Commit 6d4a1af7 authored by Adrian Damian's avatar Adrian Damian
Browse files

Converted to the gradle ecosystem

parent 0a5a738e
Loading
Loading
Loading
Loading

.travis.yml

0 → 100644
+6 −0
Original line number Diff line number Diff line
language: java
jdk:
  - openjdk7
  - oraclejdk8
script: for mod in cadcAccessControl  cadcAccessControl-Admin  cadcAccessControl-Identity  cadcAccessControl-Server  cadcTomcat; do cd $mod; gradle assemble check install; cd ..; done
+0 −23
Original line number Diff line number Diff line
@@ -19,26 +19,3 @@ Where command is:
-d|--debug                   : Debug mode print all the logging messages
-h|--help                    : Print this message and exit
```

## Depdencies

### opencadc dependencies

- opencadc/ac/cadcUtil
- opencadc/ac/cadcLog
- opencadc/ac/cadcAccessControl
- opencadc/ac/cadcAccessControl-Server

### external build dependencies
- log4j.jar (log4j-1.2.17.jar)
- commons-logging.jar
- unboundid.jar
- servlet-api
- mail

### external test dependencies
- asm.jar (hibernate-3.2.3)
- cglib.jar (hibernate-3.2.3)
- easymock.jar (easymock-3.0.jar)
- junit.jar (junit-4.6.jar)
- objenesis.jar (objenesis-1.2.jar)
+42 −0
Original line number Diff line number Diff line
plugins {
    id 'java'
    id 'maven'
    id 'maven-publish'
    id 'com.jfrog.bintray' version '1.7.1'
}

repositories {
    jcenter()
    mavenLocal()

    // Only here until cadcUtil is in jcenter.
    maven {
        url  'http://dl.bintray.com/opencadc/software'
    }
}

sourceCompatibility = 1.7
group = 'opencadc'

version = '1.0'

dependencies {
    compile 'log4j:log4j:1.2.+'
    compile 'org.jdom:jdom2:2.+'
    compile 'javax.servlet:javax.servlet-api:3.+'
    compile 'xerces:xercesImpl:2.+'
    compile 'com.unboundid:unboundid-ldapsdk:2.3.+'
    compile 'commons-fileupload:commons-fileupload:1.3.+'
    compile 'com.sun.mail:javax.mail:1.+'

    compile 'opencadc:cadcUtil:1.+'
    compile 'opencadc:cadcLog:1.+'
    compile 'opencadc:cadcRegistry:1.+'
    compile 'opencadc:cadcAccessControl:1.+'
    compile 'opencadc:cadcAccessControl-Server:1.+'

    testCompile 'junit:junit:4.+'
    testCompile 'org.easymock:easymock:3.+'
    testCompile 'xerces:xercesImpl:2.+'
    testCompile 'org.skyscreamer:jsonassert:1.+'
}

cadcAccessControl-Admin/build.xml

deleted100644 → 0
+0 −170
Original line number 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" />
  
  <property file="local.build.properties"/>

  <property name="project" value="cadcAccessControl-Admin"/>

  <!-- JAR files to be included in classpath and war file -->
  <property name="cadcAC" value="${lib}/cadcAccessControl.jar"/>
  <property name="cadcAC-Server" value="${lib}/cadcAccessControl-Server.jar"/>
  <property name="cadcReg" value="${lib}/cadcRegistry.jar"/>
  <property name="cadcLog" value="${lib}/cadcLog.jar"/>
  <property name="cadcUtil" value="${lib}/cadcUtil.jar"/>
  <property name="log4j" value="${ext.lib}/log4j.jar"/>
  <property name="commons-logging" value="${ext.lib}/commons-logging.jar"/>
  <property name="unboundid" value="${ext.lib}/unboundid-ldapsdk-se.jar"/>
  <property name="servlet-api" value="${ext.lib}/servlet-api.jar"/>
  <property name="mail" value="${ext.lib}/mail.jar"/>

  <property name="cadc" value="${cadcAC}:${cadcAC-Server}:${cadcUtil}"/>
  <property name="client.cadc.jars" value="${cadcAC}:${cadcAC-Server}:${cadcLog}:${cadcUtil}:${cadcReg}"/>
  <property name="client.external.jars" value="${unboundid}:${log4j}:${servlet-api}:${mail}"/>

  <property name="jars" value="${cadc}:${client.cadc.jars}:${client.external.jars}"/>

  <target name="copyResources" depends="compile">
    <copy overwrite="true"
      file="${env.A}/etc/LocalAuthority.properties"
      tofile="${build}/class/LocalAuthority.properties"/>
  </target>

  <target name="build" depends="compile,copyResources,manifest">
    <jar jarfile="${build}/lib/${project}.jar"
         basedir="${build}/class" update="no"
         manifest="${build}/tmp/${project}.mf">
    </jar>
  </target>

  <target name="setup-test" depends="init">
    <copy overwrite="true"
          file="${env.A}/test-certificates/x509_CADCAuthtest1.pem"
          tofile="build/test/class/cadcauthtest1.pem"/>
  </target>

  <target name="manifest">
    <pathconvert property="client.flat.manifest" pathsep=" ">
      <mapper type="flatten"/>
      <path>
        <pathelement path="${client.cadc.jars}"/>
      </path>
      <path>
        <pathelement path="${client.external.jars}"/>
      </path>
    </pathconvert>
    <pathconvert property="client.non-flat.manifest" pathsep=" ">
      <path>
        <pathelement path="${client.cadc.jars}"/>
      </path>
      <path>
        <pathelement path="${client.external.jars}"/>
      </path>
    </pathconvert>

    <manifest file="${build}/tmp/${project}.mf" mode="replace">
      <attribute name="Main-Class" value="ca.nrc.cadc.ac.admin.Main"/>
      <attribute name="Class-Path" value="${client.flat.manifest} ${client.non-flat.manifest}"/>
    </manifest>
  	
  	<echo message="classpath: ${client.flat.manifest} ${client.non-flat.manifest}" />
  </target>

  <!-- JAR files needed to run the test suite -->
  <property name="cadcLog" value="${lib}/cadcLog.jar"/>
  <property name="asm"        value="${ext.dev}/asm.jar" />
  <property name="cglib"      value="${ext.dev}/cglib.jar" />
  <property name="easymock"   value="${ext.dev}/easymock.jar" />
  <property name="junit"      value="${ext.dev}/junit.jar" />
  <property name="objenesis"  value="${ext.dev}/objenesis.jar" />
  <property name="jdom2" value="${ext.dev}/jdom2.jar"/>
  <property name="json" value="${ext.dev}/json.jar" />
  <property name="jsonassert" value="${ext.dev}/jsonassert.jar" />

  <property name="testingJars" value="${jsonassert}:${junit}:${asm}:${cglib}:${easymock}:${objenesis}:${jdom2}:${json}:${cadcLog}"/>

</project>
Loading