Merge "JUnit additions for BRMS,POLICY-SDK-APP"

diff --git a/ONAP-PAP-REST/src/main/java/org/onap/policy/pap/xacml/rest/elk/client/ElkConnectorImpl.java b/ONAP-PAP-REST/src/main/java/org/onap/policy/pap/xacml/rest/elk/client/ElkConnectorImpl.java
index 59bf500..d87e75f 100644 (file)
--- a/ONAP-PAP-REST/src/main/java/org/onap/policy/pap/xacml/rest/elk/client/ElkConnectorImpl.java
+++ b/ONAP-PAP-REST/src/main/java/org/onap/policy/pap/xacml/rest/elk/client/ElkConnectorImpl.java
@@ -166,7 +166,7 @@ public class ElkConnectorImpl implements ElkConnector{
 
                        String errorMessage = result.getErrorMessage();
                        if (errorMessage != null && !errorMessage.isEmpty()) {
-                               String xMessage = errorMessage;
+                               String xMessage;
                                if (errorMessage.contains("TokenMgrError")) {
                                        int indexError = errorMessage.lastIndexOf("TokenMgrError");
                                        xMessage = "Invalid Search Expression.  Details: " + errorMessage.substring(indexError);

diff --git a/packages/docker/pom.xml b/packages/docker/pom.xml
index 68b4d92..e73ff4d 100644 (file)
--- a/packages/docker/pom.xml
+++ b/packages/docker/pom.xml
@@ -82,7 +82,6 @@
                                                        <resources>          
                                                                <resource>
                                                                        <directory>src/main/docker</directory>
-                                                                       <filtering>true</filtering>
                                                                </resource>
                                                        </resources>              
                                                </configuration>            

diff --git a/packages/docker/src/main/docker/Dockerfile b/packages/docker/src/main/docker/Dockerfile
index b0e8205..70ad8b5 100644 (file)
--- a/packages/docker/src/main/docker/Dockerfile
+++ b/packages/docker/src/main/docker/Dockerfile
@@ -2,9 +2,11 @@ FROM ubuntu:14.04
 
 ARG HTTP_PROXY=${HTTP_PROXY}
 ARG HTTPS_PROXY=${HTTPS_PROXY}
+ARG POLICY_LOGS=/var/log/policy
 
 ENV http_proxy $HTTP_PROXY
 ENV https_proxy $HTTPS_PROXY
+ENV POLICY_LOGS ${POLICY_LOGS}
 
 RUN \
         apt-get clean && \
@@ -29,7 +31,8 @@ RUN \
         apt-get update && \
         apt-get install -y mariadb-client
 
-RUN mkdir -p /opt/app/policy /tmp/policy-install && chown policy /opt/app/policy /tmp/policy-install
+RUN mkdir -p /opt/app/policy /tmp/policy-install ${POLICY_LOGS} && \
+    chown policy /opt/app/policy /tmp/policy-install ${POLICY_LOGS}
 
 WORKDIR /tmp/policy-install