Merge branch 'master' of https://github.com/opencadc/cdp (ae2e5bc2) · Commits · OATS-CADC / cdp

.travis.yml

+1 −1

Original line number	Diff line number	Diff line
		@@ -2,4 +2,4 @@ language: java
		jdk:
		- openjdk7
		- oraclejdk8
		script: for mod in cadc-cdp cadc-cdp-server; do cd $mod; gradle assemble check install; cd ..; done
		script: for mod in cadc-cdp cadc-cdp-server; do cd $mod; gradle assemble check install \|\| break -1; cd ..; done

+1 −1

Original line number	Diff line number	Diff line
		@@ -105,7 +105,7 @@ public class GetProxyCertByDN extends DelegationAction
		* Private Key from DB.
		* @param p
		* @return
		* @throws ca.nrc.cadc.cred.server.ResourceNotFoundException
		* @throws ResourceNotFoundException
		*/
		@Override
		public X509CertificateChain getCertificate(X500Principal p)

+2 −7

Original line number	Diff line number	Diff line
		@@ -59,6 +59,7 @@ public class CredPrivateClient
		* name ca.nrc.cadc.cred.client.priv.impl.CredPrivateClientImpl.
		*
		* @param baseServiceURL
		* @return
		* @throws ClassNotFoundException
		* implementation class
		* ca.nrc.cadc.cred.client.priv.impl.CredPrivateClientImpl
		@@ -67,13 +68,7 @@ public class CredPrivateClient
		* constructor of class
		* ca.nrc.cadc.cred.client.priv.impl.CredPrivateClientImpl
		* not accessible
		* @throws InstationatiationException
		* class
		* ca.nrc.cadc.cred.client.priv.impl.CredPrivateClientImpl
		* cannot be instantiated for some reason ( the class
		* object represents an abstract class, an interface, an
		* array class, a primitive type, or void or the class has
		* no nullary constructor).
		* @throws java.lang.InstantiationException
		*
		*/
		public static CredPrivateClient getInstance(URL baseServiceURL)