From 575c9820dffbfee3311e19a5f64e64b98c2ed5f8 Mon Sep 17 00:00:00 2001 From: Instrumental Date: Fri, 19 Oct 2018 11:13:05 -0500 Subject: Fix GUI Buttons Issue-ID: AAF-435 Change-Id: I8b5e83609176a22b5aa54cac6fd0911488bd707b Signed-off-by: Instrumental --- auth/sample/bin/service.sh | 1 + auth/sample/etc/org.osaaf.aaf.cm.props | 2 +- auth/sample/etc/org.osaaf.aaf.fs.props | 2 +- auth/sample/etc/org.osaaf.aaf.gui.props | 6 +----- auth/sample/etc/org.osaaf.aaf.hello.props | 2 +- auth/sample/etc/org.osaaf.aaf.locate.props | 2 +- auth/sample/etc/org.osaaf.aaf.oauth.props | 2 +- auth/sample/etc/org.osaaf.aaf.service.props | 2 +- auth/sample/local/initialConfig.props | 2 +- 9 files changed, 9 insertions(+), 12 deletions(-) (limited to 'auth/sample') diff --git a/auth/sample/bin/service.sh b/auth/sample/bin/service.sh index 6b694adc..b810f0c5 100644 --- a/auth/sample/bin/service.sh +++ b/auth/sample/bin/service.sh @@ -85,6 +85,7 @@ if [ ! -e $LOCAL/org.osaaf.aaf.props ]; then TMP=$(mktemp) echo aaf_env=${AAF_ENV} >> ${TMP} + echo aaf_release=${VERSION} >> ${TMP} echo cadi_latitude=${LATITUDE} >> ${TMP} echo cadi_longitude=${LONGITUDE} >> ${TMP} echo cadi_x509_issuers=${CADI_X509_ISSUERS} >> ${TMP} diff --git a/auth/sample/etc/org.osaaf.aaf.cm.props b/auth/sample/etc/org.osaaf.aaf.cm.props index 839ec246..c04201c7 100644 --- a/auth/sample/etc/org.osaaf.aaf.cm.props +++ b/auth/sample/etc/org.osaaf.aaf.cm.props @@ -4,7 +4,7 @@ ## Note: Link to CA Properties in "local" dir ## cadi_prop_files=/opt/app/osaaf/local/org.osaaf.aaf.props:/opt/app/osaaf/etc/org.osaaf.aaf.log4j.props:/opt/app/osaaf/local/org.osaaf.aaf.cassandra.props:/opt/app/osaaf/etc/org.osaaf.aaf.orgs.props:/opt/app/osaaf/local/org.osaaf.aaf.cm.ca.props -aaf_component=AAF_NS.cm:2.1 +aaf_component=AAF_NS.cm:AAF_RELEASE port=8150 #Certman diff --git a/auth/sample/etc/org.osaaf.aaf.fs.props b/auth/sample/etc/org.osaaf.aaf.fs.props index 0e423aad..ab6e79d6 100644 --- a/auth/sample/etc/org.osaaf.aaf.fs.props +++ b/auth/sample/etc/org.osaaf.aaf.fs.props @@ -3,7 +3,7 @@ ## AAF Fileserver Properties ## cadi_prop_files=/opt/app/osaaf/local/org.osaaf.aaf.props:/opt/app/osaaf/etc/org.osaaf.aaf.log4j.props -aaf_component=AAF_NS.fs:2.1 +aaf_component=AAF_NS.fs:AAF_RELEASE port=8096 aaf_public_dir=/opt/app/osaaf/public diff --git a/auth/sample/etc/org.osaaf.aaf.gui.props b/auth/sample/etc/org.osaaf.aaf.gui.props index 36c05e1e..6ab8b440 100644 --- a/auth/sample/etc/org.osaaf.aaf.gui.props +++ b/auth/sample/etc/org.osaaf.aaf.gui.props @@ -3,7 +3,7 @@ ## AAF GUI Properties ## cadi_prop_files=/opt/app/osaaf/local/org.osaaf.aaf.props:/opt/app/osaaf/etc/org.osaaf.aaf.log4j.props:/opt/app/osaaf/etc/org.osaaf.aaf.orgs.props -aaf_component=AAF_NS.gui:2.1 +aaf_component=AAF_NS.gui:AAF_RELEASE port=8200 aaf_gui_title=AAF @@ -12,10 +12,6 @@ aaf_gui_theme=theme/onap cadi_loginpage_url=https://AAF_LOCATE_URL/AAF_NS.gui:2.0/login # GUI URLS and Help URLS -cm_url=https://aaf.osaaf.org:8150 -gw_url=https://aaf.osaaf.org:8095 -fs_url=http://aaf.osaaf.org:8096 - aaf_url.gui_onboard=https://wiki.onap.org/display/DW/Client+Onboarding # aaf_url.cuigui=https://???/Using+the+Command+Prompt diff --git a/auth/sample/etc/org.osaaf.aaf.hello.props b/auth/sample/etc/org.osaaf.aaf.hello.props index 17ec4464..7c812d31 100644 --- a/auth/sample/etc/org.osaaf.aaf.hello.props +++ b/auth/sample/etc/org.osaaf.aaf.hello.props @@ -3,6 +3,6 @@ ## AAF Hello Properties ## cadi_prop_files=/opt/app/osaaf/local/org.osaaf.aaf.props:/opt/app/osaaf/etc/org.osaaf.aaf.log4j.props -aaf_component=AAF_NS.hello:2.1 +aaf_component=AAF_NS.hello:AAF_RELEASE port=8130 diff --git a/auth/sample/etc/org.osaaf.aaf.locate.props b/auth/sample/etc/org.osaaf.aaf.locate.props index 2ca197a7..c7786aa7 100644 --- a/auth/sample/etc/org.osaaf.aaf.locate.props +++ b/auth/sample/etc/org.osaaf.aaf.locate.props @@ -3,6 +3,6 @@ ## AAF Locator Properties ## cadi_prop_files=/opt/app/osaaf/local/org.osaaf.aaf.props:/opt/app/osaaf/etc/org.osaaf.aaf.log4j.props:/opt/app/osaaf/etc/org.osaaf.aaf.orgs.props:/opt/app/osaaf/local/org.osaaf.aaf.cassandra.props -aaf_component=AAF_NS.locator:2.1 +aaf_component=AAF_NS.locator:AAF_RELEASE port=8095 diff --git a/auth/sample/etc/org.osaaf.aaf.oauth.props b/auth/sample/etc/org.osaaf.aaf.oauth.props index cf80debe..36304d7e 100644 --- a/auth/sample/etc/org.osaaf.aaf.oauth.props +++ b/auth/sample/etc/org.osaaf.aaf.oauth.props @@ -3,6 +3,6 @@ ## AAF OAuth2 Properties ## cadi_prop_files=/opt/app/osaaf/local/org.osaaf.aaf.props:/opt/app/osaaf/etc/org.osaaf.aaf.log4j.props:/opt/app/osaaf/local/org.osaaf.aaf.cassandra.props -aaf_component=AAF_NS.oauth:2.1 +aaf_component=AAF_NS.oauth:AAF_RELEASE port=8140 diff --git a/auth/sample/etc/org.osaaf.aaf.service.props b/auth/sample/etc/org.osaaf.aaf.service.props index 1b9132ad..71e666d8 100644 --- a/auth/sample/etc/org.osaaf.aaf.service.props +++ b/auth/sample/etc/org.osaaf.aaf.service.props @@ -3,6 +3,6 @@ ## AAF Service Properties ## cadi_prop_files=/opt/app/osaaf/local/org.osaaf.aaf.props:/opt/app/osaaf/etc/org.osaaf.aaf.log4j.props:/opt/app/osaaf/local/org.osaaf.aaf.cassandra.props:/opt/app/osaaf/etc/org.osaaf.aaf.orgs.props -aaf_component=AAF_NS.service:2.1 +aaf_component=AAF_NS.service:AAF_RELEASE port=8100 diff --git a/auth/sample/local/initialConfig.props b/auth/sample/local/initialConfig.props index 2f599cdb..740bf844 100644 --- a/auth/sample/local/initialConfig.props +++ b/auth/sample/local/initialConfig.props @@ -1,4 +1,4 @@ -aaf_locate_url=https://meriadoc.mithril.sbc.com:8095 +aaf_locate_url=https://localhost:8095 aaf_oauth2_introspect_url=https://AAF_LOCATE_URL/AAF_NS.introspect:2.1/introspect aaf_oauth2_token_url=https://AAF_LOCATE_URL/AAF_NS.token:2.1/token aaf_url=https://AAF_LOCATE_URL/AAF_NS.service:2.1 -- cgit 1.2.3-korg