Update of /var/cvs/src/org/mmbase/util/xml
In directory james.mmbase.org:/tmp/cvs-serv24760/xml
Modified Files:
Tag: MMBase-1_8
DocumentReader.java UtilReader.java
Log Message:
ported stuff with ! in resourceloader.xml to recognize the current jar from head
See also: http://cvs.mmbase.org/viewcvs/src/org/mmbase/util/xml
Index: DocumentReader.java
===================================================================
RCS file: /var/cvs/src/org/mmbase/util/xml/DocumentReader.java,v
retrieving revision 1.29.2.6
retrieving revision 1.29.2.7
diff -u -b -r1.29.2.6 -r1.29.2.7
--- DocumentReader.java 1 Oct 2008 09:22:00 -0000 1.29.2.6
+++ DocumentReader.java 8 Dec 2008 12:59:12 -0000 1.29.2.7
@@ -40,7 +40,7 @@
* @author Rico Jansen
* @author Pierre van Rooden
* @author Michiel Meeuwissen
- * @version $Id: DocumentReader.java,v 1.29.2.6 2008/10/01 09:22:00 michiel
Exp $
+ * @version $Id: DocumentReader.java,v 1.29.2.7 2008/12/08 12:59:12 michiel
Exp $
* @since MMBase-1.7
*/
public class DocumentReader {
@@ -605,6 +605,13 @@
return v.iterator();
}
+ /**
+ * @since MMBase-1.9
+ */
+ public Document getDocument() {
+ return document;
+ }
+
public static void main(String[] argv) throws Exception {
if (argv.length == 0) {
System.out.println("Usage: java -Dmmbase.config=<config dir>
org.mmbase.util.xml.DocumentReader <path to xml>");
Index: UtilReader.java
===================================================================
RCS file: /var/cvs/src/org/mmbase/util/xml/UtilReader.java,v
retrieving revision 1.25.2.4
retrieving revision 1.25.2.5
diff -u -b -r1.25.2.4 -r1.25.2.5
--- UtilReader.java 24 Nov 2008 17:32:09 -0000 1.25.2.4
+++ UtilReader.java 8 Dec 2008 12:59:12 -0000 1.25.2.5
@@ -34,7 +34,7 @@
* @since MMBase-1.6.4
* @author Rob Vermeulen
* @author Michiel Meeuwissen
- * @version $Id: UtilReader.java,v 1.25.2.4 2008/11/24 17:32:09 michiel Exp $
+ * @version $Id: UtilReader.java,v 1.25.2.5 2008/12/08 12:59:12 michiel Exp $
*/
public class UtilReader {
@@ -183,6 +183,13 @@
}
}
+ /**
+ * @since MMBase-1.9.1
+ */
+ protected Map.Entry getEntry(DocumentReader reader, String k, String v) {
+ return new Entry(k, v);
+ }
+
protected void readProperties(String s) {
properties.clear();
maps.clear();
@@ -234,7 +241,7 @@
}
}
if (key != null) {
- entryList.add(new Entry(key, value));
+ entryList.add(getEntry(reader, key,
value));
}
}
if (maps.containsKey(name) && !
type.equals("mergingmap")) {
@@ -244,10 +251,11 @@
}
} else {
String value = reader.getElementValue(p);
- if (properties.containsKey(name)) {
- log.service("Property '" + name + "'(" + value
+ "') of " + url + " is shadowed");
+ Map.Entry entry = getEntry(reader, name, value);
+ if (properties.containsKey(entry.getKey())) {
+ log.service("Property '" + entry.getKey() +
"'(" + entry.getValue()+ "') of " + url + " is shadowed");
} else {
- properties.put(name, value);
+ properties.put(entry.getKey(),
entry.getValue());
}
}
}
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
