[MMBASE CVS] Re: Order status
___ Cvs mailing list Cvs@lists.mmbase.org http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] applications/cloudcontext/templates index_users_body.jsp
Update of /var/cvs/applications/cloudcontext/templates
In directory james.mmbase.org:/tmp/cvs-serv27337
Modified Files:
Tag: MMBase-1_8
index_users_body.jsp
Log Message:
didn't compile with newer tomcats (MMB-17060)
See also: http://cvs.mmbase.org/viewcvs/applications/cloudcontext/templates
See also: http://www.mmbase.org/jira/browse/MMB-17060
Index: index_users_body.jsp
===
RCS file: /var/cvs/applications/cloudcontext/templates/index_users_body.jsp,v
retrieving revision 1.8
retrieving revision 1.8.2.1
diff -u -b -r1.8 -r1.8.2.1
--- index_users_body.jsp14 Aug 2006 10:58:09 - 1.8
+++ index_users_body.jsp9 Dec 2008 09:22:38 - 1.8.2.1
@@ -97,7 +97,7 @@
href=mm:url referids=user,parameters,$parametersmm:param
name=urledit_user.jsp/mm:param/mm:urlimg src=mm:url
page=${location}images/mmbase-edit.gif / alt=%=getPrompt(m,update)%
title=%=getPrompt(m,update)% //a
/mm:maywrite
mm:function name=rank
-mm:compare value=%= +
org.mmbase.security.Rank.ADMIN.getInt()% inverse=true
+mm:compare value='%= +
org.mmbase.security.Rank.ADMIN.getInt()%' inverse=true
mm:maydelete
mm:import id=promptreallydeleteusers/mm:import
a onclick=[EMAIL PROTECTED] file=confirm.js %
href=mm:url referids=[EMAIL PROTECTED],parameters,$parametersmm:param
name=urldelete_user.jsp/mm:param/mm:urlimg src=mm:url
page=${location}images/mmbase-delete.gif / alt=%=getPrompt(m,delete)%
title=%=getPrompt(m,delete)% //a
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] RE: Message
You should hurry, as supply is waning! When bonds rose amid indications of economic weakness ininvestments. Druckenmiller called his fund Duquesne Capital Management. been bullish. Later in the year, Soross money managers became bearishhave ever met. He may think that the market did not react as it should ___ Cvs mailing list Cvs@lists.mmbase.org http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] applications/cloudcontext/src/org/mmbase/security/implementation/cloudcontext/builders Contexts.java
Update of
/var/cvs/applications/cloudcontext/src/org/mmbase/security/implementation/cloudcontext/builders
In directory james.mmbase.org:/tmp/cvs-serv27578
Modified Files:
Tag: MMBase-1_8
Contexts.java
Log Message:
The node can be requested from the user object, which is beter in case the
usercontext object was a 'local admin' (of which the username could coincide
with another user)
See also:
http://cvs.mmbase.org/viewcvs/applications/cloudcontext/src/org/mmbase/security/implementation/cloudcontext/builders
Index: Contexts.java
===
RCS file:
/var/cvs/applications/cloudcontext/src/org/mmbase/security/implementation/cloudcontext/builders/Contexts.java,v
retrieving revision 1.48.2.2
retrieving revision 1.48.2.3
diff -u -b -r1.48.2.2 -r1.48.2.3
--- Contexts.java 8 Dec 2008 16:31:47 - 1.48.2.2
+++ Contexts.java 9 Dec 2008 09:33:30 - 1.48.2.3
@@ -35,7 +35,7 @@
* @author Eduard Witteveen
* @author Pierre van Rooden
* @author Michiel Meeuwissen
- * @version $Id: Contexts.java,v 1.48.2.2 2008/12/08 16:31:47 michiel Exp $
+ * @version $Id: Contexts.java,v 1.48.2.3 2008/12/09 09:33:30 michiel Exp $
* @seeorg.mmbase.security.implementation.cloudcontext.Verify
* @seeorg.mmbase.security.Authorization
*/
@@ -915,8 +915,7 @@
* util
*/
protected MMObjectNode getUserNode(UserContext user) {
-Provider users = Authenticate.getInstance().getUserProvider();
-return users.getUser(user.getIdentifier());
+return ((User) user).getNode();
}
protected MMObjectNode getGroupOrUserNode(Parameters a) {
@@ -997,7 +996,7 @@
if (checkingUser == null) {
throw new SecurityException(Self was not supplied);
}
-// find the user first, the check if the current user actually has
rights on the object
+// find the user first, the check if the current user actually has
rights on the objec
Provider users = Authenticate.getInstance().getUserProvider();
MMObjectNode userToCheck =
users.getUserBuilder().getNode(a.getString(usertocheck));
if (userToCheck == null) { // the user is null?
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] applications/cloudcontext/src/org/mmbase/security/implementation/cloudcontext/builders Contexts.java
Update of
/var/cvs/applications/cloudcontext/src/org/mmbase/security/implementation/cloudcontext/builders
In directory james.mmbase.org:/tmp/cvs-serv27633
Modified Files:
Contexts.java
Log Message:
The node can be requested from the user object, which is beter in case the
usercontext object was a 'local admin' (of which the username could coincide
with another user)
See also:
http://cvs.mmbase.org/viewcvs/applications/cloudcontext/src/org/mmbase/security/implementation/cloudcontext/builders
Index: Contexts.java
===
RCS file:
/var/cvs/applications/cloudcontext/src/org/mmbase/security/implementation/cloudcontext/builders/Contexts.java,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -b -r1.57 -r1.58
--- Contexts.java 8 Dec 2008 17:02:46 - 1.57
+++ Contexts.java 9 Dec 2008 09:34:18 - 1.58
@@ -35,7 +35,7 @@
* @author Eduard Witteveen
* @author Pierre van Rooden
* @author Michiel Meeuwissen
- * @version $Id: Contexts.java,v 1.57 2008/12/08 17:02:46 michiel Exp $
+ * @version $Id: Contexts.java,v 1.58 2008/12/09 09:34:18 michiel Exp $
* @seeorg.mmbase.security.implementation.cloudcontext.Verify
* @seeorg.mmbase.security.Authorization
*/
@@ -916,8 +916,7 @@
* @javadoc
*/
protected MMObjectNode getUserNode(UserContext user) {
-Provider users = Authenticate.getInstance().getUserProvider();
-return users.getUser(user.getIdentifier());
+return ((User) user).getNode();
}
protected MMObjectNode getGroupOrUserNode(Parameters a) {
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] applications/taglib/src/org/mmbase/bridge/jsp/taglib InstanceOfTag.java mmbase-taglib.xml
Update of /var/cvs/applications/taglib/src/org/mmbase/bridge/jsp/taglib In directory james.mmbase.org:/tmp/cvs-serv27687 Modified Files: Tag: MMBase-1_8 mmbase-taglib.xml Added Files: Tag: MMBase-1_8 InstanceOfTag.java Log Message: new instanceof tag See also: http://cvs.mmbase.org/viewcvs/applications/taglib/src/org/mmbase/bridge/jsp/taglib InstanceOfTag.java is new Index: mmbase-taglib.xml === RCS file: /var/cvs/applications/taglib/src/org/mmbase/bridge/jsp/taglib/mmbase-taglib.xml,v retrieving revision 1.374.2.33 retrieving revision 1.374.2.34 diff -u -b -r1.374.2.33 -r1.374.2.34 --- mmbase-taglib.xml 26 Nov 2008 14:08:02 - 1.374.2.33 +++ mmbase-taglib.xml 9 Dec 2008 09:35:58 - 1.374.2.34 @@ -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.374.2.33 2008/11/26 14:08:02 michiel Exp $ +version: $Id: mmbase-taglib.xml,v 1.374.2.34 2008/12/09 09:35:58 bert Exp $ -- taglib author=MMBase community @@ -8434,7 +8434,7 @@ tag namedatatype/name -extendscloudtreferrer/extends +extendscloudreferrer/extends tagclassorg.mmbase.bridge.jsp.taglib.DataTypeTag/tagclass bodycontentJSP/bodycontent info @@ -8458,6 +8458,21 @@ /attribute /tag + tag +nameinstanceof/name +extendsnodereferrer/extends +extendscondition/extends +tagclassorg.mmbase.bridge.jsp.taglib.InstanceOfTag/tagclass +bodycontentJSP/bodycontent +info +/info +sinceMMBase-1.8.7/since +attribute + namenodemanager/name + requiredtrue/required +/attribute + /tag + !-- tag nametest/name ___ Cvs mailing list Cvs@lists.mmbase.org http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] src/org/mmbase/util/functions PatternNodeFunctionProvider.java
Update of /var/cvs/src/org/mmbase/util/functions
In directory james.mmbase.org:/tmp/cvs-serv28237
Modified Files:
Tag: MMBase-1_8
PatternNodeFunctionProvider.java
Log Message:
avoid a NPE, I thing happening for node fields
See also: http://cvs.mmbase.org/viewcvs/src/org/mmbase/util/functions
Index: PatternNodeFunctionProvider.java
===
RCS file:
/var/cvs/src/org/mmbase/util/functions/PatternNodeFunctionProvider.java,v
retrieving revision 1.9
retrieving revision 1.9.2.1
diff -u -b -r1.9 -r1.9.2.1
--- PatternNodeFunctionProvider.java29 Mar 2006 15:05:51 - 1.9
+++ PatternNodeFunctionProvider.java9 Dec 2008 10:04:49 - 1.9.2.1
@@ -32,7 +32,7 @@
* xml).
*
* @author Michiel Meeuwissen
- * @version $Id: PatternNodeFunctionProvider.java,v 1.9 2006/03/29 15:05:51
michiel Exp $
+ * @version $Id: PatternNodeFunctionProvider.java,v 1.9.2.1 2008/12/09
10:04:49 michiel Exp $
* @since MMBase-1.8
*/
public class PatternNodeFunctionProvider extends FunctionProvider {
@@ -106,7 +106,13 @@
{
Matcher fields = fieldsPattern.matcher(template);
while (fields.find()) {
-fields.appendReplacement(sb,
node.getStringValue(fields.group(1)));
+String s = node.getStringValue(fields.group(1));
+if (s == null) {
+// I think getStringValue should perhaps never return
null, but if it does,
+// avoid the NPE
+s = ;
+}
+fields.appendReplacement(sb, s);
}
fields.appendTail(sb);
}
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] src/org/mmbase/util/functions PatternNodeFunctionProvider.java
Update of /var/cvs/src/org/mmbase/util/functions
In directory james.mmbase.org:/tmp/cvs-serv28306
Modified Files:
PatternNodeFunctionProvider.java
Log Message:
avoid a NPE, I thing happening for node fields
See also: http://cvs.mmbase.org/viewcvs/src/org/mmbase/util/functions
Index: PatternNodeFunctionProvider.java
===
RCS file:
/var/cvs/src/org/mmbase/util/functions/PatternNodeFunctionProvider.java,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -b -r1.15 -r1.16
--- PatternNodeFunctionProvider.java27 Jul 2007 14:07:07 - 1.15
+++ PatternNodeFunctionProvider.java9 Dec 2008 10:05:31 - 1.16
@@ -32,7 +32,7 @@
* xml).
*
* @author Michiel Meeuwissen
- * @version $Id: PatternNodeFunctionProvider.java,v 1.15 2007/07/27 14:07:07
michiel Exp $
+ * @version $Id: PatternNodeFunctionProvider.java,v 1.16 2008/12/09 10:05:31
michiel Exp $
* @since MMBase-1.8
*/
public class PatternNodeFunctionProvider extends FunctionProvider {
@@ -190,7 +190,13 @@
{
Matcher fields = fieldsPattern.matcher(template);
while (fields.find()) {
-fields.appendReplacement(sb,
node.getStringValue(fields.group(1)));
+String s = node.getStringValue(fields.group(1));
+if (s == null) {
+// I think getStringValue should perhaps never return
null, but if it does,
+// avoid the NPE
+s = ;
+}
+fields.appendReplacement(sb, s);
}
fields.appendTail(sb);
}
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] src/org/mmbase/bridge/implementation BasicNode.java
Update of /var/cvs/src/org/mmbase/bridge/implementation
In directory james.mmbase.org:/tmp/cvs-serv29447
Modified Files:
Tag: MMBase-1_8
BasicNode.java
Log Message:
ported wrapping with casting from 1.9. This makes no difference if the
processor already produced the correct type, but makes them easier to
implement, because you don't necessary need to return the excact correct type
any more (it is sometimes hard to know that that is)
See also: http://cvs.mmbase.org/viewcvs/src/org/mmbase/bridge/implementation
Index: BasicNode.java
===
RCS file: /var/cvs/src/org/mmbase/bridge/implementation/BasicNode.java,v
retrieving revision 1.210.2.9
retrieving revision 1.210.2.10
diff -u -b -r1.210.2.9 -r1.210.2.10
--- BasicNode.java 11 Nov 2008 18:58:18 - 1.210.2.9
+++ BasicNode.java 9 Dec 2008 10:39:53 - 1.210.2.10
@@ -32,7 +32,7 @@
* @author Rob Vermeulen
* @author Pierre van Rooden
* @author Michiel Meeuwissen
- * @version $Id: BasicNode.java,v 1.210.2.9 2008/11/11 18:58:18 michiel Exp $
+ * @version $Id: BasicNode.java,v 1.210.2.10 2008/12/09 10:39:53 michiel Exp $
* @see org.mmbase.bridge.Node
* @see org.mmbase.module.core.MMObjectNode
*/
@@ -347,7 +347,7 @@
Boolean result = Boolean.valueOf(noderef.getBooleanValue(fieldName));
if (nodeManager.hasField(fieldName)) { // gui(..) stuff could not work.
Field field = nodeManager.getField(fieldName);
-result = (Boolean)
field.getDataType().getProcessor(DataType.PROCESS_GET,
Field.TYPE_BOOLEAN).process(this, field, result);
+result =
Boolean.valueOf(Casting.toBoolean(field.getDataType().getProcessor(DataType.PROCESS_GET,
Field.TYPE_BOOLEAN).process(this, field, result)));
}
return result.booleanValue();
}
@@ -356,7 +356,7 @@
Date result = noderef.getDateValue(fieldName);
if (nodeManager.hasField(fieldName)) { // gui(..) stuff could not work.
Field field = nodeManager.getField(fieldName);
-result = (Date)
field.getDataType().getProcessor(DataType.PROCESS_GET,
Field.TYPE_DATETIME).process(this, field, result);
+result =
Casting.toDate(field.getDataType().getProcessor(DataType.PROCESS_GET,
Field.TYPE_DATETIME).process(this, field, result));
}
return result;
}
@@ -365,7 +365,7 @@
List result = noderef.getListValue(fieldName);
if (nodeManager.hasField(fieldName)) { // gui(..) stuff could not work.
Field field = nodeManager.getField(fieldName);
-result = (List)
field.getDataType().getProcessor(DataType.PROCESS_GET,
Field.TYPE_LIST).process(this, field, result);
+result =
Casting.toList(field.getDataType().getProcessor(DataType.PROCESS_GET,
Field.TYPE_LIST).process(this, field, result));
}
return result;
@@ -394,7 +394,7 @@
}
if (nodeManager.hasField(fieldName)) { // only if this is actually a
field of this node-manager, otherewise it might be e.g. a request for an
'element' of a cluster node
Field field = nodeManager.getField(fieldName);
-result = (Node)
field.getDataType().getProcessor(DataType.PROCESS_GET,
Field.TYPE_NODE).process(this, field, result);
+result =
Casting.toNode(field.getDataType().getProcessor(DataType.PROCESS_GET,
Field.TYPE_NODE).process(this, field, result), getCloud());
}
return result;
@@ -415,7 +415,7 @@
Float result = new Float(getNode().getFloatValue(fieldName));
if (nodeManager.hasField(fieldName)) { // gui(..) stuff could not work.
Field field = nodeManager.getField(fieldName);
-result = (Float)
field.getDataType().getProcessor(DataType.PROCESS_GET,
Field.TYPE_FLOAT).process(this, field, result);
+result = new
Float(Casting.toFloat(field.getDataType().getProcessor(DataType.PROCESS_GET,
Field.TYPE_FLOAT).process(this, field, result)));
}
return result.floatValue();
}
@@ -424,7 +424,7 @@
Long result = new Long(getNode().getLongValue(fieldName));
if (nodeManager.hasField(fieldName)) { // gui(..) stuff could not work.
Field field = nodeManager.getField(fieldName);
-result = (Long)
field.getDataType().getProcessor(DataType.PROCESS_GET,
Field.TYPE_LONG).process(this, field, result);
+result = new
Long(Casting.toLong(field.getDataType().getProcessor(DataType.PROCESS_GET,
Field.TYPE_LONG).process(this, field, result)));
}
return result.longValue();
}
@@ -433,7 +433,7 @@
Double result = new Double(getNode().getDoubleValue(fieldName));
if (nodeManager.hasField(fieldName)) { // gui(..) stuff could not work.
Field field = nodeManager.getField(fieldName);
-result = (Double)
[MMBASE CVS] applications/cloudcontext/templates index.jsp
Update of /var/cvs/applications/cloudcontext/templates In directory james.mmbase.org:/tmp/cvs-serv29724 Modified Files: Tag: MMBase-1_8 index.jsp Log Message: using taglib 2 (to use mm:-functions) See also: http://cvs.mmbase.org/viewcvs/applications/cloudcontext/templates Index: index.jsp === RCS file: /var/cvs/applications/cloudcontext/templates/index.jsp,v retrieving revision 1.19 retrieving revision 1.19.2.1 diff -u -b -r1.19 -r1.19.2.1 --- index.jsp 10 Feb 2006 18:15:07 - 1.19 +++ index.jsp 9 Dec 2008 10:49:43 - 1.19.2.1 @@ -1,6 +1,6 @@ !DOCTYPE html PUBLIC -//W3C//DTD XHTML 1.0 Strict//EN DTD/xhtml1-strict.dtd [EMAIL PROTECTED] language=java contentType=text/html; charset=UTF-8 -%%@ taglib uri=http://www.mmbase.org/mmbase-taglib-1.0; prefix=mm +%%@ taglib uri=http://www.mmbase.org/mmbase-taglib-2.0; prefix=mm %[EMAIL PROTECTED] file=settings.jsp %mm:content language=$language type=text/html expires=0 mm:import externid=urlindex_users.jsp/mm:import ___ Cvs mailing list Cvs@lists.mmbase.org http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] applications/cloudcontext/src/org/mmbase/security/implementation/cloudcontext/builders Contexts.java
Update of
/var/cvs/applications/cloudcontext/src/org/mmbase/security/implementation/cloudcontext/builders
In directory james.mmbase.org:/tmp/cvs-serv30602
Modified Files:
Tag: MMBase-1_8
Contexts.java
Log Message:
the 'defaultcontext' field on the user builder is optional now
See also:
http://cvs.mmbase.org/viewcvs/applications/cloudcontext/src/org/mmbase/security/implementation/cloudcontext/builders
Index: Contexts.java
===
RCS file:
/var/cvs/applications/cloudcontext/src/org/mmbase/security/implementation/cloudcontext/builders/Contexts.java,v
retrieving revision 1.48.2.4
retrieving revision 1.48.2.5
diff -u -b -r1.48.2.4 -r1.48.2.5
--- Contexts.java 9 Dec 2008 10:14:09 - 1.48.2.4
+++ Contexts.java 9 Dec 2008 11:21:15 - 1.48.2.5
@@ -35,7 +35,7 @@
* @author Eduard Witteveen
* @author Pierre van Rooden
* @author Michiel Meeuwissen
- * @version $Id: Contexts.java,v 1.48.2.4 2008/12/09 10:14:09 michiel Exp $
+ * @version $Id: Contexts.java,v 1.48.2.5 2008/12/09 11:21:15 michiel Exp $
* @seeorg.mmbase.security.implementation.cloudcontext.Verify
* @seeorg.mmbase.security.Authorization
*/
@@ -195,6 +195,7 @@
if (builder instanceof Contexts) {
try {
MMObjectBuilder users =
Authenticate.getInstance().getUserProvider().getUserBuilder();
+if (users.hasField(defaultcontext)) {
BasicSearchQuery query = new BasicSearchQuery(true);
Step step = query.addStep(users);
BasicFieldValueConstraint constraint = new
BasicFieldValueConstraint(new BasicStepField(step,
users.getField(defaultcontext)), new Integer(nodeId));
@@ -214,6 +215,7 @@
int count = result.getIntValue(count);
if (count 0) return false;
+}
// perhaps should also return false if there are still
nodes with this context?
// this check is not done in editors, but perhaps it
should be bit harder!
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] applications/cloudcontext/src/org/mmbase/security/implementation/cloudcontext Authenticate.java
Update of
/var/cvs/applications/cloudcontext/src/org/mmbase/security/implementation/cloudcontext
In directory james.mmbase.org:/tmp/cvs-serv31101
Modified Files:
Authenticate.java
Log Message:
oops
See also:
http://cvs.mmbase.org/viewcvs/applications/cloudcontext/src/org/mmbase/security/implementation/cloudcontext
Index: Authenticate.java
===
RCS file:
/var/cvs/applications/cloudcontext/src/org/mmbase/security/implementation/cloudcontext/Authenticate.java,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -b -r1.27 -r1.28
--- Authenticate.java 8 Dec 2008 17:02:46 - 1.27
+++ Authenticate.java 9 Dec 2008 11:44:27 - 1.28
@@ -31,7 +31,7 @@
* @author Eduard Witteveen
* @author Pierre van Rooden
* @author Michiel Meeuwissen
- * @version $Id: Authenticate.java,v 1.27 2008/12/08 17:02:46 michiel Exp $
+ * @version $Id: Authenticate.java,v 1.28 2008/12/09 11:44:27 michiel Exp $
*/
public class Authenticate extends Authentication {
private static final Logger log =
Logging.getLoggerInstance(Authenticate.class);
@@ -155,7 +155,7 @@
return user;
}
}
-node = users.getUser(userName, password, false);
+node = users.getUser(userName, password, true);
if (node != null ! users.isValid(node)) {
throw new SecurityException(Logged in an invalid user);
}
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] applications/cloudcontext/templates index_users_body.jsp
Update of /var/cvs/applications/cloudcontext/templates
In directory james.mmbase.org:/tmp/cvs-serv31405
Modified Files:
index_users_body.jsp
Log Message:
didn't compile with newer tomcats (MMB-17060)
See also: http://cvs.mmbase.org/viewcvs/applications/cloudcontext/templates
See also: http://www.mmbase.org/jira/browse/MMB-17060
Index: index_users_body.jsp
===
RCS file: /var/cvs/applications/cloudcontext/templates/index_users_body.jsp,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- index_users_body.jsp14 Aug 2006 10:58:09 - 1.8
+++ index_users_body.jsp9 Dec 2008 11:53:01 - 1.9
@@ -97,7 +97,7 @@
href=mm:url referids=user,parameters,$parametersmm:param
name=urledit_user.jsp/mm:param/mm:urlimg src=mm:url
page=${location}images/mmbase-edit.gif / alt=%=getPrompt(m,update)%
title=%=getPrompt(m,update)% //a
/mm:maywrite
mm:function name=rank
-mm:compare value=%= +
org.mmbase.security.Rank.ADMIN.getInt()% inverse=true
+mm:compare value='%= +
org.mmbase.security.Rank.ADMIN.getInt()%' inverse=true
mm:maydelete
mm:import id=promptreallydeleteusers/mm:import
a onclick=[EMAIL PROTECTED] file=confirm.js %
href=mm:url referids=[EMAIL PROTECTED],parameters,$parametersmm:param
name=urldelete_user.jsp/mm:param/mm:urlimg src=mm:url
page=${location}images/mmbase-delete.gif / alt=%=getPrompt(m,delete)%
title=%=getPrompt(m,delete)% //a
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] applications/crontab/src/org/mmbase/applications/crontab/builders CronJobs.java
Update of
/var/cvs/applications/crontab/src/org/mmbase/applications/crontab/builders
In directory james.mmbase.org:/tmp/cvs-serv917/builders
Modified Files:
CronJobs.java
Log Message:
on reload of the module, also reload the jobs defined by the cronjobs builder
See also:
http://cvs.mmbase.org/viewcvs/applications/crontab/src/org/mmbase/applications/crontab/builders
Index: CronJobs.java
===
RCS file:
/var/cvs/applications/crontab/src/org/mmbase/applications/crontab/builders/CronJobs.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- CronJobs.java 2 Dec 2008 09:10:36 - 1.11
+++ CronJobs.java 9 Dec 2008 13:38:49 - 1.12
@@ -20,7 +20,7 @@
* The builder also starts the CronDeamon. on startup the list of cronjobs is
loaded into memory.
* bThe builder uses the bridge to get a cloud using class security./b
* @author Kees Jongenburger
- * @version $Id: CronJobs.java,v 1.11 2008/12/02 09:10:36 michiel Exp $
+ * @version $Id: CronJobs.java,v 1.12 2008/12/09 13:38:49 michiel Exp $
*/
public class CronJobs extends MMObjectBuilder {
@@ -33,23 +33,42 @@
boolean res = super.init();
org.mmbase.util.ThreadPools.jobsExecutor.execute(new Runnable() {
public void run() {
+CronJobs.this.readJobs();
+}
+});
+return res;
+}
+
+private final SetNodeCronEntry myJobs = new HashSetNodeCronEntry();
+
+
+public static CronJobs getBuilder() {
+return (CronJobs) MMBase.getMMBase().getBuilder(cronjobs);
+}
+
+public void readJobs() {
+Cloud cloud = getCloud();
+
CronDaemon cronDaemon = CronDaemon.getInstance();
-NodeIterator nodeIterator =
getCloud().getNodeManager(getTableName()).getList(null, null,
null).nodeIterator();
+for(NodeCronEntry e : myJobs) {
+cronDaemon.remove(e);
+}
+myJobs.clear();
+
+log.service(Loading jobs from + this);
+NodeIterator nodeIterator =
cloud.getNodeManager(getTableName()).getList(null, null, null).nodeIterator();
while (nodeIterator.hasNext()) {
Node node = nodeIterator.nextNode();
-CronEntry entry = null;
try {
-entry = new NodeCronEntry(node);
+NodeCronEntry entry = new NodeCronEntry(node);
log.service(Adding cron entry [ + entry + ]);
+myJobs.add(entry);
cronDaemon.add(entry);
} catch (Exception e) {
log.warn(did not add cronjob with id +
node.getNumber() + because of error + e.getMessage());
}
}
}
-});
-return res;
-}
@Override public void notify(NodeEvent event) {
log.debug(Received + event);
___
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-serv917/modules
Modified Files:
CrontabModule.java
Log Message:
on reload of the module, also reload the jobs defined by the cronjobs builder
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.19
retrieving revision 1.20
diff -u -b -r1.19 -r1.20
--- CrontabModule.java 4 Aug 2008 14:12:38 - 1.19
+++ CrontabModule.java 9 Dec 2008 13:38:49 - 1.20
@@ -13,6 +13,7 @@
import org.mmbase.util.DynamicDate;
import org.mmbase.util.functions.*;
import org.mmbase.applications.crontab.*;
+import org.mmbase.applications.crontab.builders.CronJobs;
import org.mmbase.module.WatchedReloadableModule;
import org.mmbase.util.logging.*;
@@ -20,7 +21,7 @@
* Starts a crontab for MMBase as a Module.
*
* @author Michiel Meeuwissen
- * @version $Id: CrontabModule.java,v 1.19 2008/08/04 14:12:38 michiel Exp $
+ * @version $Id: CrontabModule.java,v 1.20 2008/12/09 13:38:49 michiel Exp $
*/
public class CrontabModule extends WatchedReloadableModule {
@@ -50,7 +51,7 @@
}
private static final Logger log =
Logging.getLoggerInstance(CrontabModule.class);
-protected CronDaemon cronDaemon = null;
+protected final CronDaemon cronDaemon;
/**
* Need to remember which crontab entries where 'mine', to known which
must be removed if
@@ -144,11 +145,14 @@
*/
public void reload() {
log.info(Reloading crontab);
-IteratorCronEntry i = myEntries.iterator();
-while (i.hasNext()) {
-cronDaemon.remove(i.next());
+for (CronEntry e : myEntries) {
+cronDaemon.remove(e);
}
myEntries.clear();
+CronJobs cronJobs = CronJobs.getBuilder();
+if (cronJobs != null) {
+cronJobs.readJobs();
+}
init();
}
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] applications/crontab/src/org/mmbase/applications/crontab/builders NodeCronEntry.java
Update of
/var/cvs/applications/crontab/src/org/mmbase/applications/crontab/builders
In directory james.mmbase.org:/tmp/cvs-serv851
Modified Files:
NodeCronEntry.java
Log Message:
lowered some log
See also:
http://cvs.mmbase.org/viewcvs/applications/crontab/src/org/mmbase/applications/crontab/builders
Index: NodeCronEntry.java
===
RCS file:
/var/cvs/applications/crontab/src/org/mmbase/applications/crontab/builders/NodeCronEntry.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- NodeCronEntry.java 2 Dec 2008 09:23:22 - 1.5
+++ NodeCronEntry.java 9 Dec 2008 13:38:10 - 1.6
@@ -17,7 +17,7 @@
/**
*
* @author Michiel Meeuwissen
- * @version $Id: NodeCronEntry.java,v 1.5 2008/12/02 09:23:22 michiel Exp $
+ * @version $Id: NodeCronEntry.java,v 1.6 2008/12/09 13:38:10 michiel Exp $
* @since MMBase-1.8.6
*/
@@ -66,13 +66,13 @@
Node server = servers.nextNode();
String name = server.getStringValue(name);
if (name != null name.equalsIgnoreCase(machineName)) {
-log.service(Active [ + this + ] for server [ + name + ]);
+log.debug(Active [ + this + ] for server [ + name + ]);
return true;
} else {
-log.service(Ignoring related server [ + name + ], does not
equal servername [ + machineName + ]);
+log.debug(Ignoring related server [ + name + ], does not
equal servername [ + machineName + ]);
}
}
-log.service(NOT active cron entry [ + this + ], not related to
server [ + machineName + ]);
+log.debug(NOT active cron entry [ + this + ], not related to
server [ + machineName + ]);
return false;
}
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] contributions/CMSContainer_Modules/luceus/src/java/com/finalist/cmsc/module/luceusmodule PageAwareCustomContentHandler.java IndexUpdateTask.java
Update of
/var/cvs/contributions/CMSContainer_Modules/luceus/src/java/com/finalist/cmsc/module/luceusmodule
In directory
james.mmbase.org:/tmp/cvs-serv29928/luceus/src/java/com/finalist/cmsc/module/luceusmodule
Modified Files:
Tag: b1_5
IndexUpdateTask.java
Added Files:
Tag: b1_5
PageAwareCustomContentHandler.java
Log Message:
CMSC-1179 Added a CustomContentHandler which is aware of the page content a
content element is being indexed in.
See also:
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer_Modules/luceus/src/java/com/finalist/cmsc/module/luceusmodule
See also: http://www.mmbase.org/jira/browse/CMSC-1179
PageAwareCustomContentHandler.java is new
Index: IndexUpdateTask.java
===
RCS file:
/var/cvs/contributions/CMSContainer_Modules/luceus/src/java/com/finalist/cmsc/module/luceusmodule/IndexUpdateTask.java,v
retrieving revision 1.10
retrieving revision 1.10.2.1
diff -u -b -r1.10 -r1.10.2.1
--- IndexUpdateTask.java12 Apr 2008 14:26:33 - 1.10
+++ IndexUpdateTask.java9 Dec 2008 11:00:48 - 1.10.2.1
@@ -9,6 +9,7 @@
*/
package com.finalist.cmsc.module.luceusmodule;
+import java.util.Collections;
import java.util.Iterator;
import java.util.List;
import java.util.Set;
@@ -364,14 +365,24 @@
}
}
- if (cch != null) {
- SetNode custom = cch.findLinkedContent(contentElement);
+ // Assume there are no custom related elements
+ SetNode custom = Collections.emptySet();
+
+ // Then try to find related content, based on the handler implementation
if any
+ if (cch instanceof PageAwareCustomContentHandler) {
+ PageAwareCustomContentHandler pcch = (PageAwareCustomContentHandler)
cch;
+ custom = pcch.findLinkedContent(contentElement, pageNode);
+ }
+ else if (cch != null) {
+ custom = cch.findLinkedContent(contentElement);
+ }
+
+ // Finally fields of the custom content to the document
for (Node customNode : custom) {
if (module.isDoSecondaryWithPrimary()) {
LuceusUtil.nodeFields(customNode, doc);
}
}
- }
Indexer idx = module.getIndexer();
if (idx != null) {
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] applications/cloudcontext/src/org/mmbase/security/implementation/cloudcontext/builders Contexts.java
Update of
/var/cvs/applications/cloudcontext/src/org/mmbase/security/implementation/cloudcontext/builders
In directory james.mmbase.org:/tmp/cvs-serv30665/cloudcontext/builders
Modified Files:
Contexts.java
Log Message:
the 'defaultcontext' field on the user builder is optional now
See also:
http://cvs.mmbase.org/viewcvs/applications/cloudcontext/src/org/mmbase/security/implementation/cloudcontext/builders
Index: Contexts.java
===
RCS file:
/var/cvs/applications/cloudcontext/src/org/mmbase/security/implementation/cloudcontext/builders/Contexts.java,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -b -r1.59 -r1.60
--- Contexts.java 9 Dec 2008 10:25:35 - 1.59
+++ Contexts.java 9 Dec 2008 11:23:00 - 1.60
@@ -35,7 +35,7 @@
* @author Eduard Witteveen
* @author Pierre van Rooden
* @author Michiel Meeuwissen
- * @version $Id: Contexts.java,v 1.59 2008/12/09 10:25:35 michiel Exp $
+ * @version $Id: Contexts.java,v 1.60 2008/12/09 11:23:00 michiel Exp $
* @seeorg.mmbase.security.implementation.cloudcontext.Verify
* @seeorg.mmbase.security.Authorization
*/
@@ -194,6 +194,7 @@
if (builder instanceof Contexts) {
try {
MMObjectBuilder users =
Authenticate.getInstance().getUserProvider().getUserBuilder();
+if (users.hasField(defaultcontext)) {
BasicSearchQuery query = new BasicSearchQuery(true);
Step step = query.addStep(users);
BasicFieldValueConstraint constraint = new
BasicFieldValueConstraint(new BasicStepField(step,
users.getField(defaultcontext)), new Integer(nodeId));
@@ -215,7 +216,7 @@
// perhaps should also return false if there are still
nodes with this context?
// this check is not done in editors, but perhaps it
should be bit harder!
-
+}
} catch (SearchQueryException sqe) {
// leave to rest of impl.
}
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] applications/crontab/src/org/mmbase/applications/crontab MMBaseQueryJob.java
Update of /var/cvs/applications/crontab/src/org/mmbase/applications/crontab
In directory james.mmbase.org:/tmp/cvs-serv788
Modified Files:
MMBaseQueryJob.java
Log Message:
removed superflouous empty log
See also:
http://cvs.mmbase.org/viewcvs/applications/crontab/src/org/mmbase/applications/crontab
Index: MMBaseQueryJob.java
===
RCS file:
/var/cvs/applications/crontab/src/org/mmbase/applications/crontab/MMBaseQueryJob.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- MMBaseQueryJob.java 27 Dec 2005 09:29:13 - 1.1
+++ MMBaseQueryJob.java 9 Dec 2008 13:37:42 - 1.2
@@ -18,7 +18,7 @@
* following Job can be used.
*
* @author Michiel Meeuwissen
- * @version $Id: MMBaseQueryJob.java,v 1.1 2005/12/27 09:29:13 michiel Exp $
+ * @version $Id: MMBaseQueryJob.java,v 1.2 2008/12/09 13:37:42 michiel Exp $
*/
public class MMBaseQueryJob extends AbstractCronJob {
@@ -60,12 +60,10 @@
}
log.service(heading.toString());
while(results.next()) {
-StringBuffer row = new StringBuffer();
for (int i = 1; i = meta.getColumnCount(); i++) {
heading.append(results.getString(i));
if (i meta.getColumnCount()) heading.append(|);
}
-log.service(row);
}
} catch (Exception e) {
// perhaps the result set simply is not available for use any
more (this class is
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] src/org/mmbase/security/classsecurity ClassAuthentication.java
Update of /var/cvs/src/org/mmbase/security/classsecurity
In directory james.mmbase.org:/tmp/cvs-serv1479
Modified Files:
Tag: MMBase-1_8
ClassAuthentication.java
Log Message:
I think reading of authenticated classes suffered from a race condiation, which
causes that it could be used yet, while not yet be fully read.
See also: http://cvs.mmbase.org/viewcvs/src/org/mmbase/security/classsecurity
Index: ClassAuthentication.java
===
RCS file:
/var/cvs/src/org/mmbase/security/classsecurity/ClassAuthentication.java,v
retrieving revision 1.13.2.1
retrieving revision 1.13.2.2
diff -u -b -r1.13.2.1 -r1.13.2.2
--- ClassAuthentication.java9 Jun 2008 09:44:50 - 1.13.2.1
+++ ClassAuthentication.java9 Dec 2008 14:04:23 - 1.13.2.2
@@ -30,7 +30,7 @@
* its configuration file, contains this configuration.
*
* @author Michiel Meeuwissen
- * @version $Id: ClassAuthentication.java,v 1.13.2.1 2008/06/09 09:44:50
michiel Exp $
+ * @version $Id: ClassAuthentication.java,v 1.13.2.2 2008/12/09 14:04:23
michiel Exp $
* @see ClassAuthenticationWrapper
* @sinceMMBase-1.8
*/
@@ -68,7 +68,7 @@
protected static synchronized void load(String configFile) throws
SecurityException {
List resourceList =
MMBaseCopConfig.securityLoader.getResourceList(configFile);
log.info(Loading + configFile + ( + resourceList + ));
-authenticatedClasses = new ArrayList();
+List ac = new ArrayList(); // temporary stores 'authenticatedClasses'
ListIterator it = resourceList.listIterator();
while (it.hasNext()) it.next();
while (it.hasPrevious()) {
@@ -99,22 +99,26 @@
}
property = property.getNextSibling();
}
-authenticatedClasses.add(new Login(Pattern.compile(clazz),
method, Collections.unmodifiableMap(map), weight));
+ac.add(new Login(Pattern.compile(clazz), method,
Collections.unmodifiableMap(map), weight));
}
} catch (Exception e) {
log.error(u + + e.getMessage(), e);
}
}
-Collections.sort(authenticatedClasses);
+Collections.sort(ac);
{ // last fall back, everybody may get the 'anonymous' cloud.
Map map = new HashMap();
map.put(rank, anonymous);
-authenticatedClasses.add(new Login(Pattern.compile(.*), class,
Collections.unmodifiableMap(map), Integer.MIN_VALUE));
+ac.add(new Login(Pattern.compile(.*), class,
Collections.unmodifiableMap(map), Integer.MIN_VALUE));
}
-log.service(Class authentication: + authenticatedClasses);
+// This method is responsible for this list, so we return an
unmodifable version
+// Also, the authenticatedClasses member must remain null as long as
it is not yet fully
+// read (classChecked is locked then)
+authenticatedClasses = Collections.unmodifiableList(ac);
+log.service(Class authentication: + ac);
}
@@ -135,7 +139,6 @@
synchronized(ClassAuthentication.class) { // if load is running
this locks
if (authenticatedClasses == null) { // if locked, load was
running and this now skips, so load is not called twice.
String configFile = classauthentication.xml;
-load(configFile);
watcher = new
ResourceWatcher(MMBaseCopConfig.securityLoader) {
public void onChange(String resource) {
load(resource);
@@ -143,6 +146,7 @@
};
watcher.add(configFile);
watcher.start();
+watcher.onChange();
}
}
}
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] contributions/CMSContainer_Modules/luceus/src/java/com/finalist/cmsc/module/luceusmodule PageAwareCustomContentHandler.java IndexUpdateTask.java
Update of
/var/cvs/contributions/CMSContainer_Modules/luceus/src/java/com/finalist/cmsc/module/luceusmodule
In directory
james.mmbase.org:/tmp/cvs-serv29943/luceus/src/java/com/finalist/cmsc/module/luceusmodule
Modified Files:
Tag: b1_4
IndexUpdateTask.java
Added Files:
Tag: b1_4
PageAwareCustomContentHandler.java
Log Message:
CMSC-1179 Added a CustomContentHandler which is aware of the page content a
content element is being indexed in.
See also:
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer_Modules/luceus/src/java/com/finalist/cmsc/module/luceusmodule
See also: http://www.mmbase.org/jira/browse/CMSC-1179
PageAwareCustomContentHandler.java is new
Index: IndexUpdateTask.java
===
RCS file:
/var/cvs/contributions/CMSContainer_Modules/luceus/src/java/com/finalist/cmsc/module/luceusmodule/IndexUpdateTask.java,v
retrieving revision 1.9
retrieving revision 1.9.2.1
diff -u -b -r1.9 -r1.9.2.1
--- IndexUpdateTask.java26 Nov 2007 11:42:13 - 1.9
+++ IndexUpdateTask.java9 Dec 2008 11:00:54 - 1.9.2.1
@@ -9,6 +9,7 @@
*/
package com.finalist.cmsc.module.luceusmodule;
+import java.util.Collections;
import java.util.Iterator;
import java.util.List;
import java.util.Set;
@@ -365,14 +366,24 @@
}
}
- if (cch != null) {
- SetNode custom = cch.findLinkedContent(contentElement);
+ // Assume there are no custom related elements
+ SetNode custom = Collections.emptySet();
+
+ // Then try to find related content, based on the handler implementation
if any
+ if (cch instanceof PageAwareCustomContentHandler) {
+ PageAwareCustomContentHandler pcch = (PageAwareCustomContentHandler)
cch;
+ custom = pcch.findLinkedContent(contentElement, pageNode);
+ }
+ else if (cch != null) {
+ custom = cch.findLinkedContent(contentElement);
+ }
+
+ // Finally fields of the custom content to the document
for (Node customNode : custom) {
if (module.isDoSecondaryWithPrimary()) {
LuceusUtil.nodeFields(customNode, doc);
}
}
- }
Indexer idx = module.getIndexer();
if (idx != null) {
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] src/org/mmbase/security/classsecurity ClassAuthentication.java
Update of /var/cvs/src/org/mmbase/security/classsecurity
In directory james.mmbase.org:/tmp/cvs-serv1586
Modified Files:
ClassAuthentication.java
Log Message:
I think reading of authenticated classes suffered from a race condiation, which
causes that it could be used yet, while not yet be fully read.
See also: http://cvs.mmbase.org/viewcvs/src/org/mmbase/security/classsecurity
Index: ClassAuthentication.java
===
RCS file:
/var/cvs/src/org/mmbase/security/classsecurity/ClassAuthentication.java,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -b -r1.25 -r1.26
--- ClassAuthentication.java3 Nov 2008 14:00:57 - 1.25
+++ ClassAuthentication.java9 Dec 2008 14:06:46 - 1.26
@@ -29,7 +29,7 @@
* its configuration file, contains this configuration.
*
* @author Michiel Meeuwissen
- * @version $Id: ClassAuthentication.java,v 1.25 2008/11/03 14:00:57 michiel
Exp $
+ * @version $Id: ClassAuthentication.java,v 1.26 2008/12/09 14:06:46 michiel
Exp $
* @see ClassAuthenticationWrapper
* @sinceMMBase-1.8
*/
@@ -70,7 +70,7 @@
protected static synchronized void load(String configFile) throws
SecurityException {
ListURL resourceList =
MMBaseCopConfig.securityLoader.getResourceList(configFile);
log.info(Loading + configFile + ( + resourceList + ));
-authenticatedClasses = new ArrayListLogin();
+ListLogin ac = new ArrayListLogin(); // temporary stores
'authenticatedClasses'
ListIteratorURL it = resourceList.listIterator();
while (it.hasNext()) it.next();
while (it.hasPrevious()) {
@@ -101,21 +101,26 @@
}
property = property.getNextSibling();
}
-authenticatedClasses.add(new Login(u,
Pattern.compile(clazz), method, map, weight, i));
+ac.add(new Login(u, Pattern.compile(clazz), method, map,
weight, i));
}
} catch (Exception e) {
log.error(u + + e.getMessage(), e);
}
}
-Collections.sort(authenticatedClasses);
+Collections.sort(ac);
{ // last fall back, everybody may get the 'anonymous' cloud.
MapString, String map = new HashMapString, String();
map.put(rank, anonymous);
-authenticatedClasses.add(new Login(null, Pattern.compile(.*),
class, map, Integer.MIN_VALUE, 0));
+ac.add(new Login(null, Pattern.compile(.*), class, map,
Integer.MIN_VALUE, 0));
}
+
+// This method is responsible for this list, so we return an
unmodifable version
+// Also, the authenticatedClasses member must remain null as long as
it is not yet fully
+// read (classChecked is locked then)
+authenticatedClasses = Collections.unmodifiableList(ac);
log.service(Class authentication: + authenticatedClasses);
}
@@ -137,15 +142,14 @@
if (authenticatedClasses == null) {
synchronized(ClassAuthentication.class) { // if load is running
this locks
if (authenticatedClasses == null) { // if locked, load was
running and this now skips, so load is not called twice.
-String configFile = classauthentication.xml;
-load(configFile);
watcher = new
ResourceWatcher(MMBaseCopConfig.securityLoader) {
public void onChange(String resource) {
load(resource);
}
};
-watcher.add(configFile);
+watcher.add(classauthentication.xml);
watcher.start();
+watcher.onChange();
}
}
}
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] applications/cloudcontext/src/org/mmbase/security/implementation/cloudcontext/builders Contexts.java
Update of
/var/cvs/applications/cloudcontext/src/org/mmbase/security/implementation/cloudcontext/builders
In directory james.mmbase.org:/tmp/cvs-serv28608
Modified Files:
Tag: MMBase-1_8
Contexts.java
Log Message:
MMB-1749
See also:
http://cvs.mmbase.org/viewcvs/applications/cloudcontext/src/org/mmbase/security/implementation/cloudcontext/builders
See also: http://www.mmbase.org/jira/browse/MMB-1749
Index: Contexts.java
===
RCS file:
/var/cvs/applications/cloudcontext/src/org/mmbase/security/implementation/cloudcontext/builders/Contexts.java,v
retrieving revision 1.48.2.3
retrieving revision 1.48.2.4
diff -u -b -r1.48.2.3 -r1.48.2.4
--- Contexts.java 9 Dec 2008 09:33:30 - 1.48.2.3
+++ Contexts.java 9 Dec 2008 10:14:09 - 1.48.2.4
@@ -35,7 +35,7 @@
* @author Eduard Witteveen
* @author Pierre van Rooden
* @author Michiel Meeuwissen
- * @version $Id: Contexts.java,v 1.48.2.3 2008/12/09 09:33:30 michiel Exp $
+ * @version $Id: Contexts.java,v 1.48.2.4 2008/12/09 10:14:09 michiel Exp $
* @seeorg.mmbase.security.implementation.cloudcontext.Verify
* @seeorg.mmbase.security.Authorization
*/
@@ -922,7 +922,10 @@
MMObjectNode groupOrUser = getNode(a.getString(PARAMETER_GROUPORUSER));
if (groupOrUser == null) throw new IllegalArgumentException(There is
no node with id ' + a.get(PARAMETER_GROUPORUSER) + ');
MMObjectBuilder parent = groupOrUser.getBuilder();
-if (! (parent instanceof Groups || parent instanceof Users)) {
+
+MMObjectBuilder userBuilder =
Authenticate.getInstance().getUserProvider().getUserBuilder();
+
+if (! (parent instanceof Groups ||
userBuilder.getClass().isInstance(parent))) {
throw new IllegalArgumentException(Node ' +
a.get(PARAMETER_GROUPORUSER) + ' does not represent a group or a user);
}
return groupOrUser;
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] applications/cloudcontext/config/builders/cloudcontext mmbaseusers.xml
Update of /var/cvs/applications/cloudcontext/config/builders/cloudcontext In directory james.mmbase.org:/tmp/cvs-serv30519 Modified Files: Tag: MMBase-1_8 mmbaseusers.xml Log Message: added a property which can be used to indicate which fields must be presented in specialized security editors See also: http://cvs.mmbase.org/viewcvs/applications/cloudcontext/config/builders/cloudcontext Index: mmbaseusers.xml === RCS file: /var/cvs/applications/cloudcontext/config/builders/cloudcontext/mmbaseusers.xml,v retrieving revision 1.19 retrieving revision 1.19.2.1 diff -u -b -r1.19 -r1.19.2.1 --- mmbaseusers.xml 17 Aug 2006 15:25:16 - 1.19 +++ mmbaseusers.xml 9 Dec 2008 11:20:38 - 1.19.2.1 @@ -44,6 +44,8 @@ Switching this to true makes the 'encoded' password about as good as the password itself. -- property name=allowencodedpasswordfalse/property + +property name=security_editor_fieldsusername,defaultcontext,status,owner/property /properties fieldlist field ___ Cvs mailing list Cvs@lists.mmbase.org http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] applications/cloudcontext/config/builders/cloudcontext mmbasecontexts.xml
Update of /var/cvs/applications/cloudcontext/config/builders/cloudcontext In directory james.mmbase.org:/tmp/cvs-serv30455 Modified Files: Tag: MMBase-1_8 mmbasecontexts.xml Log Message: spacing only See also: http://cvs.mmbase.org/viewcvs/applications/cloudcontext/config/builders/cloudcontext Index: mmbasecontexts.xml === RCS file: /var/cvs/applications/cloudcontext/config/builders/cloudcontext/mmbasecontexts.xml,v retrieving revision 1.8 retrieving revision 1.8.2.1 diff -u -b -r1.8 -r1.8.2.1 ___ Cvs mailing list Cvs@lists.mmbase.org http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] config datatypes.xml
Update of /var/cvs/config In directory james.mmbase.org:/tmp/cvs-serv30790 Modified Files: datatypes.xml Log Message: resolved warning in log about incorrect order in xml See also: http://cvs.mmbase.org/viewcvs/config Index: datatypes.xml === RCS file: /var/cvs/config/datatypes.xml,v retrieving revision 1.76 retrieving revision 1.77 diff -u -b -r1.76 -r1.77 --- datatypes.xml 1 Dec 2008 20:01:21 - 1.76 +++ datatypes.xml 9 Dec 2008 11:28:54 - 1.77 @@ -4,7 +4,7 @@ xmlns:xsi=http://www.w3.org/2001/XMLSchema-instance; xsi:schemaLocation=http://www.mmbase.org/xmlns/datatypes http://www.mmbase.org/xmlns/datatypes.xsd; - !-- @version $Id: datatypes.xml,v 1.76 2008/12/01 20:01:21 michiel Exp $ -- + !-- @version $Id: datatypes.xml,v 1.77 2008/12/09 11:28:54 michiel Exp $ -- !-- schematic syntax of one datatype entry: @@ -17,6 +17,8 @@ required? minInclusive|minExclusive? maxInclusive|maxExclusive? +precision? +scale? minLength? maxLength? length? @@ -866,9 +868,10 @@ specialization id=currency + property name=roundingMode value=HALF_UP / precision value=20 / scale value=5 enforce=never / - property name=roundingMode value=HALF_UP / + !-- Need a getprocessor to round to scale 2 for displaying. -- ___ Cvs mailing list Cvs@lists.mmbase.org http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] Re: Order status
Go for your quoit! The stock is limited! Voters go to the polls, with the centre-leftconsolation penalty as the game neared its end, and encounters within a game. These ads are also targetedtries (both converted), two penalties, and two drop ___ Cvs mailing list Cvs@lists.mmbase.org http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] Your order
___ Cvs mailing list Cvs@lists.mmbase.org http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] applications/taglib/src/org/mmbase/bridge/jsp/taglib InstanceOfTag.java mmbase-taglib.xml
Update of /var/cvs/applications/taglib/src/org/mmbase/bridge/jsp/taglib In directory james.mmbase.org:/tmp/cvs-serv2176 Modified Files: mmbase-taglib.xml Added Files: InstanceOfTag.java Log Message: new instanceof tag 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.445 retrieving revision 1.446 diff -u -b -r1.445 -r1.446 --- mmbase-taglib.xml 5 Dec 2008 13:59:27 - 1.445 +++ mmbase-taglib.xml 9 Dec 2008 14:29:11 - 1.446 @@ -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.445 2008/12/05 13:59:27 michiel Exp $ +version: $Id: mmbase-taglib.xml,v 1.446 2008/12/09 14:29:11 bert Exp $ -- taglib author=MMBase community @@ -8930,6 +8930,21 @@ /attribute /tag + tag +nameinstanceof/name +extendsnodereferrer/extends +extendscondition/extends +tagclassorg.mmbase.bridge.jsp.taglib.InstanceOfTag/tagclass +bodycontentJSP/bodycontent +info +/info +sinceMMBase-1.8.7/since +attribute + namenodemanager/name + requiredtrue/required +/attribute + /tag + !-- tag nametest/name ___ Cvs mailing list Cvs@lists.mmbase.org http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] applications/taglib/src/org/mmbase/bridge/jsp/taglib InstanceOfTag.java
Update of /var/cvs/applications/taglib/src/org/mmbase/bridge/jsp/taglib
In directory james.mmbase.org:/tmp/cvs-serv3449
Modified Files:
InstanceOfTag.java
Log Message:
some details, added a 'descendants' attribute for congruity with typeconstraint
See also:
http://cvs.mmbase.org/viewcvs/applications/taglib/src/org/mmbase/bridge/jsp/taglib
Index: InstanceOfTag.java
===
RCS file:
/var/cvs/applications/taglib/src/org/mmbase/bridge/jsp/taglib/InstanceOfTag.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- InstanceOfTag.java 9 Dec 2008 14:29:11 - 1.2
+++ InstanceOfTag.java 9 Dec 2008 15:30:02 - 1.3
@@ -19,17 +19,18 @@
import org.mmbase.bridge.*;
/**
- * Lives under a nodeprovider. Can give information about the node,
- * like what its nodemanager is.
+ * Lives under a nodeprovider, as a condition tag, reporting whether or not
the node is of a certain builder.
*
* @author Bert Huijgen
- * @version $Id: InstanceOfTag.java,v 1.2 2008/12/09 14:29:11 bert Exp $
+ * @version $Id: InstanceOfTag.java,v 1.3 2008/12/09 15:30:02 michiel Exp $
+ * @since MMBase-1.9.1
*/
public class InstanceOfTag extends NodeReferrerTag implements Condition {
private Attribute inverse = Attribute.NULL;
private Attribute nodemanager = Attribute.NULL;
+private Attribute descendants = Attribute.NULL;
public void setInverse(String b) throws JspTagException {
inverse = getAttribute(b);
@@ -43,12 +44,16 @@
nodemanager = getAttribute(nm);
}
+public void setDescendants(String d) throws JspTagException {
+descendants = getAttribute(d, true);
+}
+
public int doStartTag() throws JspTagException{
Node node = getNode();
NodeManager nm = node.getNodeManager();
NodeManager compareTo =
node.getCloud().getNodeManager(nodemanager.getString(this));
- boolean result = nm.equals(compareTo) ||
compareTo.getDescendants().contains(nm);
+boolean result = nm.equals(compareTo) || (descendants.getBoolean(this,
true) compareTo.getDescendants().contains(nm));
if (result != getInverse()) {
return EVAL_BODY;
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] applications/taglib/src/org/mmbase/bridge/jsp/taglib ImageTag.java mmbase-taglib.xml
Update of /var/cvs/applications/taglib/src/org/mmbase/bridge/jsp/taglib
In directory james.mmbase.org:/tmp/cvs-serv3514
Modified Files:
ImageTag.java mmbase-taglib.xml
Log Message:
MMB-1750. Made some method protected (no reason for them not to)
See also:
http://cvs.mmbase.org/viewcvs/applications/taglib/src/org/mmbase/bridge/jsp/taglib
See also: http://www.mmbase.org/jira/browse/MMB-1750
Index: ImageTag.java
===
RCS file:
/var/cvs/applications/taglib/src/org/mmbase/bridge/jsp/taglib/ImageTag.java,v
retrieving revision 1.80
retrieving revision 1.81
diff -u -b -r1.80 -r1.81
--- ImageTag.java 5 Dec 2008 13:59:27 - 1.80
+++ ImageTag.java 9 Dec 2008 15:30:58 - 1.81
@@ -31,7 +31,7 @@
* sensitive for future changes in how the image servlet works.
*
* @author Michiel Meeuwissen
- * @version $Id: ImageTag.java,v 1.80 2008/12/05 13:59:27 michiel Exp $
+ * @version $Id: ImageTag.java,v 1.81 2008/12/09 15:30:58 michiel Exp $
*/
public class ImageTag extends FieldTag {
@@ -66,6 +66,7 @@
private Attribute altAttribute = Attribute.NULL;
private Attribute absolute = Attribute.NULL;
+private Attribute disposition = Attribute.NULL;
private Object prevDimension;
@@ -134,6 +135,13 @@
absolute = getAttribute(a, true);
}
+/**
+ * @since MMBase-1.9.1
+ */
+public void setDisposition(String d) throws JspTagException {
+disposition = getAttribute(d, true);
+}
+
private int getMode() throws JspTagException {
String m = mode.getString(this).toLowerCase();
if (m.length() == 0 || m.equals(url)) {
@@ -255,11 +263,11 @@
return servletArgument;
}
-public String getServletPath(Node node, String servletArgument) throws
JspTagException {
+protected String getServletPath(Node node, String servletArgument) throws
JspTagException {
Function servletPathFunction = getServletFunction(node);
Parameters args = getServletArguments(servletArgument,
servletPathFunction);
fillStandardParameters(args);
-String url = servletPathFunction.getFunctionValue( args).toString();
+String url = servletPathFunction.getFunctionValue(args).toString();
if (absolute != Attribute.NULL) {
String a = absolute.getString(this);
HttpServletRequest req = (HttpServletRequest)
getPageContext().getRequest();
@@ -285,20 +293,23 @@
return url;
}
-public Function getServletFunction(Node node) {
+protected Function getServletFunction(Node node) {
Function servletPathFunction = node.getFunction(servletpath);
return servletPathFunction;
}
-public Parameters getServletArguments(String servletArgument, Function
servletPathFunction) {
+protected Parameters getServletArguments(String servletArgument, Function
servletPathFunction) throws JspTagException {
HttpServletRequest req = (HttpServletRequest) pageContext.getRequest();
Parameters args = servletPathFunction.createParameters();
args.set(context, makeRelative() ? UriParser.makeRelative(new
File(req.getServletPath()).getParent(), /) : req.getContextPath())
.set(argument, servletArgument);
+if (disposition != Attribute.NULL) {
+args.set(disposition, disposition.getString(this));
+}
return args;
}
-public String getOutputValue(int mode, Node node, String servletPath,
Dimension dim) throws JspTagException {
+protected String getOutputValue(int mode, Node node, String servletPath,
Dimension dim) throws JspTagException {
String outputValue = null;
switch(mode) {
case MODE_URL:
@@ -327,15 +338,15 @@
return outputValue;
}
-public String getSrcAttribute(String url) throws JspTagException {
+protected String getSrcAttribute(String url) throws JspTagException {
return src=\ + url + \;
}
-public String getBaseAttributes(String url, Dimension dim) throws
JspTagException {
+protected String getBaseAttributes(String url, Dimension dim) throws
JspTagException {
return getSrcAttribute(url) + height=\ + dim.getHeight() + \
width=\ + dim.getWidth() + \;
}
-public String getAltAttribute(Node node) throws JspTagException {
+protected String getAltAttribute(Node node) throws JspTagException {
String alt = null;
if (altAttribute != Attribute.NULL) {
alt = altAttribute.getString(this);
@@ -368,7 +379,7 @@
return attributes.toString();
}
-public Dimension getDimension(Node node, String template) {
+protected Dimension getDimension(Node node, String template) {
return new LazyDimension(node, template);
}
@@ -381,7 +392,7 @@
* @param cropTemplate - crop the image. values are 'begin', 'middle' and
'end'.
[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-serv3910/bridge/util Modified Files: AbstractNode.java Log Message: indentation only 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.27 retrieving revision 1.28 diff -u -b -r1.27 -r1.28 --- AbstractNode.java 1 Dec 2008 22:41:06 - 1.27 +++ AbstractNode.java 9 Dec 2008 15:42:31 - 1.28 @@ -32,7 +32,7 @@ * here, to minimalize the implementation effort of fully implemented Nodes. * * @author Michiel Meeuwissen - * @version $Id: AbstractNode.java,v 1.27 2008/12/01 22:41:06 michiel Exp $ + * @version $Id: AbstractNode.java,v 1.28 2008/12/09 15:42:31 michiel Exp $ * @see org.mmbase.bridge.Node * @since MMBase-1.8 */ ___ Cvs mailing list Cvs@lists.mmbase.org http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] src/org/mmbase/storage/implementation/database DatabaseStorageManager.java
Update of /var/cvs/src/org/mmbase/storage/implementation/database
In directory james.mmbase.org:/tmp/cvs-serv3991/storage/implementation/database
Modified Files:
DatabaseStorageManager.java
Log Message:
log besides the fields, also the table
See also:
http://cvs.mmbase.org/viewcvs/src/org/mmbase/storage/implementation/database
Index: DatabaseStorageManager.java
===
RCS file:
/var/cvs/src/org/mmbase/storage/implementation/database/DatabaseStorageManager.java,v
retrieving revision 1.204
retrieving revision 1.205
diff -u -b -r1.204 -r1.205
--- DatabaseStorageManager.java 4 Dec 2008 11:23:20 - 1.204
+++ DatabaseStorageManager.java 9 Dec 2008 15:43:34 - 1.205
@@ -33,7 +33,7 @@
*
* @author Pierre van Rooden
* @since MMBase-1.7
- * @version $Id: DatabaseStorageManager.java,v 1.204 2008/12/04 11:23:20
nklasens Exp $
+ * @version $Id: DatabaseStorageManager.java,v 1.205 2008/12/09 15:43:34
michiel Exp $
*/
public class DatabaseStorageManager implements StorageManager {
@@ -2154,7 +2154,7 @@
if (size maxMax) {
mapping.setFixedSize(maxMax);
found = typeMappings.indexOf(mapping);
-log.warn(Type for field + field.getName() + : + typeName
+ ( + size + ) undefined. Setting size to + maxMax);
+log.warn(Type for field + field.getName() + : in +
field.getParent().getTableName() + + typeName + ( + size + ) undefined.
Setting size to + maxMax);
size = maxMax;
}
}
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] applications/taglib/config/components taglib.xml
Update of /var/cvs/applications/taglib/config/components In directory james.mmbase.org:/tmp/cvs-serv4191 Modified Files: taglib.xml Log Message: test case for mm:image See also: http://cvs.mmbase.org/viewcvs/applications/taglib/config/components Index: taglib.xml === RCS file: /var/cvs/applications/taglib/config/components/taglib.xml,v retrieving revision 1.7 retrieving revision 1.8 diff -u -b -r1.7 -r1.8 --- taglib.xml 19 Nov 2008 11:17:55 - 1.7 +++ taglib.xml 9 Dec 2008 15:47:46 - 1.8 @@ -59,7 +59,15 @@ /block block name=test_form mimetype=text/html classification=taglib.test -body jsp=test/form.jspx / +body jsp=test/form.jspx + param name=article type=String / +/body + /block + + block name=test_image mimetype=text/html + classification=taglib.test +body jsp=test/image.jspx +/body /block /component ___ Cvs mailing list Cvs@lists.mmbase.org http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] applications/taglib/blocks/test image.jspx imagejsp.jsp index.jspx
Update of /var/cvs/applications/taglib/blocks/test
In directory james.mmbase.org:/tmp/cvs-serv4284
Modified Files:
index.jspx
Added Files:
image.jspx imagejsp.jsp
Log Message:
test case for mm:image
See also: http://cvs.mmbase.org/viewcvs/applications/taglib/blocks/test
image.jspx is new
imagejsp.jsp is new
Index: index.jspx
===
RCS file: /var/cvs/applications/taglib/blocks/test/index.jspx,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- index.jspx 19 Nov 2008 11:18:15 - 1.6
+++ index.jspx 9 Dec 2008 15:48:26 - 1.7
@@ -15,6 +15,7 @@
limm:link page=test_listcontainersa href=${_}list
containers/a/mm:link/li
limm:link page=test_varsa href=${_}variables/a/mm:link/li
limm:link page=test_forma href=${_}mm:form/a/mm:link/li
+limm:link page=test_imagea href=${_}mm:image/a/mm:link/li
/ol
/div
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] src/org/mmbase/module/builders AbstractServletBuilder.java
Update of /var/cvs/src/org/mmbase/module/builders
In directory james.mmbase.org:/tmp/cvs-serv4451
Modified Files:
AbstractServletBuilder.java
Log Message:
MMB-1750
See also: http://cvs.mmbase.org/viewcvs/src/org/mmbase/module/builders
See also: http://www.mmbase.org/jira/browse/MMB-1750
Index: AbstractServletBuilder.java
===
RCS file: /var/cvs/src/org/mmbase/module/builders/AbstractServletBuilder.java,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -b -r1.59 -r1.60
--- AbstractServletBuilder.java 15 Nov 2008 10:58:40 - 1.59
+++ AbstractServletBuilder.java 9 Dec 2008 15:56:31 - 1.60
@@ -30,7 +30,7 @@
*
*
* @author Michiel Meeuwissen
- * @version $Id: AbstractServletBuilder.java,v 1.59 2008/11/15 10:58:40
michiel Exp $
+ * @version $Id: AbstractServletBuilder.java,v 1.60 2008/12/09 15:56:31
michiel Exp $
* @since MMBase-1.6
*/
public abstract class AbstractServletBuilder extends MMObjectBuilder {
@@ -363,6 +363,7 @@
fileName = fileName.substring(backSlash + 1);
}
+
buf.append(urlEscaper.transform(legalizeFileName.matcher(fileName).replaceAll(_)));
return buf;
}
@@ -449,6 +450,7 @@
new
ParameterString(field,String.class), // The field to use as argument,
defaults to number unless 'argument' is specified.
new
ParameterString(context, String.class), // Path to the context root,
defaults to / (but can specify something relative).
new
ParameterString(argument, String.class), // Parameter to use for the
argument, overrides 'field'
+ new
ParameterString(disposition, String.class),
Parameter.REQUEST,
Parameter.CLOUD
},
@@ -517,6 +519,16 @@
}
servlet.append(argument);
+
+String disposition = (String) a.get(disposition);
+if (disposition != null) {
+String defaultDisposition =
node.getNodeManager().getProperty(Content-Disposition);
+if (! disposition.equals(defaultDisposition)) {
+servlet.append('/');
+servlet.append(disposition);
+addFileName = true;
+}
+}
if (addFileName) {
servlet.append('/');
getFileName(mmnode, servlet);
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] applications/resources/src/org/mmbase/servlet HandleServlet.java
Update of /var/cvs/applications/resources/src/org/mmbase/servlet
In directory james.mmbase.org:/tmp/cvs-serv4564
Modified Files:
HandleServlet.java
Log Message:
MMB-1750
See also:
http://cvs.mmbase.org/viewcvs/applications/resources/src/org/mmbase/servlet
See also: http://www.mmbase.org/jira/browse/MMB-1750
Index: HandleServlet.java
===
RCS file:
/var/cvs/applications/resources/src/org/mmbase/servlet/HandleServlet.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- HandleServlet.java 26 Sep 2008 10:12:26 - 1.3
+++ HandleServlet.java 9 Dec 2008 15:59:54 - 1.4
@@ -28,7 +28,7 @@
* specialized servlets. The mime-type is always application/x-binary, forcing
the browser to
* download.
*
- * @version $Id: HandleServlet.java,v 1.3 2008/09/26 10:12:26 michiel Exp $
+ * @version $Id: HandleServlet.java,v 1.4 2008/12/09 15:59:54 michiel Exp $
* @author Michiel Meeuwissen
* @since MMBase-1.6
* @see ImageServlet
@@ -43,7 +43,7 @@
private static CacheInteger, Integer jpegSizes = null;
-protected Map getAssociations() {
+protected MapString, Integer getAssociations() {
Map a = super.getAssociations();
// Can do the following:
a.put(attachments, 0);
@@ -150,13 +150,17 @@
*/
protected String getContentDisposition(QueryParts query, Node node, String
def) {
String fileNamePart = query.getFileName();
-if(fileNamePart != null fileNamePart.startsWith(/inline/)) {
+if(fileNamePart != null) {
+if (fileNamePart.startsWith(/inline/)) {
return inline;
-} else {
+}
+if (fileNamePart.startsWith(/attachment/)) {
+return attachment;
+}
+}
String cd =
node.getNodeManager().getProperty(Content-Disposition);
return cd == null ? def : cd;
}
-}
/**
@@ -209,6 +213,10 @@
}
+protected long getSize(NodeManager manager, Node node) {
+return node.getSize(handle);
+}
+
/**
* Serves a node with a byte[] handle field as an attachment.
*/
@@ -262,11 +270,18 @@
l = byteArray.length;
jpegSizes.put(node.getNumber(), l);
bytes = new ByteArrayInputStream(byteArray);
+res.setHeader(X-MMBase-IECompatibleJpeg, This image was
filtered, because Microsoft Internet Explorer might crash otherwise);
} else {
+int s = (int) getSize(manager, node);
+if (s != l) {
bytes = new
IECompatibleJpegInputStream(node.getInputStreamValue(handle));
+res.setHeader(X-MMBase-IECompatibleJpeg, This image was
filtered, because Microsoft Internet Explorer might crash otherwise ( + (s -
l) + bytes thrown away));
+} else {
+bytes = node.getInputStreamValue(handle);
+}
+
}
jpegLength = l;
-res.setHeader(X-MMBase-IECompatibleJpeg, This image was
filtered, because Microsoft Internet Explorer might crash otherwise);
} else {
bytes = node.getInputStreamValue(handle);
}
@@ -278,14 +293,11 @@
setCacheControl(res, node);
if (jpegLength == -1) {
-int size = -1;
-if (manager.hasField(size)) {
-size = node.getIntValue(size);
-} else if (manager.hasField(filesize)) {
-size = node.getIntValue(filesize);
-}
+int size = (int) getSize(manager, node);
if (size = 0) {
res.setContentLength(size);
+} else {
+log.warn(Size of handles not stored in + manager);
}
log.debug(Serving node + node.getNumber() + with bytes +
size);
} else {
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] src/org/mmbase/servlet HandleServlet.java
Update of /var/cvs/src/org/mmbase/servlet
In directory james.mmbase.org:/tmp/cvs-serv4653
Modified Files:
Tag: MMBase-1_8
HandleServlet.java
Log Message:
MMB-1750
See also: http://cvs.mmbase.org/viewcvs/src/org/mmbase/servlet
See also: http://www.mmbase.org/jira/browse/MMB-1750
Index: HandleServlet.java
===
RCS file: /var/cvs/src/org/mmbase/servlet/Attic/HandleServlet.java,v
retrieving revision 1.29.2.2
retrieving revision 1.29.2.3
diff -u -b -r1.29.2.2 -r1.29.2.3
--- HandleServlet.java 25 Nov 2008 09:01:06 - 1.29.2.2
+++ HandleServlet.java 9 Dec 2008 16:02:22 - 1.29.2.3
@@ -27,7 +27,7 @@
* specialized servlets. The mime-type is always application/x-binary, forcing
the browser to
* download.
*
- * @version $Id: HandleServlet.java,v 1.29.2.2 2008/11/25 09:01:06 sdeboer Exp
$
+ * @version $Id: HandleServlet.java,v 1.29.2.3 2008/12/09 16:02:22 michiel Exp
$
* @author Michiel Meeuwissen
* @since MMBase-1.6
* @see ImageServlet
@@ -131,17 +131,21 @@
}
/**
- [EMAIL PROTECTED] MMBase-1.8.8
+ [EMAIL PROTECTED] MMBase-1.8.7
*/
protected String getContentDisposition(QueryParts query, Node node, String
def) {
String fileNamePart = query.getFileName();
-if(fileNamePart != null fileNamePart.startsWith(/inline/)) {
+if(fileNamePart != null) {
+if (fileNamePart.startsWith(/inline/)) {
return inline;
-} else {
+}
+if (fileNamePart.startsWith(/attachment/)) {
+return attachment;
+}
+}
String cd =
node.getNodeManager().getProperty(Content-Disposition);
return cd == null ? def : cd;
}
-}
/**
* Sets the content disposition header.
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] src/org/mmbase/module/builders AbstractServletBuilder.java
Update of /var/cvs/src/org/mmbase/module/builders
In directory james.mmbase.org:/tmp/cvs-serv4782
Modified Files:
Tag: MMBase-1_8
AbstractServletBuilder.java
Log Message:
MMB-1750
See also: http://cvs.mmbase.org/viewcvs/src/org/mmbase/module/builders
See also: http://www.mmbase.org/jira/browse/MMB-1750
Index: AbstractServletBuilder.java
===
RCS file: /var/cvs/src/org/mmbase/module/builders/AbstractServletBuilder.java,v
retrieving revision 1.42.2.6
retrieving revision 1.42.2.7
diff -u -b -r1.42.2.6 -r1.42.2.7
--- AbstractServletBuilder.java 15 Nov 2008 11:00:45 - 1.42.2.6
+++ AbstractServletBuilder.java 9 Dec 2008 16:05:19 - 1.42.2.7
@@ -30,7 +30,7 @@
*
*
* @author Michiel Meeuwissen
- * @version $Id: AbstractServletBuilder.java,v 1.42.2.6 2008/11/15 11:00:45
michiel Exp $
+ * @version $Id: AbstractServletBuilder.java,v 1.42.2.7 2008/12/09 16:05:19
michiel Exp $
* @since MMBase-1.6
*/
public abstract class AbstractServletBuilder extends MMObjectBuilder {
@@ -440,6 +440,7 @@
new Parameter(field,
String.class), // The field to use as argument, defaults to number unless
'argument' is specified.
new Parameter(context,
String.class), // Path to the context root, defaults to / (but can specify
something relative).
new Parameter(argument,
String.class), // Parameter to use for the argument, overrides 'field'
+ new Parameter(disposition,
String.class),
Parameter.REQUEST,
Parameter.CLOUD
},
@@ -497,14 +498,23 @@
if (usesBridgeServlet session != null) {
servlet.append(session= + session + +);
}
+servlet.append(argument);
-if (! addFileName) {
-return servlet.append(argument).toString();
-} else {
-servlet.append(argument).append('/');
+String disposition = (String) a.get(disposition);
+if (disposition != null) {
+String defaultDisposition =
node.getNodeManager().getProperty(Content-Disposition);
+if (! disposition.equals(defaultDisposition)) {
+servlet.append('/');
+servlet.append(disposition);
+addFileName = true;
+}
+}
+
+if (addFileName) {
+servlet.append('/');
getFileName(mmnode, servlet);
-return servlet.toString();
}
+return servlet.toString();
}
public Object getFunctionValue(Parameters a) {
___
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 ImageTag.java
Update of /var/cvs/applications/taglib/src/org/mmbase/bridge/jsp/taglib
In directory james.mmbase.org:/tmp/cvs-serv4969
Modified Files:
Tag: MMBase-1_8
mmbase-taglib.xml ImageTag.java
Log Message:
MMB-1750
See also:
http://cvs.mmbase.org/viewcvs/applications/taglib/src/org/mmbase/bridge/jsp/taglib
See also: http://www.mmbase.org/jira/browse/MMB-1750
Index: mmbase-taglib.xml
===
RCS file:
/var/cvs/applications/taglib/src/org/mmbase/bridge/jsp/taglib/mmbase-taglib.xml,v
retrieving revision 1.374.2.34
retrieving revision 1.374.2.35
diff -u -b -r1.374.2.34 -r1.374.2.35
--- mmbase-taglib.xml 9 Dec 2008 09:35:58 - 1.374.2.34
+++ mmbase-taglib.xml 9 Dec 2008 16:10:18 - 1.374.2.35
@@ -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.374.2.34 2008/12/09 09:35:58 bert Exp $
+version: $Id: mmbase-taglib.xml,v 1.374.2.35 2008/12/09 16:10:18 michiel Exp $
--
taglib author=MMBase community
@@ -4572,6 +4572,26 @@
/possiblevalue
/attribute
attribute
+ namedisposition/name
+ requiredfalse/required
+ rtexprvaluetrue/rtexprvalue
+ refercontexttrue/refercontext
+ info
+p
+/p
+ /info
+
+ sinceMMBase-1.9.1/since
+ possiblevalue
+valueattachment/value
+infoThe image will be served out as an attachment./info
+ /possiblevalue
+ possiblevalue
+valueinline/value
+infoThe image will be served out inline./info
+ /possiblevalue
+/attribute
+attribute
nameelement/name
requiredfalse/required
rtexprvaluetrue/rtexprvalue
@@ -4732,6 +4752,13 @@
see tag=node attribute=element /
sinceMMBase-1.7.4/since
/attribute
+attribute
+ namedisposition/name
+ requiredfalse/required
+ rtexprvaluetrue/rtexprvalue
+ refercontexttrue/refercontext
+ see tag=image attribute=disposition /
+/attribute
info
p
Returns an URL to the attachment servlet. This is a NodeReferrer
Index: ImageTag.java
===
RCS file:
/var/cvs/applications/taglib/src/org/mmbase/bridge/jsp/taglib/ImageTag.java,v
retrieving revision 1.73.2.2
retrieving revision 1.73.2.3
diff -u -b -r1.73.2.2 -r1.73.2.3
--- ImageTag.java 24 Jul 2007 10:00:25 - 1.73.2.2
+++ ImageTag.java 9 Dec 2008 16:10:18 - 1.73.2.3
@@ -30,7 +30,7 @@
* sensitive for future changes in how the image servlet works.
*
* @author Michiel Meeuwissen
- * @version $Id: ImageTag.java,v 1.73.2.2 2007/07/24 10:00:25 michiel Exp $
+ * @version $Id: ImageTag.java,v 1.73.2.3 2008/12/09 16:10:18 michiel Exp $
*/
public class ImageTag extends FieldTag {
@@ -84,6 +84,8 @@
private Attribute altAttribute = Attribute.NULL;
+private Attribute disposition = Attribute.NULL;
+
private Object prevDimension;
@@ -145,6 +147,13 @@
altAttribute = getAttribute(a);
}
+/**
+ * @since MMBase-1.9.1
+ */
+public void setDisposition(String d) throws JspTagException {
+disposition = getAttribute(d);
+}
+
private int getMode() throws JspTagException {
String m = mode.getString(this).toLowerCase();
if (m.equals() || m.equals(url)) {
@@ -275,11 +284,15 @@
return servletPathFunction;
}
-public Parameters getServletArguments(String servletArgument, Function
servletPathFunction) {
+public Parameters getServletArguments(String servletArgument, Function
servletPathFunction) throws JspTagException {
HttpServletRequest req = (HttpServletRequest) pageContext.getRequest();
Parameters args = servletPathFunction.createParameters();
args.set(context, makeRelative() ? UriParser.makeRelative(new
File(req.getServletPath()).getParent(), /) : req.getContextPath())
.set(argument, servletArgument);
+String d = disposition.getString(this);
+if (! .equals(d)) {
+args.set(disposition, d);
+}
return args;
}
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] Delivery Status Notification
Look inside to find more about these wonderful things! never do; they're too busy. ~Kenneth Grahamestrafed in behind the defence to connect with a freekick previously nine.Arsenals confidence, and they continued to press the ___ Cvs mailing list Cvs@lists.mmbase.org http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] src/org/mmbase/servlet ImageServlet.java
Update of /var/cvs/src/org/mmbase/servlet
In directory james.mmbase.org:/tmp/cvs-serv5508
Modified Files:
Tag: MMBase-1_8
ImageServlet.java
Log Message:
MMB-1750
See also: http://cvs.mmbase.org/viewcvs/src/org/mmbase/servlet
See also: http://www.mmbase.org/jira/browse/MMB-1750
Index: ImageServlet.java
===
RCS file: /var/cvs/src/org/mmbase/servlet/Attic/ImageServlet.java,v
retrieving revision 1.28.2.1
retrieving revision 1.28.2.2
diff -u -b -r1.28.2.1 -r1.28.2.2
--- ImageServlet.java 7 Aug 2007 08:10:31 - 1.28.2.1
+++ ImageServlet.java 9 Dec 2008 16:36:19 - 1.28.2.2
@@ -29,7 +29,7 @@
* images), which you have to create yourself before calling this servlet. The
cache() function of
* Images can be used for this. An URL can be gotten with cachepath().
*
- * @version $Id: ImageServlet.java,v 1.28.2.1 2007/08/07 08:10:31 michiel Exp $
+ * @version $Id: ImageServlet.java,v 1.28.2.2 2008/12/09 16:36:19 michiel Exp $
* @author Michiel Meeuwissen
* @since MMBase-1.6
* @seeorg.mmbase.module.builders.AbstractImages
@@ -101,8 +101,8 @@
} else { // 'images', but as you see this is not explicit, so you can
also name your image builder otherwise.
originalNode = node;
}
-
-query.getResponse().setHeader(Content-Disposition, inline;
filename=\ + getFileName(node, originalNode, mmbase-image)+ \);
+String disposition = getContentDisposition(query, node, inline);
+query.getResponse().setHeader(Content-Disposition, disposition + ;
filename=\ + getFileName(node, originalNode, mmbase-image)+ \);
return true;
}
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] Your order
___ Cvs mailing list Cvs@lists.mmbase.org http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] Delivery Status Notification (Failure)
___ Cvs mailing list Cvs@lists.mmbase.org http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] Delivery Status Notification (Failure)
___ Cvs mailing list Cvs@lists.mmbase.org http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] contributions/CMSContainer/cmsc/utilities/src/java/com/finalist/cmsc/util ComparableComparator.java ComparisonUtil.java
Update of /var/cvs/contributions/CMSContainer/cmsc/utilities/src/java/com/finalist/cmsc/util In directory james.mmbase.org:/tmp/cvs-serv14676/cmsc/utilities/src/java/com/finalist/cmsc/util Added Files: ComparableComparator.java Removed Files: ComparisonUtil.java Log Message: CMSC-1126 using Assets in content See also: http://cvs.mmbase.org/viewcvs/contributions/CMSContainer/cmsc/utilities/src/java/com/finalist/cmsc/util See also: http://www.mmbase.org/jira/browse/CMSC-1126 ComparableComparator.java is new ___ Cvs mailing list Cvs@lists.mmbase.org http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] contributions/CMSContainer_Modules/community/src/java/com/finalist/cmsc/community/forms UserAddAction.java
Update of
/var/cvs/contributions/CMSContainer_Modules/community/src/java/com/finalist/cmsc/community/forms
In directory james.mmbase.org:/tmp/cvs-serv14724
Modified Files:
UserAddAction.java
Log Message:
CMSC-949 Blocking users: user status enhancements it is set 'active' when
creating a new user by hand.
See also:
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer_Modules/community/src/java/com/finalist/cmsc/community/forms
See also: http://www.mmbase.org/jira/browse/CMSC-949
Index: UserAddAction.java
===
RCS file:
/var/cvs/contributions/CMSContainer_Modules/community/src/java/com/finalist/cmsc/community/forms/UserAddAction.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -b -r1.13 -r1.14
--- UserAddAction.java 6 Nov 2008 07:04:21 - 1.13
+++ UserAddAction.java 10 Dec 2008 01:59:42 - 1.14
@@ -150,7 +150,7 @@
if (authentication.getId() != null) {
authId = authentication.getId();
Person person = ps.createPerson(userForm.getFirstName(),
userForm.getPrefix(), userForm.getLastName(),
-
authentication.getId(),RegisterStatus.UNCONFIRMED.getName(),new Date());
+
authentication.getId(),RegisterStatus.ACTIVE.getName(),new Date());
person.setEmail(userForm.getEmail());
ps.updatePerson(person);
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] contributions/CMSContainer_Modules/community/src/java/com/finalist/cmsc/services/community/person RegisterStatus.java
Update of
/var/cvs/contributions/CMSContainer_Modules/community/src/java/com/finalist/cmsc/services/community/person
In directory
james.mmbase.org:/tmp/cvs-serv16630/CMSContainer_Modules/community/src/java/com/finalist/cmsc/services/community/person
Modified Files:
RegisterStatus.java
Log Message:
CMSC-949 Blocking users: user status enhancements
See also:
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer_Modules/community/src/java/com/finalist/cmsc/services/community/person
See also: http://www.mmbase.org/jira/browse/CMSC-949
Index: RegisterStatus.java
===
RCS file:
/var/cvs/contributions/CMSContainer_Modules/community/src/java/com/finalist/cmsc/services/community/person/RegisterStatus.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- RegisterStatus.java 4 Dec 2008 09:34:32 - 1.2
+++ RegisterStatus.java 10 Dec 2008 02:32:34 - 1.3
@@ -1,9 +1,9 @@
package com.finalist.cmsc.services.community.person;
public enum RegisterStatus {
- ACTIVE(active),
- UNCONFIRMED(unconfirmed),
- BLOCKED(blocked);
+ ACTIVE(Active),
+ UNCONFIRMED(Unconfirmed),
+ BLOCKED(Blocked);
private String name;
private RegisterStatus(final String name) {
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/services/impl NewsletterPublicationServiceImpl.java
Update of
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/services/impl
In directory
james.mmbase.org:/tmp/cvs-serv16630/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/services/impl
Modified Files:
NewsletterPublicationServiceImpl.java
Log Message:
CMSC-949 Blocking users: user status enhancements
See also:
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/services/impl
See also: http://www.mmbase.org/jira/browse/CMSC-949
Index: NewsletterPublicationServiceImpl.java
===
RCS file:
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/services/impl/NewsletterPublicationServiceImpl.java,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -b -r1.31 -r1.32
--- NewsletterPublicationServiceImpl.java 5 Dec 2008 08:59:55 -
1.31
+++ NewsletterPublicationServiceImpl.java 10 Dec 2008 02:32:35 -
1.32
@@ -14,7 +14,6 @@
import com.finalist.cmsc.services.community.person.Person;
import com.finalist.cmsc.services.community.person.RegisterStatus;
import com.finalist.newsletter.NewsletterSendFailException;
-import com.finalist.newsletter.cao.NewsLetterStatisticCAO;
import com.finalist.newsletter.cao.NewsletterPublicationCAO;
import com.finalist.newsletter.cao.NewsletterSubscriptionCAO;
import com.finalist.newsletter.domain.Publication;
@@ -89,7 +88,7 @@
for (Subscription subscription : subscriptions) {
SetTerm terms = subscriptionCAO.getTerms(subscription.getId());
Person subscripber =
CommunityModuleAdapter.getUserById(subscription.getSubscriberId());
- if(subscripber == null ||
RegisterStatus.BLOCKED.getName().equals(subscripber.getActive())) {
+ if(subscripber == null ||
RegisterStatus.BLOCKED.getName().equalsIgnoreCase(subscripber.getActive())) {
continue;
}
subscription.setEmail(subscripber.getEmail());
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] contributions/CMSContainer_Modules/community/src/java/com/finalist/cmsc/services/community/person RegisterStatus.java
Update of
/var/cvs/contributions/CMSContainer_Modules/community/src/java/com/finalist/cmsc/services/community/person
In directory
james.mmbase.org:/tmp/cvs-serv16860/CMSContainer_Modules/community/src/java/com/finalist/cmsc/services/community/person
Modified Files:
Tag: b1_5
RegisterStatus.java
Log Message:
CMSC-949 Blocking users: user status enhancements
See also:
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer_Modules/community/src/java/com/finalist/cmsc/services/community/person
See also: http://www.mmbase.org/jira/browse/CMSC-949
Index: RegisterStatus.java
===
RCS file:
/var/cvs/contributions/CMSContainer_Modules/community/src/java/com/finalist/cmsc/services/community/person/RegisterStatus.java,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -u -b -r1.1.2.2 -r1.1.2.3
--- RegisterStatus.java 4 Dec 2008 09:34:50 - 1.1.2.2
+++ RegisterStatus.java 10 Dec 2008 02:35:25 - 1.1.2.3
@@ -1,9 +1,9 @@
package com.finalist.cmsc.services.community.person;
public enum RegisterStatus {
- ACTIVE(active),
- UNCONFIRMED(unconfirmed),
- BLOCKED(blocked);
+ ACTIVE(Active),
+ UNCONFIRMED(Unconfirmed),
+ BLOCKED(Blocked);
private String name;
private RegisterStatus(final String name) {
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/services/impl NewsletterPublicationServiceImpl.java
Update of
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/services/impl
In directory
james.mmbase.org:/tmp/cvs-serv16860/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/services/impl
Modified Files:
Tag: b1_5
NewsletterPublicationServiceImpl.java
Log Message:
CMSC-949 Blocking users: user status enhancements
See also:
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/services/impl
See also: http://www.mmbase.org/jira/browse/CMSC-949
Index: NewsletterPublicationServiceImpl.java
===
RCS file:
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/services/impl/NewsletterPublicationServiceImpl.java,v
retrieving revision 1.24.2.4
retrieving revision 1.24.2.5
diff -u -b -r1.24.2.4 -r1.24.2.5
--- NewsletterPublicationServiceImpl.java 5 Dec 2008 09:00:15 -
1.24.2.4
+++ NewsletterPublicationServiceImpl.java 10 Dec 2008 02:35:25 -
1.24.2.5
@@ -14,7 +14,6 @@
import com.finalist.cmsc.services.community.person.Person;
import com.finalist.cmsc.services.community.person.RegisterStatus;
import com.finalist.newsletter.NewsletterSendFailException;
-import com.finalist.newsletter.cao.NewsLetterStatisticCAO;
import com.finalist.newsletter.cao.NewsletterPublicationCAO;
import com.finalist.newsletter.cao.NewsletterSubscriptionCAO;
import com.finalist.newsletter.domain.Publication;
@@ -89,7 +88,7 @@
for (Subscription subscription : subscriptions) {
SetTerm terms = subscriptionCAO.getTerms(subscription.getId());
Person subscripber =
CommunityModuleAdapter.getUserById(subscription.getSubscriberId());
- if(subscripber == null ||
RegisterStatus.BLOCKED.getName().equals(subscripber.getActive())) {
+ if(subscripber == null ||
RegisterStatus.BLOCKED.getName().equalsIgnoreCase(subscripber.getActive())) {
continue;
}
subscription.setEmail(subscripber.getEmail());
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/util ComparisonUtil.java
Update of /var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/util In directory james.mmbase.org:/tmp/cvs-serv23281/portlets-newsletter/src/java/com/finalist/newsletter/util Added Files: ComparisonUtil.java Log Message: CMSC-1126 using Assets in content(Move the ComparisonUtil.java back from Container) See also: http://cvs.mmbase.org/viewcvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/util See also: http://www.mmbase.org/jira/browse/CMSC-1126 ___ Cvs mailing list Cvs@lists.mmbase.org http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/forms SubscriptioManagementAction.java
Update of /var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/forms In directory james.mmbase.org:/tmp/cvs-serv23305/portlets-newsletter/src/java/com/finalist/newsletter/forms Modified Files: SubscriptioManagementAction.java Log Message: CMSC-1126 using Assets in content(Move the ComparisonUtil.java back from Container) See also: http://cvs.mmbase.org/viewcvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/forms See also: http://www.mmbase.org/jira/browse/CMSC-1126 Index: SubscriptioManagementAction.java === RCS file: /var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/forms/SubscriptioManagementAction.java,v retrieving revision 1.16 retrieving revision 1.17 diff -u -b -r1.16 -r1.17 --- SubscriptioManagementAction.java3 Dec 2008 05:34:39 - 1.16 +++ SubscriptioManagementAction.java10 Dec 2008 04:52:58 - 1.17 @@ -2,7 +2,6 @@ import java.util.ArrayList; import java.util.Collections; -import java.util.Comparator; import java.util.HashMap; import java.util.HashSet; import java.util.LinkedHashMap; @@ -23,13 +22,13 @@ import com.finalist.cmsc.paging.PagingStatusHolder; import com.finalist.cmsc.paging.PagingUtils; -import com.finalist.cmsc.util.ComparisonUtil; import com.finalist.cmsc.services.community.person.PersonService; import com.finalist.newsletter.domain.Newsletter; import com.finalist.newsletter.services.NewsletterPublicationService; import com.finalist.newsletter.services.NewsletterService; import com.finalist.newsletter.services.NewsletterSubscriptionServices; import com.finalist.newsletter.services.SubscriptionHibernateService; +import com.finalist.newsletter.util.ComparisonUtil; /** ___ Cvs mailing list Cvs@lists.mmbase.org http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/util NewsletterBounceUtil.java
Update of
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/util
In directory
james.mmbase.org:/tmp/cvs-serv23305/portlets-newsletter/src/java/com/finalist/newsletter/util
Modified Files:
NewsletterBounceUtil.java
Log Message:
CMSC-1126 using Assets in content(Move the ComparisonUtil.java back from
Container)
See also:
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/util
See also: http://www.mmbase.org/jira/browse/CMSC-1126
Index: NewsletterBounceUtil.java
===
RCS file:
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/util/NewsletterBounceUtil.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- NewsletterBounceUtil.java 3 Dec 2008 05:34:40 - 1.6
+++ NewsletterBounceUtil.java 10 Dec 2008 04:52:58 - 1.7
@@ -18,7 +18,6 @@
import com.finalist.newsletter.domain.NewsletterBounce;
import com.finalist.newsletter.services.CommunityModuleAdapter;
-import com.finalist.cmsc.util.ComparisonUtil;
public class NewsletterBounceUtil {
private static Log log = LogFactory.getLog(NewsletterBounceUtil.class);
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] Your order
___ Cvs mailing list Cvs@lists.mmbase.org http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] contributions/CMSContainer_Modules/dataconversion/src/java/com/finalist/cmsc/dataconversion/service NodeService.java
Update of
/var/cvs/contributions/CMSContainer_Modules/dataconversion/src/java/com/finalist/cmsc/dataconversion/service
In directory james.mmbase.org:/tmp/cvs-serv27312/service
Modified Files:
NodeService.java
Log Message:
CMSC-1166, KNMI migration to the CMS Container,improve reverse
See also:
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer_Modules/dataconversion/src/java/com/finalist/cmsc/dataconversion/service
See also: http://www.mmbase.org/jira/browse/CMSC-1166
Index: NodeService.java
===
RCS file:
/var/cvs/contributions/CMSContainer_Modules/dataconversion/src/java/com/finalist/cmsc/dataconversion/service/NodeService.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- NodeService.java28 Nov 2008 08:07:42 - 1.6
+++ NodeService.java10 Dec 2008 07:17:55 - 1.7
@@ -64,7 +64,8 @@
while (properties.hasNext()) {
Map.EntryString,Object entry= properties.next();
if(!entry.getKey().toString().equals(lastmodifieddate)) {
- node.setObjectValue(entry.getKey().toString(),
entry.getValue()) ;
+ node.setValueWithoutProcess(entry.getKey().toString(),
entry.getValue());
+ //node.setObjectValue(entry.getKey().toString(),
entry.getValue()) ;
}
else {
modifyDate = entry.getValue();
@@ -95,7 +96,7 @@
Node desNode = cloud.getNode(dnumber.intValue());
type = data.getDestinationRelationType();
Relation relate;
-if (true.equals(data.getReverse())) {
+if (destinationtype.equals(data.getReverse())) {
relate = RelationUtil.createRelation(desNode, sourceNode,
data.getDestinationRelationType());
}else{
relate = RelationUtil.createRelation(sourceNode, desNode,
data.getDestinationRelationType());
@@ -117,7 +118,8 @@
relate.setObjectValue(name, intro) ;
}
else {
-relate.setObjectValue(entry.getKey().toString(),
entry.getValue()) ;
+
relate.setValueWithoutProcess(entry.getKey().toString(), entry.getValue());
+ // relate.setObjectValue(entry.getKey().toString(),
entry.getValue()) ;
}
}
relate.commit();
@@ -168,7 +170,7 @@
Node desNode = cloud.getNode(dnumber.intValue());
type = reldata.getDestinationRelationType();
Relation relate;
- if (true.equals(reldata.getReverse())) {
+ if (destinationtype.equals(reldata.getReverse())) {
relate = RelationUtil.createRelation(desNode, sourceNode,
type);
} else {
relate = RelationUtil.createRelation(sourceNode, desNode,
type);
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] contributions/CMSContainer_Modules/dataconversion/src/java/com/finalist/cmsc/dataconversion/dataaccess DataAccessor.java
Update of
/var/cvs/contributions/CMSContainer_Modules/dataconversion/src/java/com/finalist/cmsc/dataconversion/dataaccess
In directory james.mmbase.org:/tmp/cvs-serv27312/dataaccess
Modified Files:
DataAccessor.java
Log Message:
CMSC-1166, KNMI migration to the CMS Container,improve reverse
See also:
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer_Modules/dataconversion/src/java/com/finalist/cmsc/dataconversion/dataaccess
See also: http://www.mmbase.org/jira/browse/CMSC-1166
Index: DataAccessor.java
===
RCS file:
/var/cvs/contributions/CMSContainer_Modules/dataconversion/src/java/com/finalist/cmsc/dataconversion/dataaccess/DataAccessor.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- DataAccessor.java 2 Dec 2008 10:37:03 - 1.7
+++ DataAccessor.java 10 Dec 2008 07:17:55 - 1.8
@@ -276,8 +276,15 @@
try {
connection = dataSource.getConnection();
statement = connection.createStatement();
- sql = select * from + + relData.getSourceRelationType() +
+ where snumber in (select number from
- + relData.getRelateTable() + ) and dnumber in (select number
from + relData.getTableName() + );
+ if (sourcetype.equals(relData.getReverse())) {
+sql = select * from + + relData.getSourceRelationType() +
+ + where snumber in (select number from +
relData.getTableName()
+ + ) and dnumber in (select number from +
relData.getRelateTable()+ );
+ }else{
+sql = select * from + + relData.getSourceRelationType() +
++ where snumber in (select number from +
relData.getRelateTable()
++ ) and dnumber in (select number from + relData.getTableName()
+ );
+ }
rs = statement.executeQuery(sql);
while (rs.next()) {
sv = rs.getInt(snumber);
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] Delivery Status Notification (Failure)
You're welcome to our store! added tax (VAT) on the price of milk. The Namibian Dairycame third with 6 table points, Italy fourth with 4 Scientists at NASA say that new satellite images ofWashington to mark the fourth anniversary of the start ___ Cvs mailing list Cvs@lists.mmbase.org http://lists.mmbase.org/mailman/listinfo/cvs
