I have received no feedback after 40 hours, and will be committing
this code after lunch today.
Lloyd
On May 29, 2007, at 6:57 PM, Lloyd L Chambers wrote:
> TIMEOUT: noon on Thursday May 31
>
> IssueTracker issue:
> https://glassfish.dev.java.net/issues/show_bug.cgi?id=2966
>
> I am the person removing the code; for questions on *why* it is
> being removed, please talk to Nazrul Islam and Abhijit Kumar.
>
> For now I've commented out the relevant code (hence the diffs won't
> show most of the code that is now out).
>
> While this is an incompatible change, it is code that is part of
> EE, and hence it never was released for public consumption.
>
> QL EE passes.
>
> Lloyd
>
> ------------------
> cvs diff -w -u appserv-api/src admin/mbeanapi-impl/src
>
>
> 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.3
> diff -w -u -r1.3 XTypes.java
> --- appserv-api/src/java/com/sun/appserv/management/base/
> XTypes.java 5 May 2007 05:30:30 -0000 1.3
> +++ appserv-api/src/java/com/sun/appserv/management/base/
> XTypes.java 30 May 2007 01:46:38 -0000
> @@ -605,31 +605,35 @@
>
> /**
> +---------------------------------------------------------------------
> ----------
> +LOAD_BALANCER_MONITORING
> ID for {_at_link
> com.sun.appserv.management.monitor.ServerRootMonitor}
> - */
> + *
> public final static String
> LOAD_BALANCER_MONITOR = P + "LoadBalancerMonitor";
>
> /**
> ID for {_at_link
> com.sun.appserv.management.monitor.LoadBalancerServerMonitor}
> - */
> + *
> public final static String
> LOAD_BALANCER_SERVER_MONITOR = P +
> "LoadBalancerServerMonitor";
>
> /**
> ID for {_at_link
> com.sun.appserv.management.monitor.LoadBalancerClusterMonitor}
> - */
> + *
> public final static String
> LOAD_BALANCER_CLUSTER_MONITOR = P +
> "LoadBalancerClusterMonitor";
>
> /**
> ID for {_at_link
> com.sun.appserv.management.monitor.LoadBalancerApplicationMonitor}
> - */
> + *
> public final static String
> LOAD_BALANCER_APPLICATION_MONITOR = P +
> "LoadBalancerApplicationMonitor";
>
> /**
> ID for {_at_link
> com.sun.appserv.management.monitor.LoadBalancerContextRootMonitor}
> - */
> + *
> public final static String
> LOAD_BALANCER_CONTEXT_ROOT_MONITOR = P +
> "LoadBalancerContextRootMonitor";
> +---------------------------------------------------------------------
> ----------
> + */
>
> /**
> ID for {_at_link
> com.sun.appserv.management.monitor.ApplicationMonitor}
> Index: appserv-api/src/java/com/sun/appserv/management/base/
> XTypesMapper.java
> ===================================================================
> RCS file: /cvs/glassfish/appserv-api/src/java/com/sun/appserv/
> management/base/XTypesMapper.java,v
> retrieving revision 1.3
> diff -w -u -r1.3 XTypesMapper.java
> --- appserv-api/src/java/com/sun/appserv/management/base/
> XTypesMapper.java 5 May 2007 05:30:30 -0000 1.3
> +++ appserv-api/src/java/com/sun/appserv/management/base/
> XTypesMapper.java 30 May 2007 01:46:38 -0000
> @@ -48,10 +48,12 @@
> import com.sun.appserv.management.ext.update.UpdateStatus;
> import com.sun.appserv.management.ext.logging.Logging;
> import com.sun.appserv.management.ext.lb.LoadBalancer;
> +/*
> import
> com.sun.appserv.management.monitor.LoadBalancerContextRootMonitor;
> import com.sun.appserv.management.monitor.LoadBalancerClusterMonitor;
> import com.sun.appserv.management.monitor.LoadBalancerServerMonitor;
> import com.sun.appserv.management.monitor.LoadBalancerMonitor;
> +*/
> import com.sun.appserv.management.deploy.DeploymentMgr;
> /**
> @@ -227,11 +229,13 @@
> ServerRootMonitor.class,
> + /*
> LoadBalancerMonitor.class,
> LoadBalancerServerMonitor.class,
> LoadBalancerClusterMonitor.class,
> LoadBalancerApplicationMonitor.class,
> LoadBalancerContextRootMonitor.class,
> + */
>
> CallFlowMonitor.class,
>
>
>
> Index: appserv-api/src/java/com/sun/appserv/management/config/
> HTTPProtocolConfig.java
> ===================================================================
> RCS file: /cvs/glassfish/appserv-api/src/java/com/sun/appserv/
> management/config/HTTPProtocolConfig.java,v
> retrieving revision 1.2
> diff -w -u -r1.2 HTTPProtocolConfig.java
> --- appserv-api/src/java/com/sun/appserv/management/config/
> HTTPProtocolConfig.java 5 May 2007 05:30:33 -0000 1.2
> +++ appserv-api/src/java/com/sun/appserv/management/config/
> HTTPProtocolConfig.java 30 May 2007 01:46:38 -0000
> @@ -33,14 +33,6 @@
> * only if the new code is made subject to such option by the
> copyright
> * holder.
> */
> -
> -/*
> -* $Header: /cvs/glassfish/appserv-api/src/java/com/sun/appserv/
> management/config/HTTPProtocolConfig.java,v 1.2 2007/05/05 05:30:33
> tcfujii Exp $
> -* $Revision: 1.2 $
> -* $Date: 2007/05/05 05:30:33 $
> -*/
> -
> -
> package com.sun.appserv.management.config;
> import com.sun.appserv.management.base.XTypes;
> @@ -54,26 +46,48 @@
> /** The j2eeType as returned by {_at_link
> com.sun.appserv.management.base.AMX#getJ2EEType}. */
> public static final String J2EE_TYPE =
> XTypes.HTTP_PROTOCOL_CONFIG;
> + /**
> + <b>DO NOT USE, use {_at_link #getDefaultType}</b>
> + @deprecated
> + */
> public String getDefaultResponseType();
> +
> /**
> - Legal values include:
> - <ul>
> - <li>"text/html</li>
> - <li>ISO-8859-1</li>
> - <li>en</li>
> - </ul>
> + <b>DO NOT USE, use {_at_link #setDefaultType}</b>
> + @deprecated
> */
> public void setDefaultResponseType( final String value );
> public boolean getDNSLookupEnabled();
> public void setDNSLookupEnabled( final boolean value );
> +
> + /**
> + Example: "text/html; charset=iso-8859-1".
> + */
> + public String getForcedType();
> + /**
> + See {_at_link #getForcedType}.
> + */
> + public void setForcedType(String forcedType);
> +
> +
> + /**
> + @see HTTPProtocolConfigKeys#FORCED_RESPONSE_TYPE_KEY
> + @deprecated
> + */
> + public String getDefaultType();
> + public void setDefaultType(String defaultType);
> +
> /**
> + <b>DO NOT USE, use {_at_link #getResponseType}</b>
> @see HTTPProtocolConfigKeys#FORCED_RESPONSE_TYPE_KEY
> + @deprecated
> */
> public String getForcedResponseType();
> /**
> @see HTTPProtocolConfigKeys#FORCED_RESPONSE_TYPE_KEY
> + @deprecated
> */
> public void setForcedResponseType( final String value );
> Index: appserv-api/src/java/com/sun/appserv/management/config/
> HTTPProtocolConfigKeys.java
> ===================================================================
> RCS file: /cvs/glassfish/appserv-api/src/java/com/sun/appserv/
> management/config/HTTPProtocolConfigKeys.java,v
> retrieving revision 1.2
> diff -w -u -r1.2 HTTPProtocolConfigKeys.java
> --- appserv-api/src/java/com/sun/appserv/management/config/
> HTTPProtocolConfigKeys.java 5 May 2007 05:30:33 -0000 1.2
> +++ appserv-api/src/java/com/sun/appserv/management/config/
> HTTPProtocolConfigKeys.java 30 May 2007 01:46:38 -0000
> @@ -34,11 +34,6 @@
> * holder.
> */
>
> -/*
> - * $Header: /cvs/glassfish/appserv-api/src/java/com/sun/appserv/
> management/config/HTTPProtocolConfigKeys.java,v 1.2 2007/05/05
> 05:30:33 tcfujii Exp $
> - * $Revision: 1.2 $
> - * $Date: 2007/05/05 05:30:33 $
> - */
> package com.sun.appserv.management.config;
> /**
> @@ -56,6 +51,17 @@
> public static final String DNS_LOOKUP_ENABLED_KEY
> = "DNSLookupEnabled";
> /**
> + See {_at_link HTTPProtocolConfig#setForcedType}.
> + */
> + public static final String FORCED_TYPE_KEY
> = "ForcedType";
> +
> + /**
> + See {_at_link HTTPProtocolConfig#setDefaultType}.
> + */
> + public static final String DEFAULT_TYPE_KEY
> = "DefaultType";
> +
> +
> + /**
> See {_at_link
> HTTPProtocolConfig#setForcedResponseType} for legal values.
> The response type to be forced if the content
> served cannot
> be matched by any of the MIME mappings for extensions.
> @@ -63,11 +69,13 @@
> content-type, encoding, language, charset
> <p>
> Example: "text/html; charset=iso-8859-1"
> -
> + @deprecated
> */
> public static final String
> FORCED_RESPONSE_TYPE_KEY = "ForcedResponseType";
> +
> /**
> See {_at_link #FORCED_RESPONSE_TYPE_KEY}.
> + @deprecated
> */
> public static final String DEFAULT_RESPONSE_TYPE_KEY
> = "DefaultResponseType";
> public static final String
> SSL_ENABLED_KEY = "SSLEnabled";
>
>
>
> Index: appserv-api/src/java/com/sun/appserv/management/helper/
> LBConfigHelper.java
> ===================================================================
> RCS file: /cvs/glassfish/appserv-api/src/java/com/sun/appserv/
> management/helper/LBConfigHelper.java,v
> retrieving revision 1.5
> diff -w -u -r1.5 LBConfigHelper.java
> --- appserv-api/src/java/com/sun/appserv/management/helper/
> LBConfigHelper.java 5 May 2007 05:30:50 -0000 1.5
> +++ appserv-api/src/java/com/sun/appserv/management/helper/
> LBConfigHelper.java 30 May 2007 01:46:39 -0000
> @@ -77,11 +77,12 @@
> import com.sun.appserv.management.config.ObjectTypeValues;
> import com.sun.appserv.management.config.ServerConfig;
> import com.sun.appserv.management.ext.lb.LoadBalancer;
> -import
> com.sun.appserv.management.monitor.LoadBalancerApplicationMonitor;
> +/*import
> com.sun.appserv.management.monitor.LoadBalancerApplicationMonitor;
> import com.sun.appserv.management.monitor.LoadBalancerClusterMonitor;
> import
> com.sun.appserv.management.monitor.LoadBalancerContextRootMonitor;
> import com.sun.appserv.management.monitor.LoadBalancerMonitor;
> import com.sun.appserv.management.monitor.LoadBalancerServerMonitor;
> +*/
> import com.sun.appserv.management.monitor.MonitoringRoot;
> import
> com.sun.appserv.management.monitor.statistics.LoadBalancerContextRootS
> tats;
> import
> com.sun.appserv.management.monitor.statistics.LoadBalancerServerStats;
> @@ -566,7 +567,6 @@
> *
> * @return Map of LoadBalancerServerStats and the fully
> qualified names
> * of the servers i.e. clustername.servername or servername
> - */
> public Map<String, LoadBalancerServerStats> getInstanceStats(
> final String targetLoadBalancer, final String target,
> boolean allTargets) {
>
> @@ -592,6 +592,7 @@
> }
> return loadBalancerServerStatsMap;
> }
> + */
>
> /**
> * This is a convenience method to fetch the stats for context
> roots
> @@ -604,7 +605,6 @@
> *
> * @return Map of LoadBalancerContextRootStats and the fully
> qualified names
> * of the servers i.e. clustername.servername or servername
> - */
> public Map<String, LoadBalancerContextRootStats>
> getInstanceStats(
> final String targetLoadBalancer, final String
> contextRoot,
> final String target, boolean allTargets) {
> @@ -644,6 +644,7 @@
> }
> return loadBalancerContextRootStatsMap;
> }
> + */
>
> /**
> * This method supports the create-http-lb-ref CLI command. It
> creates a server-ref|cluster-ref, health-checker by using
> @@ -1113,7 +1114,6 @@
> * @param allTargets list Monitors for all targets.
> *
> * @return Map of LoadBalancerServerMonitors and their names
> - */
> public Map<String, LoadBalancerServerMonitor>
> getInstanceMonitors(
> final String targetLoadBalancer, final String target,
> boolean allTargets) {
> @@ -1143,6 +1143,7 @@
> }
> return loadBalancerServerMonitorMap;
> }
> + */
> /**
> * Returns the stats for an instance. If the instance is being
> load
> @@ -1152,7 +1153,6 @@
> * @param serverName instance name
> *
> * @return Map of LoadBalancerServerMonitor keyed by load
> balancer name
> - */
> public Map<String, LoadBalancerServerMonitor>
> getInstanceAggregateStats(String serverName) {
>
> @@ -1185,6 +1185,7 @@
> }
> return loadBalancerServerMonitorMap;
> }
> + */
>
> /**
> * Returns the load balancers loadbalancing a target :
> @@ -1285,6 +1286,7 @@
> return relevantLoadBalancerConfigMap;
> }
>
> + /*
> private void populateLoadBalancerServerMonitorMap(String target,
> Map<String, LoadBalancerServerMonitor>
> loadBalancerServerMonitorMap,
> LoadBalancerClusterMonitor loadBalancerClusterMonitor) {
> @@ -1302,6 +1304,7 @@
> loadBalancerServerMonitor);
> }
> }
> + */
>
> private LoadBalancer createLoadBalancer(final String
> configName) {
> mDomainConfig.createLoadBalancerConfig(
> @@ -1345,19 +1348,19 @@
> }
>
> // PRIVATE VARIABLES
> - DomainConfig mDomainConfig = null;
> + private final DomainConfig mDomainConfig;
>
> - DomainRoot mDomainRoot = null;
> + private final DomainRoot mDomainRoot;
>
> - static final String LB_CONFIG_SUFFIX = "_LB_CONFIG";
> + private static final String LB_CONFIG_SUFFIX = "_LB_CONFIG";
>
> - static final String LB_SUFFIX = "-lb-temp";
> + private static final String LB_SUFFIX = "-lb-temp";
>
> - Logger mLogger = null;
> + private final Logger mLogger;
>
> - ResourceBundle resBundle = null;
> + private final ResourceBundle resBundle;
>
> - Formatter formatter = null;
> + private Formatter formatter;
>
> public static final String RESPONSE_TIMEOUT = "responsetimeout";
> public static final String HTTPS_ROUTING = "httpsrouting";
>
> cvs diff: Diffing appserv-api/src/java/com/sun/appserv/management/j2ee
> cvs diff: Diffing appserv-api/src/java/com/sun/appserv/management/
> j2ee/statistics
> cvs diff: Diffing appserv-api/src/java/com/sun/appserv/management/
> monitor
> cvs diff: appserv-api/src/java/com/sun/appserv/management/monitor/
> LoadBalancerApplicationMonitor.java was removed, no comparison
> available
> cvs diff: appserv-api/src/java/com/sun/appserv/management/monitor/
> LoadBalancerClusterMonitor.java was removed, no comparison available
> cvs diff: appserv-api/src/java/com/sun/appserv/management/monitor/
> LoadBalancerContextRootMonitor.java was removed, no comparison
> available
> cvs diff: appserv-api/src/java/com/sun/appserv/management/monitor/
> LoadBalancerMonitor.java was removed, no comparison available
> cvs diff: appserv-api/src/java/com/sun/appserv/management/monitor/
> LoadBalancerServerMonitor.java was removed, no comparison available
>
> Index: appserv-api/src/java/com/sun/appserv/management/monitor/
> MonitoringRoot.java
> ===================================================================
> RCS file: /cvs/glassfish/appserv-api/src/java/com/sun/appserv/
> management/monitor/MonitoringRoot.java,v
> retrieving revision 1.2
> diff -w -u -r1.2 MonitoringRoot.java
> --- appserv-api/src/java/com/sun/appserv/management/monitor/
> MonitoringRoot.java 5 May 2007 05:30:53 -0000 1.2
> +++ appserv-api/src/java/com/sun/appserv/management/monitor/
> MonitoringRoot.java 30 May 2007 01:46:39 -0000
> @@ -61,6 +61,6 @@
> /**
> * @return Map of LoadBalancerServerMonitor, keyed by
> load-balancer name.
> - */
> public Map<String, LoadBalancerMonitor>
> getLoadBalancerMonitorMap();
> + */
> }
>
>
>
> Index: admin/mbeanapi-impl/src/java/com/sun/enterprise/management/
> DomainRootImpl.java
> ===================================================================
> RCS file: /cvs/glassfish/admin/mbeanapi-impl/src/java/com/sun/
> enterprise/management/DomainRootImpl.java,v
> retrieving revision 1.22
> diff -w -u -r1.22 DomainRootImpl.java
> --- admin/mbeanapi-impl/src/java/com/sun/enterprise/management/
> DomainRootImpl.java 5 May 2007 05:23:16 -0000 1.22
> +++ admin/mbeanapi-impl/src/java/com/sun/enterprise/management/
> DomainRootImpl.java 30 May 2007 01:46:39 -0000
> @@ -35,8 +35,6 @@
> */
> package com.sun.enterprise.management;
> -import com.sun.enterprise.management.support.LBBootstrapUtil;
> -
> /**
> DAS implementation of DomainRoot
> @@ -48,6 +46,11 @@
> {
> }
> +/*
> +LOAD_BALANCER_MONITORING
> +This code never belonged here.
> +Decouple and reimplement correctly elsewhere.
> +
> public void
> postRegisterHook(Boolean registrationDone)
> {
> @@ -62,6 +65,7 @@
> logWarning( "DomainRootImpl: postRegisterHook
> Bootstrapping for LB failed" );
> }
> }
> +*/
> }
> cvs diff: Diffing admin/mbeanapi-impl/src/java/com/sun/enterprise/
> management/config
> Index: admin/mbeanapi-impl/src/java/com/sun/enterprise/management/
> config/ClusterRefConfigImpl.java
> ===================================================================
> RCS file: /cvs/glassfish/admin/mbeanapi-impl/src/java/com/sun/
> enterprise/management/config/ClusterRefConfigImpl.java,v
> retrieving revision 1.13
> diff -w -u -r1.13 ClusterRefConfigImpl.java
> --- admin/mbeanapi-impl/src/java/com/sun/enterprise/management/
> config/ClusterRefConfigImpl.java 5 May 2007 05:23:17 -0000 1.13
> +++ admin/mbeanapi-impl/src/java/com/sun/enterprise/management/
> config/ClusterRefConfigImpl.java 30 May 2007 01:46:39 -0000
> @@ -50,22 +50,26 @@
> import com.sun.enterprise.management.config.AMXConfigImplBase;
> import com.sun.enterprise.management.support.Delegate;
> import com.sun.enterprise.management.support.ObjectNames;
> -import com.sun.enterprise.management.support.LBDeregistrationUtil;
> import com.sun.enterprise.management.support.AMXAttributeNameMapper;
> import static com.sun.appserv.management.base.XTypes.LOAD_BALANCER;
> -import static
> com.sun.appserv.management.base.XTypes.LOAD_BALANCER_MONITOR;
> import static com.sun.appserv.management.base.AMX.J2EE_TYPE_KEY;
> import static com.sun.appserv.management.base.AMX.NAME_KEY;
> import static com.sun.appserv.management.base.AMX.JMX_DOMAIN;
> import com.sun.appserv.management.base.Util;
> import com.sun.appserv.management.base.AMXDebug;
> +/*
> +LOAD_BALANCER_MONITORING
> +This code never belonged here; improper dependency
> +import static
> com.sun.appserv.management.base.XTypes.LOAD_BALANCER_MONITOR;
> +import com.sun.enterprise.management.support.LBDeregistrationUtil;
> import com.sun.appserv.management.monitor.LoadBalancerMonitor;
> import com.sun.appserv.management.monitor.LoadBalancerClusterMonitor;
> import com.sun.appserv.management.monitor.LoadBalancerServerMonitor;
> import
> com.sun.appserv.management.monitor.LoadBalancerApplicationMonitor;
> import
> com.sun.appserv.management.monitor.LoadBalancerContextRootMonitor;
> +*/
> import com.sun.appserv.management.config.DeployedItemRefConfig;
> import com.sun.appserv.management.config.ClusterRefConfig;
> import com.sun.appserv.management.config.ClusterConfig;
> @@ -74,6 +78,7 @@
> import com.sun.appserv.management.config.LoadBalancerConfig;
> import com.sun.appserv.management.config.LBConfig;
> import com.sun.appserv.management.client.ProxyFactory;
> +import com.sun.appserv.management.util.misc.ExceptionUtil;
> /**
> Configuration for the <cluster-ref> element.
> @@ -82,13 +87,19 @@
> implements ConfigFactoryCallback {
> //implements ClusterRefConfig
> - ClusterRefDeregistrationHelper mHelper = null;
> -
> public ClusterRefConfigImpl(final Delegate delegate)
> {
> super(delegate);
> }
> +/*
> +LOAD_BALANCER_MONITORING
> +This code never belonged here.
> +Decouple and reimplement correctly elsewhere; config
> +item should *never* depend on monitoring ones.
> +
> + volatile ClusterRefDeregistrationHelper mHelper = null;
> +
> protected void unregisterMisc() {
> try {
> mHelper = new ClusterRefDeregistrationHelper(
> @@ -114,7 +125,8 @@
> mHelper = null;
> } catch (Exception ex) {
> logWarning("ClusterRefConfig postDeregistration
> failed. " +
> - "Load Balancer Monitoring MBeans might be
> lying around");
> + "Load Balancer Monitoring MBeans might be
> lying around\n" +
> + ExceptionUtil.toString(ex) );
> }
> }
> @@ -194,6 +206,7 @@
> }
> }
> }
> +*/
> }
> Index: admin/mbeanapi-impl/src/java/com/sun/enterprise/management/
> config/DeployedItemRefConfigImpl.java
> ===================================================================
> RCS file: /cvs/glassfish/admin/mbeanapi-impl/src/java/com/sun/
> enterprise/management/config/DeployedItemRefConfigImpl.java,v
> retrieving revision 1.12
> diff -w -u -r1.12 DeployedItemRefConfigImpl.java
> --- admin/mbeanapi-impl/src/java/com/sun/enterprise/management/
> config/DeployedItemRefConfigImpl.java 5 May 2007 05:23:17
> -0000 1.12
> +++ admin/mbeanapi-impl/src/java/com/sun/enterprise/management/
> config/DeployedItemRefConfigImpl.java 30 May 2007 01:46:39 -0000
> @@ -39,7 +39,6 @@
> package com.sun.enterprise.management.config;
> -import com.sun.enterprise.management.support.LBDeregistrationUtil;
> import com.sun.enterprise.management.support.ObjectNames;
> import javax.management.ObjectName;
> @@ -60,18 +59,26 @@
> import javax.management.ObjectName;
> import static com.sun.appserv.management.base.XTypes.LOAD_BALANCER;
> -import static
> com.sun.appserv.management.base.XTypes.LOAD_BALANCER_MONITOR;
> import static com.sun.appserv.management.base.AMX.J2EE_TYPE_KEY;
> import static com.sun.appserv.management.base.AMX.NAME_KEY;
> import static com.sun.appserv.management.base.AMX.JMX_DOMAIN;
> import com.sun.appserv.management.base.Util;
> import com.sun.appserv.management.base.AMXDebug;
> +/*
> +LOAD_BALANCER_MONITORING
> +This code never belonged here.
> +Decouple and reimplement correctly elsewhere; config
> +item should *never* depend on monitoring ones.
> +
> +import static
> com.sun.appserv.management.base.XTypes.LOAD_BALANCER_MONITOR;
> +import com.sun.enterprise.management.support.LBDeregistrationUtil;
> import com.sun.appserv.management.monitor.LoadBalancerMonitor;
> import com.sun.appserv.management.monitor.LoadBalancerClusterMonitor;
> import com.sun.appserv.management.monitor.LoadBalancerServerMonitor;
> import
> com.sun.appserv.management.monitor.LoadBalancerApplicationMonitor;
> import
> com.sun.appserv.management.monitor.LoadBalancerContextRootMonitor;
> +*/
> import com.sun.appserv.management.config.DeployedItemRefConfig;
> import com.sun.appserv.management.config.ClusterRefConfig;
> import com.sun.appserv.management.config.ClusterConfig;
> @@ -80,14 +87,13 @@
> import com.sun.appserv.management.config.LoadBalancerConfig;
> import com.sun.appserv.management.config.LBConfig;
> import com.sun.appserv.management.client.ProxyFactory;
> +import com.sun.appserv.management.util.misc.ExceptionUtil;
> /**
> Configuration for the <application-ref> element
> found within a <server>
> */
> public final class DeployedItemRefConfigImpl extends
> AMXConfigImplBase
> {
> - DeployedItemRefDeRegistrationHelper mHelper = null;
> -
> public
> DeployedItemRefConfigImpl( final Delegate delegate )
> {
> @@ -95,14 +101,14 @@
> }
> /*
> - protected void
> - addCustomMappings( final AttributeNameMapper mapper )
> - {
> - super.addCustomMappings( mapper );
> - // these require custom mappings due to different
> names...
> - mapper.addMapping( "lb-enabled", "LBEnabled" );
> - }
> - */
> +LOAD_BALANCER_MONITORING
> +See duplicated code in ClusterRefConfigImpl, ServerRefConfigImpl,
> +DeployedItemRefConfigImpl.
> +This code never belonged here.
> +Decouple and reimplement correctly elsewhere; config
> +item should *never* depend on monitoring ones.
> +
> + DeployedItemRefDeRegistrationHelper mHelper = null;
>
> protected void unregisterMisc() {
> try {
> @@ -133,7 +139,8 @@
> } catch (Exception ex) {
> logWarning("DeployedItemRef postDeregistration
> failed. " +
> "Load Balancer Monitoring MBeans might be
> lying around " +
> - "if this application is being load balanced " );
> + "if this application is being load balanced\n" +
> + ExceptionUtil.toString(ex) );
> }
> }
> @@ -303,4 +310,5 @@
> return relevantLoadBalancerConfigMap;
> }
> }
> +*/
> }
> \ No newline at end of file
> Index: admin/mbeanapi-impl/src/java/com/sun/enterprise/management/
> config/LoadBalancerConfigImpl.java
> ===================================================================
> RCS file: /cvs/glassfish/admin/mbeanapi-impl/src/java/com/sun/
> enterprise/management/config/LoadBalancerConfigImpl.java,v
> retrieving revision 1.7
> diff -w -u -r1.7 LoadBalancerConfigImpl.java
> --- admin/mbeanapi-impl/src/java/com/sun/enterprise/management/
> config/LoadBalancerConfigImpl.java 5 May 2007 05:23:19
> -0000 1.7
> +++ admin/mbeanapi-impl/src/java/com/sun/enterprise/management/
> config/LoadBalancerConfigImpl.java 30 May 2007 01:46:39 -0000
> @@ -40,7 +40,6 @@
> package com.sun.enterprise.management.config;
> -import com.sun.enterprise.management.support.LBDeregistrationUtil;
> import com.sun.enterprise.management.support.ObjectNames;
> import java.util.Map;
> @@ -54,11 +53,21 @@
> import javax.management.JMException;
> import javax.management.MBeanServer;
> import javax.management.ObjectName;
> +
> +/*
> +LOAD_BALANCER_MONITORING
> +This code never belonged here.
> +Decouple and reimplement correctly elsewhere; config
> +item should *never* depend on monitoring ones.
> +
> +import com.sun.enterprise.management.support.LBDeregistrationUtil;
> import com.sun.appserv.management.monitor.LoadBalancerMonitor;
> import com.sun.appserv.management.monitor.LoadBalancerClusterMonitor;
> import com.sun.appserv.management.monitor.LoadBalancerServerMonitor;
> import
> com.sun.appserv.management.monitor.LoadBalancerApplicationMonitor;
> import
> com.sun.appserv.management.monitor.LoadBalancerContextRootMonitor;
> +*/
> +
> import com.sun.appserv.management.config.DeployedItemRefConfig;
> import com.sun.appserv.management.config.ClusterRefConfig;
> import com.sun.appserv.management.config.ClusterConfig;
> @@ -71,19 +80,26 @@
> import com.sun.appserv.management.monitor.MonitoringRoot;
> import com.sun.appserv.management.DomainRoot;
> import com.sun.appserv.management.client.ProxyFactory;
> +import com.sun.appserv.management.util.misc.ExceptionUtil;
> /**
> Configuration for the <lb-config> element.
> */
> public final class LoadBalancerConfigImpl extends AMXConfigImplBase {
>
> - LoadBalancerDeregistrationHelper mHelper = null;
> - String lbConfigName = null;
> -
> public LoadBalancerConfigImpl(final Delegate delegate) {
> super(delegate);
> }
>
> +/*
> +LOAD_BALANCER_MONITORING
> +This code never belonged here.
> +Decouple and reimplement correctly elsewhere; config
> +item should *never* depend on monitoring ones.
> +
> + LoadBalancerDeregistrationHelper mHelper = null;
> + String lbConfigName = null;
> +
> protected void unregisterMisc() {
> try {
> LoadBalancerConfig lbc = ProxyFactory.getInstance
> (getMBeanServer())
> @@ -118,7 +134,8 @@
> mHelper = null;
> } catch (Exception ex) {
> logWarning("LoadBalancerConfig postDeregistration
> failed. " +
> - "Load Balancer Monitoring MBeans might be
> lying around");
> + "Load Balancer Monitoring MBeans might be
> lying around\n" +
> + ExceptionUtil.toString(ex) );
> }
> }
> @@ -197,4 +214,5 @@
> mbs.unregisterMBean(lbmObjName);
> }
> }
> + */
> }
> \ No newline at end of file
> Index: admin/mbeanapi-impl/src/java/com/sun/enterprise/management/
> config/ServerRefConfigImpl.java
> ===================================================================
> RCS file: /cvs/glassfish/admin/mbeanapi-impl/src/java/com/sun/
> enterprise/management/config/ServerRefConfigImpl.java,v
> retrieving revision 1.12
> diff -w -u -r1.12 ServerRefConfigImpl.java
> --- admin/mbeanapi-impl/src/java/com/sun/enterprise/management/
> config/ServerRefConfigImpl.java 5 May 2007 05:23:20 -0000 1.12
> +++ admin/mbeanapi-impl/src/java/com/sun/enterprise/management/
> config/ServerRefConfigImpl.java 30 May 2007 01:46:39 -0000
> @@ -39,7 +39,6 @@
> package com.sun.enterprise.management.config;
> -import com.sun.enterprise.management.support.LBDeregistrationUtil;
> import javax.management.ObjectName;
> import java.util.Collection;
> @@ -58,18 +57,28 @@
> import com.sun.enterprise.management.support.ObjectNames;
> import static com.sun.appserv.management.base.XTypes.LOAD_BALANCER;
> -import static
> com.sun.appserv.management.base.XTypes.LOAD_BALANCER_MONITOR;
> import static com.sun.appserv.management.base.AMX.J2EE_TYPE_KEY;
> import static com.sun.appserv.management.base.AMX.NAME_KEY;
> import static com.sun.appserv.management.base.AMX.JMX_DOMAIN;
> import com.sun.appserv.management.base.Util;
> import com.sun.appserv.management.base.AMXDebug;
> +
> +/*
> +LOAD_BALANCER_MONITORING
> +This code never belonged here.
> +Decouple and reimplement correctly elsewhere; config
> +item should *never* depend on monitoring ones.
> +
> +import static
> com.sun.appserv.management.base.XTypes.LOAD_BALANCER_MONITOR;
> +import com.sun.enterprise.management.support.LBDeregistrationUtil;
> import com.sun.appserv.management.monitor.LoadBalancerMonitor;
> import com.sun.appserv.management.monitor.LoadBalancerClusterMonitor;
> import com.sun.appserv.management.monitor.LoadBalancerServerMonitor;
> import
> com.sun.appserv.management.monitor.LoadBalancerApplicationMonitor;
> import
> com.sun.appserv.management.monitor.LoadBalancerContextRootMonitor;
> +*/
> +
> import com.sun.appserv.management.config.DeployedItemRefConfig;
> import com.sun.appserv.management.config.ClusterRefConfig;
> import com.sun.appserv.management.config.ClusterConfig;
> @@ -78,14 +87,13 @@
> import com.sun.appserv.management.config.LoadBalancerConfig;
> import com.sun.appserv.management.config.LBConfig;
> import com.sun.appserv.management.client.ProxyFactory;
> +import com.sun.appserv.management.util.misc.ExceptionUtil;
> +
> /**
> Configuration for the <server-ref> element.
> */
> public final class ServerRefConfigImpl extends AMXConfigImplBase
> - implements ConfigFactoryCallback
> -{
> - // implements ServerRefConfig
> - ServerRefDeregistrationHelper mHelper = null;
> + implements ConfigFactoryCallback{
>
> public ServerRefConfigImpl(final Delegate delegate)
> {
> @@ -118,6 +126,17 @@
> getHealthCheckerConfigFactory().remove(item);
> }
> +/*
> +LOAD_BALANCER_MONITORING
> +See duplicated code in ClusterRefConfigImpl, ServerRefConfigImpl,
> +DeployedItemRefConfigImpl.
> +This code never belonged here.
> +Decouple and reimplement correctly elsewhere; config
> +item should *never* depend on monitoring ones.
> +
> + // implements ServerRefConfig
> + ServerRefDeregistrationHelper mHelper = null;
> +
> protected void unregisterMisc() {
> try {
> mHelper = new ServerRefDeregistrationHelper(
> @@ -147,7 +166,8 @@
> mHelper = null;
> } catch (Exception ex) {
> logWarning("ServerRefConfig postDeregistration failed.
> " +
> - "Load Balancer Monitoring MBeans might be
> lying around");
> + "Load Balancer Monitoring MBeans might be
> lying around\n" +
> + ExceptionUtil.toString(ex));
> }
> }
> @@ -282,4 +302,5 @@
> }
> }
> + */
> }
>
>
> cvs diff: admin/mbeanapi-impl/src/java/com/sun/enterprise/
> management/monitor/LoadBalancerApplicationMonitorImpl.java was
> removed, no comparison available
> cvs diff: admin/mbeanapi-impl/src/java/com/sun/enterprise/
> management/monitor/LoadBalancerClusterMonitorImpl.java was removed,
> no comparison available
> cvs diff: admin/mbeanapi-impl/src/java/com/sun/enterprise/
> management/monitor/LoadBalancerContextRootMonitorImpl.java was
> removed, no comparison available
> cvs diff: admin/mbeanapi-impl/src/java/com/sun/enterprise/
> management/monitor/LoadBalancerMonitorImpl.java was removed, no
> comparison available
> cvs diff: admin/mbeanapi-impl/src/java/com/sun/enterprise/
> management/monitor/LoadBalancerServerMonitorImpl.java was removed,
> no comparison available
>
>
> cvs diff: admin/mbeanapi-impl/src/java/com/sun/enterprise/
> management/support/LBBaseMBeanRegistrationListener.java was
> removed, no comparison available
> cvs diff: admin/mbeanapi-impl/src/java/com/sun/enterprise/
> management/support/LBBootstrapUtil.java was removed, no comparison
> available
> cvs diff: admin/mbeanapi-impl/src/java/com/sun/enterprise/
> management/support/LBDeregistrationUtil.java was removed, no
> comparison available
> cvs diff: admin/mbeanapi-impl/src/java/com/sun/enterprise/
> management/support/
> LoadBalancerApplicationRefRegistrationListener.java was removed, no
> comparison available
> cvs diff: admin/mbeanapi-impl/src/java/com/sun/enterprise/
> management/support/LoadBalancerClusterRefRegistrationListener.java
> was removed, no comparison available
> cvs diff: admin/mbeanapi-impl/src/java/com/sun/enterprise/
> management/support/LoadBalancerRegistrationListener.java was
> removed, no comparison available
> cvs diff: admin/mbeanapi-impl/src/java/com/sun/enterprise/
> management/support/LoadBalancerServerRefRegistrationListener.java
> was removed, no comparison available
>
>
> 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.23
> diff -w -u -r1.23 TypeInfos.java
> --- admin/mbeanapi-impl/src/java/com/sun/enterprise/management/
> support/TypeInfos.java 5 May 2007 05:23:42 -0000 1.23
> +++ admin/mbeanapi-impl/src/java/com/sun/enterprise/management/
> support/TypeInfos.java 30 May 2007 01:46:39 -0000
> @@ -370,6 +370,9 @@
> }
> }
> + /*
> +LOAD_BALANCER_MONITORING
> +
> private static final class LoadBalancerMonitorChild extends
> TypeData
> {
> public LoadBalancerMonitorChild ( final String
> j2eeType )
> @@ -401,6 +404,7 @@
> super( j2eeType,
> XTypes.LOAD_BALANCER_APPLICATION_MONITOR );
> }
> }
> + */
>
> private static final class HTTPServiceMonitorChild extends
> TypeData
> {
> @@ -653,6 +657,8 @@
> new ServerRootMonitorChild( APPLICATION_MONITOR ),
> new ServerRootMonitorChild( LOGGING ),
> +/*
> +LOAD_BALANCER_MONITORING
> // ------------------------------------------
> // load balancer monitoring mbeans hierarchy:
> // ------------------------------------------
> @@ -666,6 +672,7 @@
> new LoadBalancerClusterMonitorChild
> ( XTypes.LOAD_BALANCER_SERVER_MONITOR ),
> new LoadBalancerServerMonitorChild
> ( XTypes.LOAD_BALANCER_APPLICATION_MONITOR ),
> new LoadBalancerApplicationMonitorChild
> ( XTypes.LOAD_BALANCER_CONTEXT_ROOT_MONITOR ),
> +*/
> //new MiscChild( WEB_MODULE_MONITOR, APPLICATION_MONITOR ),
> new MiscChild( WEB_MODULE_VIRTUAL_SERVER_MONITOR,
> APPLICATION_MONITOR ),
> cvs diff: Diffing admin/mbeanapi-impl/src/java/com/sun/enterprise/
> management/support/oldconfig
>
>
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: admin-unsubscribe_at_glassfish.dev.java.net
> For additional commands, e-mail: admin-help_at_glassfish.dev.java.net
>