Merge "Music health check apis"

diff --git a/LICENSE.txt b/LICENSE.txt
index 73eab27..7b8a2fc 100644 (file)
--- a/LICENSE.txt
+++ b/LICENSE.txt
@@ -1,7 +1,7 @@
 ============LICENSE_START==========================================
 ONAP Portal
 ===================================================================
-Copyright (c) 2017 AT&T Intellectual Property. All rights reserved.
+Copyright (c) 2017 - 2018 AT&T Intellectual Property. All rights reserved.
 ===================================================================
 
 Unless otherwise specified, all software contained herein is licensed
@@ -30,6 +30,14 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 See the License for the specific language governing permissions and
 limitations under the License.
 
+For the files
+/ecomp-portal-BE-common/src/main/webapp/WEB-INF/static/ebz/angular_js/angular-sanitize.js
+and
+/ecomp-portal-BE-common/src/main/webapp/static/ebz/angular_js/angular-sanitize.js
+to the extent that they contain code originating from Erik Arvidsson,
+that code is used under the Apache-2.0 license,
+as permitted by http://erik.eae.net/simplehtmlparser/simplehtmlparser.js.
+
 ============LICENSE_END============================================
 
 

diff --git a/deliveries/Apps_Users_OnBoarding_Script.sql b/deliveries/Apps_Users_OnBoarding_Script.sql
index 34dbe89..0232a1f 100644 (file)
--- a/deliveries/Apps_Users_OnBoarding_Script.sql
+++ b/deliveries/Apps_Users_OnBoarding_Script.sql
@@ -12,7 +12,7 @@ INSERT INTO `fn_app` (`app_id`, `app_name`, `app_image_url`, `app_description`,
 (5, 'Policy', 'images/cache/portal1470452815_67021.png', NULL, NULL, 'http://policy.api.simpledemo.onap.org:8443/onap/policy', NULL, 'http://policy.api.simpledemo.onap.org:8443/onap/api/v2', '', '', NULL, 'okYTaDrhzibcbGVq5mjkVQ==', 'N', 'Y', NULL, 'Default', 'ueb_key', 'ueb_secret', 'ECOMP-PORTAL-OUTBOX', 1,'N',NULL),
 (6, 'Virtual Infrastructure Deployment', 'images/cache/portal-345993588_92550.png', NULL, NULL, 'http://vid.api.simpledemo.onap.org:8080/vid/welcome.htm', NULL, 'http://vid.api.simpledemo.onap.org:8080/vid/api/v2', '', '', NULL, 'okYTaDrhzibcbGVq5mjkVQ==', 'N', 'Y', NULL, 'Default', '2Re7Pvdkgw5aeAUD', 'S31PrbOzGgL4hg4owgtx47Da', 'ECOMP-PORTAL-OUTBOX-90', 1,'N',NULL),
 (7, 'A&AI UI', 'images/cache/portal-345993588_92550.png', NULL, NULL, 'http://aai.api.simpledemo.onap.org:9517/services/aai/webapp/index.html#/viewInspect', NULL, 'http://aai.api.simpledemo.onap.org:9517/api/v2', '', '', NULL, 't1oqm6wCXrGUXUSL8mS7pQ==', 'N', 'Y', NULL, 'aaiui', 'ueb_key', 'ueb_secret', 'ECOMP-PORTAL-OUTBOX', 1,'N',NULL),
-(8, 'CLI', 'images/cache/portal-345993588_92550.png', NULL, NULL, 'http://portal.api.simpledemo.onap.org:8080/', NULL, NULL, '', '', NULL, '', 'Y', 'Y', NULL, '', '', '', '', 2,'N',NULL),
+(8, 'CLI', 'images/cache/portal-345993588_92550.png', NULL, NULL, 'http://portal.api.simpledemo.onap.org:8080/', NULL, NULL, '', '', NULL, '', 'Y', 'Y', NULL, '', '', '', '', 1,'N',NULL),
 (9, 'MSB', 'images/cache/portal-345993588_92550.png', NULL, NULL, 'http://msb-discovery:8080/iui/microservices/default.html', NULL, NULL, '', '', NULL, '', 'Y', 'Y', NULL, '', '', '', '', 2,'N',NULL);
 
 -- insert SDC users user id2-8

diff --git a/deliveries/os_docker_release.sh b/deliveries/os_docker_release.sh
index 2a22fef..3ff88b2 100755 (executable)
--- a/deliveries/os_docker_release.sh
+++ b/deliveries/os_docker_release.sh
@@ -13,7 +13,7 @@ if [ -z "$PORTAL_VERSION" ]; then
 fi
 
 TIMESTAMP=$(date +%C%y%m%dT%H%M%S)
-export VERSION="${PORTAL_VERSION}-STAGING-${TIMESTAMP}"
-export LATEST="${PORTAL_VERSION}-STAGING-latest"
+export VERSION="${PORTAL_VERSION}-${TIMESTAMP}"
+export LATEST="${PORTAL_VERSION}"
 
 exec ./os_docker_base.sh

diff --git a/deliveries/properties_simpledemo/ONAPWIDGETMS/application.properties b/deliveries/properties_simpledemo/ONAPWIDGETMS/application.properties
index 547a882..e353ace 100644 (file)
--- a/deliveries/properties_simpledemo/ONAPWIDGETMS/application.properties
+++ b/deliveries/properties_simpledemo/ONAPWIDGETMS/application.properties
@@ -19,7 +19,7 @@ security.user.name=widget_user
 security.user.password=ENC(IjywcRnI9+nuVEh9+OFFiRWAjBT1n718)
 
 initialization.default.widgets=true
-initialization.widgetData.url=http://portal.api.simpledemo.onap.org:8989/ONAPPORTAL/commonWidgets
+initialization.widgetData.url=http://portal-app:8080/ONAPPORTAL/commonWidgets
 
 ## Account Basic Authentication Properties
 account.user.name=portal

diff --git a/docs/tutorials/portal-sdk/architecture.rst b/docs/tutorials/portal-sdk/architecture.rst
index 203fc17..ec64bf2 100644 (file)
--- a/docs/tutorials/portal-sdk/architecture.rst
+++ b/docs/tutorials/portal-sdk/architecture.rst
@@ -1,4 +1,4 @@
 Application architecture
 ============================================
- 
-ONAP Portal Architecture:
+
+Click here to see the `ONAP Portal Architecture <../../../docs/platform/architecture.html>`_.