tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From craig...@locus.apache.org
Subject cvs commit: jakarta-tomcat/src/shell tomcat.bat
Date Mon, 01 May 2000 15:46:50 GMT
craigmcc    00/05/01 08:46:50

  Modified:    .        README build.bat build.sh build.xml
               src/share/org/apache/jasper/compiler TagLibraryInfoImpl.java
               src/shell tomcat.bat
  Log:
  Revise the build process to "disconnect" Tomcat from using the old
  xml.jar file -- this is the first step in implementing JAXP-based parser
  independence.  For the moment, you will need to have the JAXP
  redistributable files (jaxp.jar and parser.jar) in your CLASSPATH.  Later,
  it will be possible to use any JAXP-compatible parser.
  
  Note the revised build instructions in the README file -- you will also
  need to get your servlet classes from a new CVS subproject called
  "jakarta-servletapi".  The javax.servlet.* classes inside the Tomcat
  project will shortly be removed.
  
  Revision  Changes    Path
  1.8       +79 -1     jakarta-tomcat/README
  
  Index: README
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat/README,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- README	2000/04/06 21:18:21	1.7
  +++ README	2000/05/01 15:46:47	1.8
  @@ -1,3 +1,81 @@
  +			Jakarta Tomcat Servlet Container
  +			================================
  +
  +
  +INSTALLING AND BUILDING TOMCAT
  +------------------------------
  +
  +This subproject contains the source code for the Tomcat servlet container and
  +JSP engine that conforms to the latest public versions of the Servlet and JSP
  +APIs.  In order to build these sources successfully, you must do the following:
  +
  +* Download and install the Java API for XML Parsing implementation (current
  +  version number is 1.0) from <http://java.sun.com/xml>.  Make sure that the
  +  "jaxp.jar" and "parser.jar" files are on your class path.
  +
  +* Download and install the JAKARTA-ANT distribution.  If you have downloaded
  +  the source distribution, you must create the executable version by
  +  executing the following commands:
  +
  +	cd jakarta-ant
  +	./bootstrap.sh		<-- Unix
  +	bootstrap		<-- Windows
  +
  +  This should result in the creation of a file "ant.jar" in the "lib"
  +  subdirectory, which will be used when building the Servlet API distribution.
  +
  +* Download and install the JAKARTA-SERVLETAPI distribution into the same
  +  directory where you installed Ant.  If you have downloaded the source
  +  distribution, you must create the executable version by executing the
  +  following commands:
  +
  +	cd jakarta-servletapi
  +	./build.sh dist		<-- Unix
  +	build dist		<-- Windows
  +
  +* Download and install the JAKARTA-TOMCAT source code distribution (or check
  +  them out via anonymous CVS) into the same directory where you installed
  +  Ant and the Servlet API downloads.  To build an "unpacked" version of Tomcat
  +  into directory "../build/tomcat", execute the following commands:
  +
  +	cd jakarta-tomcat
  +	./build.sh		<-- Unix
  +	build			<-- Windows
  +
  +  To run the unpacked version of Tomcat, execute the following:
  +
  +	cd ../build/tomcat	<-- Unix
  +	./bin/startup.sh	<-- Unix
  +
  +	cd ..\build\tomcat	<-- Windows
  +	.\bin\startup		<-- Windows
  +
  +  To shut down the unpacked version of Tomcat (from the same directory):
  +
  +	./bin/shutdown.sh	<-- Unix
  +	.\bin\shutdown		<-- Windows
  +
  +* You can also build a distribution version of Tomcat as follows:
  +
  +	cd jakarta-tomcat
  +	./build.sh dist		<-- Unix
  +	build dist		<-- Windows
  +
  +  which will create the distribution in directory "../dist/tomcat".
  +
  +
  + source code, or check it out
  +  from the CVS repository, into a directory parallel to the jakarta-ant
  +  directory created above.  That is, if you downloaded both subprojects into
  +  a directory named $JAKARTA_HOME, you would see the following two entries:
  +
  +	jakarta-ant/
  +	jakarta-servletapi/
  +
  +  underneath it.
  +
  +
  +
   How to Build
   ------------
   
  @@ -62,7 +140,7 @@
   	bin\shutdown		<-- Windows
   
   
  -Testing the Build
  +TESTING THE BUILD
   -----------------
   
   We have packaged a set of 'quick tests' that test out various parts of
  
  
  
  1.6       +11 -6     jakarta-tomcat/build.bat
  
  Index: build.bat
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat/build.bat,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- build.bat	2000/04/25 16:56:24	1.5
  +++ build.bat	2000/05/01 15:46:47	1.6
  @@ -1,19 +1,22 @@
   @echo off
   REM convience bat file to build with
   
  -SET _ANTHOME=%ANT_HOME%
  -if "%ANT_HOME%" == "" SET ANT_HOME=..\jakarta-ant
  +set _ANTHOME=%ANT_HOME%
  +if "%ANT_HOME%" == "" set ANT_HOME=..\jakarta-ant
   
  +set _SERVLETAPIHOME=%SERVLETAPI_HOME%
  +if "%SERVLETAPI_HOME%" == "" set SERVLETAPI_HOME=..\jakarta-servletapi
  +
   if "%CLASSPATH%" == "" goto noclasspath
   
   rem else
   set _CLASSPATH=%CLASSPATH%
  -set CLASSPATH=%CLASSPATH%;%ANT_HOME%\lib\ant.jar;%ANT_HOME%\lib\xml.jar;..\jakarta-tools\moo.jar
  +set CLASSPATH=%CLASSPATH%;%ANT_HOME%\lib\ant.jar;%SERVLETAPI_HOME%\lib\servlet.jar;..\jakarta-tools\moo.jar
   goto next
   
   :noclasspath
   set _CLASSPATH=
  -set CLASSPATH=%ANT_HOME%\lib\ant.jar;%ANT_HOME%\lib\xml.jar;..\jakarta-tools\moo.jar
  +set CLASSPATH=%ANT_HOME%\lib\ant.jar;%SERVLETAPI_HOME%\lib\servlet.jar;..\jakarta-tools\moo.jar
   goto next
   
   :next
  @@ -25,5 +28,7 @@
   rem clean up classpath after
   set CLASSPATH=%_CLASSPATH%
   set _CLASSPATH=
  -SET ANT_HOME=%_ANTHOME%
  -SET _ANTHOME=
  +set SERVLETAPI_HOME=%_SERVLETAPIHOME%
  +set _SERVLETAPIHOME=
  +set ANT_HOME=%_ANTHOME%
  +set _ANTHOME=
  
  
  
  1.11      +2 -3      jakarta-tomcat/build.sh
  
  Index: build.sh
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat/build.sh,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- build.sh	2000/04/25 16:56:24	1.10
  +++ build.sh	2000/05/01 15:46:47	1.11
  @@ -1,6 +1,6 @@
   #! /bin/sh
   
  -# $Id: build.sh,v 1.10 2000/04/25 16:56:24 craigmcc Exp $
  +# $Id: build.sh,v 1.11 2000/05/01 15:46:47 craigmcc Exp $
   
   if [ -z "$JAVA_HOME" ]
   then
  @@ -20,8 +20,7 @@
   
   JAVACMD=$JAVA_HOME/bin/java $ANT_OPTS
   
  -cp=../jakarta-ant/lib/ant.jar:../jakarta-tools/moo.jar:../jakarta-ant/lib/xml.jar:../build/tomcat/classes:$JAVA_HOME/lib/tools.jar:$JAVA_HOME/lib/dev.jar
  +cp=../jakarta-ant/lib/ant.jar:../jakarta-servletapi/lib/servlet.jar:../jakarta-tools/moo.jar:../build/tomcat/classes:$JAVA_HOME/lib/tools.jar:$JAVA_HOME/lib/dev.jar
   
   $JAVACMD -classpath $cp:$CLASSPATH org.apache.tools.ant.Main "$@"
  -
   
  
  
  
  1.47      +10 -13    jakarta-tomcat/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat/build.xml,v
  retrieving revision 1.46
  retrieving revision 1.47
  diff -u -r1.46 -r1.47
  --- build.xml	2000/04/15 13:14:09	1.46
  +++ build.xml	2000/05/01 15:46:47	1.47
  @@ -5,6 +5,7 @@
            work  -->
       <property name="ant.home" value="../jakarta-ant" />
       <property name="build.compiler" value="classic"/>
  +    <property name="servlet.jar" value="../jakarta-servletapi/lib/servlet.jar"/>
       <property name="tomcat.build" value="../build/tomcat"/>
       <property name="tomcat.home" value="../dist/tomcat"/>
     </target>
  @@ -36,9 +37,8 @@
       <!-- include ant, it is used for testing and will be used for
            configuration and few other tasks -->
       <copydir src="${ant.home}/bin" dest="${tomcat.build}/bin"/>
  -    <copyfile src="${ant.home}/lib/xml.jar" dest="${tomcat.build}/lib/xml.jar"/>
       <copyfile src="${ant.home}/lib/ant.jar" dest="${tomcat.build}/lib/ant.jar"/>
  -
  +    <copyfile src="${servlet.jar}" dest="${tomcat.build}/lib/servlet.jar"/>
       <copyfile src="LICENSE" dest="${tomcat.build}/LICENSE"/>
   
       <fixcrlf srcdir="${tomcat.build}" includes="*.sh" cr="remove"/>
  @@ -55,9 +55,9 @@
     <!-- ==================== Build tomcat ==================== -->
     <target name="tomcat" depends="prepare">
       <javac srcdir="src/share" destdir="${tomcat.build}/classes"
  -           classpath="${tomcat.build}/lib/xml.jar" debug="on"/>
  -
  -    <copydir src="src/share" dest="${tomcat.build}/classes">
  +           classpath="${servlet.jar}" debug="on" excludes="javax/**"/>
  +    <copydir src="src/share" dest="${tomcat.build}/classes"
  +             excludes="javax/**">
         <include name="**/*.properties" />
       </copydir>
     </target>
  @@ -69,7 +69,7 @@
       <copydir src="src/examples" dest="${tomcat.build}/webapps/examples"/>
       <javac srcdir="src/examples/WEB-INF/classes"
              destdir="${tomcat.build}/webapps/examples/WEB-INF/classes"
  -           classpath="${tomcat.build}/classes"/>
  +           classpath="${tomcat.build}/classes,${servlet.jar}"/>
       <javac srcdir="src/examples/jsp/plugin/applet"
              destdir="${tomcat.build}/webapps/examples/jsp/plugin/applet"/>
   
  @@ -78,21 +78,21 @@
       <copydir src="src/webpages" dest="${tomcat.build}/webapps/ROOT"/>
       <javac srcdir="src/webpages/WEB-INF/classes"
              destdir="${tomcat.build}/webapps/ROOT/WEB-INF/classes"
  -           classpath="${tomcat.build}/classes"/>
  +           classpath="${tomcat.build}/classes,${servlet.jar}"/>
   
       <!-- admin context -->
       <mkdir dir="${tomcat.build}/webapps/admin"/>
       <copydir src="src/admin" dest="${tomcat.build}/webapps/admin"/>
       <javac srcdir="src/admin/WEB-INF/classes"
              destdir="${tomcat.build}/webapps/admin/WEB-INF/classes"
  -           classpath="${tomcat.build}/classes"/>
  +           classpath="${tomcat.build}/classes,${servlet.jar}"/>
   
       <!-- Test application -->
       <mkdir dir="${tomcat.build}/webapps/test"/>
       <copydir src="src/tests/webpages" dest="${tomcat.build}/webapps/test"/>
       <javac srcdir="src/tests/webpages/WEB-INF/classes"
              destdir="${tomcat.build}/webapps/test/WEB-INF/classes"
  -           classpath="${tomcat.build}/classes"/>
  +           classpath="${tomcat.build}/classes,${servlet.jar}"/>
     </target>
   
   
  @@ -101,19 +101,16 @@
   
       <mkdir dir="${tomcat.home}"/>
       <copydir src="${tomcat.build}" dest="${tomcat.home}"/>
  -    <copydir src="src/share/javax" dest="${tomcat.home}/src/javax"/>
       <copydir src="src/share/org" dest="${tomcat.home}/src/org"/>
   
       <!-- create tomcat jar files -->
       <jar jarfile="${tomcat.home}/lib/webserver.jar"
            basedir="${tomcat.home}/classes"
            includes="org/apache/tomcat/**"/> 
  -    <jar jarfile="${tomcat.home}/lib/servlet.jar"
  -         basedir="${tomcat.home}/classes"
  -         includes="javax/servlet/**"/>
       <jar jarfile="${tomcat.home}/lib/jasper.jar"
            basedir="${tomcat.home}/classes"
            includes="org/apache/jasper/**"/>
  +    <copyfile src="${servlet.jar}" dest="${tomcat.home}/lib/servlet.jar"/>
   
       <!-- Add Tomcat internal javadoc -->
       <mkdir dir="${tomcat.home}/webapps/ROOT/javadoc" />
  
  
  
  1.17      +5 -4      jakarta-tomcat/src/share/org/apache/jasper/compiler/TagLibraryInfoImpl.java
  
  Index: TagLibraryInfoImpl.java
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat/src/share/org/apache/jasper/compiler/TagLibraryInfoImpl.java,v
  retrieving revision 1.16
  retrieving revision 1.17
  diff -u -r1.16 -r1.17
  --- TagLibraryInfoImpl.java	2000/03/28 04:29:48	1.16
  +++ TagLibraryInfoImpl.java	2000/05/01 15:46:48	1.17
  @@ -1,7 +1,7 @@
   /*
  - * $Header: /home/cvs/jakarta-tomcat/src/share/org/apache/jasper/compiler/TagLibraryInfoImpl.java,v
1.16 2000/03/28 04:29:48 akv Exp $
  - * $Revision: 1.16 $
  - * $Date: 2000/03/28 04:29:48 $
  + * $Header: /home/cvs/jakarta-tomcat/src/share/org/apache/jasper/compiler/TagLibraryInfoImpl.java,v
1.17 2000/05/01 15:46:48 craigmcc Exp $
  + * $Revision: 1.17 $
  + * $Date: 2000/05/01 15:46:48 $
    *
    * The Apache Software License, Version 1.1
    *
  @@ -499,7 +499,8 @@
                                     );
           }
           
  -        return new TagAttributeInfo(name, required, rtexprvalue, type);
  +	//     return new TagAttributeInfo(name, required, rtexprvalue, type);
  +        return new TagAttributeInfo(name, required, type, rtexprvalue);
       }
   
       static void copy(InputStream in, String fileName) 
  
  
  
  1.21      +0 -1      jakarta-tomcat/src/shell/tomcat.bat
  
  Index: tomcat.bat
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat/src/shell/tomcat.bat,v
  retrieving revision 1.20
  retrieving revision 1.21
  diff -u -r1.20 -r1.21
  --- tomcat.bat	2000/04/03 19:02:56	1.20
  +++ tomcat.bat	2000/05/01 15:46:49	1.21
  @@ -28,7 +28,6 @@
   set CLASSPATH=%TOMCAT_HOME%\classes
   set CLASSPATH=%CLASSPATH%;%TOMCAT_HOME%\lib\webserver.jar
   set CLASSPATH=%CLASSPATH%;%TOMCAT_HOME%\lib\jasper.jar
  -set CLASSPATH=%CLASSPATH%;%TOMCAT_HOME%\lib\xml.jar
   set CLASSPATH=%CLASSPATH%;%TOMCAT_HOME%\lib\servlet.jar
   set CLASSPATH=%CLASSPATH%;%JAVA_HOME%\lib\tools.jar
   
  
  
  

Mime
View raw message