Author: cziegeler Date: Sun Oct 24 09:14:10 2004 New Revision: 55441 Added: cocoon/branches/BRANCH_2_1_X/legal/junit-3.8.1.jar.license.txt - copied unchanged from rev 55432, cocoon/branches/BRANCH_2_1_X/legal/junit.jar.license.txt cocoon/branches/BRANCH_2_1_X/tools/lib/junit-3.8.1.jar (contents, props changed) Removed: cocoon/branches/BRANCH_2_1_X/legal/junit.jar.license.txt Modified: cocoon/branches/BRANCH_2_1_X/src/blocks/faces/java/org/apache/cocoon/faces/context/InitParameterMap.java cocoon/branches/BRANCH_2_1_X/src/blocks/faces/java/org/apache/cocoon/faces/samples/carstore/FormatValidatorTag.java cocoon/branches/BRANCH_2_1_X/src/blocks/faces/java/org/apache/cocoon/faces/samples/components/renderkit/BaseRenderer.java cocoon/branches/BRANCH_2_1_X/src/blocks/faces/java/org/apache/cocoon/faces/samples/components/renderkit/Util.java cocoon/branches/BRANCH_2_1_X/src/blocks/faces/java/org/apache/cocoon/faces/taglib/ConvertDateTimeTag.java cocoon/branches/BRANCH_2_1_X/src/blocks/faces/java/org/apache/cocoon/faces/taglib/ParameterTag.java cocoon/branches/BRANCH_2_1_X/src/blocks/faces/java/org/apache/cocoon/faces/taglib/UIComponentBodyTag.java cocoon/branches/BRANCH_2_1_X/src/blocks/faces/java/org/apache/cocoon/faces/taglib/UIComponentTag.java cocoon/branches/BRANCH_2_1_X/src/blocks/faces/java/org/apache/cocoon/faces/taglib/VerbatimTag.java cocoon/branches/BRANCH_2_1_X/src/blocks/faces/java/org/apache/cocoon/faces/taglib/html/MessagesTag.java cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/acting/HandleFormSubmitAction.java Log: Update junit to 3.8.1 and remove some unused imports
Modified: cocoon/branches/BRANCH_2_1_X/src/blocks/faces/java/org/apache/cocoon/faces/context/InitParameterMap.java ============================================================================== --- cocoon/branches/BRANCH_2_1_X/src/blocks/faces/java/org/apache/cocoon/faces/context/InitParameterMap.java (original) +++ cocoon/branches/BRANCH_2_1_X/src/blocks/faces/java/org/apache/cocoon/faces/context/InitParameterMap.java Sun Oct 24 09:14:10 2004 @@ -16,11 +16,6 @@ package org.apache.cocoon.faces.context; import org.apache.cocoon.environment.Context; -import org.apache.cocoon.environment.Request; - -import java.util.Enumeration; -import java.util.HashSet; -import java.util.Set; /** * Init parameters map Modified: cocoon/branches/BRANCH_2_1_X/src/blocks/faces/java/org/apache/cocoon/faces/samples/carstore/FormatValidatorTag.java ============================================================================== --- cocoon/branches/BRANCH_2_1_X/src/blocks/faces/java/org/apache/cocoon/faces/samples/carstore/FormatValidatorTag.java (original) +++ cocoon/branches/BRANCH_2_1_X/src/blocks/faces/java/org/apache/cocoon/faces/samples/carstore/FormatValidatorTag.java Sun Oct 24 09:14:10 2004 @@ -46,7 +46,6 @@ import org.apache.cocoon.faces.taglib.ValidatorTag; import javax.faces.validator.Validator; -import javax.servlet.jsp.JspException; /** * FormatValidatorTag is the tag handler class for FormatValidator tag, Modified: cocoon/branches/BRANCH_2_1_X/src/blocks/faces/java/org/apache/cocoon/faces/samples/components/renderkit/BaseRenderer.java ============================================================================== --- cocoon/branches/BRANCH_2_1_X/src/blocks/faces/java/org/apache/cocoon/faces/samples/components/renderkit/BaseRenderer.java (original) +++ cocoon/branches/BRANCH_2_1_X/src/blocks/faces/java/org/apache/cocoon/faces/samples/components/renderkit/BaseRenderer.java Sun Oct 24 09:14:10 2004 @@ -49,8 +49,6 @@ import java.io.IOException; import java.util.Iterator; -import java.util.MissingResourceException; -import java.util.ResourceBundle; /** * <p>Convenient base class for <code>Renderer</code> implementations.</p> Modified: cocoon/branches/BRANCH_2_1_X/src/blocks/faces/java/org/apache/cocoon/faces/samples/components/renderkit/Util.java ============================================================================== --- cocoon/branches/BRANCH_2_1_X/src/blocks/faces/java/org/apache/cocoon/faces/samples/components/renderkit/Util.java (original) +++ cocoon/branches/BRANCH_2_1_X/src/blocks/faces/java/org/apache/cocoon/faces/samples/components/renderkit/Util.java Sun Oct 24 09:14:10 2004 @@ -52,8 +52,6 @@ import javax.faces.el.MethodBinding; import javax.faces.el.ValueBinding; -import java.util.Locale; - /** * <B>Util</B> is a class which houses common functionality used by * other classes. Modified: cocoon/branches/BRANCH_2_1_X/src/blocks/faces/java/org/apache/cocoon/faces/taglib/ConvertDateTimeTag.java ============================================================================== --- cocoon/branches/BRANCH_2_1_X/src/blocks/faces/java/org/apache/cocoon/faces/taglib/ConvertDateTimeTag.java (original) +++ cocoon/branches/BRANCH_2_1_X/src/blocks/faces/java/org/apache/cocoon/faces/taglib/ConvertDateTimeTag.java Sun Oct 24 09:14:10 2004 @@ -15,17 +15,13 @@ */ package org.apache.cocoon.faces.taglib; -import org.apache.cocoon.taglib.TagSupport; import org.apache.cocoon.i18n.I18nUtils; import org.apache.cocoon.faces.FacesUtils; import org.xml.sax.Attributes; import org.xml.sax.SAXException; -import javax.faces.component.UIComponent; -import javax.faces.component.ValueHolder; import javax.faces.convert.Converter; -import javax.faces.convert.ConverterException; import javax.faces.convert.DateTimeConverter; import java.util.Locale; import java.util.TimeZone; Modified: cocoon/branches/BRANCH_2_1_X/src/blocks/faces/java/org/apache/cocoon/faces/taglib/ParameterTag.java ============================================================================== --- cocoon/branches/BRANCH_2_1_X/src/blocks/faces/java/org/apache/cocoon/faces/taglib/ParameterTag.java (original) +++ cocoon/branches/BRANCH_2_1_X/src/blocks/faces/java/org/apache/cocoon/faces/taglib/ParameterTag.java Sun Oct 24 09:14:10 2004 @@ -15,11 +15,7 @@ */ package org.apache.cocoon.faces.taglib; -import org.apache.cocoon.taglib.TagSupport; - import org.apache.cocoon.faces.FacesUtils; -import org.xml.sax.Attributes; -import org.xml.sax.SAXException; import javax.faces.component.UIComponent; import javax.faces.component.UIParameter; Modified: cocoon/branches/BRANCH_2_1_X/src/blocks/faces/java/org/apache/cocoon/faces/taglib/UIComponentBodyTag.java ============================================================================== --- cocoon/branches/BRANCH_2_1_X/src/blocks/faces/java/org/apache/cocoon/faces/taglib/UIComponentBodyTag.java (original) +++ cocoon/branches/BRANCH_2_1_X/src/blocks/faces/java/org/apache/cocoon/faces/taglib/UIComponentBodyTag.java Sun Oct 24 09:14:10 2004 @@ -17,7 +17,6 @@ import org.apache.cocoon.taglib.BodyContent; import org.apache.cocoon.taglib.BodyTag; -import org.apache.cocoon.taglib.Tag; import org.xml.sax.SAXException; Modified: cocoon/branches/BRANCH_2_1_X/src/blocks/faces/java/org/apache/cocoon/faces/taglib/UIComponentTag.java ============================================================================== --- cocoon/branches/BRANCH_2_1_X/src/blocks/faces/java/org/apache/cocoon/faces/taglib/UIComponentTag.java (original) +++ cocoon/branches/BRANCH_2_1_X/src/blocks/faces/java/org/apache/cocoon/faces/taglib/UIComponentTag.java Sun Oct 24 09:14:10 2004 @@ -29,14 +29,11 @@ import org.xml.sax.Attributes; import org.xml.sax.SAXException; -import javax.faces.FactoryFinder; import javax.faces.application.Application; import javax.faces.component.UIComponent; import javax.faces.context.FacesContext; import javax.faces.context.ResponseWriter; import javax.faces.el.ValueBinding; -import javax.faces.render.RenderKit; -import javax.faces.render.RenderKitFactory; import java.io.IOException; import java.util.ArrayList; import java.util.Iterator; Modified: cocoon/branches/BRANCH_2_1_X/src/blocks/faces/java/org/apache/cocoon/faces/taglib/VerbatimTag.java ============================================================================== --- cocoon/branches/BRANCH_2_1_X/src/blocks/faces/java/org/apache/cocoon/faces/taglib/VerbatimTag.java (original) +++ cocoon/branches/BRANCH_2_1_X/src/blocks/faces/java/org/apache/cocoon/faces/taglib/VerbatimTag.java Sun Oct 24 09:14:10 2004 @@ -15,16 +15,10 @@ */ package org.apache.cocoon.faces.taglib; -import org.apache.cocoon.taglib.TagSupport; - -import org.apache.cocoon.faces.FacesUtils; -import org.xml.sax.Attributes; import org.xml.sax.SAXException; import javax.faces.component.UIComponent; import javax.faces.component.UIOutput; -import javax.faces.component.UIParameter; -import javax.faces.FacesException; /** * @version CVS $Id$ Modified: cocoon/branches/BRANCH_2_1_X/src/blocks/faces/java/org/apache/cocoon/faces/taglib/html/MessagesTag.java ============================================================================== --- cocoon/branches/BRANCH_2_1_X/src/blocks/faces/java/org/apache/cocoon/faces/taglib/html/MessagesTag.java (original) +++ cocoon/branches/BRANCH_2_1_X/src/blocks/faces/java/org/apache/cocoon/faces/taglib/html/MessagesTag.java Sun Oct 24 09:14:10 2004 @@ -21,11 +21,7 @@ import javax.faces.FacesException; import javax.faces.component.UIComponent; -import javax.faces.component.UIInput; import javax.faces.component.UIMessages; -import javax.faces.context.FacesContext; -import javax.faces.el.MethodBinding; -import javax.faces.event.ValueChangeEvent; /** * @version CVS $Id$ Modified: cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/acting/HandleFormSubmitAction.java ============================================================================== --- cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/acting/HandleFormSubmitAction.java (original) +++ cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/acting/HandleFormSubmitAction.java Sun Oct 24 09:14:10 2004 @@ -45,7 +45,7 @@ * <li><strong>attribute-name</strong>: name of the request attribute in which the form instance should be stored * </ul> * - * @version $Id: HandleFormSubmitAction.java,v 1.4 2004/03/28 20:51:24 antonio Exp $ + * @version $Id$ */ public class HandleFormSubmitAction extends AbstractFormsAction implements Action, ThreadSafe { @@ -72,7 +72,7 @@ // TODO cache these classes Class clazz = Class.forName(formHandlerClassName); formHandler = (FormHandler)clazz.newInstance(); - LifecycleHelper.setupComponent(formHandler, null, null, manager, null, null); + LifecycleHelper.setupComponent(formHandler, null, null, manager, null); form.setFormHandler(formHandler); } Added: cocoon/branches/BRANCH_2_1_X/tools/lib/junit-3.8.1.jar ============================================================================== Binary file. No diff available.