Portal Login Filter reintegration

Issue-ID: AAI-599
Change-Id: I119608a418a07546cd58d4fcbdf93f033c8fbd88
Signed-off-by: rv871f <richard.vondadelszen@amdocs.com>

1 files changed, 64 insertions, 95 deletions

diff --git a/sparkybe-onap-application/pom.xml b/sparkybe-onap-application/pom.xml
index 92c3126..ec40b53 100644
--- a/sparkybe-onap-application/pom.xml
+++ b/sparkybe-onap-application/pom.xml
@@ -1,5 +1,6 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-  <modelVersion>4.0.0</modelVersion>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+	<modelVersion>4.0.0</modelVersion>
 
 	<parent>
 		<groupId>org.springframework.boot</groupId>
@@ -8,9 +9,9 @@
 	</parent>
 
 	<groupId>org.onap.aai.sparky-be</groupId>
-    <artifactId>sparkybe-onap-application</artifactId>
+	<artifactId>sparkybe-onap-application</artifactId>
 	<version>1.2.0-SNAPSHOT</version>
-	<packaging>jar</packaging> 
+	<packaging>jar</packaging>
 
 	<properties>
 		<java.version>1.8</java.version>
@@ -29,26 +30,26 @@
 
 
 	<dependencyManagement>
-	<dependencies>
+		<dependencies>
+
+			<!-- Camel BOM -->
+			<dependency>
+				<groupId>org.apache.camel</groupId>
+				<artifactId>camel-spring-boot-dependencies</artifactId>
+				<version>${camel-spring-boot.version}</version>
+				<type>pom</type>
+				<scope>import</scope>
+			</dependency>
 
-		<!-- Camel BOM -->
-		<dependency>
-			<groupId>org.apache.camel</groupId>
-			<artifactId>camel-spring-boot-dependencies</artifactId>
-			<version>${camel-spring-boot.version}</version>
-			<type>pom</type>
-			<scope>import</scope>
-		</dependency>
-		
-		<dependency>
-			<groupId>ch.qos.logback</groupId>
-			<artifactId>logback-classic</artifactId>
-			<version>1.2.1</version>
-		</dependency>
+			<dependency>
+				<groupId>ch.qos.logback</groupId>
+				<artifactId>logback-classic</artifactId>
+				<version>1.2.1</version>
+			</dependency>
 
-	</dependencies>
+		</dependencies>
 
-</dependencyManagement>
+	</dependencyManagement>
 
 	<dependencies>
 
@@ -73,14 +74,14 @@
 				</exclusion>
 			</exclusions>
 		</dependency>
-		
+
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-starter-logging</artifactId>
 			<exclusions>
 				<exclusion>
-   	 	 	        <groupId>ch.qos.logback</groupId>
-			        <artifactId>logback-classic</artifactId>
+					<groupId>ch.qos.logback</groupId>
+					<artifactId>logback-classic</artifactId>
 				</exclusion>
 			</exclusions>
 		</dependency>
@@ -125,7 +126,7 @@
 		<dependency>
 			<groupId>commons-io</groupId>
 			<artifactId>commons-io</artifactId>
-			</dependency>
+		</dependency>
 
 		<!-- https://mvnrepository.com/artifact/org.eclipse.jetty/jetty-util -->
 		<dependency>
@@ -144,11 +145,11 @@
 			<artifactId>spring-boot-starter-actuator</artifactId>
 		</dependency>
 
-	<dependency>
-		<groupId>org.onap.aai.sparky-be</groupId>
-		<artifactId>sparkybe-onap-service</artifactId>
-		<version>1.2.0-SNAPSHOT</version>
-	</dependency>
+		<dependency>
+			<groupId>org.onap.aai.sparky-be</groupId>
+			<artifactId>sparkybe-onap-service</artifactId>
+			<version>1.2.0-SNAPSHOT</version>
+		</dependency>
 
 
 
@@ -378,6 +379,13 @@
 			<plugin>
 				<groupId>org.springframework.boot</groupId>
 				<artifactId>spring-boot-maven-plugin</artifactId>
+				<configuration>
+					<folders>
+						<folder>
+							${CONFIG_HOME}/portal/
+						</folder>
+					</folders>
+				</configuration>
 			</plugin>
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
@@ -486,38 +494,14 @@
 					</reportPlugins>
 				</configuration>
 			</plugin>
-			
-	<!-- 		<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-resources-plugin</artifactId>
-				<version>2.7</version>
-				<executions>
-					<execution>
-						<id>copy-docker-file</id>
-						<phase>package</phase>
-						<goals>
-							<goal>copy-resources</goal>
-						</goals>
-						<configuration>
-							<outputDirectory>target</outputDirectory>
-							<overwrite>true</overwrite>
-							<resources>
-								<resource>
-									<directory>${basedir}/src/main/docker</directory>
-									<filtering>true</filtering>
-									<includes>
-										<include>**/*</include>
-									</includes>
-								</resource>
-								<resource>
-									<directory>${basedir}/src/main/scripts/</directory>
-								</resource>
-							</resources>
-						</configuration>
-					</execution>
-				</executions>
-			</plugin>
-			 -->
+
+			<!-- <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-resources-plugin</artifactId> 
+				<version>2.7</version> <executions> <execution> <id>copy-docker-file</id> 
+				<phase>package</phase> <goals> <goal>copy-resources</goal> </goals> <configuration> 
+				<outputDirectory>target</outputDirectory> <overwrite>true</overwrite> <resources> 
+				<resource> <directory>${basedir}/src/main/docker</directory> <filtering>true</filtering> 
+				<includes> <include>**/*</include> </includes> </resource> <resource> <directory>${basedir}/src/main/scripts/</directory> 
+				</resource> </resources> </configuration> </execution> </executions> </plugin> -->
 			<plugin>
 				<groupId>com.spotify</groupId>
 				<artifactId>docker-maven-plugin</artifactId>
@@ -534,41 +518,26 @@
 				</configuration>
 			</plugin>
 			<!-- license plugin -->
-<!-- 			<plugin>
-				<groupId>com.mycila</groupId>
-				<artifactId>license-maven-plugin</artifactId>
-				<version>3.0</version>
-				<configuration>
-					<header>LICENSE</header>
-					<includes>
-						<include>src/main/java/**</include>
-					</includes>
-				</configuration>
-				<executions>
-					<execution>
-						<goals>
-							<goal>format</goal>
-						</goals>
-						<phase>process-sources</phase>
-					</execution>
-				</executions>
-			</plugin>
- -->
+			<!-- <plugin> <groupId>com.mycila</groupId> <artifactId>license-maven-plugin</artifactId> 
+				<version>3.0</version> <configuration> <header>LICENSE</header> <includes> 
+				<include>src/main/java/**</include> </includes> </configuration> <executions> 
+				<execution> <goals> <goal>format</goal> </goals> <phase>process-sources</phase> 
+				</execution> </executions> </plugin> -->
 		</plugins>
 	</build>
-		<distributionManagement>
-        <repository>
-            <id>ecomp-releases</id>
-            <name>ECOMP Release Repository</name>
-            <url>${nexusproxy}/content/repositories/releases/</url>
-        </repository>
-        <snapshotRepository>
-            <id>ecomp-snapshots</id>
-            <name>ECOMP Snapshot Repository</name>
-            <url>${nexusproxy}/content/repositories/snapshots/</url>
-        </snapshotRepository>
-    </distributionManagement>
-	
+	<distributionManagement>
+		<repository>
+			<id>ecomp-releases</id>
+			<name>ECOMP Release Repository</name>
+			<url>${nexusproxy}/content/repositories/releases/</url>
+		</repository>
+		<snapshotRepository>
+			<id>ecomp-snapshots</id>
+			<name>ECOMP Snapshot Repository</name>
+			<url>${nexusproxy}/content/repositories/snapshots/</url>
+		</snapshotRepository>
+	</distributionManagement>
+
 </project>