Author: markt
Date: Sat Oct 22 19:28:31 2011
New Revision: 1187757
URL: http://svn.apache.org/viewvc?rev=1187757&view=rev
Log:
Removing info part 2
Modified:
tomcat/trunk/java/org/apache/catalina/Cluster.java
tomcat/trunk/java/org/apache/catalina/Realm.java
tomcat/trunk/java/org/apache/catalina/Session.java
tomcat/trunk/java/org/apache/catalina/Store.java
tomcat/trunk/java/org/apache/catalina/connector/Connector.java
tomcat/trunk/java/org/apache/catalina/connector/Request.java
tomcat/trunk/java/org/apache/catalina/connector/Response.java
tomcat/trunk/java/org/apache/catalina/core/ApplicationHttpRequest.java
tomcat/trunk/java/org/apache/catalina/core/ApplicationHttpResponse.java
tomcat/trunk/java/org/apache/catalina/core/StandardPipeline.java
tomcat/trunk/java/org/apache/catalina/core/StandardWrapper.java
tomcat/trunk/java/org/apache/catalina/ha/CatalinaCluster.java
tomcat/trunk/java/org/apache/catalina/ha/authenticator/ClusterSingleSignOnListener.java
tomcat/trunk/java/org/apache/catalina/ha/session/ClusterSessionListener.java
tomcat/trunk/java/org/apache/catalina/ha/session/JvmRouteSessionIDBinderListener.java
tomcat/trunk/java/org/apache/catalina/ha/tcp/SimpleTcpCluster.java
tomcat/trunk/java/org/apache/catalina/manager/DummyProxySession.java
tomcat/trunk/java/org/apache/catalina/realm/CombinedRealm.java
tomcat/trunk/java/org/apache/catalina/realm/DataSourceRealm.java
tomcat/trunk/java/org/apache/catalina/realm/JAASRealm.java
tomcat/trunk/java/org/apache/catalina/realm/JDBCRealm.java
tomcat/trunk/java/org/apache/catalina/realm/JNDIRealm.java
tomcat/trunk/java/org/apache/catalina/realm/MemoryRealm.java
tomcat/trunk/java/org/apache/catalina/realm/RealmBase.java
tomcat/trunk/java/org/apache/catalina/realm/UserDatabaseRealm.java
tomcat/trunk/java/org/apache/catalina/session/FileStore.java
tomcat/trunk/java/org/apache/catalina/session/JDBCStore.java
tomcat/trunk/java/org/apache/catalina/session/StandardManager.java
tomcat/trunk/java/org/apache/catalina/session/StandardSession.java
tomcat/trunk/java/org/apache/catalina/session/StoreBase.java
tomcat/trunk/java/org/apache/catalina/startup/Embedded.java
tomcat/trunk/java/org/apache/catalina/valves/JDBCAccessLogValve.java
tomcat/trunk/webapps/examples/WEB-INF/classes/compressionFilters/CompressionServletResponseWrapper.java
Modified: tomcat/trunk/java/org/apache/catalina/Cluster.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/Cluster.java?rev=1187757&r1=1187756&r2=1187757&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/Cluster.java (original)
+++ tomcat/trunk/java/org/apache/catalina/Cluster.java Sat Oct 22 19:28:31 2011
@@ -37,13 +37,6 @@ public interface Cluster {
// ------------------------------------------------------------- Properties
/**
- * Return descriptive information about this Cluster implementation and
- * the corresponding version number, in the format
- * <code><description>/<version></code>.
- */
- public String getInfo();
-
- /**
* Return the name of the cluster that this Server is currently
* configured to operate within.
*
Modified: tomcat/trunk/java/org/apache/catalina/Realm.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/Realm.java?rev=1187757&r1=1187756&r2=1187757&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/Realm.java (original)
+++ tomcat/trunk/java/org/apache/catalina/Realm.java Sat Oct 22 19:28:31 2011
@@ -58,16 +58,7 @@ public interface Realm {
public void setContainer(Container container);
- /**
- * Return descriptive information about this Realm implementation and
- * the corresponding version number, in the format
- * <code><description>/<version></code>.
- */
- public String getInfo();
-
-
// --------------------------------------------------------- Public Methods
-
/**
* Add a property change listener to this component.
Modified: tomcat/trunk/java/org/apache/catalina/Session.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/Session.java?rev=1187757&r1=1187756&r2=1187757&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/Session.java (original)
+++ tomcat/trunk/java/org/apache/catalina/Session.java Sat Oct 22 19:28:31 2011
@@ -138,14 +138,6 @@ public interface Session {
/**
- * Return descriptive information about this Session implementation and
- * the corresponding version number, in the format
- * <code><description>/<version></code>.
- */
- public String getInfo();
-
-
- /**
* Return the last time the client sent a request associated with this
* session, as the number of milliseconds since midnight, January 1, 1970
* GMT. Actions that your application takes, such as getting or setting
Modified: tomcat/trunk/java/org/apache/catalina/Store.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/Store.java?rev=1187757&r1=1187756&r2=1187757&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/Store.java (original)
+++ tomcat/trunk/java/org/apache/catalina/Store.java Sat Oct 22 19:28:31 2011
@@ -36,18 +36,8 @@ import java.io.IOException;
public interface Store {
-
// ------------------------------------------------------------- Properties
-
- /**
- * Return descriptive information about this Store implementation and
- * the corresponding version number, in the format
- * <code><description>/<version></code>.
- */
- public String getInfo();
-
-
/**
* Return the Manager instance associated with this Store.
*/
Modified: tomcat/trunk/java/org/apache/catalina/connector/Connector.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/connector/Connector.java?rev=1187757&r1=1187756&r2=1187757&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/connector/Connector.java (original)
+++ tomcat/trunk/java/org/apache/catalina/connector/Connector.java Sat Oct 22
19:28:31 2011
@@ -112,13 +112,6 @@ public class Connector extends Lifecycle
/**
- * Descriptive information about this Connector implementation.
- */
- protected static final String info =
- "org.apache.catalina.connector.Connector/2.1";
-
-
- /**
* The port number on which we listen for requests.
*/
protected int port = 0;
@@ -388,16 +381,6 @@ public class Connector extends Lifecycle
}
- /**
- * Return descriptive information about this Connector implementation.
- */
- public String getInfo() {
-
- return (info);
-
- }
-
-
/**
* Return the mapper.
*/
Modified: tomcat/trunk/java/org/apache/catalina/connector/Request.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/connector/Request.java?rev=1187757&r1=1187756&r2=1187757&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/connector/Request.java (original)
+++ tomcat/trunk/java/org/apache/catalina/connector/Request.java Sat Oct 22
19:28:31 2011
@@ -645,22 +645,6 @@ public class Request
/**
- * Descriptive information about this Request implementation.
- */
- protected static final String info =
- "org.apache.coyote.catalina.CoyoteRequest/1.0";
-
- /**
- * Return descriptive information about this Request implementation and
- * the corresponding version number, in the format
- * <code><description>/<version></code>.
- */
- public String getInfo() {
- return info;
- }
-
-
- /**
* Mapping data.
*/
protected MappingData mappingData = new MappingData();
Modified: tomcat/trunk/java/org/apache/catalina/connector/Response.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/connector/Response.java?rev=1187757&r1=1187756&r2=1187757&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/connector/Response.java (original)
+++ tomcat/trunk/java/org/apache/catalina/connector/Response.java Sat Oct 22
19:28:31 2011
@@ -94,14 +94,6 @@ public class Response
// ----------------------------------------------------- Class Variables
-
- /**
- * Descriptive information about this Response implementation.
- */
- protected static final String info =
- "org.apache.coyote.catalina.CoyoteResponse/1.0";
-
-
/**
* The string manager for this package.
*/
@@ -371,16 +363,6 @@ public class Response
/**
- * Return descriptive information about this Response implementation and
- * the corresponding version number, in the format
- * <code><description>/<version></code>.
- */
- public String getInfo() {
- return (info);
- }
-
-
- /**
* The request with which this response is associated.
*/
protected Request request = null;
Modified: tomcat/trunk/java/org/apache/catalina/core/ApplicationHttpRequest.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/ApplicationHttpRequest.java?rev=1187757&r1=1187756&r2=1187757&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/core/ApplicationHttpRequest.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/core/ApplicationHttpRequest.java Sat
Oct 22 19:28:31 2011
@@ -128,13 +128,6 @@ class ApplicationHttpRequest extends Htt
/**
- * Descriptive information about this implementation.
- */
- protected static final String info =
- "org.apache.catalina.core.ApplicationHttpRequest/1.0";
-
-
- /**
* The request parameters for this request. This is initialized from the
* wrapped request, but updates are allowed.
*/
@@ -627,16 +620,6 @@ class ApplicationHttpRequest extends Htt
/**
- * Return descriptive information about this implementation.
- */
- public String getInfo() {
-
- return (info);
-
- }
-
-
- /**
* Perform a shallow copy of the specified Map, and return the result.
*
* @param orig Origin Map to be copied
Modified:
tomcat/trunk/java/org/apache/catalina/core/ApplicationHttpResponse.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/ApplicationHttpResponse.java?rev=1187757&r1=1187756&r2=1187757&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/core/ApplicationHttpResponse.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/core/ApplicationHttpResponse.java Sat
Oct 22 19:28:31 2011
@@ -84,16 +84,8 @@ class ApplicationHttpResponse extends Ht
protected boolean included = false;
- /**
- * Descriptive information about this implementation.
- */
- protected static final String info =
- "org.apache.catalina.core.ApplicationHttpResponse/1.0";
-
-
// ------------------------------------------------ ServletResponse Methods
-
/**
* Disallow <code>reset()</code> calls on a included response.
*
@@ -356,17 +348,6 @@ class ApplicationHttpResponse extends Ht
// -------------------------------------------------------- Package Methods
-
- /**
- * Return descriptive information about this implementation.
- */
- public String getInfo() {
-
- return (info);
-
- }
-
-
/**
* Return the included flag for this response.
*/
Modified: tomcat/trunk/java/org/apache/catalina/core/StandardPipeline.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/StandardPipeline.java?rev=1187757&r1=1187756&r2=1187757&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/core/StandardPipeline.java (original)
+++ tomcat/trunk/java/org/apache/catalina/core/StandardPipeline.java Sat Oct 22
19:28:31 2011
@@ -98,27 +98,12 @@ public class StandardPipeline extends Li
/**
- * Descriptive information about this implementation.
- */
- protected static final String info =
"org.apache.catalina.core.StandardPipeline/1.0";
-
-
- /**
* The first valve associated with this Pipeline.
*/
protected Valve first = null;
+
// --------------------------------------------------------- Public Methods
-
-
- /**
- * Return descriptive information about this implementation class.
- */
- public String getInfo() {
-
- return info;
-
- }
@Override
public boolean isAsyncSupported() {
Modified: tomcat/trunk/java/org/apache/catalina/core/StandardWrapper.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/StandardWrapper.java?rev=1187757&r1=1187756&r2=1187757&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/core/StandardWrapper.java (original)
+++ tomcat/trunk/java/org/apache/catalina/core/StandardWrapper.java Sat Oct 22
19:28:31 2011
@@ -134,13 +134,6 @@ public class StandardWrapper extends Con
/**
- * The descriptive information string for this implementation.
- */
- protected static final String info =
- "org.apache.catalina.core.StandardWrapper/1.0";
-
-
- /**
* The (single) possibly uninitialized instance of this servlet.
*/
protected volatile Servlet instance = null;
@@ -358,19 +351,6 @@ public class StandardWrapper extends Con
/**
- * Return descriptive information about this Container implementation and
- * the corresponding version number, in the format
- * <code><description>/<version></code>.
- */
- @Override
- public String getInfo() {
-
- return (info);
-
- }
-
-
- /**
* Return the InstanceSupport object for this Wrapper instance.
*/
public InstanceSupport getInstanceSupport() {
Modified: tomcat/trunk/java/org/apache/catalina/ha/CatalinaCluster.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/ha/CatalinaCluster.java?rev=1187757&r1=1187756&r2=1187757&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/ha/CatalinaCluster.java (original)
+++ tomcat/trunk/java/org/apache/catalina/ha/CatalinaCluster.java Sat Oct 22
19:28:31 2011
@@ -41,11 +41,6 @@ public interface CatalinaCluster extends
// ----------------------------------------------------- Instance Variables
/**
- * Descriptive information about this component implementation.
- */
- public String info = "CatalinaCluster/2.0";
-
- /**
* Start the cluster, the owning container will invoke this
* @throws Exception - if failure to start cluster
*/
Modified:
tomcat/trunk/java/org/apache/catalina/ha/authenticator/ClusterSingleSignOnListener.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/ha/authenticator/ClusterSingleSignOnListener.java?rev=1187757&r1=1187756&r2=1187757&view=diff
==============================================================================
---
tomcat/trunk/java/org/apache/catalina/ha/authenticator/ClusterSingleSignOnListener.java
(original)
+++
tomcat/trunk/java/org/apache/catalina/ha/authenticator/ClusterSingleSignOnListener.java
Sat Oct 22 19:28:31 2011
@@ -37,11 +37,6 @@ public class ClusterSingleSignOnListener
private static final Log log =
LogFactory.getLog(ClusterSingleSignOnListener.class);
- /**
- * The descriptive information about this implementation.
- */
- protected static final String info =
"org.apache.catalina.ha.authenticator.ClusterSingleSignOnListener/1.0";
-
// ------------------------------------------------------------- Properties
private ClusterSingleSignOn clusterSSO = null;
@@ -55,15 +50,6 @@ public class ClusterSingleSignOnListener
//--Logic---------------------------------------------------
- /**
- * Return descriptive information about this implementation.
- */
- public String getInfo() {
-
- return (info);
-
- }
-
public ClusterSingleSignOn getClusterSSO() {
return clusterSSO;
Modified:
tomcat/trunk/java/org/apache/catalina/ha/session/ClusterSessionListener.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/ha/session/ClusterSessionListener.java?rev=1187757&r1=1187756&r2=1187757&view=diff
==============================================================================
---
tomcat/trunk/java/org/apache/catalina/ha/session/ClusterSessionListener.java
(original)
+++
tomcat/trunk/java/org/apache/catalina/ha/session/ClusterSessionListener.java
Sat Oct 22 19:28:31 2011
@@ -36,11 +36,6 @@ public class ClusterSessionListener exte
private static final Log log =
LogFactory.getLog(ClusterSessionListener.class);
- /**
- * The descriptive information about this implementation.
- */
- protected static final String info =
"org.apache.catalina.ha.session.ClusterSessionListener/1.1";
-
//--Constructor---------------------------------------------
public ClusterSessionListener() {
@@ -50,15 +45,6 @@ public class ClusterSessionListener exte
//--Logic---------------------------------------------------
/**
- * Return descriptive information about this implementation.
- */
- public String getInfo() {
-
- return (info);
-
- }
-
- /**
* Callback from the cluster, when a message is received, The cluster will
* broadcast it invoking the messageReceived on the receiver.
*
Modified:
tomcat/trunk/java/org/apache/catalina/ha/session/JvmRouteSessionIDBinderListener.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/ha/session/JvmRouteSessionIDBinderListener.java?rev=1187757&r1=1187756&r2=1187757&view=diff
==============================================================================
---
tomcat/trunk/java/org/apache/catalina/ha/session/JvmRouteSessionIDBinderListener.java
(original)
+++
tomcat/trunk/java/org/apache/catalina/ha/session/JvmRouteSessionIDBinderListener.java
Sat Oct 22 19:28:31 2011
@@ -46,12 +46,6 @@ public class JvmRouteSessionIDBinderList
private static final StringManager sm =
StringManager.getManager(Constants.Package);
- /**
- * The descriptive information about this implementation.
- */
- protected static final String info =
- "org.apache.catalina.ha.session.JvmRouteSessionIDBinderListener/1.1";
-
//--Instance Variables--------------------------------------
@@ -71,15 +65,6 @@ public class JvmRouteSessionIDBinderList
//--Logic---------------------------------------------------
/**
- * Return descriptive information about this implementation.
- */
- public String getInfo() {
-
- return (info);
-
- }
-
- /**
* @return Returns the numberOfSessions.
*/
public long getNumberOfSessions() {
Modified: tomcat/trunk/java/org/apache/catalina/ha/tcp/SimpleTcpCluster.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/ha/tcp/SimpleTcpCluster.java?rev=1187757&r1=1187756&r2=1187757&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/ha/tcp/SimpleTcpCluster.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/ha/tcp/SimpleTcpCluster.java Sat Oct
22 19:28:31 2011
@@ -80,11 +80,6 @@ public class SimpleTcpCluster extends Li
// ----------------------------------------------------- Instance Variables
- /**
- * Descriptive information about this component implementation.
- */
- protected static final String info = "SimpleTcpCluster/2.2";
-
public static final String BEFORE_MEMBERREGISTER_EVENT =
"before_member_register";
public static final String AFTER_MEMBERREGISTER_EVENT =
"after_member_register";
@@ -180,16 +175,6 @@ public class SimpleTcpCluster extends Li
}
/**
- * Return descriptive information about this Cluster implementation and the
- * corresponding version number, in the format
- * <code><description>/<version></code>.
- */
- @Override
- public String getInfo() {
- return (info);
- }
-
- /**
* Return heartbeat enable flag (default false)
* @return the heartbeatBackgroundEnabled
*/
Modified: tomcat/trunk/java/org/apache/catalina/manager/DummyProxySession.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/manager/DummyProxySession.java?rev=1187757&r1=1187756&r2=1187757&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/manager/DummyProxySession.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/manager/DummyProxySession.java Sat
Oct 22 19:28:31 2011
@@ -79,11 +79,6 @@ public class DummyProxySession implement
}
@Override
- public String getInfo() {
- return null;
- }
-
- @Override
public long getLastAccessedTime() {
return 0;
}
Modified: tomcat/trunk/java/org/apache/catalina/realm/CombinedRealm.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/realm/CombinedRealm.java?rev=1187757&r1=1187756&r2=1187757&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/realm/CombinedRealm.java (original)
+++ tomcat/trunk/java/org/apache/catalina/realm/CombinedRealm.java Sat Oct 22
19:28:31 2011
@@ -63,7 +63,8 @@ public class CombinedRealm extends Realm
realms.add(theRealm);
if (log.isDebugEnabled()) {
- sm.getString("combinedRealm.addRealm", theRealm.getInfo(),
+ sm.getString("combinedRealm.addRealm",
+ theRealm.getClass().getName(),
Integer.toString(realms.size()));
}
}
@@ -105,7 +106,8 @@ public class CombinedRealm extends Realm
for (Realm realm : realms) {
if (log.isDebugEnabled()) {
- log.debug(sm.getString("combinedRealm.authStart", username,
realm.getInfo()));
+ log.debug(sm.getString("combinedRealm.authStart", username,
+ realm.getClass().getName()));
}
authenticatedUser = realm.authenticate(username, clientDigest,
nonce,
@@ -113,11 +115,13 @@ public class CombinedRealm extends Realm
if (authenticatedUser == null) {
if (log.isDebugEnabled()) {
- log.debug(sm.getString("combinedRealm.authFail", username,
realm.getInfo()));
+ log.debug(sm.getString("combinedRealm.authFail", username,
+ realm.getClass().getName()));
}
} else {
if (log.isDebugEnabled()) {
- log.debug(sm.getString("combinedRealm.authSuccess",
username, realm.getInfo()));
+ log.debug(sm.getString("combinedRealm.authSuccess",
+ username, realm.getClass().getName()));
}
break;
}
@@ -140,18 +144,21 @@ public class CombinedRealm extends Realm
for (Realm realm : realms) {
if (log.isDebugEnabled()) {
- log.debug(sm.getString("combinedRealm.authStart", username,
realm.getInfo()));
+ log.debug(sm.getString("combinedRealm.authStart", username,
+ realm.getClass().getName()));
}
authenticatedUser = realm.authenticate(username, credentials);
if (authenticatedUser == null) {
if (log.isDebugEnabled()) {
- log.debug(sm.getString("combinedRealm.authFail", username,
realm.getInfo()));
+ log.debug(sm.getString("combinedRealm.authFail", username,
+ realm.getClass().getName()));
}
} else {
if (log.isDebugEnabled()) {
- log.debug(sm.getString("combinedRealm.authSuccess",
username, realm.getInfo()));
+ log.debug(sm.getString("combinedRealm.authSuccess",
+ username, realm.getClass().getName()));
}
break;
}
@@ -203,7 +210,7 @@ public class CombinedRealm extends Realm
// If realm doesn't start can't authenticate against it
iter.remove();
log.error(sm.getString("combinedRealm.realmStartFail",
- realm.getInfo()), e);
+ realm.getClass().getName()), e);
}
}
}
@@ -248,18 +255,21 @@ public class CombinedRealm extends Realm
for (Realm realm : realms) {
if (log.isDebugEnabled()) {
- log.debug(sm.getString("combinedRealm.authStart", username,
realm.getInfo()));
+ log.debug(sm.getString("combinedRealm.authStart", username,
+ realm.getClass().getName()));
}
authenticatedUser = realm.authenticate(certs);
if (authenticatedUser == null) {
if (log.isDebugEnabled()) {
- log.debug(sm.getString("combinedRealm.authFail", username,
realm.getInfo()));
+ log.debug(sm.getString("combinedRealm.authFail", username,
+ realm.getClass().getName()));
}
} else {
if (log.isDebugEnabled()) {
- log.debug(sm.getString("combinedRealm.authSuccess",
username, realm.getInfo()));
+ log.debug(sm.getString("combinedRealm.authSuccess",
+ username, realm.getClass().getName()));
}
break;
}
@@ -289,7 +299,7 @@ public class CombinedRealm extends Realm
for (Realm realm : realms) {
if (log.isDebugEnabled()) {
log.debug(sm.getString("combinedRealm.authStart",
- username, realm.getInfo()));
+ username, realm.getClass().getName()));
}
authenticatedUser = realm.authenticate(gssContext, storeCreds);
@@ -297,12 +307,12 @@ public class CombinedRealm extends Realm
if (authenticatedUser == null) {
if (log.isDebugEnabled()) {
log.debug(sm.getString("combinedRealm.authFail",
- username, realm.getInfo()));
+ username, realm.getClass().getName()));
}
} else {
if (log.isDebugEnabled()) {
log.debug(sm.getString("combinedRealm.authSuccess",
- username, realm.getInfo()));
+ username, realm.getClass().getName()));
}
break;
}
Modified: tomcat/trunk/java/org/apache/catalina/realm/DataSourceRealm.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/realm/DataSourceRealm.java?rev=1187757&r1=1187756&r2=1187757&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/realm/DataSourceRealm.java (original)
+++ tomcat/trunk/java/org/apache/catalina/realm/DataSourceRealm.java Sat Oct 22
19:28:31 2011
@@ -14,8 +14,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
-
package org.apache.catalina.realm;
@@ -44,9 +42,7 @@ import org.apache.naming.ContextBindings
* @author Ignacio Ortega
* @version $Revision$
*/
-
-public class DataSourceRealm
- extends RealmBase {
+public class DataSourceRealm extends RealmBase {
// ----------------------------------------------------- Instance Variables
@@ -71,13 +67,6 @@ public class DataSourceRealm
/**
- * Descriptive information about this Realm implementation.
- */
- protected static final String info =
- "org.apache.catalina.realm.DataSourceRealm/1.0";
-
-
- /**
* Context local datasource.
*/
protected boolean localDataSource = false;
@@ -241,22 +230,9 @@ public class DataSourceRealm
this.userTable = userTable;
}
- /**
- * Return descriptive information about this Realm implementation and
- * the corresponding version number, in the format
- * <code><description>/<version></code>.
- */
- @Override
- public String getInfo() {
-
- return info;
-
- }
-
// --------------------------------------------------------- Public Methods
-
/**
* Return the Principal associated with the specified username and
* credentials, if there is one; otherwise return <code>null</code>.
Modified: tomcat/trunk/java/org/apache/catalina/realm/JAASRealm.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/realm/JAASRealm.java?rev=1187757&r1=1187756&r2=1187757&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/realm/JAASRealm.java (original)
+++ tomcat/trunk/java/org/apache/catalina/realm/JAASRealm.java Sat Oct 22
19:28:31 2011
@@ -143,13 +143,6 @@ public class JAASRealm
/**
* Descriptive information about this <code>Realm</code> implementation.
*/
- protected static final String info =
- "org.apache.catalina.realm.JAASRealm/1.0";
-
-
- /**
- * Descriptive information about this <code>Realm</code> implementation.
- */
protected static final String name = "JAASRealm";
@@ -305,22 +298,9 @@ public class JAASRealm
this.userClassNames = userClassNames;
}
- /**
- * Return descriptive information about this Realm implementation and
- * the corresponding version number, in the format
- * <code><description>/<version></code>.
- */
- @Override
- public String getInfo() {
-
- return info;
-
- }
-
// --------------------------------------------------------- Public Methods
-
/**
* Return the <code>Principal</code> associated with the specified username
* and credentials, if there is one; otherwise return <code>null</code>.
Modified: tomcat/trunk/java/org/apache/catalina/realm/JDBCRealm.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/realm/JDBCRealm.java?rev=1187757&r1=1187756&r2=1187757&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/realm/JDBCRealm.java (original)
+++ tomcat/trunk/java/org/apache/catalina/realm/JDBCRealm.java Sat Oct 22
19:28:31 2011
@@ -96,13 +96,6 @@ public class JDBCRealm
/**
* Descriptive information about this Realm implementation.
*/
- protected static final String info =
- "org.apache.catalina.realm.JDBCRealm/1.0";
-
-
- /**
- * Descriptive information about this Realm implementation.
- */
protected static final String name = "JDBCRealm";
@@ -304,21 +297,9 @@ public class JDBCRealm
this.userTable = userTable;
}
- /**
- * Return descriptive information about this Realm implementation and
- * the corresponding version number, in the format
- * <code><description>/<version></code>.
- */
- @Override
- public String getInfo() {
-
- return info;
-
- }
// --------------------------------------------------------- Public Methods
-
/**
* Return the Principal associated with the specified username and
* credentials, if there is one; otherwise return <code>null</code>.
Modified: tomcat/trunk/java/org/apache/catalina/realm/JNDIRealm.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/realm/JNDIRealm.java?rev=1187757&r1=1187756&r2=1187757&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/realm/JNDIRealm.java (original)
+++ tomcat/trunk/java/org/apache/catalina/realm/JNDIRealm.java Sat Oct 22
19:28:31 2011
@@ -228,12 +228,6 @@ public class JNDIRealm extends RealmBase
*/
public static final String DEREF_ALIASES = "java.naming.ldap.derefAliases";
- /**
- * Descriptive information about this Realm implementation.
- */
- protected static final String info =
- "org.apache.catalina.realm.JNDIRealm/1.0";
-
/**
* Descriptive information about this Realm implementation.
@@ -969,22 +963,9 @@ public class JNDIRealm extends RealmBase
this.useDelegatedCredential = useDelegatedCredential;
}
- /**
- * Return descriptive information about this Realm implementation and
- * the corresponding version number, in the format
- * <code><description>/<version></code>.
- */
- @Override
- public String getInfo() {
-
- return info;
-
- }
-
// ---------------------------------------------------------- Realm Methods
-
/**
* Return the Principal associated with the specified username and
* credentials, if there is one; otherwise return <code>null</code>.
Modified: tomcat/trunk/java/org/apache/catalina/realm/MemoryRealm.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/realm/MemoryRealm.java?rev=1187757&r1=1187756&r2=1187757&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/realm/MemoryRealm.java (original)
+++ tomcat/trunk/java/org/apache/catalina/realm/MemoryRealm.java Sat Oct 22
19:28:31 2011
@@ -62,14 +62,6 @@ public class MemoryRealm extends RealmB
/**
* Descriptive information about this Realm implementation.
*/
- protected static final String info =
- "org.apache.catalina.realm.MemoryRealm/1.0";
-
-
- /**
- * Descriptive information about this Realm implementation.
- */
-
protected static final String name = "MemoryRealm";
@@ -89,20 +81,6 @@ public class MemoryRealm extends RealmB
// ------------------------------------------------------------- Properties
-
- /**
- * Return descriptive information about this Realm implementation and
- * the corresponding version number, in the format
- * <code><description>/<version></code>.
- */
- @Override
- public String getInfo() {
-
- return info;
-
- }
-
-
/**
* Return the pathname of our XML file containing user definitions.
*/
Modified: tomcat/trunk/java/org/apache/catalina/realm/RealmBase.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/realm/RealmBase.java?rev=1187757&r1=1187756&r2=1187757&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/realm/RealmBase.java (original)
+++ tomcat/trunk/java/org/apache/catalina/realm/RealmBase.java Sat Oct 22
19:28:31 2011
@@ -104,13 +104,6 @@ public abstract class RealmBase extends
/**
- * Descriptive information about this Realm implementation.
- */
- protected static final String info =
- "org.apache.catalina.realm.RealmBase/1.0";
-
-
- /**
* The MessageDigest object for digesting user credentials (passwords).
*/
protected volatile MessageDigest md = null;
@@ -254,18 +247,6 @@ public abstract class RealmBase extends
}
}
- /**
- * Return descriptive information about this Realm implementation and
- * the corresponding version number, in the format
- * <code><description>/<version></code>.
- */
- @Override
- public String getInfo() {
-
- return info;
-
- }
-
/**
* Return the "validate certificate chains" flag.
Modified: tomcat/trunk/java/org/apache/catalina/realm/UserDatabaseRealm.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/realm/UserDatabaseRealm.java?rev=1187757&r1=1187756&r2=1187757&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/realm/UserDatabaseRealm.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/realm/UserDatabaseRealm.java Sat Oct
22 19:28:31 2011
@@ -64,13 +64,6 @@ public class UserDatabaseRealm
/**
* Descriptive information about this Realm implementation.
*/
- protected static final String info =
- "org.apache.catalina.realm.UserDatabaseRealm/1.0";
-
-
- /**
- * Descriptive information about this Realm implementation.
- */
protected static final String name = "UserDatabaseRealm";
@@ -83,20 +76,6 @@ public class UserDatabaseRealm
// ------------------------------------------------------------- Properties
-
- /**
- * Return descriptive information about this Realm implementation and
- * the corresponding version number, in the format
- * <code><description>/<version></code>.
- */
- @Override
- public String getInfo() {
-
- return info;
-
- }
-
-
/**
* Return the global JNDI name of the <code>UserDatabase</code> resource
* we will be using.
Modified: tomcat/trunk/java/org/apache/catalina/session/FileStore.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/session/FileStore.java?rev=1187757&r1=1187756&r2=1187757&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/session/FileStore.java (original)
+++ tomcat/trunk/java/org/apache/catalina/session/FileStore.java Sat Oct 22
19:28:31 2011
@@ -78,15 +78,11 @@ public final class FileStore extends Sto
/**
- * The descriptive information about this implementation.
- */
- private static final String info = "FileStore/1.0";
-
- /**
* Name to register for this Store, used for logging.
*/
private static final String storeName = "fileStore";
+
/**
* Name to register for the background thread.
*/
@@ -123,24 +119,13 @@ public final class FileStore extends Sto
/**
- * Return descriptive information about this Store implementation and
- * the corresponding version number, in the format
- * <code><description>/<version></code>.
- */
- @Override
- public String getInfo() {
-
- return (info);
-
- }
-
- /**
* Return the thread name for this Store.
*/
public String getThreadName() {
return(threadName);
}
+
/**
* Return the name for this Store, used for logging.
*/
Modified: tomcat/trunk/java/org/apache/catalina/session/JDBCStore.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/session/JDBCStore.java?rev=1187757&r1=1187756&r2=1187757&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/session/JDBCStore.java (original)
+++ tomcat/trunk/java/org/apache/catalina/session/JDBCStore.java Sat Oct 22
19:28:31 2011
@@ -57,11 +57,6 @@ import org.apache.tomcat.util.ExceptionU
public class JDBCStore extends StoreBase {
/**
- * The descriptive information about this implementation.
- */
- protected static final String info = "JDBCStore/1.0";
-
- /**
* Context name associated with this Store
*/
private String name = null;
@@ -189,14 +184,6 @@ public class JDBCStore extends StoreBase
// ------------------------------------------------------------- Properties
/**
- * Return the info for this Store.
- */
- @Override
- public String getInfo() {
- return (info);
- }
-
- /**
* Return the name for this instance (built from container name)
*/
public String getName() {
Modified: tomcat/trunk/java/org/apache/catalina/session/StandardManager.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/session/StandardManager.java?rev=1187757&r1=1187756&r2=1187757&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/session/StandardManager.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/session/StandardManager.java Sat Oct
22 19:28:31 2011
@@ -97,13 +97,6 @@ public class StandardManager extends Man
// ----------------------------------------------------- Instance Variables
-
- /**
- * The descriptive information about this implementation.
- */
- protected static final String info = "StandardManager/1.0";
-
-
/**
* The descriptive name of this Manager implementation (for logging).
*/
@@ -123,20 +116,6 @@ public class StandardManager extends Man
// ------------------------------------------------------------- Properties
-
- /**
- * Return descriptive information about this Manager implementation and
- * the corresponding version number, in the format
- * <code><description>/<version></code>.
- */
- @Override
- public String getInfo() {
-
- return (info);
-
- }
-
-
/**
* Return the descriptive short name of this Manager implementation.
*/
Modified: tomcat/trunk/java/org/apache/catalina/session/StandardSession.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/session/StandardSession.java?rev=1187757&r1=1187756&r2=1187757&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/session/StandardSession.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/session/StandardSession.java Sat Oct
22 19:28:31 2011
@@ -203,12 +203,6 @@ public class StandardSession implements
/**
- * Descriptive information describing this Session implementation.
- */
- protected static final String info = "StandardSession/1.0";
-
-
- /**
* The last accessed time for this Session.
*/
protected volatile long lastAccessedTime = creationTime;
@@ -445,19 +439,6 @@ public class StandardSession implements
/**
- * Return descriptive information about this Session implementation and
- * the corresponding version number, in the format
- * <code><description>/<version></code>.
- */
- @Override
- public String getInfo() {
-
- return (info);
-
- }
-
-
- /**
* Return the last time the client sent a request associated with this
* session, as the number of milliseconds since midnight, January 1, 1970
* GMT. Actions that your application takes, such as getting or setting
Modified: tomcat/trunk/java/org/apache/catalina/session/StoreBase.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/session/StoreBase.java?rev=1187757&r1=1187756&r2=1187757&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/session/StoreBase.java (original)
+++ tomcat/trunk/java/org/apache/catalina/session/StoreBase.java Sat Oct 22
19:28:31 2011
@@ -41,11 +41,6 @@ public abstract class StoreBase extends
// ----------------------------------------------------- Instance Variables
/**
- * The descriptive information about this implementation.
- */
- protected static final String info = "StoreBase/1.0";
-
- /**
* Name to register for this Store, used for logging.
*/
protected static String storeName = "StoreBase";
@@ -65,18 +60,10 @@ public abstract class StoreBase extends
*/
protected Manager manager;
+
// ------------------------------------------------------------- Properties
/**
- * Return the info for this Store.
- */
- @Override
- public String getInfo() {
- return(info);
- }
-
-
- /**
* Return the name for this Store, used for logging.
*/
public String getStoreName() {
Modified: tomcat/trunk/java/org/apache/catalina/startup/Embedded.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/startup/Embedded.java?rev=1187757&r1=1187756&r2=1187757&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/startup/Embedded.java (original)
+++ tomcat/trunk/java/org/apache/catalina/startup/Embedded.java Sat Oct 22
19:28:31 2011
@@ -306,7 +306,8 @@ public class Embedded extends StandardS
public synchronized void addConnector(Connector connector) {
if( log.isDebugEnabled() ) {
- log.debug("Adding connector (" + connector.getInfo() + ")");
+ log.debug("Adding connector (" + connector.getClass().getName() +
+ ")");
}
// Make sure we have a Container to send requests to
Modified: tomcat/trunk/java/org/apache/catalina/valves/JDBCAccessLogValve.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/valves/JDBCAccessLogValve.java?rev=1187757&r1=1187756&r2=1187757&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/valves/JDBCAccessLogValve.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/valves/JDBCAccessLogValve.java Sat
Oct 22 19:28:31 2011
@@ -213,12 +213,6 @@ public final class JDBCAccessLogValve ex
*/
protected boolean requestAttributesEnabled = true;
- /**
- * The descriptive information about this implementation.
- */
- protected static final String info =
- "org.apache.catalina.valves.JDBCAccessLogValve/1.1";
-
// ------------------------------------------------------------- Properties
Modified:
tomcat/trunk/webapps/examples/WEB-INF/classes/compressionFilters/CompressionServletResponseWrapper.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/examples/WEB-INF/classes/compressionFilters/CompressionServletResponseWrapper.java?rev=1187757&r1=1187756&r2=1187757&view=diff
==============================================================================
---
tomcat/trunk/webapps/examples/WEB-INF/classes/compressionFilters/CompressionServletResponseWrapper.java
(original)
+++
tomcat/trunk/webapps/examples/WEB-INF/classes/compressionFilters/CompressionServletResponseWrapper.java
Sat Oct 22 19:28:31 2011
@@ -56,20 +56,12 @@ public class CompressionServletResponseW
/**
* Original response
*/
-
protected HttpServletResponse origResponse = null;
/**
- * Descriptive information about this Response implementation.
- */
-
- protected static final String info = "CompressionServletResponseWrapper";
-
- /**
* The ServletOutputStream that has been returned by
* <code>getOutputStream()</code>, if any.
*/
-
protected ServletOutputStream stream = null;
@@ -77,7 +69,6 @@ public class CompressionServletResponseW
* The PrintWriter that has been returned by
* <code>getWriter()</code>, if any.
*/
-
protected PrintWriter writer = null;
/**
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
