s1970 - added application targets to GMS client and AC Admin client. Reduced dependencies

cadc-access-control-admin/build.gradle

@@ -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

-#!/bin/bash
-
-java -Xmx128m -jar ${CADC_ROOT}/lib/cadcAccessControl-Admin.jar $*

cadc-access-control-identity/build.gradle

@@ -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.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

@@ -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/build.gradle

@@ -3,22 +3,21 @@ 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.client.GMSClientMain'
 
 dependencies {
     compile 'log4j:log4j:1.2.+'
@@ -33,3 +32,7 @@ dependencies {
     testCompile 'xerces:xercesImpl:2.+'
     testCompile 'org.skyscreamer:jsonassert:1.+'
 }
+
+configurations {
+  runtime.exclude group: 'org.springframework'
+}

cadc-access-control/scripts/cadcGMSClient

-#!/bin/bash
-
-# environment
-#
-# CADC_ROOT : location of installed CADC/CANFAR sofwtare
-# CADC_EXT  : location of external java/lib (default: /usr/cadc/external)
-# C2SRV     : name of the service environment to use (default: www, supported: demo, rc, dev)
-#
-
-# location of jar files
-CL=$CADC_ROOT/lib
-EL=/usr/cadc/external/java/lib
-if [ ! -z $CADC_EXT ]; then
-    EL=$CADC_EXT/java/lib
-fi
-
-# classpath
-echo
-EP="${EL}/jdom2.jar:${EL}/log4j.jar:${EL}/xerces.jar"
-CP="${CL}/cadcUtil.jar:${CL}/cadcRegistryClient.jar:${CL}/cadcAccessControl.jar"
-echo "classpath: ${CP}:${EP}"
-echo
-
-# service environment
-LOCAL=""
-
-if [ "$C2SRV" == "www" ]; then
-    # no-op
-    LOCAL=""
-elif [ "$C2SRV" == "demo" ]; then
-    LOCAL="-Dca.nrc.cadc.reg.client.RegistryClient.shortHostname=demo"
-elif [ "$C2SRV" == "rc" ]; then
-    LOCAL="-Dca.nrc.cadc.reg.client.RegistryClient.shortHostname=rc"
-elif [ "$C2SRV" == "dev" ]; then 
-    LOCAL="-Dca.nrc.cadc.reg.client.RegistryClient.host=$(whoami).cadc.dao.nrc.ca" 
-fi
-echo "registry hack: $LOCAL"
-echo
-
-java $LOCAL -cp "${CP}:${EP}" ca.nrc.cadc.ac.client.GMSClientMain "$@"
-