User: d_jencks
Date: 01/09/12 15:11:51
Modified: src/main/org/jboss/deployment ServiceDeployer.java
Log:
Slight refactoring (method extraction) to improve clarity
Revision Changes Path
1.8 +68 -126 jboss/src/main/org/jboss/deployment/ServiceDeployer.java
Index: ServiceDeployer.java
===================================================================
RCS file: /cvsroot/jboss/jboss/src/main/org/jboss/deployment/ServiceDeployer.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- ServiceDeployer.java 2001/09/11 18:34:59 1.7
+++ ServiceDeployer.java 2001/09/12 22:11:51 1.8
@@ -61,7 +61,7 @@
* @author <a href="mailto:[EMAIL PROTECTED]";>Marc Fleury</a>
* @author <a href="mailto:[EMAIL PROTECTED]";>David Maplesden</a>
* @author <a href="[EMAIL PROTECTED]">David Jencks</a>
- * @version $Revision: 1.7 $ <p>
+ * @version $Revision: 1.8 $ <p>
*
* <b>20010830 marc fleury:</b>
* <ul>initial import
@@ -93,9 +93,11 @@
extends ServiceMBeanSupport
implements ServiceDeployerMBean
{
-
+ private static final String SERVICE_CONTROLLER_NAME =
"JBOSS-SYSTEM:spine=ServiceController";
// Attributes --------------------------------------------------------
+ private ObjectName serviceControllerName;
+
// each url can spawn a series of MLet classloaders that are specific to it and
cycled
private Map urlToClassLoadersSetMap;
@@ -529,8 +531,6 @@
return deployedMBeans;
}
- //log.debug("adding URLClassLoader for url archive " +
dependency);
- //URLClassLoader cl1 = new URLClassLoader(new URL[]{dependency});
if (!isDeployed(dependencyString))
{
log.debug("recursively deploying " + dependency);
@@ -566,123 +566,40 @@
{
Element mbean = (Element)nl.item(i);
-
- try
- {
- log.debug("deploying with ServiceController mbean " + mbean);
- ObjectName service = (ObjectName)server.invoke(
- new ObjectName("JBOSS-SYSTEM:spine=ServiceController"),
+ log.debug("deploying with ServiceController mbean " + mbean);
+ ObjectName service = (ObjectName)invoke(getServiceControllerName(),
"deploy",
new Object[]{mbean},
new String[]{"org.w3c.dom.Element"});
-
- // marcf: I don't think we should keep track and undeploy...
- //david jencks what do you mean by this???
+ // marcf: I don't think we should keep track and undeploy...
+ //david jencks what do you mean by this???
+ if (service != null)
+ {
services.add(service);
deployedMBeans.add(service);
}
- catch (MBeanException mbe)
- {
- log.error("Mbean exception while creating mbean",
mbe.getTargetException());
- }
- catch (RuntimeMBeanException rbe)
- {
- log.error("Runtime Mbean exception while creating mbean",
rbe.getTargetException());
- }
- catch (MalformedObjectNameException mone)
- {
- log.error("MalformedObjectNameException while creating mbean",
mone);
- }
- catch (ReflectionException re)
- {
- log.error("ReflectionException while creating mbean", re);
- }
- catch (InstanceNotFoundException re)
- {
- log.error("InstanceNotFoundException while creating mbean", re);
- }
- catch (Exception e)
- {
- log.error("Exception while creating mbean", e);
- }
}
//init the mbeans in our package
for (Iterator it = services.iterator(); it.hasNext(); )
{
ObjectName service = (ObjectName)it.next();
-
- try
- {
- server.invoke(
- new ObjectName("JBOSS-SYSTEM:spine=ServiceController"),
+ invoke(getServiceControllerName(),
"init",
new Object[]{service},
new String[]{"javax.management.ObjectName"});
- }
- catch (MBeanException mbe)
- {
- log.error("Mbean exception while creating mbean",
mbe.getTargetException());
- }
- catch (RuntimeMBeanException rbe)
- {
- log.error("Runtime Mbean exception while creating mbean",
rbe.getTargetException());
- }
- catch (MalformedObjectNameException mone)
- {
- log.error("MalformedObjectNameException while creating mbean",
mone);
- }
- catch (ReflectionException re)
- {
- log.error("ReflectionException while creating mbean", re);
- }
- catch (InstanceNotFoundException re)
- {
- log.error("InstanceNotFoundException while creating mbean", re);
- }
- catch (Exception e)
- {
- log.error("Exception while creating mbean", e);
- }
+
}
//iterate through services and start.
for (Iterator it = services.iterator(); it.hasNext(); )
{
ObjectName service = (ObjectName)it.next();
-
- try
- {
- server.invoke(
- new ObjectName("JBOSS-SYSTEM:spine=ServiceController"),
+ invoke(getServiceControllerName(),
"start",
new Object[]{service},
new String[]{"javax.management.ObjectName"});
- }
- catch (MBeanException mbe)
- {
- log.error("Mbean exception while creating mbean",
mbe.getTargetException());
- }
- catch (RuntimeMBeanException rbe)
- {
- log.error("Runtime Mbean exception while creating mbean",
rbe.getTargetException());
- }
- catch (MalformedObjectNameException mone)
- {
- log.error("MalformedObjectNameException while creating mbean",
mone);
- }
- catch (ReflectionException re)
- {
- log.error("ReflectionException while creating mbean", re);
- }
- catch (InstanceNotFoundException re)
- {
- log.error("InstanceNotFoundException while creating mbean", re);
- }
- catch (Exception e)
- {
- log.error("Exception while creating mbean", e);
- }
+
}
}// if document != null
@@ -738,38 +655,22 @@
for (Iterator iterator = services.iterator(); iterator.hasNext(); )
{
ObjectName name = (ObjectName)iterator.next();
-
- try
- {
- server.invoke(
- new ObjectName("JBOSS-SYSTEM:spine=ServiceController"),
+ invoke(getServiceControllerName(),
"stop",
new Object[]{name},
new String[]{"javax.management.ObjectName"});
- }
- catch (Exception e)
- {
- log.error("exception stopping mbean " + name, e);
- }
+
}
//destroy services
for (Iterator iterator = services.iterator(); iterator.hasNext(); )
{
ObjectName name = (ObjectName)iterator.next();
-
- try
- {
- server.invoke(
- new ObjectName("JBOSS-SYSTEM:spine=ServiceController"),
+ invoke(getServiceControllerName(),
"destroy",
new Object[]{name},
new String[]{"javax.management.ObjectName"});
- }
- catch (Exception e)
- {
- log.error("exception stopping mbean " + name, e);
- }
+
}
Iterator iterator = services.iterator();
@@ -777,18 +678,10 @@
{
ObjectName name = (ObjectName)iterator.next();
log.debug("undeploying mbean " + name);
- try
- {
- server.invoke(
- new ObjectName("JBOSS-SYSTEM:spine=ServiceController"),
+ invoke(getServiceControllerName(),
"undeploy",
new Object[]{name},
new String[]{"javax.management.ObjectName"});
- }
- catch (Exception e)
- {
- log.error("problem undeploying mbean " + name, e);
- }
}
}
@@ -1043,6 +936,55 @@
("Depends element must have a value.");
}
return new ObjectName(name);
+ }
+
+
+ /* Calls server.invoke, unwraps exceptions, and returns 1 if
+ * invoke succeeded and 0 if invoke failed (for ease in counting)
+ */
+ private Object invoke(ObjectName name, String method, Object[] args, String[]
sig)
+ {
+ try
+ {
+ return server.invoke(name, method, args, sig);
+ }
+ catch (MBeanException mbe)
+ {
+ log.error("Mbean exception while executing " + method + " on " + args,
mbe.getTargetException());
+ }
+ catch (RuntimeMBeanException rbe)
+ {
+ log.error("Runtime Mbean exception while executing " + method + " on " +
args, rbe.getTargetException());
+ }
+ catch (ReflectionException re)
+ {
+ log.error("ReflectionException while executing " + method + " on " + args,
re);
+ }
+ catch (InstanceNotFoundException re)
+ {
+ log.error("InstanceNotFoundException while executing " + method + " on " +
args, re);
+ }
+ catch (Exception e)
+ {
+ log.error("Exception while executing " + method + " on " + args, e);
+ }
+ return null;
+ }
+
+ private ObjectName getServiceControllerName() throws DeploymentException
+ {
+ if (serviceControllerName == null)
+ {
+ try
+ {
+ serviceControllerName = new ObjectName(SERVICE_CONTROLLER_NAME);
+ }
+ catch(MalformedObjectNameException mone)
+ {
+ throw new DeploymentException("Can't construct service controller
object name!!" + mone);
+ }
+ }
+ return serviceControllerName;
}
}
_______________________________________________
Jboss-development mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/jboss-development
