Repair widget-ms problem; adjust sonar in poms

Using OParent again; override some Sonar configuration and tasks.
Repair display & fetch of users from remote apps.
Use EPSDK version 1710 database scripts.

Issue: PORTAL-50, PORTAL-59, PORTAL-86
Change-Id: I05eaea3680b0422236cc86cdd0ad5847c2731e54
Signed-off-by: Christopher Lott (cl778h) <clott@research.att.com>

2 files changed, 48 insertions, 10 deletions

diff --git a/ecomp-portal-widget-ms/widget-ms/pom.xml b/ecomp-portal-widget-ms/widget-ms/pom.xml
index 08659cc7..67350d28 100644
--- a/ecomp-portal-widget-ms/widget-ms/pom.xml
+++ b/ecomp-portal-widget-ms/widget-ms/pom.xml
@@ -24,6 +24,8 @@
 		<java.version>1.8</java.version>
 		<hibernate.version>4.3.11.Final</hibernate.version>
 		<skipTests>true</skipTests>
+		<!-- Replicate this from OParent -->
+		<jacocoVersion>0.7.6.201602180812</jacocoVersion>
 	</properties>
 
 	<dependencies>
@@ -128,6 +130,13 @@
 				</exclusion>
 			</exclusions>
 		</dependency>
+		<!-- Jacoco offline instrumentation agent -->
+		<dependency>
+			<groupId>org.jacoco</groupId>
+			<artifactId>org.jacoco.agent</artifactId>
+			<version>${jacocoVersion}</version>
+			<classifier>runtime</classifier>
+		</dependency>
 	</dependencies>
 
 	<build>
@@ -150,6 +159,7 @@
 
 		<pluginManagement>
 			<plugins>
+				<!-- replicated from OParent -->
 				<plugin>
 					<groupId>org.apache.maven.plugins</groupId>
 					<artifactId>maven-site-plugin</artifactId>
@@ -184,10 +194,28 @@
 			<plugin>
 				<groupId>org.jacoco</groupId>
 				<artifactId>jacoco-maven-plugin</artifactId>
-				<version>0.7.6.201602180812</version>
+				<version>${jacocoVersion}</version>
 				<executions>
+					<!-- disable jacoco executions from oparent -->
+					<execution>
+						<id>pre-unit-test</id>
+						<phase>none</phase>
+					</execution>
+					<execution>
+						<id>post-unit-test</id>
+						<phase>none</phase>
+					</execution>
+					<execution>
+						<id>pre-integration-test</id>
+						<phase>none</phase>
+					</execution>
 					<execution>
-						<id>prepare-agent</id>
+						<id>post-integration-test</id>
+						<phase>none</phase>
+					</execution>
+					<!-- Order matters -->
+					<execution>
+						<id>portal-prepare-agent</id>
 						<goals>
 							<goal>prepare-agent</goal>
 						</goals>
@@ -195,21 +223,22 @@
 							<destFile>${sonar.jacoco.reportPath}</destFile>
 						</configuration>
 					</execution>
+					<!-- offline instrumentation for PowerMock -->
 					<execution>
-						<id>default-instrument</id>
+						<id>portal-offline-instrument</id>
 						<goals>
 							<goal>instrument</goal>
 						</goals>
 					</execution>
 					<execution>
-						<id>default-restore-instrumented-classes</id>
+						<id>portal-restore-instrumented-classes</id>
 						<phase>test</phase>
 						<goals>
 							<goal>restore-instrumented-classes</goal>
 						</goals>
 					</execution>
 					<execution>
-						<id>post-unit-test</id>
+						<id>portal-post-unit-test</id>
 						<phase>test</phase>
 						<goals>
 							<goal>report</goal>
@@ -219,9 +248,18 @@
 							<outputDirectory>${project.basedir}/target/site/jacoco</outputDirectory>
 						</configuration>
 					</execution>
-			
 				</executions>
 			</plugin>
+
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-surefire-plugin</artifactId>
+				<configuration>
+					<systemPropertyVariables>
+						<jacoco-agent.destfile>${project.build.directory}/code-coverage/jacoco-ut.exec</jacoco-agent.destfile>
+					</systemPropertyVariables>
+				</configuration>
+			</plugin>
 		</plugins>
 
 	</build>
diff --git a/ecomp-portal-widget-ms/widget-ms/src/main/java/org/openecomp/portalapp/widget/service/impl/StorageServiceImpl.java b/ecomp-portal-widget-ms/widget-ms/src/main/java/org/openecomp/portalapp/widget/service/impl/StorageServiceImpl.java
index 8c5e0778..2f7206ea 100644
--- a/ecomp-portal-widget-ms/widget-ms/src/main/java/org/openecomp/portalapp/widget/service/impl/StorageServiceImpl.java
+++ b/ecomp-portal-widget-ms/widget-ms/src/main/java/org/openecomp/portalapp/widget/service/impl/StorageServiceImpl.java
@@ -244,8 +244,8 @@ public class StorageServiceImpl implements StorageService {
 		String controllerName = "Portal" + widgetId + "Ctrl";
 		String cssName = "portal" + widgetId + "-css-ready";
 		String colorArg1 = "color: #fff";
-		String framework = sb.replaceAll("ARUGMENT1", namespace).replaceAll("ARUGMENT2", controllerName)
-				.replaceAll("ARUGMENT3", cssName).replaceAll("CSS_ARG1", colorArg1)
+		String framework = sb.replaceAll("ARGUMENT1", namespace).replaceAll("ARGUMENT2", controllerName)
+				.replaceAll("ARGUMENT3", cssName).replaceAll("CSS_ARG1", colorArg1)
 				.replaceAll("MICROSERVICE_ID", newWidget.getServiceId().toString())
 				.replaceAll("WIDGET_ID", Long.toString(widgetId));
 
@@ -350,8 +350,8 @@ public class StorageServiceImpl implements StorageService {
 		String controllerName = "Portal" + widgetId + "Ctrl";
 		String cssName = "portal" + widgetId + "-css-ready";
 		String colorArg1 = "color: #fff";
-		String framework = sb.replaceAll("ARUGMENT1", namespace).replaceAll("ARUGMENT2", controllerName)
-				.replaceAll("ARUGMENT3", cssName).replaceAll("CSS_ARG1", colorArg1)
+		String framework = sb.replaceAll("ARGUMENT1", namespace).replaceAll("ARGUMENT2", controllerName)
+				.replaceAll("ARGUMENT3", cssName).replaceAll("CSS_ARG1", colorArg1)
 				.replaceAll("MICROSERVICE_ID", newWidget.getServiceId().toString())
 				.replaceAll("WIDGET_ID", Long.toString(widgetId));
 		widgetFile.setFramework(framework.getBytes());