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/02/03 12:39:09 UTC
cvs commit: jakarta-cactus/src/sample/servlet22/org/apache/cactus/sample/unit TestServletTestCaseSpecific.java
vmassol 02/02/03 03:39:09
Modified: src/framework/servlet22/org/apache/cactus/server
HttpServletRequestWrapper.java
PageContextWrapper.java
RequestDispatcherWrapper.java
ServletConfigWrapper.java
ServletContextWrapper.java
src/framework/share/org/apache/cactus/client/authentication
AbstractAuthentication.java
BasicAuthentication.java
src/sample/servlet22/org/apache/cactus TestAll.java
src/sample/servlet22/org/apache/cactus/sample/unit
TestServletTestCaseSpecific.java
Log:
reformatting
Revision Changes Path
1.10 +3 -10 jakarta-cactus/src/framework/servlet22/org/apache/cactus/server/HttpServletRequestWrapper.java
Index: HttpServletRequestWrapper.java
===================================================================
RCS file: /home/cvs/jakarta-cactus/src/framework/servlet22/org/apache/cactus/server/HttpServletRequestWrapper.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- HttpServletRequestWrapper.java 13 Jan 2002 15:01:22 -0000 1.9
+++ HttpServletRequestWrapper.java 3 Feb 2002 11:39:09 -0000 1.10
@@ -53,16 +53,9 @@
*/
package org.apache.cactus.server;
-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 org.apache.cactus.*;
-import org.apache.cactus.util.log.*;
+import org.apache.cactus.ServletURL;
/**
* Encapsulation class for the Servlet 2.2 API <code>HttpServletRequest</code>.
@@ -77,7 +70,7 @@
*
* @author <a href="mailto:vmassol@apache.org">Vincent Massol</a>
*
- * @version $Id: HttpServletRequestWrapper.java,v 1.9 2002/01/13 15:01:22 vmassol Exp $
+ * @version $Id: HttpServletRequestWrapper.java,v 1.10 2002/02/03 11:39:09 vmassol Exp $
*/
public class HttpServletRequestWrapper extends AbstractHttpServletRequestWrapper
{
1.4 +3 -3 jakarta-cactus/src/framework/servlet22/org/apache/cactus/server/PageContextWrapper.java
Index: PageContextWrapper.java
===================================================================
RCS file: /home/cvs/jakarta-cactus/src/framework/servlet22/org/apache/cactus/server/PageContextWrapper.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- PageContextWrapper.java 13 Jan 2002 15:01:22 -0000 1.3
+++ PageContextWrapper.java 3 Feb 2002 11:39:09 -0000 1.4
@@ -53,9 +53,9 @@
*/
package org.apache.cactus.server;
-import javax.servlet.jsp.*;
+import javax.servlet.jsp.PageContext;
-import org.apache.cactus.*;
+import org.apache.cactus.ServletURL;
/**
* Wrapper around <code>PageContext</code> so that get methods that would
@@ -64,7 +64,7 @@
*
* @author <a href="mailto:vmassol@apache.org">Vincent Massol</a>
*
- * @version $Id: PageContextWrapper.java,v 1.3 2002/01/13 15:01:22 vmassol Exp $
+ * @version $Id: PageContextWrapper.java,v 1.4 2002/02/03 11:39:09 vmassol Exp $
*/
public class PageContextWrapper extends AbstractPageContextWrapper
{
1.6 +9 -8 jakarta-cactus/src/framework/servlet22/org/apache/cactus/server/RequestDispatcherWrapper.java
Index: RequestDispatcherWrapper.java
===================================================================
RCS file: /home/cvs/jakarta-cactus/src/framework/servlet22/org/apache/cactus/server/RequestDispatcherWrapper.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- RequestDispatcherWrapper.java 13 Jan 2002 15:01:22 -0000 1.5
+++ RequestDispatcherWrapper.java 3 Feb 2002 11:39:09 -0000 1.6
@@ -53,10 +53,11 @@
*/
package org.apache.cactus.server;
-import java.io.*;
-
-import javax.servlet.*;
-import javax.servlet.http.*;
+import java.io.IOException;
+import javax.servlet.RequestDispatcher;
+import javax.servlet.ServletException;
+import javax.servlet.ServletRequest;
+import javax.servlet.ServletResponse;
/**
* Wrapper around <code>RequestDispatcher</code> which overrides the
@@ -65,14 +66,14 @@
*
* @author <a href="mailto:vmassol@apache.org">Vincent Massol</a>
*
- * @version $Id: RequestDispatcherWrapper.java,v 1.5 2002/01/13 15:01:22 vmassol Exp $
+ * @version $Id: RequestDispatcherWrapper.java,v 1.6 2002/02/03 11:39:09 vmassol Exp $
*/
public class RequestDispatcherWrapper implements RequestDispatcher
{
/**
* The original request dispatcher object
*/
- private RequestDispatcher originalDispatcher;
+ private RequestDispatcher originalDispatcher;
/**
* @param theOriginalDispatcher the original request dispatcher object
@@ -94,7 +95,7 @@
throws IOException, ServletException
{
HttpServletRequestWrapper request =
- (HttpServletRequestWrapper)theRequest;
+ (HttpServletRequestWrapper) theRequest;
this.originalDispatcher.forward(request.getOriginalRequest(),
theResponse);
}
@@ -111,7 +112,7 @@
throws IOException, ServletException
{
HttpServletRequestWrapper request =
- (HttpServletRequestWrapper)theRequest;
+ (HttpServletRequestWrapper) theRequest;
this.originalDispatcher.include(request.getOriginalRequest(),
theResponse);
}
1.6 +9 -11 jakarta-cactus/src/framework/servlet22/org/apache/cactus/server/ServletConfigWrapper.java
Index: ServletConfigWrapper.java
===================================================================
RCS file: /home/cvs/jakarta-cactus/src/framework/servlet22/org/apache/cactus/server/ServletConfigWrapper.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- ServletConfigWrapper.java 13 Jan 2002 15:01:22 -0000 1.5
+++ ServletConfigWrapper.java 3 Feb 2002 11:39:09 -0000 1.6
@@ -53,13 +53,11 @@
*/
package org.apache.cactus.server;
-import java.util.*;
-import java.io.*;
-import java.security.*;
-import java.net.*;
-
-import javax.servlet.*;
-import javax.servlet.http.*;
+import java.util.Enumeration;
+import java.util.Hashtable;
+import java.util.Vector;
+import javax.servlet.ServletConfig;
+import javax.servlet.ServletContext;
/**
* Wrapper around <code>ServletConfig</code> which overrides the
@@ -68,7 +66,7 @@
*
* @author <a href="mailto:vmassol@apache.org">Vincent Massol</a>
*
- * @version $Id: ServletConfigWrapper.java,v 1.5 2002/01/13 15:01:22 vmassol Exp $
+ * @version $Id: ServletConfigWrapper.java,v 1.6 2002/02/03 11:39:09 vmassol Exp $
* @see ServletContext
*/
public class ServletConfigWrapper implements ServletConfig
@@ -140,7 +138,7 @@
{
// Look first in the list of parameters set using the
// setInitParameter() method.
- String value = (String)this.initParameters.get(theName);
+ String value = (String) this.initParameters.get(theName);
if (value == null) {
value = this.originalConfig.getInitParameter(theName);
}
@@ -159,13 +157,13 @@
Enumeration enum = this.initParameters.keys();
while (enum.hasMoreElements()) {
- String value = (String)enum.nextElement();
+ String value = (String) enum.nextElement();
names.add(value);
}
enum = this.originalConfig.getInitParameterNames();
while (enum.hasMoreElements()) {
- String value = (String)enum.nextElement();
+ String value = (String) enum.nextElement();
names.add(value);
}
1.7 +2 -8 jakarta-cactus/src/framework/servlet22/org/apache/cactus/server/ServletContextWrapper.java
Index: ServletContextWrapper.java
===================================================================
RCS file: /home/cvs/jakarta-cactus/src/framework/servlet22/org/apache/cactus/server/ServletContextWrapper.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- ServletContextWrapper.java 13 Jan 2002 15:01:22 -0000 1.6
+++ ServletContextWrapper.java 3 Feb 2002 11:39:09 -0000 1.7
@@ -53,13 +53,7 @@
*/
package org.apache.cactus.server;
-import java.util.*;
-import java.io.*;
-import java.security.*;
-import java.net.*;
-
-import javax.servlet.*;
-import javax.servlet.http.*;
+import javax.servlet.ServletContext;
/**
* Wrapper around Servlet 2.2 <code>ServletContext</code>. This wrapper
@@ -68,7 +62,7 @@
*
* @author <a href="mailto:vmassol@apache.org">Vincent Massol</a>
*
- * @version $Id: ServletContextWrapper.java,v 1.6 2002/01/13 15:01:22 vmassol Exp $
+ * @version $Id: ServletContextWrapper.java,v 1.7 2002/02/03 11:39:09 vmassol Exp $
* @see AbstractServletContextWrapper
*/
public class ServletContextWrapper extends AbstractServletContextWrapper
1.5 +3 -1 jakarta-cactus/src/framework/share/org/apache/cactus/client/authentication/AbstractAuthentication.java
Index: AbstractAuthentication.java
===================================================================
RCS file: /home/cvs/jakarta-cactus/src/framework/share/org/apache/cactus/client/authentication/AbstractAuthentication.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- AbstractAuthentication.java 2 Feb 2002 17:49:10 -0000 1.4
+++ AbstractAuthentication.java 3 Feb 2002 11:39:09 -0000 1.5
@@ -69,7 +69,9 @@
* @author <a href="mailto:vmassol@apache.org">Vincent Massol</a>
* @author <a href="mailto:Jason.Robertson@acs-inc.com">Jason Robertson</a>
*
- * @version $Id: AbstractAuthentication.java,v 1.4 2002/02/02 17:49:10 vmassol Exp $
+ * @since 1.3
+ *
+ * @version $Id: AbstractAuthentication.java,v 1.5 2002/02/03 11:39:09 vmassol Exp $
*/
public abstract class AbstractAuthentication
{
1.6 +11 -0 jakarta-cactus/src/framework/share/org/apache/cactus/client/authentication/BasicAuthentication.java
Index: BasicAuthentication.java
===================================================================
RCS file: /home/cvs/jakarta-cactus/src/framework/share/org/apache/cactus/client/authentication/BasicAuthentication.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- BasicAuthentication.java 2 Feb 2002 17:49:10 -0000 1.5
+++ BasicAuthentication.java 3 Feb 2002 11:39:09 -0000 1.6
@@ -57,6 +57,17 @@
import java.text.CharacterIterator;
import java.text.StringCharacterIterator;
+/**
+ * Basic Authentication support.
+ *
+ * @author <a href="mailto:vmassol@apache.org">Vincent Massol</a>
+ * @author <a href="mailto:Jason.Robertson@acs-inc.com">Jason Robertson</a>
+ *
+ * @since 1.3
+ * @see AbstractAuthentication
+ *
+ * @version $Id: BasicAuthentication.java,v 1.6 2002/02/03 11:39:09 vmassol Exp $
+ */
public class BasicAuthentication extends AbstractAuthentication
{
public BasicAuthentication(String userid, String password)
1.8 +5 -3 jakarta-cactus/src/sample/servlet22/org/apache/cactus/TestAll.java
Index: TestAll.java
===================================================================
RCS file: /home/cvs/jakarta-cactus/src/sample/servlet22/org/apache/cactus/TestAll.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- TestAll.java 13 Jan 2002 21:21:17 -0000 1.7
+++ TestAll.java 3 Feb 2002 11:39:09 -0000 1.8
@@ -53,7 +53,9 @@
*/
package org.apache.cactus;
-import junit.framework.*;
+import junit.framework.Test;
+import junit.framework.TestCase;
+import junit.framework.TestSuite;
/**
* Run all the sample tests of Cactus for Servlet API 2.2 that do need a
@@ -61,7 +63,7 @@
*
* @author <a href="mailto:vmassol@apache.org">Vincent Massol</a>
*
- * @version $Id: TestAll.java,v 1.7 2002/01/13 21:21:17 vmassol Exp $
+ * @version $Id: TestAll.java,v 1.8 2002/02/03 11:39:09 vmassol Exp $
*/
public class TestAll extends TestCase
{
@@ -82,7 +84,7 @@
*/
public static void main(String[] theArgs)
{
- junit.ui.TestRunner.main(new String[] {TestAll.class.getName()});
+ junit.ui.TestRunner.main(new String[]{TestAll.class.getName()});
}
/**
1.6 +5 -11 jakarta-cactus/src/sample/servlet22/org/apache/cactus/sample/unit/TestServletTestCaseSpecific.java
Index: TestServletTestCaseSpecific.java
===================================================================
RCS file: /home/cvs/jakarta-cactus/src/sample/servlet22/org/apache/cactus/sample/unit/TestServletTestCaseSpecific.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- TestServletTestCaseSpecific.java 13 Jan 2002 15:29:38 -0000 1.5
+++ TestServletTestCaseSpecific.java 3 Feb 2002 11:39:09 -0000 1.6
@@ -53,16 +53,10 @@
*/
package org.apache.cactus.sample.unit;
-import java.util.*;
-import java.text.*;
-import javax.servlet.*;
-import javax.servlet.http.*;
-import java.net.*;
-import java.io.*;
+import junit.framework.Test;
+import junit.framework.TestSuite;
-import junit.framework.*;
-
-import org.apache.cactus.*;
+import org.apache.cactus.ServletTestCase;
/**
* Cactus unit tests for testing <code>ServletTestCase</code>. These tests
@@ -76,7 +70,7 @@
*
* @author <a href="mailto:vmassol@apache.org">Vincent Massol</a>
*
- * @version $Id: TestServletTestCaseSpecific.java,v 1.5 2002/01/13 15:29:38 vmassol Exp $
+ * @version $Id: TestServletTestCaseSpecific.java,v 1.6 2002/02/03 11:39:09 vmassol Exp $
*/
public class TestServletTestCaseSpecific extends ServletTestCase
{
@@ -97,7 +91,7 @@
*/
public static void main(String[] theArgs)
{
- junit.ui.TestRunner.main(new String[] {
+ junit.ui.TestRunner.main(new String[]{
TestServletTestCaseSpecific.class.getName()});
}
--
To unsubscribe, e-mail: <ma...@jakarta.apache.org>
For additional commands, e-mail: <ma...@jakarta.apache.org>