Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
OATS-CADC
ac
Commits
562faadb
Commit
562faadb
authored
Sep 02, 2016
by
Brian Major
Browse files
s1970 - added application targets to GMS client and AC Admin client. Reduced dependencies
parent
60bf4a9f
Changes
6
Hide whitespace changes
Inline
Side-by-side
cadc-access-control-admin/build.gradle
View file @
562faadb
...
...
@@ -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
deleted
100755 → 0
View file @
60bf4a9f
#!/bin/bash
java
-Xmx128m
-jar
${
CADC_ROOT
}
/lib/cadcAccessControl-Admin.jar
$*
cadc-access-control-identity/build.gradle
View file @
562faadb
...
...
@@ -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
View file @
562faadb
...
...
@@ -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
View file @
562faadb
...
...
@@ -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
deleted
100755 → 0
View file @
60bf4a9f
#!/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
"
$@
"
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment