[MMBASE CVS] tests/config/builders/tests datatypes.xml mustbechanged.xml
Update of /var/cvs/tests/config/builders/tests In directory james.mmbase.org:/tmp/cvs-serv13536/tests Modified Files: datatypes.xml mustbechanged.xml Log Message: defined length of a few string fields to avoid the warning in the log See also: http://cvs.mmbase.org/viewcvs/tests/config/builders/tests Index: datatypes.xml === RCS file: /var/cvs/tests/config/builders/tests/datatypes.xml,v retrieving revision 1.34 retrieving revision 1.35 diff -u -b -r1.34 -r1.35 --- datatypes.xml 1 Dec 2008 17:32:08 - 1.34 +++ datatypes.xml 2 Dec 2008 08:05:39 - 1.35 @@ -58,7 +58,9 @@ descriptions descriptionExample of String pattern./description /descriptions - datatype base=emailaddress / + datatype base=emailaddress + maxLength value=255 / + /datatype /field field name=stringrange descriptions @@ -403,6 +405,7 @@ /field field name=nonode_typedef datatype base=eline xmlns=http://www.mmbase.org/xmlns/datatypes; + maxLength value=255 / enumeration query path=typedef element= xmlns=http://www.mmbase.org/xmlns/searchquery; distinct / @@ -439,7 +442,9 @@ /field field name=lastmodifier - datatype base=lastmodifier xmlns=http://www.mmbase.org/xmlns/datatypes; / + datatype base=lastmodifier xmlns=http://www.mmbase.org/xmlns/datatypes; + maxLength value=255 / + /datatype /field field name=age state=virtual Index: mustbechanged.xml === RCS file: /var/cvs/tests/config/builders/tests/mustbechanged.xml,v retrieving revision 1.1 retrieving revision 1.2 diff -u -b -r1.1 -r1.2 --- mustbechanged.xml 18 Nov 2008 23:30:39 - 1.1 +++ mustbechanged.xml 2 Dec 2008 08:05:39 - 1.2 @@ -17,10 +17,13 @@ fieldlist field name=string - datatype base=line xmlns=http://www.mmbase.org/xmlns/datatypes; / + datatype base=line xmlns=http://www.mmbase.org/xmlns/datatypes; + maxLength value=255 / + /datatype /field field name=mustbechanged1 type=virtual datatype base=line xmlns=http://www.mmbase.org/xmlns/datatypes; + maxLength value=255 / commitprocessor class name=org.mmbase.datatypes.processors.AssertChangedCommitProcessor / /commitprocessor @@ -28,6 +31,7 @@ /field field name=mustbechanged2 type=virtual datatype base=line xmlns=http://www.mmbase.org/xmlns/datatypes; + maxLength value=255 / commitprocessor class name=org.mmbase.datatypes.processors.AssertChangedCommitProcessor / /commitprocessor ___ Cvs mailing list Cvs@lists.mmbase.org http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] tests/config/builders/wiki createdby.field.xml lastmodifiedby.field.xml
Update of /var/cvs/tests/config/builders/wiki In directory james.mmbase.org:/tmp/cvs-serv13536/wiki Modified Files: createdby.field.xml lastmodifiedby.field.xml Log Message: defined length of a few string fields to avoid the warning in the log See also: http://cvs.mmbase.org/viewcvs/tests/config/builders/wiki Index: createdby.field.xml === RCS file: /var/cvs/tests/config/builders/wiki/createdby.field.xml,v retrieving revision 1.1 retrieving revision 1.2 diff -u -b -r1.1 -r1.2 --- createdby.field.xml 18 Nov 2008 12:58:16 - 1.1 +++ createdby.field.xml 2 Dec 2008 08:05:39 - 1.2 @@ -15,6 +15,7 @@ guiname xml:lang=nlAangemaakt door/guiname /gui editorpositionslist105/list/positions/editor - datatype base=created xmlns=http://www.mmbase.org/xmlns/datatypes; + datatype base=creator xmlns=http://www.mmbase.org/xmlns/datatypes; +maxLength value=255 / /datatype /field Index: lastmodifiedby.field.xml === RCS file: /var/cvs/tests/config/builders/wiki/lastmodifiedby.field.xml,v retrieving revision 1.1 retrieving revision 1.2 diff -u -b -r1.1 -r1.2 --- lastmodifiedby.field.xml18 Nov 2008 12:58:16 - 1.1 +++ lastmodifiedby.field.xml2 Dec 2008 08:05:39 - 1.2 @@ -16,5 +16,6 @@ /gui editorpositionslist106/list/positions/editor datatype base=lastmodifier xmlns=http://www.mmbase.org/xmlns/datatypes; +maxLength value=255 / /datatype /field ___ Cvs mailing list Cvs@lists.mmbase.org http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] tests/bridge/org/mmbase/bridge CloudContextTest.java
Update of /var/cvs/tests/bridge/org/mmbase/bridge
In directory james.mmbase.org:/tmp/cvs-serv13758/bridge/org/mmbase/bridge
Modified Files:
CloudContextTest.java
Log Message:
perhaps it is time that this issue that a RemoteCloud#getCloudContext does not
return the remote context is fixed
See also: http://cvs.mmbase.org/viewcvs/tests/bridge/org/mmbase/bridge
Index: CloudContextTest.java
===
RCS file: /var/cvs/tests/bridge/org/mmbase/bridge/CloudContextTest.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- CloudContextTest.java 30 Jul 2008 21:54:31 - 1.5
+++ CloudContextTest.java 2 Dec 2008 08:07:45 - 1.6
@@ -18,7 +18,7 @@
* Test class codeCloudContext/code from the bridge package.
*
* @author Jaco de Groot
- * @version $Id: CloudContextTest.java,v 1.5 2008/07/30 21:54:31 michiel Exp $
+ * @version $Id: CloudContextTest.java,v 1.6 2008/12/02 08:07:45 michiel Exp $
*/
public class CloudContextTest extends BridgeTest {
@@ -45,7 +45,7 @@
// temporary removed, because failing
-/// assertEquals(cloudContext.getUri(),
cloudContext.getCloud(mmbase).getCloudContext().getUri());
+assertEquals(cloudContext.getUri(),
cloudContext.getCloud(mmbase).getCloudContext().getUri());
}
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] contributions/CMSContainer_Modules/community/src/webapp/editors/community userlist_table.jspf
Update of
/var/cvs/contributions/CMSContainer_Modules/community/src/webapp/editors/community
In directory james.mmbase.org:/tmp/cvs-serv14781
Modified Files:
userlist_table.jspf
Log Message:
CMSC-949, Blocking users: user status enhancements,show useful state by jsp
See also:
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer_Modules/community/src/webapp/editors/community
See also: http://www.mmbase.org/jira/browse/CMSC-949
Index: userlist_table.jspf
===
RCS file:
/var/cvs/contributions/CMSContainer_Modules/community/src/webapp/editors/community/userlist_table.jspf,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- userlist_table.jspf 2 Dec 2008 08:18:01 - 1.7
+++ userlist_table.jspf 2 Dec 2008 08:46:16 - 1.8
@@ -34,10 +34,26 @@
/edit:ui-tcolumn
edit:ui-tcolumn titlekey=community.search.state
select
onchange=selectState('${pageContext.request.contextPath
}/editors/community/SearchConditionalUser.do?page=${page}sortby=${param.sortby}dir=${param.dir}authid=${person.authId}',this)
- option selected=selected
value=ACTIVE${person.active}/option
- option value=ACTIVEfmt:message
key=community.search.state.active/ /option
+ c:if test=${not empty person.active}
+ option selected=selected
value=${person.active}${person.active}/option
+ /c:if
+ c:if test=${empty person.active}
+ option selected=selected value=ACTIVEfmt:message
key=community.search.state.active//option
+ option value=UNCONFIRMEDfmt:message
key=community.search.state.unconfirmed/ /option
+ option value=BLOCKEDfmt:message
key=community.search.state.blocked//option
+ /c:if
+ c:if test=${person.active == 'ACTIVE'}
option value=UNCONFIRMEDfmt:message
key=community.search.state.unconfirmed/ /option
option value=BLOCKEDfmt:message
key=community.search.state.blocked//option
+ /c:if
+ c:if test=${person.active == 'UNCONFIRMED'}
+ option value=ACTIVEfmt:message
key=community.search.state.active/ /option
+ option value=BLOCKEDfmt:message
key=community.search.state.blocked//option
+ /c:if
+ c:if test=${person.active == 'BLOCKED'}
+ option value=ACTIVEfmt:message
key=community.search.state.active/ /option
+ option value=UNCONFIRMEDfmt:message
key=community.search.state.unconfirmed/ /option
+ /c:if
/select
/edit:ui-tcolumn
/edit:ui-table
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] applications/crontab/src/org/mmbase/applications/crontab CronEntry.java
Update of /var/cvs/applications/crontab/src/org/mmbase/applications/crontab
In directory
james.mmbase.org:/tmp/cvs-serv15399/src/org/mmbase/applications/crontab
Modified Files:
CronEntry.java
Log Message:
implemented 'isActive'. This means all jobs are always in the daemon, but only
when running it is decied whter that is needed
See also:
http://cvs.mmbase.org/viewcvs/applications/crontab/src/org/mmbase/applications/crontab
Index: CronEntry.java
===
RCS file:
/var/cvs/applications/crontab/src/org/mmbase/applications/crontab/CronEntry.java,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -b -r1.18 -r1.19
--- CronEntry.java 4 Aug 2008 13:36:28 - 1.18
+++ CronEntry.java 2 Dec 2008 09:10:36 - 1.19
@@ -20,7 +20,7 @@
*
* @author Kees Jongenburger
* @author Michiel Meeuwissen
- * @version $Id: CronEntry.java,v 1.18 2008/08/04 13:36:28 michiel Exp $
+ * @version $Id: CronEntry.java,v 1.19 2008/12/02 09:10:36 michiel Exp $
*/
public class CronEntry implements java.io.Serializable {
@@ -202,6 +202,12 @@
public boolean isAlive() {
return isAlive(0);
}
+
+public boolean isActive() {
+String machineName = MMBaseContext.getMachineName();
+return servers.matcher(machineName).matches();
+}
+
public boolean isMustBeOne() {
return type == Type.MUSTBEONE || type == Type.BALANCE_MUSTBEONE;
}
@@ -325,11 +331,13 @@
return maxDuration;
}
+
+
boolean mustRun(Date date) {
String machineName = MMBaseContext.getMachineName();
-if (! servers.matcher(machineName).matches()) {
-log.debug(This cron entry + this + must not run because this
machine + machineName + does not match + servers);
+if (! isActive()) {
+log.debug(This cron entry + this + must not run because it is
not active on this machine + machineName);
return false;
} else {
log.debug( + machineName + matched + servers + so must
run);
___
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 NodeCronEntry.java
Update of
/var/cvs/applications/crontab/src/org/mmbase/applications/crontab/builders
In directory
james.mmbase.org:/tmp/cvs-serv15399/src/org/mmbase/applications/crontab/builders
Modified Files:
CronJobs.java NodeCronEntry.java
Log Message:
implemented 'isActive'. This means all jobs are always in the daemon, but only
when running it is decied whter that is needed
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.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- CronJobs.java 2 Dec 2008 08:42:59 - 1.10
+++ CronJobs.java 2 Dec 2008 09:10:36 - 1.11
@@ -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.10 2008/12/02 08:42:59 michiel Exp $
+ * @version $Id: CronJobs.java,v 1.11 2008/12/02 09:10:36 michiel Exp $
*/
public class CronJobs extends MMObjectBuilder {
@@ -31,6 +31,8 @@
*/
@Override public boolean init() {
boolean res = super.init();
+org.mmbase.util.ThreadPools.jobsExecutor.execute(new Runnable() {
+public void run() {
CronDaemon cronDaemon = CronDaemon.getInstance();
NodeIterator nodeIterator =
getCloud().getNodeManager(getTableName()).getList(null, null,
null).nodeIterator();
while (nodeIterator.hasNext()) {
@@ -38,33 +40,14 @@
CronEntry entry = null;
try {
entry = new NodeCronEntry(node);
-NodeList servers = node.getRelatedNodes(mmservers);
-if (servers.size() 0) {
-String machineName = MMBaseContext.getMachineName();
-boolean found = false;
-for (int i=0; i servers.size(); i++) {
-Node server = servers.getNode(i);
-String name = server.getStringValue(name);
-if (name != null
name.equalsIgnoreCase(machineName)) {
-log.service(Adding cron entry [ + entry + ] for
server [ + name + ]);
-cronDaemon.add(entry);
-found = true;
-break;
-} else {
-log.service(Ignoring related server [ + name +
], does not equal servername [ + machineName + ]);
-}
-}
-if (!found) {
-log.service(NOT Adding cron entry [ + entry + ],
not related to server [ + machineName + ]);
-}
-} else {
log.service(Adding cron entry [ + entry + ]);
cronDaemon.add(entry);
-}
} catch (Exception e) {
log.warn(did not add cronjob with id + node.getNumber() +
because of error + e.getMessage());
}
}
+}
+});
return res;
}
@@ -128,6 +111,7 @@
}
private Cloud getCloud() {
+LocalContext.getCloudContext().assertUp();
return LocalContext.getCloudContext().getCloud(mmbase, class,
null);
}
Index: NodeCronEntry.java
===
RCS file:
/var/cvs/applications/crontab/src/org/mmbase/applications/crontab/builders/NodeCronEntry.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- NodeCronEntry.java 29 Jul 2008 10:01:21 - 1.3
+++ NodeCronEntry.java 2 Dec 2008 09:10:36 - 1.4
@@ -9,7 +9,7 @@
import org.mmbase.applications.crontab.CronEntry;
-import org.mmbase.bridge.Node;
+import org.mmbase.bridge.*;
import java.util.*;
import org.mmbase.util.logging.*;
@@ -17,7 +17,7 @@
/**
*
* @author Michiel Meeuwissen
- * @version $Id: NodeCronEntry.java,v 1.3 2008/07/29 10:01:21 michiel Exp $
+ * @version $Id: NodeCronEntry.java,v 1.4 2008/12/02 09:10:36 michiel Exp $
* @since MMBase-1.8.6
*/
@@ -45,7 +45,24 @@
}
-protected void setCronTime(String ct) {
+@Override public boolean isActive() {
+NodeList servers = getNode().getRelatedNodes(mmservers);
+String machineName =
org.mmbase.module.core.MMBaseContext.getMachineName();
+for (int i=0; i servers.size(); i++) {
+Node server = servers.getNode(i);
+String name = server.getStringValue(name);
+if (name != null name.equalsIgnoreCase(machineName)) {
+log.service(Active [ + this + ] for server [ + name + ]);
+
[MMBASE CVS] src/org/mmbase/util ThreadPools.java
Update of /var/cvs/src/org/mmbase/util
In directory james.mmbase.org:/tmp/cvs-serv18867
Modified Files:
Tag: MMBase-1_8
ThreadPools.java
Log Message:
added method for forward compatibility
See also: http://cvs.mmbase.org/viewcvs/src/org/mmbase/util
Index: ThreadPools.java
===
RCS file: /var/cvs/src/org/mmbase/util/ThreadPools.java,v
retrieving revision 1.5.2.2
retrieving revision 1.5.2.3
diff -u -b -r1.5.2.2 -r1.5.2.3
--- ThreadPools.java12 Aug 2008 13:05:18 - 1.5.2.2
+++ ThreadPools.java2 Dec 2008 11:03:57 - 1.5.2.3
@@ -15,12 +15,18 @@
*
* @since MMBase 1.8
* @author Michiel Meewissen
- * @version $Id: ThreadPools.java,v 1.5.2.2 2008/08/12 13:05:18 michiel Exp $
+ * @version $Id: ThreadPools.java,v 1.5.2.3 2008/12/02 11:03:57 michiel Exp $
*/
public abstract class ThreadPools {
private static final Logger log =
Logging.getLoggerInstance(ThreadPools.class);
+
+public static String identify(Future r, String s) {
+// ignored, implemented only in 1.9
+return null;
+}
+
private static Thread newThread(Runnable r, String id) {
Thread t = new
Thread(org.mmbase.module.core.MMBaseContext.getThreadGroup(), r, id) {
/**
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] src/org/mmbase/util ThreadPools.java
Update of /var/cvs/src/org/mmbase/util
In directory james.mmbase.org:/tmp/cvs-serv18946
Modified Files:
Tag: MMBase-1_8
ThreadPools.java
Log Message:
added method for forward compatibility
See also: http://cvs.mmbase.org/viewcvs/src/org/mmbase/util
Index: ThreadPools.java
===
RCS file: /var/cvs/src/org/mmbase/util/ThreadPools.java,v
retrieving revision 1.5.2.3
retrieving revision 1.5.2.4
diff -u -b -r1.5.2.3 -r1.5.2.4
--- ThreadPools.java2 Dec 2008 11:03:57 - 1.5.2.3
+++ ThreadPools.java2 Dec 2008 11:05:13 - 1.5.2.4
@@ -15,14 +15,14 @@
*
* @since MMBase 1.8
* @author Michiel Meewissen
- * @version $Id: ThreadPools.java,v 1.5.2.3 2008/12/02 11:03:57 michiel Exp $
+ * @version $Id: ThreadPools.java,v 1.5.2.4 2008/12/02 11:05:13 michiel Exp $
*/
public abstract class ThreadPools {
private static final Logger log =
Logging.getLoggerInstance(ThreadPools.class);
-public static String identify(Future r, String s) {
+public static String identify(Object r, String s) {
// ignored, implemented only in 1.9
return null;
}
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] src/org/mmbase/util ThreadPools.java
Update of /var/cvs/src/org/mmbase/util
In directory james.mmbase.org:/tmp/cvs-serv19191
Modified Files:
Tag: MMBase-1_8
ThreadPools.java
Log Message:
added a method for forward compatiblity (temporary used in email app)
See also: http://cvs.mmbase.org/viewcvs/src/org/mmbase/util
Index: ThreadPools.java
===
RCS file: /var/cvs/src/org/mmbase/util/ThreadPools.java,v
retrieving revision 1.5.2.4
retrieving revision 1.5.2.5
diff -u -b -r1.5.2.4 -r1.5.2.5
--- ThreadPools.java2 Dec 2008 11:05:13 - 1.5.2.4
+++ ThreadPools.java2 Dec 2008 11:16:35 - 1.5.2.5
@@ -15,12 +15,22 @@
*
* @since MMBase 1.8
* @author Michiel Meewissen
- * @version $Id: ThreadPools.java,v 1.5.2.4 2008/12/02 11:05:13 michiel Exp $
+ * @version $Id: ThreadPools.java,v 1.5.2.5 2008/12/02 11:16:35 michiel Exp $
*/
public abstract class ThreadPools {
private static final Logger log =
Logging.getLoggerInstance(ThreadPools.class);
+/**
+ * Wrapper around Thread.scheduler.scheduleAtFixedRate. Provided for
forward compatibility.
+ * @deprecated
+ */
+
+public static ScheduledFuture scheduleAtFixedRate(Runnable pub, int time1,
int time2) {
+return scheduler.scheduleAtFixedRate(pub,
+ time1,
+ time2, TimeUnit.SECONDS);
+}
public static String identify(Object r, String s) {
// ignored, implemented only in 1.9
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] src/org/mmbase/util ThreadPools.java
Update of /var/cvs/src/org/mmbase/util
In directory james.mmbase.org:/tmp/cvs-serv19236
Modified Files:
ThreadPools.java
Log Message:
added a method for forward compatiblity (temporary used in email app)
See also: http://cvs.mmbase.org/viewcvs/src/org/mmbase/util
Index: ThreadPools.java
===
RCS file: /var/cvs/src/org/mmbase/util/ThreadPools.java,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -b -r1.22 -r1.23
--- ThreadPools.java11 Sep 2008 15:52:35 - 1.22
+++ ThreadPools.java2 Dec 2008 11:16:45 - 1.23
@@ -18,7 +18,7 @@
*
* @since MMBase 1.8
* @author Michiel Meeuwissen
- * @version $Id: ThreadPools.java,v 1.22 2008/09/11 15:52:35 michiel Exp $
+ * @version $Id: ThreadPools.java,v 1.23 2008/12/02 11:16:45 michiel Exp $
*/
public abstract class ThreadPools {
private static final Logger log =
Logging.getLoggerInstance(ThreadPools.class);
@@ -35,6 +35,16 @@
public static String identify(Future r, String s) {
return identifiers.put(r, s);
}
+
+/**
+ * Wrapper around Thread.scheduler.scheduleAtFixedRate.
+ * @deprecated
+ */
+public static ScheduledFuture scheduleAtFixedRate(Runnable pub, int time,
int time) {
+return scheduler.scheduleAtFixedRate(pub
+ time,
+ time, TimeUnit.SECONDS);
+}
/**
* returns a identifier string for the given task.
* @since MMBase-1.9
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] applications/email/src/org/mmbase/applications/email EmailBuilder.java
Update of /var/cvs/applications/email/src/org/mmbase/applications/email
In directory james.mmbase.org:/tmp/cvs-serv19287
Modified Files:
EmailBuilder.java
Log Message:
Fixed 1.8 compatibility again
See also:
http://cvs.mmbase.org/viewcvs/applications/email/src/org/mmbase/applications/email
Index: EmailBuilder.java
===
RCS file:
/var/cvs/applications/email/src/org/mmbase/applications/email/EmailBuilder.java,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -b -r1.35 -r1.36
--- EmailBuilder.java 28 Nov 2008 14:25:45 - 1.35
+++ EmailBuilder.java 2 Dec 2008 11:17:15 - 1.36
@@ -31,18 +31,18 @@
*
* @author Daniel Ockeloen
* @author Michiel Meeuwissen
- * @version $Id: EmailBuilder.java,v 1.35 2008/11/28 14:25:45 michiel Exp $
+ * @version $Id: EmailBuilder.java,v 1.36 2008/12/02 11:17:15 michiel Exp $
*/
public class EmailBuilder extends MMObjectBuilder {
private static final Logger log =
Logging.getLoggerInstance(EmailBuilder.class);
-public final static ParameterString TYPE_PARAMETER = new
ParameterString(type, String.class, oneshot);
+public final static Parameter/*String*/ TYPE_PARAMETER = new
Parameter/*String*/(type, String.class, oneshot);
static {
}
-public final static ParameterList MESSAGEFORMAT_ARGUMENTS_PARAMETER =
new ParameterList(formatarguments, List.class, null);
+public final static Parameter/*List*/ MESSAGEFORMAT_ARGUMENTS_PARAMETER
= new Parameter/*List*/(formatarguments, List.class, null);
public final static Parameter[] MAIL_PARAMETERS = { TYPE_PARAMETER,
MESSAGEFORMAT_ARGUMENTS_PARAMETER };
@@ -83,7 +83,7 @@
static String groupsBuilder;
// reference to the expire handler
-private ScheduledFuture expireHandler;
+private /*ScheduledFuture*/ Object expireHandler;
protected int expireTime = 60 * 30 ;
protected int sleepTime = 60;
@@ -118,9 +118,7 @@
// check every defined sleeptime
log.service(Expirehandler started with sleep time + sleepTime +
sec, expire time + expireTime + sec.);
expireHandler =
-ThreadPools.scheduler.scheduleAtFixedRate(new
EmailExpireHandler(this, expireTime),
- sleepTime,
- sleepTime,
TimeUnit.SECONDS);
+ThreadPools.scheduleAtFixedRate(new EmailExpireHandler(this,
expireTime), sleepTime, sleepTime);
ThreadPools.identify(expireHandler, Sent email deleter);
@@ -142,7 +140,13 @@
}
@Override public void shutdown() {
-if (expireHandler != null) { expireHandler.cancel(true); }
+if (expireHandler != null) {
+try {
+expireHandler.getClass().getMethod(cancel,
Boolean.class).invoke(expireHandler, Boolean.TRUE);
+} catch (Exception e) {
+log.warn(e);
+}
+}
}
@@ -157,7 +161,7 @@
node =
org.mmbase.bridge.util.CloneUtil.cloneNodeWithRelations(node);
}
-List a = parameters.get(MESSAGEFORMAT_ARGUMENTS_PARAMETER);
+List a = (List) parameters.get(MESSAGEFORMAT_ARGUMENTS_PARAMETER);
arguments = a == null ? null : a.toArray();
log.debug(We're in mail - args: + parameters);
@@ -242,7 +246,7 @@
* @param args List with arguments
*/
private static void setType(Node node, Parameters parameters) {
-String type = parameters.get(TYPE_PARAMETER);
+String type = (String) parameters.get(TYPE_PARAMETER);
String typeField = getTypeField();
if (oneshot.equals(type)) {
node.setValue(typeField, TYPE_ONESHOT);
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] applications/email/src/org/mmbase/applications/email EmailBuilder.java
Update of /var/cvs/applications/email/src/org/mmbase/applications/email
In directory
james.mmbase.org:/tmp/cvs-serv19389/src/org/mmbase/applications/email
Modified Files:
EmailBuilder.java
Log Message:
reflection was not done quite correctly
See also:
http://cvs.mmbase.org/viewcvs/applications/email/src/org/mmbase/applications/email
Index: EmailBuilder.java
===
RCS file:
/var/cvs/applications/email/src/org/mmbase/applications/email/EmailBuilder.java,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -b -r1.36 -r1.37
--- EmailBuilder.java 2 Dec 2008 11:17:15 - 1.36
+++ EmailBuilder.java 2 Dec 2008 11:22:12 - 1.37
@@ -31,7 +31,7 @@
*
* @author Daniel Ockeloen
* @author Michiel Meeuwissen
- * @version $Id: EmailBuilder.java,v 1.36 2008/12/02 11:17:15 michiel Exp $
+ * @version $Id: EmailBuilder.java,v 1.37 2008/12/02 11:22:12 michiel Exp $
*/
public class EmailBuilder extends MMObjectBuilder {
@@ -142,9 +142,9 @@
@Override public void shutdown() {
if (expireHandler != null) {
try {
-expireHandler.getClass().getMethod(cancel,
Boolean.class).invoke(expireHandler, Boolean.TRUE);
+expireHandler.getClass().getMethod(cancel,
Boolean.TYPE).invoke(expireHandler, Boolean.TRUE);
} catch (Exception e) {
-log.warn(e);
+log.error(e);
}
}
}
___
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_Modules/community/src/java/com/finalist/cmsc/services/community/person PersonHibernateService.java PersonService.java
Update of
/var/cvs/contributions/CMSContainer_Modules/community/src/java/com/finalist/cmsc/services/community/person
In directory james.mmbase.org:/tmp/cvs-serv16175/services/community/person
Modified Files:
Tag: b1_5
PersonHibernateService.java PersonService.java
Log Message:
CMSC-949, Blocking users: user status enhancements,show state through Action
See also:
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer_Modules/community/src/java/com/finalist/cmsc/services/community/person
See also: http://www.mmbase.org/jira/browse/CMSC-949
Index: PersonHibernateService.java
===
RCS file:
/var/cvs/contributions/CMSContainer_Modules/community/src/java/com/finalist/cmsc/services/community/person/PersonHibernateService.java,v
retrieving revision 1.23.2.1
retrieving revision 1.23.2.2
diff -u -b -r1.23.2.1 -r1.23.2.2
--- PersonHibernateService.java 6 Nov 2008 07:46:28 - 1.23.2.1
+++ PersonHibernateService.java 2 Dec 2008 09:46:51 - 1.23.2.2
@@ -431,4 +431,10 @@
creatRelationRecord(importPerson);
}
}
+ @Transactional
+ public void changeStateByAuthenticationId(Long authenticationId, String
active) {
+ Person per=getPersonByAuthenticationId(authenticationId);
+ per.setActive(active);
+ updatePerson(per);
+ }
}
Index: PersonService.java
===
RCS file:
/var/cvs/contributions/CMSContainer_Modules/community/src/java/com/finalist/cmsc/services/community/person/PersonService.java,v
retrieving revision 1.16.2.1
retrieving revision 1.16.2.2
diff -u -b -r1.16.2.1 -r1.16.2.2
--- PersonService.java 6 Nov 2008 07:46:28 - 1.16.2.1
+++ PersonService.java 2 Dec 2008 09:46:51 - 1.16.2.2
@@ -81,4 +81,6 @@
public List Person getPersonsByAuthenticationIds(Set Integer
authenticationIds, String name, String email);
public void addRelationRecord(String level, PersonExportImportVO
importPerson);
+
+ void changeStateByAuthenticationId(Long authenticationId, String active);
}
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] Delivery Status Notification
___ Cvs mailing list Cvs@lists.mmbase.org http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] contributions/CMSContainer_Modules/community/resources cmsc-community.properties
Update of /var/cvs/contributions/CMSContainer_Modules/community/resources
In directory james.mmbase.org:/tmp/cvs-serv16355/resources
Modified Files:
Tag: b1_5
cmsc-community.properties
Log Message:
CMSC-949, Blocking users: user status enhancements,show useful state by jsp
See also:
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer_Modules/community/resources
See also: http://www.mmbase.org/jira/browse/CMSC-949
Index: cmsc-community.properties
===
RCS file:
/var/cvs/contributions/CMSContainer_Modules/community/resources/cmsc-community.properties,v
retrieving revision 1.30.2.1
retrieving revision 1.30.2.2
diff -u -b -r1.30.2.1 -r1.30.2.2
--- cmsc-community.properties 19 Nov 2008 08:37:06 - 1.30.2.1
+++ cmsc-community.properties 2 Dec 2008 09:49:58 - 1.30.2.2
@@ -106,3 +106,7 @@
community.search.selectUser = select the users not in group {0}
community.search.addUserToGroup = add selected users to {0} group
community.search.addToSubscribe = Add to Subscriptions
\ No newline at end of file
+community.search.state = State
+community.search.state.active = ACTIVE
+community.search.state.unconfirmed = UNCONFIRMED
+community.search.state.blocked = BLOCKED
\ No newline at end of file
___
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-serv14672/crontab/builders
Modified Files:
CronJobs.java
Log Message:
added some @Override, implemented initalization in init
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.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- CronJobs.java 12 Sep 2008 12:24:45 - 1.9
+++ CronJobs.java 2 Dec 2008 08:42:59 - 1.10
@@ -20,32 +20,18 @@
* 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.9 2008/09/12 12:24:45 michiel Exp $
+ * @version $Id: CronJobs.java,v 1.10 2008/12/02 08:42:59 michiel Exp $
*/
-public class CronJobs extends MMObjectBuilder implements Runnable {
+public class CronJobs extends MMObjectBuilder {
-private static Logger log = Logging.getLoggerInstance(CronJobs.class);
-
-CronDaemon cronDaemon = null;
-
-public CronJobs() {
-org.mmbase.util.ThreadPools.jobsExecutor.execute(this);
-}
+private static final Logger log =
Logging.getLoggerInstance(CronJobs.class);
/**
- * This thread wait's for MMBase to be started and then adds all the
crontEntries to the CronDaemon
+ * Adds all the crontEntries to the CronDaemon
*/
-public void run() {
-while (!MMBase.getMMBase().getState()) {
-try {
-Thread.sleep(2000);
-} catch (InterruptedException e) {
-log.warn(thread interrupted, cronjobs will not be loaded);
-return;
-}
-}
-
-cronDaemon = CronDaemon.getInstance();
+@Override public boolean init() {
+boolean res = super.init();
+CronDaemon cronDaemon = CronDaemon.getInstance();
NodeIterator nodeIterator =
getCloud().getNodeManager(getTableName()).getList(null, null,
null).nodeIterator();
while (nodeIterator.hasNext()) {
Node node = nodeIterator.nextNode();
@@ -56,7 +42,7 @@
if (servers.size() 0) {
String machineName = MMBaseContext.getMachineName();
boolean found = false;
-for (int i=0; iservers.size(); i++) {
+for (int i=0; i servers.size(); i++) {
Node server = servers.getNode(i);
String name = server.getStringValue(name);
if (name != null
name.equalsIgnoreCase(machineName)) {
@@ -79,10 +65,12 @@
log.warn(did not add cronjob with id + node.getNumber() +
because of error + e.getMessage());
}
}
+return res;
}
-public void notify(NodeEvent event) {
+@Override public void notify(NodeEvent event) {
log.debug(Received + event);
+CronDaemon cronDaemon = CronDaemon.getInstance();
switch(event.getType()) {
case Event.TYPE_NEW: {
try {
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] applications/crontab/blocks index.jspx
Update of /var/cvs/applications/crontab/blocks
In directory james.mmbase.org:/tmp/cvs-serv15399/blocks
Modified Files:
index.jspx
Log Message:
implemented 'isActive'. This means all jobs are always in the daemon, but only
when running it is decied whter that is needed
See also: http://cvs.mmbase.org/viewcvs/applications/crontab/blocks
Index: index.jspx
===
RCS file: /var/cvs/applications/crontab/blocks/index.jspx,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- index.jspx 12 Sep 2008 12:23:03 - 1.6
+++ index.jspx 2 Dec 2008 09:10:36 - 1.7
@@ -10,6 +10,11 @@
jsp:directive.page import=org.mmbase.framework.*,java.util.* /
mm:import id=format-MM-dd HH:mm:ss/mm:import
mm:url id=ok write=false page=/mmbase/style/images/ok.gif /
+ style
+.inactive {
+color: #aaa;
+}
+ /style
h1Crontab admin page for
jsp:expressionorg.mmbase.module.core.MMBase.getMMBase().getMachineName()/jsp:expression/h1
mm:cloud rank=administrator
mm:import externid=kick /
@@ -68,7 +73,7 @@
thconfiguration/th
/tr
mm:listfunction id=cronentry module=crontab name=list
-tr
+tr class=${cronentry.active ? 'active' : 'inactive'}
td${cronentry.id}/td
td${cronentry.type}/td
td${cronentry.cronTime}/td
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] Delivery Status Notification
___ Cvs mailing list Cvs@lists.mmbase.org http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] contributions/CMSContainer_Modules/community/resources cmsc-community.properties cmsc-community_zh.properties cmsc-community_nl.properties
Update of /var/cvs/contributions/CMSContainer_Modules/community/resources
In directory james.mmbase.org:/tmp/cvs-serv22968/community/resources
Modified Files:
Tag: b1_5
cmsc-community.properties cmsc-community_zh.properties
cmsc-community_nl.properties
Log Message:
CMSC-949 - Added missing translations of person state.
See also:
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer_Modules/community/resources
See also: http://www.mmbase.org/jira/browse/CMSC-949
Index: cmsc-community.properties
===
RCS file:
/var/cvs/contributions/CMSContainer_Modules/community/resources/cmsc-community.properties,v
retrieving revision 1.30.2.2
retrieving revision 1.30.2.3
diff -u -b -r1.30.2.2 -r1.30.2.3
--- cmsc-community.properties 2 Dec 2008 09:49:58 - 1.30.2.2
+++ cmsc-community.properties 2 Dec 2008 14:28:23 - 1.30.2.3
@@ -106,7 +106,8 @@
community.search.selectUser = select the users not in group {0}
community.search.addUserToGroup = add selected users to {0} group
community.search.addToSubscribe = Add to Subscriptions
+
community.search.state = State
-community.search.state.active = ACTIVE
-community.search.state.unconfirmed = UNCONFIRMED
-community.search.state.blocked = BLOCKED
\ No newline at end of file
+community.search.state.active = Active
+community.search.state.unconfirmed = Unconfirmed
+community.search.state.blocked = Blocked
\ No newline at end of file
Index: cmsc-community_zh.properties
===
RCS file:
/var/cvs/contributions/CMSContainer_Modules/community/resources/cmsc-community_zh.properties,v
retrieving revision 1.8.2.1
retrieving revision 1.8.2.2
diff -u -b -r1.8.2.1 -r1.8.2.2
--- cmsc-community_zh.properties19 Nov 2008 08:37:06 - 1.8.2.1
+++ cmsc-community_zh.properties2 Dec 2008 14:28:23 - 1.8.2.2
@@ -107,3 +107,8 @@
community.search.selectUser = æ¥è¯¢ä¸å¨{0}ç»çç¨æ·
community.search.addUserToGroup = æ·»å ç¨æ·å°{0}ç»
community.search.addToSubscribe = æ·»å ç¨æ·è®¢é
\ No newline at end of file
+
+community.search.state = State
+community.search.state.active = Active
+community.search.state.unconfirmed = Unconfirmed
+community.search.state.blocked = Blocked
\ No newline at end of file
Index: cmsc-community_nl.properties
===
RCS file:
/var/cvs/contributions/CMSContainer_Modules/community/resources/cmsc-community_nl.properties,v
retrieving revision 1.18.2.1
retrieving revision 1.18.2.2
diff -u -b -r1.18.2.1 -r1.18.2.2
--- cmsc-community_nl.properties19 Nov 2008 08:37:06 - 1.18.2.1
+++ cmsc-community_nl.properties2 Dec 2008 14:28:23 - 1.18.2.2
@@ -105,3 +105,8 @@
community.search.selectUser = Selecteer de leden die niet in groep {0} zitten
community.search.addUserToGroup = Voeg de geselecteerde leden toe aan groep
{0}.
community.search.addToSubscribe = Maak leden lid
+
+community.search.state = Status
+community.search.state.active = Actief
+community.search.state.unconfirmed = Onbevestigd
+community.search.state.blocked = Geblokkeerd
\ No newline at end of file
___
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] tests/bridge/org/mmbase/bridge ProcessorTest.java
Update of /var/cvs/tests/bridge/org/mmbase/bridge
In directory james.mmbase.org:/tmp/cvs-serv13662/bridge/org/mmbase/bridge
Modified Files:
ProcessorTest.java
Log Message:
count commit tests cannot be done by rmmci
See also: http://cvs.mmbase.org/viewcvs/tests/bridge/org/mmbase/bridge
Index: ProcessorTest.java
===
RCS file: /var/cvs/tests/bridge/org/mmbase/bridge/ProcessorTest.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- ProcessorTest.java 25 Nov 2008 16:02:37 - 1.3
+++ ProcessorTest.java 2 Dec 2008 08:06:28 - 1.4
@@ -22,7 +22,7 @@
/**
*
* @author Michiel Meeuwissen
- * @version $Id: ProcessorTest.java,v 1.3 2008/11/25 16:02:37 michiel Exp $
+ * @version $Id: ProcessorTest.java,v 1.4 2008/12/02 08:06:28 michiel Exp $
* @since MMBase-1.9.1
*/
public class ProcessorTest extends BridgeTest {
@@ -32,7 +32,6 @@
super(name);
}
-/*
protected Node testCommitProcessorIsChanged1(Cloud c) {
NodeManager nm = c.getNodeManager(mustbechanged);
Node n = nm.createNode();
@@ -107,13 +106,15 @@
org.mmbase.cache.CacheManager.getInstance().readConfiguration();
}
-*/
+
protected int testCommitCount(Cloud c) {
NodeManager nm = c.getNodeManager(datatypes);
int ccbefore = CountCommitProcessor.count;
Node n = nm.createNode();
n.commit();
+if
(c.getCloudContext().getUri().equals(ContextProvider.DEFAULT_CLOUD_CONTEXT_NAME))
{
assertEquals(ccbefore + 1, CountCommitProcessor.count);
+}
return n.getNumber();
}
@@ -126,9 +127,11 @@
Transaction t = getCloud().getTransaction(commitcount);
testCommitCount(t);
t.commit();
+if
(getCloudContext().getUri().equals(ContextProvider.DEFAULT_CLOUD_CONTEXT_NAME))
{
// there is no point in calling a commit processor twice
assertEquals(ccbefore + 1, CountCommitProcessor.count);
}
+}
static int nn = 0;
public void testCommitCountTransaction2() {
Transaction t = getCloud().getTransaction(commitcount2);
@@ -139,28 +142,33 @@
t.commit(); // but only the transaction.
nn = n.getNumber();
-
+if
(getCloudContext().getUri().equals(ContextProvider.DEFAULT_CLOUD_CONTEXT_NAME))
{
// commit processor must have been called.
assertEquals(ccbefore + 1, CountCommitProcessor.count);
}
+}
protected void testCommitCountOnChange(Cloud c, int nn) {
int ccbefore = CountCommitProcessor.count;
int changedbefore = CountCommitProcessor.changed;
Node n = c.getNode(nn);
n.commit();
+if
(getCloudContext().getUri().equals(ContextProvider.DEFAULT_CLOUD_CONTEXT_NAME))
{
assertEquals(ccbefore + 1, CountCommitProcessor.count);
assertEquals(changedbefore, CountCommitProcessor.changed);
}
+}
protected void testCommitCountOnChange2(Cloud c, int nn) {
int ccbefore = CountCommitProcessor.count;
int changedbefore = CountCommitProcessor.changed;
Node n = c.getNode(nn);
n.setStringValue(string, foobar);
n.commit();
+if
(getCloudContext().getUri().equals(ContextProvider.DEFAULT_CLOUD_CONTEXT_NAME))
{
assertEquals(ccbefore + 1, CountCommitProcessor.count);
assertEquals(changedbefore + 1, CountCommitProcessor.changed);
}
+}
public void testCommitCountOnChange() {
testCommitCountOnChange(getCloud(), nn);
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] contributions/CMSContainer_Modules/community/resources cmsc-community.properties
Update of /var/cvs/contributions/CMSContainer_Modules/community/resources
In directory james.mmbase.org:/tmp/cvs-serv14178/resources
Modified Files:
cmsc-community.properties
Log Message:
CMSC-949, Blocking users: user status enhancements,show state by jsp
See also:
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer_Modules/community/resources
See also: http://www.mmbase.org/jira/browse/CMSC-949
Index: cmsc-community.properties
===
RCS file:
/var/cvs/contributions/CMSContainer_Modules/community/resources/cmsc-community.properties,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -b -r1.31 -r1.32
--- cmsc-community.properties 19 Nov 2008 08:43:03 - 1.31
+++ cmsc-community.properties 2 Dec 2008 08:18:01 - 1.32
@@ -106,3 +106,7 @@
community.search.selectUser = select the users not in group {0}
community.search.addUserToGroup = add selected users to {0} group
community.search.addToSubscribe = Add to Subscriptions
\ No newline at end of file
+community.search.state = State
+community.search.state.active = ACTIVE
+community.search.state.unconfirmed = UNCONFIRMED
+community.search.state.blocked = BLOCKED
\ No newline at end of file
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] contributions/CMSContainer/cmsc/utilities/src/java/com/finalist/util/http BulkUploadUtil.java
Update of
/var/cvs/contributions/CMSContainer/cmsc/utilities/src/java/com/finalist/util/http
In directory james.mmbase.org:/tmp/cvs-serv14727
Modified Files:
BulkUploadUtil.java
Log Message:
CMSC-681 Asset -Workflow bulk upload
See also:
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer/cmsc/utilities/src/java/com/finalist/util/http
See also: http://www.mmbase.org/jira/browse/CMSC-681
Index: BulkUploadUtil.java
===
RCS file:
/var/cvs/contributions/CMSContainer/cmsc/utilities/src/java/com/finalist/util/http/BulkUploadUtil.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -b -r1.12 -r1.13
--- BulkUploadUtil.java 21 Nov 2008 02:33:00 - 1.12
+++ BulkUploadUtil.java 2 Dec 2008 08:43:11 - 1.13
@@ -101,15 +101,11 @@
}
public static ListInteger store(Cloud cloud, NodeManager manager, String
parentchannel, FormFile file) {
- ArrayListInteger nodes = new ArrayListInteger();
+ ListInteger nodes ;
if (StringUtils.isEmpty(parentchannel)) {
throw new NullPointerException(parentchannel is null);
}
- Node node = getNode(Integer.valueOf(parentchannel), manager, file);
-
- if (node != null) {
- nodes.add(node.getNumber());
- }
+ nodes = getNodeList(Integer.valueOf(parentchannel), manager, file);
return nodes;
}
@@ -162,21 +158,26 @@
return node;
}
- private static Node getNode(Integer parentChannel, NodeManager manager,
FormFile file) {
- Node node = null;
+ private static ListInteger getNodeList(Integer parentChannel, NodeManager
manager, FormFile file) {
+ ListInteger nodes = null;
try {
if (isZipFile(file)) {
ZipInputStream zip = new ZipInputStream(new
BufferedInputStream(new ByteArrayInputStream(file.getFileData(;
-createNodesInZip(parentChannel, manager, zip);
+nodes = createNodesInZip(parentChannel, manager, zip);
} else {
-createNode(parentChannel, manager, file.getFileName(),
file.getInputStream(), file.getFileSize());
+
+Node node = createNode(parentChannel, manager, file.getFileName(),
file.getInputStream(), file.getFileSize());
+if(node!=null){
+ nodes = new ArrayListInteger();
+ nodes.add(node.getNumber());
+}
}
} catch (Exception ex) {
log.error(Failed to read uploaded file, ex);
} finally {
file.destroy();
}
- return node;
+ return nodes;
}
private static ArrayListInteger createNodesInZip(NodeManager manager,
ZipInputStream zip) {
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] applications/crontab/blocks index.jspx
Update of /var/cvs/applications/crontab/blocks
In directory james.mmbase.org:/tmp/cvs-serv15666/blocks
Modified Files:
index.jspx
Log Message:
some details
See also: http://cvs.mmbase.org/viewcvs/applications/crontab/blocks
Index: index.jspx
===
RCS file: /var/cvs/applications/crontab/blocks/index.jspx,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- index.jspx 2 Dec 2008 09:10:36 - 1.7
+++ index.jspx 2 Dec 2008 09:23:22 - 1.8
@@ -65,6 +65,7 @@
thid/th
thtype/th
thtime/th
+thservers/th
thrun/th
thlast run started on/th
thcost of last run (ms)/th
@@ -79,7 +80,9 @@
td${cronentry.cronTime}/td
td
jsp:text${cronentry.servers}/jsp:text
-c:if test=${not cronentry.mustBeOne or not cronentry.alive}
+ /td
+ td
+c:if test=${(not cronentry.mustBeOne or not cronentry.alive) and
cronentry.active}
mm:link
mm:param name=kick value=${cronentry.id} /
a href=${_}Kick/a
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] src/org/mmbase/bridge/util CloneUtil.java
Update of /var/cvs/src/org/mmbase/bridge/util In directory james.mmbase.org:/tmp/cvs-serv18797 Added Files: Tag: MMBase-1_8 CloneUtil.java Log Message: ported from head See also: http://cvs.mmbase.org/viewcvs/src/org/mmbase/bridge/util CloneUtil.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 SearchConditionalUserAction.java
Update of
/var/cvs/contributions/CMSContainer_Modules/community/src/java/com/finalist/cmsc/community/forms
In directory james.mmbase.org:/tmp/cvs-serv16175/community/forms
Modified Files:
Tag: b1_5
SearchConditionalUserAction.java
Log Message:
CMSC-949, Blocking users: user status enhancements,show state through Action
See also:
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer_Modules/community/src/java/com/finalist/cmsc/community/forms
See also: http://www.mmbase.org/jira/browse/CMSC-949
Index: SearchConditionalUserAction.java
===
RCS file:
/var/cvs/contributions/CMSContainer_Modules/community/src/java/com/finalist/cmsc/community/forms/SearchConditionalUserAction.java,v
retrieving revision 1.19
retrieving revision 1.19.2.1
diff -u -b -r1.19 -r1.19.2.1
--- SearchConditionalUserAction.java25 Sep 2008 06:56:13 - 1.19
+++ SearchConditionalUserAction.java2 Dec 2008 09:46:51 - 1.19.2.1
@@ -63,7 +63,12 @@
setPagingInformation(request);
Map String , String map = getParameterMap(actionForm);
-
+ String active=request.getParameter(state);
+ if(null!=active){
+ String authId=request.getParameter(authid);
+ Long authenticationId=Long.parseLong(authId);
+ personService.changeStateByAuthenticationId(authenticationId,active);
+ }
List Person persons = personService.getAssociatedPersons(map);
int totalCount = personService.getAssociatedPersonsNum(map);
@@ -168,6 +173,7 @@
per.setUsername(username);
per.setGroups(groupsName);
per.setAuthId(p.getAuthenticationId());
+ per.setActive(p.getActive());
perShow.add(per);
}
return perShow;
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] contributions/CMSContainer_Portlets/portlets-newsletter/resources newsletter.properties newsletter_zh.properties
Update of /var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/resources In directory james.mmbase.org:/tmp/cvs-serv23566/portlets-newsletter/resources Modified Files: newsletter.properties newsletter_zh.properties Log Message: CMSC-1100 - Improve some translations. See also: http://cvs.mmbase.org/viewcvs/contributions/CMSContainer_Portlets/portlets-newsletter/resources See also: http://www.mmbase.org/jira/browse/CMSC-1100 Index: newsletter.properties === RCS file: /var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/resources/newsletter.properties,v retrieving revision 1.46 retrieving revision 1.47 diff -u -b -r1.46 -r1.47 --- newsletter.properties 14 Nov 2008 06:38:52 - 1.46 +++ newsletter.properties 2 Dec 2008 15:05:22 - 1.47 @@ -14,7 +14,7 @@ site.newsletteredition.new.blank = New edition: empty site.newsletteredition.new.withcontent = New edition: clone -site.newsletteredition.edit = Edit edition +site.newsletteredition.edit = Edit edition properties site.newsletteredition.remove = Remove edition site.newsletteredition.publish = Send edition site.newsletteredition.test = Send test mail @@ -240,9 +240,9 @@ newsletter.publication.link.newsubscriber = New Subscriber newsletter.publication.link.newuser = New User -newsletter.icons.title.editproperty= Edit property +newsletter.icons.title.editproperty= Edit newsletter page newsletter.icons.title.sendemail = Send test email -newsletter.icons.title.sendedition = Send editions to all member +newsletter.icons.title.sendedition = Send edition to all members newsletter.icons.title.userright = View user rights newsletter.icons.title.edituser = Edit User newsletter.icons.title.user.unsubscribe = Unsubscribe the current newsletter Index: newsletter_zh.properties === RCS file: /var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/resources/newsletter_zh.properties,v retrieving revision 1.27 retrieving revision 1.28 diff -u -b -r1.27 -r1.28 --- newsletter_zh.properties14 Nov 2008 03:32:26 - 1.27 +++ newsletter_zh.properties2 Dec 2008 15:05:22 - 1.28 @@ -20,7 +20,6 @@ site.newsletteredition.test = åéæµè¯é®ä»¶ site.newsletteredition.revokeapproval = æ¤éæ¹å edition site.newsletteredition.approve = æ¹å edition - site.newsletteredition.freeze = å»ç» site.newsletteredition.defrost = è§£å» ___ Cvs mailing list Cvs@lists.mmbase.org http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] contributions/CMSContainer_Portlets/portlets-newsletter/resources newsletter_zh.properties newsletter_nl.properties newsletter.properties
Update of /var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/resources In directory james.mmbase.org:/tmp/cvs-serv23583/portlets-newsletter/resources Modified Files: Tag: b1_5 newsletter_zh.properties newsletter_nl.properties newsletter.properties Log Message: CMSC-1100 - Improve some translations. See also: http://cvs.mmbase.org/viewcvs/contributions/CMSContainer_Portlets/portlets-newsletter/resources See also: http://www.mmbase.org/jira/browse/CMSC-1100 Index: newsletter_zh.properties === RCS file: /var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/resources/newsletter_zh.properties,v retrieving revision 1.20.2.7 retrieving revision 1.20.2.8 diff -u -b -r1.20.2.7 -r1.20.2.8 Index: newsletter_nl.properties === RCS file: /var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/resources/newsletter_nl.properties,v retrieving revision 1.21.2.9 retrieving revision 1.21.2.10 diff -u -b -r1.21.2.9 -r1.21.2.10 Index: newsletter.properties === RCS file: /var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/resources/newsletter.properties,v retrieving revision 1.37.2.8 retrieving revision 1.37.2.9 diff -u -b -r1.37.2.8 -r1.37.2.9 --- newsletter.properties 14 Nov 2008 06:59:39 - 1.37.2.8 +++ newsletter.properties 2 Dec 2008 15:05:28 - 1.37.2.9 @@ -14,7 +14,7 @@ site.newsletteredition.new.blank = New edition: empty site.newsletteredition.new.withcontent = New edition: clone -site.newsletteredition.edit = Edit edition +site.newsletteredition.edit = Edit edition properties site.newsletteredition.remove = Remove edition site.newsletteredition.publish = Send edition site.newsletteredition.test = Send test mail @@ -240,9 +240,9 @@ newsletter.publication.link.newsubscriber = New Subscriber newsletter.publication.link.newuser = New User -newsletter.icons.title.editproperty= Edit property +newsletter.icons.title.editproperty= Edit newsletter page newsletter.icons.title.sendemail = Send test email -newsletter.icons.title.sendedition = Send editions to all member +newsletter.icons.title.sendedition = Send edition to all members newsletter.icons.title.userright = View user rights newsletter.icons.title.edituser = Edit User newsletter.icons.title.user.unsubscribe = Unsubscribe the current newsletter ___ Cvs mailing list Cvs@lists.mmbase.org http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] contributions/CMSContainer/cmsc/richtext/src/webapp/mmbase/edit/wizard/xinha/popups insertinline_image.html
Update of
/var/cvs/contributions/CMSContainer/cmsc/richtext/src/webapp/mmbase/edit/wizard/xinha/popups
In directory
james.mmbase.org:/tmp/cvs-serv13902/cmsc/richtext/src/webapp/mmbase/edit/wizard/xinha/popups
Modified Files:
insertinline_image.html
Log Message:
CMSC-1126 using Assets in content
See also:
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer/cmsc/richtext/src/webapp/mmbase/edit/wizard/xinha/popups
See also: http://www.mmbase.org/jira/browse/CMSC-1126
Index: insertinline_image.html
===
RCS file:
/var/cvs/contributions/CMSContainer/cmsc/richtext/src/webapp/mmbase/edit/wizard/xinha/popups/insertinline_image.html,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- insertinline_image.html 1 Dec 2008 10:47:58 - 1.9
+++ insertinline_image.html 2 Dec 2008 08:10:02 - 1.10
@@ -81,7 +81,7 @@
}
function onSelect() {
-
openPopupWindow('../../../../../editors/resources/ImageAction.do?action=oftencontenttypes=imagesoffset=0order=titledirection=1channelid=current','filterwindow2',750,600);
+
openPopupWindow('../../../../../editors/resources/ImageAction.do?action=oftencontenttypes=imagesoffset=0channelid=current','filterwindow2',750,600);
return false;
};
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] contributions/CMSContainer_Modules/community/src/webapp/editors/community userlist_table.jspf
Update of
/var/cvs/contributions/CMSContainer_Modules/community/src/webapp/editors/community
In directory james.mmbase.org:/tmp/cvs-serv14178/src/webapp/editors/community
Modified Files:
userlist_table.jspf
Log Message:
CMSC-949, Blocking users: user status enhancements,show state by jsp
See also:
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer_Modules/community/src/webapp/editors/community
See also: http://www.mmbase.org/jira/browse/CMSC-949
Index: userlist_table.jspf
===
RCS file:
/var/cvs/contributions/CMSContainer_Modules/community/src/webapp/editors/community/userlist_table.jspf,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- userlist_table.jspf 19 Sep 2008 10:32:02 - 1.6
+++ userlist_table.jspf 2 Dec 2008 08:18:01 - 1.7
@@ -32,5 +32,13 @@
edit:ui-tcolumn titlekey=community.search.memberOf
${person.groups}
/edit:ui-tcolumn
+ edit:ui-tcolumn titlekey=community.search.state
+ select
onchange=selectState('${pageContext.request.contextPath
}/editors/community/SearchConditionalUser.do?page=${page}sortby=${param.sortby}dir=${param.dir}authid=${person.authId}',this)
+ option selected=selected
value=ACTIVE${person.active}/option
+ option value=ACTIVEfmt:message
key=community.search.state.active/ /option
+ option value=UNCONFIRMEDfmt:message
key=community.search.state.unconfirmed/ /option
+ option value=BLOCKEDfmt:message
key=community.search.state.blocked//option
+ /select
+ /edit:ui-tcolumn
/edit:ui-table
___
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-serv18308
Modified Files:
DataAccessor.java
Log Message:
CMSC-1166, KNMI migration to the CMS Container,add deal with int field mapping
to date
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.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- DataAccessor.java 1 Dec 2008 10:11:23 - 1.6
+++ DataAccessor.java 2 Dec 2008 10:37:03 - 1.7
@@ -192,6 +192,11 @@
try {
if (INT_TO_DATA.equals(changeMethod)) {
int i=rs.getInt(fieldName);
+if (i0) {
+ String redate = String.valueOf(i)+000;
+ Long l=Long.parseLong(redate);
+ return new java.sql.Date(l);
+}
return new java.sql.Date(i);
} else if (BLOB_TO_STRING.equals(changeMethod)) {
Blob blob = rs.getBlob(fieldName);
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] contributions/CMSContainer/cmsc/contentrepository/src/webapp/editors/resources imagesearch.jsp
Update of
/var/cvs/contributions/CMSContainer/cmsc/contentrepository/src/webapp/editors/resources
In directory
james.mmbase.org:/tmp/cvs-serv13953/cmsc/contentrepository/src/webapp/editors/resources
Modified Files:
imagesearch.jsp
Log Message:
CMSC-1126 using Assets in content
See also:
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer/cmsc/contentrepository/src/webapp/editors/resources
See also: http://www.mmbase.org/jira/browse/CMSC-1126
Index: imagesearch.jsp
===
RCS file:
/var/cvs/contributions/CMSContainer/cmsc/contentrepository/src/webapp/editors/resources/imagesearch.jsp,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -b -r1.28 -r1.29
--- imagesearch.jsp 2 Dec 2008 06:05:39 - 1.28
+++ imagesearch.jsp 2 Dec 2008 08:10:51 - 1.29
@@ -45,7 +45,7 @@
}
function selectChannel(channelid, path) {
- document.location =
../../resources/ImageAction.do?action=oftencontenttypes=imagesoffset=0order=titledirection=1channelid=+channelid;
+ document.location =
../../resources/ImageAction.do?action=oftencontenttypes=imagesoffset=0channelid=+channelid;
}
/script
link rel=stylesheet type=text/css href=imagesearch.css /
___
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/domain PersonVO.java
Update of
/var/cvs/contributions/CMSContainer_Modules/community/src/java/com/finalist/cmsc/services/community/domain
In directory james.mmbase.org:/tmp/cvs-serv16175/services/community/domain
Modified Files:
Tag: b1_5
PersonVO.java
Log Message:
CMSC-949, Blocking users: user status enhancements,show state through Action
See also:
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer_Modules/community/src/java/com/finalist/cmsc/services/community/domain
See also: http://www.mmbase.org/jira/browse/CMSC-949
Index: PersonVO.java
===
RCS file:
/var/cvs/contributions/CMSContainer_Modules/community/src/java/com/finalist/cmsc/services/community/domain/PersonVO.java,v
retrieving revision 1.4
retrieving revision 1.4.2.1
diff -u -b -r1.4 -r1.4.2.1
--- PersonVO.java 23 Sep 2008 07:12:57 - 1.4
+++ PersonVO.java 2 Dec 2008 09:46:51 - 1.4.2.1
@@ -9,6 +9,15 @@
private String groups;
private Long authId;
private boolean inGroup;
+ private String active;
+
+ public String getActive() {
+ return active;
+ }
+
+ public void setActive(String active) {
+ this.active = active;
+ }
public String getFullname() {
return fullname;
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] applications/crontab/src/org/mmbase/applications/crontab CronEntry.java
Update of /var/cvs/applications/crontab/src/org/mmbase/applications/crontab
In directory
james.mmbase.org:/tmp/cvs-serv15666/src/org/mmbase/applications/crontab
Modified Files:
CronEntry.java
Log Message:
some details
See also:
http://cvs.mmbase.org/viewcvs/applications/crontab/src/org/mmbase/applications/crontab
Index: CronEntry.java
===
RCS file:
/var/cvs/applications/crontab/src/org/mmbase/applications/crontab/CronEntry.java,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -b -r1.19 -r1.20
--- CronEntry.java 2 Dec 2008 09:10:36 - 1.19
+++ CronEntry.java 2 Dec 2008 09:23:22 - 1.20
@@ -20,7 +20,7 @@
*
* @author Kees Jongenburger
* @author Michiel Meeuwissen
- * @version $Id: CronEntry.java,v 1.19 2008/12/02 09:10:36 michiel Exp $
+ * @version $Id: CronEntry.java,v 1.20 2008/12/02 09:23:22 michiel Exp $
*/
public class CronEntry implements java.io.Serializable {
@@ -211,8 +211,8 @@
public boolean isMustBeOne() {
return type == Type.MUSTBEONE || type == Type.BALANCE_MUSTBEONE;
}
-public Pattern getServers() {
-return servers;
+public String getServers() {
+return servers.pattern();
}
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] src/org/mmbase/util ThreadPools.java
Update of /var/cvs/src/org/mmbase/util
In directory james.mmbase.org:/tmp/cvs-serv21033
Modified Files:
ThreadPools.java
Log Message:
oops
See also: http://cvs.mmbase.org/viewcvs/src/org/mmbase/util
Index: ThreadPools.java
===
RCS file: /var/cvs/src/org/mmbase/util/ThreadPools.java,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -b -r1.23 -r1.24
--- ThreadPools.java2 Dec 2008 11:16:45 - 1.23
+++ ThreadPools.java2 Dec 2008 13:04:19 - 1.24
@@ -18,7 +18,7 @@
*
* @since MMBase 1.8
* @author Michiel Meeuwissen
- * @version $Id: ThreadPools.java,v 1.23 2008/12/02 11:16:45 michiel Exp $
+ * @version $Id: ThreadPools.java,v 1.24 2008/12/02 13:04:19 michiel Exp $
*/
public abstract class ThreadPools {
private static final Logger log =
Logging.getLoggerInstance(ThreadPools.class);
@@ -40,10 +40,10 @@
* Wrapper around Thread.scheduler.scheduleAtFixedRate.
* @deprecated
*/
-public static ScheduledFuture scheduleAtFixedRate(Runnable pub, int time,
int time) {
-return scheduler.scheduleAtFixedRate(pub
- time,
- time, TimeUnit.SECONDS);
+public static ScheduledFuture scheduleAtFixedRate(Runnable pub, int time1,
int time2) {
+return scheduler.scheduleAtFixedRate(pub,
+ time1,
+ time1, TimeUnit.SECONDS);
}
/**
* returns a identifier string for the given task.
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] contributions/CMSContainer/cmsc/contentrepository/src/webapp/editors/resources imagesearch.jsp
Update of
/var/cvs/contributions/CMSContainer/cmsc/contentrepository/src/webapp/editors/resources
In directory
james.mmbase.org:/tmp/cvs-serv17417/cmsc/contentrepository/src/webapp/editors/resources
Modified Files:
imagesearch.jsp
Log Message:
CMSC-1126 using Assets in content
See also:
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer/cmsc/contentrepository/src/webapp/editors/resources
See also: http://www.mmbase.org/jira/browse/CMSC-1126
Index: imagesearch.jsp
===
RCS file:
/var/cvs/contributions/CMSContainer/cmsc/contentrepository/src/webapp/editors/resources/imagesearch.jsp,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -b -r1.29 -r1.30
--- imagesearch.jsp 2 Dec 2008 08:10:51 - 1.29
+++ imagesearch.jsp 2 Dec 2008 10:06:24 - 1.30
@@ -54,22 +54,9 @@
mm:cloud jspvar=cloud loginpage=../../editors/login.jsp
mm:import externid=actionoften/mm:import%-- either often or search --%
div class=editor style=height:555px
- div class=body
- html:form action=/editors/resources/ImageAction method=post
-html:hidden property=action value=${action}/
-html:hidden property=offset/
-html:hidden property=order/
-html:hidden property=direction/
-mm:import id=contenttypes
jspvar=contenttypesimages/mm:import
-c:if test=${action == 'search'}
- [EMAIL PROTECTED] file=imageform.jsp %
-/c:if
- /html:form
- /div
- div class=ruler_green
c:choose
c:when test=${empty param.channelid}
- divfmt:message
key=images.channel.titlefmt:paramALL
CHANNELS/fmt:param/fmt:message/div
+mm:import id=channelMsgfmt:message
key=images.channel.titlefmt:paramALL
CHANNELS/fmt:param/fmt:message/mm:import
/c:when
c:otherwise
c:if test=${param.channelid eq 'current'}
@@ -77,12 +64,27 @@
/c:if
mm:node number=${channelid}
mm:field name=pathfragment
id=pathfragment write=false /
- divfmt:message
key=images.channel.title
+ mm:import id=channelMsg
+ fmt:message key=images.channel.title
fmt:param
value=${pathfragment} /
- /fmt:message/div
+ /fmt:message
+ /mm:import
/mm:node
/c:otherwise
/c:choose
+ div class=body c:if test=${action !=
'search'}style=display:none/c:if
+ html:form action=/editors/resources/ImageAction method=post
+html:hidden property=action value=${action}/
+c:if test=${!empty channelid}
+ html:hidden property=channelid value=${channelid}/
+/c:if
+html:hidden property=offset/
+mm:import id=contenttypes
jspvar=contenttypesimages/mm:import
+ [EMAIL PROTECTED] file=imageform.jsp %
+ /html:form
+ /div
+ div class=ruler_green
+ divc:out value=${channelMsg} //div
` /div
div class=body style=max-height:400px;overflow-y:auto;
overflow-x:hidden
mm:import externid=results jspvar=nodeList vartype=List/
___
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-serv15666/src/org/mmbase/applications/crontab/builders
Modified Files:
NodeCronEntry.java
Log Message:
some details
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.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- NodeCronEntry.java 2 Dec 2008 09:10:36 - 1.4
+++ NodeCronEntry.java 2 Dec 2008 09:23:22 - 1.5
@@ -17,7 +17,7 @@
/**
*
* @author Michiel Meeuwissen
- * @version $Id: NodeCronEntry.java,v 1.4 2008/12/02 09:10:36 michiel Exp $
+ * @version $Id: NodeCronEntry.java,v 1.5 2008/12/02 09:23:22 michiel Exp $
* @since MMBase-1.8.6
*/
@@ -44,12 +44,26 @@
return
org.mmbase.bridge.ContextProvider.getDefaultCloudContext().getCloud(mmbase,
class, null).getNode(getId());
}
+@Override public String getServers() {
+NodeIterator servers =
getNode().getRelatedNodes(mmservers).nodeIterator();
+if (! servers.hasNext()) return ;
+StringBuilder bul = new StringBuilder();
+while (servers.hasNext()) {
+Node server = servers.nextNode();
+if (bul.length() 0) bul.append( );
+bul.append(server.getStringValue(name));
+}
+return bul.toString();
+
+}
@Override public boolean isActive() {
-NodeList servers = getNode().getRelatedNodes(mmservers);
+NodeIterator servers =
getNode().getRelatedNodes(mmservers).nodeIterator();
+if (! servers.hasNext()) return true;
+
String machineName =
org.mmbase.module.core.MMBaseContext.getMachineName();
-for (int i=0; i servers.size(); i++) {
-Node server = servers.getNode(i);
+while (servers.hasNext()) {
+Node server = servers.nextNode();
String name = server.getStringValue(name);
if (name != null name.equalsIgnoreCase(machineName)) {
log.service(Active [ + this + ] for server [ + name + ]);
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] contributions/CMSContainer_Modules/community/src/webapp/editors/community/js formcheck.js
Update of
/var/cvs/contributions/CMSContainer_Modules/community/src/webapp/editors/community/js
In directory james.mmbase.org:/tmp/cvs-serv16355/src/webapp/editors/community/js
Modified Files:
Tag: b1_5
formcheck.js
Log Message:
CMSC-949, Blocking users: user status enhancements,show useful state by jsp
See also:
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer_Modules/community/src/webapp/editors/community/js
See also: http://www.mmbase.org/jira/browse/CMSC-949
Index: formcheck.js
===
RCS file:
/var/cvs/contributions/CMSContainer_Modules/community/src/webapp/editors/community/js/formcheck.js,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -u -b -r1.2 -r1.2.2.1
--- formcheck.js1 Aug 2008 07:20:18 - 1.2
+++ formcheck.js2 Dec 2008 09:49:58 - 1.2.2.1
@@ -23,3 +23,8 @@
document.forms[0].method.value = addInit;
document.forms[0].submit();
}
\ No newline at end of file
+function selectState(url,ele){
+ surl=url+state=+ele.value
+ // alert(surl);
+ window.location.href =surl;
+}
\ No newline at end of file
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] speeltuin/nightly mail-results.sh build.sh env.sh version.sh
Update of /var/cvs/speeltuin/nightly
In directory james.mmbase.org:/home/nightly/bin
Modified Files:
build.sh env.sh version.sh
Added Files:
mail-results.sh
Log Message:
See also: http://cvs.mmbase.org/viewcvs/speeltuin/nightly
mail-results.sh is new
Index: build.sh
===
RCS file: /var/cvs/speeltuin/nightly/build.sh,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -b -r1.28 -r1.29
--- build.sh15 Nov 2008 09:40:05 - 1.28
+++ build.sh2 Dec 2008 08:09:13 - 1.29
@@ -1,11 +1,6 @@
#!/bin/bash
source $HOME/bin/env.sh
-
-export MAILADDRESS=[EMAIL PROTECTED]
-#export MAILADDRESS=[EMAIL PROTECTED]
-export BUILD_MAILADDRESS=$MAILADDRESS
-
source $HOME/bin/version.sh
# UNSTABLE branch
@@ -51,7 +46,7 @@
if [ 1 == 1 ] ; then
-echo Now executing tests. Results in ${builder}/test-results. | tee -a
${builddir}/messages.log
+echo Now executing tests. Results in ${builddir}/test-results.log | tee -a
${builddir}/messages.log
cd ${BUILD_HOME}/nightly-build/cvs/mmbase/tests
${antcommand} -quiet -listener org.apache.tools.ant.listener.Log4jListener
-lib lib:. run.all 21 | tee ${builddir}/tests-results.log
fi
@@ -63,43 +58,4 @@
echo 'ln -s ${dir} latest' in `pwd` | tee -a ${builddir}/messages.log
ln -s ${dir} latest
- # Using one thread for all mail about failures
-parent=[EMAIL PROTECTED];
-mutthdr=my_hdr In-Reply-To: ${parent};
-
-
-showtests=1
-if [ 1 == 1 ] ; then
-if [ -f latest/messages.log ] ; then
-if (( `cat latest/messages.log | grep -P
'\[javac\]\s+[0-9]+\s+errors' | wc -l` 0 )) ; then
- echo Build failed, sending mail to ${BUILD_MAILADDRESS} | tee -a
${builddir}/messages.log
- echo -e Build on ${version} failed:\n\n | \
- cat latest/messages.log latest/errors.log | grep -B 10
\[javac\] | \
- mutt -e $mutthdr -s Build failed ${BUILD_MAILADDRESS}
- showtests=0;
-fi
-else
-echo Build failed, sending mail to ${BUILD_MAILADDRESS} | tee -a
${builddir}/messages.log
-echo -e No build created on ${version}\n\n | \
-tail -q -n 20 - latest/errors.log | \
-mutt -e $mutthdr -s Build failed ${BUILD_MAILADDRESS}
- showtests=0;
-fi
-fi
-
-
-
-if [ 1 == $showtests ] ; then
-cd /home/nightly/builds
-echo Test results | tee -a ${builddir}/messages.log
-
-if [ -f latest/tests-results.log ] ; then
- if (( `cat latest/tests-results.log | grep 'FAILURES' | wc -l` 0 ))
; then
- echo Failures, sending mail to ${MAILADDRESS} | tee -a
${builddir}/messages.log
- (echo Failures on build ${version} ; echo See also
http://www.mmbase.org/download/builds/latest/tests-results.log; ; \
-cat latest/tests-results.log | grep -P '(^Tests
run:|^[0-9]+\)|^\tat org\.mmbase|FAILURES||OK)' ) | \
- mutt -e $mutthdr -s Test cases failures ${MAILADDRESS}
- fi
-fi
-fi
-
+$HOME/bin/mail-results.sh
\ No newline at end of file
Index: env.sh
===
RCS file: /var/cvs/speeltuin/nightly/env.sh,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- env.sh 4 Nov 2008 07:05:09 - 1.2
+++ env.sh 2 Dec 2008 08:09:13 - 1.3
@@ -1,6 +1,5 @@
-
echo setting PATH, JAVA HOME
-export
PATH=/bin:/usr/bin:/usr/local/bin:/usr/local/sbin:/usr/ccs/bin:/home/nightly/bin
+export
PATH=/home/nightly/apache-ant/bin:/bin:/usr/bin:/usr/local/bin:/usr/local/sbin:/usr/ccs/bin:/home/nightly/bin:/home/nightly/maven/bin
echo $HOME
@@ -9,11 +8,11 @@
export JAVA_HOME=/home/nightly/jdk
export JAVAC=${JAVA_HOME}/bin/javac
-export MAVEN_OPTS=-Xmx700m -XX:MaxPermSize=128m
+export MAVEN_OPTS=-Xmx700m -XX:MaxPermSize=128m
export MAVEN=/home/nightly/maven/bin/maven --nobanner --quiet
export CVS=/usr/bin/cvs -d :pserver:[EMAIL PROTECTED]:/var/cvs
-export ANT_HOME=/usr/ant
-antcommand=/usr/bin/ant
+export ANT_HOME=/home/nightly/apache-ant
+antcommand=$ANT_HOME/bin/ant
# Ant sucks incredibly. This classapth should not be necessary, but really, it
is (not with ant 1.7)
export
CLASSPATH=${BUILD_HOME}/.ant/lib/ant-apache-log4j.jar:${BUILD_HOME}/.ant/lib/log4j-1.2.13.jar
Index: version.sh
===
RCS file: /var/cvs/speeltuin/nightly/version.sh,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- version.sh 25 Sep 2008 19:48:49 - 1.2
+++ version.sh 2 Dec 2008 08:09:13 - 1.3
@@ -1,14 +1,14 @@
-mmbaseversion=1.9.0-SNAPSHOT
+mmbaseversion=1.9-SNAPSHOT
version=`date -u '+%Y-%m-%d'`
cvsversionoption=-D
cvsversion=`date '+%Y-%m-%d %H:%M'`
revision=-A
-#version=MMBase-1.9.0.beta2
+#version=MMBase-1.9.0.final
#cvsversion=
#cvsversionoption=-r
[MMBASE CVS] src/org/mmbase/util XMLBasicReader.java
Update of /var/cvs/src/org/mmbase/util
In directory james.mmbase.org:/tmp/cvs-serv25187
Modified Files:
Tag: MMBase-1_8
XMLBasicReader.java
Log Message:
I suppose this would fix MMB-1743, though I have no access to a Vista machine
See also: http://cvs.mmbase.org/viewcvs/src/org/mmbase/util
See also: http://www.mmbase.org/jira/browse/MMB-1743
Index: XMLBasicReader.java
===
RCS file: /var/cvs/src/org/mmbase/util/XMLBasicReader.java,v
retrieving revision 1.46
retrieving revision 1.46.2.1
diff -u -b -r1.46 -r1.46.2.1
--- XMLBasicReader.java 26 Jan 2006 10:21:50 - 1.46
+++ XMLBasicReader.java 2 Dec 2008 16:16:08 - 1.46.2.1
@@ -31,7 +31,7 @@
* @author Rico Jansen
* @author Pierre van Rooden
* @author Michiel Meeuwissen
- * @version $Id: XMLBasicReader.java,v 1.46 2006/01/26 10:21:50 michiel Exp $
+ * @version $Id: XMLBasicReader.java,v 1.46.2.1 2008/12/02 16:16:08 michiel
Exp $
*/
public class XMLBasicReader extends DocumentReader {
@@ -91,8 +91,10 @@
try {
is.setSystemId(new File(path).toURL().toExternalForm());
} catch (java.net.MalformedURLException mfe) {
-}
+log.warn(mfe);
+if (! path.startsWith(/)) path = / + path;
is.setSystemId(file:// + path);
+}
} catch (java.io.FileNotFoundException e) {
log.error(Error reading + path + : + e.toString());
log.service(Using empty source);
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] src/org/mmbase/module/core TransactionResolver.java
Update of /var/cvs/src/org/mmbase/module/core
In directory james.mmbase.org:/tmp/cvs-serv25461
Modified Files:
TransactionResolver.java
Log Message:
only split upt the one method up in some (private) methods. This make the scope
of variables clearer, and the methods can be documented seperately
See also: http://cvs.mmbase.org/viewcvs/src/org/mmbase/module/core
Index: TransactionResolver.java
===
RCS file: /var/cvs/src/org/mmbase/module/core/TransactionResolver.java,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -b -r1.30 -r1.31
--- TransactionResolver.java9 Jan 2008 12:26:51 - 1.30
+++ TransactionResolver.java2 Dec 2008 16:32:23 - 1.31
@@ -18,7 +18,7 @@
* @javadoc
*
* @author Rico Jansen
- * @version $Id: TransactionResolver.java,v 1.30 2008/01/09 12:26:51 michiel
Exp $
+ * @version $Id: TransactionResolver.java,v 1.31 2008/12/02 16:32:23 michiel
Exp $
*/
class TransactionResolver {
private static final Logger log =
Logging.getLoggerInstance(TransactionResolver.class);
@@ -28,8 +28,75 @@
this.mmbase = mmbase;
}
+
+
+/**
+ * Given a map where the keys are temporary identifiers, sets the values
to actual new node
+ * numbers, unless this was already done.
+ */
+private void getNewNumbers(MapString, Integer numbers) {
+// Get the numbers
+for (Map.EntryString, Integer numberEntry : numbers.entrySet()) {
+Integer num = numberEntry.getValue();
+if (num == null || num.intValue() == -1) {
+int newNumber = mmbase.getStorageManager().createKey();
+log.info( + numberEntry.getKey() + - + newNumber);
+numberEntry.setValue(newNumber);
+}
+}
+
+if (log.isDebugEnabled()) {
+log.debug(TransactionResolver - numbers: + numbers);
+}
+}
+
+private void setNewNumbers(MapMMObjectNode, CollectionString nnodes,
MapString, Integer numbers) {
+// put numbers in the right place
+for (Map.EntryMMObjectNode, CollectionString nnodeEntry :
nnodes.entrySet()) {
+MMObjectNode node = nnodeEntry.getKey();
+CollectionString changedFields = nnodeEntry.getValue();
+for (String field : changedFields) {
+String tmpField = _ + field;
+String key = node.getStringValue(tmpField);
+int number = numbers.get(key);
+node.setValue(field, number);
+}
+}
+}
+
/**
- * Result a transaction. ie. resolves all 'node' fields to actual number
was will be committed
+ * Checks whether all NODE field are indeed filled now, which would mean
that this transaction
+ * was indeed sucessfully resolved now.
+ */
+private void check(final CollectionMMObjectNode nodes) throws
TransactionManagerException {
+
+// Check now whether resolving was completely successfull
+for (MMObjectNode node : nodes) {
+MMObjectBuilder bul = mmbase.getMMObject(node.getName());
+for (CoreField fd : bul.getFields()) {
+int dbtype = fd.getType();
+if ((dbtype == Field.TYPE_INTEGER)||
+(dbtype == Field.TYPE_NODE)) {
+
+String field = fd.getName();
+String tmpField = _ + field;
+if (node.getDBState(tmpField) == Field.STATE_VIRTUAL) {
+int number = node.getIntValue(field);
+if (number == -1) {
+String key = node.getStringValue(tmpField);
+if (key != null key.length() 0) {
+throw new TransactionManagerException(For
node + node + and field + field + . Found value for + tmpField + :
+ key + . Should be empty.);
+}
+}
+}
+}
+}
+}
+}
+
+
+/**
+ * Result a transaction. ie. resolves all 'node' fields to actual number
wich will be committed
* to the database
*
* @throws TransactionManagerException if the transactiosn could not be
successfully completely resolved.
@@ -38,6 +105,8 @@
MapString, Integer numbers = new HashMapString, Integer(); /* Temp
key - Real node number */
MapMMObjectNode, CollectionString nnodes = new
HashMapMMObjectNode, CollectionString(); /* MMObjectNode -- List of
changed fields */
+
+
// Find all unique keys and store them in a map to remap them later
// Also store the nodes with which fields uses them.
for (MMObjectNode node : nodes) {
@@ -110,53 +179,11 @@
log.debug(TransactionResolver - nnodes + nnodes);
}
-// Get the numbers
-for (Map.EntryString, Integer numberEntry :
[MMBASE CVS] src/org/mmbase/module/core TransactionManager.java
Update of /var/cvs/src/org/mmbase/module/core
In directory james.mmbase.org:/tmp/cvs-serv25961
Modified Files:
TransactionManager.java
Log Message:
indentation, scoping
See also: http://cvs.mmbase.org/viewcvs/src/org/mmbase/module/core
Index: TransactionManager.java
===
RCS file: /var/cvs/src/org/mmbase/module/core/TransactionManager.java,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -b -r1.48 -r1.49
--- TransactionManager.java 11 Nov 2008 07:46:30 - 1.48
+++ TransactionManager.java 2 Dec 2008 16:52:20 - 1.49
@@ -21,18 +21,18 @@
* @javadoc
*
* @author Rico Jansen
- * @version $Id: TransactionManager.java,v 1.48 2008/11/11 07:46:30 michiel
Exp $
+ * @version $Id: TransactionManager.java,v 1.49 2008/12/02 16:52:20 michiel
Exp $
*/
public class TransactionManager {
private static final Logger log =
Logging.getLoggerInstance(TransactionManager.class);
static final String EXISTS_NO = no;
-static final int I_EXISTS_NO = 0;
+private static final int I_EXISTS_NO = 0;
static final String EXISTS_YES = yes;
-static final int I_EXISTS_YES = 1;
-public static final String EXISTS_NOLONGER = nolonger;
-static final int I_EXISTS_NOLONGER = 2;
+private static final int I_EXISTS_YES = 1;
+static final StringEXISTS_NOLONGER = nolonger;
+private static final int I_EXISTS_NOLONGER = 2;
private TemporaryNodeManager tmpNodeManager;
private TransactionResolver transactionResolver;
@@ -305,7 +305,7 @@
NodeState state = new NodeState();
state.state = State.UNCOMMITED;
state.changed = node.isChanged() || node.isNew();
-String exists =
node.getStringValue(MMObjectBuilder.TMP_FIELD_EXISTS);
+String exists = (String)
node.getValue(MMObjectBuilder.TMP_FIELD_EXISTS);
if (exists == null) {
throw new IllegalStateException(The _exists field does not
exist on node +node);
} else if (exists.equals(EXISTS_NO)) {
@@ -315,7 +315,7 @@
} else if (exists.equals(EXISTS_NOLONGER)) {
state.exists = I_EXISTS_NOLONGER;
} else {
-throw new IllegalStateException(Invalid value for _exists on
node +node);
+throw new IllegalStateException(Invalid value for _exists '
+ exists + ' on node + node);
}
stati.put(node.getNumber(), state);
}
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] src/org/mmbase/module/core TemporaryNodeManager.java
Update of /var/cvs/src/org/mmbase/module/core
In directory james.mmbase.org:/tmp/cvs-serv26088
Modified Files:
TemporaryNodeManager.java
Log Message:
bigdecimal
See also: http://cvs.mmbase.org/viewcvs/src/org/mmbase/module/core
Index: TemporaryNodeManager.java
===
RCS file: /var/cvs/src/org/mmbase/module/core/TemporaryNodeManager.java,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -b -r1.56 -r1.57
--- TemporaryNodeManager.java 2 Dec 2008 16:38:31 - 1.56
+++ TemporaryNodeManager.java 2 Dec 2008 16:58:02 - 1.57
@@ -9,6 +9,7 @@
*/
package org.mmbase.module.core;
+import java.math.BigDecimal;
import org.mmbase.bridge.Field;
import org.mmbase.module.corebuilders.RelDef;
@@ -28,7 +29,7 @@
* @javadoc
*
* @author Rico Jansen
- * @version $Id: TemporaryNodeManager.java,v 1.56 2008/12/02 16:38:31 michiel
Exp $
+ * @version $Id: TemporaryNodeManager.java,v 1.57 2008/12/02 16:58:02 michiel
Exp $
*/
public class TemporaryNodeManager {
@@ -230,6 +231,16 @@
return INVALID_VALUE;
}
break;
+case Field.TYPE_DECIMAL:
+try {
+BigDecimal d = BigDecimal.ONE.negate();
+if (!stringValue.equals()) d = new
BigDecimal(stringValue);
+node.setValue(field, d);
+} catch (NumberFormatException x) {
+log.debug(Value for field + field + is not a
number + stringValue);
+return INVALID_VALUE;
+}
+break;
case Field.TYPE_DATETIME:
try {
node.setValue(field, Casting.toDate(value));
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] Delivery Status Notification
___ Cvs mailing list Cvs@lists.mmbase.org http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] RE: Dear [EMAIL PROTECTED] Dec 85% 0FF
___ Cvs mailing list Cvs@lists.mmbase.org http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] Delivery Status Notification
___ Cvs mailing list Cvs@lists.mmbase.org http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] contributions/CMSContainer_Portlets/portlets-login README.txt
Update of /var/cvs/contributions/CMSContainer_Portlets/portlets-login In directory james.mmbase.org:/tmp/cvs-serv3478 Modified Files: README.txt Log Message: CMSC-948 Registration portlet for CMS container add a sql script to alter table mm_portletparameter See also: http://cvs.mmbase.org/viewcvs/contributions/CMSContainer_Portlets/portlets-login See also: http://www.mmbase.org/jira/browse/CMSC-948 Index: README.txt === RCS file: /var/cvs/contributions/CMSContainer_Portlets/portlets-login/README.txt,v retrieving revision 1.2 retrieving revision 1.3 diff -u -b -r1.2 -r1.3 --- README.txt 8 Feb 2008 10:36:02 - 1.2 +++ README.txt 3 Dec 2008 02:24:48 - 1.3 @@ -1,3 +1,5 @@ DESCRIPTION: Login portlet + check the prefix_portletparameter ,be sure that the value of field m_value is varchar (4000),if not ,run the following script to do it + alter table prefix_portletparameter modify m_value varchar(4000) ___ 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 ComparisonUtil.java
Update of /var/cvs/contributions/CMSContainer/cmsc/utilities/src/java/com/finalist/cmsc/util In directory james.mmbase.org:/tmp/cvs-serv12310/utilities/src/java/com/finalist/cmsc/util Added Files: ComparisonUtil.java Log Message: CMSC-1126 (using Assets in contentElements,add action about selecting often used images in all channels,move the comparisonUtil.java to Container) 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 ComparisonUtil.java is new ___ Cvs mailing list Cvs@lists.mmbase.org http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/util NewsletterBounceUtil.java ComparisonUtil.java
Update of
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/util
In directory james.mmbase.org:/tmp/cvs-serv12414/util
Modified Files:
NewsletterBounceUtil.java
Removed Files:
ComparisonUtil.java
Log Message:
CMSC-1126 (Move the ComparisonUtil.java to 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.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- NewsletterBounceUtil.java 22 Oct 2008 05:32:07 - 1.5
+++ NewsletterBounceUtil.java 3 Dec 2008 05:34:40 - 1.6
@@ -18,7 +18,7 @@
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] contributions/CMSContainer_Modules/community/src/webapp/editors/community/js formcheck.js
Update of
/var/cvs/contributions/CMSContainer_Modules/community/src/webapp/editors/community/js
In directory james.mmbase.org:/tmp/cvs-serv13609/js
Modified Files:
formcheck.js
Log Message:
CMSC-949, Blocking users: user status enhancements,pull-down options in lower
case
See also:
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer_Modules/community/src/webapp/editors/community/js
See also: http://www.mmbase.org/jira/browse/CMSC-949
Index: formcheck.js
===
RCS file:
/var/cvs/contributions/CMSContainer_Modules/community/src/webapp/editors/community/js/formcheck.js,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- formcheck.js2 Dec 2008 08:18:01 - 1.3
+++ formcheck.js3 Dec 2008 06:11:20 - 1.4
@@ -28,3 +28,19 @@
// alert(surl);
window.location.href =surl;
}
\ No newline at end of file
+function onState(){
+var sels = document.getElementsByTagName(select);
+for (i = 0; i sels.length; i++) {
+var sel = sels[i];
+var options = sel.getElementsByTagName(option);
+var v = options[0];
+if ( == v.value) {
+options[0].parentNode.removeChild(options[0]);
+}
+for (j = 1; j options.length; j++) {
+if (v.value == options[j].value) {
+options[j].parentNode.removeChild(options[j]);
+}
+}
+}
+}
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] contributions/CMSContainer/cmsc/contentrepository/src/java/com/finalist/cmsc/resources/forms SearchAction.java
Update of
/var/cvs/contributions/CMSContainer/cmsc/contentrepository/src/java/com/finalist/cmsc/resources/forms
In directory
james.mmbase.org:/tmp/cvs-serv13724/cmsc/contentrepository/src/java/com/finalist/cmsc/resources/forms
Modified Files:
SearchAction.java
Log Message:
CMSC-1126 using Assets in content
See also:
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer/cmsc/contentrepository/src/java/com/finalist/cmsc/resources/forms
See also: http://www.mmbase.org/jira/browse/CMSC-1126
Index: SearchAction.java
===
RCS file:
/var/cvs/contributions/CMSContainer/cmsc/contentrepository/src/java/com/finalist/cmsc/resources/forms/SearchAction.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -b -r1.12 -r1.13
--- SearchAction.java 1 Dec 2008 10:47:58 - 1.12
+++ SearchAction.java 3 Dec 2008 06:15:37 - 1.13
@@ -12,15 +12,12 @@
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
-import net.sf.mmapps.commons.util.StringUtil;
-
import org.apache.commons.lang.StringUtils;
import org.apache.struts.action.*;
import org.mmbase.bridge.*;
import org.mmbase.bridge.util.Queries;
import org.mmbase.bridge.util.SearchUtil;
-import org.mmbase.storage.search.RelationStep;
import org.mmbase.storage.search.Step;
import org.mmbase.util.logging.Logger;
import org.mmbase.util.logging.Logging;
@@ -36,9 +33,6 @@
private static final String OBJECTID = objectid;
private static final String CONTENTTYPES = contenttypes;
- private static final String CONTENTCHANNEL = contentchannel;
- private static final String CREATIONREL = creationrel;
- private static final String DESTINATION = destination;
private static final String REPOSITORY_SEARCH_RESULTS_PER_PAGE =
repository.search.results.per.page;
@@ -65,19 +59,6 @@
Step theStep = query.addStep(nodeManager);
query.setNodeStep(theStep);
- //search in one contentchannel
- String channelid=searchForm.getChannelid();
- if(!StringUtil.isEmpty(channelid)){
- //search in the current channel
- if(current.equals(channelid))
- channelid = (String)request.getSession().getAttribute(creation);
- NodeManager channelManager = cloud.getNodeManager(CONTENTCHANNEL);
- RelationStep relStep =
query.addRelationStep(channelManager,CREATIONREL,DESTINATION);
- Step channelStep = relStep.getNext();
- Queries.addConstraints(query, channelManager.getName() + .number= +
channelid);
- request.setAttribute(channelid, channelid);
- }
-
// Order the result by:
String order = searchForm.getOrder();
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] contributions/CMSContainer_Modules/community/src/webapp/editors/community/js formcheck.js
Update of
/var/cvs/contributions/CMSContainer_Modules/community/src/webapp/editors/community/js
In directory james.mmbase.org:/tmp/cvs-serv13751/js
Modified Files:
Tag: b1_5
formcheck.js
Log Message:
CMSC-949, Blocking users: user status enhancements,pull-down options in lower
case
See also:
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer_Modules/community/src/webapp/editors/community/js
See also: http://www.mmbase.org/jira/browse/CMSC-949
Index: formcheck.js
===
RCS file:
/var/cvs/contributions/CMSContainer_Modules/community/src/webapp/editors/community/js/formcheck.js,v
retrieving revision 1.2.2.1
retrieving revision 1.2.2.2
diff -u -b -r1.2.2.1 -r1.2.2.2
--- formcheck.js2 Dec 2008 09:49:58 - 1.2.2.1
+++ formcheck.js3 Dec 2008 06:15:53 - 1.2.2.2
@@ -28,3 +28,19 @@
// alert(surl);
window.location.href =surl;
}
\ No newline at end of file
+function onState(){
+var sels = document.getElementsByTagName(select);
+for (i = 0; i sels.length; i++) {
+var sel = sels[i];
+var options = sel.getElementsByTagName(option);
+var v = options[0];
+if ( == v.value) {
+options[0].parentNode.removeChild(options[0]);
+}
+for (j = 1; j options.length; j++) {
+if (v.value == options[j].value) {
+options[j].parentNode.removeChild(options[j]);
+}
+}
+}
+}
\ No newline at end of file
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] contributions/CMSContainer/cmsc/contentrepository/src/java/com/finalist/cmsc/resources/forms SearchForm.java
Update of
/var/cvs/contributions/CMSContainer/cmsc/contentrepository/src/java/com/finalist/cmsc/resources/forms
In directory
james.mmbase.org:/tmp/cvs-serv13892/cmsc/contentrepository/src/java/com/finalist/cmsc/resources/forms
Modified Files:
SearchForm.java
Log Message:
CMSC-1126 using Assets in content
See also:
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer/cmsc/contentrepository/src/java/com/finalist/cmsc/resources/forms
See also: http://www.mmbase.org/jira/browse/CMSC-1126
Index: SearchForm.java
===
RCS file:
/var/cvs/contributions/CMSContainer/cmsc/contentrepository/src/java/com/finalist/cmsc/resources/forms/SearchForm.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- SearchForm.java 28 Nov 2008 09:28:51 - 1.6
+++ SearchForm.java 3 Dec 2008 06:18:36 - 1.7
@@ -7,17 +7,6 @@
private String contenttypes;
private String objectid;
- private String channelid;
-
-
- public String getChannelid() {
- return channelid;
- }
-
-
- public void setChannelid(String channelid) {
- this.channelid = channelid;
- }
public SearchForm() {
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
