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/17 21:03:25 UTC
cvs commit: jakarta-cactus/src/framework/share/org/apache/cactus/util/log BaseLog.java BaseLogDummy.java Log.java
vmassol 02/02/17 12:03:25
Modified: src/framework/servlet23/org/apache/cactus/server
FilterTestCaller.java FilterTestController.java
src/framework/share/org/apache/cactus ServiceDefinition.java
ServiceEnumeration.java ServletTestCase.java
ServletTestRequest.java ServletURL.java
WebRequest.java
src/framework/share/org/apache/cactus/client
AbstractHttpClient.java
src/framework/share/org/apache/cactus/server
AbstractTestCaller.java AbstractTestController.java
JspImplicitObjects.java JspTestCaller.java
JspTestController.java JspTestRedirector.java
ServletImplicitObjects.java ServletTestCaller.java
ServletTestController.java
ServletTestRedirector.java ServletUtil.java
src/framework/share/org/apache/cactus/util AssertUtils.java
ChainedRuntimeException.java ClientCookie.java
JUnitVersionHelper.java
src/framework/share/org/apache/cactus/util/log BaseLog.java
BaseLogDummy.java Log.java
Log:
some more checkstyle-reported corrections
Revision Changes Path
1.9 +2 -3 jakarta-cactus/src/framework/servlet23/org/apache/cactus/server/FilterTestCaller.java
Index: FilterTestCaller.java
===================================================================
RCS file: /home/cvs/jakarta-cactus/src/framework/servlet23/org/apache/cactus/server/FilterTestCaller.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- FilterTestCaller.java 17 Feb 2002 19:00:10 -0000 1.8
+++ FilterTestCaller.java 17 Feb 2002 20:03:24 -0000 1.9
@@ -68,7 +68,7 @@
*
* @author <a href="mailto:vmassol@apache.org">Vincent Massol</a>
*
- * @version $Id: FilterTestCaller.java,v 1.8 2002/02/17 19:00:10 vmassol Exp $
+ * @version $Id: FilterTestCaller.java,v 1.9 2002/02/17 20:03:24 vmassol Exp $
*/
public class FilterTestCaller extends AbstractTestCaller
{
@@ -81,8 +81,7 @@
}
/**
- * Sets the test case fields using the implicit objects (using reflection).
- * @param theTestInstance the test class instance
+ * @see AbstractTestCaller#setTestCaseFields(AbstractTestCase)
*/
protected void setTestCaseFields(AbstractTestCase theTestInstance)
throws Exception
1.5 +2 -2 jakarta-cactus/src/framework/servlet23/org/apache/cactus/server/FilterTestController.java
Index: FilterTestController.java
===================================================================
RCS file: /home/cvs/jakarta-cactus/src/framework/servlet23/org/apache/cactus/server/FilterTestController.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- FilterTestController.java 2 Feb 2002 17:54:36 -0000 1.4
+++ FilterTestController.java 17 Feb 2002 20:03:24 -0000 1.5
@@ -61,12 +61,12 @@
*
* @author <a href="mailto:vmassol@apache.org">Vincent Massol</a>
*
- * @version $Id: FilterTestController.java,v 1.4 2002/02/02 17:54:36 vmassol Exp $
+ * @version $Id: FilterTestController.java,v 1.5 2002/02/17 20:03:24 vmassol Exp $
*/
public class FilterTestController extends AbstractTestController
{
/**
- * @return the test caller that will be used to execute the test
+ * @see AbstractTestController#getTestCaller(WebImplicitObjects)
*/
protected AbstractTestCaller getTestCaller(
WebImplicitObjects theObjects)
1.7 +8 -5 jakarta-cactus/src/framework/share/org/apache/cactus/ServiceDefinition.java
Index: ServiceDefinition.java
===================================================================
RCS file: /home/cvs/jakarta-cactus/src/framework/share/org/apache/cactus/ServiceDefinition.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- ServiceDefinition.java 13 Jan 2002 15:07:08 -0000 1.6
+++ ServiceDefinition.java 17 Feb 2002 20:03:24 -0000 1.7
@@ -1,4 +1,6 @@
/*
+ * ====================================================================
+ *
* The Apache Software License, Version 1.1
*
* Copyright (c) 2001-2002 The Apache Software Foundation. All rights
@@ -23,10 +25,10 @@
* Alternately, this acknowlegement may appear in the software itself,
* if and wherever such third-party acknowlegements normally appear.
*
- * 4. The names "The Jakarta Project", "Cactus", and "Apache Software
- * Foundation" must not be used to endorse or promote products derived
- * from this software without prior written permission. For written
- * permission, please contact apache@apache.org.
+ * 4. The names "The Jakarta Project", "Cactus" and "Apache Software
+ * Foundation" must not be used to endorse or promote products
+ * derived from this software without prior written permission. For
+ * written permission, please contact apache@apache.org.
*
* 5. Products derived from this software may not be called "Apache"
* nor may "Apache" appear in their names without prior written
@@ -50,6 +52,7 @@
* individuals on behalf of the Apache Software Foundation. For more
* information on the Apache Software Foundation, please see
* <http://www.apache.org/>.
+ *
*/
package org.apache.cactus;
@@ -59,7 +62,7 @@
*
* @author <a href="mailto:vmassol@apache.org">Vincent Massol</a>
*
- * @version $Id: ServiceDefinition.java,v 1.6 2002/01/13 15:07:08 vmassol Exp $
+ * @version $Id: ServiceDefinition.java,v 1.7 2002/02/17 20:03:24 vmassol Exp $
*/
public class ServiceDefinition
{
1.7 +15 -6 jakarta-cactus/src/framework/share/org/apache/cactus/ServiceEnumeration.java
Index: ServiceEnumeration.java
===================================================================
RCS file: /home/cvs/jakarta-cactus/src/framework/share/org/apache/cactus/ServiceEnumeration.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- ServiceEnumeration.java 13 Jan 2002 15:07:08 -0000 1.6
+++ ServiceEnumeration.java 17 Feb 2002 20:03:24 -0000 1.7
@@ -1,4 +1,6 @@
/*
+ * ====================================================================
+ *
* The Apache Software License, Version 1.1
*
* Copyright (c) 2001-2002 The Apache Software Foundation. All rights
@@ -23,10 +25,10 @@
* Alternately, this acknowlegement may appear in the software itself,
* if and wherever such third-party acknowlegements normally appear.
*
- * 4. The names "The Jakarta Project", "Cactus", and "Apache Software
- * Foundation" must not be used to endorse or promote products derived
- * from this software without prior written permission. For written
- * permission, please contact apache@apache.org.
+ * 4. The names "The Jakarta Project", "Cactus" and "Apache Software
+ * Foundation" must not be used to endorse or promote products
+ * derived from this software without prior written permission. For
+ * written permission, please contact apache@apache.org.
*
* 5. Products derived from this software may not be called "Apache"
* nor may "Apache" appear in their names without prior written
@@ -50,6 +52,7 @@
* individuals on behalf of the Apache Software Foundation. For more
* information on the Apache Software Foundation, please see
* <http://www.apache.org/>.
+ *
*/
package org.apache.cactus;
@@ -59,7 +62,7 @@
*
* @author <a href="mailto:vmassol@apache.org">Vincent Massol</a>
*
- * @version $Id: ServiceEnumeration.java,v 1.6 2002/01/13 15:07:08 vmassol Exp $
+ * @version $Id: ServiceEnumeration.java,v 1.7 2002/02/17 20:03:24 vmassol Exp $
*/
public class ServiceEnumeration
{
@@ -86,7 +89,12 @@
*/
private String name;
- public ServiceEnumeration(String theServiceName)
+ /**
+ * Private constructor so that only allowed enumeration can be created.
+ *
+ * @param theServiceName the name of the service
+ */
+ private ServiceEnumeration(String theServiceName)
{
this.name = theServiceName;
}
@@ -95,6 +103,7 @@
* Compares a string representing the name of the service with the Service
* enumerated type.
*
+ * @param theString the string to compare with this Service name
* @return true if the string corresponds to the current Service
*/
public boolean equals(String theString)
1.12 +8 -5 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.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- ServletTestCase.java 2 Feb 2002 17:26:54 -0000 1.11
+++ ServletTestCase.java 17 Feb 2002 20:03:24 -0000 1.12
@@ -1,4 +1,6 @@
/*
+ * ====================================================================
+ *
* The Apache Software License, Version 1.1
*
* Copyright (c) 2001-2002 The Apache Software Foundation. All rights
@@ -23,10 +25,10 @@
* Alternately, this acknowlegement may appear in the software itself,
* if and wherever such third-party acknowlegements normally appear.
*
- * 4. The names "The Jakarta Project", "Cactus", and "Apache Software
- * Foundation" must not be used to endorse or promote products derived
- * from this software without prior written permission. For written
- * permission, please contact apache@apache.org.
+ * 4. The names "The Jakarta Project", "Cactus" and "Apache Software
+ * Foundation" must not be used to endorse or promote products
+ * derived from this software without prior written permission. For
+ * written permission, please contact apache@apache.org.
*
* 5. Products derived from this software may not be called "Apache"
* nor may "Apache" appear in their names without prior written
@@ -50,6 +52,7 @@
* individuals on behalf of the Apache Software Foundation. For more
* information on the Apache Software Foundation, please see
* <http://www.apache.org/>.
+ *
*/
package org.apache.cactus;
@@ -66,7 +69,7 @@
*
* @author <a href="mailto:vmassol@apache.org">Vincent Massol</a>
*
- * @version $Id: ServletTestCase.java,v 1.11 2002/02/02 17:26:54 vmassol Exp $
+ * @version $Id: ServletTestCase.java,v 1.12 2002/02/17 20:03:24 vmassol Exp $
*/
public class ServletTestCase extends AbstractTestCase
{
1.10 +8 -5 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.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- ServletTestRequest.java 20 Jan 2002 21:11:39 -0000 1.9
+++ ServletTestRequest.java 17 Feb 2002 20:03:24 -0000 1.10
@@ -1,4 +1,6 @@
/*
+ * ====================================================================
+ *
* The Apache Software License, Version 1.1
*
* Copyright (c) 2001-2002 The Apache Software Foundation. All rights
@@ -23,10 +25,10 @@
* Alternately, this acknowlegement may appear in the software itself,
* if and wherever such third-party acknowlegements normally appear.
*
- * 4. The names "The Jakarta Project", "Cactus", and "Apache Software
- * Foundation" must not be used to endorse or promote products derived
- * from this software without prior written permission. For written
- * permission, please contact apache@apache.org.
+ * 4. The names "The Jakarta Project", "Cactus" and "Apache Software
+ * Foundation" must not be used to endorse or promote products
+ * derived from this software without prior written permission. For
+ * written permission, please contact apache@apache.org.
*
* 5. Products derived from this software may not be called "Apache"
* nor may "Apache" appear in their names without prior written
@@ -50,6 +52,7 @@
* individuals on behalf of the Apache Software Foundation. For more
* information on the Apache Software Foundation, please see
* <http://www.apache.org/>.
+ *
*/
package org.apache.cactus;
@@ -77,7 +80,7 @@
*
* @author <a href="mailto:vmassol@apache.org">Vincent Massol</a>
*
- * @version $Id: ServletTestRequest.java,v 1.9 2002/01/20 21:11:39 vmassol Exp $
+ * @version $Id: ServletTestRequest.java,v 1.10 2002/02/17 20:03:24 vmassol Exp $
* @deprecated As of Cactus 1.2, replaced by WebRequest
* @see WebRequest
*/
1.16 +15 -9 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.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- ServletURL.java 17 Feb 2002 19:00:10 -0000 1.15
+++ ServletURL.java 17 Feb 2002 20:03:24 -0000 1.16
@@ -1,4 +1,6 @@
/*
+ * ====================================================================
+ *
* The Apache Software License, Version 1.1
*
* Copyright (c) 2001-2002 The Apache Software Foundation. All rights
@@ -23,10 +25,10 @@
* Alternately, this acknowlegement may appear in the software itself,
* if and wherever such third-party acknowlegements normally appear.
*
- * 4. The names "The Jakarta Project", "Cactus", and "Apache Software
- * Foundation" must not be used to endorse or promote products derived
- * from this software without prior written permission. For written
- * permission, please contact apache@apache.org.
+ * 4. The names "The Jakarta Project", "Cactus" and "Apache Software
+ * Foundation" must not be used to endorse or promote products
+ * derived from this software without prior written permission. For
+ * written permission, please contact apache@apache.org.
*
* 5. Products derived from this software may not be called "Apache"
* nor may "Apache" appear in their names without prior written
@@ -50,6 +52,7 @@
* individuals on behalf of the Apache Software Foundation. For more
* information on the Apache Software Foundation, please see
* <http://www.apache.org/>.
+ *
*/
package org.apache.cactus;
@@ -72,20 +75,21 @@
* path will be an empty string. Otherwise, this path starts with a character
* but does not end with a character.</li>
* <li><b>Servlet Path</b>: The path section that directly corresponds to the
- * mapping which activated this request. This path starts with a character.</li>
+ * mapping which activated this request. This path starts with a
+ * character.</li>
* <li><b>PathInfo</b>: The part of the request path that is not part of the
* Context Path or the Servlet Path.</li></ul></pre></code>
*
* @author <a href="mailto:vmassol@apache.org">Vincent Massol</a>
*
- * @version $Id: ServletURL.java,v 1.15 2002/02/17 19:00:10 vmassol Exp $
+ * @version $Id: ServletURL.java,v 1.16 2002/02/17 20:03:24 vmassol Exp $
*/
public class ServletURL
{
/**
- * Name of the parameter in the HTTP request that represents the Server name
- * in the URL to simulate. The name is voluntarily long so that it will not
- * clash with a user-defined parameter.
+ * Name of the parameter in the HTTP request that represents the Server
+ * name in the URL to simulate. The name is voluntarily long so that it
+ * will not clash with a user-defined parameter.
*/
public final static String URL_SERVER_NAME_PARAM =
"Cactus_URL_Server";
@@ -332,6 +336,8 @@
* HTTP request.
*
* @param theRequest the incoming HTTP request.
+ * @return the <code>ServletURL</code> object unserialized from the HTTP
+ * request
*/
public static ServletURL loadFromRequest(HttpServletRequest theRequest)
{
1.15 +3 -2 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.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- WebRequest.java 16 Feb 2002 23:25:49 -0000 1.14
+++ WebRequest.java 17 Feb 2002 20:03:24 -0000 1.15
@@ -92,7 +92,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.14 2002/02/16 23:25:49 vmassol Exp $
+ * @version $Id: WebRequest.java,v 1.15 2002/02/17 20:03:24 vmassol Exp $
*/
public class WebRequest
{
@@ -183,7 +183,8 @@
*
* @param theAuthenticationObject the authentication object
*/
- public void setAuthentication(AbstractAuthentication theAuthenticationObject)
+ public void setAuthentication(
+ AbstractAuthentication theAuthenticationObject)
{
this.authentication = theAuthenticationObject;
}
1.20 +1 -3 jakarta-cactus/src/framework/share/org/apache/cactus/client/AbstractHttpClient.java
Index: AbstractHttpClient.java
===================================================================
RCS file: /home/cvs/jakarta-cactus/src/framework/share/org/apache/cactus/client/AbstractHttpClient.java,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- AbstractHttpClient.java 17 Feb 2002 19:00:11 -0000 1.19
+++ AbstractHttpClient.java 17 Feb 2002 20:03:24 -0000 1.20
@@ -66,8 +66,6 @@
import org.apache.cactus.WebRequest;
import org.apache.cactus.WebTestResult;
import org.apache.cactus.client.authentication.AbstractAuthentication;
-import org.apache.cactus.util.log.Log;
-import org.apache.cactus.util.log.LogService;
/**
* Abstract class for performing the steps necessary to run a test. It involves
@@ -77,7 +75,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: AbstractHttpClient.java,v 1.19 2002/02/17 19:00:11 vmassol Exp $
+ * @version $Id: AbstractHttpClient.java,v 1.20 2002/02/17 20:03:24 vmassol Exp $
*/
public abstract class AbstractHttpClient
{
1.9 +13 -2 jakarta-cactus/src/framework/share/org/apache/cactus/server/AbstractTestCaller.java
Index: AbstractTestCaller.java
===================================================================
RCS file: /home/cvs/jakarta-cactus/src/framework/share/org/apache/cactus/server/AbstractTestCaller.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- AbstractTestCaller.java 17 Feb 2002 18:44:23 -0000 1.8
+++ AbstractTestCaller.java 17 Feb 2002 20:03:24 -0000 1.9
@@ -75,7 +75,7 @@
*
* @author <a href="mailto:vmassol@apache.org">Vincent Massol</a>
*
- * @version $Id: AbstractTestCaller.java,v 1.8 2002/02/17 18:44:23 vmassol Exp $
+ * @version $Id: AbstractTestCaller.java,v 1.9 2002/02/17 20:03:24 vmassol Exp $
*/
public abstract class AbstractTestCaller
{
@@ -111,6 +111,8 @@
*
* @param theTestCase the instance of the test case class on which the
* class variable (implicit objects) should be set
+ * @exception Exception if an errors occurs when setting the implicit
+ * objects
*/
protected abstract void setTestCaseFields(AbstractTestCase theTestCase)
throws Exception;
@@ -215,6 +217,8 @@
/**
* @return the class to test class name, extracted from the HTTP request
+ * @exception ServletException if the class name of the test case is missing
+ * from the HTTP request
*/
protected String getTestClassName() throws ServletException
{
@@ -238,6 +242,8 @@
/**
* @return the class method to call for the current test case, extracted
* from the HTTP request
+ * @exception ServletException if the method name of the test case is
+ * missing from the HTTP request
*/
protected String getTestMethodName() throws ServletException
{
@@ -280,6 +286,9 @@
* @param theClassName the name of the test class
* @param theTestCaseName the name of the current test case
* @return an instance of the test class to call
+ * @exception ServletException if the test case instance for the current
+ * test fails to be instanciated (for example if some
+ * information is missing from the HTTP request)
*/
protected AbstractTestCase getTestClassInstance(String theClassName,
String theTestCaseName) throws ServletException
@@ -318,8 +327,10 @@
/**
* @param theClassName the name of the test class
- * @param theTestCaseName the name of the current test case
* @return the class object the test class to call
+ * @exception ServletException if the class of the current test case
+ * cannot be loaded in memory (i.e. it is not in the
+ * classpath)
*/
protected Class getTestClassClass(String theClassName)
throws ServletException
1.12 +13 -5 jakarta-cactus/src/framework/share/org/apache/cactus/server/AbstractTestController.java
Index: AbstractTestController.java
===================================================================
RCS file: /home/cvs/jakarta-cactus/src/framework/share/org/apache/cactus/server/AbstractTestController.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- AbstractTestController.java 17 Feb 2002 19:00:11 -0000 1.11
+++ AbstractTestController.java 17 Feb 2002 20:03:24 -0000 1.12
@@ -1,4 +1,6 @@
/*
+ * ====================================================================
+ *
* The Apache Software License, Version 1.1
*
* Copyright (c) 2001-2002 The Apache Software Foundation. All rights
@@ -23,10 +25,10 @@
* Alternately, this acknowlegement may appear in the software itself,
* if and wherever such third-party acknowlegements normally appear.
*
- * 4. The names "The Jakarta Project", "Cactus", and "Apache Software
- * Foundation" must not be used to endorse or promote products derived
- * from this software without prior written permission. For written
- * permission, please contact apache@apache.org.
+ * 4. The names "The Jakarta Project", "Cactus" and "Apache Software
+ * Foundation" must not be used to endorse or promote products
+ * derived from this software without prior written permission. For
+ * written permission, please contact apache@apache.org.
*
* 5. Products derived from this software may not be called "Apache"
* nor may "Apache" appear in their names without prior written
@@ -50,6 +52,7 @@
* individuals on behalf of the Apache Software Foundation. For more
* information on the Apache Software Foundation, please see
* <http://www.apache.org/>.
+ *
*/
package org.apache.cactus.server;
@@ -69,7 +72,7 @@
*
* @author <a href="mailto:vmassol@apache.org">Vincent Massol</a>
*
- * @version $Id: AbstractTestController.java,v 1.11 2002/02/17 19:00:11 vmassol Exp $
+ * @version $Id: AbstractTestController.java,v 1.12 2002/02/17 20:03:24 vmassol Exp $
*/
public abstract class AbstractTestController
{
@@ -80,6 +83,7 @@
LogService.getInstance().getLog(AbstractTestController.class.getName());
/**
+ * @param theObjects the implicit objects coming from the redirector
* @return the test caller that will be used to execute the test
*/
protected abstract AbstractTestCaller getTestCaller(
@@ -91,6 +95,8 @@
*
* @param theObjects the implicit objects (they are different for the
* different redirectors)
+ * @exception ServletException if an error occurs when servicing the
+ * request
*/
public void handleRequest(WebImplicitObjects theObjects)
throws ServletException
@@ -160,6 +166,8 @@
* @param theRequest the HTTP request
* @return the service name of the service to call (there are 2 services
* "do test" and "get results"), extracted from the HTTP request
+ * @exception ServletException if the service to execute is missing from
+ * the HTTP request
*/
private String getServiceName(HttpServletRequest theRequest)
throws ServletException
1.7 +8 -5 jakarta-cactus/src/framework/share/org/apache/cactus/server/JspImplicitObjects.java
Index: JspImplicitObjects.java
===================================================================
RCS file: /home/cvs/jakarta-cactus/src/framework/share/org/apache/cactus/server/JspImplicitObjects.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- JspImplicitObjects.java 2 Feb 2002 17:26:55 -0000 1.6
+++ JspImplicitObjects.java 17 Feb 2002 20:03:24 -0000 1.7
@@ -1,4 +1,6 @@
/*
+ * ====================================================================
+ *
* The Apache Software License, Version 1.1
*
* Copyright (c) 2001-2002 The Apache Software Foundation. All rights
@@ -23,10 +25,10 @@
* Alternately, this acknowlegement may appear in the software itself,
* if and wherever such third-party acknowlegements normally appear.
*
- * 4. The names "The Jakarta Project", "Cactus", and "Apache Software
- * Foundation" must not be used to endorse or promote products derived
- * from this software without prior written permission. For written
- * permission, please contact apache@apache.org.
+ * 4. The names "The Jakarta Project", "Cactus" and "Apache Software
+ * Foundation" must not be used to endorse or promote products
+ * derived from this software without prior written permission. For
+ * written permission, please contact apache@apache.org.
*
* 5. Products derived from this software may not be called "Apache"
* nor may "Apache" appear in their names without prior written
@@ -50,6 +52,7 @@
* individuals on behalf of the Apache Software Foundation. For more
* information on the Apache Software Foundation, please see
* <http://www.apache.org/>.
+ *
*/
package org.apache.cactus.server;
@@ -63,7 +66,7 @@
*
* @author <a href="mailto:vmassol@apache.org">Vincent Massol</a>
*
- * @version $Id: JspImplicitObjects.java,v 1.6 2002/02/02 17:26:55 vmassol Exp $
+ * @version $Id: JspImplicitObjects.java,v 1.7 2002/02/17 20:03:24 vmassol Exp $
*/
public class JspImplicitObjects extends ServletImplicitObjects
{
1.16 +9 -9 jakarta-cactus/src/framework/share/org/apache/cactus/server/JspTestCaller.java
Index: JspTestCaller.java
===================================================================
RCS file: /home/cvs/jakarta-cactus/src/framework/share/org/apache/cactus/server/JspTestCaller.java,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- JspTestCaller.java 17 Feb 2002 18:44:23 -0000 1.15
+++ JspTestCaller.java 17 Feb 2002 20:03:24 -0000 1.16
@@ -1,4 +1,6 @@
/*
+ * ====================================================================
+ *
* The Apache Software License, Version 1.1
*
* Copyright (c) 2001-2002 The Apache Software Foundation. All rights
@@ -23,10 +25,10 @@
* Alternately, this acknowlegement may appear in the software itself,
* if and wherever such third-party acknowlegements normally appear.
*
- * 4. The names "The Jakarta Project", "Cactus", and "Apache Software
- * Foundation" must not be used to endorse or promote products derived
- * from this software without prior written permission. For written
- * permission, please contact apache@apache.org.
+ * 4. The names "The Jakarta Project", "Cactus" and "Apache Software
+ * Foundation" must not be used to endorse or promote products
+ * derived from this software without prior written permission. For
+ * written permission, please contact apache@apache.org.
*
* 5. Products derived from this software may not be called "Apache"
* nor may "Apache" appear in their names without prior written
@@ -50,6 +52,7 @@
* individuals on behalf of the Apache Software Foundation. For more
* information on the Apache Software Foundation, please see
* <http://www.apache.org/>.
+ *
*/
package org.apache.cactus.server;
@@ -59,8 +62,6 @@
import org.apache.cactus.AbstractTestCase;
import org.apache.cactus.JspTestCase;
import org.apache.cactus.ServletURL;
-import org.apache.cactus.util.log.Log;
-import org.apache.cactus.util.log.LogService;
/**
* Call the test method on the server side after assigning the JSP implicit
@@ -68,7 +69,7 @@
*
* @author <a href="mailto:vmassol@apache.org">Vincent Massol</a>
*
- * @version $Id: JspTestCaller.java,v 1.15 2002/02/17 18:44:23 vmassol Exp $
+ * @version $Id: JspTestCaller.java,v 1.16 2002/02/17 20:03:24 vmassol Exp $
*/
public class JspTestCaller extends ServletTestCaller
{
@@ -81,8 +82,7 @@
}
/**
- * Sets the test case fields using the implicit objects (using reflection).
- * @param theTestInstance the test class instance
+ * @see AbstractTestCaller#setTestCaseFields(AbstractTestCase)
*/
protected void setTestCaseFields(AbstractTestCase theTestInstance)
throws Exception
1.7 +9 -6 jakarta-cactus/src/framework/share/org/apache/cactus/server/JspTestController.java
Index: JspTestController.java
===================================================================
RCS file: /home/cvs/jakarta-cactus/src/framework/share/org/apache/cactus/server/JspTestController.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- JspTestController.java 2 Feb 2002 17:26:55 -0000 1.6
+++ JspTestController.java 17 Feb 2002 20:03:24 -0000 1.7
@@ -1,4 +1,6 @@
/*
+ * ====================================================================
+ *
* The Apache Software License, Version 1.1
*
* Copyright (c) 2001-2002 The Apache Software Foundation. All rights
@@ -23,10 +25,10 @@
* Alternately, this acknowlegement may appear in the software itself,
* if and wherever such third-party acknowlegements normally appear.
*
- * 4. The names "The Jakarta Project", "Cactus", and "Apache Software
- * Foundation" must not be used to endorse or promote products derived
- * from this software without prior written permission. For written
- * permission, please contact apache@apache.org.
+ * 4. The names "The Jakarta Project", "Cactus" and "Apache Software
+ * Foundation" must not be used to endorse or promote products
+ * derived from this software without prior written permission. For
+ * written permission, please contact apache@apache.org.
*
* 5. Products derived from this software may not be called "Apache"
* nor may "Apache" appear in their names without prior written
@@ -50,6 +52,7 @@
* individuals on behalf of the Apache Software Foundation. For more
* information on the Apache Software Foundation, please see
* <http://www.apache.org/>.
+ *
*/
package org.apache.cactus.server;
@@ -61,12 +64,12 @@
*
* @author <a href="mailto:vmassol@apache.org">Vincent Massol</a>
*
- * @version $Id: JspTestController.java,v 1.6 2002/02/02 17:26:55 vmassol Exp $
+ * @version $Id: JspTestController.java,v 1.7 2002/02/17 20:03:24 vmassol Exp $
*/
public class JspTestController extends AbstractTestController
{
/**
- * @return the test caller that will be used to execute the test
+ * @see AbstractTestController#getTestCaller(WebImplicitObjects)
*/
protected AbstractTestCaller getTestCaller(
WebImplicitObjects theObjects)
1.13 +9 -5 jakarta-cactus/src/framework/share/org/apache/cactus/server/JspTestRedirector.java
Index: JspTestRedirector.java
===================================================================
RCS file: /home/cvs/jakarta-cactus/src/framework/share/org/apache/cactus/server/JspTestRedirector.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- JspTestRedirector.java 17 Feb 2002 19:00:11 -0000 1.12
+++ JspTestRedirector.java 17 Feb 2002 20:03:24 -0000 1.13
@@ -1,4 +1,6 @@
/*
+ * ====================================================================
+ *
* The Apache Software License, Version 1.1
*
* Copyright (c) 2001-2002 The Apache Software Foundation. All rights
@@ -23,10 +25,10 @@
* Alternately, this acknowlegement may appear in the software itself,
* if and wherever such third-party acknowlegements normally appear.
*
- * 4. The names "The Jakarta Project", "Cactus", and "Apache Software
- * Foundation" must not be used to endorse or promote products derived
- * from this software without prior written permission. For written
- * permission, please contact apache@apache.org.
+ * 4. The names "The Jakarta Project", "Cactus" and "Apache Software
+ * Foundation" must not be used to endorse or promote products
+ * derived from this software without prior written permission. For
+ * written permission, please contact apache@apache.org.
*
* 5. Products derived from this software may not be called "Apache"
* nor may "Apache" appear in their names without prior written
@@ -50,6 +52,7 @@
* individuals on behalf of the Apache Software Foundation. For more
* information on the Apache Software Foundation, please see
* <http://www.apache.org/>.
+ *
*/
package org.apache.cactus.server;
@@ -65,7 +68,7 @@
*
* @author <a href="mailto:vmassol@apache.org">Vincent Massol</a>
*
- * @version $Id: JspTestRedirector.java,v 1.12 2002/02/17 19:00:11 vmassol Exp $
+ * @version $Id: JspTestRedirector.java,v 1.13 2002/02/17 20:03:24 vmassol Exp $
*/
public class JspTestRedirector
{
@@ -89,6 +92,7 @@
* Handles requests from the <code>jspRedirector.jsp</code> JSP Redirector.
* @param theObjects the implicit objects that will be passed to the test
* case
+ * @exception ServletException if an error occurs servicing the request
*/
public void doGet(JspImplicitObjects theObjects) throws ServletException
{
1.8 +8 -5 jakarta-cactus/src/framework/share/org/apache/cactus/server/ServletImplicitObjects.java
Index: ServletImplicitObjects.java
===================================================================
RCS file: /home/cvs/jakarta-cactus/src/framework/share/org/apache/cactus/server/ServletImplicitObjects.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- ServletImplicitObjects.java 2 Feb 2002 17:26:55 -0000 1.7
+++ ServletImplicitObjects.java 17 Feb 2002 20:03:24 -0000 1.8
@@ -1,4 +1,6 @@
/*
+ * ====================================================================
+ *
* The Apache Software License, Version 1.1
*
* Copyright (c) 2001-2002 The Apache Software Foundation. All rights
@@ -23,10 +25,10 @@
* Alternately, this acknowlegement may appear in the software itself,
* if and wherever such third-party acknowlegements normally appear.
*
- * 4. The names "The Jakarta Project", "Cactus", and "Apache Software
- * Foundation" must not be used to endorse or promote products derived
- * from this software without prior written permission. For written
- * permission, please contact apache@apache.org.
+ * 4. The names "The Jakarta Project", "Cactus" and "Apache Software
+ * Foundation" must not be used to endorse or promote products
+ * derived from this software without prior written permission. For
+ * written permission, please contact apache@apache.org.
*
* 5. Products derived from this software may not be called "Apache"
* nor may "Apache" appear in their names without prior written
@@ -50,6 +52,7 @@
* individuals on behalf of the Apache Software Foundation. For more
* information on the Apache Software Foundation, please see
* <http://www.apache.org/>.
+ *
*/
package org.apache.cactus.server;
@@ -62,7 +65,7 @@
*
* @author <a href="mailto:vmassol@apache.org">Vincent Massol</a>
*
- * @version $Id: ServletImplicitObjects.java,v 1.7 2002/02/02 17:26:55 vmassol Exp $
+ * @version $Id: ServletImplicitObjects.java,v 1.8 2002/02/17 20:03:24 vmassol Exp $
*/
public class ServletImplicitObjects extends WebImplicitObjects
{
1.18 +9 -9 jakarta-cactus/src/framework/share/org/apache/cactus/server/ServletTestCaller.java
Index: ServletTestCaller.java
===================================================================
RCS file: /home/cvs/jakarta-cactus/src/framework/share/org/apache/cactus/server/ServletTestCaller.java,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- ServletTestCaller.java 17 Feb 2002 18:44:23 -0000 1.17
+++ ServletTestCaller.java 17 Feb 2002 20:03:24 -0000 1.18
@@ -1,4 +1,6 @@
/*
+ * ====================================================================
+ *
* The Apache Software License, Version 1.1
*
* Copyright (c) 2001-2002 The Apache Software Foundation. All rights
@@ -23,10 +25,10 @@
* Alternately, this acknowlegement may appear in the software itself,
* if and wherever such third-party acknowlegements normally appear.
*
- * 4. The names "The Jakarta Project", "Cactus", and "Apache Software
- * Foundation" must not be used to endorse or promote products derived
- * from this software without prior written permission. For written
- * permission, please contact apache@apache.org.
+ * 4. The names "The Jakarta Project", "Cactus" and "Apache Software
+ * Foundation" must not be used to endorse or promote products
+ * derived from this software without prior written permission. For
+ * written permission, please contact apache@apache.org.
*
* 5. Products derived from this software may not be called "Apache"
* nor may "Apache" appear in their names without prior written
@@ -50,6 +52,7 @@
* individuals on behalf of the Apache Software Foundation. For more
* information on the Apache Software Foundation, please see
* <http://www.apache.org/>.
+ *
*/
package org.apache.cactus.server;
@@ -60,8 +63,6 @@
import org.apache.cactus.AbstractTestCase;
import org.apache.cactus.ServletTestCase;
import org.apache.cactus.ServletURL;
-import org.apache.cactus.util.log.Log;
-import org.apache.cactus.util.log.LogService;
/**
* Responsible for instanciating the <code>TestCase</code> class on the server
@@ -69,7 +70,7 @@
*
* @author <a href="mailto:vmassol@apache.org">Vincent Massol</a>
*
- * @version $Id: ServletTestCaller.java,v 1.17 2002/02/17 18:44:23 vmassol Exp $
+ * @version $Id: ServletTestCaller.java,v 1.18 2002/02/17 20:03:24 vmassol Exp $
*/
public class ServletTestCaller extends AbstractTestCaller
{
@@ -82,8 +83,7 @@
}
/**
- * Sets the test case fields using the implicit objects (using reflection).
- * @param theTestInstance the test class instance
+ * @see AbstractTestCaller#setTestCaseFields(AbstractTestCase)
*/
protected void setTestCaseFields(AbstractTestCase theTestInstance)
throws Exception
1.7 +9 -6 jakarta-cactus/src/framework/share/org/apache/cactus/server/ServletTestController.java
Index: ServletTestController.java
===================================================================
RCS file: /home/cvs/jakarta-cactus/src/framework/share/org/apache/cactus/server/ServletTestController.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- ServletTestController.java 2 Feb 2002 17:26:55 -0000 1.6
+++ ServletTestController.java 17 Feb 2002 20:03:24 -0000 1.7
@@ -1,4 +1,6 @@
/*
+ * ====================================================================
+ *
* The Apache Software License, Version 1.1
*
* Copyright (c) 2001-2002 The Apache Software Foundation. All rights
@@ -23,10 +25,10 @@
* Alternately, this acknowlegement may appear in the software itself,
* if and wherever such third-party acknowlegements normally appear.
*
- * 4. The names "The Jakarta Project", "Cactus", and "Apache Software
- * Foundation" must not be used to endorse or promote products derived
- * from this software without prior written permission. For written
- * permission, please contact apache@apache.org.
+ * 4. The names "The Jakarta Project", "Cactus" and "Apache Software
+ * Foundation" must not be used to endorse or promote products
+ * derived from this software without prior written permission. For
+ * written permission, please contact apache@apache.org.
*
* 5. Products derived from this software may not be called "Apache"
* nor may "Apache" appear in their names without prior written
@@ -50,6 +52,7 @@
* individuals on behalf of the Apache Software Foundation. For more
* information on the Apache Software Foundation, please see
* <http://www.apache.org/>.
+ *
*/
package org.apache.cactus.server;
@@ -61,12 +64,12 @@
*
* @author <a href="mailto:vmassol@apache.org">Vincent Massol</a>
*
- * @version $Id: ServletTestController.java,v 1.6 2002/02/02 17:26:55 vmassol Exp $
+ * @version $Id: ServletTestController.java,v 1.7 2002/02/17 20:03:24 vmassol Exp $
*/
public class ServletTestController extends AbstractTestController
{
/**
- * @return the test caller that will be used to execute the test
+ * @see AbstractTestController#getTestCaller(WebImplicitObjects)
*/
protected AbstractTestCaller getTestCaller(
WebImplicitObjects theObjects)
1.16 +14 -11 jakarta-cactus/src/framework/share/org/apache/cactus/server/ServletTestRedirector.java
Index: ServletTestRedirector.java
===================================================================
RCS file: /home/cvs/jakarta-cactus/src/framework/share/org/apache/cactus/server/ServletTestRedirector.java,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- ServletTestRedirector.java 17 Feb 2002 19:00:11 -0000 1.15
+++ ServletTestRedirector.java 17 Feb 2002 20:03:24 -0000 1.16
@@ -1,4 +1,6 @@
/*
+ * ====================================================================
+ *
* The Apache Software License, Version 1.1
*
* Copyright (c) 2001-2002 The Apache Software Foundation. All rights
@@ -23,10 +25,10 @@
* Alternately, this acknowlegement may appear in the software itself,
* if and wherever such third-party acknowlegements normally appear.
*
- * 4. The names "The Jakarta Project", "Cactus", and "Apache Software
- * Foundation" must not be used to endorse or promote products derived
- * from this software without prior written permission. For written
- * permission, please contact apache@apache.org.
+ * 4. The names "The Jakarta Project", "Cactus" and "Apache Software
+ * Foundation" must not be used to endorse or promote products
+ * derived from this software without prior written permission. For
+ * written permission, please contact apache@apache.org.
*
* 5. Products derived from this software may not be called "Apache"
* nor may "Apache" appear in their names without prior written
@@ -50,10 +52,10 @@
* individuals on behalf of the Apache Software Foundation. For more
* information on the Apache Software Foundation, please see
* <http://www.apache.org/>.
+ *
*/
package org.apache.cactus.server;
-import java.io.IOException;
import javax.servlet.ServletException;
import javax.servlet.http.HttpServlet;
import javax.servlet.http.HttpServletRequest;
@@ -67,7 +69,7 @@
*
* @author <a href="mailto:vmassol@apache.org">Vincent Massol</a>
*
- * @version $Id: ServletTestRedirector.java,v 1.15 2002/02/17 19:00:11 vmassol Exp $
+ * @version $Id: ServletTestRedirector.java,v 1.16 2002/02/17 20:03:24 vmassol Exp $
* @see ServletTestCaller
*/
public class ServletTestRedirector extends HttpServlet
@@ -94,11 +96,11 @@
* @param theRequest the incoming HTTP client request
* @param theResponse the outgoing HTTP client request to send back.
*
- * @exception ServletException if an error occurred when sending back
- * the response to the client.
+ * @exception ServletException if an error occurs when servicing the
+ * request
*/
public void doGet(HttpServletRequest theRequest,
- HttpServletResponse theResponse) throws ServletException, IOException
+ HttpServletResponse theResponse) throws ServletException
{
// Same handling than for a POST
doPost(theRequest, theResponse);
@@ -111,10 +113,11 @@
* @param theRequest the incoming HTTP request.
* @param theResponse the outgoing HTTP response.
*
- * @exception ServletException if an unexpected error occurred
+ * @exception ServletException if an error occurs when servicing the
+ * request
*/
public void doPost(HttpServletRequest theRequest,
- HttpServletResponse theResponse) throws ServletException, IOException
+ HttpServletResponse theResponse) throws ServletException
{
// Mark beginning of test on server side
LOGGER.debug("------------- Start Servlet service");
1.8 +8 -7 jakarta-cactus/src/framework/share/org/apache/cactus/server/ServletUtil.java
Index: ServletUtil.java
===================================================================
RCS file: /home/cvs/jakarta-cactus/src/framework/share/org/apache/cactus/server/ServletUtil.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- ServletUtil.java 17 Feb 2002 19:00:11 -0000 1.7
+++ ServletUtil.java 17 Feb 2002 20:03:24 -0000 1.8
@@ -1,4 +1,6 @@
/*
+ * ====================================================================
+ *
* The Apache Software License, Version 1.1
*
* Copyright (c) 2001-2002 The Apache Software Foundation. All rights
@@ -23,10 +25,10 @@
* Alternately, this acknowlegement may appear in the software itself,
* if and wherever such third-party acknowlegements normally appear.
*
- * 4. The names "The Jakarta Project", "Cactus", and "Apache Software
- * Foundation" must not be used to endorse or promote products derived
- * from this software without prior written permission. For written
- * permission, please contact apache@apache.org.
+ * 4. The names "The Jakarta Project", "Cactus" and "Apache Software
+ * Foundation" must not be used to endorse or promote products
+ * derived from this software without prior written permission. For
+ * written permission, please contact apache@apache.org.
*
* 5. Products derived from this software may not be called "Apache"
* nor may "Apache" appear in their names without prior written
@@ -50,21 +52,20 @@
* individuals on behalf of the Apache Software Foundation. For more
* information on the Apache Software Foundation, please see
* <http://www.apache.org/>.
+ *
*/
package org.apache.cactus.server;
import java.net.URLDecoder;
import org.apache.cactus.util.ChainedRuntimeException;
-import org.apache.cactus.util.log.Log;
-import org.apache.cactus.util.log.LogService;
/**
* All prupose utility methods for manipulating the Servlet API.
*
* @author <a href="mailto:vmassol@apache.org">Vincent Massol</a>
*
- * @version $Id: ServletUtil.java,v 1.7 2002/02/17 19:00:11 vmassol Exp $
+ * @version $Id: ServletUtil.java,v 1.8 2002/02/17 20:03:24 vmassol Exp $
*/
public class ServletUtil
{
1.12 +11 -8 jakarta-cactus/src/framework/share/org/apache/cactus/util/AssertUtils.java
Index: AssertUtils.java
===================================================================
RCS file: /home/cvs/jakarta-cactus/src/framework/share/org/apache/cactus/util/AssertUtils.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- AssertUtils.java 2 Feb 2002 17:26:56 -0000 1.11
+++ AssertUtils.java 17 Feb 2002 20:03:25 -0000 1.12
@@ -1,4 +1,6 @@
/*
+ * ====================================================================
+ *
* The Apache Software License, Version 1.1
*
* Copyright (c) 2001-2002 The Apache Software Foundation. All rights
@@ -23,10 +25,10 @@
* Alternately, this acknowlegement may appear in the software itself,
* if and wherever such third-party acknowlegements normally appear.
*
- * 4. The names "The Jakarta Project", "Cactus", and "Apache Software
- * Foundation" must not be used to endorse or promote products derived
- * from this software without prior written permission. For written
- * permission, please contact apache@apache.org.
+ * 4. The names "The Jakarta Project", "Cactus" and "Apache Software
+ * Foundation" must not be used to endorse or promote products
+ * derived from this software without prior written permission. For
+ * written permission, please contact apache@apache.org.
*
* 5. Products derived from this software may not be called "Apache"
* nor may "Apache" appear in their names without prior written
@@ -50,10 +52,10 @@
* individuals on behalf of the Apache Software Foundation. For more
* information on the Apache Software Foundation, please see
* <http://www.apache.org/>.
+ *
*/
package org.apache.cactus.util;
-import java.io.IOException;
import java.net.HttpURLConnection;
import java.util.Hashtable;
import java.util.StringTokenizer;
@@ -67,7 +69,7 @@
*
* @author <a href="mailto:vmassol@apache.org">Vincent Massol</a>
*
- * @version $Id: AssertUtils.java,v 1.11 2002/02/02 17:26:56 vmassol Exp $
+ * @version $Id: AssertUtils.java,v 1.12 2002/02/17 20:03:25 vmassol Exp $
* @deprecated As of Cactus 1.2, replaced by WebResponse
* @see org.apache.cactus.WebResponse
*/
@@ -79,7 +81,6 @@
* @return the servlet output stream bytes as a string.
*/
public static String getResponseAsString(HttpURLConnection theConnection)
- throws IOException
{
WebResponse response = new WebResponse(null, theConnection);
return response.getText();
@@ -92,7 +93,7 @@
* string is a separate line from the output stream).
*/
public static String[] getResponseAsStringArray(
- HttpURLConnection theConnection) throws IOException
+ HttpURLConnection theConnection)
{
WebResponse response = new WebResponse(null, theConnection);
return response.getTextAsArray();
@@ -167,6 +168,8 @@
/**
* Parse a single "Set-Cookie" header.
*
+ * @param theHeaderValue the raw Cookie header to parse and from which to
+ * extract the different cookies
* @return a vector og <code>ClientCookie</code> objects containing the
* parsed values from the "Set-Cookie" header.
*/
1.7 +8 -5 jakarta-cactus/src/framework/share/org/apache/cactus/util/ChainedRuntimeException.java
Index: ChainedRuntimeException.java
===================================================================
RCS file: /home/cvs/jakarta-cactus/src/framework/share/org/apache/cactus/util/ChainedRuntimeException.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- ChainedRuntimeException.java 2 Feb 2002 17:26:56 -0000 1.6
+++ ChainedRuntimeException.java 17 Feb 2002 20:03:25 -0000 1.7
@@ -1,4 +1,6 @@
/*
+ * ====================================================================
+ *
* The Apache Software License, Version 1.1
*
* Copyright (c) 2001-2002 The Apache Software Foundation. All rights
@@ -23,10 +25,10 @@
* Alternately, this acknowlegement may appear in the software itself,
* if and wherever such third-party acknowlegements normally appear.
*
- * 4. The names "The Jakarta Project", "Cactus", and "Apache Software
- * Foundation" must not be used to endorse or promote products derived
- * from this software without prior written permission. For written
- * permission, please contact apache@apache.org.
+ * 4. The names "The Jakarta Project", "Cactus" and "Apache Software
+ * Foundation" must not be used to endorse or promote products
+ * derived from this software without prior written permission. For
+ * written permission, please contact apache@apache.org.
*
* 5. Products derived from this software may not be called "Apache"
* nor may "Apache" appear in their names without prior written
@@ -50,6 +52,7 @@
* individuals on behalf of the Apache Software Foundation. For more
* information on the Apache Software Foundation, please see
* <http://www.apache.org/>.
+ *
*/
package org.apache.cactus.util;
@@ -63,7 +66,7 @@
*
* @author <a href="mailto:vmassol@apache.org">Vincent Massol</a>
*
- * @version $Id: ChainedRuntimeException.java,v 1.6 2002/02/02 17:26:56 vmassol Exp $
+ * @version $Id: ChainedRuntimeException.java,v 1.7 2002/02/17 20:03:25 vmassol Exp $
*/
public class ChainedRuntimeException extends RuntimeException
{
1.8 +8 -5 jakarta-cactus/src/framework/share/org/apache/cactus/util/ClientCookie.java
Index: ClientCookie.java
===================================================================
RCS file: /home/cvs/jakarta-cactus/src/framework/share/org/apache/cactus/util/ClientCookie.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- ClientCookie.java 13 Jan 2002 15:17:12 -0000 1.7
+++ ClientCookie.java 17 Feb 2002 20:03:25 -0000 1.8
@@ -1,4 +1,6 @@
/*
+ * ====================================================================
+ *
* The Apache Software License, Version 1.1
*
* Copyright (c) 2001-2002 The Apache Software Foundation. All rights
@@ -23,10 +25,10 @@
* Alternately, this acknowlegement may appear in the software itself,
* if and wherever such third-party acknowlegements normally appear.
*
- * 4. The names "The Jakarta Project", "Cactus", and "Apache Software
- * Foundation" must not be used to endorse or promote products derived
- * from this software without prior written permission. For written
- * permission, please contact apache@apache.org.
+ * 4. The names "The Jakarta Project", "Cactus" and "Apache Software
+ * Foundation" must not be used to endorse or promote products
+ * derived from this software without prior written permission. For
+ * written permission, please contact apache@apache.org.
*
* 5. Products derived from this software may not be called "Apache"
* nor may "Apache" appear in their names without prior written
@@ -50,6 +52,7 @@
* individuals on behalf of the Apache Software Foundation. For more
* information on the Apache Software Foundation, please see
* <http://www.apache.org/>.
+ *
*/
package org.apache.cactus.util;
@@ -59,7 +62,7 @@
*
* @author <a href="mailto:vmassol@apache.org">Vincent Massol</a>
*
- * @version $Id: ClientCookie.java,v 1.7 2002/01/13 15:17:12 vmassol Exp $
+ * @version $Id: ClientCookie.java,v 1.8 2002/02/17 20:03:25 vmassol Exp $
* @deprecated As of Cactus 1.2, replaced by org.apache.cactus.Cookie
* @see org.apache.cactus.Cookie
*/
1.4 +17 -7 jakarta-cactus/src/framework/share/org/apache/cactus/util/JUnitVersionHelper.java
Index: JUnitVersionHelper.java
===================================================================
RCS file: /home/cvs/jakarta-cactus/src/framework/share/org/apache/cactus/util/JUnitVersionHelper.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- JUnitVersionHelper.java 2 Feb 2002 17:26:56 -0000 1.3
+++ JUnitVersionHelper.java 17 Feb 2002 20:03:25 -0000 1.4
@@ -1,4 +1,6 @@
/*
+ * ====================================================================
+ *
* The Apache Software License, Version 1.1
*
* Copyright (c) 2001-2002 The Apache Software Foundation. All rights
@@ -23,10 +25,10 @@
* Alternately, this acknowlegement may appear in the software itself,
* if and wherever such third-party acknowlegements normally appear.
*
- * 4. The names "The Jakarta Project", "Cactus", and "Apache Software
- * Foundation" must not be used to endorse or promote products derived
- * from this software without prior written permission. For written
- * permission, please contact apache@apache.org.
+ * 4. The names "The Jakarta Project", "Cactus" and "Apache Software
+ * Foundation" must not be used to endorse or promote products
+ * derived from this software without prior written permission. For
+ * written permission, please contact apache@apache.org.
*
* 5. Products derived from this software may not be called "Apache"
* nor may "Apache" appear in their names without prior written
@@ -50,6 +52,7 @@
* individuals on behalf of the Apache Software Foundation. For more
* information on the Apache Software Foundation, please see
* <http://www.apache.org/>.
+ *
*/
package org.apache.cactus.util;
@@ -64,10 +67,14 @@
* @author <a href="mailto:stefan.bodewig@epost.de">Stefan Bodewig</a>
* @author <a href="mailto:vmassol@apache.org">Vincent Massol</a>
*
- * @version $Id: JUnitVersionHelper.java,v 1.3 2002/02/02 17:26:56 vmassol Exp $
+ * @version $Id: JUnitVersionHelper.java,v 1.4 2002/02/17 20:03:25 vmassol Exp $
*/
public class JUnitVersionHelper
{
+ /**
+ * The <code>Method</code> to use to get the test name from a
+ * <code>TestCase</code> object.
+ */
private static Method testCaseName = null;
static
@@ -89,12 +96,15 @@
* of JUnit remove the old name() method. This method provides
* access to the name of a TestCase via reflection that is
* supposed to work with version before and after JUnit 3.7.
+ *
+ * @param theTestCase the test case for which to retrieve the name
+ * @return the test case name
*/
- public static String getTestCaseName(TestCase t)
+ public static String getTestCaseName(TestCase theTestCase)
{
if (testCaseName != null) {
try {
- return (String) testCaseName.invoke(t, new Object[0]);
+ return (String) testCaseName.invoke(theTestCase, new Object[0]);
} catch (Throwable e) {
}
}
1.9 +1 -2 jakarta-cactus/src/framework/share/org/apache/cactus/util/log/BaseLog.java
Index: BaseLog.java
===================================================================
RCS file: /home/cvs/jakarta-cactus/src/framework/share/org/apache/cactus/util/log/BaseLog.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- BaseLog.java 16 Feb 2002 23:25:50 -0000 1.8
+++ BaseLog.java 17 Feb 2002 20:03:25 -0000 1.9
@@ -67,7 +67,7 @@
*
* @author <a href="mailto:vmassol@apache.org">Vincent Massol</a>
*
- * @version $Id: BaseLog.java,v 1.8 2002/02/16 23:25:50 vmassol Exp $
+ * @version $Id: BaseLog.java,v 1.9 2002/02/17 20:03:25 vmassol Exp $
*/
public class BaseLog implements Log
{
@@ -130,7 +130,6 @@
/**
* Log an ERROR level exception only
*
- * @param theMessage the message to log
* @param theThrowable the exception to log
*/
public void error(Throwable theThrowable)
1.8 +1 -2 jakarta-cactus/src/framework/share/org/apache/cactus/util/log/BaseLogDummy.java
Index: BaseLogDummy.java
===================================================================
RCS file: /home/cvs/jakarta-cactus/src/framework/share/org/apache/cactus/util/log/BaseLogDummy.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- BaseLogDummy.java 16 Feb 2002 23:25:50 -0000 1.7
+++ BaseLogDummy.java 17 Feb 2002 20:03:25 -0000 1.8
@@ -61,7 +61,7 @@
*
* @author <a href="mailto:vmassol@apache.org">Vincent Massol</a>
*
- * @version $Id: BaseLogDummy.java,v 1.7 2002/02/16 23:25:50 vmassol Exp $
+ * @version $Id: BaseLogDummy.java,v 1.8 2002/02/17 20:03:25 vmassol Exp $
*/
public class BaseLogDummy implements Log
{
@@ -114,7 +114,6 @@
/**
* Log an ERROR level exception only
*
- * @param theMessage the message to log
* @param theThrowable the exception to log
*/
public void error(Throwable theThrowable)
1.8 +1 -2 jakarta-cactus/src/framework/share/org/apache/cactus/util/log/Log.java
Index: Log.java
===================================================================
RCS file: /home/cvs/jakarta-cactus/src/framework/share/org/apache/cactus/util/log/Log.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- Log.java 16 Feb 2002 23:25:50 -0000 1.7
+++ Log.java 17 Feb 2002 20:03:25 -0000 1.8
@@ -61,7 +61,7 @@
*
* @author <a href="mailto:vmassol@apache.org">Vincent Massol</a>
*
- * @version $Id: Log.java,v 1.7 2002/02/16 23:25:50 vmassol Exp $
+ * @version $Id: Log.java,v 1.8 2002/02/17 20:03:25 vmassol Exp $
*/
public interface Log
{
@@ -98,7 +98,6 @@
/**
* Log an ERROR level exception only
*
- * @param theMessage the message to log
* @param theThrowable the exception to log
*/
public void error(Throwable theThrowable);
--
To unsubscribe, e-mail: <ma...@jakarta.apache.org>
For additional commands, e-mail: <ma...@jakarta.apache.org>