aboutsummaryrefslogtreecommitdiffstats
path: root/utils
diff options
context:
space:
mode:
authorTal Gitelman <tg851x@intl.att.com>2017-12-10 18:55:03 +0200
committerTal Gitelman <tg851x@intl.att.com>2017-12-10 19:33:38 +0200
commit51d50f0ef642e0f996a1c8b8d2ef4838bdfec892 (patch)
tree3ac236a864d74d19b0f5c9020891a7a7e5c31b44 /utils
parentb5cc2e0695f195716d6ccdc65e73807a6632ec70 (diff)
Final commit to master merge from
Change-Id: Ib464f9a8828437c86fe6def8af238aaf83473507 Issue-ID: SDC-714 Signed-off-by: Tal Gitelman <tg851x@intl.att.com>
Diffstat (limited to 'utils')
-rw-r--r--utils/webseal-simulator/pom.xml5
-rw-r--r--utils/webseal-simulator/src/main/java/org/openecomp/sdc/webseal/simulator/Login.java1
-rw-r--r--utils/webseal-simulator/src/main/java/org/openecomp/sdc/webseal/simulator/conf/Conf.java1
3 files changed, 4 insertions, 3 deletions
diff --git a/utils/webseal-simulator/pom.xml b/utils/webseal-simulator/pom.xml
index e240da6d01..fa9d3529b3 100644
--- a/utils/webseal-simulator/pom.xml
+++ b/utils/webseal-simulator/pom.xml
@@ -14,6 +14,7 @@
<!--maven-->
<maven.build.timestamp.format>yyyyMMdd'T'HHmm</maven.build.timestamp.format>
<nexus.proxy>https://nexus.onap.org</nexus.proxy>
+ <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
</properties>
<dependencies>
@@ -161,7 +162,7 @@
<executions>
<execution>
<id>copy-resources-simulator</id>
- <phase>validate</phase>
+ <phase>package</phase>
<goals>
<goal>copy-resources</goal>
</goals>
@@ -223,7 +224,7 @@
<alias>sdc-simulator</alias>
<build>
<cleanup>try</cleanup>
- <dockerFileDir>${basedir}\sdc-simulator</dockerFileDir>
+ <dockerFileDir>${basedir}/sdc-simulator</dockerFileDir>
<tags>
<tag>${docker.tag}</tag>
<tag>${docker.latest.tag}</tag>
diff --git a/utils/webseal-simulator/src/main/java/org/openecomp/sdc/webseal/simulator/Login.java b/utils/webseal-simulator/src/main/java/org/openecomp/sdc/webseal/simulator/Login.java
index 2798f68563..78aca50e95 100644
--- a/utils/webseal-simulator/src/main/java/org/openecomp/sdc/webseal/simulator/Login.java
+++ b/utils/webseal-simulator/src/main/java/org/openecomp/sdc/webseal/simulator/Login.java
@@ -12,7 +12,6 @@ import javax.servlet.http.HttpServlet;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
-import org.openecomp.sdc.webseal.simulator.User;
import org.openecomp.sdc.webseal.simulator.conf.Conf;
public class Login extends HttpServlet {
diff --git a/utils/webseal-simulator/src/main/java/org/openecomp/sdc/webseal/simulator/conf/Conf.java b/utils/webseal-simulator/src/main/java/org/openecomp/sdc/webseal/simulator/conf/Conf.java
index c00af32734..ae2fa036ea 100644
--- a/utils/webseal-simulator/src/main/java/org/openecomp/sdc/webseal/simulator/conf/Conf.java
+++ b/utils/webseal-simulator/src/main/java/org/openecomp/sdc/webseal/simulator/conf/Conf.java
@@ -6,6 +6,7 @@ import java.util.List;
import java.util.Map;
import org.openecomp.sdc.webseal.simulator.User;
+
import com.typesafe.config.Config;
import com.typesafe.config.ConfigFactory;