User: user57
Date: 02/02/12 20:26:40
Modified: src/main/org/jboss/system Info.java Server.java
ServerConfig.java ServiceLibraries.java
Log:
o These are all kinda related, so I am commiting them together
o This is the second half of the migration to using ObjectName OBJECT_NAME
o Not using jboss.system.* properties anywhere (one place in testsuite
which I am ignoring for now)
o StateManager will now read its config from a url (configURL), and only
attempt to write it back out if that is a file URL. Need to fix this
to not need to write back to a config file.
o Still setting jboss.home & jboss.system.home, but use ServerConfigMBean
to get the proper bits, will eventually abstract all file access out
o Added a simple locator to find a mbean server. This is trivial code,
but helps clean up client code and makes it obvious what it does.
Revision Changes Path
1.10 +2 -2 jboss/src/main/org/jboss/system/Info.java
Index: Info.java
===================================================================
RCS file: /cvsroot/jboss/jboss/src/main/org/jboss/system/Info.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- Info.java 10 Feb 2002 02:50:00 -0000 1.9
+++ Info.java 13 Feb 2002 04:26:40 -0000 1.10
@@ -27,7 +27,7 @@
* @author <a href="mailto:[EMAIL PROTECTED]";>Hiram Chirino</a>
* @author <a href="mailto:[EMAIL PROTECTED]";>Jason Dillon</a>
* @author <a href="mailto:[EMAIL PROTECTED]";>Marc Fleury</a>
- * @version $Revision: 1.9 $
+ * @version $Revision: 1.10 $
*/
public class Info
implements InfoMBean, MBeanRegistration
@@ -76,7 +76,7 @@
}
}
- return (name != null ? name : new ObjectName(OBJECT_NAME));
+ return name == null ? OBJECT_NAME : name;
}
public void postRegister(Boolean registrationDone)
1.14 +18 -36 jboss/src/main/org/jboss/system/Server.java
Index: Server.java
===================================================================
RCS file: /cvsroot/jboss/jboss/src/main/org/jboss/system/Server.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- Server.java 13 Feb 2002 03:37:32 -0000 1.13
+++ Server.java 13 Feb 2002 04:26:40 -0000 1.14
@@ -32,7 +32,7 @@
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Marc Fleury</a>
* @author <a href="mailto:[EMAIL PROTECTED]";>Jason Dillon</a>
- * @version $Revision: 1.13 $
+ * @version $Revision: 1.14 $
*/
public class Server
implements ServerMBean
@@ -82,32 +82,24 @@
log.info("Starting General Purpose Architecture (GPA)...");
// Create the MBeanServer
- server = MBeanServerFactory.createMBeanServer(config.getDomain());
+ server = MBeanServerFactory.createMBeanServer("jboss");
if (debug) {
log.debug("Created MBeanServer: " + server);
}
- String systemDomain = server.getDefaultDomain() + ".system";
- if (debug) {
- log.debug("Using system domain: " + systemDomain);
- }
-
// Register server components
- server.registerMBean(this,
- new ObjectName(systemDomain,"service", "Server"));
- server.registerMBean(config,
- new ObjectName(systemDomain,"service", "ServerConfig"));
+ server.registerMBean(this, ServerMBean.OBJECT_NAME);
+ server.registerMBean(config, ServerConfigMBean.OBJECT_NAME);
// Initialize the MBean libraries repository
- server.registerMBean(ServiceLibraries.getLibraries(),
- new ObjectName(systemDomain, "service",
"ServiceLibraries"));
+ server.registerMBean(ServiceLibraries.getLibraries(), null);
// Initialize spine boot libraries
initBootLibraries();
// Create MBeanClassLoader for the base system
ObjectName loaderName =
- new ObjectName(systemDomain, "service", "ServiceClassLoader");
+ new ObjectName("jboss.system", "service", "ServiceClassLoader");
MBeanClassLoader mcl = new MBeanClassLoader(loaderName);
server.registerMBean(mcl, loaderName);
@@ -120,9 +112,7 @@
Thread.currentThread().setContextClassLoader(mcl);
// Setup logging
- server.createMBean("org.jboss.logging.Log4jService",
- new ObjectName(systemDomain, "service", "Logging"),
- loaderName);
+ server.createMBean("org.jboss.logging.Log4jService", null, loaderName);
log.debug("Logging has been initialized");
@@ -135,15 +125,11 @@
log.info("Patch URL: " + config.getPatchURL());
// General Purpose Architecture information
- server.createMBean("org.jboss.system.Info",
- new ObjectName(systemDomain, "service", "Info"),
- loaderName);
+ server.createMBean("org.jboss.system.Info", null, loaderName);
// Service Controller
ObjectName controllerName =
- server.createMBean("org.jboss.system.ServiceController",
- new ObjectName(systemDomain, "service",
"ServiceController"),
- loaderName).getObjectName();
+ server.createMBean("org.jboss.system.ServiceController", null,
loaderName).getObjectName();
if (debug) {
log.debug("Registered service controller: " + controllerName);
@@ -159,28 +145,24 @@
log.warn("Failed to add shutdown hook", e);
}
- // Deployer
+ // Main Deployer
ObjectName mainDeployer =
- server.createMBean("org.jboss.deployment.MainDeployer",
- null,
- loaderName).getObjectName();
- //Initialize the MainDeployer
- server.invoke(mainDeployer, "create", new Object[]{}, new String[] {});
+ server.createMBean("org.jboss.deployment.MainDeployer", null,
loaderName).getObjectName();
+
+ // Initialize the MainDeployer
+ server.invoke(mainDeployer, "create", new Object[0], new String[0]);
// SAR Deployer
- ObjectName sarDeployer =
- server.createMBean("org.jboss.deployment.SARDeployer",
- null,
- loaderName).getObjectName();
+ server.createMBean("org.jboss.deployment.SARDeployer", null, loaderName);
// Ok, now do a first deploy of JBoss' jboss-service.xml
server.invoke(mainDeployer,
"deploy",
- new Object[] {config.getConfigURL() + "jboss-service.xml"},
- new String[] {"java.lang.String"});
+ new Object[] { config.getConfigURL() + "jboss-service.xml" },
+ new String[] { "java.lang.String" });
// Start the main deployer thread
- server.invoke(mainDeployer, "start", new Object[]{}, new String[] {});
+ server.invoke(mainDeployer, "start", new Object[0], new String[0]);
// Calculate how long it took
long lapsedTime = System.currentTimeMillis() - started.getTime();
1.4 +11 -25 jboss/src/main/org/jboss/system/ServerConfig.java
Index: ServerConfig.java
===================================================================
RCS file: /cvsroot/jboss/jboss/src/main/org/jboss/system/ServerConfig.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ServerConfig.java 12 Feb 2002 05:05:47 -0000 1.3
+++ ServerConfig.java 13 Feb 2002 04:26:40 -0000 1.4
@@ -22,7 +22,7 @@
* Should use nested version when JDK 1.4 is standardized.
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Jason Dillon</a>
- * @version $Revision: 1.3 $
+ * @version $Revision: 1.4 $
*/
public class ServerConfig
implements ServerConfigMBean
@@ -33,11 +33,8 @@
/** The directory for server temporay files. */
private File tempDir;
- /** The directory for local state data files. */
- private File stateDataDir;
-
- /** The JMX domain for the base MBean server. */
- private String domain = "jboss";
+ /** The directory for local data files. */
+ private File dataDir;
/** The base installation URL, used to construct other URLs. */
private URL installURL;
@@ -84,17 +81,6 @@
this(dir, dir.toURL());
}
- public void setDomain(final String domain) {
- if (domain == null)
- throw new IllegalArgumentException("domain is null");
-
- this.domain = domain;
- }
-
- public String getDomain() {
- return domain;
- }
-
public void setConfigName(final String name) {
if (name == null)
throw new IllegalArgumentException("name is null");
@@ -141,26 +127,26 @@
return tempDir;
}
- public void setStateDataDir(final File dir) {
+ public void setDataDir(final File dir) {
if (dir == null)
throw new IllegalArgumentException("dir is null");
// FIXME: check if this is really a directory
// FIXME: check if this is writable
- stateDataDir = dir;
+ dataDir = dir;
}
/**
- * Get the directory where local state data will be stored.
+ * Get the directory where local data will be stored.
*
- * @return The directory where the server stores local state data.
+ * @return The directory where the server stores local data.
*/
- public File getStateDataDir() {
- if (stateDataDir == null) {
- stateDataDir = new File(homeDir, "db");
+ public File getDataDir() {
+ if (dataDir == null) {
+ dataDir = new File(homeDir, "db");
}
- return stateDataDir;
+ return dataDir;
}
public void setInstallURL(final URL url) {
1.16 +3 -3 jboss/src/main/org/jboss/system/ServiceLibraries.java
Index: ServiceLibraries.java
===================================================================
RCS file: /cvsroot/jboss/jboss/src/main/org/jboss/system/ServiceLibraries.java,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- ServiceLibraries.java 11 Feb 2002 23:02:30 -0000 1.15
+++ ServiceLibraries.java 13 Feb 2002 04:26:40 -0000 1.16
@@ -26,7 +26,7 @@
* @see <related>
* @author <a href="mailto:[EMAIL PROTECTED]";>Marc Fleury</a>
* @author <a href="mailto:[EMAIL PROTECTED]";>Ole Husgaard</a>
- * @version $Revision: 1.15 $ <p>
+ * @version $Revision: 1.16 $ <p>
*
* <p><b>20010830 marc fleury:</b>
* <ul>
@@ -448,7 +448,6 @@
public ObjectName preRegister(MBeanServer server, ObjectName name)
throws Exception
{
-
classLoaders = new HashSet();
classes = new HashMap();
resources = new HashMap();
@@ -456,7 +455,8 @@
clToClassSetMap = new HashMap();
log.info("ClassLoaders and ServiceLibraries initialized");
- return name == null ? new ObjectName(OBJECT_NAME) : name;
+
+ return name == null ? OBJECT_NAME : name;
}
/**
_______________________________________________
Jboss-development mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/jboss-development
