rleland 2003/08/27 22:57:58 Modified: src/share/org/apache/struts/taglib/logic PresentTag.java RedirectTag.java Log: Remove unused imports and update license. Revision Changes Path 1.18 +8 -9 jakarta-struts/src/share/org/apache/struts/taglib/logic/PresentTag.java Index: PresentTag.java =================================================================== RCS file: /home/cvs/jakarta-struts/src/share/org/apache/struts/taglib/logic/PresentTag.java,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- PresentTag.java 31 Jul 2003 03:30:20 -0000 1.17 +++ PresentTag.java 28 Aug 2003 05:57:58 -0000 1.18 @@ -7,7 +7,7 @@ * * The Apache Software License, Version 1.1 * - * Copyright (c) 1999-2003 The Apache Software Foundation. All rights + * Copyright (c) 2000-2003 The Apache Software Foundation. All rights * reserved. * * Redistribution and use in source and binary forms, with or without @@ -23,7 +23,7 @@ * distribution. * * 3. The end-user documentation included with the redistribution, if - * any, must include the following acknowlegement: + * any, must include the following acknowledgement: * "This product includes software developed by the * Apache Software Foundation (http://www.apache.org/)." * Alternately, this acknowlegement may appear in the software itself, @@ -35,8 +35,8 @@ * permission, please contact [EMAIL PROTECTED] * * 5. Products derived from this software may not be called "Apache" - * nor may "Apache" appear in their names without prior written - * permission of the Apache Group. + * nor may "Apache" appear in their name, without prior written + * permission of the Apache Software Foundation. * * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES @@ -68,7 +68,6 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.jsp.JspException; -import org.apache.struts.util.RequestUtils; import org.apache.struts.taglib.TagUtils; /** 1.19 +13 -14 jakarta-struts/src/share/org/apache/struts/taglib/logic/RedirectTag.java Index: RedirectTag.java =================================================================== RCS file: /home/cvs/jakarta-struts/src/share/org/apache/struts/taglib/logic/RedirectTag.java,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- RedirectTag.java 31 Jul 2003 03:30:00 -0000 1.18 +++ RedirectTag.java 28 Aug 2003 05:57:58 -0000 1.19 @@ -7,7 +7,7 @@ * * The Apache Software License, Version 1.1 * - * Copyright (c) 1999-2003 The Apache Software Foundation. All rights + * Copyright (c) 2000-2003 The Apache Software Foundation. All rights * reserved. * * Redistribution and use in source and binary forms, with or without @@ -23,7 +23,7 @@ * distribution. * * 3. The end-user documentation included with the redistribution, if - * any, must include the following acknowlegement: + * any, must include the following acknowledgement: * "This product includes software developed by the * Apache Software Foundation (http://www.apache.org/)." * Alternately, this acknowlegement may appear in the software itself, @@ -35,8 +35,8 @@ * permission, please contact [EMAIL PROTECTED] * * 5. Products derived from this software may not be called "Apache" - * nor may "Apache" appear in their names without prior written - * permission of the Apache Group. + * nor may "Apache" appear in their name, without prior written + * permission of the Apache Software Foundation. * * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES @@ -70,7 +70,6 @@ import javax.servlet.jsp.tagext.TagSupport; import org.apache.struts.util.MessageResources; -import org.apache.struts.util.RequestUtils; import org.apache.struts.taglib.TagUtils; /** @@ -290,7 +289,7 @@ property, scope, transaction); - + String url = null; try { url = @@ -303,13 +302,13 @@ params, anchor, true); - + } catch (MalformedURLException e) { TagUtils.getInstance().saveException(pageContext, e); throw new JspException( messages.getMessage("redirect.url", e.toString())); } - + return url; } @@ -322,10 +321,10 @@ protected void doRedirect(String url) throws JspException { HttpServletResponse response = (HttpServletResponse) pageContext.getResponse(); - + try { response.sendRedirect(url); - + } catch (IOException e) { TagUtils.getInstance().saveException(pageContext, e); throw new JspException(e.getMessage());
--------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]