Author: michiel
Date: 2010-05-25 19:03:44 +0200 (Tue, 25 May 2010)
New Revision: 42261
Modified:
mmbase/branches/MMBase-1_9/core/src/main/java/org/mmbase/module/core/MMBase.java
mmbase/branches/MMBase-1_9/core/src/main/java/org/mmbase/module/core/MMBaseContext.java
Log:
removed dependency from MMBaseContext on MMBase
Modified:
mmbase/branches/MMBase-1_9/core/src/main/java/org/mmbase/module/core/MMBase.java
===================================================================
---
mmbase/branches/MMBase-1_9/core/src/main/java/org/mmbase/module/core/MMBase.java
2010-05-25 16:59:08 UTC (rev 42260)
+++
mmbase/branches/MMBase-1_9/core/src/main/java/org/mmbase/module/core/MMBase.java
2010-05-25 17:03:44 UTC (rev 42261)
@@ -377,6 +377,7 @@
}
log.info("MMBase machine name used for clustering: '" + machineName +
"'");
+ MMBaseContext.machineName = machineName;
Logging.setMachineName(machineName);
org.mmbase.util.xml.EntityResolver.clearMMEntities(false);
Modified:
mmbase/branches/MMBase-1_9/core/src/main/java/org/mmbase/module/core/MMBaseContext.java
===================================================================
---
mmbase/branches/MMBase-1_9/core/src/main/java/org/mmbase/module/core/MMBaseContext.java
2010-05-25 16:59:08 UTC (rev 42260)
+++
mmbase/branches/MMBase-1_9/core/src/main/java/org/mmbase/module/core/MMBaseContext.java
2010-05-25 17:03:44 UTC (rev 42261)
@@ -42,7 +42,17 @@
private static boolean htmlRootUrlPathInitialized = false;
private static String outputFile;
+
/**
+ * Name of the machine used in the mmbase cluster.
+ * it is used for the mmservers objects. Make sure that this is different
+ * for each node in your cluster. This is not the machines dns name
+ * (as defined by host as name or ip number).
+ */
+ static String machineName = null;
+
+
+ /**
* Initialize MMBase using a <code>ServletContext</code>. This method will
* check the servlet configuration for context parameters mmbase.outputfile
* and mmbase.config. If not found it will look for system
@@ -439,6 +449,6 @@
* @return 'machine name' to identify this web app or <code>null</code> if
not yet determined.
*/
public static String getMachineName() {
- return MMBase.machineName;
+ return machineName;
}
}
_______________________________________________
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
