cvs commit: jakarta-tomcat/src/share/org/apache/tomcat/task ApacheConfig.java StopTomcat.java

[nacho]

nacho       00/11/19 18:10:38

  Modified:    src/share/org/apache/tomcat/task ApacheConfig.java
                        StopTomcat.java
  Log:
  Cleaning dependencies related to old packaging
  
  Revision  Changes    Path
  1.22      +4 -4      
jakarta-tomcat/src/share/org/apache/tomcat/task/ApacheConfig.java
  
  Index: ApacheConfig.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/task/ApacheConfig.java,v
  retrieving revision 1.21
  retrieving revision 1.22
  diff -u -r1.21 -r1.22
  --- ApacheConfig.java 2000/11/02 21:45:07     1.21
  +++ ApacheConfig.java 2000/11/20 02:10:35     1.22
  @@ -66,8 +66,8 @@
   import java.util.*;
   
   // Used to find Ajp12 connector port
  -import org.apache.tomcat.service.PoolTcpConnector;
  -import org.apache.tomcat.service.connector.Ajp12ConnectionHandler;
  +//import org.apache.tomcat.service.PoolTcpConnector;
  +//import org.apache.tomcat.service.connector.Ajp12ConnectionHandler;
   import org.apache.tomcat.modules.server.Ajp12Interceptor;
   
   /**
  @@ -139,10 +139,10 @@
            BaseInterceptor ci[]=cm.getContainer().getInterceptors();
            for( int i=0; i<ci.length; i++ ) {
                Object con=ci[i];
  -             if( con instanceof  Ajp12ConnectionHandler ) {
  +/*           if( con instanceof  Ajp12ConnectionHandler ) {
                    PoolTcpConnector tcpCon=(PoolTcpConnector) con;
                    portInt=tcpCon.getPort();
  -             }
  +             }*/
                if( con instanceof  Ajp12Interceptor ) {
                    Ajp12Interceptor tcpCon=(Ajp12Interceptor) con;
                    portInt=tcpCon.getPort();
  
  
  
  1.13      +4 -4      jakarta-tomcat/src/share/org/apache/tomcat/task/StopTomcat.java
  
  Index: StopTomcat.java
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/task/StopTomcat.java,v
  retrieving revision 1.12
  retrieving revision 1.13
  diff -u -r1.12 -r1.13
  --- StopTomcat.java   2000/11/02 21:45:10     1.12
  +++ StopTomcat.java   2000/11/20 02:10:36     1.13
  @@ -68,8 +68,8 @@
   import java.util.*;
   
   // Used to stop tomcat
  -import org.apache.tomcat.service.PoolTcpConnector;
  -import org.apache.tomcat.service.connector.Ajp12ConnectionHandler;
  +//import org.apache.tomcat.service.PoolTcpConnector;
  +//import org.apache.tomcat.service.connector.Ajp12ConnectionHandler;
   import org.apache.tomcat.modules.server.Ajp12Interceptor;
   
   /**
  @@ -176,11 +176,11 @@
        BaseInterceptor ci[]=cm.getContainer().getInterceptors();
        for( int i=0; i<ci.length; i++ ) {
            Object con=ci[i];
  -         if( con instanceof  Ajp12ConnectionHandler ) {
  +/*       if( con instanceof  Ajp12ConnectionHandler ) {
                PoolTcpConnector tcpCon=(PoolTcpConnector) con;
                portInt=tcpCon.getPort();
                address=tcpCon.getAddress();
  -         }
  +         }*/
            if( con instanceof  Ajp12Interceptor ) {
                Ajp12Interceptor tcpCon=(Ajp12Interceptor) con;
                portInt=tcpCon.getPort();