Commit 831fd7dd authored by Jeff Burke's avatar Jeff Burke
Browse files

s1849: updates for lastest cadcRegistry changes.

parent 8035f4a6

cadcCDP/build.xml

+4 −1
Original line number Original line Diff line number Diff line
@@ -115,5 +115,8 @@ 
    </manifest>

    </manifest>

  </target>

  </target>





  <target name="test">

    <echo message="tests not implemented"/>

  </target>

  

  

</project>
 
</project>

cadcCDP/src/ca/nrc/cadc/cred/client/CredClient.java

+4 −4
Original line number Original line Diff line number Diff line
@@ -199,7 +199,7 @@ public class CredClient 
            }

            }





            URL credUrl = getRegistryClient()

            URL credUrl = getRegistryClient()

                .getServiceURL(this.serviceID, Standards.CRED_PROXY_10_URI, AuthMethod.CERT);

                .getServiceURL(this.serviceID, Standards.CRED_PROXY_10, AuthMethod.CERT);

            URL url = new URL(credUrl.toExternalForm() + "/" + path.toString());

            URL url = new URL(credUrl.toExternalForm() + "/" + path.toString());

            LOGGER.debug("getCertficate: " + url.toString());

            LOGGER.debug("getCertficate: " + url.toString());

            return downloadCertificate(url);

            return downloadCertificate(url);
@@ -242,7 +242,7 @@ public class CredClient 
        }

        }





        URL credUrl = getRegistryClient()

        URL credUrl = getRegistryClient()

            .getServiceURL(this.serviceID, Standards.CRED_DELEGATE_10_URI, AuthMethod.CERT);

            .getServiceURL(this.serviceID, Standards.CRED_DELEGATE_10, AuthMethod.CERT);

        URL resourceURL = new URL(credUrl.toExternalForm() + "/" + resourcePath.toString());

        URL resourceURL = new URL(credUrl.toExternalForm() + "/" + resourcePath.toString());





        LOGGER.debug("delegate(), URL=" + resourceURL);

        LOGGER.debug("delegate(), URL=" + resourceURL);
@@ -313,7 +313,7 @@ public class CredClient 
        }

        }





        URL credUrl = getRegistryClient()

        URL credUrl = getRegistryClient()

            .getServiceURL(this.serviceID, Standards.CRED_DELEGATE_10_URI, AuthMethod.CERT);

            .getServiceURL(this.serviceID, Standards.CRED_DELEGATE_10, AuthMethod.CERT);

        URL resourceURL = new URL(credUrl.toExternalForm() + "/" + resourcePath.toString());

        URL resourceURL = new URL(credUrl.toExternalForm() + "/" + resourcePath.toString());





        LOGGER.debug("delegate(), URL=" + resourceURL);

        LOGGER.debug("delegate(), URL=" + resourceURL);
@@ -617,7 +617,7 @@ public class CredClient 
        }

        }





        URL credUrl = getRegistryClient()

        URL credUrl = getRegistryClient()

            .getServiceURL(this.serviceID, Standards.CRED_DELEGATE_10_URI, AuthMethod.CERT);

            .getServiceURL(this.serviceID, Standards.CRED_DELEGATE_10, AuthMethod.CERT);

        URL resourceURL = new URL(credUrl.toExternalForm() + "/" + resourcePath.toString());

        URL resourceURL = new URL(credUrl.toExternalForm() + "/" + resourcePath.toString());

        

        

        LOGGER.debug("get hash, URL=" + resourceURL);

        LOGGER.debug("get hash, URL=" + resourceURL);