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 cm...@apache.org on 2003/05/24 18:48:13 UTC
cvs commit: jakarta-cactus/framework/src/java/j2ee13/org/apache/cactus/server FilterTestCaller.java
cmlenz 2003/05/24 09:48:13
Modified: framework/src/java/share/org/apache/cactus/server
ServletTestCaller.java JspTestCaller.java
framework/src/java/share/org/apache/cactus JspTestCase.java
ServletTestCase.java
framework/src/java/j2ee13/org/apache/cactus
FilterTestCase.java
samples/servlet/src/test-cactus/share/org/apache/cactus/sample/unit
TestServletConfig.java
framework/src/java/j2ee13/org/apache/cactus/server
FilterTestCaller.java
Log:
Revert the move of the wrapper classes from o.a.c.server to o.a.c.server.wrapper
Revision Changes Path
1.9 +1 -3 jakarta-cactus/framework/src/java/share/org/apache/cactus/server/ServletTestCaller.java
Index: ServletTestCaller.java
===================================================================
RCS file: /home/cvs/jakarta-cactus/framework/src/java/share/org/apache/cactus/server/ServletTestCaller.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- ServletTestCaller.java 22 Feb 2003 12:01:50 -0000 1.8
+++ ServletTestCaller.java 24 May 2003 16:48:13 -0000 1.9
@@ -67,8 +67,6 @@
import org.apache.cactus.AbstractWebServerTestCase;
import org.apache.cactus.ServletTestCase;
import org.apache.cactus.ServletURL;
-import org.apache.cactus.server.wrapper.HttpServletRequestWrapper;
-import org.apache.cactus.server.wrapper.ServletConfigWrapper;
/**
* Responsible for instanciating the <code>TestCase</code> class on the server
1.9 +1 -2 jakarta-cactus/framework/src/java/share/org/apache/cactus/server/JspTestCaller.java
Index: JspTestCaller.java
===================================================================
RCS file: /home/cvs/jakarta-cactus/framework/src/java/share/org/apache/cactus/server/JspTestCaller.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- JspTestCaller.java 22 Feb 2003 12:01:50 -0000 1.8
+++ JspTestCaller.java 24 May 2003 16:48:13 -0000 1.9
@@ -66,7 +66,6 @@
import org.apache.cactus.AbstractWebServerTestCase;
import org.apache.cactus.JspTestCase;
import org.apache.cactus.ServletURL;
-import org.apache.cactus.server.wrapper.PageContextWrapper;
/**
* Call the test method on the server side after assigning the JSP implicit
1.10 +2 -2 jakarta-cactus/framework/src/java/share/org/apache/cactus/JspTestCase.java
Index: JspTestCase.java
===================================================================
RCS file: /home/cvs/jakarta-cactus/framework/src/java/share/org/apache/cactus/JspTestCase.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- JspTestCase.java 17 Mar 2003 19:15:14 -0000 1.9
+++ JspTestCase.java 24 May 2003 16:48:13 -0000 1.10
@@ -60,7 +60,7 @@
import org.apache.cactus.configuration.Configuration;
import org.apache.cactus.configuration.JspConfiguration;
-import org.apache.cactus.server.wrapper.PageContextWrapper;
+import org.apache.cactus.server.PageContextWrapper;
/**
* Test classes that need access to valid JSP implicit objects (such as the
1.12 +3 -3 jakarta-cactus/framework/src/java/share/org/apache/cactus/ServletTestCase.java
Index: ServletTestCase.java
===================================================================
RCS file: /home/cvs/jakarta-cactus/framework/src/java/share/org/apache/cactus/ServletTestCase.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- ServletTestCase.java 17 Mar 2003 19:13:51 -0000 1.11
+++ ServletTestCase.java 24 May 2003 16:48:13 -0000 1.12
@@ -63,7 +63,7 @@
import org.apache.cactus.configuration.Configuration;
import org.apache.cactus.configuration.ServletConfiguration;
-import org.apache.cactus.server.wrapper.ServletConfigWrapper;
+import org.apache.cactus.server.ServletConfigWrapper;
/**
* Test classes that need access to valid Servlet implicit objects (such as the
@@ -83,7 +83,7 @@
* <code>beginXXX()</code> or <code>endXXX()</code> methods it will
* have the <code>null</code> value.
*/
- public org.apache.cactus.server.wrapper.HttpServletRequestWrapper request;
+ public org.apache.cactus.server.HttpServletRequestWrapper request;
/**
* Valid <code>HttpServletResponse</code> object that you can access from
1.13 +3 -3 jakarta-cactus/framework/src/java/j2ee13/org/apache/cactus/FilterTestCase.java
Index: FilterTestCase.java
===================================================================
RCS file: /home/cvs/jakarta-cactus/framework/src/java/j2ee13/org/apache/cactus/FilterTestCase.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- FilterTestCase.java 17 Mar 2003 19:15:13 -0000 1.12
+++ FilterTestCase.java 24 May 2003 16:48:13 -0000 1.13
@@ -61,7 +61,7 @@
import org.apache.cactus.configuration.Configuration;
import org.apache.cactus.configuration.FilterConfiguration;
-import org.apache.cactus.server.wrapper.FilterConfigWrapper;
+import org.apache.cactus.server.FilterConfigWrapper;
/**
* Test classes that need access to valid Filter implicit objects (such as the
@@ -81,7 +81,7 @@
* <code>beginXXX()</code> or <code>endXXX()</code> methods it will
* have the <code>null</code> value.
*/
- public org.apache.cactus.server.wrapper.HttpServletRequestWrapper request;
+ public org.apache.cactus.server.HttpServletRequestWrapper request;
/**
* Valid <code>HttpServletResponse</code> object that you can access from
1.5 +2 -2 jakarta-cactus/samples/servlet/src/test-cactus/share/org/apache/cactus/sample/unit/TestServletConfig.java
Index: TestServletConfig.java
===================================================================
RCS file: /home/cvs/jakarta-cactus/samples/servlet/src/test-cactus/share/org/apache/cactus/sample/unit/TestServletConfig.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- TestServletConfig.java 17 Mar 2003 19:30:32 -0000 1.4
+++ TestServletConfig.java 24 May 2003 16:48:13 -0000 1.5
@@ -62,7 +62,7 @@
import javax.servlet.ServletContext;
import org.apache.cactus.ServletTestCase;
-import org.apache.cactus.server.wrapper.ServletContextWrapper;
+import org.apache.cactus.server.ServletContextWrapper;
/**
* Tests that exercise the Servlet Config.
1.10 +1 -3 jakarta-cactus/framework/src/java/j2ee13/org/apache/cactus/server/FilterTestCaller.java
Index: FilterTestCaller.java
===================================================================
RCS file: /home/cvs/jakarta-cactus/framework/src/java/j2ee13/org/apache/cactus/server/FilterTestCaller.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- FilterTestCaller.java 22 Feb 2003 12:01:50 -0000 1.9
+++ FilterTestCaller.java 24 May 2003 16:48:13 -0000 1.10
@@ -66,8 +66,6 @@
import org.apache.cactus.AbstractWebServerTestCase;
import org.apache.cactus.FilterTestCase;
import org.apache.cactus.ServletURL;
-import org.apache.cactus.server.wrapper.FilterConfigWrapper;
-import org.apache.cactus.server.wrapper.HttpServletRequestWrapper;
/**
* Responsible for instanciating the <code>TestCase</code> class on the server
---------------------------------------------------------------------
To unsubscribe, e-mail: cactus-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: cactus-dev-help@jakarta.apache.org