Commit 906e1b14 authored by bmajor's avatar bmajor Committed by GitHub
Browse files

Merge pull request #8 from brianmajor/s1970 

s1970 - added application targets to GMS client and AC Admin client. …
parents 20041524 a0d24742

cadc-access-control-admin/build.gradle

+11 −12
Original line number Diff line number Diff line
@@ -3,40 +3,39 @@ plugins { 
    id 'maven'

    id 'maven-publish'

    id 'com.jfrog.bintray' version '1.7.1'

    id 'application'

}



repositories {

    jcenter()

    mavenLocal()



    // Only here until cadcUtil is in jcenter.

    maven {

        url  'http://dl.bintray.com/opencadc/software'

    }

}



sourceCompatibility = 1.7



group = 'org.opencadc'



version = '1.0'

version = '1.0.1'



mainClassName = 'ca.nrc.cadc.ac.admin.Main'



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 'org.opencadc:cadc-util:1.+'

    compile 'org.opencadc:cadc-log:1.+'

    compile 'org.opencadc:cadc-registry:1.+'

    compile 'org.opencadc:cadc-access-control:1.+'

    compile 'org.opencadc:cadc-access-control-server:1.+'



    testCompile 'junit:junit:4.+'

    testCompile 'org.easymock:easymock:3.+'

    testCompile 'xerces:xercesImpl:2.+'

    testCompile 'org.skyscreamer:jsonassert:1.+'

}



configurations {

  runtime.exclude group: 'org.springframework'

  runtime.exclude group: 'org.restlet.jse'

  runtime.exclude group: 'org.restlet.jee'

}

cadc-access-control-admin/scripts/userAdmin

deleted100755 → 0
+0 −3
Original line number Diff line number Diff line 
#!/bin/bash



java -Xmx128m -jar ${CADC_ROOT}/lib/cadcAccessControl-Admin.jar $*

cadc-access-control-identity/build.gradle

+0 −6
Original line number Diff line number Diff line
@@ -8,11 +8,6 @@ plugins { 
repositories {

    jcenter()

    mavenLocal()



    // Only here until cadcUtil is in jcenter.

    maven {

        url  'http://dl.bintray.com/opencadc/software'

    }

}



sourceCompatibility = 1.7
@@ -24,7 +19,6 @@ dependencies { 
    compile 'log4j:log4j:1.2.+'



    compile 'org.opencadc:cadc-util:1.+'

    compile 'org.opencadc:cadc-log:1.+'

    compile 'org.opencadc:cadc-registry:1.+'

    compile 'org.opencadc:cadc-vosi:1.+'

    compile 'org.opencadc:cadc-access-control:1.+'

cadc-access-control-server/build.gradle

+1 −8
Original line number Diff line number Diff line
@@ -8,23 +8,17 @@ plugins { 
repositories {

    jcenter()

    mavenLocal()



    // Only here until cadcUtil is in jcenter.

    maven {

        url  'http://dl.bintray.com/opencadc/software'

    }

}



sourceCompatibility = 1.7

group = 'org.opencadc'



version = '1.0'

version = '1.0.1'



dependencies {

    compile 'log4j:log4j:1.2.+'

    compile 'org.jdom:jdom2:2.+'

    compile 'org.json:json:20160212'

    compile 'javax.servlet:javax.servlet-api:3.+'

    compile 'xerces:xercesImpl:2.+'

    compile 'com.unboundid:unboundid-ldapsdk:2.3.+'
@@ -39,5 +33,4 @@ dependencies { 
    testCompile 'org.easymock:easymock:3.+'

    testCompile 'xerces:xercesImpl:2.+'

    testCompile 'org.skyscreamer:jsonassert:1.+'

    testCompile 'commons-logging:commons-logging:1.+'

}

cadc-access-control-server/src/test/java/ca/nrc/cadc/ac/server/ldap/AbstractLdapDAOTest.java

+13 −10
Original line number Diff line number Diff line
@@ -67,23 +67,24 @@ 


package ca.nrc.cadc.ac.server.ldap;



import java.lang.reflect.Field;

import java.util.NoSuchElementException;



import javax.security.auth.Subject;

import javax.security.auth.x500.X500Principal;



import org.apache.log4j.Level;

import org.apache.log4j.Logger;

import org.junit.BeforeClass;



import ca.nrc.cadc.ac.PersonalDetails;

import ca.nrc.cadc.ac.User;

import ca.nrc.cadc.ac.UserNotFoundException;

import ca.nrc.cadc.ac.UserRequest;

import ca.nrc.cadc.auth.DNPrincipal;

import ca.nrc.cadc.auth.HttpPrincipal;

import ca.nrc.cadc.auth.NumericPrincipal;

import ca.nrc.cadc.util.Log4jInit;

import org.apache.log4j.Level;

import org.apache.log4j.Logger;

import org.junit.BeforeClass;



import javax.security.auth.Subject;

import javax.security.auth.x500.X500Principal;

import java.lang.reflect.Field;

import java.util.UUID;

import java.util.NoSuchElementException;

import ca.nrc.cadc.util.PropertiesReader;



/**

 * Created by jburke on 2014-11-03.
@@ -132,6 +133,8 @@ public class AbstractLdapDAOTest 
    {

        Log4jInit.setLevel("ca.nrc.cadc.ac", Level.DEBUG);



        System.setProperty(PropertiesReader.class.getName() + ".dir", "src/test/resources");



        // get the configuration of the development server from and config files...

        try

        {