You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@turbine.apache.org by mp...@apache.org on 2001/05/05 18:34:25 UTC

cvs commit: jakarta-turbine/src/java/org/apache/turbine/modules/actions AccessController.java DefaultAction.java FreeMarkerSiteCooker.java InitContextsAction.java LoginUser.java LogoutUser.java WebMacroSiteAction.java WebMacroSiteSecureAction.java

mpoeschl    01/05/05 09:34:25

  Modified:    src/java/org/apache/turbine/modules/actions
                        AccessController.java DefaultAction.java
                        FreeMarkerSiteCooker.java InitContextsAction.java
                        LoginUser.java LogoutUser.java
                        WebMacroSiteAction.java
                        WebMacroSiteSecureAction.java
  Log:
  - qualifying imports
  
  Revision  Changes    Path
  1.7       +8 -14     jakarta-turbine/src/java/org/apache/turbine/modules/actions/AccessController.java
  
  Index: AccessController.java
  ===================================================================
  RCS file: /home/cvs/jakarta-turbine/src/java/org/apache/turbine/modules/actions/AccessController.java,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- AccessController.java	2001/03/06 04:50:42	1.6
  +++ AccessController.java	2001/05/05 16:34:20	1.7
  @@ -25,13 +25,13 @@
    *    Alternately, this acknowledgment may appear in the software itself,
    *    if and wherever such third-party acknowledgments normally appear.
    *
  - * 4. The names "Apache" and "Apache Software Foundation" and 
  - *    "Apache Turbine" must not be used to endorse or promote products 
  - *    derived from this software without prior written permission. For 
  + * 4. The names "Apache" and "Apache Software Foundation" and
  + *    "Apache Turbine" 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",
  - *    "Apache Turbine", nor may "Apache" appear in their name, without 
  + *    "Apache Turbine", 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
  @@ -54,17 +54,11 @@
    * <http://www.apache.org/>.
    */
   
  -// Java Core Classes
  -import java.util.*;
  -
   // Turbine Utility Classes
  -import org.apache.turbine.modules.*;
  -import org.apache.turbine.util.*;
  -import org.apache.turbine.util.db.*;
  -import org.apache.turbine.util.security.*;
  -import org.apache.turbine.om.security.*;
  -import org.apache.turbine.om.security.peer.*;
  +import org.apache.turbine.modules.Action;
   import org.apache.turbine.services.security.TurbineSecurity;
  +import org.apache.turbine.util.RunData;
  +import org.apache.turbine.util.security.AccessControlList;
   
   
   /**
  @@ -97,7 +91,7 @@
    *
    * @author <a href="mailto:john.mcnally@clearink.com">John D. McNally</a>
    * @author <a href="mailto:bmclaugh@algx.net">Brett McLaughlin</a>
  - * @version $Id: AccessController.java,v 1.6 2001/03/06 04:50:42 chrise Exp $
  + * @version $Id: AccessController.java,v 1.7 2001/05/05 16:34:20 mpoeschl Exp $
    */
   public class AccessController extends Action
   {
  
  
  
  1.4       +7 -10     jakarta-turbine/src/java/org/apache/turbine/modules/actions/DefaultAction.java
  
  Index: DefaultAction.java
  ===================================================================
  RCS file: /home/cvs/jakarta-turbine/src/java/org/apache/turbine/modules/actions/DefaultAction.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- DefaultAction.java	2001/03/06 04:50:42	1.3
  +++ DefaultAction.java	2001/05/05 16:34:20	1.4
  @@ -25,13 +25,13 @@
    *    Alternately, this acknowledgment may appear in the software itself,
    *    if and wherever such third-party acknowledgments normally appear.
    *
  - * 4. The names "Apache" and "Apache Software Foundation" and 
  - *    "Apache Turbine" must not be used to endorse or promote products 
  - *    derived from this software without prior written permission. For 
  + * 4. The names "Apache" and "Apache Software Foundation" and
  + *    "Apache Turbine" 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",
  - *    "Apache Turbine", nor may "Apache" appear in their name, without 
  + *    "Apache Turbine", 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
  @@ -54,20 +54,17 @@
    * <http://www.apache.org/>.
    */
   
  -// Java Core Classes
  -import java.util.*;
  -
   // Turbine Modules
  -import org.apache.turbine.modules.*;
  +import org.apache.turbine.modules.Action;
   
   // Turbine Utility Classes
  -import org.apache.turbine.util.*;
  +import org.apache.turbine.util.RunData;
   
   /**
    * This is a Default Action module that doesn't do much.
    *
    * @author <a href="mailto:mbryson@mont.mindspring.com">Dave Bryson</a>
  - * @version $Id: DefaultAction.java,v 1.3 2001/03/06 04:50:42 chrise Exp $
  + * @version $Id: DefaultAction.java,v 1.4 2001/05/05 16:34:20 mpoeschl Exp $
    */
   public class DefaultAction extends Action
   {
  
  
  
  1.6       +23 -16    jakarta-turbine/src/java/org/apache/turbine/modules/actions/FreeMarkerSiteCooker.java
  
  Index: FreeMarkerSiteCooker.java
  ===================================================================
  RCS file: /home/cvs/jakarta-turbine/src/java/org/apache/turbine/modules/actions/FreeMarkerSiteCooker.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- FreeMarkerSiteCooker.java	2001/03/06 04:50:42	1.5
  +++ FreeMarkerSiteCooker.java	2001/05/05 16:34:21	1.6
  @@ -25,13 +25,13 @@
    *    Alternately, this acknowledgment may appear in the software itself,
    *    if and wherever such third-party acknowledgments normally appear.
    *
  - * 4. The names "Apache" and "Apache Software Foundation" and 
  - *    "Apache Turbine" must not be used to endorse or promote products 
  - *    derived from this software without prior written permission. For 
  + * 4. The names "Apache" and "Apache Software Foundation" and
  + *    "Apache Turbine" 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",
  - *    "Apache Turbine", nor may "Apache" appear in their name, without 
  + *    "Apache Turbine", 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
  @@ -55,20 +55,27 @@
    */
   
   // Java Core Classes
  -import java.util.*;
  -import java.net.*;
  -import java.io.*;
  +import java.util.Enumeration;
  +import java.util.Hashtable;
  +import java.util.LinkedList;
  +import java.util.List;
  +import java.util.Vector;
  +import java.net.URL;
  +import java.io.BufferedReader;
  +import java.io.BufferedWriter;
  +import java.io.File;
  +import java.io.FileReader;
  +import java.io.FileWriter;
  +import java.io.InputStreamReader;
   
   // Turbine Utility Classes
  -import org.apache.turbine.modules.*;
  -import org.apache.turbine.util.*;
  -import org.apache.turbine.util.db.*;
  -import org.apache.turbine.om.security.*;
  -import org.apache.turbine.om.security.peer.*;
  -import org.apache.turbine.services.resources.*;
  -import org.apache.turbine.services.freemarker.*;
  +import org.apache.turbine.modules.Action;
  +import org.apache.turbine.services.resources.TurbineResources;
  +import org.apache.turbine.services.freemarker.DynamicURIModel;
  +import org.apache.turbine.util.Log;
  +import org.apache.turbine.util.RunData;
   
  -import freemarker.template.*;
  +import freemarker.template.SimpleScalar;
   
   /**
    * This action parses all files located in the screens, navigations,
  @@ -78,7 +85,7 @@
    * the urls with the static variation.
    *
    * @author <a href="mailto:john.mcnally@clearink.com">John D. McNally</a>
  - * @version $Id: FreeMarkerSiteCooker.java,v 1.5 2001/03/06 04:50:42 chrise Exp $
  + * @version $Id: FreeMarkerSiteCooker.java,v 1.6 2001/05/05 16:34:21 mpoeschl Exp $
    */
   public class FreeMarkerSiteCooker extends Action
   {
  
  
  
  1.5       +14 -11    jakarta-turbine/src/java/org/apache/turbine/modules/actions/InitContextsAction.java
  
  Index: InitContextsAction.java
  ===================================================================
  RCS file: /home/cvs/jakarta-turbine/src/java/org/apache/turbine/modules/actions/InitContextsAction.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- InitContextsAction.java	2001/03/18 16:58:15	1.4
  +++ InitContextsAction.java	2001/05/05 16:34:21	1.5
  @@ -25,13 +25,13 @@
    *    Alternately, this acknowledgment may appear in the software itself,
    *    if and wherever such third-party acknowledgments normally appear.
    *
  - * 4. The names "Apache" and "Apache Software Foundation" and 
  - *    "Apache Turbine" must not be used to endorse or promote products 
  - *    derived from this software without prior written permission. For 
  + * 4. The names "Apache" and "Apache Software Foundation" and
  + *    "Apache Turbine" 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",
  - *    "Apache Turbine", nor may "Apache" appear in their name, without 
  + *    "Apache Turbine", 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
  @@ -54,25 +54,28 @@
    * <http://www.apache.org/>.
    */
   
  -// Java Core CLasses
  -import java.util.*;
  +// Java Core Classes
  +import java.util.Enumeration;
  +import java.util.Hashtable;
  +import java.util.Iterator;
  +import java.util.Properties;
   
   // Java Naming and Directory Interface Classes
  -import javax.naming.*;
  +import javax.naming.InitialContext;
   
   // Turbine Modules
  -import org.apache.turbine.modules.*;
  +import org.apache.turbine.modules.Action;
   
   // Turbine Utility Classes
  -import org.apache.turbine.util.*;
  -import org.apache.turbine.util.db.*;
  +import org.apache.turbine.util.RunData;
   import org.apache.turbine.services.resources.TurbineResources;
   
  +
   /**
    * Used to initialize JNDI contexts.
    *
    * @author <a href="mailto:greg@shwoop.com">Greg Ritter</a>
  - * @version $Id: InitContextsAction.java,v 1.4 2001/03/18 16:58:15 jvanzyl Exp $
  + * @version $Id: InitContextsAction.java,v 1.5 2001/05/05 16:34:21 mpoeschl Exp $
    */
   public class InitContextsAction extends Action
   {
  
  
  
  1.11      +24 -21    jakarta-turbine/src/java/org/apache/turbine/modules/actions/LoginUser.java
  
  Index: LoginUser.java
  ===================================================================
  RCS file: /home/cvs/jakarta-turbine/src/java/org/apache/turbine/modules/actions/LoginUser.java,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- LoginUser.java	2001/03/06 04:50:43	1.10
  +++ LoginUser.java	2001/05/05 16:34:21	1.11
  @@ -25,13 +25,13 @@
    *    Alternately, this acknowledgment may appear in the software itself,
    *    if and wherever such third-party acknowledgments normally appear.
    *
  - * 4. The names "Apache" and "Apache Software Foundation" and 
  - *    "Apache Turbine" must not be used to endorse or promote products 
  - *    derived from this software without prior written permission. For 
  + * 4. The names "Apache" and "Apache Software Foundation" and
  + *    "Apache Turbine" 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",
  - *    "Apache Turbine", nor may "Apache" appear in their name, without 
  + *    "Apache Turbine", 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
  @@ -54,16 +54,16 @@
    * <http://www.apache.org/>.
    */
   
  -// Java Core CLasses
  -import java.util.*;
  -
  -// Turbine Utility Classes
  -import org.apache.turbine.modules.*;
  -import org.apache.turbine.util.*;
  +// Turbine Classes
  +import org.apache.turbine.TurbineConstants;
  +import org.apache.turbine.modules.Action;
  +import org.apache.turbine.util.Log;
  +import org.apache.turbine.util.RunData;
   import org.apache.turbine.services.resources.TurbineResources;
   import org.apache.turbine.services.security.TurbineSecurity;
  -import org.apache.turbine.om.security.*;
  -import org.apache.turbine.util.security.*;
  +import org.apache.turbine.om.security.User;
  +import org.apache.turbine.util.security.DataBackendException;
  +import org.apache.turbine.util.security.TurbineSecurityException;
   
   /**
    * This is where we authenticate the user logging into the system
  @@ -71,7 +71,7 @@
    * that users last login time will be updated.
    *
    * @author <a href="mailto:mbryson@mont.mindspring.com">Dave Bryson</a>
  - * @version $Id: LoginUser.java,v 1.10 2001/03/06 04:50:43 chrise Exp $
  + * @version $Id: LoginUser.java,v 1.11 2001/05/05 16:34:21 mpoeschl Exp $
    */
   public class LoginUser extends Action
   {
  @@ -93,8 +93,8 @@
               return;
           }
   
  -        String username = data.getParameters().getString ( "username", "" );
  -        String password = data.getParameters().getString ( "password", "" );
  +        String username = data.getParameters().getString( "username", "" );
  +        String password = data.getParameters().getString( "password", "" );
   
           User user = null;
           try
  @@ -116,7 +116,7 @@
               // want to because the username is not set yet.  Save the
               // User object into the session.
               data.save();
  -            
  +
               /*
                * If the setPage("template.vm") method has not
                * been used in the template to authenticate the
  @@ -125,7 +125,7 @@
                * by the "template.home" property as listed in
                * TR.props for the webapp.
                */
  -            
  +
           }
           catch ( TurbineSecurityException e )
           {
  @@ -133,18 +133,21 @@
               {
                   Log.error(e);
               }
  -            data.setMessage(TurbineResources.getString("login.error"));
  +            data.setMessage(TurbineResources.getString(
  +                TurbineConstants.LOGIN_ERROR));
               // Retrieve an anonymous user.
               data.setUser (TurbineSecurity.getAnonymousUser());
  -            String loginTemplate = TurbineResources.getString("template.login");
  -            
  +            String loginTemplate = TurbineResources.getString(
  +                TurbineConstants.TEMPLATE_LOGIN);
  +
               if (loginTemplate != null && loginTemplate.length() > 0)
               {
                   data.setScreenTemplate(loginTemplate);
               }
               else
               {
  -                data.setScreen(TurbineResources.getString("screen.login"));
  +                data.setScreen(TurbineResources.getString(
  +                    TurbineConstants.SCREEN_LOGIN));
               }
           }
       }
  
  
  
  1.9       +20 -23    jakarta-turbine/src/java/org/apache/turbine/modules/actions/LogoutUser.java
  
  Index: LogoutUser.java
  ===================================================================
  RCS file: /home/cvs/jakarta-turbine/src/java/org/apache/turbine/modules/actions/LogoutUser.java,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- LogoutUser.java	2001/03/06 04:50:43	1.8
  +++ LogoutUser.java	2001/05/05 16:34:22	1.9
  @@ -25,13 +25,13 @@
    *    Alternately, this acknowledgment may appear in the software itself,
    *    if and wherever such third-party acknowledgments normally appear.
    *
  - * 4. The names "Apache" and "Apache Software Foundation" and 
  - *    "Apache Turbine" must not be used to endorse or promote products 
  - *    derived from this software without prior written permission. For 
  + * 4. The names "Apache" and "Apache Software Foundation" and
  + *    "Apache Turbine" 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",
  - *    "Apache Turbine", nor may "Apache" appear in their name, without 
  + *    "Apache Turbine", 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
  @@ -54,27 +54,22 @@
    * <http://www.apache.org/>.
    */
   
  -// Java Core Classes
  -import java.util.*;
  -
  -// Turbine Modules
  -import org.apache.turbine.modules.*;
  -
  -// Turbine Utility Classes
  -import org.apache.turbine.modules.*;
  -import org.apache.turbine.util.*;
  -import org.apache.turbine.util.db.*;
  +// Turbine Classes
  +import org.apache.turbine.TurbineConstants;
  +import org.apache.turbine.modules.Action;
  +import org.apache.turbine.om.security.User;
   import org.apache.turbine.services.resources.TurbineResources;
   import org.apache.turbine.services.security.TurbineSecurity;
  -import org.apache.turbine.util.security.*;
  -import org.apache.turbine.om.security.*;
  +import org.apache.turbine.util.Log;
  +import org.apache.turbine.util.RunData;
  +import org.apache.turbine.util.security.AccessControlList;
   
   /**
    * This action removes a user from the session. It makes sure to save
    * the User object in the sesion.
    *
    * @author <a href="mailto:mbryson@mont.mindspring.com">Dave Bryson</a>
  - * @version $Id: LogoutUser.java,v 1.8 2001/03/06 04:50:43 chrise Exp $
  + * @version $Id: LogoutUser.java,v 1.9 2001/05/05 16:34:22 mpoeschl Exp $
    */
   public class LogoutUser extends Action
   {
  @@ -88,18 +83,19 @@
           throws Exception
       {
           User user = data.getUser();
  -        
  +
           if ( user != null )
           {
               // Make sure that the user has really logged in...
  -            if (!user.hasLoggedIn() ) 
  +            if (!user.hasLoggedIn() )
                   return;
   
               user.setHasLoggedIn( new Boolean(false) );
               TurbineSecurity.saveUser( user );
           }
  -        
  -        data.setMessage(TurbineResources.getString("logout.message"));
  +
  +        data.setMessage(TurbineResources.getString(
  +            TurbineConstants.LOGOUT_MESSAGE));
   
           // This will cause the acl to be removed from the session in
           // the Turbine servlet code.
  @@ -121,10 +117,11 @@
           // - it is recommended that action.logout is set to "LogoutUser" and
           // that the session validator does handle setting the screen/template
           // for a logged out (read not-logged-in) user.
  -        if (!TurbineResources.getString("action.logout", "")
  +        if (!TurbineResources.getString(TurbineConstants.ACTION_LOGOUT, "")
                   .equals("LogoutUser"))
           {
  -            data.setScreen(TurbineResources.getString("screen.homepage"));
  +            data.setScreen(TurbineResources.getString(
  +                TurbineConstants.SCREEN_HOMEPAGE));
           }
       }
   }
  
  
  
  1.6       +11 -13    jakarta-turbine/src/java/org/apache/turbine/modules/actions/WebMacroSiteAction.java
  
  Index: WebMacroSiteAction.java
  ===================================================================
  RCS file: /home/cvs/jakarta-turbine/src/java/org/apache/turbine/modules/actions/WebMacroSiteAction.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- WebMacroSiteAction.java	2001/03/06 04:50:43	1.5
  +++ WebMacroSiteAction.java	2001/05/05 16:34:22	1.6
  @@ -25,13 +25,13 @@
    *    Alternately, this acknowledgment may appear in the software itself,
    *    if and wherever such third-party acknowledgments normally appear.
    *
  - * 4. The names "Apache" and "Apache Software Foundation" and 
  - *    "Apache Turbine" must not be used to endorse or promote products 
  - *    derived from this software without prior written permission. For 
  + * 4. The names "Apache" and "Apache Software Foundation" and
  + *    "Apache Turbine" 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",
  - *    "Apache Turbine", nor may "Apache" appear in their name, without 
  + *    "Apache Turbine", 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
  @@ -55,14 +55,14 @@
    */
   
   // Turbine Stuff
  -import org.apache.turbine.util.RunData;
   import org.apache.turbine.modules.screens.TemplateScreen;
   import org.apache.turbine.modules.screens.WebMacroSiteScreen;
  -import org.apache.turbine.util.webmacro.*;
  +import org.apache.turbine.util.RunData;
  +import org.apache.turbine.util.webmacro.WebMacroActionEvent;
   
   // WebMacro Stuff
  -import org.apache.turbine.services.webmacro.*;
  -import org.webmacro.servlet.*;
  +import org.webmacro.servlet.WebContext;
  +
   
   /**
    * This class provides a convenience methods for WebMacroSite Actions
  @@ -70,7 +70,7 @@
    * and not used directly.
    *
    * @author <a href="mailto:jon@latchkey.com">Jon S. Stevens</a>
  - * @version $Id: WebMacroSiteAction.java,v 1.5 2001/03/06 04:50:43 chrise Exp $
  + * @version $Id: WebMacroSiteAction.java,v 1.6 2001/05/05 16:34:22 mpoeschl Exp $
    */
   public abstract class WebMacroSiteAction extends WebMacroActionEvent
   {
  @@ -95,8 +95,7 @@
        * @param context Context for web pages.
        * @exception Exception, a generic exception.
        */
  -    public abstract void doPerform( RunData data,
  -                                    WebContext context )
  +    public abstract void doPerform( RunData data, WebContext context )
           throws Exception;
   
       /**
  @@ -120,8 +119,7 @@
        * @param data Turbine information.
        * @param template The template that will be executed next.
        */
  -    public void setTemplate(RunData data,
  -                            String template)
  +    public void setTemplate(RunData data, String template)
       {
           TemplateScreen.setTemplate(data, template);
       }
  
  
  
  1.5       +8 -11     jakarta-turbine/src/java/org/apache/turbine/modules/actions/WebMacroSiteSecureAction.java
  
  Index: WebMacroSiteSecureAction.java
  ===================================================================
  RCS file: /home/cvs/jakarta-turbine/src/java/org/apache/turbine/modules/actions/WebMacroSiteSecureAction.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- WebMacroSiteSecureAction.java	2001/03/06 22:40:31	1.4
  +++ WebMacroSiteSecureAction.java	2001/05/05 16:34:22	1.5
  @@ -25,13 +25,13 @@
    *    Alternately, this acknowledgment may appear in the software itself,
    *    if and wherever such third-party acknowledgments normally appear.
    *
  - * 4. The names "Apache" and "Apache Software Foundation" and 
  - *    "Apache Turbine" must not be used to endorse or promote products 
  - *    derived from this software without prior written permission. For 
  + * 4. The names "Apache" and "Apache Software Foundation" and
  + *    "Apache Turbine" 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",
  - *    "Apache Turbine", nor may "Apache" appear in their name, without 
  + *    "Apache Turbine", 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
  @@ -55,12 +55,10 @@
    */
   
   // Turbine
  -import org.apache.turbine.modules.screens.*;
  -import org.apache.turbine.modules.*;
  -import org.apache.turbine.util.*;
  +import org.apache.turbine.util.RunData;
   
   // WebMacro
  -import org.webmacro.servlet.*;
  +import org.webmacro.servlet.WebContext;
   
   /**
    * WebMacroSiteSecure action.
  @@ -75,7 +73,7 @@
    *
    * @author <a href="mailto:mbryson@mont.mindspring.com">Dave Bryson</a>
    * @author <a href="mailto:jon@latchkey.com">Jon S. Stevens</a>
  - * @version $Id: WebMacroSiteSecureAction.java,v 1.4 2001/03/06 22:40:31 chrise Exp $
  + * @version $Id: WebMacroSiteSecureAction.java,v 1.5 2001/05/05 16:34:22 mpoeschl Exp $
    */
   public abstract class WebMacroSiteSecureAction extends WebMacroSiteAction
   {
  @@ -86,8 +84,7 @@
        * @param context Context for web pages.
        * @exception Exception, a generic exception.
        */
  -    public abstract void doPerform( RunData data,
  -                                             WebContext context )
  +    public abstract void doPerform( RunData data, WebContext context )
           throws Exception;
   
       /**
  
  
  

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