You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by co...@hyperreal.org on 1999/11/13 00:24:39 UTC

cvs commit: jakarta-tomcat/src/shell ant

costin      99/11/12 15:24:37

  Modified:    src/share/org/apache/tomcat/service/http HttpAdapter.java
  Added:       src/shell ant
  Log:
  -Fixed port init problem
  -added "ant" script. You can use it instead of build.sh ( I have it
  in my PATH, and just type ant to build )
  
  Revision  Changes    Path
  1.2       +7 -9      jakarta-tomcat/src/share/org/apache/tomcat/service/http/HttpAdapter.java
  
  Index: HttpAdapter.java
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/service/http/HttpAdapter.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- HttpAdapter.java	1999/11/02 17:37:22	1.1
  +++ HttpAdapter.java	1999/11/12 23:24:24	1.2
  @@ -1,9 +1,9 @@
   
   
   /*
  - * $Header: /home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/service/http/HttpAdapter.java,v 1.1 1999/11/02 17:37:22 costin Exp $
  - * $Revision: 1.1 $
  - * $Date: 1999/11/02 17:37:22 $
  + * $Header: /home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/service/http/HttpAdapter.java,v 1.2 1999/11/12 23:24:24 costin Exp $
  + * $Revision: 1.2 $
  + * $Date: 1999/11/12 23:24:24 $
    *
    * ====================================================================
    *
  @@ -88,10 +88,8 @@
       
       private InetAddress address;
       // default is 8080
  -    private int port=8080;
  +    int vport=8080;
   
  -    int vport;
  -
       private ServerSocketFactory socketFactory;
       private ServerSocket serverSocket;
   
  @@ -105,7 +103,7 @@
   
       public void start() throws Exception {
   	if( con==null) throw new Exception( "Invalid ConnectionHandler");
  -	ep.setPort(port);
  +	ep.setPort(vport);
   	if( socketFactory != null) {
   	    ep.setServerSocketFactory( socketFactory );
   	}
  @@ -122,9 +120,9 @@
       }
       
       public void setProperty( String prop, String value) {
  -	if("port".equals(prop) ) {
  +	if(HttpServer.VHOST_PORT.equals(prop) ) {
   	    //	    System.out.println("XXX");
  -	    port=string2Int(value);
  +	    vport=string2Int(value);
   	}
       }
   
  
  
  
  1.1                  jakarta-tomcat/src/shell/ant
  
  Index: ant
  ===================================================================
  #! /bin/sh
  
  ## Set to the absolute path to TOOLS if
  # not used to build tomcat and default directories
  TOOLS_HOME=${PWD}/../jakarta-tools
  
  CLASSPATH=$CLASSPATH:${TOOLS_HOME}/ant.jar:${TOOLS_HOME}/projectx-tr2.jar
  
  java org.apache.tools.ant.Main $*