Author: markt
Date: Sat Dec 11 21:35:18 2010
New Revision: 1044727
URL: http://svn.apache.org/viewvc?rev=1044727&view=rev
Log:
o.a.tomcat.util.net should not depend on o.a.coyote
Modified:
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/Http11AprProtocol.java
tomcat/trunk/java/org/apache/coyote/http11/Http11NioProtocol.java
tomcat/trunk/java/org/apache/coyote/http11/Http11Protocol.java
tomcat/trunk/java/org/apache/tomcat/util/net/AbstractEndpoint.java
tomcat/trunk/res/checkstyle/org-import-control.xml
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=1044727&r1=1044726&r2=1044727&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/ajp/AjpAprProtocol.java (original)
+++ tomcat/trunk/java/org/apache/coyote/ajp/AjpAprProtocol.java Sat Dec 11
21:35:18 2010
@@ -154,7 +154,7 @@ public class AjpAprProtocol extends Abst
}
@Override
- public RequestGroupInfo getGlobal() {
+ public Object getGlobal() {
return global;
}
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=1044727&r1=1044726&r2=1044727&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/ajp/AjpProtocol.java (original)
+++ tomcat/trunk/java/org/apache/coyote/ajp/AjpProtocol.java Sat Dec 11
21:35:18 2010
@@ -141,7 +141,7 @@ public class AjpProtocol extends Abstrac
}
@Override
- public RequestGroupInfo getGlobal() {
+ public Object getGlobal() {
return global;
}
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=1044727&r1=1044726&r2=1044727&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/http11/Http11AprProtocol.java (original)
+++ tomcat/trunk/java/org/apache/coyote/http11/Http11AprProtocol.java Sat Dec
11 21:35:18 2010
@@ -245,7 +245,7 @@ public class Http11AprProtocol extends A
}
@Override
- public RequestGroupInfo getGlobal() {
+ public Object getGlobal() {
return global;
}
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=1044727&r1=1044726&r2=1044727&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/http11/Http11NioProtocol.java (original)
+++ tomcat/trunk/java/org/apache/coyote/http11/Http11NioProtocol.java Sat Dec
11 21:35:18 2010
@@ -205,7 +205,7 @@ public class Http11NioProtocol extends A
}
@Override
- public RequestGroupInfo getGlobal() {
+ public Object getGlobal() {
return global;
}
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=1044727&r1=1044726&r2=1044727&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/http11/Http11Protocol.java (original)
+++ tomcat/trunk/java/org/apache/coyote/http11/Http11Protocol.java Sat Dec 11
21:35:18 2010
@@ -139,7 +139,7 @@ public class Http11Protocol extends Abst
}
@Override
- public RequestGroupInfo getGlobal() {
+ public Object getGlobal() {
return global;
}
Modified: tomcat/trunk/java/org/apache/tomcat/util/net/AbstractEndpoint.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/AbstractEndpoint.java?rev=1044727&r1=1044726&r2=1044727&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/net/AbstractEndpoint.java
(original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/AbstractEndpoint.java Sat Dec
11 21:35:18 2010
@@ -28,7 +28,6 @@ import java.util.concurrent.TimeUnit;
import javax.net.ssl.KeyManagerFactory;
-import org.apache.coyote.RequestGroupInfo;
import org.apache.juli.logging.Log;
import org.apache.tomcat.util.IntrospectionUtils;
import org.apache.tomcat.util.net.jsse.JSSESocketFactory;
@@ -60,7 +59,7 @@ public abstract class AbstractEndpoint {
/**
* Obtain the GlobalRequestProcessor associated with the handler.
*/
- public RequestGroupInfo getGlobal();
+ public Object getGlobal();
/**
Modified: tomcat/trunk/res/checkstyle/org-import-control.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/res/checkstyle/org-import-control.xml?rev=1044727&r1=1044726&r2=1044727&view=diff
==============================================================================
--- tomcat/trunk/res/checkstyle/org-import-control.xml (original)
+++ tomcat/trunk/res/checkstyle/org-import-control.xml Sat Dec 11 21:35:18 2010
@@ -90,9 +90,6 @@
<allow pkg="org.apache.tomcat.jni"/>
<allow pkg="org.apache.tomcat.util"/>
<disallow pkg="org.apache.util.scan"/>
- <!-- To remove? -->
- <allow class="org.apache.coyote.RequestGroupInfo"/>
- <!-- end to remove -->
<subpackage name="scan">
<allow pkg="org.apache.tomcat" exact-match="true"/>
</subpackage>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
