Update of /var/cvs/src/org/mmbase/framework
In directory james.mmbase.org:/tmp/cvs-serv336
Modified Files:
AbstractProcessor.java AbstractRenderer.java Block.java
Component.java ComponentRepository.java DeniedRenderer.java
StringRenderer.java VirtualComponent.java
Log Message:
See also: http://cvs.mmbase.org/viewcvs/src/org/mmbase/framework
Index: AbstractProcessor.java
===================================================================
RCS file: /var/cvs/src/org/mmbase/framework/AbstractProcessor.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- AbstractProcessor.java 26 Jul 2007 23:35:50 -0000 1.6
+++ AbstractProcessor.java 20 Feb 2008 17:44:07 -0000 1.7
@@ -15,11 +15,15 @@
* Abstract view implementation which implements getType and the specific
parameters.
*
* @author Michiel Meeuwissen
- * @version $Id: AbstractProcessor.java,v 1.6 2007/07/26 23:35:50 michiel Exp $
+ * @version $Id: AbstractProcessor.java,v 1.7 2008/02/20 17:44:07 michiel Exp $
* @since MMBase-1.9
*/
abstract public class AbstractProcessor implements Processor {
+
+ /**
+ * Creates a processor which does absolutely nothing.
+ */
public static Processor getEmpty(final Block b) {
return new Processor() {
public Block getBlock() { return b; }
Index: AbstractRenderer.java
===================================================================
RCS file: /var/cvs/src/org/mmbase/framework/AbstractRenderer.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- AbstractRenderer.java 16 Nov 2007 16:06:30 -0000 1.9
+++ AbstractRenderer.java 20 Feb 2008 17:44:07 -0000 1.10
@@ -13,11 +13,10 @@
import org.mmbase.util.logging.Logging;
/**
- * Abstract view implementation which implements getType and creates the
'essential' parameters
- * request and response.
+ * Abstract renderer implementation which implements getType and getBlock.
*
* @author Michiel Meeuwissen
- * @version $Id: AbstractRenderer.java,v 1.9 2007/11/16 16:06:30 michiel Exp $
+ * @version $Id: AbstractRenderer.java,v 1.10 2008/02/20 17:44:07 michiel Exp $
* @since MMBase-1.9
*/
abstract public class AbstractRenderer implements Renderer {
Index: Block.java
===================================================================
RCS file: /var/cvs/src/org/mmbase/framework/Block.java,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -b -r1.29 -r1.30
--- Block.java 25 Jan 2008 09:32:23 -0000 1.29
+++ Block.java 20 Feb 2008 17:44:07 -0000 1.30
@@ -16,12 +16,12 @@
import org.mmbase.util.logging.Logging;
/**
- * A Block is a representation of a page within a component. It consists of 3
views,
- * a 'head', 'body' and 'process' view.
+ * A Block is a representation of a page within a component. It has 2
renderers,
+ * 'head' and 'body', and a processor.
*
* @author Johannes Verelst
* @author Michiel Meeuwissen
- * @version $Id: Block.java,v 1.29 2008/01/25 09:32:23 michiel Exp $
+ * @version $Id: Block.java,v 1.30 2008/02/20 17:44:07 michiel Exp $
* @since MMBase-1.9
*/
public class Block {
@@ -62,7 +62,7 @@
/**
- * Mimetype for this block.
+ * Mimetype for this block. E.g. "text/html".
*/
public String getMimeType() {
return mimetype;
Index: Component.java
===================================================================
RCS file: /var/cvs/src/org/mmbase/framework/Component.java,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -b -r1.17 -r1.18
--- Component.java 25 Jan 2008 09:32:23 -0000 1.17
+++ Component.java 20 Feb 2008 17:44:07 -0000 1.18
@@ -14,12 +14,12 @@
/**
* A component is a piece of pluggable functionality that typically has
dependencies on other
- * components, and may be requested several views.
+ * components.
*
* A Component bundles [EMAIL PROTECTED] Block}s, [EMAIL PROTECTED] Action}s
and [EMAIL PROTECTED] @Setting}.
*
* @author Michiel Meeuwissen
- * @version $Id: Component.java,v 1.17 2008/01/25 09:32:23 michiel Exp $
+ * @version $Id: Component.java,v 1.18 2008/02/20 17:44:07 michiel Exp $
* @since MMBase-1.9
*/
public interface Component {
@@ -93,7 +93,8 @@
/**
* The baseName of the resource bundle associated with i18n messages for
this component.
- * See [EMAIL PROTECTED] java.util.ResourceBundle#getBundle(String,
Locale)}.
+ * See [EMAIL PROTECTED] java.util.ResourceBundle#getBundle(String,
Locale)}. The framework should decorate
+ * the request with this like fmt:bundle before rendinger a block.
*/
String getBundle();
@@ -103,12 +104,15 @@
Collection<Setting<?>> getSettings();
/**
- * Retrieves a setting (a definition, not a value, for that, use
+ * Retrieves a setting (a definition, not a value; for that, use
* [EMAIL PROTECTED] Framework#getSettingValue(Setting, Parameters)}) with
a certain name. Or
* <code>null</code> if no such setting in this component.
*/
Setting<?> getSetting(String name);
+ /**
+ * A component may also define extra 'actions'.
+ */
Map<String, Action> getActions();
}
Index: ComponentRepository.java
===================================================================
RCS file: /var/cvs/src/org/mmbase/framework/ComponentRepository.java,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -b -r1.27 -r1.28
--- ComponentRepository.java 25 Jan 2008 10:13:01 -0000 1.27
+++ ComponentRepository.java 20 Feb 2008 17:44:07 -0000 1.28
@@ -23,7 +23,7 @@
* This (singleton) class maintains all compoments which are registered in the
current MMBase.
*
* @author Michiel Meeuwissen
- * @version $Id: ComponentRepository.java,v 1.27 2008/01/25 10:13:01 michiel
Exp $
+ * @version $Id: ComponentRepository.java,v 1.28 2008/02/20 17:44:07 michiel
Exp $
* @since MMBase-1.9
*/
public class ComponentRepository {
@@ -144,12 +144,13 @@
for (String file : components) {
try {
Document doc = loader.getDocument(file, true, getClass());
+ String namespace = doc.getDocumentElement().getNamespaceURI();
String name = doc.getDocumentElement().getAttribute("name");
String fileName = ResourceLoader.getName(file);
if (! fileName.equals(name)) {
log.warn("Component " + name + " is defined in resource
with name " + file);
} else {
- log.service("Instantiating component '" + name + "'");
+ log.service("Instantiating component '" + name + "' " +
namespace);
}
if (rep.containsKey(name)) {
failed.add(getComponent(name, doc));
Index: DeniedRenderer.java
===================================================================
RCS file: /var/cvs/src/org/mmbase/framework/DeniedRenderer.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- DeniedRenderer.java 3 Feb 2008 17:33:56 -0000 1.2
+++ DeniedRenderer.java 20 Feb 2008 17:44:07 -0000 1.3
@@ -18,11 +18,11 @@
import org.mmbase.util.logging.Logging;
/**
- * Renderer which can be used in stead if rendering of a certain block proved
to be not allowed for
+ * Renderer which can be used in stead, if rendering of a certain block proved
to be not allowed for
* the current user.
*
* @author Michiel Meeuwissen
- * @version $Id: DeniedRenderer.java,v 1.2 2008/02/03 17:33:56 nklasens Exp $
+ * @version $Id: DeniedRenderer.java,v 1.3 2008/02/20 17:44:07 michiel Exp $
* @since MMBase-1.9
*/
Index: StringRenderer.java
===================================================================
RCS file: /var/cvs/src/org/mmbase/framework/StringRenderer.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- StringRenderer.java 25 Jan 2008 09:32:23 -0000 1.9
+++ StringRenderer.java 20 Feb 2008 17:44:07 -0000 1.10
@@ -22,7 +22,7 @@
* file. Based on [EMAIL PROTECTED] PatterNodeFunctionProvider} so several
parameters can be present.
*
* @author Michiel Meeuwissen
- * @version $Id: StringRenderer.java,v 1.9 2008/01/25 09:32:23 michiel Exp $
+ * @version $Id: StringRenderer.java,v 1.10 2008/02/20 17:44:07 michiel Exp $
* @since MMBase-1.9
*/
public class StringRenderer extends AbstractRenderer {
@@ -40,6 +40,9 @@
requestMethods = PatternNodeFunctionProvider.getRequestMethods(string);
}
+ /**
+ * @todo should consider the string
+ */
public Parameter[] getParameters() {
return new Parameter[] {Parameter.REQUEST};
}
Index: VirtualComponent.java
===================================================================
RCS file: /var/cvs/src/org/mmbase/framework/VirtualComponent.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- VirtualComponent.java 3 Feb 2008 17:33:56 -0000 1.3
+++ VirtualComponent.java 20 Feb 2008 17:44:07 -0000 1.4
@@ -8,14 +8,13 @@
*/
package org.mmbase.framework;
-
import org.mmbase.util.logging.*;
/**
* A Virtual component is a component which is only mentioned as a dependency
of another component.
*
* @author Michiel Meeuwissen
- * @version $Id: VirtualComponent.java,v 1.3 2008/02/03 17:33:56 nklasens Exp $
+ * @version $Id: VirtualComponent.java,v 1.4 2008/02/20 17:44:07 michiel Exp $
* @since MMBase-1.9
*/
public class VirtualComponent {
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
