Fixes for properties files

Issue-ID: AAI-1016
Change-Id: Ic640254cb0f81d9a9a5d34120431249c03878891
Signed-off-by: Jimmy Forsyth <jf2512@att.com>

diff --git a/bundleconfig-local/etc/appprops/methodMapper.properties b/bundleconfig-local/etc/appprops/methodMapper.properties
index c011c4b..7b71acf 100644 (file)
--- a/bundleconfig-local/etc/appprops/methodMapper.properties
+++ b/bundleconfig-local/etc/appprops/methodMapper.properties
@@ -1,24 +1,3 @@
-###
-#  ============LICENSE_START==========================================
-#  org.onap.aai
-#  ===================================================================
-#  Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
-#  Copyright © 2017-2018 Amdocs
-#  ===================================================================
-#  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.
-#  ============LICENSE_END============================================
-###
-  
 {
     "helloWorld": [
         {

diff --git a/src/main/java/org/onap/aai/modelloader/service/ModelLoaderMsgs.java b/src/main/java/org/onap/aai/modelloader/service/ModelLoaderMsgs.java
index ad17a43..c5f00c0 100644 (file)
--- a/src/main/java/org/onap/aai/modelloader/service/ModelLoaderMsgs.java
+++ b/src/main/java/org/onap/aai/modelloader/service/ModelLoaderMsgs.java
@@ -114,7 +114,7 @@ public enum ModelLoaderMsgs implements LogMessageEnum {
      * Load message bundle (ModelLoaderMsgs.properties file)\r
      */\r
     static {\r
-        EELFResourceManager.loadMessageBundle("org/onap.aai/modelloader/service/ModelLoaderMsgs");\r
+        EELFResourceManager.loadMessageBundle("org/onap/aai/modelloader/service/ModelLoaderMsgs");\r
     }\r
 \r
 }\r

diff --git a/src/main/resources/org/openecomp/modelloader/service/ModelLoaderMsgs.properties b/src/main/resources/org/onap/aai/modelloader/service/ModelLoaderMsgs.properties
similarity index 100%
rename from src/main/resources/org/openecomp/modelloader/service/ModelLoaderMsgs.properties
rename to src/main/resources/org/onap/aai/modelloader/service/ModelLoaderMsgs.properties