From 8a8bc3dc1bc810cef952a12071b6ec7dd8ff9750 Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Mon, 20 Oct 2014 09:33:07 -0400
Subject: [PATCH] Prepare v1.6.1 documentation updates

---
 src/main/java/com/gitblit/manager/IAuthenticationManager.java |   35 ++++++++++++++++++++++++++++++++++-
 1 files changed, 34 insertions(+), 1 deletions(-)

diff --git a/src/main/java/com/gitblit/manager/IAuthenticationManager.java b/src/main/java/com/gitblit/manager/IAuthenticationManager.java
index 33546d9..3600b32 100644
--- a/src/main/java/com/gitblit/manager/IAuthenticationManager.java
+++ b/src/main/java/com/gitblit/manager/IAuthenticationManager.java
@@ -31,6 +31,7 @@
 	 *
 	 * @param httpRequest
 	 * @return a user object or null
+	 * @since 1.4.0
 	 */
 	UserModel authenticate(HttpServletRequest httpRequest);
 
@@ -40,6 +41,7 @@
 	 * @param username
 	 * @param key
 	 * @return a user object or null
+* 	 * @since 1.5.0
 	 */
 	UserModel authenticate(String username, SshKey key);
 
@@ -52,6 +54,7 @@
 	 * @param httpRequest
 	 * @param requiresCertificate
 	 * @return a user object or null
+	 * @since 1.4.0
 	 */
 	UserModel authenticate(HttpServletRequest httpRequest, boolean requiresCertificate);
 
@@ -62,6 +65,7 @@
 	 * @param username
 	 * @param password
 	 * @return a user object or null
+	 * @since 1.4.0
 	 */
 	UserModel authenticate(String username, char[] password);
 
@@ -70,6 +74,7 @@
 	 *
 	 * @param request
 	 * @return the Gitblit cookie for the request or null if not found
+	 * @since 1.4.0
 	 */
 	String getCookie(HttpServletRequest request);
 
@@ -78,21 +83,45 @@
 	 *
 	 * @param response
 	 * @param user
+	 * @since 1.4.0
 	 */
+	@Deprecated
 	void setCookie(HttpServletResponse response, UserModel user);
+
+	/**
+	 * Sets a cookie for the specified user.
+	 *
+	 * @param request
+	 * @param response
+	 * @param user
+	 * @since 1.6.1
+	 */
+	void setCookie(HttpServletRequest request, HttpServletResponse response, UserModel user);
 
 	/**
 	 * Logout a user.
 	 *
 	 * @param user
+	 * @since 1.4.0
 	 */
+	@Deprecated
 	void logout(HttpServletResponse response, UserModel user);
+
+	/**
+	 * Logout a user.
+	 *
+	 * @param request
+	 * @param response
+	 * @param user
+	 * @since 1.6.1
+	 */
+	void logout(HttpServletRequest request, HttpServletResponse response, UserModel user);
 
 	/**
 	 * Does the user service support changes to credentials?
 	 *
 	 * @return true or false
-	 * @since 1.0.0
+	 * @since 1.4.0
 	 */
 	boolean supportsCredentialChanges(UserModel user);
 
@@ -101,6 +130,7 @@
 	 *
 	 * @param user
 	 * @return true if the user service supports display name changes
+	 * @since 1.4.0
 	 */
 	boolean supportsDisplayNameChanges(UserModel user);
 
@@ -109,6 +139,7 @@
 	 *
 	 * @param user
 	 * @return true if the user service supports email address changes
+	 * @since 1.4.0
 	 */
 	boolean supportsEmailAddressChanges(UserModel user);
 
@@ -117,6 +148,7 @@
 	 *
 	 * @param user
 	 * @return true if the user service supports team membership changes
+	 * @since 1.4.0
 	 */
 	boolean supportsTeamMembershipChanges(UserModel user);
 
@@ -125,6 +157,7 @@
 	 *
 	 * @param user
 	 * @return true if the team memberships can be changed
+	 * @since 1.4.0
 	 */
 	boolean supportsTeamMembershipChanges(TeamModel team);
 

--
Gitblit v1.9.1