Fix to build Javadoc with java 1.8 (af3a68fb) · Commits · OATS-CADC / ac

cadc-access-control-server/src/main/java/ca/nrc/cadc/ac/server/web/ResetPasswordServlet.java

+4 −2

Original line number	Original line	Diff line number	Diff line
	@@ -130,6 +130,7 @@ public class ResetPasswordServlet extends HttpServlet
	* using input parameters read from it. Users who do augment		* using input parameters read from it. Users who do augment
	* subject calls are constructed by taking the principals out of the ServletConfig		* subject calls are constructed by taking the principals out of the ServletConfig
	* input parameter.		* input parameter.
			* </p>
	*		*
	* <p>		* <p>
	* The ResetPasswordServlet configuration in the web deployment descriptor file		* The ResetPasswordServlet configuration in the web deployment descriptor file
	@@ -137,13 +138,14 @@ public class ResetPasswordServlet extends HttpServlet
	* <ul>		* <ul>
	* <li><code>ca.nrc.cadc.ac.server.web.ResetPasswordServlet.PrivilegedX500Principals</code>		* <li><code>ca.nrc.cadc.ac.server.web.ResetPasswordServlet.PrivilegedX500Principals</code>
	* is a list of trusted administrators DNs. It is a multi-line list with		* is a list of trusted administrators DNs. It is a multi-line list with
	* line breaks between the trusted DNs and each DN eclosed in double quotes.		* line breaks between the trusted DNs and each DN eclosed in double quotes.</li>
	* <li><code>ca.nrc.cadc.ac.server.web.ResetPasswordServlet.PrivilegedHttpPrincipals</code>		* <li><code>ca.nrc.cadc.ac.server.web.ResetPasswordServlet.PrivilegedHttpPrincipals</code>
	* is a list of space separated userids (HTTP identities) corresponding		* is a list of space separated userids (HTTP identities) corresponding
	* to the previous DNs.		* to the previous DNs.</li>
	* </ul>		* </ul>
	* The two lists of principal names must be of the same		* The two lists of principal names must be of the same
	* length and correspond to each other in order.		* length and correspond to each other in order.
			* </p>
	*		*
	* @param config The servlet configuration object.		* @param config The servlet configuration object.
	* @param response The HTTP Response.		* @param response The HTTP Response.

cadc-access-control-server/src/main/java/ca/nrc/cadc/ac/server/web/UserRequestServlet.java

+4 −2

Original line number	Original line	Diff line number	Diff line
	@@ -118,6 +118,7 @@ public class UserRequestServlet extends HttpServlet
	* using input parameters read from it. Users who do augment		* using input parameters read from it. Users who do augment
	* subject calls are constructed by taking the principals out of the ServletConfig		* subject calls are constructed by taking the principals out of the ServletConfig
	* input parameter.		* input parameter.
			* </p>
	*		*
	* <p>		* <p>
	* The UserRequestServlet in the web deployment descriptor file		* The UserRequestServlet in the web deployment descriptor file
	@@ -125,13 +126,14 @@ public class UserRequestServlet extends HttpServlet
	* <ul>		* <ul>
	* <li><code>ca.nrc.cadc.ac.server.web.UserRequestServlet.PrivilegedX500Principals</code>		* <li><code>ca.nrc.cadc.ac.server.web.UserRequestServlet.PrivilegedX500Principals</code>
	* is a list of trusted administrators DNs. It is a multi-line list with		* is a list of trusted administrators DNs. It is a multi-line list with
	* line breaks between the trusted DNs and each DN eclosed in double quotes.		* line breaks between the trusted DNs and each DN eclosed in double quotes.</li>
	* <li><code>ca.nrc.cadc.ac.server.web.UserRequestServlet.PrivilegedHttpPrincipals</code>		* <li><code>ca.nrc.cadc.ac.server.web.UserRequestServlet.PrivilegedHttpPrincipals</code>
	* is a list of space separated userids (HTTP identities) corresponding		* is a list of space separated userids (HTTP identities) corresponding
	* to the previous DNs.		* to the previous DNs.</li>
	* </ul>		* </ul>
	* The two lists of principal names must be of the same		* The two lists of principal names must be of the same
	* length and correspond to each other in order.		* length and correspond to each other in order.
			* </p>
	*		*
	* @param config The servlet configuration object.		* @param config The servlet configuration object.
	* @param response The HTTP Response.		* @param response The HTTP Response.

cadc-access-control-server/src/main/java/ca/nrc/cadc/ac/server/web/UserServlet.java

+31 −1

Original line number	Original line	Diff line number	Diff line
	@@ -110,6 +110,36 @@ public class UserServlet extends HttpServlet

	private UserPersistence userPersistence;		private UserPersistence userPersistence;

			/**
			* Servlet initialization method.
			*
			* <p>
			* Receives the servlet configuration object and initializes UserPersistence
			* using input parameters read from it. Users who do augment
			* subject calls are constructed by taking the principals out of the ServletConfig
			* input parameter.
			* </p>
			*
			* <p>
			* The UserServlet configuration in the web deployment descriptor file
			* <code>web.xml</code> must have two input parameters:
			* <ul>
			* <li><code>ca.nrc.cadc.ac.server.web.UserServlet.PrivilegedX500Principals</code>
			* is a list of trusted administrators DNs. It is a multi-line list with
			* line breaks between the trusted DNs and each DN eclosed in double quotes.</li>
			* <li><code>ca.nrc.cadc.ac.server.web.UserServlet.PrivilegedHttpPrincipals</code>
			* is a list of space separated userids (HTTP identities) corresponding
			* to the previous DNs.</li>
			* </ul>
			* The two lists of principal names must be of the same
			* length and correspond to each other in order.
			* </p>
			*
			* @param config The servlet configuration object.
			* @param response The HTTP Response.
			*
			* @throws javax.servlet.ServletException For general Servlet exceptions.
			*/
	@Override		@Override
	public void init(ServletConfig config) throws ServletException		public void init(ServletConfig config) throws ServletException
	{		{