From 627badaf69987c01811c477219fd943757a635f5 Mon Sep 17 00:00:00 2001
From: "Christopher Lott (Christopher) (cl778h)"
 <clott@vm-ep-dev2.client.research.att.com>
Date: Mon, 12 Jun 2017 09:49:00 -0400
Subject: [PORTAL-16 PORTAL-18] Widget ms; staging

Remove staging repositories from poms.
Add widget microservice code base.
Add portal unit tests.
Repair defects.
Normalize line endings.

Change-Id: Ia5e48da2a3141b352439ecd548cddf918f4df585
Signed-off-by: Christopher Lott (cl778h) <clott@research.att.com>
---
 .../src/main/webapp/WEB-INF/conf/system.properties |   6 +-
 .../src/main/webapp/WEB-INF/defs/definitions.xml   |   2 +-
 .../webapp/WEB-INF/fusion/defs/definitions.xml     | 120 ---------------------
 3 files changed, 4 insertions(+), 124 deletions(-)
 delete mode 100644 ecomp-portal-BE-os/src/main/webapp/WEB-INF/fusion/defs/definitions.xml

(limited to 'ecomp-portal-BE-os/src/main/webapp/WEB-INF')

diff --git a/ecomp-portal-BE-os/src/main/webapp/WEB-INF/conf/system.properties b/ecomp-portal-BE-os/src/main/webapp/WEB-INF/conf/system.properties
index 8c682649..0fc2c69d 100644
--- a/ecomp-portal-BE-os/src/main/webapp/WEB-INF/conf/system.properties
+++ b/ecomp-portal-BE-os/src/main/webapp/WEB-INF/conf/system.properties
@@ -33,7 +33,8 @@ hb.show_sql = false
 hb.db_reconnect = true
 hb.idle_connection_test_period = 3600
 
-app_display_name					  = app_display_name
+# Ecomp portal title
+app_display_name					  = Portal
 files_path = /demeter/WebApps/dev/ECOMP_APP/files
 context_root = ECOMPPORTAL
 # menu settings
@@ -109,10 +110,9 @@ microservices.widget.local.port = 8082
 #delete auditlog from number of days ago
 auditlog_del_day_from = 365
 
-
 #authenticate user server
 authenticate_user_server=http://todo_enter_auth_server_hostname:8383/openid-connect-server-webapp/allUsers
 
 #window width threshold to collapse left/right menu when page onload
 window_width_threshold_left_menu = 1400
-window_width_threshold_right_menu = 1350
\ No newline at end of file
+window_width_threshold_right_menu = 1350
diff --git a/ecomp-portal-BE-os/src/main/webapp/WEB-INF/defs/definitions.xml b/ecomp-portal-BE-os/src/main/webapp/WEB-INF/defs/definitions.xml
index 603e1144..0fa84a9c 100644
--- a/ecomp-portal-BE-os/src/main/webapp/WEB-INF/defs/definitions.xml
+++ b/ecomp-portal-BE-os/src/main/webapp/WEB-INF/defs/definitions.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
   ================================================================================
-  eCOMP Portal
+  ECOMP Portal
   ================================================================================
   Copyright (C) 2017 AT&T Intellectual Property
   ================================================================================
diff --git a/ecomp-portal-BE-os/src/main/webapp/WEB-INF/fusion/defs/definitions.xml b/ecomp-portal-BE-os/src/main/webapp/WEB-INF/fusion/defs/definitions.xml
deleted file mode 100644
index f11b39a0..00000000
--- a/ecomp-portal-BE-os/src/main/webapp/WEB-INF/fusion/defs/definitions.xml
+++ /dev/null
@@ -1,120 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  ================================================================================
-  eCOMP Portal
-  ================================================================================
-  Copyright (C) 2017 AT&T Intellectual Property
-  ================================================================================
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-  
-       http://www.apache.org/licenses/LICENSE-2.0
-  
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  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.
-  ================================================================================
-  -->
-
-<!DOCTYPE tiles-definitions PUBLIC
-       "-//Apache Software Foundation//DTD Tiles Configuration 3.0//EN"
-       "http://tiles.apache.org/dtds/tiles-config_3_0.dtd">
-<tiles-definitions>
-
-    <definition name="ebz_template" template="/WEB-INF/fusion/jsp/ebz_template.jsp">  
-      <put-attribute name="title" value=""></put-attribute>  
-      <put-attribute name="header" value="/WEB-INF/fusion/jsp/ebz/ebz_header.jsp"></put-attribute>  
-      <put-attribute name="body" value=""></put-attribute>
-      <put-attribute name="footer" value="/WEB-INF/fusion/jsp/ebz/ebz_footer.jsp"></put-attribute>  
-    </definition>
-    
-    <definition name="ebz_template_noheader_nofooter" template="/WEB-INF/fusion/jsp/ebz_template_noheader_nofooter.jsp">  
-      <put-attribute name="body" value=""></put-attribute>
-    </definition>  
-      
-     <definition extends="ebz_template" name="user_profile">  
-     	<put-attribute name="body" value="/WEB-INF/jsp/user_profile.jsp"></put-attribute>
-    </definition>  
-    
-    <definition extends="ebz_template" name="profile_search">   
-     	<put-attribute name="body" value="/WEB-INF/fusion/jsp/profile_search.jsp"></put-attribute>
-     	<put-attribute name="viewName" value="profile_search"></put-attribute>  
-    </definition>
-    
-    <definition extends="ebz_template" name="profile">   
-     	<put-attribute name="body" value="/WEB-INF/fusion/jsp/profile.jsp"></put-attribute>
-     	<put-attribute name="viewName" value="profile"></put-attribute>  
-    </definition>   
-    
-	<definition extends="ebz_template" name="menu">   
-     	<put-attribute name="body" value="/WEB-INF/jsp/menu.jsp"></put-attribute>
-     	<put-attribute name="viewName" value="menu"></put-attribute>  
-    </definition>  
-    
-    
-    <definition extends="ebz_template" name="welcome">   
-       <put-attribute name="body" value="/WEB-INF/jsp/welcome.jsp"></put-attribute>
-       <put-attribute name="viewName" value="welcome"></put-attribute>  
-    </definition>
-    
-    <definition extends="ebz_template" name="openIdLogin">   
-       <put-attribute name="body" value="/WEB-INF/jsp/oid-login.jsp"></put-attribute>
-       <put-attribute name="viewName" value="openIdLogin"></put-attribute>  
-    </definition>
-    
-    
-    <definition extends="ebz_template" name="role_list">   
-       <put-attribute name="body" value="/WEB-INF/fusion/jsp/role_list.jsp"></put-attribute>
-       <put-attribute name="viewName" value="role_list"></put-attribute>  
-    </definition> 
-    
-    <definition extends="ebz_template" name="role">   
-       <put-attribute name="body" value="/WEB-INF/fusion/jsp/role.jsp"></put-attribute>
-       <put-attribute name="viewName" value="role"></put-attribute>  
-    </definition>    
-     
-    <definition extends="ebz_template" name="role_function_list">   
-       <put-attribute name="body" value="/WEB-INF/fusion/jsp/role_function_list.jsp"></put-attribute>
-       <put-attribute name="viewName" value="role_function_list"></put-attribute>  
-    </definition>     
-     
-    <definition extends="ebz_template" name="post_search">   
-       <put-attribute name="body" value="/WEB-INF/fusion/jsp/post_search.jsp"></put-attribute>
-       <put-attribute name="viewName" value="post_search"></put-attribute>  
-    </definition> 
-    
-     <definition extends="ebz_template" name="error">   
-       <put-attribute name="body" value="/WEB-INF/jsp/error.jsp"></put-attribute>
-       <put-attribute name="viewName" value="error"></put-attribute>  
-    </definition> 
-    
-     <definition extends="ebz_template" name="report_search">   
-       <put-attribute name="body" value="/WEB-INF/fusion/raptor/report_search.jsp"></put-attribute>
-       <put-attribute name="viewName" value="report_search"></put-attribute>  
-    </definition>  
-    
-    <definition extends="ebz_template" name="collaborate_list">   
-       <put-attribute name="body" value="/WEB-INF/fusion/jsp/collaborateList.jsp"></put-attribute>
-    </definition> 
-    
-    <definition extends="ebz_template" name="jcs_admin">   
-       <put-attribute name="body" value="/WEB-INF/fusion/jsp/jcs_admin.jsp"></put-attribute>
-       <put-attribute name="viewName" value="jcs_admin"></put-attribute> 
-    </definition>
-    
-    <definition extends="ebz_template" name="usage_list">   
-       <put-attribute name="body" value="/WEB-INF/fusion/jsp/usage_list.jsp"></put-attribute>
-       <put-attribute name="viewName" value="usage_list"></put-attribute> 
-    </definition>
-    <!-- 
-    <definition extends="ebz_template_noheader_nofooter" name="collaboration">   
-       <put-attribute name="body" value="/WEB-INF/fusion/jsp/webrtc/collaboration.jsp"></put-attribute>
-    </definition>
-    -->
-    <definition name="collaboration" template="/WEB-INF/fusion/jsp/webrtc/collaboration.jsp"/>
-    
-       
-</tiles-definitions>
-- 
cgit 1.2.3-korg