TIMEOUT: 12:00PM PST, Monday June 3, 2007
https://glassfish.dev.java.net/issues/show_bug.cgi?id=3072
In response to DTD changes, @deprecate:
getForcedResponseType()
setForcedResponseType(...)
getDefaultResponseType()
setDefaultResponseType(...)
Add new, correctly named methods:
getResponseType()
setResponseType(...)
getDefaultRType()
setDefaultType(...)
Invoking the old methods passes through to the new eg
getForcedResponseType() calls getResponseType(), etc. This maintains
full backward compatibility.
cvs diff: Diffing appserv-api/src/java/com/sun/appserv/management/config
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 1 Jun 2007 22:55:19 -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 1 Jun 2007 22:55:19 -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";
cvs diff: Diffing appserv-api/src/java/com/sun/appserv/management/deploy
---------------------------------------------------
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 -r1.7 LoadBalancerConfigImpl.java
43d42
< import com.sun.enterprise.management.support.LBDeregistrationUtil;
56a56,63
>
> /*
> 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;
61a69,70
> */
>
73a83
> import com.sun.appserv.management.util.misc.ExceptionUtil;
79,82c89
<
< LoadBalancerDeregistrationHelper mHelper = null;
< String lbConfigName = null;
<
---
>
86a94,102
> /*
> 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;
>
121c137,138
< "Load Balancer Monitoring MBeans might be lying
around");
---
> "Load Balancer Monitoring MBeans might be
lying around\n" +
> ExceptionUtil.toString(ex) );
199a217
> */