You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@slider.apache.org by el...@apache.org on 2015/12/31 02:19:51 UTC
[3/5] incubator-slider git commit: SLIDER-1012 Modify server and
quicklinks for Tomcat (fengyongshe)
SLIDER-1012 Modify server and quicklinks for Tomcat (fengyongshe)
Project: http://git-wip-us.apache.org/repos/asf/incubator-slider/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-slider/commit/c5f7ff94
Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/c5f7ff94
Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/c5f7ff94
Branch: refs/heads/develop
Commit: c5f7ff9414cc59899fa9f6061fcdb1c1c3816441
Parents: dd121b1
Author: Josh Elser <el...@apache.org>
Authored: Tue Dec 29 20:33:32 2015 -0500
Committer: Josh Elser <el...@apache.org>
Committed: Wed Dec 30 16:20:58 2015 -0500
----------------------------------------------------------------------
app-packages/tomcat/metainfo.xml | 35 ++++++++++++++++++++++-------------
1 file changed, 22 insertions(+), 13 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/c5f7ff94/app-packages/tomcat/metainfo.xml
----------------------------------------------------------------------
diff --git a/app-packages/tomcat/metainfo.xml b/app-packages/tomcat/metainfo.xml
index 714bfa4..bdecda5 100644
--- a/app-packages/tomcat/metainfo.xml
+++ b/app-packages/tomcat/metainfo.xml
@@ -32,18 +32,39 @@
</export>
</exports>
</exportGroup>
+ <exportGroup>
+ <name>QuickLinks</name>
+ <exports>
+ <export>
+ <name>HTTP</name>
+ <value>http://${TOMCAT_HOST}:${site.server-xml.http.port}</value>
+ </export>
+ </exports>
+ </exportGroup>
</exportGroups>
+
<components>
<component>
<name>TOMCAT</name>
<category>MASTER</category>
- <compExports>Servers-host_port</compExports>
+ <appExports>Servers-tomcat.http_port,QuickLinks-HTTP</appExports>
+ <componentExports>
+ <componentExport>
+ <name>tomcat.http.port</name>
+ <value>${TOMCAT_HOST}:${site.server-xml.http.port}</value>
+ </componentExport>
+ <componentExport>
+ <name>HTTP</name>
+ <value>http://${TOMCAT_HOST}:${site.global.listen_port}</value>
+ </componentExport>
+ </componentExports>
<commandScript>
<script>scripts/tomcat.py</script>
<scriptType>PYTHON</scriptType>
</commandScript>
</component>
</components>
+
<osSpecifics>
<osSpecific>
<osType>any</osType>
@@ -56,18 +77,6 @@
</osSpecific>
</osSpecifics>
- <exportGroups>
- <exportGroup>
- <name>QuickLinks</name>
- <exports>
- <export>
- <name>HTTP</name>
- <value>http://${TOMCAT_HOST}:${site.global.listen_port}</value>
- </export>
- </exports>
- </exportGroup>
- </exportGroups>
-
<configFiles>
<configFile>
<type>env</type>