summaryrefslogtreecommitdiffstats
path: root/utils
diff options
context:
space:
mode:
authorTal Gitelman <tal.gitelman@att.com>2018-10-30 19:45:19 +0200
committerTal Gitelman <tal.gitelman@att.com>2018-11-01 09:02:27 +0000
commitae3a86d73ed732c0d3a3c46e98445c40a79582c0 (patch)
tree9247a9d25483a4dd3c99daa6d4a142ca93f717fb /utils
parentc401f4faae5b11d0ccf8c706380a89be7abf510d (diff)
upgrading jetty
Change-Id: Ie6307656f88cab59346bb17bcfc75ca494b572d7 Issue-ID: SDC-1767 Signed-off-by: Tal Gitelman <tal.gitelman@att.com>
Diffstat (limited to 'utils')
-rw-r--r--utils/webseal-simulator/sdc-simulator/Dockerfile4
-rw-r--r--utils/webseal-simulator/sdc-simulator/chef-repo/cookbooks/sdc-simulator/recipes/SDC_Simulator_5_create_jetty_modules.rb2
-rw-r--r--utils/webseal-simulator/sdc-simulator/startup.sh2
3 files changed, 3 insertions, 5 deletions
diff --git a/utils/webseal-simulator/sdc-simulator/Dockerfile b/utils/webseal-simulator/sdc-simulator/Dockerfile
index 47c9dca108..70539086a9 100644
--- a/utils/webseal-simulator/sdc-simulator/Dockerfile
+++ b/utils/webseal-simulator/sdc-simulator/Dockerfile
@@ -1,11 +1,9 @@
-FROM onap/base_sdc-jetty:1.4.0
+FROM onap/base_sdc-jetty:1.4.1
COPY chef-solo /root/chef-solo/
COPY chef-repo/cookbooks /root/chef-solo/cookbooks/
-#RUN cp ${JETTY_HOME}/resources/log4j.properties ${JETTY_BASE}/resources/log4j.properties
-
ADD WSSimulator*.war ${JETTY_BASE}/webapps/
USER root
diff --git a/utils/webseal-simulator/sdc-simulator/chef-repo/cookbooks/sdc-simulator/recipes/SDC_Simulator_5_create_jetty_modules.rb b/utils/webseal-simulator/sdc-simulator/chef-repo/cookbooks/sdc-simulator/recipes/SDC_Simulator_5_create_jetty_modules.rb
index ddfb2a50d2..8a0f6a79c2 100644
--- a/utils/webseal-simulator/sdc-simulator/chef-repo/cookbooks/sdc-simulator/recipes/SDC_Simulator_5_create_jetty_modules.rb
+++ b/utils/webseal-simulator/sdc-simulator/chef-repo/cookbooks/sdc-simulator/recipes/SDC_Simulator_5_create_jetty_modules.rb
@@ -6,7 +6,7 @@ cwd "#{jetty_base}"
code <<-EOH
cd "#{jetty_base}"
java -jar "/#{jetty_home}"/start.jar --add-to-start=deploy
- java -jar "/#{jetty_home}"/start.jar --add-to-startd=http,https,logging,setuid
+ java -jar "/#{jetty_home}"/start.jar --create-startd --add-to-start=http,https,console-capture,setuid
EOH
end
diff --git a/utils/webseal-simulator/sdc-simulator/startup.sh b/utils/webseal-simulator/sdc-simulator/startup.sh
index 89582082eb..075c2cefab 100644
--- a/utils/webseal-simulator/sdc-simulator/startup.sh
+++ b/utils/webseal-simulator/sdc-simulator/startup.sh
@@ -15,7 +15,7 @@ JAVA_OPTIONS=" ${JAVA_OPTIONS} \
-Dconfig.home=${JETTY_BASE}/config/sdc-simulator \
-Dlog.home=${JETTY_BASE}/logs \
-Dlogback.configurationFile=${JETTY_BASE}/config/sdc-simulator/logback.xml \
- -Djetty.logging.dir=${JETTY_BASE}/logs"
+ -Djetty.console-capture.dir=${JETTY_BASE}/logs"
cd /var/lib/jetty