Skip to content
Snippets Groups Projects
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
No related branches found
No related tags found
No related merge requests found
...@@ -2,5 +2,5 @@ language: java ...@@ -2,5 +2,5 @@ language: java
jdk: jdk:
- openjdk7 - openjdk7
- oraclejdk8 - 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
...@@ -95,7 +95,7 @@ import ca.nrc.cadc.util.StringUtil; ...@@ -95,7 +95,7 @@ import ca.nrc.cadc.util.StringUtil;
* Servlet to handle password changes. Passwords are an integral part of the * Servlet to handle password changes. Passwords are an integral part of the
* access control system and are handled differently to accommodate stricter * access control system and are handled differently to accommodate stricter
* guidelines. * guidelines.
* <p/> * <p>
* This servlet handles POST only. It relies on the Subject being set higher * This servlet handles POST only. It relies on the Subject being set higher
* up by the AccessControlFilter as configured in the web descriptor. * up by the AccessControlFilter as configured in the web descriptor.
*/ */
......
...@@ -109,7 +109,7 @@ import ca.nrc.cadc.util.StringUtil; ...@@ -109,7 +109,7 @@ import ca.nrc.cadc.util.StringUtil;
* Servlet to handle password resets. Passwords are an integral part of the * Servlet to handle password resets. Passwords are an integral part of the
* access control system and are handled differently to accommodate stricter * access control system and are handled differently to accommodate stricter
* guidelines. * guidelines.
* <p/> * <p>
* This servlet handles GET and POST only. It relies on the Subject being set higher * 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. * up by the AccessControlFilter as configured in the web descriptor.
*/ */
......
...@@ -115,7 +115,6 @@ public class GroupReader extends AbstractReaderWriter ...@@ -115,7 +115,6 @@ public class GroupReader extends AbstractReaderWriter
* @return Group Group. * @return Group Group.
* @throws ReaderException * @throws ReaderException
* @throws java.io.IOException * @throws java.io.IOException
* @throws java.net.URISyntaxException
*/ */
public Group read(InputStream in) public Group read(InputStream in)
throws ReaderException, IOException throws ReaderException, IOException
...@@ -143,7 +142,6 @@ public class GroupReader extends AbstractReaderWriter ...@@ -143,7 +142,6 @@ public class GroupReader extends AbstractReaderWriter
* @return Group Group. * @return Group Group.
* @throws ReaderException * @throws ReaderException
* @throws java.io.IOException * @throws java.io.IOException
* @throws java.net.URISyntaxException
*/ */
public Group read(Reader reader) public Group read(Reader reader)
throws ReaderException, IOException throws ReaderException, IOException
......
...@@ -117,7 +117,6 @@ public class UserListReader extends AbstractReaderWriter ...@@ -117,7 +117,6 @@ public class UserListReader extends AbstractReaderWriter
* @return List of Users. * @return List of Users.
* @throws ReaderException * @throws ReaderException
* @throws java.io.IOException * @throws java.io.IOException
* @throws java.net.URISyntaxException
*/ */
public List<User> read(InputStream in) public List<User> read(InputStream in)
throws ReaderException, IOException throws ReaderException, IOException
......
...@@ -80,17 +80,17 @@ import org.apache.log4j.Logger; ...@@ -80,17 +80,17 @@ import org.apache.log4j.Logger;
/** /**
* A very simple caching IVOA Registry client. All the lookups done by this client use a properties * A very simple caching IVOA Registry client. All the lookups done by this client use a properties
* file named RegistryClient.properties found via the classpath. * file named RegistryClient.properties found via the classpath.
* </p><p> * <p><p>
* Note for developers: You can set a system property to force this class to replace the hostname * Note for developers: You can set a system property to force this class to replace the hostname
* in the resuting URL with the canonical hostname of the local host. This is useful for testing: * in the resuting URL with the canonical hostname of the local host. This is useful for testing:
* </p> * <p>
* <pre> * <pre>
* ca.nrc.cadc.reg.client.RegistryClient.local=true * ca.nrc.cadc.reg.client.RegistryClient.local=true
* </pre> * </pre>
* </p><p> * <p><p>
* Note for developers: You can set a system property to force this class to replace the hostname * Note for developers: You can set a system property to force this class to replace the hostname
* in the resuting URL with an arbitrary hostname. This is useful for testing a specific remote server: * in the resuting URL with an arbitrary hostname. This is useful for testing a specific remote server:
* </p> * <p>
* <pre> * <pre>
* ca.nrc.cadc.reg.client.RegistryClient.host=www.example.com * ca.nrc.cadc.reg.client.RegistryClient.host=www.example.com
* </pre> * </pre>
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment