[MMBASE CVS] src/org/mmbase/framework ComponentRepository.java

[Michiel Meeuwissen]

Update of /var/cvs/src/org/mmbase/framework
In directory james.mmbase.org:/tmp/cvs-serv7884

Modified Files:
        ComponentRepository.java 
Log Message:
avoid errors in Didactor, which also has configuration in 
WEB-INF/config/components


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.37
retrieving revision 1.38
diff -u -b -r1.37 -r1.38
--- ComponentRepository.java    13 Jun 2008 13:56:23 -0000      1.37
+++ ComponentRepository.java    19 Jun 2008 20:47:10 -0000      1.38
@@ -25,7 +25,7 @@
  * Components can be configured by placing their configuration in 
'config/components/'.
  *
  * @author Michiel Meeuwissen
- * @version $Id: ComponentRepository.java,v 1.37 2008/06/13 13:56:23 nklasens 
Exp $
+ * @version $Id: ComponentRepository.java,v 1.38 2008/06/19 20:47:10 michiel 
Exp $
  * @since MMBase-1.9
  */
 public class ComponentRepository {
@@ -176,10 +176,16 @@
             for (URL url : loader.getResourceList(resource)) {
                 try {
                     if (url.openConnection().getDoInput()) {
+                        String namespace = ResourceLoader.getDocument(url, 
false, null).getDocumentElement().getNamespaceURI();
 
+                        if (!NAMESPACE_COMPONENT.equals(namespace)) {
+                            log.debug("Ignoring " + url  + " because namespace 
is not " + NAMESPACE_COMPONENT + ", but " + namespace);
+                            continue;
+
+                        }
                         Document doc = ResourceLoader.getDocument(url, true, 
getClass());
                         Element documentElement = doc.getDocumentElement();
-                        String namespace = documentElement.getNamespaceURI();
+
                         if (documentElement.getTagName().equals("component")) {
                             String name = documentElement.getAttribute("name");
                             String fileName = ResourceLoader.getName(resource);
_______________________________________________
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs