Author: markt
Date: Sun Nov 23 22:50:44 2014
New Revision: 1641282
URL: http://svn.apache.org/r1641282
Log:
Remove the now unnecessary per implementation AjpProcessor classes.
Added:
tomcat/trunk/java/org/apache/coyote/ajp/AjpProcessor.java (contents,
props changed)
- copied, changed from r1641281,
tomcat/trunk/java/org/apache/coyote/ajp/AbstractAjpProcessor.java
Removed:
tomcat/trunk/java/org/apache/coyote/ajp/AbstractAjpProcessor.java
tomcat/trunk/java/org/apache/coyote/ajp/AjpAprProcessor.java
tomcat/trunk/java/org/apache/coyote/ajp/AjpNio2Processor.java
tomcat/trunk/java/org/apache/coyote/ajp/AjpNioProcessor.java
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/AjpNio2Protocol.java
tomcat/trunk/java/org/apache/coyote/ajp/AjpNioProtocol.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=1641282&r1=1641281&r2=1641282&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/ajp/AbstractAjpProtocol.java (original)
+++ tomcat/trunk/java/org/apache/coyote/ajp/AbstractAjpProtocol.java Sun Nov 23
22:50:44 2014
@@ -76,7 +76,7 @@ public abstract class AbstractAjpProtoco
}
}
- protected void configureProcessor(AbstractAjpProcessor<S> processor) {
+ protected void configureProcessor(AjpProcessor<S> processor) {
processor.setAdapter(getAdapter());
processor.setTomcatAuthentication(getTomcatAuthentication());
processor.setRequiredSecret(requiredSecret);
@@ -84,8 +84,8 @@ public abstract class AbstractAjpProtoco
processor.setClientCertProvider(getClientCertProvider());
}
- protected abstract static class AbstractAjpConnectionHandler<S,P extends
AbstractAjpProcessor<S>>
- extends AbstractConnectionHandler<S, P> {
+ protected abstract static class AbstractAjpConnectionHandler<S>
+ extends AbstractConnectionHandler<S,AjpProcessor<S>> {
@Override
protected void initSsl(SocketWrapperBase<S> socket, Processor<S>
processor) {
@@ -100,8 +100,8 @@ public abstract class AbstractAjpProtoco
}
@Override
- protected P createUpgradeProcessor(SocketWrapperBase<S> socket,
ByteBuffer leftoverInput,
- HttpUpgradeHandler httpUpgradeHandler) {
+ protected AjpProcessor<S> createUpgradeProcessor(SocketWrapperBase<S>
socket,
+ ByteBuffer leftoverInput, HttpUpgradeHandler
httpUpgradeHandler) {
// TODO should fail - throw IOE
return null;
}
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=1641282&r1=1641281&r2=1641282&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/ajp/AjpAprProtocol.java (original)
+++ tomcat/trunk/java/org/apache/coyote/ajp/AjpAprProtocol.java Sun Nov 23
22:50:44 2014
@@ -103,7 +103,7 @@ public class AjpAprProtocol extends Abst
protected static class AjpConnectionHandler
- extends AbstractAjpConnectionHandler<Long,AjpAprProcessor>
+ extends AbstractAjpConnectionHandler<Long>
implements Handler {
protected final AjpAprProtocol proto;
@@ -141,8 +141,8 @@ public class AjpAprProtocol extends Abst
@Override
- protected AjpAprProcessor createProcessor() {
- AjpAprProcessor processor = new AjpAprProcessor(proto.packetSize,
(AprEndpoint)proto.endpoint);
+ protected AjpProcessor<Long> createProcessor() {
+ AjpProcessor<Long> processor = new
AjpProcessor<>(proto.packetSize, proto.endpoint);
proto.configureProcessor(processor);
register(processor);
return processor;
Modified: tomcat/trunk/java/org/apache/coyote/ajp/AjpNio2Protocol.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/ajp/AjpNio2Protocol.java?rev=1641282&r1=1641281&r2=1641282&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/ajp/AjpNio2Protocol.java (original)
+++ tomcat/trunk/java/org/apache/coyote/ajp/AjpNio2Protocol.java Sun Nov 23
22:50:44 2014
@@ -86,7 +86,7 @@ public class AjpNio2Protocol extends Abs
protected static class AjpConnectionHandler
- extends AbstractAjpConnectionHandler<Nio2Channel, AjpNio2Processor>
+ extends AbstractAjpConnectionHandler<Nio2Channel>
implements Handler {
protected final AjpNio2Protocol proto;
@@ -143,8 +143,8 @@ public class AjpNio2Protocol extends Abs
}
@Override
- protected AjpNio2Processor createProcessor() {
- AjpNio2Processor processor = new
AjpNio2Processor(proto.packetSize, (Nio2Endpoint) proto.endpoint);
+ protected AjpProcessor<Nio2Channel> createProcessor() {
+ AjpProcessor<Nio2Channel> processor = new
AjpProcessor<>(proto.packetSize, proto.endpoint);
proto.configureProcessor(processor);
register(processor);
return processor;
Modified: tomcat/trunk/java/org/apache/coyote/ajp/AjpNioProtocol.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/ajp/AjpNioProtocol.java?rev=1641282&r1=1641281&r2=1641282&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/ajp/AjpNioProtocol.java (original)
+++ tomcat/trunk/java/org/apache/coyote/ajp/AjpNioProtocol.java Sun Nov 23
22:50:44 2014
@@ -89,7 +89,7 @@ public class AjpNioProtocol extends Abst
protected static class AjpConnectionHandler
- extends AbstractAjpConnectionHandler<NioChannel, AjpNioProcessor>
+ extends AbstractAjpConnectionHandler<NioChannel>
implements Handler {
protected final AjpNioProtocol proto;
@@ -171,8 +171,8 @@ public class AjpNioProtocol extends Abst
@Override
- protected AjpNioProcessor createProcessor() {
- AjpNioProcessor processor = new AjpNioProcessor(proto.packetSize,
(NioEndpoint)proto.endpoint);
+ protected AjpProcessor<NioChannel> createProcessor() {
+ AjpProcessor<NioChannel> processor = new
AjpProcessor<>(proto.packetSize, proto.endpoint);
proto.configureProcessor(processor);
register(processor);
return processor;
Copied: tomcat/trunk/java/org/apache/coyote/ajp/AjpProcessor.java (from
r1641281, tomcat/trunk/java/org/apache/coyote/ajp/AbstractAjpProcessor.java)
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/ajp/AjpProcessor.java?p2=tomcat/trunk/java/org/apache/coyote/ajp/AjpProcessor.java&p1=tomcat/trunk/java/org/apache/coyote/ajp/AbstractAjpProcessor.java&r1=1641281&r2=1641282&rev=1641282&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/ajp/AbstractAjpProcessor.java (original)
+++ tomcat/trunk/java/org/apache/coyote/ajp/AjpProcessor.java Sun Nov 23
22:50:44 2014
@@ -42,6 +42,8 @@ import org.apache.coyote.OutputBuffer;
import org.apache.coyote.Request;
import org.apache.coyote.RequestInfo;
import org.apache.coyote.Response;
+import org.apache.juli.logging.Log;
+import org.apache.juli.logging.LogFactory;
import org.apache.tomcat.util.ExceptionUtils;
import org.apache.tomcat.util.buf.ByteChunk;
import org.apache.tomcat.util.buf.HexUtils;
@@ -57,14 +59,15 @@ import org.apache.tomcat.util.net.Socket
import org.apache.tomcat.util.res.StringManager;
/**
- * Base class for AJP Processor implementations.
+ * AJP Processor implementations.
*/
-public abstract class AbstractAjpProcessor<S> extends AbstractProcessor<S> {
+public class AjpProcessor<S> extends AbstractProcessor<S> {
+ private static final Log log = LogFactory.getLog(AjpProcessor.class);
/**
* The string manager for this package.
*/
- protected static final StringManager sm =
StringManager.getManager(AbstractAjpProcessor.class);
+ protected static final StringManager sm =
StringManager.getManager(AjpProcessor.class);
/**
@@ -264,7 +267,7 @@ public abstract class AbstractAjpProcess
// ------------------------------------------------------------ Constructor
- public AbstractAjpProcessor(int packetSize, AbstractEndpoint<S> endpoint) {
+ public AjpProcessor(int packetSize, AbstractEndpoint<S> endpoint) {
super(endpoint);
@@ -1682,6 +1685,12 @@ public abstract class AbstractAjpProcess
}
+ @Override
+ protected Log getLog() {
+ return log;
+ }
+
+
// ------------------------------------- InputStreamInputBuffer Inner Class
/**
Propchange: tomcat/trunk/java/org/apache/coyote/ajp/AjpProcessor.java
------------------------------------------------------------------------------
svn:eol-style = native
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
