Author: michiel
Date: 2010-04-13 14:40:17 +0200 (Tue, 13 Apr 2010)
New Revision: 41879
Modified:
mmbase/trunk/utils/src/main/java/org/mmbase/util/logging/Logging.java
mmbase/trunk/utils/src/main/java/org/mmbase/util/xml/EntityResolver.java
mmbase/trunk/utils/src/main/java/org/mmbase/util/xml/UtilReader.java
Log:
simplified
Modified: mmbase/trunk/utils/src/main/java/org/mmbase/util/logging/Logging.java
===================================================================
--- mmbase/trunk/utils/src/main/java/org/mmbase/util/logging/Logging.java
2010-04-13 12:29:29 UTC (rev 41878)
+++ mmbase/trunk/utils/src/main/java/org/mmbase/util/logging/Logging.java
2010-04-13 12:40:17 UTC (rev 41879)
@@ -84,19 +84,7 @@
*/
private static ResourceWatcher configWatcher;
- private static String machineName = "localhost";
- static {
- EventManager.getInstance().addEventListener(new SystemEventListener() {
- public void notify(SystemEvent se) {
- if (se instanceof SystemEvent.MachineName) {
- machineName = ((SystemEvent.MachineName) se).getName();
- }
- }
- });
- }
-
-
private Logging() {
// this class has no instances.
}
@@ -106,7 +94,7 @@
* @since MMBase-1.8
*/
public static String getMachineName() {
- return machineName;
+ return EventManager.getMachineName();
}
/**
Modified:
mmbase/trunk/utils/src/main/java/org/mmbase/util/xml/EntityResolver.java
===================================================================
--- mmbase/trunk/utils/src/main/java/org/mmbase/util/xml/EntityResolver.java
2010-04-13 12:29:29 UTC (rev 41878)
+++ mmbase/trunk/utils/src/main/java/org/mmbase/util/xml/EntityResolver.java
2010-04-13 12:40:17 UTC (rev 41879)
@@ -122,7 +122,6 @@
// ask known (core) xml readers to register their public ids and dtds
// the advantage of doing it this soon, is that the 1DTD are know as
early as possible.
org.mmbase.util.xml.DocumentReader.registerPublicIDs();
- org.mmbase.util.xml.UtilReader.registerPublicIDs();
registerSystemID("http://www.w3.org/2001/03/xml.xsd";, "xml.xsd",
null);
registerSystemID("http://www.w3.org/2001/03/XMLSchema.dtd";,
"XMLSchema.dtd", null);
Modified: mmbase/trunk/utils/src/main/java/org/mmbase/util/xml/UtilReader.java
===================================================================
--- mmbase/trunk/utils/src/main/java/org/mmbase/util/xml/UtilReader.java
2010-04-13 12:29:29 UTC (rev 41878)
+++ mmbase/trunk/utils/src/main/java/org/mmbase/util/xml/UtilReader.java
2010-04-13 12:40:17 UTC (rev 41879)
@@ -84,8 +84,10 @@
static {
// doesnt startup, probably because of cyclic referecnes, if this
happens in DocumentReader itself.
+ registerPublicIDs();
DocumentReader.utilProperties =
UtilReader.get("documentreader.xml").getProperties();
+
}
private class UtilFileWatcher extends ResourceWatcher {
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
