cvs commit: jakarta-tomcat/src/share/org/apache/tomcat/util/xml XmlMapper.java
hgomez 01/02/08 05:30:55
Modified:src/share/org/apache/tomcat/util/xml Tag: tomcat_32
XmlMapper.java
Log:
Fix a problem in resolving external public entities
this was fixed in TC 3.3
Submitted by: Frey Thibault <[EMAIL PROTECTED]>
Revision ChangesPath
No revision
No revision
1.25.2.2 +3 -0
jakarta-tomcat/src/share/org/apache/tomcat/util/xml/XmlMapper.java
Index: XmlMapper.java
===
RCS file:
/home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/util/xml/XmlMapper.java,v
retrieving revision 1.25.2.1
retrieving revision 1.25.2.2
diff -u -r1.25.2.1 -r1.25.2.2
--- XmlMapper.java2000/07/07 11:58:51 1.25.2.1
+++ XmlMapper.java2001/02/08 13:30:54 1.25.2.2
@@ -406,6 +406,9 @@
public InputSource resolveEntity(String publicId, String systemId)
throws SAXException
{
+ if (publicId == null)
+ return (null); // if publicid is null, parser will handle that (tfr)
+
String dtd = (String) fileDTDs.get(publicId);
if( dtd != null ) {
File dtdF=new File( dtd );
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, email: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper CommandLineContext.java
glenn 01/02/08 05:36:56
Modified:jasper/src/share/org/apache/jasper CommandLineContext.java
Log:
Put runtime jsp page servlets in a package
Revision ChangesPath
1.6 +12 -3
jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/CommandLineContext.java
Index: CommandLineContext.java
===
RCS file:
/home/cvs/jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/CommandLineContext.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- CommandLineContext.java 2001/02/04 01:03:04 1.5
+++ CommandLineContext.java 2001/02/08 13:36:56 1.6
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/CommandLineContext.java,v
1.5 2001/02/04 01:03:04 glenn Exp $
- * $Revision: 1.5 $
- * $Date: 2001/02/04 01:03:04 $
+ * $Header:
/home/cvs/jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/CommandLineContext.java,v
1.6 2001/02/08 13:36:56 glenn Exp $
+ * $Revision: 1.6 $
+ * $Date: 2001/02/08 13:36:56 $
*
*
*
@@ -187,6 +187,15 @@
return options.getScratchDir().toString();
}
+/**
+ * What is the scratch directory we are generating code into?
+ * FIXME: In some places this is called scratchDir and in some
+ * other places it is called outputDir.
+ */
+public String getJavacOutputDir() {
+return options.getScratchDir().toString();
+}
+
/**
* Path of the JSP URI. Note that this is not a file name. This is
* the context rooted URI of the JSP file.
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, email: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper Constants.java
glenn 01/02/08 05:37:08 Modified:jasper/src/share/org/apache/jasper Constants.java Log: Put runtime jsp page servlets in a package Revision ChangesPath 1.8 +5 -0 jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/Constants.java Index: Constants.java === RCS file: /home/cvs/jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/Constants.java,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- Constants.java2001/02/04 01:03:17 1.7 +++ Constants.java2001/02/08 13:37:08 1.8 @@ -129,6 +129,11 @@ public static final String PRECOMPILE = "jsp_precompile"; /** + * The default package name for compiled jsp pages. + */ +public static final String JSP_PACKAGE_NAME = "org.apache.jsp"; + +/** * Servlet context and request attributes that the JSP engine * uses. */ - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, email: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper JspCompilationContext.java
glenn 01/02/08 05:37:16 Modified:jasper/src/share/org/apache/jasper JspCompilationContext.java Log: Put runtime jsp page servlets in a package Revision ChangesPath 1.5 +10 -3 jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/JspCompilationContext.java Index: JspCompilationContext.java === RCS file: /home/cvs/jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/JspCompilationContext.java,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- JspCompilationContext.java2001/02/04 01:03:52 1.4 +++ JspCompilationContext.java2001/02/08 13:37:16 1.5 @@ -1,7 +1,7 @@ /* - * $Header: /home/cvs/jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/JspCompilationContext.java,v 1.4 2001/02/04 01:03:52 glenn Exp $ - * $Revision: 1.4 $ - * $Date: 2001/02/04 01:03:52 $ + * $Header: /home/cvs/jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/JspCompilationContext.java,v 1.5 2001/02/08 13:37:16 glenn Exp $ + * $Revision: 1.5 $ + * $Date: 2001/02/08 13:37:16 $ * * * @@ -118,6 +118,13 @@ */ public String getOutputDir(); +/** + * What is the scratch directory we are generating code into? + * FIXME: In some places this is called scratchDir and in some + * other places it is called outputDir. + */ +public String getJavacOutputDir(); + /** * Path of the JSP URI. Note that this is not a file name. This is * the context rooted URI of the JSP file. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, email: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper JspEngineContext.java
glenn 01/02/08 05:37:27
Modified:jasper/src/share/org/apache/jasper JspEngineContext.java
Log:
Put runtime jsp page servlets in a package
Revision ChangesPath
1.5 +13 -4
jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/JspEngineContext.java
Index: JspEngineContext.java
===
RCS file:
/home/cvs/jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/JspEngineContext.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- JspEngineContext.java 2001/02/04 01:04:02 1.4
+++ JspEngineContext.java 2001/02/08 13:37:27 1.5
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/JspEngineContext.java,v
1.4 2001/02/04 01:04:02 glenn Exp $
- * $Revision: 1.4 $
- * $Date: 2001/02/04 01:04:02 $
+ * $Header:
/home/cvs/jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/JspEngineContext.java,v
1.5 2001/02/08 13:37:27 glenn Exp $
+ * $Revision: 1.5 $
+ * $Date: 2001/02/08 13:37:27 $
*
*
*
@@ -104,7 +104,7 @@
String jspFile;
String outDir;
String servletClassName;
-String servletPackageName;
+String servletPackageName = Constants.JSP_PACKAGE_NAME;
String servletJavaFileName;
String contentType;
Options options;
@@ -204,6 +204,15 @@
return outDir;
}
+/**
+ * What is the scratch directory we are generating code into?
+ * FIXME: In some places this is called scratchDir and in some
+ * other places it is called outputDir.
+ */
+public String getJavacOutputDir() {
+return null;
+}
+
/**
* Path of the JSP URI. Note that this is not a file name. This is
* the context rooted URI of the JSP file.
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, email: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/compiler Compiler.java
glenn 01/02/08 05:37:45
Modified:jasper/src/share/org/apache/jasper/compiler Compiler.java
Log:
Put runtime jsp page servlets in a package
Revision ChangesPath
1.9 +6 -24
jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/compiler/Compiler.java
Index: Compiler.java
===
RCS file:
/home/cvs/jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/compiler/Compiler.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- Compiler.java 2001/02/04 01:04:52 1.8
+++ Compiler.java 2001/02/08 13:37:45 1.9
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/compiler/Compiler.java,v
1.8 2001/02/04 01:04:52 glenn Exp $
- * $Revision: 1.8 $
- * $Date: 2001/02/04 01:04:52 $
+ * $Header:
/home/cvs/jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/compiler/Compiler.java,v
1.9 2001/02/08 13:37:45 glenn Exp $
+ * $Revision: 1.9 $
+ * $Date: 2001/02/08 13:37:45 $
*
*
*
@@ -227,8 +227,7 @@
"-encoding",
javaEncoding,
"-classpath",
-System.getProperty("java.class.path")+ sep + classpath
-+ sep + ctxt.getOutputDir(),
+System.getProperty("java.class.path")+ sep + classpath,
"-d", ctxt.getOutputDir(),
javaFileName
};
@@ -259,9 +258,8 @@
* Configure the compiler object
*/
javac.setEncoding(javaEncoding);
-javac.setClasspath( System.getProperty("java.class.path")+ sep +
-classpath + sep + ctxt.getOutputDir());
-javac.setOutputDir(ctxt.getOutputDir());
+javac.setClasspath( System.getProperty("java.class.path")+ sep + classpath);
+javac.setOutputDir(ctxt.getJavacOutputDir());
javac.setMsgOutput(out);
/**
@@ -278,22 +276,6 @@
String msg = out.toString ();
throw new
JasperException(Constants.getString("jsp.error.unable.compile")
+ msg);
-}
-
-String classFile = ctxt.getOutputDir() + File.separatorChar;
-classFile = classFile + className + ".class";
-
-if (!classFile.equals(classFileName)) {
-File classFileObject = new File(classFile);
-File myClassFileObject = new File(classFileName);
-if (myClassFileObject.exists())
-myClassFileObject.delete();
-if (classFileObject.renameTo(myClassFileObject) == false)
-throw new
JasperException(Constants.getString("jsp.error.unable.rename",
- new Object[] {
- classFileObject,
- myClassFileObject
- }));
}
return true;
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, email: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/compiler JikesJavaCompiler.java
glenn 01/02/08 05:37:55
Modified:jasper/src/share/org/apache/jasper/compiler
JikesJavaCompiler.java
Log:
Put runtime jsp page servlets in a package
Revision ChangesPath
1.4 +23 -11
jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/compiler/JikesJavaCompiler.java
Index: JikesJavaCompiler.java
===
RCS file:
/home/cvs/jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/compiler/JikesJavaCompiler.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- JikesJavaCompiler.java2000/11/24 13:38:33 1.3
+++ JikesJavaCompiler.java2001/02/08 13:37:54 1.4
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/compiler/JikesJavaCompiler.java,v
1.3 2000/11/24 13:38:33 pierred Exp $
- * $Revision: 1.3 $
- * $Date: 2000/11/24 13:38:33 $
+ * $Header:
/home/cvs/jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/compiler/JikesJavaCompiler.java,v
1.4 2001/02/08 13:37:54 glenn Exp $
+ * $Revision: 1.4 $
+ * $Date: 2001/02/08 13:37:54 $
*
*
*
@@ -153,14 +153,26 @@
}
}
-String[] compilerCmd = new String[] {
- quote + compilerPath + quote,
- //XXX - add encoding once Jikes supports it
- "-classpath", quote + classpath + MicrosoftClasspath + quote,
- "-d", quote + outdir + quote,
- "-nowarn",
- quote + source + quote
-};
+String[] compilerCmd = null;
+
+ if( outdir != null ) {
+ compilerCmd = new String[] {
+ quote + compilerPath + quote,
+ //XXX - add encoding once Jikes supports it
+ "-classpath", quote + classpath + MicrosoftClasspath + quote,
+ "-d", quote + outdir + quote,
+ "-nowarn",
+ quote + source + quote
+};
+ } else {
+compilerCmd = new String[] {
+quote + compilerPath + quote,
+//XXX - add encoding once Jikes supports it
+"-classpath", quote + classpath + MicrosoftClasspath + quote,
+"-nowarn",
+quote + source + quote
+};
+ }
ByteArrayOutputStream tmpErr = new
ByteArrayOutputStream(OUTPUT_BUFFER_SIZE);
try {
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, email: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/compiler SunJavaCompiler.java
glenn 01/02/08 05:38:03
Modified:jasper/src/share/org/apache/jasper/compiler
SunJavaCompiler.java
Log:
Put runtime jsp page servlets in a package
Revision ChangesPath
1.2 +20 -10
jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/compiler/SunJavaCompiler.java
Index: SunJavaCompiler.java
===
RCS file:
/home/cvs/jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/compiler/SunJavaCompiler.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- SunJavaCompiler.java 2000/08/12 00:52:08 1.1
+++ SunJavaCompiler.java 2001/02/08 13:38:02 1.2
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/compiler/SunJavaCompiler.java,v
1.1 2000/08/12 00:52:08 pierred Exp $
- * $Revision: 1.1 $
- * $Date: 2000/08/12 00:52:08 $
+ * $Header:
/home/cvs/jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/compiler/SunJavaCompiler.java,v
1.2 2001/02/08 13:38:02 glenn Exp $
+ * $Revision: 1.2 $
+ * $Date: 2001/02/08 13:38:02 $
*
*
*
@@ -126,14 +126,24 @@
public boolean compile(String source) {
Main compiler = new Main(out, "jsp->javac");
+ String[] args = null;
-String[] args = new String[]
-{
-"-encoding", encoding,
-"-classpath", classpath,
-"-d", outdir,
-source
-};
+ if( outdir != null ) {
+args = new String[]
+{
+"-encoding", encoding,
+"-classpath", classpath,
+"-d", outdir,
+source
+};
+ } else {
+args = new String[]
+{
+"-encoding", encoding,
+"-classpath", classpath,
+source
+};
+ }
return compiler.compile(args);
}
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, email: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/servlet JasperLoader.java
glenn 01/02/08 05:38:25
Modified:jasper/src/share/org/apache/jasper/servlet JasperLoader.java
Log:
Put runtime jsp page servlets in a package
Revision ChangesPath
1.3 +46 -14
jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/servlet/JasperLoader.java
Index: JasperLoader.java
===
RCS file:
/home/cvs/jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/servlet/JasperLoader.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- JasperLoader.java 2001/02/04 01:07:44 1.2
+++ JasperLoader.java 2001/02/08 13:38:24 1.3
@@ -57,22 +57,15 @@
package org.apache.jasper.servlet;
-import java.io.FileInputStream;
import java.io.ByteArrayOutputStream;
-import java.io.File;
-import java.io.FileNotFoundException;
import java.io.InputStream;
import java.io.IOException;
import java.net.URL;
import java.net.URLClassLoader;
+import java.security.CodeSource;
import java.security.PermissionCollection;
-import java.util.Hashtable;
-import java.util.Vector;
-import java.util.zip.ZipFile;
-import java.util.zip.ZipEntry;
+import java.security.ProtectionDomain;
-import java.security.*;
-
import org.apache.jasper.JasperException;
import org.apache.jasper.Constants;
import org.apache.jasper.JspCompilationContext;
@@ -93,14 +86,17 @@
public class JasperLoader extends URLClassLoader {
private PermissionCollection permissionCollection = null;
+private CodeSource codeSource = null;
private String className = null;
private ClassLoader parent = null;
private SecurityManager securityManager = null;
JasperLoader(URL [] urls, String className, ClassLoader parent,
- PermissionCollection permissionCollection) {
+ PermissionCollection permissionCollection,
+ CodeSource codeSource) {
super(urls,parent);
this.permissionCollection = permissionCollection;
+ this.codeSource = codeSource;
this.className = className;
this.parent = parent;
this.securityManager = System.getSecurityManager();
@@ -176,16 +172,27 @@
}
// Class is in a package, delegate to parent
- if( dot >= 0 ) {
+ if( !name.startsWith(Constants.JSP_PACKAGE_NAME) ) {
clazz = parent.loadClass(name);
if( resolve )
resolveClass(clazz);
return clazz;
}
- // Only load unpackaged classes for the JSP page itself
- if( name.startsWith(className) ) {
- clazz = findClass(name);
+ // Only load classes for this JSP page
+ if( name.startsWith(Constants.JSP_PACKAGE_NAME + "." + className) ) {
+ String classFile = name.substring(Constants.JSP_PACKAGE_NAME.length()+1) +
+ ".class";
+ byte [] cdata = loadClassDataFromFile(classFile);
+ if( cdata == null )
+ throw new ClassNotFoundException(name);
+ if( System.getSecurityManager() != null ) {
+ ProtectionDomain pd = new ProtectionDomain(
+ codeSource,permissionCollection);
+ clazz = defineClass(name,cdata,0,cdata.length,pd);
+ } else {
+ clazz = defineClass(name,cdata,0,cdata.length);
+ }
if( clazz != null ) {
if( resolve )
resolveClass(clazz);
@@ -208,6 +215,31 @@
*/
protected final PermissionCollection getPermissions(CodeSource codeSource) {
return permissionCollection;
+}
+
+
+/**
+ * Load JSP class data from file.
+ */
+protected byte[] loadClassDataFromFile(String fileName) {
+byte[] classBytes = null;
+try {
+InputStream in = getResourceAsStream(fileName);
+if (in == null) {
+ return null;
+ }
+ByteArrayOutputStream baos = new ByteArrayOutputStream();
+byte buf[] = new byte[1024];
+for(int i = 0; (i = in.read(buf)) != -1; )
+baos.write(buf, 0, i);
+in.close();
+baos.close();
+classBytes = baos.toByteArray();
+} catch(Exception ex) {
+ ex.printStackTrace();
+return null;
+}
+return classBytes;
}
}
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, email: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/servlet JspServlet.java
glenn 01/02/08 05:38:38
Modified:jasper/src/share/org/apache/jasper/servlet JspServlet.java
Log:
Put runtime jsp page servlets in a package
Revision ChangesPath
1.12 +8 -4
jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/servlet/JspServlet.java
Index: JspServlet.java
===
RCS file:
/home/cvs/jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/servlet/JspServlet.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- JspServlet.java 2001/02/07 01:38:27 1.11
+++ JspServlet.java 2001/02/08 13:38:38 1.12
@@ -240,6 +240,7 @@
protected ServletEngine engine;
protected String serverInfo;
private PermissionCollection permissionCollection = null;
+private CodeSource codeSource = null;
static boolean firstTime = true;
@@ -288,8 +289,8 @@
try {
// Get the permissions for the web app context
URL url = options.getScratchDir().toURL();
- CodeSource cs = new CodeSource(url,null);
- permissionCollection = policy.getPermissions(cs);
+ codeSource = new CodeSource(url,null);
+ permissionCollection = policy.getPermissions(codeSource);
// Create a file read permission for web app context directory
String contextDir = url.getFile();
if( contextDir.endsWith(File.separator) )
@@ -520,8 +521,11 @@
File outputDir = new File(normalize(ctxt.getOutputDir()));
urls[0] = outputDir.toURL();
jsw.loader = new JasperLoader(urls,ctxt.getServletClassName(),
- parentClassLoader,permissionCollection);
- jsw.servletClass = jsw.loader.loadClass(ctxt.getServletClassName());
+ parentClassLoader,
+ permissionCollection,
+ codeSource);
+ jsw.servletClass = jsw.loader.loadClass(
+ Constants.JSP_PACKAGE_NAME + "." + ctxt.getServletClassName());
} catch (ClassNotFoundException cex) {
throw new JasperException(
Constants.getString("jsp.error.unable.load"),cex);
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, email: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat/src/share/org/apache/tomcat/core Constants.java
hgomez 01/02/08 05:39:50
Modified:src/share/org/apache/tomcat/core Tag: tomcat_32
Constants.java
Log:
Fixes release number
Revision ChangesPath
No revision
No revision
1.22.2.9 +1 -1
jakarta-tomcat/src/share/org/apache/tomcat/core/Attic/Constants.java
Index: Constants.java
===
RCS file:
/home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/core/Attic/Constants.java,v
retrieving revision 1.22.2.8
retrieving revision 1.22.2.9
diff -u -r1.22.2.8 -r1.22.2.9
--- Constants.java2000/12/12 04:51:38 1.22.2.8
+++ Constants.java2001/02/08 13:39:49 1.22.2.9
@@ -67,7 +67,7 @@
public class Constants {
public static final String TOMCAT_NAME = "Tomcat Web Server";
-public static final String TOMCAT_VERSION = "3.2.1";
+public static final String TOMCAT_VERSION = "3.2.2";
public static final String JSP_NAME = "JSP";
public static final String JSP_VERSION = "1.1";
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, email: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat/src/webpages index.html
hgomez 01/02/08 05:41:42 Modified:src/webpages Tag: tomcat_32 index.html Log: Fixe release number Revision ChangesPath No revision No revision 1.13.2.9 +1 -1 jakarta-tomcat/src/webpages/index.html Index: index.html === RCS file: /home/cvs/jakarta-tomcat/src/webpages/index.html,v retrieving revision 1.13.2.8 retrieving revision 1.13.2.9 diff -u -r1.13.2.8 -r1.13.2.9 --- index.html2000/12/12 04:51:38 1.13.2.8 +++ index.html2001/02/08 13:41:42 1.13.2.9 @@ -4,7 +4,7 @@ -Tomcat v3.2.1 +Tomcat v3.2.2 Tomcat - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, email: [EMAIL PROTECTED]
RE: [PROPOSAL] Tomcat 3.2.2 Release Plan
+1 Saludos , Ignacio J. Ortega > -Mensaje original- > De: Marc Saegesser [mailto:[EMAIL PROTECTED]] > Enviado el: jueves 8 de febrero de 2001 0:35 > Para: [EMAIL PROTECTED] > Asunto: [PROPOSAL] Tomcat 3.2.2 Release Plan > > > We have collected quite a few good bug fixes on the tomcat_32 > branch since > the release of Tomcat 3.2.1. I propose that we make a public > release of the > tomcat_32 branch as Tomcat 3.2.2. A proposed release plan > can be found at > > http://jakarta.apache.org/cvsweb/index.cgi/~checkout~/jakarta- > tomcat/Attic/R > ELEASE-PLAN-3.2.2?rev=1.1.2.1 > > I am volunteering to be the release manager for Tomcat 3.2.2, > unless someone > else really wants to do it. > > The goal for this release is not to fix every known problem > in Tomcat 3.2.1 > but to make the current set of fixes publicly available. It > would be great > if everything could get fixed but in the interest of timely > bug fixes for > users with production systems I think we need to get what we > have out there. > Once 3.2.2 is finalized, development can continue to fix > additional bugs and > subsequent 3.2.x release can be made as needed. > > Please review and comment on the proposed release plan. I > will call release > plan vote in the near future. > > I will be able to build and test the native code for the > ISAPI redirector > but I will need others to build/test the other native > components and supply > them to me for inclusion into the release. I will be able to test on > WinNT/200 and probably Win9x platforms but I would appreciate > test reports > from other developers about the status of the other supported > platforms. > > > - > To unsubscribe, e-mail: [EMAIL PROTECTED] > For additional commands, email: [EMAIL PROTECTED] > > - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, email: [EMAIL PROTECTED]
Help: How many sessions I have.
Hello, I have a question: - If I have a page containing a applet and some other HTML content, and the applet uses a URLConnection to connect to the web server. In this case, how many connections/sessions I have? 2 connections? one from the page itself and one from the applet? Could any guru please help? Thanks in advance. Jianming Wang - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, email: [EMAIL PROTECTED]
RE: [PROPOSAL] Tomcat 3.2.2 Release Plan
Yes, but for some reason (probably a repressed memory from some former life) I've always hated the phrase "no regressions". :-) > -Original Message- > From: James Duncan Davidson [mailto:[EMAIL PROTECTED]] > Sent: Wednesday, February 07, 2001 9:41 PM > To: [EMAIL PROTECTED] > Subject: Re: [PROPOSAL] Tomcat 3.2.2 Release Plan > > > on 2/7/01 5:12 PM, Marc Saegesser at [EMAIL PROTECTED] wrote: > > > Any bug introduced by a code change since Tomcat 3.2.1 was released MUST > > be fixed. If it worked in 3.2.1 it will work in 3.2.2. > > "no regressions" I think is the term that you are looking for. > > -- > James Duncan Davidson > http://x180.net/ !try; do(); > > > - > To unsubscribe, e-mail: [EMAIL PROTECTED] > For additional commands, email: [EMAIL PROTECTED] - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, email: [EMAIL PROTECTED]
RE: cvs commit: jakarta-tomcat/src/share/org/apache/tomcat/core Constants.java
I think this is premature. There is no 3.2.2 release until the vote on the
release plan has passed on tomcat-dev. There needs to be a little more time
provided for discussion of the plan prior to calling the vote.
> -Original Message-
> From: [EMAIL PROTECTED] [mailto:[EMAIL PROTECTED]]
> Sent: Thursday, February 08, 2001 7:40 AM
> To: [EMAIL PROTECTED]
> Subject: cvs commit: jakarta-tomcat/src/share/org/apache/tomcat/core
> Constants.java
>
>
> hgomez 01/02/08 05:39:50
>
> Modified:src/share/org/apache/tomcat/core Tag: tomcat_32
> Constants.java
> Log:
> Fixes release number
>
> Revision ChangesPath
> No revision
>
>
> No revision
>
>
> 1.22.2.9 +1 -1
> jakarta-tomcat/src/share/org/apache/tomcat/core/Attic/Constants.java
>
> Index: Constants.java
> ===
> RCS file:
> /home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/core/Attic/Co
> nstants.java,v
> retrieving revision 1.22.2.8
> retrieving revision 1.22.2.9
> diff -u -r1.22.2.8 -r1.22.2.9
> --- Constants.java 2000/12/12 04:51:38 1.22.2.8
> +++ Constants.java 2001/02/08 13:39:49 1.22.2.9
> @@ -67,7 +67,7 @@
>
>public class Constants {
>public static final String TOMCAT_NAME = "Tomcat Web Server";
> -public static final String TOMCAT_VERSION = "3.2.1";
> +public static final String TOMCAT_VERSION = "3.2.2";
>
>public static final String JSP_NAME = "JSP";
>public static final String JSP_VERSION = "1.1";
>
>
>
>
> -
> To unsubscribe, e-mail: [EMAIL PROTECTED]
> For additional commands, email: [EMAIL PROTECTED]
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, email: [EMAIL PROTECTED]
[PATCH] for mod_jk.c in tomcat_32 branch
Here is a patch for mod_jk.c to free up all allocated memory during shutdown. NetWare
complains about unreleased resources so I found what was being allocated and added an
exit_handler to free it up.
Mike Anderson
Senior Software Engineer
Platform Services Group
[EMAIL PROTECTED]
Novell, Inc., the leading provider of Net services software
www.novell.com
Index: mod_jk.c
===
RCS file: /home/cvspublic/jakarta-tomcat/src/native/apache1.3/Attic/mod_jk.c,v
retrieving revision 1.7.2.2
diff -u -r1.7.2.2 mod_jk.c
--- mod_jk.c2000/10/05 06:32:21 1.7.2.2
+++ mod_jk.c2001/02/08 16:34:25
@@ -862,6 +862,7 @@
#endif
if(wc_open(init_map, conf->log)) {
+map_free(&init_map); // we don't need this any more so free it
return;
}
}
@@ -895,6 +896,18 @@
return DECLINED;
}
+static void exit_handler (server_rec *s, ap_pool *p)
+{
+ jk_server_conf_t *conf =
+ (jk_server_conf_t *)ap_get_module_config(s->module_config, &jk_module);
+
+ wc_close(conf->log);
+ uri_worker_map_free(&(conf->uw_map), conf->log);
+ map_free(&(conf->uri_to_context));
+ if (conf->log)
+ jk_close_file_logger(&(conf->log));
+}
+
static const handler_rec jk_handlers[] =
{
{ JK_MAGIC_TYPE, jk_handler },
@@ -920,7 +933,7 @@
NULL, /* [10] logger */
NULL, /* [3] header parser */
NULL, /* apache child process initializer */
-NULL, /* apache child process exit/cleanup */
+exit_handler, /* apache child process exit/cleanup */
NULL/* [1] post read_request handling */
#ifdef EAPI
/*
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, email: [EMAIL PROTECTED]
Login Form & Authentication
Hi! I'm working in a project using servlets (with Tomcat 3.2) and I have a question regarding the security mechanisms described in servlet 2.2 spec and how to integrate them with other aspects of the application than login (for example, registration). More specifically, the application offers a registration form in the home page (nothing new here) and a registration form in the same page as the login form, which should be showed when a resource declaratively marked as secure is being accessed (nothing new here). So, for my surprise, I see no way to solve the next 2 problems inside the 2.2 spec (I'm using FORM authentication): 1) in the registration form in the home page there is no concept of a secured page to go once registered, but the user should still be logged, so if I call j_security_check it's not defined what would happen (and the solution is really dirty); 2) in the registration form in the login page, if the user choose the registration way, the form can't be directly submited to j_security_check because his/her information should be saved before being completely lost. I wanted to be standard, 2.2 standard! But instead I ended reading Tomcat request interceptors sources. Still I'm looking for a clean solution. I obviously should set the session j_username and j_password directly and this doesn't seem very portable. If I do that and then move my servlets to other container than Tomcat nasty things could happen. I think I would need to get the sources again (if available) or to program all the security stuff by myself (idea!: using j_username and j_password in the session to reuse my 6 lines of code). I can't believe than servlet spec doesn't provide an API to authenticate the user. I'm urged to know: 1) Is there a better solution? 2) If not, will the solution I proposed work? Thank you Carlos
Re: [PROPOSAL] Tomcat 3.2.2 Release Plan
Marc Saegesser wrote: > We have collected quite a few good bug fixes on the tomcat_32 branch since > the release of Tomcat 3.2.1. I propose that we make a public release of the > tomcat_32 branch as Tomcat 3.2.2. A proposed release plan can be found at > > http://jakarta.apache.org/cvsweb/index.cgi/~checkout~/jakarta-tomcat/Attic/R > ELEASE-PLAN-3.2.2?rev=1.1.2.1 > > I am volunteering to be the release manager for Tomcat 3.2.2, unless someone > else really wants to do it. > +1 on the release plan as revised. I can help to the extent that I will assist Marc in the mechanics of release manager duties, and will do some evaluation testing on the candidate release code. If that is not considered sufficient, then treat my vote as a +0 instead. Craig McClanahan - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, email: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat/src/doc readme
larryi 01/02/08 13:38:37 Modified:src/doc readme Log: Port 3.2 readme with some updates for Tomcat 3.3m1. The new features needs to be filled out. Bugs and issues needs to be reviewed. Revision ChangesPath 1.9 +165 -54 jakarta-tomcat/src/doc/readme Index: readme === RCS file: /home/cvs/jakarta-tomcat/src/doc/readme,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- readme2000/04/18 01:42:52 1.8 +++ readme2001/02/08 21:38:31 1.9 @@ -1,9 +1,9 @@ -$Id: readme,v 1.8 2000/04/18 01:42:52 craigmcc Exp $ +$Id: readme,v 1.9 2001/02/08 21:38:31 larryi Exp $ Release Notes for: - == - TOMCAT Version 3.1 - == + + TOMCAT Version 3.3m1 + 0. TABLE OF CONTENTS: @@ -11,8 +11,9 @@ 1. Introduction 2. Installing and Running Tomcat 3. Application Development Using Tomcat -4. New Features In This Release -5. Known Bugs and Issues +4. Tomcat: Past, Present, and Future +5. New Features In This Release +6. Known Bugs and Issues = @@ -38,7 +39,7 @@ Kit 1.1 or later environment, including JDKs conformant with Java2. For detailed information about installing and running Tomcat, point your -browser at file "doc/uguide/tomcat_ug.html" under the directory into which +browser at file "doc/tomcat_ug.html" under the directory into which you unpacked the Tomcat distribution. @@ -52,41 +53,47 @@ = -4. NEW FEATURES IN THIS RELEASE +4. TOMCAT: PAST, PRESENT, AND FUTURE -Many new features have been added to Tomcat since the 3.0 release. Among the -most important are: - -- Connectors for using Tomcat to run servlets with Microsoft's IIS - and Netscape's NES web server, as well as Apache and stand-alone. - -- Automatic generation of configuration files for Apache integration. +- Version 3.0 (released 12/1999) was the initial release of Tomcat. In +addition to implementing the Java Servlet and Server Pages specification, +this release featured a minimal Apache connector. + +- Tomcat 3.1 (released 4/2000) improved the Apache connection and added +connector support for Netscape and IIS web servers. It also added WAR file +support, automatic servlet reloading, and a command line tool (jspc) to +compile ahead of time the JSP pages that comprise your application. Finally, +version 3.1 also focused on reorganizing the code (modularization, cleanup, +refactoring, removal of dead code, and separation of J2EE-specific code). + +- Tomcat 3.2 is the first performance tune-up, and also added a few new +features. + +- Tomcat 3.3 is the completion of the modularization, cleanup, and +refactoring that started in Tomcat 3.1. This work carries a number of +new features (see next section). + +- Tomcat 4.x is separate development from Tomcat 3.x. It is based on the +Catalina architecture, which is very different from the architecture of +Tomcat 3.x. In addition, Tomcat 4.x is to be the reference implementation +for the Servlet 2.3 and JSP 1.2 specifications. -- Automatic deployment of applications delivered as Web ARchive (WAR) - files. To deploy an application, copy the WAR file to the - $TOMCAT_HOME/webapps directory and restart Tomcat, after which the - WAR file will be automatically expanded. To remove an application, - remove the expanded directory (and the WAR file) for that application. -- Automatic servlet reloading when servlet classes are changed in - WEB-INF/classes or WEB-INF/lib/*.jar. This support can be configured - on a per-web-application basis. - -- Enhanced support for logging on a per-Tomcat-component basis. - -- Minimal administration tool, allowing new web applications to be deployed - into a running Tomcat environment, as well as removing existing applications. += +5. NEW FEATURES IN THIS RELEASE -- Command line tool (jspc) to compile the JSP pages that comprise your - application ahead of time. +Many new features have been added to Tomcat since the 3.2.x release. Among the +most important are: -- Substantially improved installation and development documentation. +- The code has undergone a refactoring effort resulting in (we hope) improved + readability, ease of use, and performance. +- (more
cvs commit: jakarta-tomcat/src/doc faq
larryi 01/02/08 13:40:05 Modified:src/doc faq Log: Port 3.2 faq. Update the jar file info for Tomcat 3.3m1. Revision ChangesPath 1.2 +46 -17jakarta-tomcat/src/doc/faq Index: faq === RCS file: /home/cvs/jakarta-tomcat/src/doc/faq,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- faq 2000/02/08 21:08:34 1.1 +++ faq 2001/02/08 21:40:01 1.2 @@ -72,11 +72,17 @@ Q: Where are the classes for JSPs and Servlets? -A: webserver.jar -- class files for Servlet Engine. - lib/jspengine.jar -- class files for JSP Engine. - lib/servlet.jar -- Public APIs for Servlet. - lib/jsp.jar -- Public APIs for JSP. - lib/xml.jar -- classes for parsing XML document. +A: lib/facade22.jar-- Servlet Engine classes. + lib/jaxp.jar -- Public APIs for XML parser interface + lib/parser.jar -- Public XML parser reference implementation + lib/tomcat_core.jar-- Tomcat web server core classes + lib/tomcat_modules.jar -- Tomcat module classes + lib/tomcat-startup.jar -- Tomcat start/stop classes + lib/common/servlet.jar -- Public APIs for Servlet. + lib/shared/jasper.jar -- JSP Engine classes + lib/shared/tomcat_util.jar -- Utility classes. + lib/tomcat.jar -- Executable jar for starting Tomcat + lib/stop-tomcat.jar-- Executable jar for stopping Tomcat Q: Can I combine these classes with other webservers? @@ -115,13 +121,21 @@ To add "baseball" application you can make the following additions to the file (at the appropriate place): - + + Replace with an absolute path to the "baseball" directory, + or a relative path that is relative to the Tomcat home directory. + Please read "server.xml" for more details. + In addition, thanks to the AutoSetup interceptor, you may create or + copy the "baseball" directory to the "webapps" directory found under + the Tomcat home directory. When placed there, it will be served + automcatically with the default settings. A entry + in the server.xml is not required unless you want to override the + default settings. + a) To install servlets within a web-application, you can do the following: * Once a servlet has been compiled, it can be added to Tomcat by: @@ -191,31 +205,46 @@ Q: What do different init parameters for the JSP engine mean? * keepgenerated: -Whether to keep the generated java file or no. Can take a -value of true/false. If value is true then the generated files -are kept else they are deleted. +Whether to keep the generated java file or not. Can take a +value of true/false. If value is true, then the generated files +are kept, otherwise they are deleted. The default is true. * scratchdir: The work dir which will be created for storing all the generated code. This can be set to any dir. That directory will be created under the docbase. - * largeFile: + * largefile: Can take a value of true/false. If the file is really large then all the static html is stored is a separate data file if the value - of this param is set to true. + of this param is set to true. If true, this setting overrides +the mappedfile param. The default is false. + + * mappedfile: + Can take a value of true/false. If you prefer each line of static +html be output separately, set this parameter true. If largefile +is set true, this param is ignored. If neither largefile or +mappedfile is true, the static html is output in blocks up to 32K +in length. The default is false. * sendErrToClient: Can take a value of true/false. If set to true then all the compilation/parsing errors will be sent as part of the response - to the client. + to the client. The default is false. * ieClassId: This is used with the plugin. This is a particular id that is set to activate the plugin. The default value for IE 4 and 5 are - set as of now. This is for future use incase the classId for IE + set as of now. This is for future use in case the classId for IE changes in the future. + * classdebuginfo: + Whether to include debugging information in the class file. Can take +a value of true/false. If the value is true, then class debugging +information is included in the servlet class file when it is +compiled. The default is false. + + To set any of these to a value other than the default you need to explicitely defin
RE: [PROPOSAL] Tomcat 3.2.2 Release Plan
>Yes, but for some reason (probably a repressed memory from >some former life) >I've always hated the phrase "no regressions". :-) Did you want latest ajp12/ajp13 fixes from TC 3.3 to be included also in TC 3.2.2 ? - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, email: [EMAIL PROTECTED]
RE: [PROPOSAL] Tomcat 3.2.2 Release Plan
Henri, Can you add a >8k form posts to your test suite, as I've not been able to do that with Ajp13 with any combination of patches (up to and including your .RPM's). I hope that this will work soon, as we need to go SSL soon, and we have several parts of the site that post more then 8k of form data (ie: file uploads). I haven't tested if it's just file upload that's broken or all form upload (>8k with Ajp13). I will try to come up with another test case soon. Kenneth Topp On Thu, 8 Feb 2001, GOMEZ Henri wrote: > >I will be able to build and test the native code for the ISAPI > >redirector but I will need others to build/test the other native > >components and supply them to me for inclusion into the release. > > >I will be able to test on WinNT/200 and probably Win9x platforms > >but I would appreciate test reports from other developers about > >the status of the other supported platforms. > > I'll provide RPM for Redhat Linux i386 and will test it on my dev > servers. > > Regards > > - > To unsubscribe, e-mail: [EMAIL PROTECTED] > For additional commands, email: [EMAIL PROTECTED] > - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, email: [EMAIL PROTECTED]
RE: cvs commit: jakarta-tomcat/src/share/org/apache/tomcat/core Constants.java
No, this is absolutely necessary so bugs in dev builds don't get reported
as 3.2.1 bugs. "3.2.2-dev" would also be acceptable, but the version
should not remain at 3.2.1.
Keith
-Original Message-
From: Marc Saegesser [mailto:[EMAIL PROTECTED]]
Sent: Thursday, February 08, 2001 11:04 AM
To: [EMAIL PROTECTED]
Subject: RE: cvs commit: jakarta-tomcat/src/share/org/apache/tomcat/core
Constants.java
I think this is premature. There is no 3.2.2 release until the vote on the
release plan has passed on tomcat-dev. There needs to be a little more time
provided for discussion of the plan prior to calling the vote.
> -Original Message-
> From: [EMAIL PROTECTED] [mailto:[EMAIL PROTECTED]]
> Sent: Thursday, February 08, 2001 7:40 AM
> To: [EMAIL PROTECTED]
> Subject: cvs commit: jakarta-tomcat/src/share/org/apache/tomcat/core
> Constants.java
>
>
> hgomez 01/02/08 05:39:50
>
> Modified:src/share/org/apache/tomcat/core Tag: tomcat_32
> Constants.java
> Log:
> Fixes release number
>
> Revision ChangesPath
> No revision
>
>
> No revision
>
>
> 1.22.2.9 +1 -1
> jakarta-tomcat/src/share/org/apache/tomcat/core/Attic/Constants.java
>
> Index: Constants.java
> ===
> RCS file:
> /home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/core/Attic/Co
> nstants.java,v
> retrieving revision 1.22.2.8
> retrieving revision 1.22.2.9
> diff -u -r1.22.2.8 -r1.22.2.9
> --- Constants.java 2000/12/12 04:51:38 1.22.2.8
> +++ Constants.java 2001/02/08 13:39:49 1.22.2.9
> @@ -67,7 +67,7 @@
>
>public class Constants {
>public static final String TOMCAT_NAME = "Tomcat Web Server";
> -public static final String TOMCAT_VERSION = "3.2.1";
> +public static final String TOMCAT_VERSION = "3.2.2";
>
>public static final String JSP_NAME = "JSP";
>public static final String JSP_VERSION = "1.1";
>
>
>
>
> -
> To unsubscribe, e-mail: [EMAIL PROTECTED]
> For additional commands, email: [EMAIL PROTECTED]
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, email: [EMAIL PROTECTED]
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, email: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/compiler Parser.java
horwat 01/02/08 16:19:21
Modified:jasper/src/share/org/apache/jasper/compiler Parser.java
Log:
It is up to the tag implementation to process the body of the tag dependent tag.
Submitted by: Jeff Bonevich & Danno Ferrin
Bugzilla #546
Revision ChangesPath
1.7 +7 -1
jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/compiler/Parser.java
Index: Parser.java
===
RCS file:
/home/cvs/jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/compiler/Parser.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- Parser.java 2000/11/06 21:04:56 1.6
+++ Parser.java 2001/02/09 00:19:19 1.7
@@ -858,7 +858,13 @@
String tagEnd = "";
// Parse until the end of the tag body.
// Then skip the tag end...
-parser.parse(tagEnd);
+ if
(bc.equalsIgnoreCase(TagInfo.BODY_CONTENT_TAG_DEPENDENT))
+ // accept no core elements for tag dependent,
+ // ie. literal inclusion of the content
+ parser.parse(tagEnd, new Class[] {});
+ else
+ // it is JSP body content, so accept all core elements
+parser.parse(tagEnd);
try {
reader.advance(tagEnd.length());
} catch (ParseException ex) {
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, email: [EMAIL PROTECTED]
RE: [PROPOSAL] Tomcat 3.2.2 Release Plan
I regularly use ajpv13 to upload files > 2mb, using cvs head of jakarta-tomcat. Keith -Original Message- From: kenneth topp [mailto:[EMAIL PROTECTED]] Sent: Thursday, February 08, 2001 6:43 PM To: [EMAIL PROTECTED] Subject: RE: [PROPOSAL] Tomcat 3.2.2 Release Plan Henri, Can you add a >8k form posts to your test suite, as I've not been able to do that with Ajp13 with any combination of patches (up to and including your .RPM's). I hope that this will work soon, as we need to go SSL soon, and we have several parts of the site that post more then 8k of form data (ie: file uploads). I haven't tested if it's just file upload that's broken or all form upload (>8k with Ajp13). I will try to come up with another test case soon. Kenneth Topp - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, email: [EMAIL PROTECTED]
Ajp13/mod_jk - returning mod_ssl's SSL_CIPHER_USEKEYSIZE environment variable
A quick look over the source code for mod_jk and the 1.3 connector seem to show that adding the mod_ssl environment variable SSL_CIPHER_USEKEYSIZE would not be too hard, perhaps based on cloning the code that implements SSL_CIPHER handling. Can the SSL_CIPHER_USEKEYSIZE environment param be added so that servlets can determine the key lengths used (low, medium or high encryption)? It makes a lot of sense to be able to see this value in connection to SSL_CIPHER since 40-bit encryption is weak no matter what SSL cipher is being used. We'd like to be able to alert people to this and inform them that they can upgrade their browser to have better SSL protection. In fact, one of our customers even wants to reject people who use few than 128bits, and while this can be done "harshly" via mod_ssl, we'd prefer to redirect users to a page explaining things more clearly. Thanks, David
RE: [PROPOSAL] Tomcat 3.2.2 Release Plan
Keith, Is head 3.2.x or 3.3x? Thanks, Kenneth On Thu, 8 Feb 2001, Keith Wannamaker wrote: > I regularly use ajpv13 to upload files > 2mb, using cvs head > of jakarta-tomcat. > > Keith > > -Original Message- > From: kenneth topp [mailto:[EMAIL PROTECTED]] > Sent: Thursday, February 08, 2001 6:43 PM > To: [EMAIL PROTECTED] > Subject: RE: [PROPOSAL] Tomcat 3.2.2 Release Plan > > > > Henri, > > Can you add a >8k form posts to your test suite, as I've not been able to > do that with Ajp13 with any combination of patches (up to and including > your .RPM's). I hope that this will work soon, as we need to go SSL soon, > and we have several parts of the site that post more then 8k of form data > (ie: file uploads). > > I haven't tested if it's just file upload that's broken or all form upload > (>8k with Ajp13). I will try to come up with another test case soon. > > Kenneth Topp > > > > - > To unsubscribe, e-mail: [EMAIL PROTECTED] > For additional commands, email: [EMAIL PROTECTED] > - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, email: [EMAIL PROTECTED]
RE: [PROPOSAL] Tomcat 3.2.2 Release Plan
Cvs head jakarta-tomcat is 3.3. There is a branch for 3.2. Keith -Original Message- From: kenneth topp [mailto:[EMAIL PROTECTED]] Sent: Thursday, February 08, 2001 8:26 PM To: [EMAIL PROTECTED] Subject: RE: [PROPOSAL] Tomcat 3.2.2 Release Plan Keith, Is head 3.2.x or 3.3x? Thanks, Kenneth - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, email: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat/src/doc NT-Service-howto.html
larryi 01/02/08 18:24:30 Modified:src/doc NT-Service-howto.html Log: Port 3.2 changes. Other miscellaneous updates. Revision ChangesPath 1.3 +25 -16jakarta-tomcat/src/doc/NT-Service-howto.html Index: NT-Service-howto.html === RCS file: /home/cvs/jakarta-tomcat/src/doc/NT-Service-howto.html,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- NT-Service-howto.html 2000/05/03 13:38:18 1.2 +++ NT-Service-howto.html 2001/02/09 02:24:29 1.3 @@ -1,14 +1,10 @@ - - + + + + Working with the Jakarta NT Service @@ -29,18 +25,17 @@ hold on the NT executable (jk_nt_service.exe) Download - the executable from http://jakarta.apache.org/cvsweb/index.cgi/~checkout~/jakarta-tomcat/bin/nt_service/jk_nt_service.exe?rev=1.1">http://jakarta.apache.org/cvsweb/index.cgi/~checkout~/jakarta-tomcat/bin/nt_service/jk_nt_service.exe?rev=1.1 - and save it under the name jk_nt_service.exe. + the executable from the win32/i386 directory found where you downloaded the + http://jakarta.apache.org/downloads/binindex.html"> Tomcat binary + distribution. For those using Netscape as your browser, try downloading + a zip version of the file, if available. There can be problems using Netscape + to download DLL files. Customize a properties file that provides the service with Tomcat information (wrapper.properties). - Download - a template from http://jakarta.apache.org/cvsweb/index.cgi/~checkout~/jakarta-tomcat/src/etc/wrapper.properties?rev=1.1">http://jakarta.apache.org/cvsweb/index.cgi/~checkout~/jakarta-tomcat/src/etc/wrapper.properties?rev=1.1 - and save it under the name wrapper.properties. + Locate the wrapper.properties template file in your Tomcat conf/jk directory. Update the wrapper.tomcat_home property to point at your tomcat home. Update @@ -70,6 +65,9 @@ From the NT services applet, highlight your service and press start. + Note: If the log file location in your wrapper.properties file points to + the logs directory, and the logs directory doesn't yet exist, + manually create it before starting the service. Stop Tomcat as a service. @@ -86,6 +84,17 @@ defined in your server.xml. In the absence of a configured AJPV12 port the Tomcat service will kill Tomcat abruptly (that is murder it) without giving it a chance to clean up. + +Notice for JDK 1.3 users: There is a +http://developer.java.sun.com/developer/bugParade/bugs/4323062.html">known problem +in JDK 1.3 that affects Java applications being run as Windows NT services. The bug causes the +service to terminate when the currently logged in user logs out. The simplest way to work +around this problem is to use JDK 1.2. If your application requires JDK 1.3 features then you +may want to look into http://www.kcmultimedia.com/javaserv/">javaserv or +http://www.alexandriasc.com/software/JavaService/">JavaService. Users have reported +success with both of these packages but there may be others that work as well. + +To remove the installed service, execute jk_nt_service -RAdvance Setup - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, email: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat/src/doc tomcat-iis-howto.html
larryi 01/02/08 18:28:03 Modified:src/doc tomcat-iis-howto.html Log: Port 3.2 changes. Add other miscellaneous changes. Need to address what the example directory should be for Tomcat 3.3. This document assumes it will be c:\jakarta-tomcat. Revision ChangesPath 1.2 +210 -33 jakarta-tomcat/src/doc/tomcat-iis-howto.html Index: tomcat-iis-howto.html === RCS file: /home/cvs/jakarta-tomcat/src/doc/tomcat-iis-howto.html,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- tomcat-iis-howto.html 2000/05/03 12:48:19 1.1 +++ tomcat-iis-howto.html 2001/02/09 02:28:03 1.2 @@ -1,7 +1,10 @@ - -Tomcat IIS HowTo + + + + + Tomcat IIS HowTo @@ -26,7 +29,7 @@\bin - Where you place web server plugins -In all the examples in this document will be d:\tomcat. +In all the examples in this document will be c:\jakarta-tomcat. A worker is defined to be a tomcat process that accepts work from the IIS server. @@ -37,21 +40,27 @@ WinNT4.0-i386 SP4/SP5/SP6a (it should be able to work on other - versions of the NT service pack.) + versions of the NT service pack.) and Win98 IIS4.0 and PWS4.0 - Tomcat3.0 - Tomcat3.1beta + Tomcat3.0 - Tomcat3.3 The redirector uses ajp12 to send requests to the Tomcat containers. There is also an option to use Tomcat in process, more about the -in-process mode can be found in the in process howto. +in-process mode can be found in the in process +howto. Installation + +As of Tomcat 3.2, a pre-built version of the ISAPI redirector server plugin, +isapi_redirect.dll, is available under the win32/i386 directory where you +downloaded the http://jakarta.apache.org/site/binindex.html"> +Tomcat binary distribution. For those using Netscape as your browser, try +downloading a zip version of the file, if available. There can be problems using +Netscape to download DLL files. -The IIS redirector is not part of the "official" build of Jakarta, You -can obtain the code and binaries needed for it by accessing -http://jakarta.apache.org/builds/tomcat/release/v3.1_beta_1/bin/win32/i386/. -The redirector related file is isapi_redirect.dll. +You can also build a copy locally from the source in Tomcat's source +distribution. The Tomcat redirector requires three entities: @@ -60,10 +69,10 @@ DLL or build it yourself (see the build section). workers.properties - A file that describes the host(s) and port(s) used by the workers (Tomcat processes). A sample workers.properties can - be found under tomcat/conf. + be found under the conf directory. uriworkermap.properties - A file that maps URL-Path patterns to - workers. A sample uriworkermap.properties can be found in the CVS - under tomcat/conf. + workers. A sample uriworkermap.properties can be found under the + conf directory as well. The installation includes the following parts: @@ -77,8 +86,8 @@ Configuring the ISAPI Redirector In this document I will assume that isapi_redirect.dll is placed in -d:\tomcat\bin\iis\i386\isapi_redirect.dll and that you created the properties -files are in d:\tomcat\conf. +c:\jakarta-tomcat\bin\win32\i386\isapi_redirect.dll and that you created the properties +files are in c:\jakarta-tomcat\conf. In the registry, create a new registry key named @@ -87,31 +96,30 @@ Add a string value with the name extension_uri and a value of /jakarta/isapi_redirect.dll Add a string value with the name log_file and a value pointing -to where you want your log file to be (for example - d:\tomcat\isapi.log) +to where you want your log file to be (for example c:\jakarta-tomcat\logs\isapi.log). Add a string value with the name log_level and a value for -your log level (can be debug, inform, error - or emerg). - Add a string value with the name worker_file and a value of -D:\tomcat\conf\workers.properties (you can copy this file - from the CVS) - Add a string value with the name worker_mount_fileand a value of -D:\tomcat\conf\uriworkermap.properties (you can copy this file - from the CVS) +your log level (can be debug, info, error + or emerg). + Add a string value with the name worker_file and a value which +is the full path to your workers.properties file (for example +c:\jakarta-tomcat\conf\workers.properties) + Add a string value with the name worker_mount_file and a value +which is the full path to your uriworkermap.properties file (for example +c:\jakarta-tomcat\conf\uriworkermap.properties) Using the IIS management console, add a new virtual directory to your
cvs commit: jakarta-tomcat/src/doc tomcat-ug.html
larryi 01/02/08 19:11:28 Modified:src/doc tomcat-ug.html Log: Some minor updates. Fixed jakarta.apache.org URLs. Revision ChangesPath 1.6 +16 -21jakarta-tomcat/src/doc/tomcat-ug.html Index: tomcat-ug.html === RCS file: /home/cvs/jakarta-tomcat/src/doc/tomcat-ug.html,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- tomcat-ug.html2001/02/05 23:36:49 1.5 +++ tomcat-ug.html2001/02/09 03:11:28 1.6 @@ -1,8 +1,8 @@ - - + + Tomcat User's Guide @@ -30,14 +30,9 @@ This document is an introduction to the Tomcat servlet container. It should be enough for anyone to install, configure, and deploy Tomcat. As well, it answers many - questions common to new users. We encourage all users to - add answers to questions into the http://jakarta.apache.org/faq/faqindex.html"> - Tomcat FAQ and/or this document, if they don't - already exist. If you have any comments or suggestions + questions common to new users. If you have any comments or suggestions about this document don't hesitate to send them to the - Tomcat http://jakarta.apache.org/getinvolved/mail.html">mailing + Tomcat http://jakarta.apache.org/site/mail.html">mailing lists. This document began life as Tomcat: A Minimalistic User's @@ -46,7 +41,7 @@ Tomcat source tree is constantly changing, the information herein may be out of date. The only definitive reference at this point is the http://jakarta.apache.org/downloads/sourceindex.html">source + href="http://jakarta.apache.org/site/sourceindex.html">source code. "???" means I'm not sure if this should go in, or @@ -56,8 +51,7 @@ Other important documents: - http://jakarta.apache.org/faq/faqindex.html">Tomcat - FAQ + http://jakarta.apache.org/site/faqs.html">Jakarta FAQ Page Application Development manual - an alternative to the User's Guide, somewhat out-of-date @@ -146,7 +140,7 @@ About Tomcat: Q&A See also the official http://jakarta.apache.org/faq/faqindex.html">Tomcat FAQ. + href="http://jakarta.apache.org/site/faqs.html">Jakarta FAQ Page. What is Tomcat? @@ -162,7 +156,7 @@ Where can I download Tomcat? At the http://jakarta.apache.org/downloads/binindex.html">Jakarta + href="http://jakarta.apache.org/site/binindex.html">Jakarta download page! Isn't Tomcat just @@ -233,7 +227,7 @@ How do/can I contribute? Please do! See the Jakarta project contribution page, right http://jakarta.apache.org/getinvolved/getinvolvedindex.html">here. + href="http://jakarta.apache.org/site/getinvolved.html">here. You'll probably want to mailto:[EMAIL PROTECTED]">subscribe to the tomcat-dev mailing list. @@ -251,8 +245,8 @@ The Common problems section of this document. Have a look through the http://jakarta.apache.org/faq/faqindex.html"> - Tomcat FAQ. Most installation and configuration + href="http://jakarta.apache.org/site/faqs.html"> + Jakarta FAQ Page. Most installation and configuration questions can be found here. Search the Tomcat http://mikal.org/interests/java/tomcat/index.html">user @@ -260,7 +254,7 @@ href="http://www.metronet.com/~wjm/tomcat/">developer list archives. Post a question to the tomcat-user http://jakarta.apache.org/getinvolved/mail.html"> + href="http://jakarta.apache.org/site/mail.html"> mailing list, which you must first mailto:[EMAIL PROTECTED]">subscribe to if you'd like to see any replies! @@ -280,7 +274,7 @@ - http://jakarta.apache.org/downloads/binindex.html">Download the + http://jakarta.apache.org/site/binindex.html">Download the appropriate jakarta-tomcat [.zip | .gz | .Z] file. Unzip the file into some directory (say /usr/local or C:\). This @@ -1348,7 +1342,8 @@ Credits -Tomcat was originally written by Sun Microsystems, and has been improved (we hope) by a http://jakarta.apache.org/credits/whoweare.html">cast of thousands. +Tomcat was originally written by Sun Microsystems, and has been improved +(we hope) by a http://jakarta.apache.org/site/whoweare.html">cast of thousands. This document was created by: @@ -1370,7 +1365,7 @@ -Copyright ©1999,2001 The Apache Software Foundation +Copyright ©1999-2001 The Apache Softw
RE: cvs commit: jakarta-tomcat/src/share/org/apache/tomcat/core Constants.java
The point is that right now there is no such thing as a Tomcat 3.2.2
release, only 3.2.1. There is a proposal on the table to create a new
release but right now it is only a proposal. Until the vote is held and
passes, 3.2.2 doesn't exist.
Until the release plan is accepted and the initial beta drop, 3.2.2b1, is
made, it is appropriate for bugs to be reported against 3.2.1. or NIGHTLY.
> -Original Message-
> From: Keith Wannamaker [mailto:[EMAIL PROTECTED]]
> Sent: Thursday, February 08, 2001 5:53 PM
> To: [EMAIL PROTECTED]
> Subject: RE: cvs commit: jakarta-tomcat/src/share/org/apache/tomcat/core
> Constants.java
>
>
> No, this is absolutely necessary so bugs in dev builds don't get reported
> as 3.2.1 bugs. "3.2.2-dev" would also be acceptable, but the version
> should not remain at 3.2.1.
>
> Keith
>
> -Original Message-
> From: Marc Saegesser [mailto:[EMAIL PROTECTED]]
> Sent: Thursday, February 08, 2001 11:04 AM
> To: [EMAIL PROTECTED]
> Subject: RE: cvs commit: jakarta-tomcat/src/share/org/apache/tomcat/core
> Constants.java
>
>
> I think this is premature. There is no 3.2.2 release until the
> vote on the
> release plan has passed on tomcat-dev. There needs to be a
> little more time
> provided for discussion of the plan prior to calling the vote.
>
> > -Original Message-
> > From: [EMAIL PROTECTED] [mailto:[EMAIL PROTECTED]]
> > Sent: Thursday, February 08, 2001 7:40 AM
> > To: [EMAIL PROTECTED]
> > Subject: cvs commit: jakarta-tomcat/src/share/org/apache/tomcat/core
> > Constants.java
> >
> >
> > hgomez 01/02/08 05:39:50
> >
> > Modified:src/share/org/apache/tomcat/core Tag: tomcat_32
> > Constants.java
> > Log:
> > Fixes release number
> >
> > Revision ChangesPath
> > No revision
> >
> >
> > No revision
> >
> >
> > 1.22.2.9 +1 -1
> > jakarta-tomcat/src/share/org/apache/tomcat/core/Attic/Constants.java
> >
> > Index: Constants.java
> > ===
> > RCS file:
> > /home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/core/Attic/Co
> > nstants.java,v
> > retrieving revision 1.22.2.8
> > retrieving revision 1.22.2.9
> > diff -u -r1.22.2.8 -r1.22.2.9
> > --- Constants.java2000/12/12 04:51:38 1.22.2.8
> > +++ Constants.java2001/02/08 13:39:49 1.22.2.9
> > @@ -67,7 +67,7 @@
> >
> >public class Constants {
> >public static final String TOMCAT_NAME = "Tomcat Web Server";
> > -public static final String TOMCAT_VERSION = "3.2.1";
> > +public static final String TOMCAT_VERSION = "3.2.2";
> >
> >public static final String JSP_NAME = "JSP";
> >public static final String JSP_VERSION = "1.1";
> >
> >
> >
> >
> > -
> > To unsubscribe, e-mail: [EMAIL PROTECTED]
> > For additional commands, email: [EMAIL PROTECTED]
>
>
> -
> To unsubscribe, e-mail: [EMAIL PROTECTED]
> For additional commands, email: [EMAIL PROTECTED]
>
>
> -
> To unsubscribe, e-mail: [EMAIL PROTECTED]
> For additional commands, email: [EMAIL PROTECTED]
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, email: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat/src/doc NT-Service-howto.html
larryi 01/02/08 19:12:31 Modified:src/doc NT-Service-howto.html Log: Missed fixing a URL. Revision ChangesPath 1.4 +2 -2 jakarta-tomcat/src/doc/NT-Service-howto.html Index: NT-Service-howto.html === RCS file: /home/cvs/jakarta-tomcat/src/doc/NT-Service-howto.html,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- NT-Service-howto.html 2001/02/09 02:24:29 1.3 +++ NT-Service-howto.html 2001/02/09 03:12:31 1.4 @@ -1,6 +1,6 @@ - + @@ -26,7 +26,7 @@ Download the executable from the win32/i386 directory found where you downloaded the - http://jakarta.apache.org/downloads/binindex.html"> Tomcat binary + http://jakarta.apache.org/site/binindex.html"> Tomcat binary distribution. For those using Netscape as your browser, try downloading a zip version of the file, if available. There can be problems using Netscape to download DLL files. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, email: [EMAIL PROTECTED]
RE: [PROPOSAL] Tomcat 3.2.2 Release Plan
Craig, The help you've offerred is greatly appreciated, and I'll take it as a +1. I expect I'll have a few questions along the way, but the stuff you sent me earlier about building the distrobutions was already a big help. > -Original Message- > From: Craig R. McClanahan [mailto:[EMAIL PROTECTED]] > Sent: Thursday, February 08, 2001 2:49 PM > To: [EMAIL PROTECTED] > Subject: Re: [PROPOSAL] Tomcat 3.2.2 Release Plan > > > Marc Saegesser wrote: > > > We have collected quite a few good bug fixes on the tomcat_32 > branch since > > the release of Tomcat 3.2.1. I propose that we make a public > release of the > > tomcat_32 branch as Tomcat 3.2.2. A proposed release plan can > be found at > > > > > http://jakarta.apache.org/cvsweb/index.cgi/~checkout~/jakarta-tomc > at/Attic/R > > ELEASE-PLAN-3.2.2?rev=1.1.2.1 > > > > I am volunteering to be the release manager for Tomcat 3.2.2, > unless someone > > else really wants to do it. > > > > +1 on the release plan as revised. > > I can help to the extent that I will assist Marc in the mechanics > of release > manager duties, and will do some evaluation testing on the > candidate release > code. If that is not considered sufficient, then treat my vote > as a +0 instead. > > Craig McClanahan > > > > - > To unsubscribe, e-mail: [EMAIL PROTECTED] > For additional commands, email: [EMAIL PROTECTED] - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, email: [EMAIL PROTECTED]
RE: [PROPOSAL] Tomcat 3.2.2 Release Plan
I think bugs that have been fixed in 3.3 should also get fixed on the 3.2 branch (assuming they apply, of course). Enhancements made in 3.3 back ported to 3.2 only if the committer is willing to test and support them in that release. > -Original Message- > From: GOMEZ Henri [mailto:[EMAIL PROTECTED]] > Sent: Thursday, February 08, 2001 5:13 PM > To: [EMAIL PROTECTED] > Subject: RE: [PROPOSAL] Tomcat 3.2.2 Release Plan > > > >Yes, but for some reason (probably a repressed memory from > >some former life) > >I've always hated the phrase "no regressions". :-) > > Did you want latest ajp12/ajp13 fixes from TC 3.3 to be > included also in TC 3.2.2 ? > > > - > To unsubscribe, e-mail: [EMAIL PROTECTED] > For additional commands, email: [EMAIL PROTECTED] - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, email: [EMAIL PROTECTED]
Re: Login Form & Authentication
Hi again! After thinking about my previous questions I decided that a good solution could be: (Before going to the point I must say that I'm programming a RequestInterceptor to authenticate the user against an entity EJB, so I will not use neither SimpleRealm nor JDBCRealm. We could call it EJBRealm right by now) I think I could take the following for (well...almost) granted: 1) AccessInterceptor will not be interested in j_username or j_password (I hope not only in the current code but in future releases too). 2) AccessInterceptor will register two Handlers, one for authentication (that will be mapped to /j_security_check) and one for login (that will call the registered login servlet or jsp when needed). 3) EJBRealm authorize (and/or authenticate) method will be called before any of the 2 handlers. If it can authorize the request neither of both handlers will be called. If it can't, the login handler will be called (currently FormAuthHandler). 4) The login handler will redirect the request to my registered login form. I think I can assume that it will not complain about j_username or j_password not being defined, because it should know how to deal with this precondition. 5) My form will not have action=/j_security_check, from this point I'm disobeying servlet 2.2 traditions. I can do what I want here, I don't need to register j_password or j_username but only to align to an authentication method shared with EJBRealm. The registered error form is never reached (in fact, it is a fake one). j_security_check is never reached. Of course, I don't want to pretend that these points are true. But I need to find a solution based in the least possible assumptions. What do you think about this one? Carlos - Original Message - From: Carlos Pita To: [EMAIL PROTECTED] Sent: Thursday, February 08, 2001 4:42 PM Subject: Login Form & Authentication Hi! I'm working in a project using servlets (with Tomcat 3.2) and I have a question regarding the security mechanisms described in servlet 2.2 spec and how to integrate them with other aspects of the application than login (for example, registration). More specifically, the application offers a registration form in the home page (nothing new here) and a registration form in the same page as the login form, which should be showed when a resource declaratively marked as secure is being accessed (nothing new here). So, for my surprise, I see no way to solve the next 2 problems inside the 2.2 spec (I'm using FORM authentication): 1) in the registration form in the home page there is no concept of a secured page to go once registered, but the user should still be logged, so if I call j_security_check it's not defined what would happen (and the solution is really dirty); 2) in the registration form in the login page, if the user choose the registration way, the form can't be directly submited to j_security_check because his/her information should be saved before being completely lost. I wanted to be standard, 2.2 standard! But instead I ended reading Tomcat request interceptors sources. Still I'm looking for a clean solution. I obviously should set the session j_username and j_password directly and this doesn't seem very portable. If I do that and then move my servlets to other container than Tomcat nasty things could happen. I think I would need to get the sources again (if available) or to program all the security stuff by myself (idea!: using j_username and j_password in the session to reuse my 6 lines of code). I can't believe than servlet spec doesn't provide an API to authenticate the user. I'm urged to know: 1) Is there a better solution? 2) If not, will the solution I proposed work? Thank you Carlos
cvs commit: jakarta-tomcat/src/share/org/apache/tomcat/util/test/matchers - New directory
costin 01/02/08 19:31:51 jakarta-tomcat/src/share/org/apache/tomcat/util/test/matchers - New directory - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, email: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat/src/share/org/apache/tomcat/util/test/matchers GoldenMatch.java HeaderMatch.java HttpStatusMatch.java ResponseMatch.java ResponseMatchFile.java
costin 01/02/08 19:48:17
Modified:src/share/org/apache/tomcat/util/test GTest.java Header.java
HttpClient.java Parameter.java TestDefaults.java
Added: src/share/org/apache/tomcat/util/test Cookie.java
HttpRequest.java HttpResponse.java Matcher.java
Properties.java
src/share/org/apache/tomcat/util/test/matchers
GoldenMatch.java HeaderMatch.java
HttpStatusMatch.java ResponseMatch.java
ResponseMatchFile.java
Removed: src/share/org/apache/tomcat/util/test DefaultMatcher.java
Response.java
Log:
Few changes in the GTest to simplify the test writing. The code is more
modular and extensible. All old tests should work fine, but more
capabilities are available:
- easy syntax for adding parameters ( both POST and GET - even for the
same request )
- multiple tests per request, better organization of matchers
- adding new matchers should be easy ( and fun )
Note that the original GTest tag will be used for backward compatibility
( it has few big limitations that can't be resolved with the same syntax
- it's very hard to match multiple strings in the response, headers,
it requires you to type the full request, etc )
Revision ChangesPath
1.10 +103 -131 jakarta-tomcat/src/share/org/apache/tomcat/util/test/GTest.java
Index: GTest.java
===
RCS file: /home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/util/test/GTest.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- GTest.java2001/02/07 06:41:33 1.9
+++ GTest.java2001/02/09 03:48:15 1.10
@@ -62,13 +62,16 @@
import java.io.*;
import java.util.*;
import java.net.*;
+import org.apache.tomcat.util.test.matchers.*;
-
-/** Test a web application. Will send a http request and
+/** Original tester for a web application. Will send a http request and
verify the response code, compare the response with a golden
file or find strings.
This class is using the well-known ant patterns.
+
+@deprecated Use HttpClient instead. This class has very limited
+support for multiple matchers, requests, etc.
*/
public class GTest {
// Defaults
@@ -78,21 +81,22 @@
static boolean failureOnly=false;
// all test results will be available
-static Vector testResults=new Vector();
-static Vector testFailures=new Vector();
-static Vector testSuccess=new Vector();
static Hashtable testProperties=new Hashtable();
// Instance variables
-
+
+// The "real" thing.
+// GTest is here to support the old ( and simpler ) syntax .
+// The real work is done in HttpClient, which is a lot more
+// powerfull. For example it can handle multiple requests and
+// matches, etc
HttpClient httpClient=new HttpClient();
-Vector matchers=new Vector();
-//DefaultMatcher matcher=new DefaultMatcher();
-Body comment=null;
+
+// Gtest supports only one request.
+HttpRequest httpRequest=new HttpRequest();
+
String failMessage="";
-String description="No description";
-
PrintWriter out=null;
String outType=null;
int debug=-1;
@@ -100,8 +104,9 @@
boolean result=false;
public GTest() {
- //matcher.setDebug( debug );
httpClient.setDebug( debug );
+ httpClient.addHttpRequest( httpRequest );
+ // httpClient.addMatcher( matcher );
}
// Defaults
@@ -126,21 +131,21 @@
* that were run.
*/
public static Vector getTestResults() {
- return testResults;
+ return HttpClient.getTestResults();
}
/** Vector of GTest elements, containing all test instances
* that were run and failed.
*/
public static Vector getTestFailures() {
- return testFailures;
+ return HttpClient.getTestFailures();
}
/** Vector of GTest elements, containing all test instances
* that were run and failed.
*/
public static Vector getTestSuccess() {
- return testSuccess;
+ return HttpClient.getTestSuccess();
}
/** Various global test propertis
@@ -174,64 +179,35 @@
failureOnly=Boolean.valueOf(e).booleanValue();
}
-// Ant patterns
-
-public HttpClient createHttpClient() {
- return httpClient;
-}
-
-public void addHttpClient(HttpClient c) {
- httpClient=c;
-}
-
-public void addDefaultMatcher( DefaultMatcher m ) {
- matchers.addElement( m );
-
cvs commit: jakarta-tomcat/src/tests/webpages/WEB-INF test-tomcat.xml
costin 01/02/08 19:59:34
Modified:src/tests/webpages/WEB-INF test-tomcat.xml
Log:
Update the tests - the "param" target uses the new features.
I'll send detailed instructions on how to add new tests ( it is very
important to start adding regression tests whenever possible - otherwise
we'll never be able to make a release without going through hundreds of
bug reports and wasting the time ).
Revision ChangesPath
1.15 +63 -46jakarta-tomcat/src/tests/webpages/WEB-INF/test-tomcat.xml
Index: test-tomcat.xml
===
RCS file: /home/cvs/jakarta-tomcat/src/tests/webpages/WEB-INF/test-tomcat.xml,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- test-tomcat.xml 2001/02/07 06:49:29 1.14
+++ test-tomcat.xml 2001/02/09 03:59:33 1.15
@@ -16,7 +16,7 @@
early tests.
-->
-
+
@@ -27,11 +27,16 @@
-
+
+
+
+
+
+
+
@@ -51,20 +60,7 @@
protocol="${http.protocol}"
outputType="${outputType}" />
-
-
-
-
-
- RequestBody
-
-
-
-
-
-
-
@@ -93,55 +89,77 @@
-
+
Simple GET with parmeters
-
+
+
+
+
+
-
+
-
+
Simple POST parmeters
-
-
- a=b&c=d
-
+
+
+
-
+
-
+
POST and GET parameters
-
-
- a=b&c=d
-
+
+
+
+
+
+
-
+
-
+
The POST data can't be read before getParameter
-
-
- a=b&c=d
-
+
+
+
+
+
-
+
+
+
+ The POST data can't be read before getParameter
+
+
+
+
+
+
+
+
+
+
+
@@ -663,14 +681,13 @@
/>
-
+ responseMatch="Servlet: Servlet1" />
+
-
+
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, email: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat/src/admin/test test.jsp
costin 01/02/08 20:03:22
Modified:src/admin/WEB-INF/classes/tadm TomcatAdmin.java
src/admin/test test.jsp
Log:
- the admin taglib will just report that /admin is not trusted, instead
of the full stack trace (on the null pointer that follows )
- changes needed to run the Gtest
Revision ChangesPath
1.10 +4 -5 jakarta-tomcat/src/admin/WEB-INF/classes/tadm/TomcatAdmin.java
Index: TomcatAdmin.java
===
RCS file: /home/cvs/jakarta-tomcat/src/admin/WEB-INF/classes/tadm/TomcatAdmin.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- TomcatAdmin.java 2001/02/07 06:42:48 1.9
+++ TomcatAdmin.java 2001/02/09 04:03:22 1.10
@@ -33,6 +33,9 @@
HttpServletRequest req=(HttpServletRequest)pageContext.
getRequest();
init(req);
+ if( cm==null ) {
+ return SKIP_BODY;
+ }
pageContext.setAttribute("cm", cm);
Context ctx=null;
if( ctxPath==null && ctxPathParam!=null ) {
@@ -70,10 +73,6 @@
return EVAL_PAGE;
}
-// public void setPageContext(PageContext pctx ) {
-// this.pageContext=pctx;
-// }
-
public void setParent( Tag parent ) {
super.setParent( parent);
}
@@ -84,7 +83,7 @@
private void init(HttpServletRequest request) {
Request realRequest = (Request)
request.getAttribute( Request.ATTRIB_REAL_REQUEST);
- if( cm==null )
+ if( realRequest==null )
pageContext.getServletContext().log("Untrusted Application");
else
cm = realRequest.getContext().getContextManager();
1.12 +16 -16jakarta-tomcat/src/admin/test/test.jsp
Index: test.jsp
===
RCS file: /home/cvs/jakarta-tomcat/src/admin/test/test.jsp,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- test.jsp 2001/02/07 06:42:48 1.11
+++ test.jsp 2001/02/09 04:03:22 1.12
@@ -56,31 +56,33 @@
FAILED Tests
+ type="org.apache.tomcat.util.test.Matcher" >
+
<% // Need more tags - if, etc
%>
-
- FAIL ( <%= failures.getDescription() %> )
-<%= failures.getHttpClient().getRequestLine() %>
+
+ FAIL ( <%=
+ failures.getHttpClient().getComment() %> )
+<%= failures.getHttpRequest().getRequestLine() %>
-TEST: <%= failures.getMatchDescription() %>
+TEST: <%= failures.getTestDescription() %>
Request:
- <%= failures.getHttpClient().getFullRequest() %>
+ <%= failures.getHttpRequest().getFullRequest() %>
Comments:
- <%= failures.getComment() %>
+ <%= failures.getHttpClient().getComment() %>
Message:
- <%= failures.getFailureMessage() %>
+ <%= failures.getMessage() %>
<% // use a tag %>
<% if( request.getParameter("debug" ) != null ) { %>
Response status:
- <%= failures.getHttpClient().getResponse().getResponseLine() %>
+ <%= failures.getHttpResponse().getResponseLine() %>
Response headers:
(I'm not sure how to do embeded iterations, need JSP expert )
@@ -88,7 +90,7 @@
Response body:
- <%= failures.getHttpClient().getResponse().getResponseBody() %>
+ <%= failures.getHttpResponse().getResponseBody() %>
<% } %>
@@ -100,13 +102,11 @@
PASSED Tests
+ type="org.apache.tomcat.util.test.HttpClient" >
-
-OK ( <%= success.getDescription() %> )
-<%= success.getHttpClient().getRequestLine() %>
-
-TEST: <%= success.getMatchDescription() %>
+
+OK ( <%= success.getComment() %> )
+<%= success.getFirstRequest().getRequestLine() %>
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, email: [EMAIL PROTECTED]
Tomcat 4 status
I was wondering what the status of getting Tomcat 4 ready for its next beta release currently is. I have finished implementing the Java SecurityManager and the changes to jasper class loading. I know we took a step back to make a few architectural changes. Are those all in place now? Can we move toward another beta release? Whats the status of mod_webapp and the Warp connector? Regards, Glenn -- Glenn Nielsen [EMAIL PROTECTED] | /* Spelin donut madder| MOREnet System Programming | * if iz ina coment. | Missouri Research and Education Network | */ | -- - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, email: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat/src/doc tomcat-apache-howto.html
larryi 01/02/08 20:21:28 Modified:src/doc tomcat-apache-howto.html Log: Minor updates and fix URLs. Revision ChangesPath 1.3 +14 -14jakarta-tomcat/src/doc/tomcat-apache-howto.html Index: tomcat-apache-howto.html === RCS file: /home/cvs/jakarta-tomcat/src/doc/tomcat-apache-howto.html,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- tomcat-apache-howto.html 2000/08/17 21:22:44 1.2 +++ tomcat-apache-howto.html 2001/02/09 04:21:27 1.3 @@ -1,7 +1,7 @@ - - + + Tomcat-Apache HOWTO @@ -34,14 +34,14 @@ considered a work in progress. Since the Tomcat source tree is constantly changing, the information herein may be out of date. The only definitive reference at this point is the http://jakarta.apache.org/downloads/sourceindex.html">source + href="http://jakarta.apache.org/site/sourceindex.html">source code. Other important documents: Tomcat User's Guide mod_jk HOWTO [??? should be rolled into tomcat-apache howto] -http://jakarta.apache.org/faq/faqindex.html">Tomcat FAQ +http://jakarta.apache.org/site/faqs.html">Jakarta FAQ Page @@ -67,7 +67,7 @@ Integration Up until now we have not discussed Tomcat as a server add on, -instead we have considered it as a stand-alone container and discussed +instead we have considered it as a stand-alone container and discussed how it can be used. There are however a few problems with this picture: @@ -95,7 +95,7 @@ This section isn't meant to be your one-stop shop for all troubles Tomcat, but a resource for stumbling blocks common to many first-time - Tomcat'ers. See the help section for + Tomcat'ers. See the help section for additional links. http://webserver:8007/ gives a @@ -186,9 +186,9 @@ When Tomcat starts up it will automatically generate a configuration - file for Apache in TOMCAT_HOME/conf/tomcat-apache.conf. Most + file for Apache in TOMCAT_HOME/conf/jserv/tomcat-apache.conf. Most of the time you don't need to do anything but include this file - (appending "Include TOMCAT_HOME/conf/tomcat-apache.conf") in your + (appending "Include TOMCAT_HOME/conf/jserv/tomcat-apache.conf") in your httpd.conf. If you have special needs, for example an AJP port other the 8007, you can use this file as a base for your customized configuration and save the results in another file. If you manage @@ -196,9 +196,9 @@ you add a new context. - Tomcat 3.1: you must restart tomcat and apache after adding + Tomcat: you must restart tomcat and apache after adding a new context; Apache doesn't support configuration changes without a - restart. Also the file TOMCAT_HOME/conf/tomcat-apache.conf is + restart. Also the file TOMCAT_HOME/conf/jserv/tomcat-apache.conf is generated when tomcat starts, so you'll need to start Tomcat before Apache. Tomcat will overwrite TOMCAT_HOME/conf/tomcat-apache.conf each startup so customized configuration should be kept elsewhere. @@ -324,7 +324,7 @@ requests to Tomcat. For Apache, this adapter is a slightly modified version of mod_jserv. - You may try to look http://jakarta.apache.org/downloads/binindex.html"> + You may try to look http://jakarta.apache.org/site/binindex.html"> here and see if there is an already pre-built version of mod_jserv that suites your OS (Usually there is one for NT), however, being a native library you should not expect that yet (too many OS's, not enough developers, life @@ -337,7 +337,7 @@ Building mod_jserv on UNIX involves the following: Download the source distribution of Tomcat from -http://jakarta.apache.org/downloads/sourceindex.html"> here. +http://jakarta.apache.org/site/sourceindex.html"> here. Uncompress it into some directory. Building the module: @@ -353,7 +353,7 @@ perform the following: Download the source distribution of Tomcat from -http://jakarta.apache.org/downloads/sourceindex.html"> here. +http://jakarta.apache.org/site/sourceindex.html"> here. Unzip it into some directory. Building the module: @@ -872,7 +872,7 @@ -Copyright ©1999 The Apache Software Foundation +Copyright ©1999-2001 The Apache Software Foundation http://jakarta.apache.org/legal.html">Legal Stuff They Make Us Say http://jak
Re: Tomcat 4 status
> I was wondering what the status of getting Tomcat 4 ready for its next > beta release currently is. I have finished implementing the Java SecurityManager > and the changes to jasper class loading. I know we took a step back to make a few > architectural changes. Are those all in place now? I think so, and I'm +1 on going forward with a new beta release. The only outstanding issues remaining are: - Jasper reliance on getRealPath() - sealing violations in the classloader when using Xerces > Can we move toward another beta release? I'm +1 for that, but Craig may want to have the issues mentioned above addressed first. Remy - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, email: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat/src/etc modules.xml
costin 01/02/08 20:44:55 Added: src/etc modules.xml Log: Added modules.xml - part of it is script generated from sources, part is manual. I'm still working on a script to keep sources and the xml description in sync. This file is used for the simplified syntax in server.xml, and will be used probably for other jobs ( user docs, etc ). Revision ChangesPath 1.1 jakarta-tomcat/src/etc/modules.xml Index: modules.xml === Not yet Not yet Not yet Not yet Not yet Not yet Not yet Not yet Not yet Not yet Not yet Not yet Not yet Not yet Not yet Not yet Not yet Not yet Not yet Not yet Not yet Not yet Not yet Not yet Not yet Not yet Not yet Not yet Not yet Not yet Not yet Not yet Not yet Not yet Not yet Not yet Not yet Not yet Not yet Not yet Not yet Not yet Not yet Not yet Not yet Not yet Not yet Not yet Not yet Not yet Not yet Not yet Not yet Not yet Not yet Not yet Not yet Not yet Not yet Not yet Not yet Not yet Not yet Not yet Not yet Not yet Not yet Not yet Not yet Not yet Not yet Not yet Not yet Not yet Not yet Not yet Not yet Not yet Not yet Not yet Not yet Not yet Not yet Not yet Not yet Not yet Not yet Not yet Not yet Not yet Not yet Not yet Not yet Not yet Not yet Not yet Not yet Not yet Not yet Not yet Not yet Not yet Not yet Not yet Not yet Not yet Not yet Not yet Not yet Not yet Not yet Not yet Not yet Not yet Not yet Not yet Not yet Not yet Not yet Not yet Not yet - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, email: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat/src/facade22/org/apache/tomcat/facade ServletInputStreamFacade.java
costin 01/02/08 23:46:58
Modified:src/facade22/org/apache/tomcat/facade
ServletInputStreamFacade.java
Log:
Small fix in InputStreamFacade ( fixing bugs in POST + IS )
Revision ChangesPath
1.3 +10 -3
jakarta-tomcat/src/facade22/org/apache/tomcat/facade/ServletInputStreamFacade.java
Index: ServletInputStreamFacade.java
===
RCS file:
/home/cvs/jakarta-tomcat/src/facade22/org/apache/tomcat/facade/ServletInputStreamFacade.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ServletInputStreamFacade.java 2000/12/27 17:15:04 1.2
+++ ServletInputStreamFacade.java 2001/02/09 07:46:58 1.3
@@ -75,6 +75,7 @@
*/
final class ServletInputStreamFacade extends ServletInputStream {
private int bytesRead = 0;
+// Stop after reading ContentLength bytes.
private int limit = -1;
private Request reqA;
@@ -84,6 +85,7 @@
void prepare() {
int contentLength = reqA.getContentLength();
+ //System.out.println("ContentLength= " + contentLength);
if (contentLength != -1) {
limit=contentLength;
}
@@ -95,13 +97,14 @@
}
void recycle() {
-
+ limit=-1;
}
/** Read a byte. Detect if a ByteBuffer is used, if not
* use the old method.
*/
private int doRead() throws IOException {
+ //System.out.println("DoRead");
return reqA.doRead();
}
@@ -112,6 +115,7 @@
// ServletInputStream methods
public int read() throws IOException {
+ // System.out.println("Read " + limit );
if (limit != -1) {
if (bytesRead < limit) {
bytesRead++;
@@ -120,7 +124,9 @@
return -1;
}
} else {
- return doRead();
+ return -1;
+ // no content-length, no body
+ // return doRead();
}
}
@@ -142,7 +148,8 @@
}
return numRead;
} else {
- return doRead(b, off, len);
+ return 0;
+ //return doRead(b, off, len);
}
}
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, email: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat/src/share/org/apache/tomcat/core Request.java
costin 01/02/08 23:47:49
Modified:src/share/org/apache/tomcat/core Request.java
Log:
Wrong test for POST.
Revision ChangesPath
1.90 +2 -2 jakarta-tomcat/src/share/org/apache/tomcat/core/Request.java
Index: Request.java
===
RCS file: /home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/core/Request.java,v
retrieving revision 1.89
retrieving revision 1.90
diff -u -r1.89 -r1.90
--- Request.java 2001/02/07 07:01:23 1.89
+++ Request.java 2001/02/09 07:47:48 1.90
@@ -337,8 +337,8 @@
if( ! methodMB.equalsIgnoreCase("POST") )
return;
String contentType= getContentType();
- if (contentType == null &&
-contentType.startsWith("application/x-www-form-urlencoded")) {
+ if (contentType == null ||
+! contentType.startsWith("application/x-www-form-urlencoded")) {
return;
}
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, email: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat/src/share/org/apache/tomcat/modules/config PolicyInterceptor.java ServerXmlReader.java
costin 01/02/08 23:49:10
Modified:src/share/org/apache/tomcat/modules/config
PolicyInterceptor.java ServerXmlReader.java
Log:
- small fix in ServerXmlReader
- canonical path in PolicyInterceptor
Revision ChangesPath
1.7 +12 -4
jakarta-tomcat/src/share/org/apache/tomcat/modules/config/PolicyInterceptor.java
Index: PolicyInterceptor.java
===
RCS file:
/home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/modules/config/PolicyInterceptor.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- PolicyInterceptor.java2001/02/01 05:18:56 1.6
+++ PolicyInterceptor.java2001/02/09 07:49:09 1.7
@@ -106,11 +106,19 @@
if( System.getSecurityManager() != null ) return;
try {
if( null == System.getProperty("java.security.policy")) {
+ File f=null;
if( policyFile==null ) {
- // XXX ugly API - change CM
- File f= new File(cm.getHome(), "conf/tomcat.policy");
- policyFile=f.getPath();
- }
+ policyFile="conf/tomcat.policy";
+ }
+
+ if( FileUtil.isAbsolute(policyFile))
+ f=new File(policyFile);
+ else
+ f=new File(cm.getHome() + File.separator +
+policyFile);
+ try {
+ policyFile=f.getCanonicalPath();
+ } catch(IOException ex ) {}
log("Setting policy file to " + policyFile);
System.setProperty("java.security.policy",
policyFile);
1.5 +7 -3
jakarta-tomcat/src/share/org/apache/tomcat/modules/config/ServerXmlReader.java
Index: ServerXmlReader.java
===
RCS file:
/home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/modules/config/ServerXmlReader.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ServerXmlReader.java 2001/02/06 06:45:05 1.4
+++ ServerXmlReader.java 2001/02/09 07:49:10 1.5
@@ -162,7 +162,7 @@
public static void setTagRules( XmlMapper xh ) {
xh.addRule( "module", new XmlAction() {
- public void end(SaxContext ctx ) throws Exception {
+ public void start(SaxContext ctx ) throws Exception {
Object elem=ctx.currentObject();
AttributeList attributes = ctx.getCurrentAttributes();
String name=attributes.getValue("name");
@@ -178,9 +178,12 @@
public static void addDefaultTags( ContextManager cm, XmlMapper xh)
throws TomcatException
{
+ if( cm.getNote( "modules" ) != null )
+ return;
File f=new File( cm.getHome(), "/conf/modules.xml");
if( f.exists() ) {
-cm.setNote( "configFile", f.getAbsoluteFile());
+ //cm.setNote( "configFile", f.getAbsoluteFile());
+ cm.setNote( "modules", new Hashtable());
loadConfigFile( xh, f, cm );
// load module-*.xml
Vector v = getUserConfigFiles(f);
@@ -195,7 +198,7 @@
// similar with ant's taskdef
public static void addTag( XmlMapper xh, String tag, String classN) {
xh.addRule( tag ,
- xh.objectCreate( null, classN ));
+ xh.objectCreate( classN, null ));
xh.addRule( tag ,
xh.setProperties());
xh.addRule( tag,
@@ -277,3 +280,4 @@
}
+
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, email: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat/src/share/org/apache/tomcat/startup Main.java
costin 01/02/08 23:49:28
Modified:src/share/org/apache/tomcat/startup Main.java
Log:
Removing printlns.
Revision ChangesPath
1.19 +3 -3 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.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- Main.java 2001/02/06 02:46:27 1.18
+++ Main.java 2001/02/09 07:49:28 1.19
@@ -193,9 +193,9 @@
serverCl=new SimpleClassLoader(serverClassPath, commonCl);
}
-System.out.println("commonCl:"+commonCl);
-System.out.println("sharedCl:"+sharedCl);
-System.out.println("serverCl:"+serverCl);
+//System.out.println("commonCl:"+commonCl);
+//System.out.println("sharedCl:"+sharedCl);
+//System.out.println("serverCl:"+serverCl);
Class cls=serverCl.loadClass("org.apache.tomcat.startup.Tomcat");
Object proxy=cls.newInstance();
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, email: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat/src/share/org/apache/tomcat/startup Tomcat.java
costin 01/02/08 23:49:47
Modified:src/share/org/apache/tomcat/startup Tomcat.java
Log:
Removing println
Revision ChangesPath
1.52 +3 -3 jakarta-tomcat/src/share/org/apache/tomcat/startup/Tomcat.java
Index: Tomcat.java
===
RCS file: /home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/startup/Tomcat.java,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -r1.51 -r1.52
--- Tomcat.java 2001/02/06 02:46:28 1.51
+++ Tomcat.java 2001/02/09 07:49:47 1.52
@@ -76,10 +76,10 @@
sxmlConf.setConfig( configFile );
tcat.addInterceptor( sxmlConf );
ClassLoader cl=(ClassLoader)attributes.get("parentClassLoader");
-System.out.println("parentClassLoader:"+cl);
-System.out.println("thisClassLoader:"+this.getClass().getClassLoader());
+//System.out.println("parentClassLoader:"+cl);
+//System.out.println("thisClassLoader:"+this.getClass().getClassLoader());
if (cl==null) cl=this.getClass().getClassLoader();
-System.out.println("parentClassLoader:"+cl);
+//System.out.println("parentClassLoader:"+cl);
tcat.getContextManager().setParentLoader(cl);
tcat.initContextManager();
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, email: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat/src/share/org/apache/tomcat/util/xml XmlMapper.java
costin 01/02/08 23:51:34
Modified:src/share/org/apache/tomcat/util Base64.java
src/share/org/apache/tomcat/util/xml XmlMapper.java
Log:
Small fix in base64 ( the method is static )
Increased the size of the default buffers in XmlMapper ( probably
we need to make them resizable, this was just a hack until we get to
reuse the ant mapper - which didn't happened and the hack grew a bit
too big )
Revision ChangesPath
1.4 +5 -5 jakarta-tomcat/src/share/org/apache/tomcat/util/Base64.java
Index: Base64.java
===
RCS file: /home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/util/Base64.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- Base64.java 2000/12/27 21:00:31 1.3
+++ Base64.java 2001/02/09 07:51:34 1.4
@@ -1,7 +1,7 @@
/*
- * $Header: /home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/util/Base64.java,v
1.3 2000/12/27 21:00:31 costin Exp $
- * $Revision: 1.3 $
- * $Date: 2000/12/27 21:00:31 $
+ * $Header: /home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/util/Base64.java,v
1.4 2001/02/09 07:51:34 costin Exp $
+ * $Revision: 1.4 $
+ * $Date: 2001/02/09 07:51:34 $
*
*
*
@@ -74,7 +74,7 @@
* This class is used by XML Schema binary format validation
*
* @author Jeffrey Rodriguez
- * @version $Revision: 1.3 $ $Date: 2000/12/27 21:00:31 $
+ * @version $Revision: 1.4 $ $Date: 2001/02/09 07:51:34 $
*/
public final class Base64 {
@@ -147,7 +147,7 @@
* @param binaryData Array containing binaryData
* @return Encoded Base64 array
*/
-public byte[] encode( byte[] binaryData ) {
+public static byte[] encode( byte[] binaryData ) {
int lengthDataBits= binaryData.length*EIGHTBIT;
int fewerThan24bits = lengthDataBits%TWENTYFOURBITGROUP;
int numberTriplets= lengthDataBits/TWENTYFOURBITGROUP;
1.30 +4 -4
jakarta-tomcat/src/share/org/apache/tomcat/util/xml/XmlMapper.java
Index: XmlMapper.java
===
RCS file:
/home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/util/xml/XmlMapper.java,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- XmlMapper.java2000/11/22 01:10:30 1.29
+++ XmlMapper.java2001/02/09 07:51:34 1.30
@@ -48,8 +48,8 @@
boolean validating=false;
public XmlMapper() {
- attributeStack = new Object[100]; // depth of the xml doc
- tagStack = new String[100];
+ attributeStack = new Object[200]; // depth of the xml doc
+ tagStack = new String[200];
initDefaultRules();
}
@@ -341,8 +341,8 @@
this.action=action;
}
}
-Rule rules[]=new Rule[100];
-Rule matching[]=new Rule[100];
+Rule rules[]=new Rule[200];
+Rule matching[]=new Rule[200];
int ruleCount=0;
/**
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, email: [EMAIL PROTECTED]
RE: [PROPOSAL] Tomcat 3.2.2 Release Plan
>I will be able to build and test the native code for the ISAPI >redirector but I will need others to build/test the other native >components and supply them to me for inclusion into the release. >I will be able to test on WinNT/200 and probably Win9x platforms >but I would appreciate test reports from other developers about >the status of the other supported platforms. I'll provide RPM for Redhat Linux i386 and will test it on my dev servers. Regards - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, email: [EMAIL PROTECTED]
Modified Makefile NSAPI connector under Solaris 2.6 (hope thi s helps!)
Greetings I managed to compile the NSAPI connector for Jackarta-Tomcat under the following configuration (itried to find if someone managed to compile the module but i found no answer). Thi is my current configuration * java version "1.3.0_01" Java(TM) 2 Runtime Environment, Standard Edition (build 1.3.0_01) Java HotSpot(TM) Client VM (build 1.3.0_01, mixed mode) * GNU Make version 3.76.1, by Richard Stallman and Roland McGrath. * Tomcat 3.2 * Netscape Enterprise Server 3.6 * SunOS 5.6 Generic_105181-23 sun4u sparc SUNW,Ultra-250 Here are the steps to compile the NSAPI connector using this modified Makefile: 1) Define the following 3 environment variables (JAVA_HOME, JK_INCLUDE, SUITESOPT_HOME) (i'm using tcsh on the example but you should change the syntax on other shells. Also remeber to put your real paths): setenv JAVA_HOME /local/usr/j2se setenv SUITESPOT_HOME /local/netscape/suitespot setenv JK_DIR /local5/src/jakarta_source/jakarta-tomcat/src/native/jk 2) Check the new Makefile just to see if everithing is Ok: #Modified by Jose Vicente Nunez Zuleta ([EMAIL PROTECTED]) on 07/02/2001 # Defines for example NSAPI programs running under SOLARIS CC_CMD=gcc -DNET_SSL -DSOLARIS -D_REENTRANT LD_SHAREDCMD=ld -G all: OS_TYPE=solaris INCLUDEDIR=$(SUITESPOT_HOME)/include JAVA_INCLUDE=$(JAVA_HOME)/include JK_INCLUDE=$(JK_DIR) VPATH=$(JK_INCLUDE):'pwd' JK_OBJS = jk_ajp12_worker.o jk_ajp13_worker.o jk_jni_worker.o jk_map.o jk_nwmain.o \ jk_sockbuf.o jk_util.o jk_ajp13.o jk_connect.o \ jk_lb_worker.o jk_msg_buff.o jk_pool.o \ jk_uri_worker_map.o jk_worker.o jk_nsapi_plugin.o INCLUDE_FLAGS=-I$(INCLUDEDIR) -I$(INCLUDEDIR)/base -I$(INCLUDEDIR)/frame -I$(JAVA_INCLUDE) -I$(JAVA_INCLUDE)/$(OS_TYPE) -I$(JK_INCLUDE) COMMON_DEFS=-DMCC_HTTPD -DXP_UNIX -DSPAPI20 -DSOLARIS -Wall all: nsapi_redirector.so nsapi_redirector.so: $(JK_OBJS) $(LD_SHAREDCMD) $(JK_OBJS) -o nsapi_redirector.so $(EXTRA_LDDEFINES) .c.o: $(CC_CMD) $(COMMON_DEFS) $(INCLUDE_FLAGS) -c $< 3) Compile the source the NSAPI redirector (i suppouse yo are in the same directory as the Makefile): make -f Makefile.solaris 4) Copy the nsapi_redirector.so file to the desired location and follow the instructions at http://jakarta.apache.org/tomcat/jakarta-tomcat/src/doc/tomcat-netscape-howto.html I followed all the instructions and the NSAPI module worked without a problem. I hope this help anyone with the same problem i got :) José Vicente Núñez Zuleta = José Vicente Núñez Zuleta System Engineer / Developer Development Leader, Diario El Universal http://www.eluniversal.com http://www.autofuturo.com (current project) _ Do You Yahoo!? Obtenga su dirección de correo-e gratis @yahoo.com en http://correo.espanol.yahoo.com - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, email: [EMAIL PROTECTED]
