From 6408c3f5342cf4a274c81d73b09db3289697b01e Mon Sep 17 00:00:00 2001
From: da490c <dave.adams@amdocs.com>
Date: Mon, 9 Apr 2018 15:49:59 -0400
Subject: [PATCH] Add portal props at correct path

Issue-ID: AAI-1015
Change-Id: I50a75dd5707aa0bb5450b61b1be34ed3c3408db5
Signed-off-by: da490c <dave.adams@amdocs.com>
---
 champ-service/dynamic/conf/champ-beans.xml         |  4 +-
 .../{ => BOOT-INF/classes}/portal.properties       | 44 +++++++++++-----------
 2 files changed, 24 insertions(+), 24 deletions(-)
 rename sparky/appconfig/portal/{ => BOOT-INF/classes}/portal.properties (94%)

diff --git a/champ-service/dynamic/conf/champ-beans.xml b/champ-service/dynamic/conf/champ-beans.xml
index e254ed9..8abe258 100644
--- a/champ-service/dynamic/conf/champ-beans.xml
+++ b/champ-service/dynamic/conf/champ-beans.xml
@@ -39,6 +39,7 @@
     </util:map>
 
     <!-- Titan Implementation -->
+    <!--
     <bean id="graphBuilder" class="org.onap.aai.champtitan.graph.impl.TitanChampGraphImpl$Builder">
         <constructor-arg value="aaigraph-onap.dev"/>
         <constructor-arg ref="props" />
@@ -46,9 +47,9 @@
     <bean id="graphImpl" class="org.onap.aai.champtitan.graph.impl.TitanChampGraphImpl">
         <constructor-arg ref="graphBuilder" />
     </bean>
+    -->
 
     <!-- Janus Implementation -->
-<!--
     <bean id="graphBuilder" class="org.onap.aai.champjanus.graph.impl.JanusChampGraphImpl$Builder">
         <constructor-arg value="<%= @CHAMP_GRAPH_NAME %>"/>
         <constructor-arg ref="props"/>
@@ -56,7 +57,6 @@
     <bean id="graphImpl" class="org.onap.aai.champjanus.graph.impl.JanusChampGraphImpl">
         <constructor-arg ref="graphBuilder"/>
     </bean>
--->
 
     <bean id="champUUIDService" class="org.onap.champ.service.ChampUUIDService">
         <constructor-arg name="graphImpl" ref="graphImpl"/>
diff --git a/sparky/appconfig/portal/portal.properties b/sparky/appconfig/portal/BOOT-INF/classes/portal.properties
similarity index 94%
rename from sparky/appconfig/portal/portal.properties
rename to sparky/appconfig/portal/BOOT-INF/classes/portal.properties
index 3b947c4..6be1430 100644
--- a/sparky/appconfig/portal/portal.properties
+++ b/sparky/appconfig/portal/BOOT-INF/classes/portal.properties
@@ -1,23 +1,23 @@
-################################################################################
-############################## Portal properties ###############################
-################################################################################
-
-# Java class that implements the ECOMP role and user mgt API
-portal.api.impl.class = org.onap.aai.sparky.security.portal.PortalRestAPIServiceImpl
-
-# Instance of ECOMP Portal where the app has been on-boarded
-# use insecure http for dev purposes to avoid self-signed certificate
-ecomp_rest_url = http://portal.api.simpledemo.onap.org:8989/ONAPPORTAL/auxapi
-
-# Standard global logon page
-ecomp_redirect_url = http://portal.api.simpledemo.onap.org:8989/ONAPPORTAL/login.htm
-
-# Name of cookie to extract on login request
-csp_cookie_name = EPService
-# Alternate values: DEVL, V_DEVL, V_PROD
-csp_gate_keeper_prod_key = PROD
-
-# Toggles use of UEB
-ueb_listeners_enable = false
-# IDs application withing UEB flow
+################################################################################
+############################## Portal properties ###############################
+################################################################################
+
+# Java class that implements the ECOMP role and user mgt API
+portal.api.impl.class = org.onap.aai.sparky.security.portal.PortalRestAPIServiceImpl
+
+# Instance of ECOMP Portal where the app has been on-boarded
+# use insecure http for dev purposes to avoid self-signed certificate
+ecomp_rest_url = http://portal.api.simpledemo.onap.org:8989/ONAPPORTAL/auxapi
+
+# Standard global logon page
+ecomp_redirect_url = http://portal.api.simpledemo.onap.org:8989/ONAPPORTAL/login.htm
+
+# Name of cookie to extract on login request
+csp_cookie_name = EPService
+# Alternate values: DEVL, V_DEVL, V_PROD
+csp_gate_keeper_prod_key = PROD
+
+# Toggles use of UEB
+ueb_listeners_enable = false
+# IDs application withing UEB flow
 ueb_app_key = qFKles9N8gDTV0Zc	
\ No newline at end of file
-- 
2.16.6