diff options
| author |   Smokowski, Kevin (ks6305) <ks6305@att.com> | 2018-08-07 21:26:44 +0000 |
|---|---|---|
| committer | Smokowski, Kevin (ks6305) <ks6305@att.com> | 2018-08-07 21:26:44 +0000 |
| commit | 3c5a179495b00b2e832d304083885aa93e8cdab7 (patch) | |
| tree | 90b9dcf52ba520d54019411309fff3d7a4ce9a22 | |
| parent | f6e8db81573312f7b1085f6b55ad2bd4b7eba20d (diff) | |
update configuration for onap
look for properties in common folder, use java 8
Change-Id: I8a04126d8ac1db0781af9b6a015477e0fc3608dd
Issue-ID: CCSDK-448
Signed-off-by: Smokowski, Kevin (ks6305) <ks6305@att.com>
3 files changed, 6 insertions, 6 deletions
diff --git a/dmaap-listener/src/main/java/org/onap/ccsdk/sli/northbound/dmaapclient/DmaapListener.java b/dmaap-listener/src/main/java/org/onap/ccsdk/sli/northbound/dmaapclient/DmaapListener.java index 2be08cb8..7e257a12 100644 --- a/dmaap-listener/src/main/java/org/onap/ccsdk/sli/northbound/dmaapclient/DmaapListener.java +++ b/dmaap-listener/src/main/java/org/onap/ccsdk/sli/northbound/dmaapclient/DmaapListener.java @@ -32,7 +32,7 @@ import org.slf4j.LoggerFactory; public class DmaapListener { private static final String DMAAP_LISTENER_PROPERTIES = "dmaap-listener.properties"; - private static final String DMAAP_LISTENER_PROPERTIES_DIR = "/opt/sdnc/data/properties"; + private static final String DMAAP_LISTENER_PROPERTIES_DIR = "/opt/onap/ccsdk/data/properties"; private static final String SDNC_CONFIG_DIR = "SDNC_CONFIG_DIR"; private static final Logger LOG = LoggerFactory.getLogger(DmaapListener.class); diff --git a/dmaap-listener/src/main/scripts/start-dmaap-listener.sh b/dmaap-listener/src/main/scripts/start-dmaap-listener.sh index 164ade33..f767d3cd 100644 --- a/dmaap-listener/src/main/scripts/start-dmaap-listener.sh +++ b/dmaap-listener/src/main/scripts/start-dmaap-listener.sh @@ -21,15 +21,15 @@ # ============LICENSE_END========================================================= ### -PROPERTY_DIR=${PROPERTY_DIR:-/opt/sdnc/data/properties} +PROPERTY_DIR=${PROPERTY_DIR:-/opt/onap/ccsdk/data/properties} LISTENER=dmaap-listener PIDFILE=/tmp/.${LISTENER}-pid -UEBLISTENERROOT=${UEBLISTENERROOT:-/opt/app/dmaap-listener} -JAVA_HOME=${JAVA_HOME:-/usr/lib/jvm/java-7-oracle} +UEBLISTENERROOT=${UEBLISTENERROOT:-/opt/onap/dmaap-listener} +JAVA_HOME=${JAVA_HOME:-/usr/lib/jvm/java-8-oracle} JAVA_OPTS=${JAVA_OPTS:--Dhttps.protocols=TLSv1.1,TLSv1.2} JAVA=${JAVA:-${JAVA_HOME}/bin/java} diff --git a/dmaap-listener/src/main/scripts/stop-dmaap-listener.sh b/dmaap-listener/src/main/scripts/stop-dmaap-listener.sh index 61be1a14..ab242044 100644 --- a/dmaap-listener/src/main/scripts/stop-dmaap-listener.sh +++ b/dmaap-listener/src/main/scripts/stop-dmaap-listener.sh @@ -21,13 +21,13 @@ # ============LICENSE_END========================================================= ### -PROPERTY_DIR=${PROPERTY_DIR:-/opt/sdnc/data/properties} +PROPERTY_DIR=${PROPERTY_DIR:-/opt/onap/ccsdk/data/properties} LISTENER=dmaap-listener PIDFILE=/tmp/.${LISTENER}-pid -UEBLISTENERROOT=${UEBLISTENERROOT:-/opt/app/dmaap-listener} +UEBLISTENERROOT=${UEBLISTENERROOT:-/opt/onap/dmaap-listener} if [ -f $PIDFILE ] then |