Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
OATS-CADC
ac
Commits
af3a68fb
Commit
af3a68fb
authored
Nov 25, 2016
by
Sara Bertocco
Browse files
Fix to build Javadoc with java 1.8
parent
c660cd72
Changes
3
Hide whitespace changes
Inline
Side-by-side
cadc-access-control-server/src/main/java/ca/nrc/cadc/ac/server/web/ResetPasswordServlet.java
View file @
af3a68fb
...
...
@@ -130,6 +130,7 @@ public class ResetPasswordServlet extends HttpServlet
* 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 ResetPasswordServlet configuration in the web deployment descriptor file
...
...
@@ -137,13 +138,14 @@ public class ResetPasswordServlet extends HttpServlet
* <ul>
* <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
* 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>
* is a list of space separated userids (HTTP identities) corresponding
* to the previous DNs.
* 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.
...
...
cadc-access-control-server/src/main/java/ca/nrc/cadc/ac/server/web/UserRequestServlet.java
View file @
af3a68fb
...
...
@@ -118,6 +118,7 @@ public class UserRequestServlet extends HttpServlet
* 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 UserRequestServlet in the web deployment descriptor file
...
...
@@ -125,13 +126,14 @@ public class UserRequestServlet extends HttpServlet
* <ul>
* <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
* 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>
* is a list of space separated userids (HTTP identities) corresponding
* to the previous DNs.
* 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.
...
...
cadc-access-control-server/src/main/java/ca/nrc/cadc/ac/server/web/UserServlet.java
View file @
af3a68fb
...
...
@@ -109,7 +109,37 @@ public class UserServlet extends HttpServlet
protected
List
<
Subject
>
privilegedSubjects
;
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
public
void
init
(
ServletConfig
config
)
throws
ServletException
{
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment