SLIDER-809 Fix some discrepancies from the first commit.
* Fix http_port allocated port definition
* Use proper file name/paths for tomcat tarball
* Define the server-xml configuration key
* Remove unnecessary configuration calls (stop and status)
diff --git a/app-packages/tomcat/metainfo.xml b/app-packages/tomcat/metainfo.xml
index 6710ef1..3138573 100644
--- a/app-packages/tomcat/metainfo.xml
+++ b/app-packages/tomcat/metainfo.xml
@@ -10,8 +10,8 @@
<name>Servers</name>
<exports>
<export>
- <name>host_port</name>
- <value>${TOMCAT_HOST}:${site.global.listen_port}</value>
+ <name>tomcat.http_port</name>
+ <value>${TOMCAT_HOST}:${site.server-xml.http.port}</value>
</export>
</exports>
</exportGroup>
@@ -33,7 +33,7 @@
<packages>
<package>
<type>tarball</type>
- <name>files/apache-tomcat.tar.gz</name>
+ <name>files/tomcat-8.0.20.tar.gz</name>
</package>
</packages>
</osSpecific>
@@ -50,5 +50,13 @@
</exports>
</exportGroup>
</exportGroups>
+
+ <configFiles>
+ <configFile>
+ <type>env</type>
+ <fileName>server.xml</fileName>
+ <dictionaryName>server-xml</dictionaryName>
+ </configFile>
+ </configFiles>
</application>
</metainfo>
diff --git a/app-packages/tomcat/package/scripts/params.py b/app-packages/tomcat/package/scripts/params.py
index a1943d5..fe058b7 100644
--- a/app-packages/tomcat/package/scripts/params.py
+++ b/app-packages/tomcat/package/scripts/params.py
@@ -24,6 +24,7 @@
config = Script.get_config()
app_root = config['configurations']['global']['app_root']
+conf_dir = format("{app_root}/apache-tomcat-8.0.20/conf")
java64_home = config['hostLevelParams']['java_home']
pid_file = config['configurations']['global']['pid_file']
diff --git a/app-packages/tomcat/package/scripts/tomcat.py b/app-packages/tomcat/package/scripts/tomcat.py
index 35599a9..3771eae 100644
--- a/app-packages/tomcat/package/scripts/tomcat.py
+++ b/app-packages/tomcat/package/scripts/tomcat.py
@@ -33,9 +33,10 @@
def start(self, env):
import params
+ # implicit that the params/env are properly configured
self.configure(env)
tomcat_pid = format('{app_root}/catalina.pid')
- process_cmd = format('env JAVA_HOME={java64_home} CATALINA_PID=' + tomcat_pid + ' {app_root}/apache-tomcat-*/bin/catalina.sh start')
+ process_cmd = format('env JAVA_HOME={java64_home} CATALINA_PID=' + tomcat_pid + ' {app_root}/apache-tomcat-8.0.20/bin/catalina.sh start')
Execute(process_cmd,
logoutput=False,
@@ -46,9 +47,10 @@
def stop(self, env):
import params
- self.configure(env)
+ # Don't need to re-call configure()
+ env.set_params(params)
tomcat_pid = format('{app_root}/catalina.pid')
- process_cmd = format('env JAVA_HOME={java64_home} CATALINA_PID=' + tomcat_pid + ' {app_root}/apache-tomcat-*/bin/catalina.sh stop')
+ process_cmd = format('env JAVA_HOME={java64_home} CATALINA_PID=' + tomcat_pid + ' {app_root}/apache-tomcat-8.0.20/bin/catalina.sh stop')
Execute(process_cmd,
logoutput=True,
@@ -59,7 +61,8 @@
def status(self, env):
import params
- self.configure(env)
+ # Don't need to re-call configure()
+ env.set_params(params)
tomcat_pid = format('{app_root}/catalina.pid')
check_process_status(tomcat_pid)
