tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From na...@apache.org
Subject cvs commit: jakarta-tomcat/src/share/org/apache/tomcat/util/compat Jdk11Compat.java
Date Sat, 10 Feb 2001 00:55:38 GMT
nacho       01/02/09 16:55:37

  Modified:    .        build.xml
               src/admin/test test.jsp
               src/share/org/apache/tomcat/startup Main.java
               src/share/org/apache/tomcat/util/compat Jdk11Compat.java
  Log:
  * build was a little messed last time, fixing it a little,
  needs more work i.e. merge old-main and main targets
  * Fixed the new startup style to compile on JDK 1.1
  * a typo (a really cruel one) on Jdk11compat
  (thanks to nightly build logs, thanks Costin!!)
  * deleted some testing comments on sanity-test page (test.jsp)
  
  Revision  Changes    Path
  1.110     +3 -14     jakarta-tomcat/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat/build.xml,v
  retrieving revision 1.109
  retrieving revision 1.110
  diff -u -r1.109 -r1.110
  --- build.xml	2001/02/06 18:17:55	1.109
  +++ build.xml	2001/02/10 00:55:36	1.110
  @@ -403,18 +403,7 @@
       <zip zipfile="${Name}-${version}.zip" basedir="${tomcat.dist}" includes="**"/>
     </target>
     
  -  <target name="dist-new">
  -    <mkdir dir="${tomcat.dist}/lib/shared"/>
  -    <mkdir dir="${tomcat.dist}/lib/common"/>
  -    <copy file ="${tomcat.dist}/lib/servlet.jar"
  -        todir="${tomcat.dist}/lib/common" />
  -    <copy file ="${tomcat.dist}/lib/jasper.jar"
  -        todir="${tomcat.dist}/lib/shared" />
  -    <copy file ="${tomcat.dist}/lib/tomcat_util.jar"
  -        todir="${tomcat.dist}/lib/shared" />
  -  </target>
  -
  -  <target name="new">
  +  <target name="main" depends="old-main">
       <mkdir dir="${tomcat.build}/lib/shared"/>
       <mkdir dir="${tomcat.build}/lib/common"/>
       <copy file ="${tomcat.build}/lib/servlet.jar"
  @@ -448,7 +437,7 @@
     </target>
   
     
  -  <target name="all" depends="clean,dist,dist-new"/>
  -  <target name="main" depends="tomcat,webapps,sanity-test,new"/>
  +  <target name="all" depends="clean,dist"/>
  +  <target name="old-main" depends="tomcat,webapps,sanity-test"/>
       
   </project>
  
  
  
  1.13      +0 -4      jakarta-tomcat/src/admin/test/test.jsp
  
  Index: test.jsp
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat/src/admin/test/test.jsp,v
  retrieving revision 1.12
  retrieving revision 1.13
  diff -u -r1.12 -r1.13
  --- test.jsp	2001/02/09 04:03:22	1.12
  +++ test.jsp	2001/02/10 00:55:36	1.13
  @@ -16,16 +16,13 @@
      // Keep in mind this is just a way to jump-start testing, not a 
      // production-quality test runner.
   %>
  -<!-- trozo  -->
   <% out.flush(); 
      if( request.getParameter("target") == null ) return;
   %>
  -<!-- trozo  -->
   <adm:admin ctxPath="/test" 
   	   action="setLogger" 
   	   value="webapps/test/context_log.txt" />
   
  -<!-- trozo 1 -->
   <ant:gtest />
   
   <ant:ant>
  @@ -44,7 +41,6 @@
     <ant:property name="host" param="host" />
   </ant:ant>
   
  -<!-- trozo 1 -->
   <% // Test completed, display the results ( outType=none means
      // Gtest doesn't generate any output ( but we have to wait untill
      // it's done ), use 'html' for "interactive" results
  
  
  
  1.20      +6 -4      jakarta-tomcat/src/share/org/apache/tomcat/startup/Main.java
  
  Index: Main.java
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/startup/Main.java,v
  retrieving revision 1.19
  retrieving revision 1.20
  diff -u -r1.19 -r1.20
  --- Main.java	2001/02/09 07:49:28	1.19
  +++ Main.java	2001/02/10 00:55:37	1.20
  @@ -178,12 +178,14 @@
               // the server classloader loads from classes dir too and from tools.jar
               Vector urlV=new Vector();
               urlV.addElement( getURL(  getServerDir() ,"../classes/" ));
  -            urlV.addAll(getClassPathA(getServerDir()));
  +            Vector serverUrlV =getClassPathV(getServerDir());
  +            for(int i=0; i < serverUrlV.size();i++)
  +                urlV.addElement(serverUrlV.elementAt(i));
   	    urlV.addElement( new URL( "file", null , System.getProperty( "java.home" ) +"/../lib/tools.jar"));
               URL[] serverClassPath=getURLs(urlV);
               // ClassLoader for webapps it uses a shared dir as repository, distinct from
lib
  -            URL[] sharedClassPath=getURLs(getClassPathA(getSharedDir()));
  -            URL[] commonClassPath=getURLs(getClassPathA(getCommonDir()));
  +            URL[] sharedClassPath=getURLs(getClassPathV(getSharedDir()));
  +            URL[] commonClassPath=getURLs(getClassPathV(getCommonDir()));
               ClassLoader commonCl= IntrospectionUtils.getURLClassLoader(commonClassPath
, parentL );
   	    ClassLoader sharedCl= IntrospectionUtils.getURLClassLoader(sharedClassPath , commonCl
);
               ClassLoader serverCl= IntrospectionUtils.getURLClassLoader(serverClassPath
, commonCl );
  @@ -268,7 +270,7 @@
   	return names;
       }
   
  -    Vector getClassPathA(String p0) throws Exception {
  +    Vector getClassPathV(String p0) throws Exception {
           Vector urlV=new Vector();
           try{
               String cpComp[]=getJarFiles(p0);
  
  
  
  1.3       +1 -1      jakarta-tomcat/src/share/org/apache/tomcat/util/compat/Jdk11Compat.java
  
  Index: Jdk11Compat.java
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/util/compat/Jdk11Compat.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- Jdk11Compat.java	2001/02/06 02:46:30	1.2
  +++ Jdk11Compat.java	2001/02/10 00:55:37	1.3
  @@ -117,7 +117,7 @@
       }
       public URL[] getParentURLs(ClassLoader cl){
           SimpleClassLoader scl=(SimpleClassLoader)cl;
  -        return ((SimpleClassLoader)cl.getParent()).getURLs();
  +        return ((SimpleClassLoader)scl.getParent()).getURLs();
       }
       // Other methods, as needed
           
  
  
  

Mime
View raw message