Add new EnvProperties class

Added new class EnvProperties, which extends java.util.Properties
and supports property values containing embedded environment
variable references.  Updated code to use this class to load
svclogic.properties, and updated dmaap listener to use
that class to load dmaap listener configuration.

Issue-ID: SDNC-1482
Signed-off-by: Dan Timoney <dtimoney@att.com>
Change-Id: I7538b719631d8c10c27d059aeb4f70ce92760ebd

1 files changed, 23 insertions, 23 deletions

diff --git a/core/sliapi/model/swagger/src/main/yaml/sliapi.yaml b/core/sliapi/model/swagger/src/main/yaml/sliapi.yaml
index b97b1325a..d323e1058 100644
--- a/core/sliapi/model/swagger/src/main/yaml/sliapi.yaml
+++ b/core/sliapi/model/swagger/src/main/yaml/sliapi.yaml
@@ -1,25 +1,25 @@
 ---
 swagger: "2.0"
 info:
-  description: "This module contains a collection of generally useful derived\nYANG\
-    \ data types for Internet addresses and related things.\n\nCopyright (c) 2013\
-    \ IETF Trust and the persons identified as\nauthors of the code.  All rights reserved.\n\
-    \nRedistribution and use in source and binary forms, with or\nwithout modification,\
+  description: "Defines API to service logic interpreter,This module contains a collection\
+    \ of generally useful derived\nYANG data types.\n\nCopyright (c) 2013 IETF Trust\
+    \ and the persons identified as\nauthors of the code.  All rights reserved.\n\n\
+    Redistribution and use in source and binary forms, with or\nwithout modification,\
     \ is permitted pursuant to, and subject\nto the license terms contained in, the\
     \ Simplified BSD License\nset forth in Section 4.c of the IETF Trust's Legal Provisions\n\
     Relating to IETF Documents\n(http://trustee.ietf.org/license-info).\n\nThis version\
     \ of this YANG module is part of RFC 6991; see\nthe RFC itself for full legal\
-    \ notices.,Defines API to service logic interpreter,This module contains a collection\
-    \ of generally useful derived\nYANG data types.\n\nCopyright (c) 2013 IETF Trust\
-    \ and the persons identified as\nauthors of the code.  All rights reserved.\n\n\
-    Redistribution and use in source and binary forms, with or\nwithout modification,\
+    \ notices.,This module contains a collection of generally useful derived\nYANG\
+    \ data types for Internet addresses and related things.\n\nCopyright (c) 2013\
+    \ IETF Trust and the persons identified as\nauthors of the code.  All rights reserved.\n\
+    \nRedistribution and use in source and binary forms, with or\nwithout modification,\
     \ is permitted pursuant to, and subject\nto the license terms contained in, the\
     \ Simplified BSD License\nset forth in Section 4.c of the IETF Trust's Legal Provisions\n\
     Relating to IETF Documents\n(http://trustee.ietf.org/license-info).\n\nThis version\
     \ of this YANG module is part of RFC 6991; see\nthe RFC itself for full legal\
     \ notices."
   version: "1.2.0-SNAPSHOT"
-  title: "ietf-inet-types,SLI-API,ietf-yang-types API"
+  title: "SLI-API,ietf-yang-types,ietf-inet-types API"
 consumes:
 - "application/json"
 - "application/xml"
@@ -38,10 +38,10 @@ paths:
           description: "Internal error"
         200:
           description: "sli.api.TestResults"
-          responseSchema:
+          schema:
             originalRef: "#/definitions/sli.api.TestResults"
             $ref: "#/definitions/sli.api.TestResults"
-          schema:
+          responseSchema:
             originalRef: "#/definitions/sli.api.TestResults"
             $ref: "#/definitions/sli.api.TestResults"
     post:
@@ -126,10 +126,10 @@ paths:
           description: "Internal error"
         200:
           description: "sli.api.testresults.TestResult"
-          responseSchema:
+          schema:
             originalRef: "#/definitions/sli.api.testresults.TestResult"
             $ref: "#/definitions/sli.api.testresults.TestResult"
-          schema:
+          responseSchema:
             originalRef: "#/definitions/sli.api.testresults.TestResult"
             $ref: "#/definitions/sli.api.testresults.TestResult"
     post:
@@ -206,10 +206,10 @@ paths:
           description: "Internal error"
         200:
           description: "sli.api.TestResults"
-          responseSchema:
+          schema:
             originalRef: "#/definitions/sli.api.TestResults"
             $ref: "#/definitions/sli.api.TestResults"
-          schema:
+          responseSchema:
             originalRef: "#/definitions/sli.api.TestResults"
             $ref: "#/definitions/sli.api.TestResults"
   /operational/SLI-API:test-results/SLI-API:test-result/{test-identifier}/:
@@ -228,10 +228,10 @@ paths:
           description: "Internal error"
         200:
           description: "sli.api.testresults.TestResult"
-          responseSchema:
+          schema:
             originalRef: "#/definitions/sli.api.testresults.TestResult"
             $ref: "#/definitions/sli.api.testresults.TestResult"
-          schema:
+          responseSchema:
             originalRef: "#/definitions/sli.api.testresults.TestResult"
             $ref: "#/definitions/sli.api.testresults.TestResult"
   /operations/SLI-API:execute-graph/:
@@ -252,10 +252,10 @@ paths:
           description: "Internal error"
         200:
           description: "Correct response"
-          responseSchema:
+          schema:
             originalRef: "#/definitions/sli.api.ExecuteGraph"
             $ref: "#/definitions/sli.api.ExecuteGraph"
-          schema:
+          responseSchema:
             originalRef: "#/definitions/sli.api.ExecuteGraph"
             $ref: "#/definitions/sli.api.ExecuteGraph"
         201:
@@ -270,10 +270,10 @@ paths:
           description: "Internal error"
         200:
           description: "Correct response"
-          responseSchema:
+          schema:
             originalRef: "#/definitions/sli.api.Healthcheck"
             $ref: "#/definitions/sli.api.Healthcheck"
-          schema:
+          responseSchema:
             originalRef: "#/definitions/sli.api.Healthcheck"
             $ref: "#/definitions/sli.api.Healthcheck"
         201:
@@ -288,10 +288,10 @@ paths:
           description: "Internal error"
         200:
           description: "Correct response"
-          responseSchema:
+          schema:
             originalRef: "#/definitions/sli.api.Vlbcheck"
             $ref: "#/definitions/sli.api.Vlbcheck"
-          schema:
+          responseSchema:
             originalRef: "#/definitions/sli.api.Vlbcheck"
             $ref: "#/definitions/sli.api.Vlbcheck"
         201: