You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@struts.apache.org by hu...@apache.org on 2004/03/13 06:23:39 UTC

cvs commit: jakarta-struts/src/example/org/apache/struts/webapp/example CheckLogonTag.java

husted      2004/03/12 21:23:39

  Modified:    src/example/org/apache/struts/webapp/example
                        CheckLogonTag.java
  Log:
  Refine MainMenu and CheckLogon
  
  Revision  Changes    Path
  1.11      +23 -109   jakarta-struts/src/example/org/apache/struts/webapp/example/CheckLogonTag.java
  
  Index: CheckLogonTag.java
  ===================================================================
  RCS file: /home/cvs/jakarta-struts/src/example/org/apache/struts/webapp/example/CheckLogonTag.java,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- CheckLogonTag.java	13 Jan 2004 12:48:44 -0000	1.10
  +++ CheckLogonTag.java	13 Mar 2004 05:23:39 -0000	1.11
  @@ -3,63 +3,20 @@
    * $Revision$
    * $Date$
    *
  - * ====================================================================
  - *
  - * The Apache Software License, Version 1.1
  - *
  - * Copyright (c) 1999-2003 The Apache Software Foundation.  All rights
  - * reserved.
  - *
  - * Redistribution and use in source and binary forms, with or without
  - * modification, are permitted provided that the following conditions
  - * are met:
  - *
  - * 1. Redistributions of source code must retain the above copyright
  - *    notice, this list of conditions and the following disclaimer.
  - *
  - * 2. Redistributions in binary form must reproduce the above copyright
  - *    notice, this list of conditions and the following disclaimer in
  - *    the documentation and/or other materials provided with the
  - *    distribution.
  - *
  - * 3. The end-user documentation included with the redistribution, if
  - *    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,
  - *    if and wherever such third-party acknowlegements normally appear.
  - *
  - * 4. The names "The Jakarta Project", "Struts", 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 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
  - * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
  - * DISCLAIMED.  IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
  - * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
  - * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
  - * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
  - * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
  - * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
  - * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
  - * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  - * SUCH DAMAGE.
  - * ====================================================================
  - *
  - * This software consists of voluntary contributions made by many
  - * individuals on behalf of the Apache Software Foundation.  For more
  - * information on the Apache Software Foundation, please see
  - * <http://www.apache.org/>.
  + * Copyright 2000-2004 Apache Software Foundation
    *
  + * Licensed under the Apache License, Version 2.0 (the "License");
  + * you may not use this file except in compliance with the License.
  + * You may obtain a copy of the License at
  + *
  + *     http://www.apache.org/licenses/LICENSE-2.0
  + *
  + * Unless required by applicable law or agreed to in writing, software
  + * distributed under the License is distributed on an "AS IS" BASIS,
  + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  + * See the License for the specific language governing permissions and
  + * limitations under the License.
    */
  -
  -
   package org.apache.struts.webapp.example;
   
   
  @@ -78,7 +35,6 @@
    *
    * @version $Revision$ $Date$
    */
  -
   public final class CheckLogonTag extends TagSupport {
   
   
  @@ -92,56 +48,15 @@
   
   
       /**
  -     * The page to which we should forward for the user to log on.
  -     */
  -    private String page = "/logon.jsp";
  -
  -
  -    // ----------------------------------------------------------- Properties
  -
  -
  -    /**
  -     * Return the bean name.
  -     */
  -    public String getName() {
  -
  -	   return (this.name);
  -
  -    }
  -
  -
  -    /**
  -     * Set the bean name.
  -     *
  -     * @param name The new bean name
  +     * Path to use if a login is needed.
        */
  -    public void setName(String name) {
  -
  -	   this.name = name;
  -
  -    }
  +    private static String LOGIN_PATH = "/Logon.do";
   
   
       /**
  -     * Return the forward page.
  +     * The action to which we should forward for the user to log on.
        */
  -    public String getPage() {
  -
  -	   return (this.page);
  -
  -    }
  -
  -
  -    /**
  -     * Set the forward page.
  -     *
  -     * @param page The new forward page
  -     */
  -    public void setPage(String page) {
  -
  -	   this.page = page;
  -
  -    }
  +    private String page = LOGIN_PATH;
   
   
       // ------------------------------------------------------- Public Methods
  @@ -204,9 +119,8 @@
   
           super.release();
           this.name = Constants.USER_KEY;
  -        this.page = "/logon.jsp";
  +        this.page = LOGIN_PATH;
   
       }
  -
   
   }
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: struts-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: struts-dev-help@jakarta.apache.org