diff options
| author |   Patrick Brady <pb071s@att.com> | 2017-10-26 09:12:23 -0700 |
|---|---|---|
| committer | Patrick Brady <pb071s@att.com> | 2017-10-26 11:27:33 -0700 |
| commit | b7d8b97e10c62ef446b28fc071bb7536a248a304 (patch) | |
| tree | f7fcff57512caf0bf7ddc6e3638e39f8a59a2809 /appc-config/appc-config-adaptor | |
| parent | 172e0a20ac4557716ec780843253383772557aee (diff) | |
Fixing problems with features files
In progress.
Change-Id: Idb0d3f13eaa89d9241f4c543f1222c14ea288f2f
Signed-off-by: Patrick Brady <pb071s@att.com>
Issue-id: APPC-296
Diffstat (limited to 'appc-config/appc-config-adaptor')
| -rw-r--r-- | appc-config/appc-config-adaptor/features/src/main/resources/features.xml | 2 | ||||
| -rw-r--r-- | appc-config/appc-config-adaptor/provider/src/main/java/org/openecomp/appc/ccadaptor/CCAActivator.java | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/appc-config/appc-config-adaptor/features/src/main/resources/features.xml b/appc-config/appc-config-adaptor/features/src/main/resources/features.xml index ff24b9db2..d14795bac 100644 --- a/appc-config/appc-config-adaptor/features/src/main/resources/features.xml +++ b/appc-config/appc-config-adaptor/features/src/main/resources/features.xml @@ -28,7 +28,7 @@ <feature name='appc-config-adaptor' description="Application Controller Config Adaptor" version='${project.version}'> - <feature version= '${sdnc.sli.version}'>sdnc-sli</feature> + <feature>sdnc-sli</feature> <bundle>wrap:mvn:com.jcraft/jsch/0.1.52</bundle> <bundle>wrap:mvn:org.jasypt/jasypt/1.9.2</bundle> <bundle>wrap:mvn:com.att.eelf/eelf-core/${eelf.version}</bundle> diff --git a/appc-config/appc-config-adaptor/provider/src/main/java/org/openecomp/appc/ccadaptor/CCAActivator.java b/appc-config/appc-config-adaptor/provider/src/main/java/org/openecomp/appc/ccadaptor/CCAActivator.java index 96cda9ca2..4bf0f33a4 100644 --- a/appc-config/appc-config-adaptor/provider/src/main/java/org/openecomp/appc/ccadaptor/CCAActivator.java +++ b/appc-config/appc-config-adaptor/provider/src/main/java/org/openecomp/appc/ccadaptor/CCAActivator.java @@ -39,7 +39,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 SDNC_CONFIG_DIR_VAR = "APPC_CONFIG_DIR"; @SuppressWarnings("rawtypes") private ServiceRegistration registration = null; |