Upgraded the latest ONAP SDK

Upgraded latest ONAP SDK Code.

Change-Id: I669d6cfcefe068b1e4c078889d7d6c77ce788e2e
Issue-ID: POLICY-432
Signed-off-by: rb7147 <rb7147@att.com>

3 files changed, 47 insertions, 53 deletions

diff --git a/ONAP-SDK-APP/src/main/resources/key.properties b/ONAP-SDK-APP/src/main/resources/key.properties
new file mode 100644
index 000000000..134227d20
--- /dev/null
+++ b/ONAP-SDK-APP/src/main/resources/key.properties
@@ -0,0 +1,23 @@
+###
+# ================================================================================
+# onap Portal SDK
+# ================================================================================
+# Copyright (C) 2017 AT&T Intellectual Property
+# ================================================================================
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+# 
+#      http://www.apache.org/licenses/LICENSE-2.0
+# 
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+# ================================================================================
+###
+
+# Properties read by the ONAP Framework library (epsdk-fw)
+
+cipher.enc.key = AGLDdG4D04BKm2IxIWEr8o==!
\ No newline at end of file
diff --git a/ONAP-SDK-APP/src/main/resources/logback.xml b/ONAP-SDK-APP/src/main/resources/logback.xml
index fe4aac919..42535510b 100644
--- a/ONAP-SDK-APP/src/main/resources/logback.xml
+++ b/ONAP-SDK-APP/src/main/resources/logback.xml
@@ -99,7 +99,7 @@
     <encoder>
       <pattern>${applicationLoggerPattern}</pattern>
     </encoder>
-    <filter class="org.openecomp.portalapp.util.CustomLoggingFilter" />
+    <filter class="org.onap.portalapp.util.CustomLoggingFilter" />
   </appender>
   
   <appender name="asyncEELF" class="ch.qos.logback.classic.AsyncAppender">
@@ -324,47 +324,30 @@
   </appender>
  
   
-  <!-- ============================================================================ -->
-  <!--  EELF loggers -->
-  <!-- ============================================================================ -->
-  <logger name="org.onap.epsdk.eelf" level="debug" additivity="false">
+ 
+
+  <logger name="org.onap.eelf" level="info" additivity="false">
     <appender-ref ref="asyncEELF" />
   </logger>
-  
-  <!--
-  <logger name="org.onap.epsdk.eelf.security" level="info" additivity="false">
-    <appender-ref ref="asyncEELFSecurity" />
-  </logger>
-  <logger name="org.onap.epsdk.eelf.perf" level="info" additivity="false">
-    <appender-ref ref="asyncEELFPerformance" />
-  </logger>
-  <logger name="org.onap.epsdk.eelf.server" level="info" additivity="false">
-    <appender-ref ref="asyncEELFServer" />
-  </logger>
-  <logger name="org.onap.epsdk.eelf.policy" level="info" additivity="false">
-    <appender-ref ref="asyncEELFPolicy" />
-  </logger>
-  -->
-  
-  <logger name="org.onap.epsdk.eelf.audit" level="info" additivity="false">
+
+  <logger name="org.onap.eelf.audit" level="info" additivity="false">
     <appender-ref ref="asyncEELFAudit" />
   </logger>
   
-  <logger name="org.onap.epsdk.eelf.metrics" level="info" additivity="false">
-        <appender-ref ref="asyncEELFMetrics" />
+  <logger name="org.onap.eelf.debug" level="debug" additivity="false">
+    <appender-ref ref="asyncEELFDebug" />
   </logger>
-    
-  <logger name="org.onap.epsdk.eelf.error" level="info" additivity="false">
-  	<appender-ref ref="asyncEELFError" />
+	
+  <logger name="org.onap.eelf.error" level="info" additivity="false">
+    <appender-ref ref="asyncEELFError" />
   </logger>
-  
-   <logger name="org.onap.epsdk.eelf.debug" level="debug" additivity="false">
-        <appender-ref ref="asyncEELFDebug" />
-  </logger>
-  
+
+  <logger name="org.onap.eelf.metrics" level="info" additivity="false">
+    <appender-ref ref="asyncEELFMetrics" />
+  </logger>      
     
   <root level="DEBUG">
     <appender-ref ref="asyncEELF" />
   </root>
 
-</configuration>
\ No newline at end of file
+</configuration>
diff --git a/ONAP-SDK-APP/src/main/resources/portal.properties b/ONAP-SDK-APP/src/main/resources/portal.properties
index 1f2336d7b..04d39c14f 100644
--- a/ONAP-SDK-APP/src/main/resources/portal.properties
+++ b/ONAP-SDK-APP/src/main/resources/portal.properties
@@ -17,7 +17,7 @@
 # limitations under the License.
 # ================================================================================
 ###
-# Properties read by ONAP Framework library, onapFW.jar
+# Properties read by ONAP Framework library, ecompFW.jar
 
 ##########################################################################
 # The following properties should NOT be changed by partner applications.
@@ -35,30 +35,18 @@ use_rest_for_functional_menu=true
 ##########################################################################
 
 # Name of java class that implements the OnBoardingApiService interface.
-portal.api.impl.class = org.openecomp.portalapp.service.OnBoardingApiServiceImpl
+portal.api.impl.class = org.onap.portalapp.service.OnBoardingApiServiceImpl
 
-# CSP Global Log On for single sign on
-ecomp_redirect_url = todo_csp_global_logon
+# URL of the Portal where this app is onboarded
+ecomp_redirect_url = https://portal.onap.org/onapportal/process_csp
 
 # URL of the ONAP Portal REST API
-ecomp_rest_url = todo_Onap_rest_url
+ecomp_rest_url = http://portal.onap.org:50580/onapportal/auxapi
 
-# Applications do not need to run a UEB listener in 1610.  
+# Applications do not need to run a UEB listener after 1607.
 ueb_listeners_enable = false
 
 # UEB Configuration
-# In release 1607, all 6 entries below were required.
-# In release 1610, if key ueb_listeners_enable is set to false,
+# If key ueb_listeners_enable is set to false,
 # then only the ueb_app_key is required.
-# UEB servers
-ueb_url_list = todo_ueb_list
-# ONAP Portal listens on this UEB topic
-ecomp_portal_inbox_name = ONAP-PORTAL-INBOX-TEST-DEMETER
-# Replace these 3 default values with the ones for your specific App,
-# as shown on the on-boarding page on the ONAP Portal web application.
-ueb_app_key = ZOicEniw7BWDL1pM
-ueb_app_secret = PJIsBErHfo2RGKzuu03CZKgV
-ueb_app_mailbox_name = ONAP-PORTAL-OUTBOX-TEST-32756
-# Consumer group name for UEB topic.
-# Use the special tag '{UUID}' to generate a unique one for each sdk-app server.
-ueb_app_consumer_group_name = {UUID}
+ueb_app_key = REPLACE-ME-UEB-APP-KEY-EPSDK-APP-OS