From 562faadbba454a26eb3107695fcbdb72b9d381ec Mon Sep 17 00:00:00 2001
From: Brian Major <major.brian@gmail.com>
Date: Fri, 2 Sep 2016 13:32:10 -0700
Subject: [PATCH] s1970 - added application targets to GMS client and AC Admin
client. Reduced dependencies
---
cadc-access-control-admin/build.gradle | 23 ++++++------
cadc-access-control-admin/scripts/userAdmin | 3 --
cadc-access-control-identity/build.gradle | 8 +---
cadc-access-control-server/build.gradle | 9 +----
cadc-access-control/build.gradle | 15 +++++---
cadc-access-control/scripts/cadcGMSClient | 41 ---------------------
6 files changed, 22 insertions(+), 77 deletions(-)
delete mode 100755 cadc-access-control-admin/scripts/userAdmin
delete mode 100755 cadc-access-control/scripts/cadcGMSClient
diff --git a/cadc-access-control-admin/build.gradle b/cadc-access-control-admin/build.gradle
index 9edf85b7..44037a6a 100644
--- a/cadc-access-control-admin/build.gradle
+++ b/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'
}
diff --git a/cadc-access-control-admin/scripts/userAdmin b/cadc-access-control-admin/scripts/userAdmin
deleted file mode 100755
index aa373c14..00000000
--- a/cadc-access-control-admin/scripts/userAdmin
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/bash
-
-java -Xmx128m -jar ${CADC_ROOT}/lib/cadcAccessControl-Admin.jar $*
diff --git a/cadc-access-control-identity/build.gradle b/cadc-access-control-identity/build.gradle
index c7314f5a..eff722d4 100644
--- a/cadc-access-control-identity/build.gradle
+++ b/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.+'
diff --git a/cadc-access-control-server/build.gradle b/cadc-access-control-server/build.gradle
index 64243608..06b670f9 100644
--- a/cadc-access-control-server/build.gradle
+++ b/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.+'
}
diff --git a/cadc-access-control/build.gradle b/cadc-access-control/build.gradle
index 6f3b1440..31ddc1a7 100644
--- a/cadc-access-control/build.gradle
+++ b/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'
+}
diff --git a/cadc-access-control/scripts/cadcGMSClient b/cadc-access-control/scripts/cadcGMSClient
deleted file mode 100755
index cb342c13..00000000
--- a/cadc-access-control/scripts/cadcGMSClient
+++ /dev/null
@@ -1,41 +0,0 @@
-#!/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 "$@"
-
--
GitLab