Commit 52a253f8 authored by opencadc-admin's avatar opencadc-admin Committed by GitHub
Browse files

Merge pull request #5 from yeunga/master 

Fixed javadoc errors.
parents e16276a3 749ba027

.travis.yml

+1 −1
Original line number Diff line number Diff line
@@ -2,5 +2,5 @@ language: java 
jdk:

  - openjdk7

  - oraclejdk8

script: for mod in cadc-access-control  cadc-access-control-identity  cadc-access-control-server cadc-access-control-admin cadc-tomcat; do cd $mod; gradle assemble check install || break -1; cd ..; done

script: for mod in cadc-access-control  cadc-access-control-identity  cadc-access-control-server cadc-access-control-admin cadc-tomcat; do cd $mod; gradle --info build javadoc install || break -1; cd ..; done

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

+1 −1
Original line number Diff line number Diff line
@@ -95,7 +95,7 @@ import ca.nrc.cadc.util.StringUtil; 
 * Servlet to handle password changes.  Passwords are an integral part of the

 * access control system and are handled differently to accommodate stricter

 * guidelines.

 * <p/>

 * <p>

 * This servlet handles POST only.  It relies on the Subject being set higher

 * up by the AccessControlFilter as configured in the web descriptor.

 */

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

+1 −1
Original line number Diff line number Diff line
@@ -109,7 +109,7 @@ import ca.nrc.cadc.util.StringUtil; 
 * Servlet to handle password resets.  Passwords are an integral part of the

 * access control system and are handled differently to accommodate stricter

 * guidelines.

 * <p/>

 * <p>

 * This servlet handles GET and POST only.  It relies on the Subject being set higher

 * up by the AccessControlFilter as configured in the web descriptor.

 */

cadc-access-control/src/main/java/ca/nrc/cadc/ac/xml/GroupReader.java

+0 −2
Original line number Diff line number Diff line
@@ -115,7 +115,6 @@ public class GroupReader extends AbstractReaderWriter 
     * @return Group Group.

     * @throws ReaderException

     * @throws java.io.IOException

     * @throws java.net.URISyntaxException

     */

    public Group read(InputStream in)

        throws ReaderException, IOException
@@ -143,7 +142,6 @@ public class GroupReader extends AbstractReaderWriter 
     * @return Group Group.

     * @throws ReaderException

     * @throws java.io.IOException

     * @throws java.net.URISyntaxException

     */

    public Group read(Reader reader)

        throws ReaderException, IOException

cadc-access-control/src/main/java/ca/nrc/cadc/ac/xml/UserListReader.java

+0 −1
Original line number Diff line number Diff line
@@ -117,7 +117,6 @@ public class UserListReader extends AbstractReaderWriter 
     * @return List of Users.

     * @throws ReaderException

     * @throws java.io.IOException

     * @throws java.net.URISyntaxException

     */

    public List<User> read(InputStream in)

        throws ReaderException, IOException