Commit 4d054735 authored by Patrick Dowler's avatar Patrick Dowler
Browse files

added ResourceNotFoundException and modified cred APIs to use it

parent b70dbb92

projects/cadcCDP-Server/src/ca/nrc/cadc/cred/server/ProxyServlet.java

+1 −0
Original line number Diff line number Diff line
@@ -64,6 +64,7 @@ import ca.nrc.cadc.cred.server.actions.DelegationActionFactory; 
import ca.nrc.cadc.io.ByteCountWriter;

import ca.nrc.cadc.log.ServletLogInfo;

import ca.nrc.cadc.log.WebServiceLogInfo;

import ca.nrc.cadc.net.ResourceNotFoundException;

import java.io.PrintWriter;



/**

projects/cadcCDP-Server/src/ca/nrc/cadc/cred/server/actions/DelegationAction.java

+1 −1
Original line number Diff line number Diff line
@@ -63,9 +63,9 @@ import org.bouncycastle.jce.provider.BouncyCastleProvider; 


import ca.nrc.cadc.auth.AuthenticationUtil;

import ca.nrc.cadc.auth.X509CertificateChain;

import ca.nrc.cadc.cred.server.ResourceNotFoundException;

import ca.nrc.cadc.cred.CertUtil;

import ca.nrc.cadc.cred.server.CertificateDAO;

import ca.nrc.cadc.net.ResourceNotFoundException;

import ca.nrc.cadc.profiler.Profiler;

import java.util.Iterator;

import org.apache.log4j.Logger;

projects/cadcCDP-Server/src/ca/nrc/cadc/cred/server/actions/DelegationActionFactory.java

+2 −2
Original line number Diff line number Diff line
@@ -45,7 +45,7 @@ import javax.servlet.http.HttpServletRequest; 


import ca.nrc.cadc.auth.X509CertificateChain;

import ca.nrc.cadc.cred.server.CertificateDAO;

import ca.nrc.cadc.cred.server.ResourceNotFoundException;

import ca.nrc.cadc.net.ResourceNotFoundException;

import ca.nrc.cadc.profiler.Profiler;

import java.security.Principal;

import java.util.HashSet;
@@ -219,7 +219,7 @@ public class DelegationActionFactory 
        public X509CertificateChain getCertificate(X500Principal name)

                throws Exception

        {

            throw new ResourceNotFoundException();

            throw new ResourceNotFoundException("not found: " + name.getName());

        }



    }

projects/cadcCDP-Server/src/ca/nrc/cadc/cred/server/actions/GetProxyCertByDN.java

+2 −2
Original line number Diff line number Diff line
@@ -40,7 +40,7 @@ import javax.security.auth.x500.X500Principal; 


import ca.nrc.cadc.auth.X509CertificateChain;

import ca.nrc.cadc.cred.server.CertificateDAO;

import ca.nrc.cadc.cred.server.ResourceNotFoundException;

import ca.nrc.cadc.net.ResourceNotFoundException;

import ca.nrc.cadc.profiler.Profiler;



/**
@@ -81,7 +81,7 @@ public class GetProxyCertByDN extends DelegationAction 
        X509CertificateChain cert = certDAO.get(p);

        profiler.checkpoint("getCertificate");

        if (cert == null)

            throw new ResourceNotFoundException();

            throw new ResourceNotFoundException("not found: " + p.getName());

        return prepareCert(cert);

    }

projects/cadcCDP-Server/test/src/ca/nrc/cadc/cred/server/actions/DelegationActionFactoryTest.java

+1 −1
Original line number Diff line number Diff line 
package ca.nrc.cadc.cred.server.actions;



import ca.nrc.cadc.auth.AuthenticationUtil;

import ca.nrc.cadc.cred.server.ResourceNotFoundException;

import ca.nrc.cadc.net.ResourceNotFoundException;

import static org.easymock.EasyMock.createMock;

import static org.easymock.EasyMock.expect;

import static org.easymock.EasyMock.replay;