tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cos...@locus.apache.org
Subject cvs commit: jakarta-tomcat/src/examples/WEB-INF/classes Hello.java HelloW.java
Date Thu, 02 Nov 2000 21:57:03 GMT
costin      00/11/02 13:57:02

  Modified:    .        build.xml
               src/examples/WEB-INF/classes Hello.java HelloW.java
  Log:
  Few changes to Hello and HelloW ( 100 bytes output )
  
  Removed old tags from build.xml
  
  Revision  Changes    Path
  1.89      +2 -53     jakarta-tomcat/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat/build.xml,v
  retrieving revision 1.88
  retrieving revision 1.89
  diff -u -r1.88 -r1.89
  --- build.xml	2000/10/13 14:52:32	1.88
  +++ build.xml	2000/11/02 21:56:58	1.89
  @@ -295,7 +295,7 @@
     <!-- ====================  Jasper ( 1.0 )  ========== -->
     <target name="jasper" depends="init" >
       <javac destdir="${tomcat.build}/classes"
  -      srcdir="src/share"
  +      srcdir="src/jasper3"
         debug="${debug}" 
         optimize="${optimize}"
         deprecation="off" >
  @@ -315,54 +315,6 @@
        />
     </target>
   
  -  <!-- ==================== Old "compile all" ==================== -->
  -  <target name="tomcat-compile" >
  -    <javac srcdir="src/share;src/facade22" destdir="${tomcat.build}/classes"
  -      classpath="${servlet.jar};${jaxp}/jaxp.jar" 
  -      debug="${debug}" 
  -      optimize="${optimize}"
  -      deprecation="off" >
  -      <exclude name="**/Jdk12Interceptor.java" 
  -	unless="jdk12.present"/>
  -      <exclude name="**/LoaderInterceptor1.java" 
  -	unless="jdk12.present"/>
  -      <exclude name="**/SetSecurityManager.java" 
  -	unless="jdk12.present"/>
  -      <exclude name="**/EmbededTomcat.java" 
  -	unless="jdk12.present"/>
  -      <exclude name="**/PolicyInterceptor.java" 
  -	unless="jdk12.present"/>
  -      <exclude name="**/JasperLoader12.java" 
  -	unless="jdk12.present"/>
  -      <exclude name="**/AdaptiveClassLoader12.java" 
  -	unless="jdk12.present"/>
  -      <exclude name="**/SSLSocketFactory.java"
  -	unless="jsse.present" />
  -    </javac>
  -
  -    <copydir src="src/share" dest="${tomcat.build}/classes"
  -      excludes="javax/**">
  -      <include name="**/*.properties" />
  -      <include name="**/*.dtd" />
  -    </copydir>
  -  </target>
  -
  -  <!-- ==================== Old "jar all" ========== -->
  -  <target name="tomcat-jars" depends="init,prepare">
  -    <!-- create tomcat jar files -->
  -    <jar jarfile="${tomcat.build}/lib/webserver.jar"
  -      basedir="${tomcat.build}/classes" > 
  -      <include name="org/apache/tomcat/**" /> 
  -      <exclude name="org/apache/tomcat/deployment/**" />
  -      <exclude name="org/apache/tomcat/j2ee/**" />
  -      <exclude name="org/apache/tomcat/util/XMLParser.class" /> 
  -      <exclude name="org/apache/tomcat/util/XMLTree.class" />
  -    </jar>
  -    <jar jarfile="${tomcat.build}/lib/jasper.jar"
  -         basedir="${tomcat.build}/classes"
  -         includes="org/apache/jasper/**"/>
  -  </target>
  -
     <target name="tomcat-jars-new" depends="tomcat_util,tomcat.jar,tomcat_core,jasper,tomcat_modules,facade22,facade23,tomcat_config">
     </target>
   
  @@ -437,7 +389,7 @@
     </target>
   
     <!-- ==================== Copy the files to distribution format ======== -->
  -  <target name="dist" depends="main,webapps,tomcat-compile,tomcat-jars">
  +  <target name="dist" depends="main,webapps,tomcat-jars-new">
   
       <mkdir dir="${tomcat.dist}"/>
       <copydir src="${tomcat.build}" dest="${tomcat.dist}"/>
  @@ -499,9 +451,6 @@
   
     <!-- ==================== Admin & agreagate ==================== -->
      
  -  <target name="tomcat-old" depends="prepare,tomcat-compile,tomcat-jars">
  -  </target>
  -
     <target name="tomcat" depends="prepare,tomcat-jars-new">
     </target>
   
  
  
  
  1.2       +1 -1      jakarta-tomcat/src/examples/WEB-INF/classes/Hello.java
  
  Index: Hello.java
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat/src/examples/WEB-INF/classes/Hello.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- Hello.java	2000/08/30 06:39:39	1.1
  +++ Hello.java	2000/11/02 21:57:00	1.2
  @@ -3,7 +3,7 @@
   import java.io.*;
   
   public class Hello extends HttpServlet {
  -    static final byte ba[]="<h1>Hello World</h1>".getBytes();
  +    static final byte ba[]="<h1>Hello World</h1><h1>Hello World</h1><h1>Hello
World</h1><h1>Hello World</h1><h1>Hello World</h1>".getBytes();
       
       public void init(ServletConfig conf)
           throws ServletException
  
  
  
  1.2       +1 -11     jakarta-tomcat/src/examples/WEB-INF/classes/HelloW.java
  
  Index: HelloW.java
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat/src/examples/WEB-INF/classes/HelloW.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- HelloW.java	2000/08/30 06:39:39	1.1
  +++ HelloW.java	2000/11/02 21:57:01	1.2
  @@ -18,17 +18,7 @@
           response.setContentType("text/html");
           PrintWriter out = response.getWriter();
   
  -        out.println("<html>");
  -        out.println("<head>");
  -
  -	out.println("<title>Hello</title>");
  -        out.println("</head>");
  -        out.println("<body bgcolor=\"white\">");
  -        out.println("<body>");
  -
  -        out.println("<h1>Hello</h1>");
  -        out.println("</body>");
  -        out.println("</html>");
  +	out.println("<h1>Hello World</h1><h1>Hello World</h1><h1>Hello
World</h1><h1>Hello World</h1><h1>Hello World</h1>");
       }
   }
   
  
  
  

Mime
View raw message