ODL Upgrade Method 2

Changes necessary to support upgrade to ODL Nitrogen,
while continuing to use Karaf 3 style features

Change-Id: I2edf619e0b889420c32793b958c0926b0311e71d
Signed-off-by: Patrick Brady <pb071s@att.com>
Issue-ID: APPC-403

2 files changed, 6 insertions, 7 deletions

diff --git a/appc-config/appc-config-adaptor/provider/src/main/java/org/onap/appc/ccadaptor/CCAActivator.java b/appc-config/appc-config-adaptor/provider/src/main/java/org/onap/appc/ccadaptor/CCAActivator.java
index fdf14feb0..6815b4c01 100644
--- a/appc-config/appc-config-adaptor/provider/src/main/java/org/onap/appc/ccadaptor/CCAActivator.java
+++ b/appc-config/appc-config-adaptor/provider/src/main/java/org/onap/appc/ccadaptor/CCAActivator.java
@@ -2,7 +2,7 @@
  * ============LICENSE_START=======================================================
  * ONAP : APPC
  * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * Copyright (C) 2017-2018 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
  * Copyright (C) 2017 Amdocs
  * =============================================================================
@@ -18,7 +18,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  *
- * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  * ============LICENSE_END=========================================================
  */
 
@@ -39,7 +38,7 @@ public class CCAActivator implements BundleActivator
 {
 
   private static final String CCA_PROP_FILE_VAR = "SDNC_CCA_PROPERTIES";
-  private static final String SDNC_CONFIG_DIR_VAR = "SDNC_CONFIG_DIR";
+  private static final String APPC_CONFIG_DIR_VAR = "APPC_CONFIG_DIR";
 
   @SuppressWarnings("rawtypes")
   private ServiceRegistration registration = null;
@@ -56,10 +55,10 @@ public class CCAActivator implements BundleActivator
     String propFileName = System.getenv(CCA_PROP_FILE_VAR);
     if (propFileName == null)
     {
-      String propDir = System.getenv(SDNC_CONFIG_DIR_VAR);
+      String propDir = System.getenv(APPC_CONFIG_DIR_VAR);
       if (propDir == null)
         throw new ConfigurationException(
-          "Cannot find config file - " + CCA_PROP_FILE_VAR + " and " + SDNC_CONFIG_DIR_VAR + " unset");
+          "Cannot find config file - " + CCA_PROP_FILE_VAR + " and " + APPC_CONFIG_DIR_VAR + " unset");
 
       propFileName = propDir + "/appc-config-adaptor.properties";
       log.warn("Environment variable " + CCA_PROP_FILE_VAR + " unset - defaulting to " + propFileName);
diff --git a/appc-config/appc-config-adaptor/provider/src/test/java/org/onap/appc/ccadaptor/XmlUtilTest.java b/appc-config/appc-config-adaptor/provider/src/test/java/org/onap/appc/ccadaptor/XmlUtilTest.java
index 8a252df8c..859f04a7f 100644
--- a/appc-config/appc-config-adaptor/provider/src/test/java/org/onap/appc/ccadaptor/XmlUtilTest.java
+++ b/appc-config/appc-config-adaptor/provider/src/test/java/org/onap/appc/ccadaptor/XmlUtilTest.java
@@ -17,7 +17,7 @@
  * See the License for the specific language governing permissions and

  * limitations under the License.

  *============LICENSE_END=========================================================

-*/

+ */

 

 package org.onap.appc.ccadaptor;

 

@@ -50,4 +50,4 @@ public class XmlUtilTest {
         Assert.assertTrue(xmlData.contains("test1</dt>") );

         Assert.assertTrue(xmlData.contains("<dt_length>2") );

     }

-}
\ No newline at end of file
+}