You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cactus-dev@jakarta.apache.org by vm...@apache.org on 2002/01/20 22:11:39 UTC

cvs commit: jakarta-cactus/src/framework/share/org/apache/cactus Cookie.java JspTestCase.java ServletTestCase.java ServletTestRequest.java ServletURL.java WebRequest.java WebTestResult.java

vmassol     02/01/20 13:11:39

  Modified:    src/framework/share/org/apache/cactus Cookie.java
                        JspTestCase.java ServletTestCase.java
                        ServletTestRequest.java ServletURL.java
                        WebRequest.java WebTestResult.java
  Log:
  moved to qualified imports
  
  Revision  Changes    Path
  1.4       +3 -3      jakarta-cactus/src/framework/share/org/apache/cactus/Cookie.java
  
  Index: Cookie.java
  ===================================================================
  RCS file: /home/cvs/jakarta-cactus/src/framework/share/org/apache/cactus/Cookie.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- Cookie.java	13 Jan 2002 15:07:08 -0000	1.3
  +++ Cookie.java	20 Jan 2002 21:11:39 -0000	1.4
  @@ -53,8 +53,8 @@
    */
   package org.apache.cactus;
   
  -import java.util.*;
  -import java.io.*;
  +import java.io.Serializable;
  +import java.util.Date;
   
   /**
    * Client cookie. Used for manipulating client cookies either in
  @@ -63,7 +63,7 @@
    *
    * @author <a href="mailto:vmassol@apache.org">Vincent Massol</a>
    *
  - * @version $Id: Cookie.java,v 1.3 2002/01/13 15:07:08 vmassol Exp $
  + * @version $Id: Cookie.java,v 1.4 2002/01/20 21:11:39 vmassol Exp $
    */
   public class Cookie implements Serializable
   {
  
  
  
  1.8       +4 -4      jakarta-cactus/src/framework/share/org/apache/cactus/JspTestCase.java
  
  Index: JspTestCase.java
  ===================================================================
  RCS file: /home/cvs/jakarta-cactus/src/framework/share/org/apache/cactus/JspTestCase.java,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- JspTestCase.java	13 Jan 2002 15:07:08 -0000	1.7
  +++ JspTestCase.java	20 Jan 2002 21:11:39 -0000	1.8
  @@ -53,10 +53,10 @@
    */
   package org.apache.cactus;
   
  -import javax.servlet.jsp.*;
  +import javax.servlet.jsp.JspWriter;
   
  -import org.apache.cactus.client.*;
  -import org.apache.cactus.server.*;
  +import org.apache.cactus.server.PageContextWrapper;
  +import org.apache.cactus.client.JspHttpClient;
   
   /**
    * Test classes that need access to valid JSP implicit objects (such as the
  @@ -65,7 +65,7 @@
    *
    * @author <a href="mailto:vmassol@apache.org">Vincent Massol</a>
    *
  - * @version $Id: JspTestCase.java,v 1.7 2002/01/13 15:07:08 vmassol Exp $
  + * @version $Id: JspTestCase.java,v 1.8 2002/01/20 21:11:39 vmassol Exp $
    */
   public class JspTestCase extends ServletTestCase
   {
  
  
  
  1.10      +5 -9      jakarta-cactus/src/framework/share/org/apache/cactus/ServletTestCase.java
  
  Index: ServletTestCase.java
  ===================================================================
  RCS file: /home/cvs/jakarta-cactus/src/framework/share/org/apache/cactus/ServletTestCase.java,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- ServletTestCase.java	13 Jan 2002 15:07:08 -0000	1.9
  +++ ServletTestCase.java	20 Jan 2002 21:11:39 -0000	1.10
  @@ -53,15 +53,11 @@
    */
   package org.apache.cactus;
   
  -import java.lang.reflect.*;
  -import javax.servlet.*;
  -import javax.servlet.http.*;
  -import java.net.*;
  +import javax.servlet.http.HttpServletResponse;
  +import javax.servlet.http.HttpSession;
   
  -import junit.framework.*;
  -
  -import org.apache.cactus.client.*;
  -import org.apache.cactus.server.*;
  +import org.apache.cactus.server.ServletConfigWrapper;
  +import org.apache.cactus.client.ServletHttpClient;
   
   /**
    * Test classes that need access to valid Servlet implicit objects (such as the
  @@ -70,7 +66,7 @@
    *
    * @author <a href="mailto:vmassol@apache.org">Vincent Massol</a>
    *
  - * @version $Id: ServletTestCase.java,v 1.9 2002/01/13 15:07:08 vmassol Exp $
  + * @version $Id: ServletTestCase.java,v 1.10 2002/01/20 21:11:39 vmassol Exp $
    */
   public class ServletTestCase extends AbstractTestCase
   {
  
  
  
  1.9       +1 -3      jakarta-cactus/src/framework/share/org/apache/cactus/ServletTestRequest.java
  
  Index: ServletTestRequest.java
  ===================================================================
  RCS file: /home/cvs/jakarta-cactus/src/framework/share/org/apache/cactus/ServletTestRequest.java,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- ServletTestRequest.java	13 Jan 2002 15:07:08 -0000	1.8
  +++ ServletTestRequest.java	20 Jan 2002 21:11:39 -0000	1.9
  @@ -53,8 +53,6 @@
    */
   package org.apache.cactus;
   
  -import java.util.*;
  -
   /**
    * Contains all HTTP request data for a test case. It is the data that
    * will be sent to the server redirector and that will be available to the test
  @@ -79,7 +77,7 @@
    *
    * @author <a href="mailto:vmassol@apache.org">Vincent Massol</a>
    *
  - * @version $Id: ServletTestRequest.java,v 1.8 2002/01/13 15:07:08 vmassol Exp $
  + * @version $Id: ServletTestRequest.java,v 1.9 2002/01/20 21:11:39 vmassol Exp $
    * @deprecated As of Cactus 1.2, replaced by WebRequest
    * @see WebRequest
    */
  
  
  
  1.12      +5 -11     jakarta-cactus/src/framework/share/org/apache/cactus/ServletURL.java
  
  Index: ServletURL.java
  ===================================================================
  RCS file: /home/cvs/jakarta-cactus/src/framework/share/org/apache/cactus/ServletURL.java,v
  retrieving revision 1.11
  retrieving revision 1.12
  diff -u -r1.11 -r1.12
  --- ServletURL.java	13 Jan 2002 15:07:08 -0000	1.11
  +++ ServletURL.java	20 Jan 2002 21:11:39 -0000	1.12
  @@ -53,17 +53,11 @@
    */
   package org.apache.cactus;
   
  -import java.util.*;
  -import java.io.*;
  -import java.security.*;
  -import java.net.*;
  +import javax.servlet.http.HttpServletRequest;
   
  -import javax.servlet.*;
  -import javax.servlet.http.*;
  -
  -import junit.framework.*;
  -import org.apache.cactus.util.log.*;
  -import org.apache.cactus.server.*;
  +import org.apache.cactus.util.log.Log;
  +import org.apache.cactus.util.log.LogService;
  +import org.apache.cactus.server.ServletUtil;
   
   /**
    * Simulate an HTTP URL by breaking it into its different parts :<br>
  @@ -84,7 +78,7 @@
    *
    * @author <a href="mailto:vmassol@apache.org">Vincent Massol</a>
    *
  - * @version $Id: ServletURL.java,v 1.11 2002/01/13 15:07:08 vmassol Exp $
  + * @version $Id: ServletURL.java,v 1.12 2002/01/20 21:11:39 vmassol Exp $
    */
   public class ServletURL
   {
  
  
  
  1.12      +7 -4      jakarta-cactus/src/framework/share/org/apache/cactus/WebRequest.java
  
  Index: WebRequest.java
  ===================================================================
  RCS file: /home/cvs/jakarta-cactus/src/framework/share/org/apache/cactus/WebRequest.java,v
  retrieving revision 1.11
  retrieving revision 1.12
  diff -u -r1.11 -r1.12
  --- WebRequest.java	13 Jan 2002 21:21:17 -0000	1.11
  +++ WebRequest.java	20 Jan 2002 21:11:39 -0000	1.12
  @@ -53,11 +53,14 @@
    */
   package org.apache.cactus;
   
  -import java.util.*;
  -import java.io.*;
  +import java.util.Hashtable;
  +import java.util.Vector;
  +import java.util.Enumeration;
  +import java.util.StringTokenizer;
  +import java.io.InputStream;
   
  -import org.apache.cactus.util.*;
   import org.apache.cactus.client.authentication.AbstractAuthentication;
  +import org.apache.cactus.util.ChainedRuntimeException;
   
   /**
    * Contains all HTTP request data for a test case. It is the data that
  @@ -86,7 +89,7 @@
    * @author <a href="mailto:vmassol@apache.org">Vincent Massol</a>
    * @author <a href="mailto:Jason.Robertson@acs-inc.com">Jason Robertson</a>
    *
  - * @version $Id: WebRequest.java,v 1.11 2002/01/13 21:21:17 vmassol Exp $
  + * @version $Id: WebRequest.java,v 1.12 2002/01/20 21:11:39 vmassol Exp $
    */
   public class WebRequest
   {
  
  
  
  1.5       +4 -2      jakarta-cactus/src/framework/share/org/apache/cactus/WebTestResult.java
  
  Index: WebTestResult.java
  ===================================================================
  RCS file: /home/cvs/jakarta-cactus/src/framework/share/org/apache/cactus/WebTestResult.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- WebTestResult.java	13 Jan 2002 15:07:08 -0000	1.4
  +++ WebTestResult.java	20 Jan 2002 21:11:39 -0000	1.5
  @@ -53,7 +53,9 @@
    */
   package org.apache.cactus;
   
  -import java.io.*;
  +import java.io.Serializable;
  +import java.io.StringWriter;
  +import java.io.PrintWriter;
   
   /**
    * Represent the result of the execution of the Test class by the
  @@ -62,7 +64,7 @@
    *
    * @author <a href="mailto:vmassol@apache.org">Vincent Massol</a>
    *
  - * @version $Id: WebTestResult.java,v 1.4 2002/01/13 15:07:08 vmassol Exp $
  + * @version $Id: WebTestResult.java,v 1.5 2002/01/20 21:11:39 vmassol Exp $
    */
   public class WebTestResult implements Serializable
   {
  
  
  

--
To unsubscribe, e-mail:   <ma...@jakarta.apache.org>
For additional commands, e-mail: <ma...@jakarta.apache.org>