diff -ru jboss-4.0.2-src\management\src\main/org/jboss/management/j2ee/AppClientModule.java jboss-4.0.2-src-patch\management\src\main/org/jboss/management/j2ee/AppClientModule.java --- jboss-4.0.2-src\management\src\main/org/jboss/management/j2ee/AppClientModule.java 2004-02-12 09:41:44.000000000 -0300 +++ jboss-4.0.2-src-patch\management\src\main/org/jboss/management/j2ee/AppClientModule.java 2005-07-06 11:34:25.986186600 -0300 @@ -6,10 +6,11 @@ */ package org.jboss.management.j2ee; +import java.util.Hashtable; + +import javax.management.MBeanServer; import javax.management.MalformedObjectNameException; import javax.management.ObjectName; -import java.security.InvalidParameterException; -import java.util.Hashtable; /** * Root class of the JBoss JSR-77 implementation of @@ -47,12 +48,12 @@ * @param pDeploymentDescriptor * @throws InvalidParameterException If the given Name is null */ - public AppClientModule(String pName, ObjectName pApplication, String[] pJVMs, String pDeploymentDescriptor) + public AppClientModule(String pName, ObjectName pApplication, MBeanServer mbeanServer, String[] pJVMs, String pDeploymentDescriptor) throws MalformedObjectNameException, InvalidParentException { - super(J2EETypeConstants.AppClientModule, pName, pApplication, pJVMs, pDeploymentDescriptor); + super(J2EETypeConstants.AppClientModule, pName, pApplication, mbeanServer, pJVMs, pDeploymentDescriptor); } // Public -------------------------------------------------------- diff -ru jboss-4.0.2-src\management\src\main/org/jboss/management/j2ee/EJBModule.java jboss-4.0.2-src-patch\management\src\main/org/jboss/management/j2ee/EJBModule.java --- jboss-4.0.2-src\management\src\main/org/jboss/management/j2ee/EJBModule.java 2004-04-20 06:17:12.000000000 -0300 +++ jboss-4.0.2-src-patch\management\src\main/org/jboss/management/j2ee/EJBModule.java 2005-07-06 11:35:23.675345800 -0300 @@ -135,7 +135,7 @@ String[] jvms = (String[]) mbeanServer.getAttribute(j2eeServerName, "javaVMs"); - EJBModule ejbModule = new EJBModule(jarName, lParent, + EJBModule ejbModule = new EJBModule(jarName, lParent, mbeanServer, jvms, lDD, moduleServiceName, @@ -203,6 +203,7 @@ */ public EJBModule(String jarName, ObjectName jsr77ParentName, + MBeanServer mbeanServer, String[] pJVMs, String pDeploymentDescriptor, ObjectName moduleServiceName, @@ -213,7 +214,7 @@ MalformedObjectNameException, InvalidParentException { - super(J2EETypeConstants.EJBModule, jarName, jsr77ParentName, pJVMs, pDeploymentDescriptor); + super(J2EETypeConstants.EJBModule, jarName, jsr77ParentName, mbeanServer, pJVMs, pDeploymentDescriptor); this.moduleServiceName = moduleServiceName; mJBossDD = (pJBossDD == null ? "" : pJBossDD); mJAWSDD = (pJAWSDD == null ? "" : pJAWSDD); diff -ru jboss-4.0.2-src\management\src\main/org/jboss/management/j2ee/J2EEApplication.java jboss-4.0.2-src-patch\management\src\main/org/jboss/management/j2ee/J2EEApplication.java --- jboss-4.0.2-src\management\src\main/org/jboss/management/j2ee/J2EEApplication.java 2004-02-12 09:41:45.000000000 -0300 +++ jboss-4.0.2-src-patch\management\src\main/org/jboss/management/j2ee/J2EEApplication.java 2005-07-06 11:31:48.686291500 -0300 @@ -61,7 +61,7 @@ try { // Now create the J2EEApplication - J2EEApplication j2eeApp = new J2EEApplication(earName, j2eeServerName, lDD); + J2EEApplication j2eeApp = new J2EEApplication(earName, j2eeServerName, mbeanServer, lDD); jsr77Name = j2eeApp.getObjectName(); /* Check to see if the ear is already registered. This will occur when an ear is deployed because we do not receive the ear module start @@ -127,10 +127,10 @@ * @param pDeploymentDescriptor * @throws InvalidParameterException If the given Name is null */ - public J2EEApplication(String name, ObjectName mbeanServer, String pDeploymentDescriptor) + public J2EEApplication(String name, ObjectName mbeanServerName, MBeanServer mbeanServer, String pDeploymentDescriptor) throws MalformedObjectNameException, InvalidParentException { - super(J2EETypeConstants.J2EEApplication, name, mbeanServer, pDeploymentDescriptor); + super(J2EETypeConstants.J2EEApplication, name, mbeanServerName, mbeanServer, pDeploymentDescriptor); } // Public -------------------------------------------------------- diff -ru jboss-4.0.2-src\management\src\main/org/jboss/management/j2ee/J2EEDeployedObject.java jboss-4.0.2-src-patch\management\src\main/org/jboss/management/j2ee/J2EEDeployedObject.java --- jboss-4.0.2-src\management\src\main/org/jboss/management/j2ee/J2EEDeployedObject.java 2004-02-12 09:41:45.000000000 -0300 +++ jboss-4.0.2-src-patch\management\src\main/org/jboss/management/j2ee/J2EEDeployedObject.java 2005-07-06 11:30:39.013078800 -0300 @@ -7,16 +7,19 @@ package org.jboss.management.j2ee; -import org.jboss.logging.Logger; - -import javax.management.MalformedObjectNameException; -import javax.management.ObjectName; import java.io.InputStream; import java.io.InputStreamReader; import java.io.Reader; import java.io.StringWriter; import java.net.URL; import java.net.URLClassLoader; +import java.security.InvalidParameterException; + +import javax.management.MBeanServer; +import javax.management.MalformedObjectNameException; +import javax.management.ObjectName; + +import org.jboss.logging.Logger; /** * Root class of the JBoss JSR-77 implementation of @@ -58,6 +61,7 @@ // Attributes ---------------------------------------------------- private String mDeploymentDescriptor; + private ObjectName serverName; // Static -------------------------------------------------------- @@ -143,6 +147,7 @@ public J2EEDeployedObject(String pType, String pName, ObjectName pParent, + MBeanServer mbeanserver, String pDeploymentDescriptor) throws MalformedObjectNameException, @@ -150,6 +155,7 @@ { super(pType, pName, pParent); mDeploymentDescriptor = pDeploymentDescriptor; + serverName = J2EEDomain.getDomainServerName(mbeanserver); } // Public -------------------------------------------------------- @@ -169,10 +175,9 @@ */ public String getserver() { - //[TODO] Need to be implemented - return "unknown server name"; + return (serverName != null) ? serverName.getCanonicalName() : null; } - + // java.lang.Object overrides ------------------------------------ public String toString() diff -ru jboss-4.0.2-src\management\src\main/org/jboss/management/j2ee/J2EEManagedObject.java jboss-4.0.2-src-patch\management\src\main/org/jboss/management/j2ee/J2EEManagedObject.java --- jboss-4.0.2-src\management\src\main/org/jboss/management/j2ee/J2EEManagedObject.java 2005-03-18 18:36:07.000000000 -0300 +++ jboss-4.0.2-src-patch\management\src\main/org/jboss/management/j2ee/J2EEManagedObject.java 2005-06-21 15:13:24.745325400 -0300 @@ -206,7 +206,7 @@ */ public String getparent() { - return parentName.getCanonicalName(); + return (parentName != null) ? parentName.getCanonicalName() : null; } /** diff -ru jboss-4.0.2-src\management\src\main/org/jboss/management/j2ee/J2EEModule.java jboss-4.0.2-src-patch\management\src\main/org/jboss/management/j2ee/J2EEModule.java --- jboss-4.0.2-src\management\src\main/org/jboss/management/j2ee/J2EEModule.java 2004-02-12 09:41:49.000000000 -0300 +++ jboss-4.0.2-src-patch\management\src\main/org/jboss/management/j2ee/J2EEModule.java 2005-07-06 11:32:22.108808200 -0300 @@ -6,13 +6,14 @@ */ package org.jboss.management.j2ee; -import javax.management.MalformedObjectNameException; -import javax.management.ObjectName; -import java.security.InvalidParameterException; import java.util.ArrayList; import java.util.Arrays; import java.util.List; +import javax.management.MBeanServer; +import javax.management.MalformedObjectNameException; +import javax.management.ObjectName; + /** * Root class of the JBoss JSR-77 implementation of * {@link javax.management.j2ee.J2EEModule J2EEModule}. @@ -46,13 +47,14 @@ public J2EEModule(String pType, String pName, ObjectName pParent, + MBeanServer mbeanserver, String[] pJVMs, String pDeploymentDescriptor) throws MalformedObjectNameException, InvalidParentException { - super(pType, pName, pParent, pDeploymentDescriptor); + super(pType, pName, pParent, mbeanserver, pDeploymentDescriptor); mJVMs = new ArrayList(Arrays.asList(pJVMs == null ? new String[0] : pJVMs)); } diff -ru jboss-4.0.2-src\management\src\main/org/jboss/management/j2ee/ResourceAdapterModule.java jboss-4.0.2-src-patch\management\src\main/org/jboss/management/j2ee/ResourceAdapterModule.java --- jboss-4.0.2-src\management\src\main/org/jboss/management/j2ee/ResourceAdapterModule.java 2004-04-20 06:17:12.000000000 -0300 +++ jboss-4.0.2-src-patch\management\src\main/org/jboss/management/j2ee/ResourceAdapterModule.java 2005-07-06 11:36:37.849594300 -0300 @@ -120,7 +120,7 @@ // Now create the ResourceAdapterModule ResourceAdapterModule rarModule = new ResourceAdapterModule(rarName, - lParent, jvms, lDD); + lParent, mbeanServer, jvms, lDD); jsr77Name = rarModule.getObjectName(); mbeanServer.registerMBean(rarModule, jsr77Name); @@ -175,12 +175,12 @@ * @param pDeploymentDescriptor * @throws InvalidParameterException If the given Name is null */ - public ResourceAdapterModule(String rarName, ObjectName jsr77ParentName, + public ResourceAdapterModule(String rarName, ObjectName jsr77ParentName, MBeanServer mbeanServer, String[] pJVMs, String pDeploymentDescriptor) throws MalformedObjectNameException, InvalidParentException { - super(J2EETypeConstants.ResourceAdapterModule, rarName, jsr77ParentName, pJVMs, pDeploymentDescriptor); + super(J2EETypeConstants.ResourceAdapterModule, rarName, jsr77ParentName, mbeanServer, pJVMs, pDeploymentDescriptor); } // Public -------------------------------------------------------- diff -ru jboss-4.0.2-src\management\src\main/org/jboss/management/j2ee/ServiceModule.java jboss-4.0.2-src-patch\management\src\main/org/jboss/management/j2ee/ServiceModule.java --- jboss-4.0.2-src\management\src\main/org/jboss/management/j2ee/ServiceModule.java 2004-02-12 09:41:49.000000000 -0300 +++ jboss-4.0.2-src-patch\management\src\main/org/jboss/management/j2ee/ServiceModule.java 2005-07-06 11:37:45.412234000 -0300 @@ -57,7 +57,7 @@ // Get JVM of the j2eeServer String[] jvms = (String[]) mbeanServer.getAttribute(j2eeServerName, "javaVMs"); // Now create the ServiceModule - ServiceModule serviceModule = new ServiceModule(moduleName, j2eeServerName, jvms, lDD); + ServiceModule serviceModule = new ServiceModule(moduleName, j2eeServerName, mbeanServer, jvms, lDD); jsr77Name = serviceModule.getObjectName(); mbeanServer.registerMBean(serviceModule, jsr77Name); log.debug("Created JSR-77 ServiceModule, name: " + moduleName); @@ -107,12 +107,12 @@ * @param pDeploymentDescriptor * @throws InvalidParameterException If the given Name is null */ - public ServiceModule(String moduleName, ObjectName j2eeServerName, + public ServiceModule(String moduleName, ObjectName j2eeServerName, MBeanServer mbeanServer, String[] jvmNames, String pDeploymentDescriptor) throws MalformedObjectNameException, InvalidParentException { - super(J2EETypeConstants.ServiceModule, moduleName, j2eeServerName, jvmNames, pDeploymentDescriptor); + super(J2EETypeConstants.ServiceModule, moduleName, j2eeServerName, mbeanServer, jvmNames, pDeploymentDescriptor); } // Public -------------------------------------------------------- diff -ru jboss-4.0.2-src\management\src\main/org/jboss/management/j2ee/WebModule.java jboss-4.0.2-src-patch\management\src\main/org/jboss/management/j2ee/WebModule.java --- jboss-4.0.2-src\management\src\main/org/jboss/management/j2ee/WebModule.java 2004-09-24 19:48:34.000000000 -0300 +++ jboss-4.0.2-src-patch\management\src\main/org/jboss/management/j2ee/WebModule.java 2005-07-06 11:38:29.567918800 -0300 @@ -129,7 +129,7 @@ String[] jvms = (String[]) mbeanServer.getAttribute(j2eeServerName, "javaVMs"); - WebModule webModule = new WebModule(warName, jsr77ParentName, jvms, webXml, + WebModule webModule = new WebModule(warName, jsr77ParentName, mbeanServer, jvms, webXml, webContainerName, jbossWebXml); jsr77Name = webModule.getObjectName(); mbeanServer.registerMBean(webModule, jsr77Name); @@ -185,12 +185,12 @@ * @param webContainerName the JBoss web container service name for the war * @param jbossWebDD the jboss-web.xml descriptor text */ - public WebModule(String warName, ObjectName j2eeAppName, String[] jvms, + public WebModule(String warName, ObjectName j2eeAppName, MBeanServer mbeanServer, String[] jvms, String webDD, ObjectName webContainerName, String jbossWebDD) throws MalformedObjectNameException, InvalidParentException { - super(J2EETypeConstants.WebModule, warName, j2eeAppName, jvms, webDD); + super(J2EETypeConstants.WebModule, warName, j2eeAppName, mbeanServer, jvms, webDD); this.jbossWebDD = (jbossWebDD == null ? "" : jbossWebDD); }