Update of /var/cvs/src/org/mmbase/module/core
In directory james.mmbase.org:/tmp/cvs-serv22367
Modified Files:
MMBase.java MMBaseContext.java
Log Message:
it is a bit handyer if machinename is available on the instance MMBase after
all (for EL in admin pages). Made a static version on MMBaseContext
See also: http://cvs.mmbase.org/viewcvs/src/org/mmbase/module/core
Index: MMBase.java
===================================================================
RCS file: /var/cvs/src/org/mmbase/module/core/MMBase.java,v
retrieving revision 1.248
retrieving revision 1.249
diff -u -b -r1.248 -r1.249
--- MMBase.java 1 Aug 2008 08:00:49 -0000 1.248
+++ MMBase.java 1 Aug 2008 19:20:35 -0000 1.249
@@ -43,7 +43,7 @@
* @author Pierre van Rooden
* @author Johannes Verelst
* @author Ernst Bunders
- * @version $Id: MMBase.java,v 1.248 2008/08/01 08:00:49 michiel Exp $
+ * @version $Id: MMBase.java,v 1.249 2008/08/01 19:20:35 michiel Exp $
*/
public class MMBase extends ProcessorModule {
@@ -144,7 +144,7 @@
* for each node in your cluster. This is not the machines dns name
* (as defined by host as name or ip number).
*/
- private static String machineName = "unknown";
+ static String machineName = "unknown";
/**
* The host or ip number of the machine this module is
@@ -764,7 +764,7 @@
* This value is set using the configuration file.
* @return the machine name as a <code>String</code>
*/
- public static String getMachineName() {
+ public String getMachineName() {
return machineName;
}
Index: MMBaseContext.java
===================================================================
RCS file: /var/cvs/src/org/mmbase/module/core/MMBaseContext.java,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -b -r1.60 -r1.61
--- MMBaseContext.java 11 Jul 2008 13:37:04 -0000 1.60
+++ MMBaseContext.java 1 Aug 2008 19:20:35 -0000 1.61
@@ -27,7 +27,7 @@
* @author Daniel Ockeloen
* @author David van Zeventer
* @author Jaco de Groot
- * @version $Id: MMBaseContext.java,v 1.60 2008/07/11 13:37:04 michiel Exp $
+ * @version $Id: MMBaseContext.java,v 1.61 2008/08/01 19:20:35 michiel Exp $
*/
public class MMBaseContext {
private static final Logger log =
Logging.getLoggerInstance(MMBaseContext.class);
@@ -391,4 +391,11 @@
public static boolean isInitialized() {
return initialized;
}
+
+ /**
+ * @since MMBase-1.9
+ */
+ public static String getMachineName() {
+ return MMBase.machineName;
+ }
}
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
