Loading cadcCDP/Dependencies.txtdeleted 100644 → 0 +0 −10 Original line number Original line Diff line number Diff line JAR files required for the OpenCADC cadcUtil project ==================================================== Name in build.xml Versioned Name Project URL ----------------- -------------------- ----------- log4j.jar log4j-1.2.15 http://logging.apache.org bcprov.jar bouncycastle-1.46-11 http://www.bouncycastle.org/ cadcUtil.jar http://code.google.com/p/opencadc cadcRegistryclient.jar http://code.google.com/p/opencadc cadcCDP/build.gradle 0 → 100644 +27 −0 Original line number Original line Diff line number Diff line plugins { id "java" id "maven" } repositories { jcenter() mavenLocal() // Only here until cadcUtil is in jcenter. maven { url "http://dl.bintray.com/opencadc/software" } } version = '1.0' dependencies { compile group: 'log4j', name: 'log4j', version: '1.2.+' compile group: 'org.jdom', name: 'jdom2', version: '2.+' compile group: 'xerces', name: 'xercesImpl', version: '2.+' compile group: 'org.bouncycastle', name: 'bcprov-jdk16', version:'1.+' compile 'opencadc:cadcUtil:1.+' compile 'opencadc:cadcLog:1.+' compile 'opencadc:cadcRegistry:1.+' } cadcCDP/build.xmldeleted 100644 → 0 +0 −124 Original line number Original line Diff line number Diff line <!-- ************************************************************************ ******************* CANADIAN ASTRONOMY DATA CENTRE ******************* ************** CENTRE CANADIEN DE DONNÉES ASTRONOMIQUES ************** * * (c) 2009. (c) 2009. * Government of Canada Gouvernement du Canada * National Research Council Conseil national de recherches * Ottawa, Canada, K1A 0R6 Ottawa, Canada, K1A 0R6 * All rights reserved Tous droits réservés * * NRC disclaims any warranties, Le CNRC dénie toute garantie * expressed, implied, or énoncée, implicite ou légale, * statutory, of any kind with de quelque nature que ce * respect to the software, soit, concernant le logiciel, * including without limitation y compris sans restriction * any warranty of merchantability toute garantie de valeur * or fitness for a particular marchande ou de pertinence * purpose. NRC shall not be pour un usage particulier. * liable in any event for any Le CNRC ne pourra en aucun cas * damages, whether direct or être tenu responsable de tout * indirect, special or general, dommage, direct ou indirect, * consequential or incidental, particulier ou général, * arising from the use of the accessoire ou fortuit, résultant * software. Neither the name de l'utilisation du logiciel. Ni * of the National Research le nom du Conseil National de * Council of Canada nor the Recherches du Canada ni les noms * names of its contributors may de ses participants ne peuvent * be used to endorse or promote être utilisés pour approuver ou * products derived from this promouvoir les produits dérivés * software without specific prior de ce logiciel sans autorisation * written permission. préalable et particulière * par écrit. * * This file is part of the Ce fichier fait partie du projet * OpenCADC project. OpenCADC. * * OpenCADC is free software: OpenCADC est un logiciel libre ; * you can redistribute it and/or vous pouvez le redistribuer ou le * modify it under the terms of modifier suivant les termes de * the GNU Affero General Public la “GNU Affero General Public * License as published by the License” telle que publiée * Free Software Foundation, par la Free Software Foundation * either version 3 of the : soit la version 3 de cette * License, or (at your option) licence, soit (à votre gré) * any later version. toute version ultérieure. * * OpenCADC is distributed in the OpenCADC est distribué * hope that it will be useful, dans l’espoir qu’il vous * but WITHOUT ANY WARRANTY; sera utile, mais SANS AUCUNE * without even the implied GARANTIE : sans même la garantie * warranty of MERCHANTABILITY implicite de COMMERCIALISABILITÉ * or FITNESS FOR A PARTICULAR ni d’ADÉQUATION À UN OBJECTIF * PURPOSE. See the GNU Affero PARTICULIER. Consultez la Licence * General Public License for Générale Publique GNU Affero * more details. pour plus de détails. * * You should have received Vous devriez avoir reçu une * a copy of the GNU Affero copie de la Licence Générale * General Public License along Publique GNU Affero avec * with OpenCADC. If not, see OpenCADC ; si ce n’est * <http://www.gnu.org/licenses/>. pas le cas, consultez : * <http://www.gnu.org/licenses/>. * * $Revision: 4 $ * ************************************************************************ --> <project default="build" basedir="."> <property environment="env"/> <property file="local.build.properties" /> <!-- site-specific build properties or overrides of values in opencadc.properties --> <property file="${env.CADC_PREFIX}/etc/local.properties" /> <!-- site-specific targets, e.g. install, cannot duplicate those in opencadc.targets.xml --> <import file="${env.CADC_PREFIX}/etc/local.targets.xml" optional="true" /> <!-- default properties and targets --> <property file="${env.CADC_PREFIX}/etc/opencadc.properties" /> <import file="${env.CADC_PREFIX}/etc/opencadc.targets.xml"/> <!-- developer convenience: place for extra targets and properties --> <import file="extras.xml" optional="true" /> <!-- project-specific properties --> <property name="project" value="cadcCDP" /> <!-- JAR files to be included in classpath and war file --> <property name="lib.cadcUtil" value="${lib}/cadcUtil.jar" /> <property name="lib.cadcRegistryClient" value="${lib}/cadcRegistry.jar" /> <property name="lib.cadcLog" value="${lib}/cadcLog.jar" /> <property name="ext.log4j" value="${ext.lib}/log4j.jar" /> <property name="ext.jdom2" value="${ext.lib}/jdom2.jar" /> <property name="ext.xerces" value="${ext.lib}/xerces.jar" /> <property name="ext.bouncy" value="${ext.lib}/bcprov.jar" /> <!-- end of project properties --> <!-- JAR files to be included in classpath for compilation --> <property name="jars" value="${lib.cadcUtil}:${lib.cadcLog}:${lib.cadcRegistryClient}:${ext.log4j}:${ext.bouncy}" /> <property name="manifest.jars" value="${lib.cadcUtil} ${lib.cadcLog} ${lib.cadcRegistryClient} ${ext.log4j} ${ext.bouncy} ${ext.jdom2} ${ext.xerces}" /> <target name="build" depends="compile,manifest"> <jar jarfile="${build}/lib/${project}.jar" basedir="${build}/class" update="no" manifest="${build}/tmp/${project}.mf" /> </target> <target name="manifest"> <manifest file="${build}/tmp/${project}.mf" mode="replace"> <attribute name="Main-Class" value="ca.nrc.cadc.cred.client.Main"/> <attribute name="Class-Path" value="${manifest.jars}" /> </manifest> </target> <target name="test"> <echo message="tests not implemented"/> </target> </project> cadcCDP/src/ca/nrc/cadc/cred/CertUtil.java→cadcCDP/src/main/java/ca/nrc/cadc/cred/CertUtil.java +0 −0 File moved. View file cadcCDP/src/ca/nrc/cadc/cred/client/CredClient.java→cadcCDP/src/main/java/ca/nrc/cadc/cred/client/CredClient.java +0 −0 File moved. View file Loading
cadcCDP/Dependencies.txtdeleted 100644 → 0 +0 −10 Original line number Original line Diff line number Diff line JAR files required for the OpenCADC cadcUtil project ==================================================== Name in build.xml Versioned Name Project URL ----------------- -------------------- ----------- log4j.jar log4j-1.2.15 http://logging.apache.org bcprov.jar bouncycastle-1.46-11 http://www.bouncycastle.org/ cadcUtil.jar http://code.google.com/p/opencadc cadcRegistryclient.jar http://code.google.com/p/opencadc
cadcCDP/build.gradle 0 → 100644 +27 −0 Original line number Original line Diff line number Diff line plugins { id "java" id "maven" } repositories { jcenter() mavenLocal() // Only here until cadcUtil is in jcenter. maven { url "http://dl.bintray.com/opencadc/software" } } version = '1.0' dependencies { compile group: 'log4j', name: 'log4j', version: '1.2.+' compile group: 'org.jdom', name: 'jdom2', version: '2.+' compile group: 'xerces', name: 'xercesImpl', version: '2.+' compile group: 'org.bouncycastle', name: 'bcprov-jdk16', version:'1.+' compile 'opencadc:cadcUtil:1.+' compile 'opencadc:cadcLog:1.+' compile 'opencadc:cadcRegistry:1.+' }
cadcCDP/build.xmldeleted 100644 → 0 +0 −124 Original line number Original line Diff line number Diff line <!-- ************************************************************************ ******************* CANADIAN ASTRONOMY DATA CENTRE ******************* ************** CENTRE CANADIEN DE DONNÉES ASTRONOMIQUES ************** * * (c) 2009. (c) 2009. * Government of Canada Gouvernement du Canada * National Research Council Conseil national de recherches * Ottawa, Canada, K1A 0R6 Ottawa, Canada, K1A 0R6 * All rights reserved Tous droits réservés * * NRC disclaims any warranties, Le CNRC dénie toute garantie * expressed, implied, or énoncée, implicite ou légale, * statutory, of any kind with de quelque nature que ce * respect to the software, soit, concernant le logiciel, * including without limitation y compris sans restriction * any warranty of merchantability toute garantie de valeur * or fitness for a particular marchande ou de pertinence * purpose. NRC shall not be pour un usage particulier. * liable in any event for any Le CNRC ne pourra en aucun cas * damages, whether direct or être tenu responsable de tout * indirect, special or general, dommage, direct ou indirect, * consequential or incidental, particulier ou général, * arising from the use of the accessoire ou fortuit, résultant * software. Neither the name de l'utilisation du logiciel. Ni * of the National Research le nom du Conseil National de * Council of Canada nor the Recherches du Canada ni les noms * names of its contributors may de ses participants ne peuvent * be used to endorse or promote être utilisés pour approuver ou * products derived from this promouvoir les produits dérivés * software without specific prior de ce logiciel sans autorisation * written permission. préalable et particulière * par écrit. * * This file is part of the Ce fichier fait partie du projet * OpenCADC project. OpenCADC. * * OpenCADC is free software: OpenCADC est un logiciel libre ; * you can redistribute it and/or vous pouvez le redistribuer ou le * modify it under the terms of modifier suivant les termes de * the GNU Affero General Public la “GNU Affero General Public * License as published by the License” telle que publiée * Free Software Foundation, par la Free Software Foundation * either version 3 of the : soit la version 3 de cette * License, or (at your option) licence, soit (à votre gré) * any later version. toute version ultérieure. * * OpenCADC is distributed in the OpenCADC est distribué * hope that it will be useful, dans l’espoir qu’il vous * but WITHOUT ANY WARRANTY; sera utile, mais SANS AUCUNE * without even the implied GARANTIE : sans même la garantie * warranty of MERCHANTABILITY implicite de COMMERCIALISABILITÉ * or FITNESS FOR A PARTICULAR ni d’ADÉQUATION À UN OBJECTIF * PURPOSE. See the GNU Affero PARTICULIER. Consultez la Licence * General Public License for Générale Publique GNU Affero * more details. pour plus de détails. * * You should have received Vous devriez avoir reçu une * a copy of the GNU Affero copie de la Licence Générale * General Public License along Publique GNU Affero avec * with OpenCADC. If not, see OpenCADC ; si ce n’est * <http://www.gnu.org/licenses/>. pas le cas, consultez : * <http://www.gnu.org/licenses/>. * * $Revision: 4 $ * ************************************************************************ --> <project default="build" basedir="."> <property environment="env"/> <property file="local.build.properties" /> <!-- site-specific build properties or overrides of values in opencadc.properties --> <property file="${env.CADC_PREFIX}/etc/local.properties" /> <!-- site-specific targets, e.g. install, cannot duplicate those in opencadc.targets.xml --> <import file="${env.CADC_PREFIX}/etc/local.targets.xml" optional="true" /> <!-- default properties and targets --> <property file="${env.CADC_PREFIX}/etc/opencadc.properties" /> <import file="${env.CADC_PREFIX}/etc/opencadc.targets.xml"/> <!-- developer convenience: place for extra targets and properties --> <import file="extras.xml" optional="true" /> <!-- project-specific properties --> <property name="project" value="cadcCDP" /> <!-- JAR files to be included in classpath and war file --> <property name="lib.cadcUtil" value="${lib}/cadcUtil.jar" /> <property name="lib.cadcRegistryClient" value="${lib}/cadcRegistry.jar" /> <property name="lib.cadcLog" value="${lib}/cadcLog.jar" /> <property name="ext.log4j" value="${ext.lib}/log4j.jar" /> <property name="ext.jdom2" value="${ext.lib}/jdom2.jar" /> <property name="ext.xerces" value="${ext.lib}/xerces.jar" /> <property name="ext.bouncy" value="${ext.lib}/bcprov.jar" /> <!-- end of project properties --> <!-- JAR files to be included in classpath for compilation --> <property name="jars" value="${lib.cadcUtil}:${lib.cadcLog}:${lib.cadcRegistryClient}:${ext.log4j}:${ext.bouncy}" /> <property name="manifest.jars" value="${lib.cadcUtil} ${lib.cadcLog} ${lib.cadcRegistryClient} ${ext.log4j} ${ext.bouncy} ${ext.jdom2} ${ext.xerces}" /> <target name="build" depends="compile,manifest"> <jar jarfile="${build}/lib/${project}.jar" basedir="${build}/class" update="no" manifest="${build}/tmp/${project}.mf" /> </target> <target name="manifest"> <manifest file="${build}/tmp/${project}.mf" mode="replace"> <attribute name="Main-Class" value="ca.nrc.cadc.cred.client.Main"/> <attribute name="Class-Path" value="${manifest.jars}" /> </manifest> </target> <target name="test"> <echo message="tests not implemented"/> </target> </project>
cadcCDP/src/ca/nrc/cadc/cred/CertUtil.java→cadcCDP/src/main/java/ca/nrc/cadc/cred/CertUtil.java +0 −0 File moved. View file
cadcCDP/src/ca/nrc/cadc/cred/client/CredClient.java→cadcCDP/src/main/java/ca/nrc/cadc/cred/client/CredClient.java +0 −0 File moved. View file