jvanzyl     02/04/30 09:39:24

  Modified:    src/java/org/apache/turbine Turbine.java
               src/java/org/apache/turbine/services/rundata
                        DefaultTurbineRunData.java
  Log:
  Applying Martin's javadoc fixes. thx!
  
  Revision  Changes    Path
  1.38      +2 -4      jakarta-turbine-3/src/java/org/apache/turbine/Turbine.java
  
  Index: Turbine.java
  ===================================================================
  RCS file: /home/cvs/jakarta-turbine-3/src/java/org/apache/turbine/Turbine.java,v
  retrieving revision 1.37
  retrieving revision 1.38
  diff -u -r1.37 -r1.38
  --- Turbine.java      17 Apr 2002 01:59:54 -0000      1.37
  +++ Turbine.java      30 Apr 2002 16:39:24 -0000      1.38
  @@ -96,8 +96,6 @@
    * <p> Turbine servlet recognizes the following initialization parameters.
    *
    * <ul>
  - * <li><code>resources</code> the implementation of
  - * {@link org.apache.fulcrum.resources.ResourceService} to be used</li>
    * <li><code>properties</code> the path to TurbineResources.properties file
    * used by the default implementation of <code>ResourceService</code>, relative
    * to the application root.</li>
  @@ -124,7 +122,7 @@
    * @author <a href="mailto:[EMAIL PROTECTED]";>Jason van Zyl</a>
    * @author <a href="mailto:[EMAIL PROTECTED]";>Daniel Rall</a>
    * @author <a href="mailto:[EMAIL PROTECTED]";>Martin Poeschl</a>
  - * @version $Id: Turbine.java,v 1.37 2002/04/17 01:59:54 dlr Exp $
  + * @version $Id: Turbine.java,v 1.38 2002/04/30 16:39:24 jvanzyl Exp $
    */
   public class Turbine
       extends HttpServlet
  @@ -556,7 +554,7 @@
        * @param propsFile The abstract path to your
        * <code>TurbineResources.properties</code> file (including file
        * name), relative to web application root.  Defaults to {@link
  -     * org.apache.turbine.TurbineConstants.DEFAULT_TURBINE_RESOURCES}.
  +     * org.apache.turbine.TurbineConstants#DEFAULT_TURBINE_RESOURCES}.
        * @exception Exception a generic exception.
        */
       public static synchronized void configure(ServletConfig config,
  
  
  
  1.14      +6 -6      
jakarta-turbine-3/src/java/org/apache/turbine/services/rundata/DefaultTurbineRunData.java
  
  Index: DefaultTurbineRunData.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-turbine-3/src/java/org/apache/turbine/services/rundata/DefaultTurbineRunData.java,v
  retrieving revision 1.13
  retrieving revision 1.14
  diff -u -r1.13 -r1.14
  --- DefaultTurbineRunData.java        23 Apr 2002 16:05:52 -0000      1.13
  +++ DefaultTurbineRunData.java        30 Apr 2002 16:39:24 -0000      1.14
  @@ -96,7 +96,7 @@
    * @author <a href="mailto:[EMAIL PROTECTED]";>Jon S. Stevens</a>
    * @author <a href="mailto:[EMAIL PROTECTED]";>Bernie Hoeneisen</a>
    * @author <a href="mailto:[EMAIL PROTECTED]";>Daniel Rall</a>
  - * @version $Id: DefaultTurbineRunData.java,v 1.13 2002/04/23 16:05:52 dlr Exp $
  + * @version $Id: DefaultTurbineRunData.java,v 1.14 2002/04/30 16:39:24 jvanzyl Exp $
    */
   public class DefaultTurbineRunData
       extends RecyclableSupport
  @@ -590,9 +590,9 @@
        * object from.
        * @return The retreived user, or <code>null</code> if errors
        * occur.
  -     * @see org.apache.turbine.services.SessionBindingEventProxy
  +     * @see org.apache.turbine.services.rundata.SessionBindingEventProxy
        * @see org.apache.fulcrum.security.entity.User
  -     * @see org.apache.fulcrum.session.SessionBindingListener
  +     * @see org.apache.fulcrum.security.session.SessionBindingListener
        */
       public static User getUserFromSession(HttpSession session)
       {
  @@ -1075,11 +1075,11 @@
        * removed from the session (which happens on session timeout).</p>
        *
        * @see #setUser(User)
  -     * @see #setAcl(AccessControlList)
  -     * @see org.apache.turbine.services.SessionBindingEventProxy
  +     * @see #setACL(AccessControlList)
  +     * @see org.apache.turbine.services.rundata.SessionBindingEventProxy
        * @see org.apache.fulcrum.security.entity.User
        * @see org.apache.fulcrum.security.util.AccessControlList
  -     * @see org.apache.fulcrum.session.SessionBindingListener
  +     * @see org.apache.fulcrum.security.session.SessionBindingListener
        */
       public void save()
       {
  
  
  

--
To unsubscribe, e-mail:   <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>

Reply via email to