Author: markt
Date: Mon Dec 13 12:47:04 2010
New Revision: 1045099
URL: http://svn.apache.org/viewvc?rev=1045099&view=rev
Log:
Using abstract classes means impl isn't clear in the startup log. Modify name
so it is clear.
Modified:
tomcat/trunk/java/org/apache/coyote/ajp/AbstractAjpProtocol.java
tomcat/trunk/java/org/apache/coyote/ajp/AjpAprProtocol.java
tomcat/trunk/java/org/apache/coyote/ajp/AjpProtocol.java
tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Protocol.java
tomcat/trunk/java/org/apache/coyote/http11/Http11AprProtocol.java
tomcat/trunk/java/org/apache/coyote/http11/Http11NioProtocol.java
tomcat/trunk/java/org/apache/coyote/http11/Http11Protocol.java
Modified: tomcat/trunk/java/org/apache/coyote/ajp/AbstractAjpProtocol.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/ajp/AbstractAjpProtocol.java?rev=1045099&r1=1045098&r2=1045099&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/ajp/AbstractAjpProtocol.java (original)
+++ tomcat/trunk/java/org/apache/coyote/ajp/AbstractAjpProtocol.java Mon Dec 13
12:47:04 2010
@@ -63,12 +63,4 @@ public abstract class AbstractAjpProtoco
this.packetSize = packetSize;
}
}
-
-
- // ----------------------------------------------------- JMX related
methods
-
- @Override
- protected String getNamePrefix() {
- return ("ajp");
- }
}
Modified: tomcat/trunk/java/org/apache/coyote/ajp/AjpAprProtocol.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/ajp/AjpAprProtocol.java?rev=1045099&r1=1045098&r2=1045099&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/ajp/AjpAprProtocol.java (original)
+++ tomcat/trunk/java/org/apache/coyote/ajp/AjpAprProtocol.java Mon Dec 13
12:47:04 2010
@@ -97,6 +97,15 @@ public class AjpAprProtocol extends Abst
public void setPollerSize(int pollerSize) {
((AprEndpoint)endpoint).setPollerSize(pollerSize); }
public int getPollerSize() { return
((AprEndpoint)endpoint).getPollerSize(); }
+
+ // ----------------------------------------------------- JMX related
methods
+
+ @Override
+ protected String getNamePrefix() {
+ return ("ajp-apr");
+ }
+
+
// -------------------------------------- AjpConnectionHandler Inner Class
Modified: tomcat/trunk/java/org/apache/coyote/ajp/AjpProtocol.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/ajp/AjpProtocol.java?rev=1045099&r1=1045098&r2=1045099&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/ajp/AjpProtocol.java (original)
+++ tomcat/trunk/java/org/apache/coyote/ajp/AjpProtocol.java Mon Dec 13
12:47:04 2010
@@ -84,6 +84,14 @@ public class AjpProtocol extends Abstrac
private AjpConnectionHandler cHandler;
+ // ----------------------------------------------------- JMX related
methods
+
+ @Override
+ protected String getNamePrefix() {
+ return ("ajp-bio");
+ }
+
+
// -------------------------------------- AjpConnectionHandler Inner Class
Modified: tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Protocol.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Protocol.java?rev=1045099&r1=1045098&r2=1045099&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Protocol.java
(original)
+++ tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Protocol.java Mon
Dec 13 12:47:04 2010
@@ -179,12 +179,4 @@ public abstract class AbstractHttp11Prot
public void setMaxKeepAliveRequests(int mkar) {
endpoint.setMaxKeepAliveRequests(mkar);
}
-
-
- // ----------------------------------------------------- JMX related
methods
-
- @Override
- protected String getNamePrefix() {
- return ("http");
- }
}
Modified: tomcat/trunk/java/org/apache/coyote/http11/Http11AprProtocol.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/Http11AprProtocol.java?rev=1045099&r1=1045098&r2=1045099&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/http11/Http11AprProtocol.java (original)
+++ tomcat/trunk/java/org/apache/coyote/http11/Http11AprProtocol.java Mon Dec
13 12:47:04 2010
@@ -188,6 +188,14 @@ public class Http11AprProtocol extends A
public int getSSLVerifyDepth() { return
((AprEndpoint)endpoint).getSSLVerifyDepth(); }
public void setSSLVerifyDepth(int SSLVerifyDepth) {
((AprEndpoint)endpoint).setSSLVerifyDepth(SSLVerifyDepth); }
+ // ----------------------------------------------------- JMX related
methods
+
+ @Override
+ protected String getNamePrefix() {
+ return ("http-apr");
+ }
+
+
// -------------------- Connection handler --------------------
static class Http11ConnectionHandler implements Handler {
Modified: tomcat/trunk/java/org/apache/coyote/http11/Http11NioProtocol.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/Http11NioProtocol.java?rev=1045099&r1=1045098&r2=1045099&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/http11/Http11NioProtocol.java (original)
+++ tomcat/trunk/java/org/apache/coyote/http11/Http11NioProtocol.java Mon Dec
13 12:47:04 2010
@@ -147,9 +147,14 @@ public class Http11NioProtocol extends A
((NioEndpoint)endpoint).setOomParachute(oomParachute);
}
- // -------------------- SSL related properties --------------------
+ // ----------------------------------------------------- JMX related
methods
+
+ @Override
+ protected String getNamePrefix() {
+ return ("http-nio");
+ }
+
-
// -------------------- Connection handler --------------------
static class Http11ConnectionHandler implements Handler {
Modified: tomcat/trunk/java/org/apache/coyote/http11/Http11Protocol.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/Http11Protocol.java?rev=1045099&r1=1045098&r2=1045099&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/http11/Http11Protocol.java (original)
+++ tomcat/trunk/java/org/apache/coyote/http11/Http11Protocol.java Mon Dec 13
12:47:04 2010
@@ -83,6 +83,14 @@ public class Http11Protocol extends Abst
protected Http11ConnectionHandler cHandler;
+ // ----------------------------------------------------- JMX related
methods
+
+ @Override
+ protected String getNamePrefix() {
+ return ("http-bio");
+ }
+
+
// ----------------------------------- Http11ConnectionHandler Inner Class
protected static class Http11ConnectionHandler implements Handler {
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
