portals-jetspeed-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From pau...@apache.org
Subject cvs commit: jakarta-jetspeed/xdocs changes.xml
Date Thu, 14 Feb 2002 03:38:17 GMT
paulsp      02/02/13 19:38:17

  Modified:    src/java/org/apache/jetspeed/modules/actions/controllers
                        MultiColumnControllerAction.java
                        RowColumnControllerAction.java
               docs/site changes.html
               xdocs    changes.xml
  Log:
  Redirect to home page when exiting the Customizer.
  PR: 5630
  
  Revision  Changes    Path
  1.6       +23 -2     jakarta-jetspeed/src/java/org/apache/jetspeed/modules/actions/controllers/MultiColumnControllerAction.java
  
  Index: MultiColumnControllerAction.java
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed/src/java/org/apache/jetspeed/modules/actions/controllers/MultiColumnControllerAction.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- MultiColumnControllerAction.java	7 Nov 2001 04:03:36 -0000	1.5
  +++ MultiColumnControllerAction.java	14 Feb 2002 03:38:16 -0000	1.6
  @@ -70,8 +70,10 @@
   import org.apache.jetspeed.xml.api.portletmarkup.Property;
   
   // Turbine stuff
  +import org.apache.turbine.util.DynamicURI;
   import org.apache.turbine.util.Log;
   import org.apache.turbine.util.RunData;
  +import org.apache.turbine.util.StringUtils;
   import org.apache.turbine.services.template.TurbineTemplate;
   
   // Velocity Stuff
  @@ -331,13 +333,32 @@
           context.put("action", "controllers.MultiColumnControllerAction");
       }
       
  +    /**
  +     * Cancel the current customizations.  If this was the last customization
  +     * on the stack, then return the user to the home page.
  +     */
       public void doCancel(RunData data, Context context)
       {
           data.getUser().removeTemp("columns");
           ((JetspeedRunData)data).setCustomized(null);
  -        if (((JetspeedRunData)data).getCustomized()==null)
  +
  +        if (((JetspeedRunData)data).getCustomized() == null)
           {
  -            data.setScreenTemplate("Home");
  +            ((JetspeedRunData)data).setMode("default");
  +
  +            try
  +            {
  +                // bring logged on user to homepage with internal redirect
  +                DynamicURI duri = new DynamicURI(data);
  +                data.getResponse().sendRedirect(duri.toString());
  +            }
  +            catch ( Exception e )
  +            {
  +                Log.error(e);
  +                data.setMessage(e.toString());
  +                data.setStackTrace(StringUtils.stackTrace(e), e);
  +                data.setScreenTemplate("Error");
  +            }
           }
       }
   
  
  
  
  1.7       +25 -4     jakarta-jetspeed/src/java/org/apache/jetspeed/modules/actions/controllers/RowColumnControllerAction.java
  
  Index: RowColumnControllerAction.java
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed/src/java/org/apache/jetspeed/modules/actions/controllers/RowColumnControllerAction.java,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- RowColumnControllerAction.java	6 Dec 2001 06:26:54 -0000	1.6
  +++ RowColumnControllerAction.java	14 Feb 2002 03:38:16 -0000	1.7
  @@ -59,20 +59,23 @@
   import org.apache.jetspeed.portal.PortletController;
   import org.apache.jetspeed.portal.PortletControllerConfig;
   import org.apache.jetspeed.portal.PanedPortletController;
  -import org.apache.jetspeed.services.rundata.JetspeedRunData;
   import org.apache.jetspeed.services.Registry;
  +import org.apache.jetspeed.services.resources.JetspeedResources;
  +import org.apache.jetspeed.services.rundata.JetspeedRunData;
   import org.apache.jetspeed.om.profile.Profile;
   import org.apache.jetspeed.om.registry.RegistryEntry;
   import org.apache.jetspeed.xml.api.portletmarkup.Portlets;
   import org.apache.jetspeed.xml.api.portletmarkup.Entry;
   import org.apache.jetspeed.xml.api.portletmarkup.Metainfo;
   import org.apache.jetspeed.xml.api.portletmarkup.Layout;
  -
   import org.apache.jetspeed.util.AutoProfile;
   
   // Turbine stuff
  +import org.apache.turbine.util.DynamicURI;
   import org.apache.turbine.util.Log;
   import org.apache.turbine.util.RunData;
  +import org.apache.turbine.util.StringUtils;
  +import org.apache.turbine.services.template.TurbineTemplate;
   
   // Velocity Stuff
   import org.apache.velocity.context.Context;
  @@ -276,13 +279,31 @@
           // --------------------------------------------------------------------------
       }
   
  +    /**
  +     * Cancel the current customizations.  If this was the last customization
  +     * on the stack, then return the user to the home page.
  +     */
       public void doCancel(RunData data, Context context)
       {
           ((JetspeedRunData)data).setCustomized(null);
           
  -        if (((JetspeedRunData)data).getCustomized() ==null)
  +        if (((JetspeedRunData)data).getCustomized() == null)
           {
  -            data.setScreenTemplate("Home");
  +            ((JetspeedRunData)data).setMode("default");
  +
  +            try
  +            {
  +                // bring logged on user to homepage with internal redirect
  +                DynamicURI duri = new DynamicURI(data);
  +                data.getResponse().sendRedirect(duri.toString());
  +            }
  +            catch ( Exception e )
  +            {
  +                Log.error(e);
  +                data.setMessage(e.toString());
  +                data.setStackTrace(StringUtils.stackTrace(e), e);
  +                data.setScreenTemplate("Error");
  +            }
           }
       }
   
  
  
  
  1.14      +24 -2     jakarta-jetspeed/docs/site/changes.html
  
  Index: changes.html
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed/docs/site/changes.html,v
  retrieving revision 1.13
  retrieving revision 1.14
  diff -u -r1.13 -r1.14
  --- changes.html	9 Feb 2002 23:58:43 -0000	1.13
  +++ changes.html	14 Feb 2002 03:38:17 -0000	1.14
  @@ -123,7 +123,7 @@
   *** Note: Optional text is inclosed in []
   ***
   <li>
  -  action (add/remove/update/fix) - [Bug # xxx -]  description (committer's initials) [Thanks
to developer_name]
  +  action (add/remove/update/fix) - [Bug # xxx -] date - description (committer's initials)
[Thanks to developer_name]
   </li> 
   -->
   
  @@ -245,7 +245,29 @@
     Add - Adding support for HREF in Link tag in the  HTMLRewrite. (PS)
   </li>
   <li>
  -  Add 2002/02/09 - added xdocs links to Jetspeed TrailMap, Slides (DST)
  +  Add - 2002/02/09 - added xdocs links to Jetspeed TrailMap, Slides (DST)
  +</li>
  +<li>
  +  Add - 2002/02/10 - New Profiler feature: Role-based PSML. If the profiler fails to find
  +  a profile for a user, it then searches all the roles for that user for the profile.
  +</li>
  +<li>
  +  Add - 2002/02/10 - New Profiler feature: When creating new users, the default 
  +  template (user account) is now configurable in the JR.p. Setting this to empty will
  +  not create any PSML entries, and then role-based PSML will be used (if enabled).
  +</li>
  +<li>
  +  Add - 2002/02/10 - New Profiler feature: Configurable media types for new users.
  +  The JR.p configures which media types profiles are cloned from the template account
  +  when a new user is created. List the media types with commas as delimiters.
  +</li>
  +<li>
  +  Add - 2002/02/10 - New JetspeedSecurity feature: Configurable roles to assign to a new
user.
  +   The roles that are assigned to a new user are configurable via the JR.p. List the roles
  +	with commas as delimiters.
  +</li>
  +<li>
  +  Fix - 2002/02/13 - Bug 5630 - Redirect to home page when exiting the Customizer.  (PS)
   </li>
   </ul>
                               </blockquote>
  
  
  
  1.23      +5 -2      jakarta-jetspeed/xdocs/changes.xml
  
  Index: changes.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed/xdocs/changes.xml,v
  retrieving revision 1.22
  retrieving revision 1.23
  diff -u -r1.22 -r1.23
  --- changes.xml	11 Feb 2002 08:06:29 -0000	1.22
  +++ changes.xml	14 Feb 2002 03:38:17 -0000	1.23
  @@ -1,6 +1,6 @@
   <?xml version="1.0" encoding="iso-8859-1"?>
   <!--
  -$Id: changes.xml,v 1.22 2002/02/11 08:06:29 taylor Exp $
  +$Id: changes.xml,v 1.23 2002/02/14 03:38:17 paulsp Exp $
   -->
   <document>
     <properties>
  @@ -19,7 +19,7 @@
   *** Note: Optional text is inclosed in []
   ***
   <li>
  -  action (add/remove/update/fix) - [Bug # xxx -]  description (committer's initials) [Thanks
to developer_name]
  +  action (add/remove/update/fix) - [Bug # xxx -] date - description (committer's initials)
[Thanks to developer_name]
   </li> 
   -->
   
  @@ -161,6 +161,9 @@
     Add - 2002/02/10 - New JetspeedSecurity feature: Configurable roles to assign to a new
user.
      The roles that are assigned to a new user are configurable via the JR.p. List the roles
   	with commas as delimiters.
  +</li>
  +<li>
  +  Fix - 2002/02/13 - Bug 5630 - Redirect to home page when exiting the Customizer.  (PS)
   </li>
   </ul>
   </section>
  
  
  

--
To unsubscribe, e-mail:   <mailto:jetspeed-dev-unsubscribe@jakarta.apache.org>
For additional commands, e-mail: <mailto:jetspeed-dev-help@jakarta.apache.org>


Mime
View raw message