[MMBASE CVS] src/org/mmbase/framework ComponentRepository.java
Update of /var/cvs/src/org/mmbase/framework
In directory james.mmbase.org:/tmp/cvs-serv6628
Modified Files:
ComponentRepository.java
Log Message:
Lowered a log
See also: http://cvs.mmbase.org/viewcvs/src/org/mmbase/framework
Index: ComponentRepository.java
===
RCS file: /var/cvs/src/org/mmbase/framework/ComponentRepository.java,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -b -r1.39 -r1.40
--- ComponentRepository.java11 Jul 2008 15:59:56 - 1.39
+++ ComponentRepository.java21 Aug 2008 16:36:57 - 1.40
@@ -25,7 +25,7 @@
* Components can be configured by placing their configuration in
'config/components/'.
*
* @author Michiel Meeuwissen
- * @version $Id: ComponentRepository.java,v 1.39 2008/07/11 15:59:56 michiel
Exp $
+ * @version $Id: ComponentRepository.java,v 1.40 2008/08/21 16:36:57 michiel
Exp $
* @since MMBase-1.9
*/
public class ComponentRepository {
@@ -177,7 +177,7 @@
ResourceLoader loader =
ResourceLoader.getConfigurationRoot().getChildResourceLoader(child);
Collection components =
loader.getResourcePaths(ResourceLoader.XML_PATTERN, true /* recursive*/);
-log.info("In " + loader + " the following components XML's were found
" + components);
+log.debug("In " + loader + " the following components XML's were found
" + components);
for (String resource : components) {
for (URL url : loader.getResourceList(resource)) {
try {
___
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-serv5761
Modified Files:
ClassAuthentication.java
Log Message:
for performance reasons, don't exeggerate all this pattern checking and stuff
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.18
retrieving revision 1.19
diff -u -b -r1.18 -r1.19
--- ClassAuthentication.java9 Jun 2008 09:53:20 - 1.18
+++ ClassAuthentication.java21 Aug 2008 15:40:19 - 1.19
@@ -29,7 +29,7 @@
* its configuration file, contains this configuration.
*
* @author Michiel Meeuwissen
- * @version $Id: ClassAuthentication.java,v 1.18 2008/06/09 09:53:20 michiel
Exp $
+ * @version $Id: ClassAuthentication.java,v 1.19 2008/08/21 15:40:19 michiel
Exp $
* @see ClassAuthenticationWrapper
* @sinceMMBase-1.8
*/
@@ -38,6 +38,8 @@
public static final String PUBLIC_ID_CLASSSECURITY_1_0 = "-//MMBase//DTD
classsecurity config 1.0//EN";
public static final String DTD_CLASSSECURITY_1_0 =
"classsecurity_1_0.dtd";
+
+private static int MAX_DEPTH = 10;
static {
XMLEntityResolver.registerPublicID(PUBLIC_ID_CLASSSECURITY_1_0,
DTD_CLASSSECURITY_1_0, ClassAuthentication.class);
}
@@ -145,7 +147,7 @@
}
}
}
-if (log.isDebugEnabled()) {
+if (log.isTraceEnabled()) {
log.trace("Class authenticating (" + authenticatedClasses + ")");
}
Throwable t = new Throwable();
@@ -154,11 +156,19 @@
for (Login n : authenticatedClasses) {
if (application == null || application.equals(n.application)) {
Pattern p = n.classPattern;
+int depth = 0;
for (StackTraceElement element : stack) {
String className = element.getClassName();
+if (depth++ > MAX_DEPTH) {
+// for performance reasons, don't exeggerate all this
pattern checking and stuff
+log.debug("not found in time");
+break;
+}
if (className.startsWith("org.mmbase.security.")) continue;
if
(className.startsWith("org.mmbase.bridge.implementation.")) continue;
+if (log.isTraceEnabled()) {
log.trace("Checking " + className);
+}
if (p.matcher(className).matches()) {
if (log.isDebugEnabled()) {
log.debug("" + className + " matches! ->" + n + "
" + n.getMap());
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] contributions/natmm/templates/editors/evenementen evenementen.jsp
Update of /var/cvs/contributions/natmm/templates/editors/evenementen
In directory james.mmbase.org:/tmp/cvs-serv5343/templates/editors/evenementen
Modified Files:
evenementen.jsp
Log Message:
NMCMS-567 Saving activities fails in some IE6 versions, because the browser
accepts no more than 20 cookies. Temporary fixed this by disabling the newly
added cookies.
See also:
http://cvs.mmbase.org/viewcvs/contributions/natmm/templates/editors/evenementen
See also: http://www.mmbase.org/jira/browse/NMCMS-567
Index: evenementen.jsp
===
RCS file:
/var/cvs/contributions/natmm/templates/editors/evenementen/evenementen.jsp,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -b -r1.18 -r1.19
--- evenementen.jsp 22 May 2008 14:56:30 - 1.18
+++ evenementen.jsp 21 Aug 2008 15:13:57 - 1.19
@@ -148,9 +148,9 @@
thisCookie = new Cookie("titelIdFC", titelId ); thisCookie.setMaxAge(maxAge);
response.addCookie(thisCookie);
thisCookie = new Cookie("natuurgebiedenIdFC",natuurgebiedenId );
thisCookie.setMaxAge(maxAge); response.addCookie(thisCookie);
-thisCookie = new Cookie("aanmelderNaamIdFC", aanmelderNaamId );
thisCookie.setMaxAge(maxAge); response.addCookie(thisCookie);
-thisCookie = new Cookie("aanmelderPostcodeIdFC", aanmelderPostcodeId );
thisCookie.setMaxAge(maxAge); response.addCookie(thisCookie);
-thisCookie = new Cookie("aanmelderNummerIdFC", aanmelderNummerId );
thisCookie.setMaxAge(maxAge); response.addCookie(thisCookie);
+// thisCookie = new Cookie("aanmelderNaamIdFC", aanmelderNaamId );
thisCookie.setMaxAge(maxAge); response.addCookie(thisCookie);
+// thisCookie = new Cookie("aanmelderPostcodeIdFC", aanmelderPostcodeId );
thisCookie.setMaxAge(maxAge); response.addCookie(thisCookie);
+// thisCookie = new Cookie("aanmelderNummerIdFC", aanmelderNummerId );
thisCookie.setMaxAge(maxAge); response.addCookie(thisCookie);
thisCookie = new Cookie("beginDyIdFC", beginDyId );
thisCookie.setMaxAge(maxAge); response.addCookie(thisCookie);
thisCookie = new Cookie("beginMnthIdFC", beginMnthId );
thisCookie.setMaxAge(maxAge); response.addCookie(thisCookie);
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] src/org/mmbase/datatypes BasicDataType.java
Update of /var/cvs/src/org/mmbase/datatypes
In directory james.mmbase.org:/tmp/cvs-serv5127
Modified Files:
BasicDataType.java
Log Message:
observed that it spends a lot of time in the getCloud method on class
security. Perhaps this helps
See also: http://cvs.mmbase.org/viewcvs/src/org/mmbase/datatypes
Index: BasicDataType.java
===
RCS file: /var/cvs/src/org/mmbase/datatypes/BasicDataType.java,v
retrieving revision 1.95
retrieving revision 1.96
diff -u -b -r1.95 -r1.96
--- BasicDataType.java 13 Aug 2008 21:32:17 - 1.95
+++ BasicDataType.java 21 Aug 2008 14:59:52 - 1.96
@@ -40,7 +40,7 @@
* @author Pierre van Rooden
* @author Michiel Meeuwissen
* @since MMBase-1.8
- * @version $Id: BasicDataType.java,v 1.95 2008/08/13 21:32:17 michiel Exp $
+ * @version $Id: BasicDataType.java,v 1.96 2008/08/21 14:59:52 michiel Exp $
*/
public class BasicDataType extends AbstractDescriptor implements
DataType, Cloneable, Comparable>, Descriptor {
@@ -328,6 +328,7 @@
return null;
}
+private static Cloud classCloud = null;
/**
* Returns a cloud object if argument is null. Otherwise the
argument.
* @since MMBase-1.8.6
@@ -340,7 +341,9 @@
if (cloud == null) {
CloudContext context = ContextProvider.getDefaultCloudContext();
if (! context.isUp()) return null;
-cloud = context.getCloud("mmbase", "class", null);
+// class security can be a bit expensive, and this method can in
certain cases be called very often.
+if (classCloud == null || ! classCloud.getUser().isValid())
classCloud = context.getCloud("mmbase", "class", null);
+cloud = classCloud;
}
return cloud;
}
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] contributions/didactor2/src/education/templates/education/wizards/show learnblocks.jspx xmlcontent.jspx
Update of
/var/cvs/contributions/didactor2/src/education/templates/education/wizards/show
In directory james.mmbase.org:/tmp/cvs-serv4427/show
Modified Files:
learnblocks.jspx xmlcontent.jspx
Log Message:
See also:
http://cvs.mmbase.org/viewcvs/contributions/didactor2/src/education/templates/education/wizards/show
Index: learnblocks.jspx
===
RCS file:
/var/cvs/contributions/didactor2/src/education/templates/education/wizards/show/learnblocks.jspx,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- learnblocks.jspx6 Mar 2008 16:30:45 - 1.4
+++ learnblocks.jspx21 Aug 2008 14:22:29 - 1.5
@@ -7,9 +7,9 @@
-
+
-
+ ${parentBranch}|
-1
-
-
+
/editwizards/data
+ /editwizards/javascript
+
config/xmlcontent/xmlcontent
${di:setting('richtext',
'link_nodetypes')}
${locale.language}
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] contributions/didactor2/src/education/templates/education/wizards/new learnblocks.jspx xmlcontent.jspx
Update of
/var/cvs/contributions/didactor2/src/education/templates/education/wizards/new
In directory james.mmbase.org:/tmp/cvs-serv4427/new
Modified Files:
learnblocks.jspx xmlcontent.jspx
Log Message:
See also:
http://cvs.mmbase.org/viewcvs/contributions/didactor2/src/education/templates/education/wizards/new
Index: learnblocks.jspx
===
RCS file:
/var/cvs/contributions/didactor2/src/education/templates/education/wizards/new/learnblocks.jspx,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- learnblocks.jspx12 Jun 2008 12:52:51 - 1.5
+++ learnblocks.jspx21 Aug 2008 14:22:29 - 1.6
@@ -18,8 +18,10 @@
config/learnblocks/learnblocks-origin
new
+
Index: xmlcontent.jspx
===
RCS file:
/var/cvs/contributions/didactor2/src/education/templates/education/wizards/new/xmlcontent.jspx,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- xmlcontent.jspx 11 Jul 2008 13:08:40 - 1.9
+++ xmlcontent.jspx 21 Aug 2008 14:22:29 - 1.10
@@ -23,6 +23,7 @@
config/xmlcontent/xmlcontent
/editwizards/data
+${mm:treelink('/kupu', includePath)}
/editwizards/javascript
${di:setting('richtext',
'link_nodetypes')}
new
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] contributions/didactor2/src/education/templates/education/wizards/modes content_metadata.jsp educations.jsp
Update of /var/cvs/contributions/didactor2/src/education/templates/education/wizards/modes In directory james.mmbase.org:/tmp/cvs-serv4427/modes Modified Files: content_metadata.jsp educations.jsp Log Message: See also: http://cvs.mmbase.org/viewcvs/contributions/didactor2/src/education/templates/education/wizards/modes Index: content_metadata.jsp === RCS file: /var/cvs/contributions/didactor2/src/education/templates/education/wizards/modes/content_metadata.jsp,v retrieving revision 1.6 retrieving revision 1.7 diff -u -b -r1.6 -r1.7 --- content_metadata.jsp14 Mar 2008 17:37:00 - 1.6 +++ content_metadata.jsp21 Aug 2008 14:22:29 - 1.7 @@ -65,16 +65,21 @@ + +
[MMBASE CVS] contributions/didactor2/src/education/templates/education/wizards index.jsp learnobject.jsp mode.include.jsp
Update of
/var/cvs/contributions/didactor2/src/education/templates/education/wizards
In directory james.mmbase.org:/tmp/cvs-serv4427
Modified Files:
index.jsp learnobject.jsp mode.include.jsp
Log Message:
See also:
http://cvs.mmbase.org/viewcvs/contributions/didactor2/src/education/templates/education/wizards
Index: index.jsp
===
RCS file:
/var/cvs/contributions/didactor2/src/education/templates/education/wizards/index.jsp,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -b -r1.32 -r1.33
--- index.jsp 14 Mar 2008 17:37:00 - 1.32
+++ index.jsp 21 Aug 2008 14:22:29 - 1.33
@@ -19,6 +19,7 @@
-->
+
Index: learnobject.jsp
===
RCS file:
/var/cvs/contributions/didactor2/src/education/templates/education/wizards/learnobject.jsp,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -b -r1.27 -r1.28
--- learnobject.jsp 20 Jun 2008 14:15:53 - 1.27
+++ learnobject.jsp 21 Aug 2008 14:22:29 - 1.28
@@ -31,6 +31,7 @@
maxdepth="6">
+ TYPE ${_}
false
- ${locale.language}
- delegate
+ page="/mmbase/edit/wizard/jsp/wizard.jsp"
objectlist="$includePath" referids="templates">
+
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] html/mmbase/validation javascript.jspxf
Update of /var/cvs/html/mmbase/validation In directory james.mmbase.org:/tmp/cvs-serv2773 Modified Files: Tag: MMBase-1_8 javascript.jspxf Log Message: avoid collision with hazardly existing var 'javascript' See also: http://cvs.mmbase.org/viewcvs/html/mmbase/validation Index: javascript.jspxf === RCS file: /var/cvs/html/mmbase/validation/javascript.jspxf,v retrieving revision 1.1.2.5 retrieving revision 1.1.2.6 diff -u -b -r1.1.2.5 -r1.1.2.6 --- javascript.jspxf1 Jul 2008 08:39:00 - 1.1.2.5 +++ javascript.jspxf21 Aug 2008 12:18:06 - 1.1.2.6 @@ -4,8 +4,8 @@ xmlns:mm="http://www.mmbase.org/mmbase-taglib-2.0"; > - - + + ___ Cvs mailing list Cvs@lists.mmbase.org http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] html/mmbase/jquery jquery.jspx
Update of /var/cvs/html/mmbase/jquery In directory james.mmbase.org:/tmp/cvs-serv2732 Modified Files: Tag: MMBase-1_8 jquery.jspx Log Message: avoid collision with hazardly existing var 'javascript' See also: http://cvs.mmbase.org/viewcvs/html/mmbase/jquery Index: jquery.jspx === RCS file: /var/cvs/html/mmbase/jquery/jquery.jspx,v retrieving revision 1.1.2.2 retrieving revision 1.1.2.3 diff -u -b -r1.1.2.2 -r1.1.2.3 --- jquery.jspx 1 Jul 2008 08:37:33 - 1.1.2.2 +++ jquery.jspx 21 Aug 2008 12:17:55 - 1.1.2.3 @@ -4,8 +4,8 @@ xmlns:mm="http://www.mmbase.org/mmbase-taglib-2.0"; > - - + + ___ Cvs mailing list Cvs@lists.mmbase.org http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] html/mmbase/validation javascript.jspxf
Update of /var/cvs/html/mmbase/validation In directory james.mmbase.org:/tmp/cvs-serv2674 Modified Files: javascript.jspxf Log Message: avoid collision with hazardly existing var 'javascript' See also: http://cvs.mmbase.org/viewcvs/html/mmbase/validation Index: javascript.jspxf === RCS file: /var/cvs/html/mmbase/validation/javascript.jspxf,v retrieving revision 1.7 retrieving revision 1.8 diff -u -b -r1.7 -r1.8 --- javascript.jspxf1 Jul 2008 08:39:16 - 1.7 +++ javascript.jspxf21 Aug 2008 12:16:29 - 1.8 @@ -4,8 +4,8 @@ xmlns:mm="http://www.mmbase.org/mmbase-taglib-2.0"; > - - + + ___ Cvs mailing list Cvs@lists.mmbase.org http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] html/mmbase/jquery jquery.jspx
Update of /var/cvs/html/mmbase/jquery In directory james.mmbase.org:/tmp/cvs-serv2590 Modified Files: jquery.jspx Log Message: avoid collision with hazardly existing var 'javascript' See also: http://cvs.mmbase.org/viewcvs/html/mmbase/jquery Index: jquery.jspx === RCS file: /var/cvs/html/mmbase/jquery/jquery.jspx,v retrieving revision 1.4 retrieving revision 1.5 diff -u -b -r1.4 -r1.5 --- jquery.jspx 24 Jul 2008 14:25:29 - 1.4 +++ jquery.jspx 21 Aug 2008 12:15:54 - 1.5 @@ -4,8 +4,8 @@ xmlns:mm="http://www.mmbase.org/mmbase-taglib-2.0"; > - - + + ___ Cvs mailing list Cvs@lists.mmbase.org http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] contributions/didactor2/src/assessment/templates/assessment student.jspx
Update of /var/cvs/contributions/didactor2/src/assessment/templates/assessment In directory james.mmbase.org:/tmp/cvs-serv587 Modified Files: student.jspx Log Message: header disappeared (was work in progress) See also: http://cvs.mmbase.org/viewcvs/contributions/didactor2/src/assessment/templates/assessment Index: student.jspx === RCS file: /var/cvs/contributions/didactor2/src/assessment/templates/assessment/student.jspx,v retrieving revision 1.15 retrieving revision 1.16 diff -u -b -r1.15 -r1.16 --- student.jspx17 Aug 2008 19:57:31 - 1.15 +++ student.jspx21 Aug 2008 09:45:41 - 1.16 @@ -34,8 +34,7 @@ - - + ___ Cvs mailing list Cvs@lists.mmbase.org http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] contributions/didactor2/src/core/java/nl/didactor/component MMBaseComponent.java
Update of /var/cvs/contributions/didactor2/src/core/java/nl/didactor/component
In directory james.mmbase.org:/tmp/cvs-serv499
Modified Files:
MMBaseComponent.java
Log Message:
cleared exceptions if something's wrong
See also:
http://cvs.mmbase.org/viewcvs/contributions/didactor2/src/core/java/nl/didactor/component
Index: MMBaseComponent.java
===
RCS file:
/var/cvs/contributions/didactor2/src/core/java/nl/didactor/component/MMBaseComponent.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- MMBaseComponent.java21 Aug 2008 09:08:46 - 1.4
+++ MMBaseComponent.java21 Aug 2008 09:42:34 - 1.5
@@ -13,7 +13,7 @@
/**
* The didactor component wrapping an mmbase component.
* @author Michiel Meeuwissen
- * @version $Id: MMBaseComponent.java,v 1.4 2008/08/21 09:08:46 michiel Exp $
+ * @version $Id: MMBaseComponent.java,v 1.5 2008/08/21 09:42:34 michiel Exp $
*/
public class MMBaseComponent extends nl.didactor.component.Component {
@@ -106,7 +106,12 @@
@Override
public String getTemplateBar() {
Framework fw = Framework.getInstance();
-return (String)
fw.getSettingValue(getComponent().getSetting("didactor_templatebar"),
fw.createSettingValueParameters());
+if (fw == null) throw new IllegalStateException();
+org.mmbase.framework.Component component = getComponent();
+if (component == null) throw new IllegalStateException("No component
'" + name + "' found");
+org.mmbase.framework.Setting setting =
component.getSetting("didactor_templatebar");
+if (setting == null) throw new IllegalStateException();
+return (String) fw.getSettingValue(setting,
fw.createSettingValueParameters());
}
}
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] contributions/didactor2 build.properties
Update of /var/cvs/contributions/didactor2
In directory james.mmbase.org:/tmp/cvs-serv453
Modified Files:
build.properties
Log Message:
added 'shoutbox'
See also: http://cvs.mmbase.org/viewcvs/contributions/didactor2
Index: build.properties
===
RCS file: /var/cvs/contributions/didactor2/build.properties,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -b -r1.24 -r1.25
--- build.properties31 Jul 2008 11:54:22 - 1.24
+++ build.properties21 Aug 2008 09:42:07 - 1.25
@@ -1,6 +1,6 @@
build.dir = ${basedir}/build
components.with.sillydependencies=redspider,agenda
-components =
core,versioning,education,utils,portalpages,cmshelp,faq,news,projectgroup,search,address,competence,pdf,sources,isbo,pop,register,drm,metadata,report,chat,mmbob,portfolio,workspace,virtualclassroom,cms,progress,scorm,assessment,email,proactivemail,links,richtext,portal
+components =
core,versioning,education,utils,portalpages,cmshelp,faq,news,projectgroup,search,address,competence,pdf,sources,isbo,pop,register,drm,metadata,report,chat,mmbob,portfolio,workspace,virtualclassroom,cms,progress,scorm,assessment,email,proactivemail,links,richtext,portal,shoutbox
#components = core
#components=core,address,links,email
providers =
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] applications/email/src/org/mmbase/module/smtp SMTPModule.java
Update of /var/cvs/applications/email/src/org/mmbase/module/smtp
In directory james.mmbase.org:/tmp/cvs-serv32552
Modified Files:
SMTPModule.java
Log Message:
avoid NPE during shutdown if listener not made
See also:
http://cvs.mmbase.org/viewcvs/applications/email/src/org/mmbase/module/smtp
Index: SMTPModule.java
===
RCS file:
/var/cvs/applications/email/src/org/mmbase/module/smtp/SMTPModule.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- SMTPModule.java 29 Nov 2007 11:03:13 - 1.8
+++ SMTPModule.java 21 Aug 2008 09:20:55 - 1.9
@@ -18,7 +18,7 @@
* needed for a compliant SMTP server are implemented,
* but no more than these.
* @author Johannes Verelst <[EMAIL PROTECTED]>
- * @version $Id: SMTPModule.java,v 1.8 2007/11/29 11:03:13 michiel Exp $
+ * @version $Id: SMTPModule.java,v 1.9 2008/08/21 09:20:55 michiel Exp $
*/
public class SMTPModule extends org.mmbase.module.WatchedReloadableModule {
private static final Logger log =
Logging.getLoggerInstance(SMTPModule.class);
@@ -101,7 +101,7 @@
*/
public void shutdown() {
log.info("Shutting down SMTP module");
-listener.interrupt();
+if (listener != null) listener.interrupt();
}
{
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] contributions/didactor2/src/core/java/nl/didactor/component MMBaseComponent.java
Update of /var/cvs/contributions/didactor2/src/core/java/nl/didactor/component
In directory james.mmbase.org:/tmp/cvs-serv32373/core/java/nl/didactor/component
Modified Files:
MMBaseComponent.java
Log Message:
Just added some @Override
See also:
http://cvs.mmbase.org/viewcvs/contributions/didactor2/src/core/java/nl/didactor/component
Index: MMBaseComponent.java
===
RCS file:
/var/cvs/contributions/didactor2/src/core/java/nl/didactor/component/MMBaseComponent.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- MMBaseComponent.java13 Aug 2008 11:03:58 - 1.3
+++ MMBaseComponent.java21 Aug 2008 09:08:46 - 1.4
@@ -13,7 +13,7 @@
/**
* The didactor component wrapping an mmbase component.
* @author Michiel Meeuwissen
- * @version $Id: MMBaseComponent.java,v 1.3 2008/08/13 11:03:58 michiel Exp $
+ * @version $Id: MMBaseComponent.java,v 1.4 2008/08/21 09:08:46 michiel Exp $
*/
public class MMBaseComponent extends nl.didactor.component.Component {
@@ -98,10 +98,12 @@
return scopes;
}
+@Override
public int getNumber() {
return number;
}
+@Override
public String getTemplateBar() {
Framework fw = Framework.getInstance();
return (String)
fw.getSettingValue(getComponent().getSetting("didactor_templatebar"),
fw.createSettingValueParameters());
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] applications/searchrelate/templates List.js.jsp
Update of /var/cvs/applications/searchrelate/templates
In directory james.mmbase.org:/tmp/cvs-serv32118
Modified Files:
List.js.jsp
Log Message:
Redid my change of last week, because someone inadvertedly rolled it back
See also: http://cvs.mmbase.org/viewcvs/applications/searchrelate/templates
Index: List.js.jsp
===
RCS file: /var/cvs/applications/searchrelate/templates/List.js.jsp,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -b -r1.22 -r1.23
--- List.js.jsp 14 Aug 2008 15:41:26 - 1.22
+++ List.js.jsp 21 Aug 2008 08:58:33 - 1.23
@@ -12,8 +12,12 @@
* Items in the list can be added and deleted. They can also be edited (with
validation).
* The user does not need to push a commit button. All data is implicitely
committed (after a few second of inactivity, or before unload).
*
+ * Custom events (called on the associated div)
+ * - mmsrRelatedNodesReady
+ * - mmsrCreated
+ *
* @author Michiel Meeuwissen
- * @version $Id: List.js.jsp,v 1.22 2008/08/14 15:41:26 jelle Exp $
+ * @version $Id: List.js.jsp,v 1.23 2008/08/21 08:58:33 michiel Exp $
*/
@@ -174,7 +178,9 @@
div.list = new List(div);
}
});
- a.list.executeCallBack("create", r);
+ a.list.executeCallBack("create", r); // I think
this may be deprecated. Custom events are nicer
+ $(a.list.div).trigger("mmsrCreated", [r]);
+
} else {
alert(status + " with " + url);
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] contributions/didactor2/src/assessment/templates/assessment feedback.jspx index.jsp navigation.jspx
Update of /var/cvs/contributions/didactor2/src/assessment/templates/assessment In directory james.mmbase.org:/tmp/cvs-serv31858 Modified Files: feedback.jspx index.jsp navigation.jspx Log Message: resolve some typos See also: http://cvs.mmbase.org/viewcvs/contributions/didactor2/src/assessment/templates/assessment Index: feedback.jspx === RCS file: /var/cvs/contributions/didactor2/src/assessment/templates/assessment/feedback.jspx,v retrieving revision 1.9 retrieving revision 1.10 diff -u -b -r1.9 -r1.10 --- feedback.jspx 15 Aug 2008 11:43:28 - 1.9 +++ feedback.jspx 21 Aug 2008 08:53:10 - 1.10 @@ -21,7 +21,7 @@ - + Index: index.jsp === RCS file: /var/cvs/contributions/didactor2/src/assessment/templates/assessment/index.jsp,v retrieving revision 1.31 retrieving revision 1.32 diff -u -b -r1.31 -r1.32 --- index.jsp 15 Aug 2008 10:38:05 - 1.31 +++ index.jsp 21 Aug 2008 08:53:10 - 1.32 @@ -6,7 +6,7 @@ false - + Index: navigation.jspx === RCS file: /var/cvs/contributions/didactor2/src/assessment/templates/assessment/navigation.jspx,v retrieving revision 1.2 retrieving revision 1.3 diff -u -b -r1.2 -r1.3 --- navigation.jspx 21 Aug 2008 08:38:22 - 1.2 +++ navigation.jspx 21 Aug 2008 08:53:10 - 1.3 @@ -6,7 +6,7 @@ - +