These changes add support for extension-module MBeans; they can be
found and accessed. No support for deployment via AMX.
Changes are nearly generic, I'll check in soon unless I hear something.
Lloyd
MB2:/gf/build/glassfish lloyd$ cvs diff -uw appserv-api/src admin/
mbeanapi-impl/
Index: appserv-api/src/java/com/sun/appserv/management/base/XTypes.java
===================================================================
RCS file: /cvs/glassfish/appserv-api/src/java/com/sun/appserv/
management/base/XTypes.java,v
retrieving revision 1.4
diff -u -w -r1.4 XTypes.java
--- appserv-api/src/java/com/sun/appserv/management/base/
XTypes.java 5 Jun 2007 16:31:53 -0000 1.4
+++ appserv-api/src/java/com/sun/appserv/management/base/
XTypes.java 18 Dec 2007 22:21:46 -0000
@@ -461,6 +461,12 @@
*/
public final static String
LIFECYCLE_MODULE_CONFIG = P + "LifecycleModuleConfig";
+
+ /**
+ ID for {_at_link
com.sun.appserv.management.config.ExtensionModuleConfig}
+ */
+ public final static String
EXTENSION_MODULE_CONFIG = P + "ExtensionModuleConfig";
+
/**
ID for {_at_link
com.sun.appserv.management.config.AuthRealmConfig}
*/
cvs diff: Diffing appserv-api/src/java/com/sun/appserv/management/client
cvs diff: Diffing appserv-api/src/java/com/sun/appserv/management/
client/handler
cvs diff: Diffing appserv-api/src/java/com/sun/appserv/management/
client/prefs
cvs diff: Diffing appserv-api/src/java/com/sun/appserv/management/config
Index: appserv-api/src/java/com/sun/appserv/management/config/
DomainConfig.java
===================================================================
RCS file: /cvs/glassfish/appserv-api/src/java/com/sun/appserv/
management/config/DomainConfig.java,v
retrieving revision 1.5
diff -u -w -r1.5 DomainConfig.java
--- appserv-api/src/java/com/sun/appserv/management/config/
DomainConfig.java 25 May 2007 20:25:12 -0000 1.5
+++ appserv-api/src/java/com/sun/appserv/management/config/
DomainConfig.java 18 Dec 2007 22:21:46 -0000
@@ -687,6 +687,7 @@
@see #getRARModuleConfigMap
@see #getLifecycleModuleConfigMap
@see #getConnectorModuleConfigMap
+ @see #getExtensionModuleConfigMap
*/
public
Map<String,J2EEApplicationConfig>
getJ2EEApplicationConfigMap();
@@ -699,6 +700,7 @@
@see #getRARModuleConfigMap
@see #getLifecycleModuleConfigMap
@see #getConnectorModuleConfigMap
+ @see #getExtensionModuleConfigMap
*/
public Map<String,EJBModuleConfig>
getEJBModuleConfigMap( );
@@ -710,6 +712,7 @@
@see #getRARModuleConfigMap
@see #getLifecycleModuleConfigMap
@see #getConnectorModuleConfigMap
+ @see #getExtensionModuleConfigMap
*/
public Map<String,WebModuleConfig>
getWebModuleConfigMap( );
@@ -721,6 +724,7 @@
@see #getAppClientModuleConfigMap
@see #getLifecycleModuleConfigMap
@see #getConnectorModuleConfigMap
+ @see #getExtensionModuleConfigMap
*/
public Map<String,RARModuleConfig>
getRARModuleConfigMap();
@@ -732,6 +736,7 @@
@see #getRARModuleConfigMap
@see #getLifecycleModuleConfigMap
@see #getConnectorModuleConfigMap
+ @see #getExtensionModuleConfigMap
*/
public
Map<String,AppClientModuleConfig>
getAppClientModuleConfigMap();
@@ -743,9 +748,34 @@
@see #getRARModuleConfigMap
@see #getAppClientModuleConfigMap
@see #getConnectorModuleConfigMap
+ @see #getExtensionModuleConfigMap
*/
public
Map<String,LifecycleModuleConfig>
getLifecycleModuleConfigMap();
+ /**
+ @return Map, keyed by name of {_at_link
LifecycleModuleConfig}.
+ @see #getJ2EEApplicationConfigMap
+ @see #getWebModuleConfigMap
+ @see #getEJBModuleConfigMap
+ @see #getRARModuleConfigMap
+ @see #getAppClientModuleConfigMap
+ @see #getConnectorModuleConfigMap
+ */
+ public
Map<String,ExtensionModuleConfig>
getExtensionModuleConfigMap();
+
+ /**
+ @return Map, keyed by name of {_at_link
ExtensionModuleConfig}.
+ @see #getJ2EEApplicationConfigMap
+ @see #getWebModuleConfigMap
+ @see #getEJBModuleConfigMap
+ @see #getRARModuleConfigMap
+ @see #getAppClientModuleConfigMap
+ @see #getConnectorModuleConfigMap
+ @see #getExtensionModuleConfigMap
+ @since AppServer 9.1.1
+ */
+ public DiagnosticServiceConfig getDiagnosticServiceConfig();
+
/**
@return Map, keyed by name of {_at_link
J2EEApplicationConfig}
@@ -755,6 +785,7 @@
@see #getRARModuleConfigMap
@see #getAppClientModuleConfigMap
@see #getLifecycleModuleConfigMap
+ @see #getExtensionModuleConfigMap
*/
public Map<String,ConnectorModuleConfig>
getConnectorModuleConfigMap();
cvs diff: appserv-api/src/java/com/sun/appserv/management/config/
ExtensionModuleConfig.java is a new entry, no comparison available
cvs diff: admin/mbeanapi-impl/src/java/com/sun/enterprise/management/
config/ExtensionModuleConfigImpl.java is a new entry, no comparison
available
Index: admin/mbeanapi-impl/src/java/com/sun/enterprise/management/
support/OldConfigTypes.java
===================================================================
RCS file: /cvs/glassfish/admin/mbeanapi-impl/src/java/com/sun/
enterprise/management/support/OldConfigTypes.java,v
retrieving revision 1.11.2.1
diff -u -w -r1.11.2.1 OldConfigTypes.java
--- admin/mbeanapi-impl/src/java/com/sun/enterprise/management/
support/OldConfigTypes.java 21 Nov 2007 04:50:16 -0000
1.11.2.1
+++ admin/mbeanapi-impl/src/java/com/sun/enterprise/management/
support/OldConfigTypes.java 18 Dec 2007 22:21:46 -0000
@@ -120,6 +120,7 @@
add( APP_CLIENT_MODULE_CONFIG, "appclient-module" );
add( RAR_MODULE_CONFIG, "connector-module");
add( LIFECYCLE_MODULE_CONFIG, "lifecycle-module");
+ add( EXTENSION_MODULE_CONFIG, "extension-module");
add( CONFIG_CONFIG, "config");
add( STANDALONE_SERVER_CONFIG, "server");
add( CLUSTER_CONFIG, "cluster");
Index: admin/mbeanapi-impl/src/java/com/sun/enterprise/management/
support/TypeInfos.java
===================================================================
RCS file: /cvs/glassfish/admin/mbeanapi-impl/src/java/com/sun/
enterprise/management/support/TypeInfos.java,v
retrieving revision 1.24.6.1
diff -u -w -r1.24.6.1 TypeInfos.java
--- admin/mbeanapi-impl/src/java/com/sun/enterprise/management/
support/TypeInfos.java 21 Nov 2007 04:50:18 -0000 1.24.6.1
+++ admin/mbeanapi-impl/src/java/com/sun/enterprise/management/
support/TypeInfos.java 18 Dec 2007 22:21:46 -0000
@@ -510,7 +510,7 @@
new DomainConfigChild( NODE_AGENT_CONFIG ),
new DomainConfigChild( RESOURCE_ADAPTER_CONFIG ),
new DomainConfigChild( LIFECYCLE_MODULE_CONFIG ),
-//new DomainConfigChild( EXTENSION_MODULE_CONFIG ),
+new DomainConfigChild( EXTENSION_MODULE_CONFIG ),
new DomainConfigChild( LOAD_BALANCER_CONFIG ),
new DomainConfigChild( LB_CONFIG ),
Index: admin/mbeanapi-impl/src/java/com/sun/enterprise/management/
support/XTypesMapper.java
===================================================================
RCS file: /cvs/glassfish/admin/mbeanapi-impl/src/java/com/sun/
enterprise/management/support/Attic/XTypesMapper.java,v
retrieving revision 1.1.2.1
diff -u -w -r1.1.2.1 XTypesMapper.java
--- admin/mbeanapi-impl/src/java/com/sun/enterprise/management/
support/XTypesMapper.java 3 Dec 2007 20:11:26 -0000 1.1.2.1
+++ admin/mbeanapi-impl/src/java/com/sun/enterprise/management/
support/XTypesMapper.java 18 Dec 2007 22:21:46 -0000
@@ -199,6 +199,7 @@
J2EEApplicationConfig.class,
LifecycleModuleConfig.class,
+ ExtensionModuleConfig.class,
EJBContainerAvailabilityConfig.class,
WebContainerAvailabilityConfig.class,
---
Lloyd L Chambers
lloyd.chambers_at_sun.com
Sun Microsystems, Inc