From 77c3e38eccdbbd96e988ab4effdaa83eb032a3fd Mon Sep 17 00:00:00 2001
From: statta <statta@research.att.com>
Date: Wed, 4 Sep 2019 14:33:12 -0400
Subject: Update DB change

Issue-ID: PORTAL-726
Change-Id: I2f1dcb5856fd98a9410b02b8f61a4f09662e48df
Signed-off-by: statta <statta@research.att.com>
---
 .../db-scripts/EcompSdkDMLMySql_2_6_Common.sql     |   2 +
 ecomp-sdk/epsdk-app-os/pom.xml                     | 129 ++++++++++++---------
 2 files changed, 76 insertions(+), 55 deletions(-)

diff --git a/ecomp-sdk/epsdk-app-common/db-scripts/EcompSdkDMLMySql_2_6_Common.sql b/ecomp-sdk/epsdk-app-common/db-scripts/EcompSdkDMLMySql_2_6_Common.sql
index 66637e62..7be1591d 100644
--- a/ecomp-sdk/epsdk-app-common/db-scripts/EcompSdkDMLMySql_2_6_Common.sql
+++ b/ecomp-sdk/epsdk-app-common/db-scripts/EcompSdkDMLMySql_2_6_Common.sql
@@ -181,6 +181,8 @@ INSERT INTO fn_restricted_url VALUES('report/security/addReportRole','menu_repor
 INSERT INTO fn_restricted_url VALUES('report/security/*','menu_reports');
 INSERT INTO fn_restricted_url VALUES('report/wizard/get_report_log/*','menu_reports');
 
+INSERT INTO fn_restricted_url VALUES('report/wizard/save_col_tab_data/*','menu_reports');
+
 -- fn_role
 Insert into fn_role (ROLE_ID,ROLE_NAME,ACTIVE_YN,PRIORITY) values (16,'Standard User','Y',5);
 Insert into fn_role (ROLE_ID,ROLE_NAME,ACTIVE_YN,PRIORITY) values (1,'System Administrator','Y',1);
diff --git a/ecomp-sdk/epsdk-app-os/pom.xml b/ecomp-sdk/epsdk-app-os/pom.xml
index 71c07fdc..1faa7020 100644
--- a/ecomp-sdk/epsdk-app-os/pom.xml
+++ b/ecomp-sdk/epsdk-app-os/pom.xml
@@ -131,59 +131,7 @@
 					</execution>
 				</executions>
 			</plugin>
-			<plugin>
-				<artifactId>maven-resources-plugin</artifactId>
-				<version>2.5</version>
-				<executions>
-					<execution>
-						<id>copy-angular-final-step2</id>
-						<phase>prepare-package</phase>
-						<goals>
-							<goal>copy-resources</goal>
-						</goals>
-						<configuration>
-							<outputDirectory>${basedir}/target/epsdk-app-os/app</outputDirectory>
-							<resources>
-								<resource>
-									<directory>${basedir}/ngapp/dist</directory>
-								</resource>
-							</resources>
-						</configuration>
-					</execution>				
-					<execution>
-						<id>copy-angularjs-step1</id>
-						<phase>process-resources</phase>
-						<goals>
-							<goal>copy-resources</goal>
-						</goals>
-						<configuration>
-							<outputDirectory>${basedir}/ngapp</outputDirectory>
-							<resources>
-								<resource>
-									<directory>../epsdk-app-overlay/src/main/webapp/ngapp</directory>
-								</resource>		
-							</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>
-					
+				
 			<plugin>
                 <groupId>com.github.eirslett</groupId>
                 <artifactId>frontend-maven-plugin</artifactId>
@@ -225,7 +173,47 @@
                     </execution>
 
                 </executions>
-            </plugin>			
+            </plugin>			 
+
+			<plugin>
+				<artifactId>maven-resources-plugin</artifactId>
+				<version>2.5</version>
+				<executions>
+				    <!--  This is for Deployment purposes -->
+					<execution>
+						<id>copy-angular-final-step2</id>
+						<phase>prepare-package</phase>
+						<goals>
+							<goal>copy-resources</goal>
+						</goals>
+						<configuration>
+							<outputDirectory>${basedir}/target/epsdk-app-att</outputDirectory>
+							<resources>
+								<resource>
+									<directory>${basedir}/ngapp/dist</directory>
+								</resource>
+							</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</outputDirectory>
+							<resources>
+								<resource>
+									<directory>${basedir}/ngapp/dist</directory>
+								</resource>
+							</resources>
+						</configuration>
+					</execution>				
+				
+				</executions>
+			</plugin>
 			
 			<!--			
 			<plugin>
@@ -248,7 +236,38 @@
 				  </execution>
 				</executions>
 			</plugin>
-			-->			
+			-->		
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+        		<artifactId>maven-dependency-plugin</artifactId>
+        			<executions>
+						<execution>
+							<id>unpack</id>
+							<phase>process-resources</phase>
+							<goals>
+							<goal>unpack</goal>
+							</goals>
+						</execution>
+						</executions>
+						<configuration>
+						<artifactItems>
+							<artifactItem>
+							<groupId>org.onap.portal.sdk</groupId>
+							<artifactId>epsdk-app-overlay</artifactId>
+							<version>${project.version}</version>
+							<type>war</type>
+							<overWrite>false</overWrite>
+						</artifactItem>
+						</artifactItems>
+						<includes>ngapp/**</includes>
+						<outputDirectory>${basedir}</outputDirectory>
+						<markersDirectory>${basedir}</markersDirectory>
+						<overWriteReleases>false</overWriteReleases>
+						<overWriteSnapshots>false</overWriteSnapshots>
+						</configuration>
+        			
+    		</plugin>	
+			
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-war-plugin</artifactId>
-- 
cgit 1.2.3-korg