Re: cvs commit: jakarta-tomcat-4.0/tester/web/golden SSIConditional09.txt

2002-11-25 Thread Paul Speed 
Thanks Dan.  Now I have my 15 milliseconds of fame back. ;)

I'll see if I can test the updates with my site soon.
-Paul Speed

[EMAIL PROTECTED] wrote:
> 
> dsandberg2002/11/25 02:15:43
> 
>   Modified:catalina/src/share/org/apache/catalina/ssi SSICommand.java
> SSIConfig.java SSIEcho.java SSIExec.java
> SSIFlastmod.java SSIFsize.java SSIInclude.java
> SSIMediator.java SSIPrintenv.java SSIProcessor.java
> SSISet.java SSIStopProcessingException.java
>tester/src/bin tester.xml
>   Added:   catalina/src/share/org/apache/catalina/ssi
> ExpressionParseTree.java ExpressionTokenizer.java
> SSIConditional.java SSIConditionalState.java
>tester/web SSIConditional09.shtml
>tester/web/golden SSIConditional09.txt
>   Log:
>   Added back Paul Speed's conditional SSI enhancement.  Updated code/regression 
>tests to better emulate Apache SSI.  Fixed bug w/ expression parser's handling of 
>literals.
> 
>   Revision  ChangesPath
>   1.2   +5 -3  
>jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/ssi/SSICommand.java
> 
>   Index: SSICommand.java
>   ===
>   RCS file: 
>/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/ssi/SSICommand.java,v
>   retrieving revision 1.1
>   retrieving revision 1.2
>   diff -u -r1.1 -r1.2
>   --- SSICommand.java   24 May 2002 16:35:39 -  1.1
>   +++ SSICommand.java   25 Nov 2002 10:15:42 -  1.2
>   @@ -79,12 +79,14 @@
> * Write the output of the command to the writer.
> *
> * @param ssiMediator the ssi mediator
>   + * @param commandName the name of the actual command ( ie. echo )
> * @param paramNames The parameter names
> * @param paramValues The parameter values
> * @param writer the writer to output to
> * @throws SSIStopProcessingException if SSI processing should be aborted
> */
>public void process(SSIMediator ssiMediator,
>   + String commandName,
> String[] paramNames,
> String[] paramValues,
> PrintWriter writer) throws SSIStopProcessingException;
> 
> 
> 
>   1.3   +6 -4  
>jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/ssi/SSIConfig.java
> 
>   Index: SSIConfig.java
>   ===
>   RCS file: 
>/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/ssi/SSIConfig.java,v
>   retrieving revision 1.2
>   retrieving revision 1.3
>   diff -u -r1.2 -r1.3
>   --- SSIConfig.java24 Nov 2002 06:22:36 -  1.2
>   +++ SSIConfig.java25 Nov 2002 10:15:42 -  1.3
>   @@ -72,6 +72,7 @@
> * Implements the Server-side #exec command
> *
> * @author Bip Thelin
>   + * @author Paul Speed
> * @author Dan Sandberg
> * @version $Revision$, $Date$
> */
>   @@ -80,6 +81,7 @@
> * @see SSICommand
> */
>public void process(SSIMediator ssiMediator,
>   + String commandName,
> String[] paramNames,
> String[] paramValues,
> PrintWriter writer ) {
> 
> 
> 
>   1.2   +6 -4  
>jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/ssi/SSIEcho.java
> 
>   Index: SSIEcho.java
>   ===
>   RCS file: 
>/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/ssi/SSIEcho.java,v
>   retrieving revision 1.1
>   retrieving revision 1.2
>   diff -u -r1.1 -r1.2
>   --- SSIEcho.java  24 May 2002 04:38:58 -  1.1
>   +++ SSIEcho.java  25 Nov 2002 10:15:42 -  1.2
>   @@ -71,6 +71,7 @@
> * Return the result associated with the supplied Server Variable.
> *
> * @author Bip Thelin
>   + * @author Paul Speed
> * @author Dan Sandberg
> * @version $Revision$, $Date$
> */
>   @@ -82,6 +83,7 @@
> * @see SSICommand
> */
>public void process(SSIMediator ssiMediator,
>   + String commandName,
> String[] paramNames,
> String[] paramValues,
> PrintWriter writer) {
> 
> 
> 
>   1.3   +7 -5  
>jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/ssi/SSIExec.java
> 
>   Index: SSIExec.java
>   ===
>   RCS file: 
>/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/ssi/SSIExec.java,v
>   retrieving revision 1.2
>   retrieving revision 1.3
>   diff -u -r1.2 -r1.3
>   --- SSIExec.java  24 Nov 2002 06:22:36 -  1.2
>   +++ SSIExec.java  25 Nov 2002 10:15:42 -  1.

Re: cvs commit: jakarta-tomcat-4.0/tester/web/golden SSIConditional09.txt

2002-11-25 Thread Amy Roh 
Dan,

You might want to port all SSI changes to tomcat 5 as well.

Thanks,
Amy

[EMAIL PROTECTED] wrote:

dsandberg2002/11/25 02:15:43

  Modified:catalina/src/share/org/apache/catalina/ssi SSICommand.java
SSIConfig.java SSIEcho.java SSIExec.java
SSIFlastmod.java SSIFsize.java SSIInclude.java
SSIMediator.java SSIPrintenv.java SSIProcessor.java
SSISet.java SSIStopProcessingException.java
   tester/src/bin tester.xml
  Added:   catalina/src/share/org/apache/catalina/ssi
ExpressionParseTree.java ExpressionTokenizer.java
SSIConditional.java SSIConditionalState.java
   tester/web SSIConditional09.shtml
   tester/web/golden SSIConditional09.txt
  Log:
  Added back Paul Speed's conditional SSI enhancement.  Updated code/regression tests to better emulate Apache SSI.  Fixed bug w/ expression parser's handling of literals.
  
  Revision  ChangesPath
  1.2   +5 -3  jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/ssi/SSICommand.java
  
  Index: SSICommand.java
  ===
  RCS file: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/ssi/SSICommand.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- SSICommand.java	24 May 2002 16:35:39 -	1.1
  +++ SSICommand.java	25 Nov 2002 10:15:42 -	1.2
  @@ -79,12 +79,14 @@
* Write the output of the command to the writer.
*
* @param ssiMediator the ssi mediator
  + * @param commandName the name of the actual command ( ie. echo )
* @param paramNames The parameter names
* @param paramValues The parameter values
* @param writer the writer to output to
* @throws SSIStopProcessingException if SSI processing should be aborted
*/
   public void process(SSIMediator ssiMediator,
  +			String commandName,
   			String[] paramNames,
   			String[] paramValues,
   			PrintWriter writer) throws SSIStopProcessingException;
  
  
  
  1.3   +6 -4  jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/ssi/SSIConfig.java
  
  Index: SSIConfig.java
  ===
  RCS file: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/ssi/SSIConfig.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- SSIConfig.java	24 Nov 2002 06:22:36 -	1.2
  +++ SSIConfig.java	25 Nov 2002 10:15:42 -	1.3
  @@ -72,6 +72,7 @@
* Implements the Server-side #exec command
*
* @author Bip Thelin
  + * @author Paul Speed
* @author Dan Sandberg
* @version $Revision$, $Date$
*/
  @@ -80,6 +81,7 @@
* @see SSICommand
*/
   public void process(SSIMediator ssiMediator,
  +			String commandName,
   			String[] paramNames, 
   			String[] paramValues,
   			PrintWriter writer ) {
  
  
  
  1.2   +6 -4  jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/ssi/SSIEcho.java
  
  Index: SSIEcho.java
  ===
  RCS file: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/ssi/SSIEcho.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- SSIEcho.java	24 May 2002 04:38:58 -	1.1
  +++ SSIEcho.java	25 Nov 2002 10:15:42 -	1.2
  @@ -71,6 +71,7 @@
* Return the result associated with the supplied Server Variable.
*
* @author Bip Thelin
  + * @author Paul Speed
* @author Dan Sandberg
* @version $Revision$, $Date$
*/
  @@ -82,6 +83,7 @@
* @see SSICommand
*/
   public void process(SSIMediator ssiMediator,
  +			String commandName,
   			String[] paramNames,
   			String[] paramValues,
   			PrintWriter writer) {
  
  
  
  1.3   +7 -5  jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/ssi/SSIExec.java
  
  Index: SSIExec.java
  ===
  RCS file: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/ssi/SSIExec.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- SSIExec.java	24 Nov 2002 06:22:36 -	1.2
  +++ SSIExec.java	25 Nov 2002 10:15:42 -	1.3
  @@ -89,6 +89,7 @@
* 
* @author Bip Thelin
* @author Amy Roh
  + * @author Paul Speed
* @author Dan Sandberg
* @version $Revision$, $Date$
*
  @@ -101,6 +102,7 @@
* @see SSICommand
*/
   public void process(SSIMediator ssiMediator,
  +			String commandName,
   			String[] paramNames,
   			String[] paramValues,
   			PrintWriter writer) {
  @@ -111,7 +113,7 @@
   	String substitutedValue = ssiMediator.substituteVariables( paramValue );
   
   if ( paramName.equalsIgnoreCase("cgi") ) {
  -

cvs commit: jakarta-tomcat-4.0/tester/web/golden SSIConditional09.txt

2002-11-25 Thread dsandberg 
dsandberg2002/11/25 02:15:43

  Modified:catalina/src/share/org/apache/catalina/ssi SSICommand.java
SSIConfig.java SSIEcho.java SSIExec.java
SSIFlastmod.java SSIFsize.java SSIInclude.java
SSIMediator.java SSIPrintenv.java SSIProcessor.java
SSISet.java SSIStopProcessingException.java
   tester/src/bin tester.xml
  Added:   catalina/src/share/org/apache/catalina/ssi
ExpressionParseTree.java ExpressionTokenizer.java
SSIConditional.java SSIConditionalState.java
   tester/web SSIConditional09.shtml
   tester/web/golden SSIConditional09.txt
  Log:
  Added back Paul Speed's conditional SSI enhancement.  Updated code/regression tests 
to better emulate Apache SSI.  Fixed bug w/ expression parser's handling of literals.
  
  Revision  ChangesPath
  1.2   +5 -3  
jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/ssi/SSICommand.java
  
  Index: SSICommand.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/ssi/SSICommand.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- SSICommand.java   24 May 2002 16:35:39 -  1.1
  +++ SSICommand.java   25 Nov 2002 10:15:42 -  1.2
  @@ -79,12 +79,14 @@
* Write the output of the command to the writer.
*
* @param ssiMediator the ssi mediator
  + * @param commandName the name of the actual command ( ie. echo )
* @param paramNames The parameter names
* @param paramValues The parameter values
* @param writer the writer to output to
* @throws SSIStopProcessingException if SSI processing should be aborted
*/
   public void process(SSIMediator ssiMediator,
  + String commandName,
String[] paramNames,
String[] paramValues,
PrintWriter writer) throws SSIStopProcessingException;
  
  
  
  1.3   +6 -4  
jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/ssi/SSIConfig.java
  
  Index: SSIConfig.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/ssi/SSIConfig.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- SSIConfig.java24 Nov 2002 06:22:36 -  1.2
  +++ SSIConfig.java25 Nov 2002 10:15:42 -  1.3
  @@ -72,6 +72,7 @@
* Implements the Server-side #exec command
*
* @author Bip Thelin
  + * @author Paul Speed
* @author Dan Sandberg
* @version $Revision$, $Date$
*/
  @@ -80,6 +81,7 @@
* @see SSICommand
*/
   public void process(SSIMediator ssiMediator,
  + String commandName,
String[] paramNames, 
String[] paramValues,
PrintWriter writer ) {
  
  
  
  1.2   +6 -4  
jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/ssi/SSIEcho.java
  
  Index: SSIEcho.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/ssi/SSIEcho.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- SSIEcho.java  24 May 2002 04:38:58 -  1.1
  +++ SSIEcho.java  25 Nov 2002 10:15:42 -  1.2
  @@ -71,6 +71,7 @@
* Return the result associated with the supplied Server Variable.
*
* @author Bip Thelin
  + * @author Paul Speed
* @author Dan Sandberg
* @version $Revision$, $Date$
*/
  @@ -82,6 +83,7 @@
* @see SSICommand
*/
   public void process(SSIMediator ssiMediator,
  + String commandName,
String[] paramNames,
String[] paramValues,
PrintWriter writer) {
  
  
  
  1.3   +7 -5  
jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/ssi/SSIExec.java
  
  Index: SSIExec.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/ssi/SSIExec.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- SSIExec.java  24 Nov 2002 06:22:36 -  1.2
  +++ SSIExec.java  25 Nov 2002 10:15:42 -  1.3
  @@ -89,6 +89,7 @@
* 
* @author Bip Thelin
* @author Amy Roh
  + * @author Paul Speed
* @author Dan Sandberg
* @version $Revision$, $Date$
*
  @@ -101,6 +102,7 @@
* @see SSICommand
*/
   public void process(SSIMediator ssiMediator,
  + String commandName,
String[] paramNam