From e8b5b88d6cbe36d62fad93ca696a09e06db0942a Mon Sep 17 00:00:00 2001
From: "Kotta, Shireesha (sk434m)" <sk434m@att.com>
Date: Fri, 1 Feb 2019 16:02:59 -0500
Subject: pom, upgrade script changes

Issue-ID: PORTAL-356

portal/SDK release 2.5.0, POM, upgrade script


Change-Id: I18a2601ef4b2e4651b93cc0656185b7b88191fb7
Signed-off-by: Kotta, Shireesha (sk434m) <sk434m@att.com>
---
 .../db-scripts/EcompSdkDMLMySql_2_5_OS.sql         |  2 +-
 .../EcompSdkMySql_Upgrade_2_1_to_2_5_OS.sql        |  7 +++++++
 ecomp-sdk/epsdk-app-os/pom.xml                     | 16 +++++++++++++++
 .../epsdk-app-os/src/main/webapp/WEB-INF/web.xml   | 24 ----------------------
 4 files changed, 24 insertions(+), 25 deletions(-)
 create mode 100644 ecomp-sdk/epsdk-app-os/db-scripts/EcompSdkMySql_Upgrade_2_1_to_2_5_OS.sql

(limited to 'ecomp-sdk/epsdk-app-os')

diff --git a/ecomp-sdk/epsdk-app-os/db-scripts/EcompSdkDMLMySql_2_5_OS.sql b/ecomp-sdk/epsdk-app-os/db-scripts/EcompSdkDMLMySql_2_5_OS.sql
index bf825134..685d1784 100644
--- a/ecomp-sdk/epsdk-app-os/db-scripts/EcompSdkDMLMySql_2_5_OS.sql
+++ b/ecomp-sdk/epsdk-app-os/db-scripts/EcompSdkDMLMySql_2_5_OS.sql
@@ -9,7 +9,7 @@ USE ecomp_sdk;
 -- fn_menu 
 INSERT INTO fn_menu (MENU_ID, LABEL, PARENT_ID, SORT_ORDER, ACTION, FUNCTION_CD, ACTIVE_YN, SERVLET, QUERY_STRING, EXTERNAL_URL, TARGET, MENU_SET_CD, SEPARATOR_YN, IMAGE_SRC) VALUES (1, 'Root', NULL, 10, NULL, 'menu_home', 'N', NULL, NULL, NULL, NULL, 'APP', 'N', NULL); --  we need even though it's inactive
 INSERT INTO fn_menu (MENU_ID, LABEL, PARENT_ID, SORT_ORDER, ACTION, FUNCTION_CD, ACTIVE_YN, SERVLET, QUERY_STRING, EXTERNAL_URL, TARGET, MENU_SET_CD, SEPARATOR_YN, IMAGE_SRC) VALUES (5000, 'Sample Pages', 1, 30, 'sample.htm', 'menu_sample', 'Y', NULL, NULL, NULL, NULL, 'APP', 'N', 'icon-documents-book');
-INSERT INTO fn_menu (MENU_ID, LABEL, PARENT_ID, SORT_ORDER, ACTION, FUNCTION_CD, ACTIVE_YN, SERVLET, QUERY_STRING, EXTERNAL_URL, TARGET, MENU_SET_CD, SEPARATOR_YN, IMAGE_SRC) VALUES (2, 'Home', 1, 10, 'welcome.htm', 'menu_home', 'Y', NULL, NULL, NULL, NULL, 'APP', 'N', 'icon-building-home');
+INSERT INTO fn_menu (MENU_ID, LABEL, PARENT_ID, SORT_ORDER, ACTION, FUNCTION_CD, ACTIVE_YN, SERVLET, QUERY_STRING, EXTERNAL_URL, TARGET, MENU_SET_CD, SEPARATOR_YN, IMAGE_SRC) VALUES (2, 'Home', 1, 10, 'welcome', 'menu_home', 'Y', NULL, NULL, NULL, NULL, 'APP', 'N', 'icon-building-home');
 INSERT INTO fn_menu (MENU_ID, LABEL, PARENT_ID, SORT_ORDER, ACTION, FUNCTION_CD, ACTIVE_YN, SERVLET, QUERY_STRING, EXTERNAL_URL, TARGET, MENU_SET_CD, SEPARATOR_YN, IMAGE_SRC) VALUES (8, 'Reports', 1, 40, 'report.htm', 'menu_reports', 'Y', NULL, NULL, NULL, NULL, 'APP', 'N', 'icon-misc-piechart');
 INSERT INTO fn_menu (MENU_ID, LABEL, PARENT_ID, SORT_ORDER, ACTION, FUNCTION_CD, ACTIVE_YN, SERVLET, QUERY_STRING, EXTERNAL_URL, TARGET, MENU_SET_CD, SEPARATOR_YN, IMAGE_SRC) VALUES (9, 'Profile', 1, 90, 'userProfile', 'menu_profile', 'Y', NULL, NULL, NULL, NULL, 'APP', 'N', 'icon-people-oneperson');
 INSERT INTO fn_menu (MENU_ID, LABEL, PARENT_ID, SORT_ORDER, ACTION, FUNCTION_CD, ACTIVE_YN, SERVLET, QUERY_STRING, EXTERNAL_URL, TARGET, MENU_SET_CD, SEPARATOR_YN, IMAGE_SRC) VALUES (10, 'Admin', 1, 110, 'role_list.htm', 'menu_admin', 'Y', NULL, NULL, NULL, NULL, 'APP', 'N', 'icon-content-star');
diff --git a/ecomp-sdk/epsdk-app-os/db-scripts/EcompSdkMySql_Upgrade_2_1_to_2_5_OS.sql b/ecomp-sdk/epsdk-app-os/db-scripts/EcompSdkMySql_Upgrade_2_1_to_2_5_OS.sql
new file mode 100644
index 00000000..44d6276e
--- /dev/null
+++ b/ecomp-sdk/epsdk-app-os/db-scripts/EcompSdkMySql_Upgrade_2_1_to_2_5_OS.sql
@@ -0,0 +1,7 @@
+use ecomp_sdk;
+
+SET FOREIGN_KEY_CHECKS=0;
+
+update fn_menu set action = 'welcome' where action = 'welcome.htm';
+
+commit;
\ No newline at end of file
diff --git a/ecomp-sdk/epsdk-app-os/pom.xml b/ecomp-sdk/epsdk-app-os/pom.xml
index e16b78d2..01ef6c34 100644
--- a/ecomp-sdk/epsdk-app-os/pom.xml
+++ b/ecomp-sdk/epsdk-app-os/pom.xml
@@ -150,6 +150,22 @@
 							</resources>
 						</configuration>
 					</execution>
+					<!--  This is for Development purposes -->
+					<execution>
+						<id>copy-angular-final-step3</id>
+						<phase>prepare-package</phase>
+						<goals>
+							<goal>copy-resources</goal>
+						</goals>
+						<configuration>
+							<outputDirectory>${basedir}/src/main/webapp/app</outputDirectory>
+							<resources>
+								<resource>
+									<directory>${basedir}/ngapp/dist</directory>
+								</resource>
+							</resources>
+						</configuration>
+					</execution>	
 				</executions>
 			</plugin>
 					
diff --git a/ecomp-sdk/epsdk-app-os/src/main/webapp/WEB-INF/web.xml b/ecomp-sdk/epsdk-app-os/src/main/webapp/WEB-INF/web.xml
index 56a6edba..79335eb1 100644
--- a/ecomp-sdk/epsdk-app-os/src/main/webapp/WEB-INF/web.xml
+++ b/ecomp-sdk/epsdk-app-os/src/main/webapp/WEB-INF/web.xml
@@ -56,28 +56,4 @@
 	<error-page>
 		<location>/WEB-INF/jsp/error.jsp</location>
 	</error-page>
-   <filter>
-		<filter-name>CadiAuthFilter</filter-name>
-		<filter-class>org.onap.portalsdk.core.onboarding.crossapi.CadiAuthFilter</filter-class>
-		<init-param>
-			<param-name>cadi_prop_files</param-name>
-        <!-- Add Absolute path of cadi.properties -->
-			<param-value>{path}/cadi.properties
-			</param-value>
-		</init-param>
-         <!--Add param values with comma delimited values -->
-         <!-- for example /api/v3/*,/auxapi/*-->
-		<init-param>
-			<param-name>include_url_endpoints</param-name>
-			<param-value>/api/v3/*</param-value>
-		</init-param>
-		<init-param>
-			<param-name>exclude_url_endpoints</param-name>
-			<param-value>/api/v3/analytics,/api/v3/storeAnalytics</param-value>
-		</init-param>
-	</filter>
-	<filter-mapping>
-		<filter-name>CadiAuthFilter</filter-name>
-		<url-pattern>/*</url-pattern>
-	</filter-mapping>
 </web-app>
-- 
cgit 1.2.3-korg