From: markt <markt@13f79535-47bb-0310-9956-ffa450edef68>
Date: Sat, 11 Dec 2010 21:35:18 +0000 (+0000)
Subject: o.a.tomcat.util.net should not depend on o.a.coyote
X-Git-Url: https://git.internetallee.de/?a=commitdiff_plain;h=5747329988bd9e475586efd51311ff9980d88cad;p=tomcat7.0

o.a.tomcat.util.net should not depend on o.a.coyote

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@1044727 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/java/org/apache/coyote/ajp/AjpAprProtocol.java b/java/org/apache/coyote/ajp/AjpAprProtocol.java
index 53bf3ba9e..25ba562f4 100644
--- a/java/org/apache/coyote/ajp/AjpAprProtocol.java
+++ b/java/org/apache/coyote/ajp/AjpAprProtocol.java
@@ -154,7 +154,7 @@ public class AjpAprProtocol extends AbstractAjpProtocol {
         }
 
         @Override
-        public RequestGroupInfo getGlobal() {
+        public Object getGlobal() {
             return global;
         }
 
diff --git a/java/org/apache/coyote/ajp/AjpProtocol.java b/java/org/apache/coyote/ajp/AjpProtocol.java
index 3a4ea2c6b..5eaf76501 100644
--- a/java/org/apache/coyote/ajp/AjpProtocol.java
+++ b/java/org/apache/coyote/ajp/AjpProtocol.java
@@ -141,7 +141,7 @@ public class AjpProtocol extends AbstractAjpProtocol {
         }
         
         @Override
-        public RequestGroupInfo getGlobal() {
+        public Object getGlobal() {
             return global;
         }
 
diff --git a/java/org/apache/coyote/http11/Http11AprProtocol.java b/java/org/apache/coyote/http11/Http11AprProtocol.java
index 2480aead5..b94dc7e77 100644
--- a/java/org/apache/coyote/http11/Http11AprProtocol.java
+++ b/java/org/apache/coyote/http11/Http11AprProtocol.java
@@ -245,7 +245,7 @@ public class Http11AprProtocol extends AbstractHttp11Protocol {
         }
 
         @Override
-        public RequestGroupInfo getGlobal() {
+        public Object getGlobal() {
             return global;
         }
         
diff --git a/java/org/apache/coyote/http11/Http11NioProtocol.java b/java/org/apache/coyote/http11/Http11NioProtocol.java
index 8460ae4d1..3f6a0f474 100644
--- a/java/org/apache/coyote/http11/Http11NioProtocol.java
+++ b/java/org/apache/coyote/http11/Http11NioProtocol.java
@@ -205,7 +205,7 @@ public class Http11NioProtocol extends AbstractHttp11JsseProtocol {
         }
         
         @Override
-        public RequestGroupInfo getGlobal() {
+        public Object getGlobal() {
             return global;
         }
 
diff --git a/java/org/apache/coyote/http11/Http11Protocol.java b/java/org/apache/coyote/http11/Http11Protocol.java
index 11b5a913e..974d487a2 100644
--- a/java/org/apache/coyote/http11/Http11Protocol.java
+++ b/java/org/apache/coyote/http11/Http11Protocol.java
@@ -139,7 +139,7 @@ public class Http11Protocol extends AbstractHttp11JsseProtocol {
         }
 
         @Override
-        public RequestGroupInfo getGlobal() {
+        public Object getGlobal() {
             return global;
         }
 
diff --git a/java/org/apache/tomcat/util/net/AbstractEndpoint.java b/java/org/apache/tomcat/util/net/AbstractEndpoint.java
index ff77f30d0..6a4edf2ae 100644
--- a/java/org/apache/tomcat/util/net/AbstractEndpoint.java
+++ b/java/org/apache/tomcat/util/net/AbstractEndpoint.java
@@ -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();
         
         
         /**
diff --git a/res/checkstyle/org-import-control.xml b/res/checkstyle/org-import-control.xml
index e5f488f44..ced46dca2 100644
--- a/res/checkstyle/org-import-control.xml
+++ b/res/checkstyle/org-import-control.xml
@@ -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>