cvs commit: jakarta-tomcat-connectors/util/java/org/apache/tomcat/util/compat Jdk14Compat.java JdkCompat.java

2004-05-09 Thread billbarker 
billbarker2004/05/09 12:58:43

  Modified:util/java/org/apache/tomcat/util/compat Jdk14Compat.java
JdkCompat.java
  Log:
  Reverting previous patch.
  
  Since MessageFormat.setLocale works just as well, there isn't a need to expose the 
1.4 constructor.
  
  Revision  ChangesPath
  1.11  +0 -3  
jakarta-tomcat-connectors/util/java/org/apache/tomcat/util/compat/Jdk14Compat.java
  
  Index: Jdk14Compat.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-connectors/util/java/org/apache/tomcat/util/compat/Jdk14Compat.java,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- Jdk14Compat.java  8 May 2004 22:05:11 -   1.10
  +++ Jdk14Compat.java  9 May 2004 19:58:43 -   1.11
  @@ -118,7 +118,4 @@
   wrapper.initCause(wrapped);
   }
   
  -public MessageFormat getMessageFormat(String pattern, Locale locale) {
  -return new MessageFormat(pattern, locale);
  -}
}
  
  
  
  1.15  +0 -10 
jakarta-tomcat-connectors/util/java/org/apache/tomcat/util/compat/JdkCompat.java
  
  Index: JdkCompat.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-connectors/util/java/org/apache/tomcat/util/compat/JdkCompat.java,v
  retrieving revision 1.14
  retrieving revision 1.15
  diff -u -r1.14 -r1.15
  --- JdkCompat.java8 May 2004 22:05:11 -   1.14
  +++ JdkCompat.java9 May 2004 19:58:43 -   1.15
  @@ -225,14 +225,4 @@
   // do nothing
   }
   
  -/**
  - * Obtain a MessageFormat for the correct pattern and Locale.
  - *
  - * @param pattern The pattern to format with.
  - * @param locale The Locale to use.
  - */
  -public MessageFormat getMessageFormat(String pattern, Locale locale) {
  -return new MessageFormat(pattern);
  -}
  -
}
  
  
  

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

cvs commit: jakarta-tomcat-connectors/util/java/org/apache/tomcat/util/compat Jdk14Compat.java JdkCompat.java

2003-08-14 Thread billbarker 
billbarker2003/08/13 23:36:02

  Modified:util/java/org/apache/tomcat/util/compat Jdk14Compat.java
JdkCompat.java
  Log:
  Adding a 'split' method to JdkCompat.
  
  The 1.3.x JVM treats the pattern as a literal (and not as an RE) for now, since I 
don't want to introduce more dependecies for j-t-c.
  
  Also, not currently used (so the net effect is to add a few bytes).  Adding it per a 
suggestion from Costin.
  
  Revision  ChangesPath
  1.6   +6 -4  
jakarta-tomcat-connectors/util/java/org/apache/tomcat/util/compat/Jdk14Compat.java
  
  Index: Jdk14Compat.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-connectors/util/java/org/apache/tomcat/util/compat/Jdk14Compat.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- Jdk14Compat.java  19 Jul 2003 10:03:29 -  1.5
  +++ Jdk14Compat.java  14 Aug 2003 06:36:02 -  1.6
  @@ -148,5 +148,7 @@
   return trace.toString();
   }
   
  -
  +public  String [] split(String path, String pat) {
  +return path.split(pat);
  +}
}
  
  
  
  1.10  +31 -3 
jakarta-tomcat-connectors/util/java/org/apache/tomcat/util/compat/JdkCompat.java
  
  Index: JdkCompat.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-connectors/util/java/org/apache/tomcat/util/compat/JdkCompat.java,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- JdkCompat.java19 Jul 2003 10:04:05 -  1.9
  +++ JdkCompat.java14 Aug 2003 06:36:02 -  1.10
  @@ -66,6 +66,7 @@
   import java.io.IOException;
   import java.net.URL;
   import java.net.MalformedURLException;
  +import java.util.Vector;
   import java.io.PrintWriter;
   import java.io.StringWriter;
   
  @@ -220,5 +221,32 @@
   }
   }
   
  +/**
  + * Splits a string into it's components.
  + * @param path String to split
  + * @param pat Pattern to split at
  + * @return the components of the path
  + */
  +public  String [] split(String path, String pat) {
  +Vector comps = new Vector();
  +int pos = path.indexOf(pat);
  +int start = 0;
  +while( pos = 0 ) {
  +if(pos  start ) {
  +String comp = path.substring(start,pos);
  +comps.add(comp);
  +}
  +start = pos + pat.length();
  +pos = path.indexOf(pat,start);
  +}
  +if( start  path.length()) {
  +comps.add(path.substring(start));
  +}
  +String [] result = new String[comps.size()];
  +for(int i=0; i  comps.size(); i++) {
  +result[i] = (String)comps.elementAt(i);
  +}
  +return result;
  +}
   
}
  
  
  

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

cvs commit: jakarta-tomcat-connectors/util/java/org/apache/tomcat/util/compat Jdk14Compat.java JdkCompat.java

2003-07-19 Thread remm 
remm2003/07/19 03:03:29

  Modified:util/java/org/apache/tomcat/util/compat Jdk14Compat.java
JdkCompat.java
  Log:
  - Improve filter exception trace.
  - I'll add a note in the HTML that the full stack trace of the root cause is 
available in the logs.
  
  Revision  ChangesPath
  1.5   +12 -8 
jakarta-tomcat-connectors/util/java/org/apache/tomcat/util/compat/Jdk14Compat.java
  
  Index: Jdk14Compat.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-connectors/util/java/org/apache/tomcat/util/compat/Jdk14Compat.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- Jdk14Compat.java  18 Jul 2003 22:24:37 -  1.4
  +++ Jdk14Compat.java  19 Jul 2003 10:03:29 -  1.5
  @@ -132,14 +132,18 @@
   trace.append(t.toString()).append('\n');
   StackTraceElement[] elements = t.getStackTrace();
   int pos = elements.length;
  -for (int i = (elements.length - 1); i = 0; i--) {
  -if (elements[i].getClassName().startsWith(javax.servlet.)) {
  -pos = i + 1;
  -break;
  +for (int i = 0; i  elements.length; i++) {
  +if ((elements[i].getClassName().startsWith
  + (org.apache.catalina.core.ApplicationFilterChain))
  + (elements[i].getMethodName().equals(internalDoFilter))) {
  +pos = i;
   }
   }
   for (int i = 0; i  pos; i++) {
  -trace.append('\t').append(elements[i].toString()).append('\n');
  +if (!(elements[i].getClassName().startsWith
  +  (org.apache.catalina.core.))) {
  +trace.append('\t').append(elements[i].toString()).append('\n');
  +}
   }
   return trace.toString();
   }
  
  
  
  1.8   +6 -5  
jakarta-tomcat-connectors/util/java/org/apache/tomcat/util/compat/JdkCompat.java
  
  Index: JdkCompat.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-connectors/util/java/org/apache/tomcat/util/compat/JdkCompat.java,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- JdkCompat.java19 Jul 2003 09:05:11 -  1.7
  +++ JdkCompat.java19 Jul 2003 10:03:29 -  1.8
  @@ -141,7 +141,7 @@
   javaVersion = JAVA_1_3;
   Class.forName(java.lang.CharSequence);
   javaVersion = JAVA_1_4;
  -java14=true;
  +//java14=true;
   } catch (ClassNotFoundException cnfe) {
   // swallow as we've hit the max class version that we have
   }
  @@ -211,7 +211,8 @@
   StringWriter stackTrace = new StringWriter();
   t.printStackTrace(new PrintWriter(stackTrace));
   String st = stackTrace.toString();
  -int i = st.lastIndexOf(javax.servlet.);
  +int i = st.lastIndexOf
  +(org.apache.catalina.core.ApplicationFilterChain.internalDoFilter);
   if (i  -1) {
   return st.substring(0, i - 4);
   } else {
  
  
  

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

cvs commit: jakarta-tomcat-connectors/util/java/org/apache/tomcat/util/compat Jdk14Compat.java JdkCompat.java

2003-07-18 Thread remm 
remm2003/07/18 15:24:38

  Modified:util/java/org/apache/tomcat/util/compat Jdk14Compat.java
JdkCompat.java
  Log:
  - Add compat code to print out partial stack traces.
  
  Revision  ChangesPath
  1.4   +27 -4 
jakarta-tomcat-connectors/util/java/org/apache/tomcat/util/compat/Jdk14Compat.java
  
  Index: Jdk14Compat.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-connectors/util/java/org/apache/tomcat/util/compat/Jdk14Compat.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- Jdk14Compat.java  26 Mar 2003 11:01:39 -  1.3
  +++ Jdk14Compat.java  18 Jul 2003 22:24:37 -  1.4
  @@ -75,7 +75,8 @@
   /**
*  See JdkCompat. This is an extension of that class for Jdk1.4 support.
*
  - *  @author Tim Funk
  + * @author Tim Funk
  + * @author Remy Maucherat
*/
   public class Jdk14Compat extends JdkCompat {
   // -- Constants
  @@ -119,6 +120,28 @@
*/
   public long getMaxMemory() {
   return Runtime.getRuntime().maxMemory();
  +}
  +
  +
  +/**
  + * Print out a partial servlet stack trace (truncating at the last 
  + * occurrence of javax.servlet.).
  + */
  +public String getPartialServletStackTrace(Throwable t) {
  +StringBuffer trace = new StringBuffer();
  +trace.append(t.toString()).append('\n');
  +StackTraceElement[] elements = t.getStackTrace();
  +int pos = elements.length;
  +for (int i = (elements.length - 1); i = 0; i--) {
  +if (elements[i].getClassName().startsWith(javax.servlet.)) {
  +pos = i + 1;
  +break;
  +}
  +}
  +for (int i = 0; i  pos; i++) {
  +trace.append('\t').append(elements[i].toString()).append('\n');
  +}
  +return trace.toString();
   }
   
   
  
  
  
  1.5   +16 -3 
jakarta-tomcat-connectors/util/java/org/apache/tomcat/util/compat/JdkCompat.java
  
  Index: JdkCompat.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-connectors/util/java/org/apache/tomcat/util/compat/JdkCompat.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- JdkCompat.java26 Mar 2003 11:01:39 -  1.4
  +++ JdkCompat.java18 Jul 2003 22:24:37 -  1.5
  @@ -66,6 +66,8 @@
   import java.io.IOException;
   import java.net.URL;
   import java.net.MalformedURLException;
  +import java.io.PrintWriter;
  +import java.io.StringWriter;
   
   import org.apache.commons.logging.Log;
   import org.apache.commons.logging.LogFactory;
  @@ -198,6 +200,17 @@
*/
   public long getMaxMemory() {
   return (-1L);
  +}
  +
  +
  +/**
  + * Print out a partial servlet stack trace (truncating at the last 
  + * occurrence of javax.servlet.).
  + */
  +public String getPartialServletStackTrace(Throwable t) {
  +StringWriter stackTrace = new StringWriter();
  +t.printStackTrace(new PrintWriter(stackTrace));
  +return stackTrace.toString();
   }
   
   
  
  
  

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

cvs commit: jakarta-tomcat-connectors/util/java/org/apache/tomcat/util/compat Jdk14Compat.java JdkCompat.java

2003-03-26 Thread remm 
remm2003/03/26 03:01:39

  Modified:util/java/org/apache/tomcat/util/compat Jdk14Compat.java
JdkCompat.java
  Log:
  - Use JDK compat for Runtime.maxMemory().
  
  Revision  ChangesPath
  1.3   +11 -3 
jakarta-tomcat-connectors/util/java/org/apache/tomcat/util/compat/Jdk14Compat.java
  
  Index: Jdk14Compat.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-connectors/util/java/org/apache/tomcat/util/compat/Jdk14Compat.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- Jdk14Compat.java  4 Feb 2003 07:16:47 -   1.2
  +++ Jdk14Compat.java  26 Mar 2003 11:01:39 -  1.3
  @@ -114,4 +114,12 @@
   }
   
   
  +/**
  + *  Return the maximum amount of memory the JVM will attempt to use.
  + */
  +public long getMaxMemory() {
  +return Runtime.getRuntime().maxMemory();
  +}
  +
  +
}
  
  
  
  1.4   +11 -3 
jakarta-tomcat-connectors/util/java/org/apache/tomcat/util/compat/JdkCompat.java
  
  Index: JdkCompat.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-connectors/util/java/org/apache/tomcat/util/compat/JdkCompat.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- JdkCompat.java5 Feb 2003 03:47:12 -   1.3
  +++ JdkCompat.java26 Mar 2003 11:01:39 -  1.4
  @@ -193,4 +193,12 @@
   }
   
   
  +/**
  + *  Return the maximum amount of memory the JVM will attempt to use.
  + */
  +public long getMaxMemory() {
  +return (-1L);
  +}
  +
  +
}
  
  
  

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

cvs commit: jakarta-tomcat-connectors/util/java/org/apache/tomcat/util/compat Jdk14Compat.java JdkCompat.java

2003-02-03 Thread billbarker 
billbarker2003/02/03 22:01:57

  Added:   util/java/org/apache/tomcat/util/compat Jdk14Compat.java
JdkCompat.java
  Log:
  Adding JdkSupport classes.
  
  Changes from patch is to include better version detection.
  
  Submitted by: Tim Funk [EMAIL PROTECTED]
  
  Revision  ChangesPath
  1.1  
jakarta-tomcat-connectors/util/java/org/apache/tomcat/util/compat/Jdk14Compat.java
  
  Index: Jdk14Compat.java
  ===
  /*
   * $Header: 
/home/cvs/jakarta-tomcat-connectors/util/java/org/apache/tomcat/util/compat/Jdk14Compat.java,v
 1.1 2003/02/04 06:01:56 billbarker Exp $
   * $Revision: 1.1 $
   * $Date: 2003/02/04 06:01:56 $
   * 
   *
   * The Apache Software License, Version 1.1
   *
   * Copyright (c) 1999 The Apache Software Foundation.  All rights
   * reserved.
   *
   * Redistribution and use in source and binary forms, with or without
   * modification, are permitted provided that the following conditions
   * are met:
   *
   * 1. Redistributions of source code must retain the above copyright
   *notice, this list of conditions and the following disclaimer.
   *
   * 2. Redistributions in binary form must reproduce the above copyright
   *notice, this list of conditions and the following disclaimer in
   *the documentation and/or other materials provided with the
   *distribution.
   *
   * 3. The end-user documentation included with the redistribution, if
   *any, must include the following acknowlegement:
   *   This product includes software developed by the
   *Apache Software Foundation (http://www.apache.org/).
   *Alternately, this acknowlegement may appear in the software itself,
   *if and wherever such third-party acknowlegements normally appear.
   *
   * 4. The names The Jakarta Project, Tomcat, and Apache Software
   *Foundation must not be used to endorse or promote products derived
   *from this software without prior written permission. For written
   *permission, please contact [EMAIL PROTECTED]
   *
   * 5. Products derived from this software may not be called Apache
   *nor may Apache appear in their names without prior written
   *permission of the Apache Group.
   *
   * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
   * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
   * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
   * DISCLAIMED.  IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
   * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
   * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
   * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
   * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
   * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
   * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
   * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
   * SUCH DAMAGE.
   * 
   *
   * This software consists of voluntary contributions made by many
   * individuals on behalf of the Apache Software Foundation.  For more
   * information on the Apache Software Foundation, please see
   * http://www.apache.org/.
   *
   * [Additional notices, if required by prior licensing conditions]
   *
   */
  
  package org.apache.catalina.util;
  
  import java.io.File;
  import java.io.IOException;
  import java.net.URI;
  import java.net.URL;
  import java.net.MalformedURLException;
  
  import org.apache.commons.logging.Log;
  import org.apache.commons.logging.LogFactory;
  
  
  /**
   *  See JdkCompat. This is an extension of that class for Jdk1.4 support.
   *
   *  @author Tim Funk
   */
  public class Jdk14Compat extends JdkCompat {
  // -- Constants
  
  // --- Static Variables
  static Log logger = LogFactory.getLog(Jdk14Compat.class);
  
  // --- Constructors
  /**
   *  Default no-arg constructor
   */
  protected Jdk14Compat() {
  }
  
  
  // - Public Methods
  
  /**
   *  Return the URI for the given file. Originally created for
   *  o.a.c.loader.WebappClassLoader
   *
   *  @param File to wrap into URI
   *  @return A URI as a URL
   */
  public URL getURI(File file)
  throws MalformedURLException {
  
  File realFile = file;
  try {
  realFile = realFile.getCanonicalFile();
  } catch (IOException e) {
  // Ignore
  }
  
  return

cvs commit: jakarta-tomcat-connectors/util/java/org/apache/tomcat/util/compat Jdk14Compat.java JdkCompat.java

2003-02-03 Thread billbarker 
billbarker2003/02/03 23:16:47

  Modified:util/java/org/apache/tomcat/util/compat Jdk14Compat.java
JdkCompat.java
  Log:
  Urm, Err, don't trust cut-and-paste to copy package changes.
  
  Revision  ChangesPath
  1.2   +5 -5  
jakarta-tomcat-connectors/util/java/org/apache/tomcat/util/compat/Jdk14Compat.java
  
  Index: Jdk14Compat.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-connectors/util/java/org/apache/tomcat/util/compat/Jdk14Compat.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- Jdk14Compat.java  4 Feb 2003 06:01:56 -   1.1
  +++ Jdk14Compat.java  4 Feb 2003 07:16:47 -   1.2
  @@ -60,7 +60,7 @@
*
*/
   
  -package org.apache.catalina.util;
  +package org.apache.tomcat.util.compat;
   
   import java.io.File;
   import java.io.IOException;
  @@ -114,4 +114,4 @@
   }
   
   
  - }
  \ No newline at end of file
  + }
  
  
  
  1.2   +4 -4  
jakarta-tomcat-connectors/util/java/org/apache/tomcat/util/compat/JdkCompat.java
  
  Index: JdkCompat.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-connectors/util/java/org/apache/tomcat/util/compat/JdkCompat.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- JdkCompat.java4 Feb 2003 06:01:56 -   1.1
  +++ JdkCompat.java4 Feb 2003 07:16:47 -   1.2
  @@ -60,7 +60,7 @@
*
*/
   
  -package org.apache.catalina.util;
  +package org.apache.tomcat.util.compat;
   
   import java.io.File;
   import java.io.IOException;
  
  
  

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]