cvs commit: jakarta-tomcat-connectors/util/java/org/apache/tomcat/util/compat JdkCompat.java
costin 2004/10/05 22:17:47 Modified:util/java/org/apache/tomcat/util/compat JdkCompat.java Log: Remove unused dep on logging Revision ChangesPath 1.18 +3 -9 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.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- JdkCompat.java29 Aug 2004 17:14:41 - 1.17 +++ JdkCompat.java6 Oct 2004 05:17:46 - 1.18 @@ -18,14 +18,12 @@ import java.io.File; import java.io.IOException; -import java.net.URL; -import java.net.MalformedURLException; -import java.util.Vector; import java.io.PrintWriter; import java.io.StringWriter; +import java.net.MalformedURLException; +import java.net.URL; +import java.util.Vector; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; /** * General-purpose utility to provide backward-compatibility and JDK @@ -47,10 +45,6 @@ */ static final String JAVA14_SUPPORT = "org.apache.tomcat.util.compat.Jdk14Compat"; -/** - * Commons logger wrapper - */ -static Log logger = LogFactory.getLog(JdkCompat.class); /** Return java version as a string */ - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
Re: cvs commit: jakarta-tomcat-connectors/util/java/org/apache/tomcat/util/compat JdkCompat.java Jdk14Compat.java
- Original Message - From: <[EMAIL PROTECTED]> To: <[EMAIL PROTECTED]> Sent: Wednesday, April 14, 2004 6:44 PM Subject: cvs commit: jakarta-tomcat-connectors/util/java/org/apache/tomcat/util/compat JdkCompat.java Jdk14Compat.java > luehe 2004/04/14 18:44:49 > > Modified:util/java/org/apache/tomcat/util/compat JdkCompat.java > Jdk14Compat.java > Log: > "Hide" Throwable.initCause() inside Jdk14Compat, in order to preserver BC with J2SE 1.3 Thanks Jan :). This message is intended only for the use of the person(s) listed above as the intended recipient(s), and may contain information that is PRIVILEGED and CONFIDENTIAL. If you are not an intended recipient, you may not read, copy, or distribute this message or any attachment. If you received this communication in error, please notify us immediately by e-mail and then delete all copies of this message and any attachments. In addition you should be aware that ordinary (unencrypted) e-mail sent through the Internet is not secure. Do not send confidential or sensitive information, such as social security numbers, account numbers, personal identification numbers and passwords, to us via ordinary (unencrypted) e-mail. - 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 JdkCompat.java Jdk14Compat.java
luehe 2004/04/14 18:44:49
Modified:util/java/org/apache/tomcat/util/compat JdkCompat.java
Jdk14Compat.java
Log:
"Hide" Throwable.initCause() inside Jdk14Compat, in order to preserver BC with J2SE
1.3
Revision ChangesPath
1.13 +10 -0
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.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- JdkCompat.java3 Apr 2004 06:47:24 - 1.12
+++ JdkCompat.java15 Apr 2004 01:44:49 - 1.13
@@ -212,4 +212,14 @@
return result;
}
+
+/**
+ * Chains the wrapped throwable to the wrapper throwable.
+ *
+ * @param wrapper The wrapper throwable
+ * @param wrapped The throwable to be wrapped
+ */
+public void chainException(Throwable wrapper, Throwable wrapped) {
+// do nothing
+}
}
1.9 +12 -0
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.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- Jdk14Compat.java 24 Feb 2004 08:50:05 - 1.8
+++ Jdk14Compat.java 15 Apr 2004 01:44:49 - 1.9
@@ -104,4 +104,16 @@
public String [] split(String path, String pat) {
return path.split(pat);
}
+
+
+/**
+ * Chains the wrapped throwable to the wrapper throwable.
+ *
+ * @param wrapper The wrapper throwable
+ * @param wrapped The throwable to be wrapped
+ */
+public void chainException(Throwable wrapper, Throwable wrapped) {
+wrapper.initCause(wrapped);
+}
+
}
-
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 JdkCompat.java
billbarker2004/04/02 22:47:24
Modified:util/java/org/apache/tomcat/util/compat JdkCompat.java
Log:
Add detection for JDK 1.5
Revision ChangesPath
1.12 +9 -0
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.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- JdkCompat.java24 Feb 2004 08:50:05 - 1.11
+++ JdkCompat.java3 Apr 2004 06:47:24 - 1.12
@@ -66,6 +66,10 @@
return java14;
}
+public static boolean isJava15() {
+return java15;
+}
+
// Implementation
// from ant
@@ -74,10 +78,12 @@
public static final String JAVA_1_2 = "1.2";
public static final String JAVA_1_3 = "1.3";
public static final String JAVA_1_4 = "1.4";
+public static final String JAVA_1_5 = "1.5";
static String javaVersion;
static boolean java2=false;
static boolean java14=false;
+static boolean java15=false;
static JdkCompat jdkCompat;
static {
@@ -97,6 +103,9 @@
Class.forName("java.lang.CharSequence");
javaVersion = JAVA_1_4;
java14=true;
+Class.forName("java.lang.Appendable");
+javaVersion = JAVA_1_5;
+java15=true;
} catch (ClassNotFoundException cnfe) {
// swallow as we've hit the max class version that we have
}
-
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 JdkCompat.java
remm2003/07/19 03:04:05
Modified:util/java/org/apache/tomcat/util/compat JdkCompat.java
Log:
- Forgot to reset my debugging flag.
Revision ChangesPath
1.9 +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.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- JdkCompat.java19 Jul 2003 10:03:29 - 1.8
+++ JdkCompat.java19 Jul 2003 10:04:05 - 1.9
@@ -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
}
-
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 JdkCompat.java
remm2003/07/19 02:05:11
Modified:util/java/org/apache/tomcat/util/compat JdkCompat.java
Log:
- Forgot the offset, oops.
Revision ChangesPath
1.7 +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.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- JdkCompat.java19 Jul 2003 08:32:54 - 1.6
+++ JdkCompat.java19 Jul 2003 09:05:11 - 1.7
@@ -213,7 +213,7 @@
String st = stackTrace.toString();
int i = st.lastIndexOf("javax.servlet.");
if (i > -1) {
-return st.substring(0, i);
+return st.substring(0, i - 4);
} else {
return st;
}
-
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 JdkCompat.java
remm2003/07/19 01:32:54
Modified:util/java/org/apache/tomcat/util/compat JdkCompat.java
Log:
- Apply Tim Funk's patch to trunk the stacktrace on older JDK.
- Add a -4 offset to try to remove the "\tat " in front of the trace line.
Revision ChangesPath
1.6 +10 -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.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- JdkCompat.java18 Jul 2003 22:24:37 - 1.5
+++ JdkCompat.java19 Jul 2003 08:32:54 - 1.6
@@ -210,7 +210,13 @@
public String getPartialServletStackTrace(Throwable t) {
StringWriter stackTrace = new StringWriter();
t.printStackTrace(new PrintWriter(stackTrace));
-return stackTrace.toString();
+String st = stackTrace.toString();
+int i = st.lastIndexOf("javax.servlet.");
+if (i > -1) {
+return st.substring(0, i);
+} else {
+return st;
+}
}
-
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 JdkCompat.java
billbarker2003/02/04 19:47:13
Modified:util/java/org/apache/tomcat/util/compat JdkCompat.java
Log:
Fix cut-and-paste from too many files errors :)
Submitted by: Tim Funk [EMAIL PROTECTED]
Revision ChangesPath
1.3 +27 -32
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.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- JdkCompat.java4 Feb 2003 07:16:47 - 1.2
+++ JdkCompat.java5 Feb 2003 03:47:12 - 1.3
@@ -82,15 +82,14 @@
* @author Tim Funk
*/
public class JdkCompat {
-// -- Constants
-public static final String JDK14_CLASS = "org.apache.catalina.util.Jdk14Compat";
// --- Static Variables
+
/**
- * The static instance holder.
+ * class providing java2 support
*/
-static JdkCompat jdkCompat;
-
+static final String JAVA14_SUPPORT =
+"org.apache.tomcat.util.compat.Jdk14Compat";
/**
* Commons logger wrapper
*/
@@ -99,15 +98,15 @@
/** Return java version as a string
*/
public static String getJavaVersion() {
- return javaVersion;
+return javaVersion;
}
public static boolean isJava2() {
- return java2;
+return java2;
}
public static boolean isJava14() {
- return java14;
+return java14;
}
// Implementation
@@ -122,43 +121,39 @@
static String javaVersion;
static boolean java2=false;
static boolean java14=false;
-static JdkCompat compat;
+static JdkCompat jdkCompat;
static {
- init();
+init();
}
-// class providing java2 support
-static final String JAVA14_SUPPORT=
- "org.apache.tomcat.util.compat.Jdk14Compat";
-
private static void init() {
try {
javaVersion = JAVA_1_0;
Class.forName("java.lang.Void");
javaVersion = JAVA_1_1;
Class.forName("java.lang.ThreadLocal");
- java2=true;
+java2=true;
javaVersion = JAVA_1_2;
Class.forName("java.lang.StrictMath");
javaVersion = JAVA_1_3;
- Class.forName("java.lang.CharSequence");
- javaVersion = JAVA_1_4;
- java14=true;
+Class.forName("java.lang.CharSequence");
+javaVersion = JAVA_1_4;
+java14=true;
} catch (ClassNotFoundException cnfe) {
// swallow as we've hit the max class version that we have
}
- if( java14 ) {
- try {
- Class c=Class.forName(JAVA14_SUPPORT);
- compat=(JdkCompat)c.newInstance();
- } catch( Exception ex ) {
- compat=new JdkCompat();
- }
- } else {
- compat=new JdkCompat();
- // Install jar handler if none installed
- }
+if( java14 ) {
+try {
+Class c=Class.forName(JAVA14_SUPPORT);
+jdkCompat=(JdkCompat)c.newInstance();
+} catch( Exception ex ) {
+jdkCompat=new JdkCompat();
+}
+} else {
+jdkCompat=new JdkCompat();
+// Install jar handler if none installed
+}
}
// --- Constructors
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
