You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by ol...@apache.org on 2012/12/06 22:58:13 UTC
svn commit: r1418104 [23/23] - in
/tomcat/site/trunk/docs/maven-plugin-2.1-SNAPSHOT: ./ apidocs/
apidocs/org/apache/tomcat/maven/common/deployer/class-use/
apidocs/org/apache/tomcat/maven/plugin/tomcat6/
apidocs/org/apache/tomcat/maven/plugin/tomcat6/c...
Modified: tomcat/site/trunk/docs/maven-plugin-2.1-SNAPSHOT/tomcat7-war-runner/xref/org/apache/tomcat/maven/runner/Tomcat7Runner.html
URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/maven-plugin-2.1-SNAPSHOT/tomcat7-war-runner/xref/org/apache/tomcat/maven/runner/Tomcat7Runner.html?rev=1418104&r1=1418103&r2=1418104&view=diff
==============================================================================
--- tomcat/site/trunk/docs/maven-plugin-2.1-SNAPSHOT/tomcat7-war-runner/xref/org/apache/tomcat/maven/runner/Tomcat7Runner.html (original)
+++ tomcat/site/trunk/docs/maven-plugin-2.1-SNAPSHOT/tomcat7-war-runner/xref/org/apache/tomcat/maven/runner/Tomcat7Runner.html Thu Dec 6 21:57:40 2012
@@ -48,646 +48,721 @@
<a class="jxr_linenumber" name="38" href="#38">38</a> <strong class="jxr_keyword">import</strong> java.io.InputStream;
<a class="jxr_linenumber" name="39" href="#39">39</a> <strong class="jxr_keyword">import</strong> java.lang.reflect.InvocationTargetException;
<a class="jxr_linenumber" name="40" href="#40">40</a> <strong class="jxr_keyword">import</strong> java.lang.reflect.Method;
-<a class="jxr_linenumber" name="41" href="#41">41</a> <strong class="jxr_keyword">import</strong> java.net.URL;
-<a class="jxr_linenumber" name="42" href="#42">42</a> <strong class="jxr_keyword">import</strong> java.util.HashMap;
-<a class="jxr_linenumber" name="43" href="#43">43</a> <strong class="jxr_keyword">import</strong> java.util.Map;
-<a class="jxr_linenumber" name="44" href="#44">44</a> <strong class="jxr_keyword">import</strong> java.util.Properties;
-<a class="jxr_linenumber" name="45" href="#45">45</a> <strong class="jxr_keyword">import</strong> java.util.StringTokenizer;
-<a class="jxr_linenumber" name="46" href="#46">46</a>
-<a class="jxr_linenumber" name="47" href="#47">47</a> <em class="jxr_javadoccomment">/**</em>
-<a class="jxr_linenumber" name="48" href="#48">48</a> <em class="jxr_javadoccomment"> * FIXME add junit for that but when https://issues.apache.org/bugzilla/show_bug.cgi?id=52028 fixed</em>
-<a class="jxr_linenumber" name="49" href="#49">49</a> <em class="jxr_javadoccomment"> * Main class used to run the standalone wars in a Apache Tomcat instance.</em>
-<a class="jxr_linenumber" name="50" href="#50">50</a> <em class="jxr_javadoccomment"> *</em>
-<a class="jxr_linenumber" name="51" href="#51">51</a> <em class="jxr_javadoccomment"> * @author Olivier Lamy</em>
-<a class="jxr_linenumber" name="52" href="#52">52</a> <em class="jxr_javadoccomment"> * @since 2.0</em>
-<a class="jxr_linenumber" name="53" href="#53">53</a> <em class="jxr_javadoccomment"> */</em>
-<a class="jxr_linenumber" name="54" href="#54">54</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">class</strong> Tomcat7Runner
-<a class="jxr_linenumber" name="55" href="#55">55</a> {
-<a class="jxr_linenumber" name="56" href="#56">56</a> <em class="jxr_comment">// true/false to use the server.xml located in the jar /conf/server.xml</em>
-<a class="jxr_linenumber" name="57" href="#57">57</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">static</strong> <strong class="jxr_keyword">final</strong> String USE_SERVER_XML_KEY = <span class="jxr_string">"useServerXml"</span>;
-<a class="jxr_linenumber" name="58" href="#58">58</a>
-<a class="jxr_linenumber" name="59" href="#59">59</a> <em class="jxr_comment">// contains war name wars=foo.war,bar.war</em>
-<a class="jxr_linenumber" name="60" href="#60">60</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">static</strong> <strong class="jxr_keyword">final</strong> String WARS_KEY = <span class="jxr_string">"wars"</span>;
+<a class="jxr_linenumber" name="41" href="#41">41</a> <strong class="jxr_keyword">import</strong> java.net.URISyntaxException;
+<a class="jxr_linenumber" name="42" href="#42">42</a> <strong class="jxr_keyword">import</strong> java.net.URL;
+<a class="jxr_linenumber" name="43" href="#43">43</a> <strong class="jxr_keyword">import</strong> java.security.AccessController;
+<a class="jxr_linenumber" name="44" href="#44">44</a> <strong class="jxr_keyword">import</strong> java.security.PrivilegedAction;
+<a class="jxr_linenumber" name="45" href="#45">45</a> <strong class="jxr_keyword">import</strong> java.util.HashMap;
+<a class="jxr_linenumber" name="46" href="#46">46</a> <strong class="jxr_keyword">import</strong> java.util.Map;
+<a class="jxr_linenumber" name="47" href="#47">47</a> <strong class="jxr_keyword">import</strong> java.util.Properties;
+<a class="jxr_linenumber" name="48" href="#48">48</a> <strong class="jxr_keyword">import</strong> java.util.StringTokenizer;
+<a class="jxr_linenumber" name="49" href="#49">49</a>
+<a class="jxr_linenumber" name="50" href="#50">50</a> <em class="jxr_javadoccomment">/**</em>
+<a class="jxr_linenumber" name="51" href="#51">51</a> <em class="jxr_javadoccomment"> * FIXME add junit for that but when https://issues.apache.org/bugzilla/show_bug.cgi?id=52028 fixed</em>
+<a class="jxr_linenumber" name="52" href="#52">52</a> <em class="jxr_javadoccomment"> * Main class used to run the standalone wars in a Apache Tomcat instance.</em>
+<a class="jxr_linenumber" name="53" href="#53">53</a> <em class="jxr_javadoccomment"> *</em>
+<a class="jxr_linenumber" name="54" href="#54">54</a> <em class="jxr_javadoccomment"> * @author Olivier Lamy</em>
+<a class="jxr_linenumber" name="55" href="#55">55</a> <em class="jxr_javadoccomment"> * @since 2.0</em>
+<a class="jxr_linenumber" name="56" href="#56">56</a> <em class="jxr_javadoccomment"> */</em>
+<a class="jxr_linenumber" name="57" href="#57">57</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">class</strong> Tomcat7Runner
+<a class="jxr_linenumber" name="58" href="#58">58</a> {
+<a class="jxr_linenumber" name="59" href="#59">59</a> <em class="jxr_comment">// true/false to use the server.xml located in the jar /conf/server.xml</em>
+<a class="jxr_linenumber" name="60" href="#60">60</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">static</strong> <strong class="jxr_keyword">final</strong> String USE_SERVER_XML_KEY = <span class="jxr_string">"useServerXml"</span>;
<a class="jxr_linenumber" name="61" href="#61">61</a>
-<a class="jxr_linenumber" name="62" href="#62">62</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">static</strong> <strong class="jxr_keyword">final</strong> String ARCHIVE_GENERATION_TIMESTAMP_KEY = <span class="jxr_string">"generationTimestamp"</span>;
-<a class="jxr_linenumber" name="63" href="#63">63</a>
-<a class="jxr_linenumber" name="64" href="#64">64</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">static</strong> <strong class="jxr_keyword">final</strong> String ENABLE_NAMING_KEY = <span class="jxr_string">"enableNaming"</span>;
-<a class="jxr_linenumber" name="65" href="#65">65</a>
-<a class="jxr_linenumber" name="66" href="#66">66</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">static</strong> <strong class="jxr_keyword">final</strong> String ACCESS_LOG_VALVE_FORMAT_KEY = <span class="jxr_string">"accessLogValveFormat"</span>;
-<a class="jxr_linenumber" name="67" href="#67">67</a>
-<a class="jxr_linenumber" name="68" href="#68">68</a> <em class="jxr_javadoccomment">/**</em>
-<a class="jxr_linenumber" name="69" href="#69">69</a> <em class="jxr_javadoccomment"> * key of the property which contains http protocol : HTTP/1.1 or org.apache.coyote.http11.Http11NioProtocol</em>
-<a class="jxr_linenumber" name="70" href="#70">70</a> <em class="jxr_javadoccomment"> */</em>
-<a class="jxr_linenumber" name="71" href="#71">71</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">static</strong> <strong class="jxr_keyword">final</strong> String HTTP_PROTOCOL_KEY = <span class="jxr_string">"connectorhttpProtocol"</span>;
+<a class="jxr_linenumber" name="62" href="#62">62</a> <em class="jxr_comment">// contains war name wars=foo.war,bar.war</em>
+<a class="jxr_linenumber" name="63" href="#63">63</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">static</strong> <strong class="jxr_keyword">final</strong> String WARS_KEY = <span class="jxr_string">"wars"</span>;
+<a class="jxr_linenumber" name="64" href="#64">64</a>
+<a class="jxr_linenumber" name="65" href="#65">65</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">static</strong> <strong class="jxr_keyword">final</strong> String ARCHIVE_GENERATION_TIMESTAMP_KEY = <span class="jxr_string">"generationTimestamp"</span>;
+<a class="jxr_linenumber" name="66" href="#66">66</a>
+<a class="jxr_linenumber" name="67" href="#67">67</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">static</strong> <strong class="jxr_keyword">final</strong> String ENABLE_NAMING_KEY = <span class="jxr_string">"enableNaming"</span>;
+<a class="jxr_linenumber" name="68" href="#68">68</a>
+<a class="jxr_linenumber" name="69" href="#69">69</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">static</strong> <strong class="jxr_keyword">final</strong> String ACCESS_LOG_VALVE_FORMAT_KEY = <span class="jxr_string">"accessLogValveFormat"</span>;
+<a class="jxr_linenumber" name="70" href="#70">70</a>
+<a class="jxr_linenumber" name="71" href="#71">71</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">static</strong> <strong class="jxr_keyword">final</strong> String CODE_SOURCE_CONTEXT_PATH = <span class="jxr_string">"codeSourceContextPath"</span>;
<a class="jxr_linenumber" name="72" href="#72">72</a>
-<a class="jxr_linenumber" name="73" href="#73">73</a>
-<a class="jxr_linenumber" name="74" href="#74">74</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">int</strong> httpPort;
-<a class="jxr_linenumber" name="75" href="#75">75</a>
-<a class="jxr_linenumber" name="76" href="#76">76</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">int</strong> httpsPort;
+<a class="jxr_linenumber" name="73" href="#73">73</a> <em class="jxr_javadoccomment">/**</em>
+<a class="jxr_linenumber" name="74" href="#74">74</a> <em class="jxr_javadoccomment"> * key of the property which contains http protocol : HTTP/1.1 or org.apache.coyote.http11.Http11NioProtocol</em>
+<a class="jxr_linenumber" name="75" href="#75">75</a> <em class="jxr_javadoccomment"> */</em>
+<a class="jxr_linenumber" name="76" href="#76">76</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">static</strong> <strong class="jxr_keyword">final</strong> String HTTP_PROTOCOL_KEY = <span class="jxr_string">"connectorhttpProtocol"</span>;
<a class="jxr_linenumber" name="77" href="#77">77</a>
-<a class="jxr_linenumber" name="78" href="#78">78</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">int</strong> ajpPort;
-<a class="jxr_linenumber" name="79" href="#79">79</a>
-<a class="jxr_linenumber" name="80" href="#80">80</a> <strong class="jxr_keyword">public</strong> String serverXmlPath;
-<a class="jxr_linenumber" name="81" href="#81">81</a>
-<a class="jxr_linenumber" name="82" href="#82">82</a> <strong class="jxr_keyword">public</strong> Properties runtimeProperties;
-<a class="jxr_linenumber" name="83" href="#83">83</a>
-<a class="jxr_linenumber" name="84" href="#84">84</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">boolean</strong> resetExtract;
-<a class="jxr_linenumber" name="85" href="#85">85</a>
-<a class="jxr_linenumber" name="86" href="#86">86</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">boolean</strong> debug = false;
-<a class="jxr_linenumber" name="87" href="#87">87</a>
-<a class="jxr_linenumber" name="88" href="#88">88</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">boolean</strong> clientAuth = false;
-<a class="jxr_linenumber" name="89" href="#89">89</a>
-<a class="jxr_linenumber" name="90" href="#90">90</a> <strong class="jxr_keyword">public</strong> String keyAlias = <strong class="jxr_keyword">null</strong>;
-<a class="jxr_linenumber" name="91" href="#91">91</a>
-<a class="jxr_linenumber" name="92" href="#92">92</a> <strong class="jxr_keyword">public</strong> String httpProtocol;
-<a class="jxr_linenumber" name="93" href="#93">93</a>
-<a class="jxr_linenumber" name="94" href="#94">94</a> <strong class="jxr_keyword">public</strong> String extractDirectory = <span class="jxr_string">".extract"</span>;
-<a class="jxr_linenumber" name="95" href="#95">95</a>
-<a class="jxr_linenumber" name="96" href="#96">96</a> <strong class="jxr_keyword">public</strong> File extractDirectoryFile;
-<a class="jxr_linenumber" name="97" href="#97">97</a>
-<a class="jxr_linenumber" name="98" href="#98">98</a> <strong class="jxr_keyword">public</strong> String loggerName;
-<a class="jxr_linenumber" name="99" href="#99">99</a>
-<a class="jxr_linenumber" name="100" href="#100">100</a> Catalina container;
-<a class="jxr_linenumber" name="101" href="#101">101</a>
-<a class="jxr_linenumber" name="102" href="#102">102</a> Tomcat tomcat;
-<a class="jxr_linenumber" name="103" href="#103">103</a>
-<a class="jxr_linenumber" name="104" href="#104">104</a> String uriEncoding = <span class="jxr_string">"ISO-8859-1"</span>;
-<a class="jxr_linenumber" name="105" href="#105">105</a>
-<a class="jxr_linenumber" name="106" href="#106">106</a> <em class="jxr_javadoccomment">/**</em>
-<a class="jxr_linenumber" name="107" href="#107">107</a> <em class="jxr_javadoccomment"> * key = context of the webapp, value = war path on file system</em>
-<a class="jxr_linenumber" name="108" href="#108">108</a> <em class="jxr_javadoccomment"> */</em>
-<a class="jxr_linenumber" name="109" href="#109">109</a> Map<String, String> webappWarPerContext = <strong class="jxr_keyword">new</strong> HashMap<String, String>();
+<a class="jxr_linenumber" name="78" href="#78">78</a>
+<a class="jxr_linenumber" name="79" href="#79">79</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">int</strong> httpPort;
+<a class="jxr_linenumber" name="80" href="#80">80</a>
+<a class="jxr_linenumber" name="81" href="#81">81</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">int</strong> httpsPort;
+<a class="jxr_linenumber" name="82" href="#82">82</a>
+<a class="jxr_linenumber" name="83" href="#83">83</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">int</strong> ajpPort;
+<a class="jxr_linenumber" name="84" href="#84">84</a>
+<a class="jxr_linenumber" name="85" href="#85">85</a> <strong class="jxr_keyword">public</strong> String serverXmlPath;
+<a class="jxr_linenumber" name="86" href="#86">86</a>
+<a class="jxr_linenumber" name="87" href="#87">87</a> <strong class="jxr_keyword">public</strong> Properties runtimeProperties;
+<a class="jxr_linenumber" name="88" href="#88">88</a>
+<a class="jxr_linenumber" name="89" href="#89">89</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">boolean</strong> resetExtract;
+<a class="jxr_linenumber" name="90" href="#90">90</a>
+<a class="jxr_linenumber" name="91" href="#91">91</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">boolean</strong> debug = false;
+<a class="jxr_linenumber" name="92" href="#92">92</a>
+<a class="jxr_linenumber" name="93" href="#93">93</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">boolean</strong> clientAuth = false;
+<a class="jxr_linenumber" name="94" href="#94">94</a>
+<a class="jxr_linenumber" name="95" href="#95">95</a> <strong class="jxr_keyword">public</strong> String keyAlias = <strong class="jxr_keyword">null</strong>;
+<a class="jxr_linenumber" name="96" href="#96">96</a>
+<a class="jxr_linenumber" name="97" href="#97">97</a> <strong class="jxr_keyword">public</strong> String httpProtocol;
+<a class="jxr_linenumber" name="98" href="#98">98</a>
+<a class="jxr_linenumber" name="99" href="#99">99</a> <strong class="jxr_keyword">public</strong> String extractDirectory = <span class="jxr_string">".extract"</span>;
+<a class="jxr_linenumber" name="100" href="#100">100</a>
+<a class="jxr_linenumber" name="101" href="#101">101</a> <strong class="jxr_keyword">public</strong> File extractDirectoryFile;
+<a class="jxr_linenumber" name="102" href="#102">102</a>
+<a class="jxr_linenumber" name="103" href="#103">103</a> <strong class="jxr_keyword">public</strong> String codeSourceContextPath = <strong class="jxr_keyword">null</strong>;
+<a class="jxr_linenumber" name="104" href="#104">104</a>
+<a class="jxr_linenumber" name="105" href="#105">105</a> <strong class="jxr_keyword">public</strong> File codeSourceWar = <strong class="jxr_keyword">null</strong>;
+<a class="jxr_linenumber" name="106" href="#106">106</a>
+<a class="jxr_linenumber" name="107" href="#107">107</a> <strong class="jxr_keyword">public</strong> String loggerName;
+<a class="jxr_linenumber" name="108" href="#108">108</a>
+<a class="jxr_linenumber" name="109" href="#109">109</a> Catalina container;
<a class="jxr_linenumber" name="110" href="#110">110</a>
-<a class="jxr_linenumber" name="111" href="#111">111</a> <strong class="jxr_keyword">public</strong> Tomcat7Runner()
-<a class="jxr_linenumber" name="112" href="#112">112</a> {
-<a class="jxr_linenumber" name="113" href="#113">113</a> <em class="jxr_comment">// no op</em>
-<a class="jxr_linenumber" name="114" href="#114">114</a> }
-<a class="jxr_linenumber" name="115" href="#115">115</a>
-<a class="jxr_linenumber" name="116" href="#116">116</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> run()
-<a class="jxr_linenumber" name="117" href="#117">117</a> <strong class="jxr_keyword">throws</strong> Exception
-<a class="jxr_linenumber" name="118" href="#118">118</a> {
+<a class="jxr_linenumber" name="111" href="#111">111</a> Tomcat tomcat;
+<a class="jxr_linenumber" name="112" href="#112">112</a>
+<a class="jxr_linenumber" name="113" href="#113">113</a> String uriEncoding = <span class="jxr_string">"ISO-8859-1"</span>;
+<a class="jxr_linenumber" name="114" href="#114">114</a>
+<a class="jxr_linenumber" name="115" href="#115">115</a> <em class="jxr_javadoccomment">/**</em>
+<a class="jxr_linenumber" name="116" href="#116">116</a> <em class="jxr_javadoccomment"> * key = context of the webapp, value = war path on file system</em>
+<a class="jxr_linenumber" name="117" href="#117">117</a> <em class="jxr_javadoccomment"> */</em>
+<a class="jxr_linenumber" name="118" href="#118">118</a> Map<String, String> webappWarPerContext = <strong class="jxr_keyword">new</strong> HashMap<String, String>();
<a class="jxr_linenumber" name="119" href="#119">119</a>
-<a class="jxr_linenumber" name="120" href="#120">120</a> PasswordUtil.deobfuscateSystemProps();
-<a class="jxr_linenumber" name="121" href="#121">121</a>
-<a class="jxr_linenumber" name="122" href="#122">122</a> <strong class="jxr_keyword">if</strong> ( loggerName != <strong class="jxr_keyword">null</strong> && loggerName.length() > 0 )
-<a class="jxr_linenumber" name="123" href="#123">123</a> {
-<a class="jxr_linenumber" name="124" href="#124">124</a> installLogger( loggerName );
-<a class="jxr_linenumber" name="125" href="#125">125</a> }
-<a class="jxr_linenumber" name="126" href="#126">126</a>
-<a class="jxr_linenumber" name="127" href="#127">127</a> <strong class="jxr_keyword">this</strong>.extractDirectoryFile = <strong class="jxr_keyword">new</strong> File( <strong class="jxr_keyword">this</strong>.extractDirectory );
+<a class="jxr_linenumber" name="120" href="#120">120</a> <strong class="jxr_keyword">public</strong> Tomcat7Runner()
+<a class="jxr_linenumber" name="121" href="#121">121</a> {
+<a class="jxr_linenumber" name="122" href="#122">122</a> <em class="jxr_comment">// no op</em>
+<a class="jxr_linenumber" name="123" href="#123">123</a> }
+<a class="jxr_linenumber" name="124" href="#124">124</a>
+<a class="jxr_linenumber" name="125" href="#125">125</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> run()
+<a class="jxr_linenumber" name="126" href="#126">126</a> <strong class="jxr_keyword">throws</strong> Exception
+<a class="jxr_linenumber" name="127" href="#127">127</a> {
<a class="jxr_linenumber" name="128" href="#128">128</a>
-<a class="jxr_linenumber" name="129" href="#129">129</a> debugMessage( <span class="jxr_string">"use extractDirectory:"</span> + extractDirectoryFile.getPath() );
+<a class="jxr_linenumber" name="129" href="#129">129</a> PasswordUtil.deobfuscateSystemProps();
<a class="jxr_linenumber" name="130" href="#130">130</a>
-<a class="jxr_linenumber" name="131" href="#131">131</a> <strong class="jxr_keyword">boolean</strong> archiveTimestampChanged = false;
-<a class="jxr_linenumber" name="132" href="#132">132</a>
-<a class="jxr_linenumber" name="133" href="#133">133</a> <em class="jxr_comment">// compare timestamp stored during previous run if exists</em>
-<a class="jxr_linenumber" name="134" href="#134">134</a> File timestampFile = <strong class="jxr_keyword">new</strong> File( extractDirectoryFile, <span class="jxr_string">".tomcat_executable_archive.timestamp"</span> );
+<a class="jxr_linenumber" name="131" href="#131">131</a> <strong class="jxr_keyword">if</strong> ( loggerName != <strong class="jxr_keyword">null</strong> && loggerName.length() > 0 )
+<a class="jxr_linenumber" name="132" href="#132">132</a> {
+<a class="jxr_linenumber" name="133" href="#133">133</a> installLogger( loggerName );
+<a class="jxr_linenumber" name="134" href="#134">134</a> }
<a class="jxr_linenumber" name="135" href="#135">135</a>
-<a class="jxr_linenumber" name="136" href="#136">136</a> Properties timestampProps = loadProperties( timestampFile );
+<a class="jxr_linenumber" name="136" href="#136">136</a> <strong class="jxr_keyword">this</strong>.extractDirectoryFile = <strong class="jxr_keyword">new</strong> File( <strong class="jxr_keyword">this</strong>.extractDirectory );
<a class="jxr_linenumber" name="137" href="#137">137</a>
-<a class="jxr_linenumber" name="138" href="#138">138</a> <strong class="jxr_keyword">if</strong> ( timestampFile.exists() )
-<a class="jxr_linenumber" name="139" href="#139">139</a> {
-<a class="jxr_linenumber" name="140" href="#140">140</a> String timestampValue = timestampProps.getProperty( Tomcat7Runner.ARCHIVE_GENERATION_TIMESTAMP_KEY );
-<a class="jxr_linenumber" name="141" href="#141">141</a> <strong class="jxr_keyword">if</strong> ( timestampValue != <strong class="jxr_keyword">null</strong> )
-<a class="jxr_linenumber" name="142" href="#142">142</a> {
-<a class="jxr_linenumber" name="143" href="#143">143</a> <strong class="jxr_keyword">long</strong> timestamp = Long.parseLong( timestampValue );
-<a class="jxr_linenumber" name="144" href="#144">144</a> archiveTimestampChanged =
-<a class="jxr_linenumber" name="145" href="#145">145</a> Long.parseLong( runtimeProperties.getProperty( Tomcat7Runner.ARCHIVE_GENERATION_TIMESTAMP_KEY ) )
-<a class="jxr_linenumber" name="146" href="#146">146</a> > timestamp;
-<a class="jxr_linenumber" name="147" href="#147">147</a>
-<a class="jxr_linenumber" name="148" href="#148">148</a> debugMessage( <span class="jxr_string">"read timestamp from file "</span> + timestampValue + <span class="jxr_string">", archiveTimestampChanged: "</span>
-<a class="jxr_linenumber" name="149" href="#149">149</a> + archiveTimestampChanged );
-<a class="jxr_linenumber" name="150" href="#150">150</a> }
-<a class="jxr_linenumber" name="151" href="#151">151</a>
-<a class="jxr_linenumber" name="152" href="#152">152</a> }
-<a class="jxr_linenumber" name="153" href="#153">153</a>
-<a class="jxr_linenumber" name="154" href="#154">154</a> <em class="jxr_comment">// do we have to extract content</em>
-<a class="jxr_linenumber" name="155" href="#155">155</a> {
-<a class="jxr_linenumber" name="156" href="#156">156</a> <strong class="jxr_keyword">if</strong> ( !extractDirectoryFile.exists() || resetExtract || archiveTimestampChanged )
-<a class="jxr_linenumber" name="157" href="#157">157</a> {
-<a class="jxr_linenumber" name="158" href="#158">158</a> extract();
-<a class="jxr_linenumber" name="159" href="#159">159</a> <em class="jxr_comment">//if archiveTimestampChanged or timestamp file not exists store the last timestamp from the archive</em>
-<a class="jxr_linenumber" name="160" href="#160">160</a> <strong class="jxr_keyword">if</strong> ( archiveTimestampChanged || !timestampFile.exists() )
-<a class="jxr_linenumber" name="161" href="#161">161</a> {
-<a class="jxr_linenumber" name="162" href="#162">162</a> timestampProps.put( Tomcat7Runner.ARCHIVE_GENERATION_TIMESTAMP_KEY, runtimeProperties.getProperty(
-<a class="jxr_linenumber" name="163" href="#163">163</a> Tomcat7Runner.ARCHIVE_GENERATION_TIMESTAMP_KEY ) );
-<a class="jxr_linenumber" name="164" href="#164">164</a> saveProperties( timestampProps, timestampFile );
-<a class="jxr_linenumber" name="165" href="#165">165</a> }
-<a class="jxr_linenumber" name="166" href="#166">166</a> }
-<a class="jxr_linenumber" name="167" href="#167">167</a> <strong class="jxr_keyword">else</strong>
-<a class="jxr_linenumber" name="168" href="#168">168</a> {
-<a class="jxr_linenumber" name="169" href="#169">169</a> String wars = runtimeProperties.getProperty( WARS_KEY );
-<a class="jxr_linenumber" name="170" href="#170">170</a> populateWebAppWarPerContext( wars );
-<a class="jxr_linenumber" name="171" href="#171">171</a> }
-<a class="jxr_linenumber" name="172" href="#172">172</a> }
-<a class="jxr_linenumber" name="173" href="#173">173</a>
-<a class="jxr_linenumber" name="174" href="#174">174</a> <em class="jxr_comment">// create tomcat various paths</em>
-<a class="jxr_linenumber" name="175" href="#175">175</a> <strong class="jxr_keyword">new</strong> File( extractDirectory, <span class="jxr_string">"conf"</span> ).mkdirs();
-<a class="jxr_linenumber" name="176" href="#176">176</a> <strong class="jxr_keyword">new</strong> File( extractDirectory, <span class="jxr_string">"logs"</span> ).mkdirs();
-<a class="jxr_linenumber" name="177" href="#177">177</a> <strong class="jxr_keyword">new</strong> File( extractDirectory, <span class="jxr_string">"webapps"</span> ).mkdirs();
-<a class="jxr_linenumber" name="178" href="#178">178</a> <strong class="jxr_keyword">new</strong> File( extractDirectory, <span class="jxr_string">"work"</span> ).mkdirs();
-<a class="jxr_linenumber" name="179" href="#179">179</a> File tmpDir = <strong class="jxr_keyword">new</strong> File( extractDirectory, <span class="jxr_string">"temp"</span> );
-<a class="jxr_linenumber" name="180" href="#180">180</a> tmpDir.mkdirs();
-<a class="jxr_linenumber" name="181" href="#181">181</a>
-<a class="jxr_linenumber" name="182" href="#182">182</a> System.setProperty( <span class="jxr_string">"java.io.tmpdir"</span>, tmpDir.getAbsolutePath() );
-<a class="jxr_linenumber" name="183" href="#183">183</a>
-<a class="jxr_linenumber" name="184" href="#184">184</a> System.setProperty( <span class="jxr_string">"catalina.base"</span>, extractDirectoryFile.getAbsolutePath() );
-<a class="jxr_linenumber" name="185" href="#185">185</a> System.setProperty( <span class="jxr_string">"catalina.home"</span>, extractDirectoryFile.getAbsolutePath() );
+<a class="jxr_linenumber" name="138" href="#138">138</a> debugMessage( <span class="jxr_string">"use extractDirectory:"</span> + extractDirectoryFile.getPath() );
+<a class="jxr_linenumber" name="139" href="#139">139</a>
+<a class="jxr_linenumber" name="140" href="#140">140</a> <strong class="jxr_keyword">boolean</strong> archiveTimestampChanged = false;
+<a class="jxr_linenumber" name="141" href="#141">141</a>
+<a class="jxr_linenumber" name="142" href="#142">142</a> <em class="jxr_comment">// compare timestamp stored during previous run if exists</em>
+<a class="jxr_linenumber" name="143" href="#143">143</a> File timestampFile = <strong class="jxr_keyword">new</strong> File( extractDirectoryFile, <span class="jxr_string">".tomcat_executable_archive.timestamp"</span> );
+<a class="jxr_linenumber" name="144" href="#144">144</a>
+<a class="jxr_linenumber" name="145" href="#145">145</a> Properties timestampProps = loadProperties( timestampFile );
+<a class="jxr_linenumber" name="146" href="#146">146</a>
+<a class="jxr_linenumber" name="147" href="#147">147</a> <strong class="jxr_keyword">if</strong> ( timestampFile.exists() )
+<a class="jxr_linenumber" name="148" href="#148">148</a> {
+<a class="jxr_linenumber" name="149" href="#149">149</a> String timestampValue = timestampProps.getProperty( Tomcat7Runner.ARCHIVE_GENERATION_TIMESTAMP_KEY );
+<a class="jxr_linenumber" name="150" href="#150">150</a> <strong class="jxr_keyword">if</strong> ( timestampValue != <strong class="jxr_keyword">null</strong> )
+<a class="jxr_linenumber" name="151" href="#151">151</a> {
+<a class="jxr_linenumber" name="152" href="#152">152</a> <strong class="jxr_keyword">long</strong> timestamp = Long.parseLong( timestampValue );
+<a class="jxr_linenumber" name="153" href="#153">153</a> archiveTimestampChanged =
+<a class="jxr_linenumber" name="154" href="#154">154</a> Long.parseLong( runtimeProperties.getProperty( Tomcat7Runner.ARCHIVE_GENERATION_TIMESTAMP_KEY ) )
+<a class="jxr_linenumber" name="155" href="#155">155</a> > timestamp;
+<a class="jxr_linenumber" name="156" href="#156">156</a>
+<a class="jxr_linenumber" name="157" href="#157">157</a> debugMessage( <span class="jxr_string">"read timestamp from file "</span> + timestampValue + <span class="jxr_string">", archiveTimestampChanged: "</span>
+<a class="jxr_linenumber" name="158" href="#158">158</a> + archiveTimestampChanged );
+<a class="jxr_linenumber" name="159" href="#159">159</a> }
+<a class="jxr_linenumber" name="160" href="#160">160</a>
+<a class="jxr_linenumber" name="161" href="#161">161</a> }
+<a class="jxr_linenumber" name="162" href="#162">162</a>
+<a class="jxr_linenumber" name="163" href="#163">163</a> codeSourceContextPath = runtimeProperties.getProperty( CODE_SOURCE_CONTEXT_PATH );
+<a class="jxr_linenumber" name="164" href="#164">164</a> <strong class="jxr_keyword">if</strong> ( codeSourceContextPath != <strong class="jxr_keyword">null</strong> && !codeSourceContextPath.isEmpty() )
+<a class="jxr_linenumber" name="165" href="#165">165</a> {
+<a class="jxr_linenumber" name="166" href="#166">166</a> codeSourceWar = AccessController.doPrivileged( <strong class="jxr_keyword">new</strong> PrivilegedAction<File>()
+<a class="jxr_linenumber" name="167" href="#167">167</a> {
+<a class="jxr_linenumber" name="168" href="#168">168</a> <strong class="jxr_keyword">public</strong> File run()
+<a class="jxr_linenumber" name="169" href="#169">169</a> {
+<a class="jxr_linenumber" name="170" href="#170">170</a> <strong class="jxr_keyword">try</strong>
+<a class="jxr_linenumber" name="171" href="#171">171</a> {
+<a class="jxr_linenumber" name="172" href="#172">172</a> File src =
+<a class="jxr_linenumber" name="173" href="#173">173</a> <strong class="jxr_keyword">new</strong> File( Tomcat7Runner.<strong class="jxr_keyword">class</strong>.getProtectionDomain().getCodeSource().getLocation().toURI() );
+<a class="jxr_linenumber" name="174" href="#174">174</a> <strong class="jxr_keyword">if</strong> ( src.getName().endsWith( <span class="jxr_string">".war"</span> ) )
+<a class="jxr_linenumber" name="175" href="#175">175</a> {
+<a class="jxr_linenumber" name="176" href="#176">176</a> <strong class="jxr_keyword">return</strong> src;
+<a class="jxr_linenumber" name="177" href="#177">177</a> }
+<a class="jxr_linenumber" name="178" href="#178">178</a> <strong class="jxr_keyword">else</strong>
+<a class="jxr_linenumber" name="179" href="#179">179</a> {
+<a class="jxr_linenumber" name="180" href="#180">180</a> debugMessage( <span class="jxr_string">"ERROR: Code source is not a war file, ignoring."</span> );
+<a class="jxr_linenumber" name="181" href="#181">181</a> }
+<a class="jxr_linenumber" name="182" href="#182">182</a> }
+<a class="jxr_linenumber" name="183" href="#183">183</a> <strong class="jxr_keyword">catch</strong> ( URISyntaxException e )
+<a class="jxr_linenumber" name="184" href="#184">184</a> {
+<a class="jxr_linenumber" name="185" href="#185">185</a> debugMessage( <span class="jxr_string">"ERROR: Could not find code source. "</span> + e.getMessage() );
<a class="jxr_linenumber" name="186" href="#186">186</a>
-<a class="jxr_linenumber" name="187" href="#187">187</a> <em class="jxr_comment">// start with a server.xml</em>
-<a class="jxr_linenumber" name="188" href="#188">188</a> <strong class="jxr_keyword">if</strong> ( serverXmlPath != <strong class="jxr_keyword">null</strong> || useServerXml() )
-<a class="jxr_linenumber" name="189" href="#189">189</a> {
-<a class="jxr_linenumber" name="190" href="#190">190</a> container = <strong class="jxr_keyword">new</strong> Catalina();
-<a class="jxr_linenumber" name="191" href="#191">191</a> container.setUseNaming( <strong class="jxr_keyword">this</strong>.enableNaming() );
-<a class="jxr_linenumber" name="192" href="#192">192</a> <strong class="jxr_keyword">if</strong> ( serverXmlPath != <strong class="jxr_keyword">null</strong> && <strong class="jxr_keyword">new</strong> File( serverXmlPath ).exists() )
-<a class="jxr_linenumber" name="193" href="#193">193</a> {
-<a class="jxr_linenumber" name="194" href="#194">194</a> container.setConfig( serverXmlPath );
-<a class="jxr_linenumber" name="195" href="#195">195</a> }
-<a class="jxr_linenumber" name="196" href="#196">196</a> <strong class="jxr_keyword">else</strong>
-<a class="jxr_linenumber" name="197" href="#197">197</a> {
-<a class="jxr_linenumber" name="198" href="#198">198</a> container.setConfig( <strong class="jxr_keyword">new</strong> File( extractDirectory, <span class="jxr_string">"conf/server.xml"</span> ).getAbsolutePath() );
-<a class="jxr_linenumber" name="199" href="#199">199</a> }
-<a class="jxr_linenumber" name="200" href="#200">200</a> container.start();
-<a class="jxr_linenumber" name="201" href="#201">201</a> }
-<a class="jxr_linenumber" name="202" href="#202">202</a> <strong class="jxr_keyword">else</strong>
-<a class="jxr_linenumber" name="203" href="#203">203</a> {
-<a class="jxr_linenumber" name="204" href="#204">204</a> tomcat = <strong class="jxr_keyword">new</strong> Tomcat()
-<a class="jxr_linenumber" name="205" href="#205">205</a> {
-<a class="jxr_linenumber" name="206" href="#206">206</a> <strong class="jxr_keyword">public</strong> Context addWebapp( Host host, String url, String name, String path )
-<a class="jxr_linenumber" name="207" href="#207">207</a> {
-<a class="jxr_linenumber" name="208" href="#208">208</a>
-<a class="jxr_linenumber" name="209" href="#209">209</a> Context ctx = <strong class="jxr_keyword">new</strong> StandardContext();
-<a class="jxr_linenumber" name="210" href="#210">210</a> ctx.setName( name );
-<a class="jxr_linenumber" name="211" href="#211">211</a> ctx.setPath( url );
-<a class="jxr_linenumber" name="212" href="#212">212</a> ctx.setDocBase( path );
-<a class="jxr_linenumber" name="213" href="#213">213</a>
-<a class="jxr_linenumber" name="214" href="#214">214</a> ContextConfig ctxCfg = <strong class="jxr_keyword">new</strong> ContextConfig();
-<a class="jxr_linenumber" name="215" href="#215">215</a> ctx.addLifecycleListener( ctxCfg );
-<a class="jxr_linenumber" name="216" href="#216">216</a>
-<a class="jxr_linenumber" name="217" href="#217">217</a> ctxCfg.setDefaultWebXml( <strong class="jxr_keyword">new</strong> File( extractDirectory, <span class="jxr_string">"conf/web.xml"</span> ).getAbsolutePath() );
-<a class="jxr_linenumber" name="218" href="#218">218</a>
-<a class="jxr_linenumber" name="219" href="#219">219</a> <strong class="jxr_keyword">if</strong> ( host == <strong class="jxr_keyword">null</strong> )
-<a class="jxr_linenumber" name="220" href="#220">220</a> {
-<a class="jxr_linenumber" name="221" href="#221">221</a> getHost().addChild( ctx );
-<a class="jxr_linenumber" name="222" href="#222">222</a> }
-<a class="jxr_linenumber" name="223" href="#223">223</a> <strong class="jxr_keyword">else</strong>
-<a class="jxr_linenumber" name="224" href="#224">224</a> {
-<a class="jxr_linenumber" name="225" href="#225">225</a> host.addChild( ctx );
-<a class="jxr_linenumber" name="226" href="#226">226</a> }
-<a class="jxr_linenumber" name="227" href="#227">227</a>
-<a class="jxr_linenumber" name="228" href="#228">228</a> <strong class="jxr_keyword">return</strong> ctx;
-<a class="jxr_linenumber" name="229" href="#229">229</a> }
-<a class="jxr_linenumber" name="230" href="#230">230</a> };
-<a class="jxr_linenumber" name="231" href="#231">231</a>
-<a class="jxr_linenumber" name="232" href="#232">232</a> <strong class="jxr_keyword">if</strong> ( <strong class="jxr_keyword">this</strong>.enableNaming() )
-<a class="jxr_linenumber" name="233" href="#233">233</a> {
-<a class="jxr_linenumber" name="234" href="#234">234</a> System.setProperty( <span class="jxr_string">"catalina.useNaming"</span>, <span class="jxr_string">"true"</span> );
-<a class="jxr_linenumber" name="235" href="#235">235</a> tomcat.enableNaming();
-<a class="jxr_linenumber" name="236" href="#236">236</a> }
-<a class="jxr_linenumber" name="237" href="#237">237</a>
-<a class="jxr_linenumber" name="238" href="#238">238</a> tomcat.getHost().setAppBase( <strong class="jxr_keyword">new</strong> File( extractDirectory, <span class="jxr_string">"webapps"</span> ).getAbsolutePath() );
-<a class="jxr_linenumber" name="239" href="#239">239</a>
-<a class="jxr_linenumber" name="240" href="#240">240</a> String connectorHttpProtocol = runtimeProperties.getProperty( HTTP_PROTOCOL_KEY );
-<a class="jxr_linenumber" name="241" href="#241">241</a>
-<a class="jxr_linenumber" name="242" href="#242">242</a> <strong class="jxr_keyword">if</strong> ( httpProtocol != <strong class="jxr_keyword">null</strong> && httpProtocol.trim().length() > 0 )
-<a class="jxr_linenumber" name="243" href="#243">243</a> {
-<a class="jxr_linenumber" name="244" href="#244">244</a> connectorHttpProtocol = httpProtocol;
-<a class="jxr_linenumber" name="245" href="#245">245</a> }
-<a class="jxr_linenumber" name="246" href="#246">246</a>
-<a class="jxr_linenumber" name="247" href="#247">247</a> debugMessage( <span class="jxr_string">"use connectorHttpProtocol:"</span> + connectorHttpProtocol );
-<a class="jxr_linenumber" name="248" href="#248">248</a>
-<a class="jxr_linenumber" name="249" href="#249">249</a> <strong class="jxr_keyword">if</strong> ( httpPort > 0 )
-<a class="jxr_linenumber" name="250" href="#250">250</a> {
-<a class="jxr_linenumber" name="251" href="#251">251</a> Connector connector = <strong class="jxr_keyword">new</strong> Connector( connectorHttpProtocol );
-<a class="jxr_linenumber" name="252" href="#252">252</a> connector.setPort( httpPort );
-<a class="jxr_linenumber" name="253" href="#253">253</a>
-<a class="jxr_linenumber" name="254" href="#254">254</a> <strong class="jxr_keyword">if</strong> ( httpsPort > 0 )
-<a class="jxr_linenumber" name="255" href="#255">255</a> {
-<a class="jxr_linenumber" name="256" href="#256">256</a> connector.setRedirectPort( httpsPort );
-<a class="jxr_linenumber" name="257" href="#257">257</a> }
-<a class="jxr_linenumber" name="258" href="#258">258</a> connector.setURIEncoding( uriEncoding );
-<a class="jxr_linenumber" name="259" href="#259">259</a>
-<a class="jxr_linenumber" name="260" href="#260">260</a> tomcat.getService().addConnector( connector );
-<a class="jxr_linenumber" name="261" href="#261">261</a>
-<a class="jxr_linenumber" name="262" href="#262">262</a> tomcat.setConnector( connector );
-<a class="jxr_linenumber" name="263" href="#263">263</a> }
-<a class="jxr_linenumber" name="264" href="#264">264</a>
-<a class="jxr_linenumber" name="265" href="#265">265</a> <em class="jxr_comment">// add a default acces log valve</em>
-<a class="jxr_linenumber" name="266" href="#266">266</a> AccessLogValve alv = <strong class="jxr_keyword">new</strong> AccessLogValve();
-<a class="jxr_linenumber" name="267" href="#267">267</a> alv.setDirectory( <strong class="jxr_keyword">new</strong> File( extractDirectory, <span class="jxr_string">"logs"</span> ).getAbsolutePath() );
-<a class="jxr_linenumber" name="268" href="#268">268</a> alv.setPattern( runtimeProperties.getProperty( Tomcat7Runner.ACCESS_LOG_VALVE_FORMAT_KEY ) );
-<a class="jxr_linenumber" name="269" href="#269">269</a> tomcat.getHost().getPipeline().addValve( alv );
+<a class="jxr_linenumber" name="187" href="#187">187</a> }
+<a class="jxr_linenumber" name="188" href="#188">188</a> <strong class="jxr_keyword">return</strong> <strong class="jxr_keyword">null</strong>;
+<a class="jxr_linenumber" name="189" href="#189">189</a> }
+<a class="jxr_linenumber" name="190" href="#190">190</a> } );
+<a class="jxr_linenumber" name="191" href="#191">191</a> }
+<a class="jxr_linenumber" name="192" href="#192">192</a>
+<a class="jxr_linenumber" name="193" href="#193">193</a> <em class="jxr_comment">// do we have to extract content</em>
+<a class="jxr_linenumber" name="194" href="#194">194</a> {
+<a class="jxr_linenumber" name="195" href="#195">195</a> <strong class="jxr_keyword">if</strong> ( !extractDirectoryFile.exists() || resetExtract || archiveTimestampChanged )
+<a class="jxr_linenumber" name="196" href="#196">196</a> {
+<a class="jxr_linenumber" name="197" href="#197">197</a> extract();
+<a class="jxr_linenumber" name="198" href="#198">198</a> <em class="jxr_comment">//if archiveTimestampChanged or timestamp file not exists store the last timestamp from the archive</em>
+<a class="jxr_linenumber" name="199" href="#199">199</a> <strong class="jxr_keyword">if</strong> ( archiveTimestampChanged || !timestampFile.exists() )
+<a class="jxr_linenumber" name="200" href="#200">200</a> {
+<a class="jxr_linenumber" name="201" href="#201">201</a> timestampProps.put( Tomcat7Runner.ARCHIVE_GENERATION_TIMESTAMP_KEY, runtimeProperties.getProperty(
+<a class="jxr_linenumber" name="202" href="#202">202</a> Tomcat7Runner.ARCHIVE_GENERATION_TIMESTAMP_KEY ) );
+<a class="jxr_linenumber" name="203" href="#203">203</a> saveProperties( timestampProps, timestampFile );
+<a class="jxr_linenumber" name="204" href="#204">204</a> }
+<a class="jxr_linenumber" name="205" href="#205">205</a> }
+<a class="jxr_linenumber" name="206" href="#206">206</a> <strong class="jxr_keyword">else</strong>
+<a class="jxr_linenumber" name="207" href="#207">207</a> {
+<a class="jxr_linenumber" name="208" href="#208">208</a> String wars = runtimeProperties.getProperty( WARS_KEY );
+<a class="jxr_linenumber" name="209" href="#209">209</a> populateWebAppWarPerContext( wars );
+<a class="jxr_linenumber" name="210" href="#210">210</a> }
+<a class="jxr_linenumber" name="211" href="#211">211</a> }
+<a class="jxr_linenumber" name="212" href="#212">212</a>
+<a class="jxr_linenumber" name="213" href="#213">213</a> <em class="jxr_comment">// create tomcat various paths</em>
+<a class="jxr_linenumber" name="214" href="#214">214</a> <strong class="jxr_keyword">new</strong> File( extractDirectory, <span class="jxr_string">"conf"</span> ).mkdirs();
+<a class="jxr_linenumber" name="215" href="#215">215</a> <strong class="jxr_keyword">new</strong> File( extractDirectory, <span class="jxr_string">"logs"</span> ).mkdirs();
+<a class="jxr_linenumber" name="216" href="#216">216</a> <strong class="jxr_keyword">new</strong> File( extractDirectory, <span class="jxr_string">"webapps"</span> ).mkdirs();
+<a class="jxr_linenumber" name="217" href="#217">217</a> <strong class="jxr_keyword">new</strong> File( extractDirectory, <span class="jxr_string">"work"</span> ).mkdirs();
+<a class="jxr_linenumber" name="218" href="#218">218</a> File tmpDir = <strong class="jxr_keyword">new</strong> File( extractDirectory, <span class="jxr_string">"temp"</span> );
+<a class="jxr_linenumber" name="219" href="#219">219</a> tmpDir.mkdirs();
+<a class="jxr_linenumber" name="220" href="#220">220</a>
+<a class="jxr_linenumber" name="221" href="#221">221</a> System.setProperty( <span class="jxr_string">"java.io.tmpdir"</span>, tmpDir.getAbsolutePath() );
+<a class="jxr_linenumber" name="222" href="#222">222</a>
+<a class="jxr_linenumber" name="223" href="#223">223</a> System.setProperty( <span class="jxr_string">"catalina.base"</span>, extractDirectoryFile.getAbsolutePath() );
+<a class="jxr_linenumber" name="224" href="#224">224</a> System.setProperty( <span class="jxr_string">"catalina.home"</span>, extractDirectoryFile.getAbsolutePath() );
+<a class="jxr_linenumber" name="225" href="#225">225</a>
+<a class="jxr_linenumber" name="226" href="#226">226</a> <em class="jxr_comment">// start with a server.xml</em>
+<a class="jxr_linenumber" name="227" href="#227">227</a> <strong class="jxr_keyword">if</strong> ( serverXmlPath != <strong class="jxr_keyword">null</strong> || useServerXml() )
+<a class="jxr_linenumber" name="228" href="#228">228</a> {
+<a class="jxr_linenumber" name="229" href="#229">229</a> container = <strong class="jxr_keyword">new</strong> Catalina();
+<a class="jxr_linenumber" name="230" href="#230">230</a> container.setUseNaming( <strong class="jxr_keyword">this</strong>.enableNaming() );
+<a class="jxr_linenumber" name="231" href="#231">231</a> <strong class="jxr_keyword">if</strong> ( serverXmlPath != <strong class="jxr_keyword">null</strong> && <strong class="jxr_keyword">new</strong> File( serverXmlPath ).exists() )
+<a class="jxr_linenumber" name="232" href="#232">232</a> {
+<a class="jxr_linenumber" name="233" href="#233">233</a> container.setConfig( serverXmlPath );
+<a class="jxr_linenumber" name="234" href="#234">234</a> }
+<a class="jxr_linenumber" name="235" href="#235">235</a> <strong class="jxr_keyword">else</strong>
+<a class="jxr_linenumber" name="236" href="#236">236</a> {
+<a class="jxr_linenumber" name="237" href="#237">237</a> container.setConfig( <strong class="jxr_keyword">new</strong> File( extractDirectory, <span class="jxr_string">"conf/server.xml"</span> ).getAbsolutePath() );
+<a class="jxr_linenumber" name="238" href="#238">238</a> }
+<a class="jxr_linenumber" name="239" href="#239">239</a> container.start();
+<a class="jxr_linenumber" name="240" href="#240">240</a> }
+<a class="jxr_linenumber" name="241" href="#241">241</a> <strong class="jxr_keyword">else</strong>
+<a class="jxr_linenumber" name="242" href="#242">242</a> {
+<a class="jxr_linenumber" name="243" href="#243">243</a> tomcat = <strong class="jxr_keyword">new</strong> Tomcat()
+<a class="jxr_linenumber" name="244" href="#244">244</a> {
+<a class="jxr_linenumber" name="245" href="#245">245</a> <strong class="jxr_keyword">public</strong> Context addWebapp( Host host, String url, String name, String path )
+<a class="jxr_linenumber" name="246" href="#246">246</a> {
+<a class="jxr_linenumber" name="247" href="#247">247</a>
+<a class="jxr_linenumber" name="248" href="#248">248</a> Context ctx = <strong class="jxr_keyword">new</strong> StandardContext();
+<a class="jxr_linenumber" name="249" href="#249">249</a> ctx.setName( name );
+<a class="jxr_linenumber" name="250" href="#250">250</a> ctx.setPath( url );
+<a class="jxr_linenumber" name="251" href="#251">251</a> ctx.setDocBase( path );
+<a class="jxr_linenumber" name="252" href="#252">252</a>
+<a class="jxr_linenumber" name="253" href="#253">253</a> ContextConfig ctxCfg = <strong class="jxr_keyword">new</strong> ContextConfig();
+<a class="jxr_linenumber" name="254" href="#254">254</a> ctx.addLifecycleListener( ctxCfg );
+<a class="jxr_linenumber" name="255" href="#255">255</a>
+<a class="jxr_linenumber" name="256" href="#256">256</a> ctxCfg.setDefaultWebXml( <strong class="jxr_keyword">new</strong> File( extractDirectory, <span class="jxr_string">"conf/web.xml"</span> ).getAbsolutePath() );
+<a class="jxr_linenumber" name="257" href="#257">257</a>
+<a class="jxr_linenumber" name="258" href="#258">258</a> <strong class="jxr_keyword">if</strong> ( host == <strong class="jxr_keyword">null</strong> )
+<a class="jxr_linenumber" name="259" href="#259">259</a> {
+<a class="jxr_linenumber" name="260" href="#260">260</a> getHost().addChild( ctx );
+<a class="jxr_linenumber" name="261" href="#261">261</a> }
+<a class="jxr_linenumber" name="262" href="#262">262</a> <strong class="jxr_keyword">else</strong>
+<a class="jxr_linenumber" name="263" href="#263">263</a> {
+<a class="jxr_linenumber" name="264" href="#264">264</a> host.addChild( ctx );
+<a class="jxr_linenumber" name="265" href="#265">265</a> }
+<a class="jxr_linenumber" name="266" href="#266">266</a>
+<a class="jxr_linenumber" name="267" href="#267">267</a> <strong class="jxr_keyword">return</strong> ctx;
+<a class="jxr_linenumber" name="268" href="#268">268</a> }
+<a class="jxr_linenumber" name="269" href="#269">269</a> };
<a class="jxr_linenumber" name="270" href="#270">270</a>
-<a class="jxr_linenumber" name="271" href="#271">271</a> <em class="jxr_comment">// create https connector</em>
-<a class="jxr_linenumber" name="272" href="#272">272</a> <strong class="jxr_keyword">if</strong> ( httpsPort > 0 )
-<a class="jxr_linenumber" name="273" href="#273">273</a> {
-<a class="jxr_linenumber" name="274" href="#274">274</a> Connector httpsConnector = <strong class="jxr_keyword">new</strong> Connector( connectorHttpProtocol );
-<a class="jxr_linenumber" name="275" href="#275">275</a> httpsConnector.setPort( httpsPort );
-<a class="jxr_linenumber" name="276" href="#276">276</a> httpsConnector.setSecure( <strong class="jxr_keyword">true</strong> );
-<a class="jxr_linenumber" name="277" href="#277">277</a> httpsConnector.setProperty( <span class="jxr_string">"SSLEnabled"</span>, <span class="jxr_string">"true"</span> );
-<a class="jxr_linenumber" name="278" href="#278">278</a> httpsConnector.setProperty( <span class="jxr_string">"sslProtocol"</span>, <span class="jxr_string">"TLS"</span> );
-<a class="jxr_linenumber" name="279" href="#279">279</a> httpsConnector.setURIEncoding( uriEncoding );
+<a class="jxr_linenumber" name="271" href="#271">271</a> <strong class="jxr_keyword">if</strong> ( <strong class="jxr_keyword">this</strong>.enableNaming() )
+<a class="jxr_linenumber" name="272" href="#272">272</a> {
+<a class="jxr_linenumber" name="273" href="#273">273</a> System.setProperty( <span class="jxr_string">"catalina.useNaming"</span>, <span class="jxr_string">"true"</span> );
+<a class="jxr_linenumber" name="274" href="#274">274</a> tomcat.enableNaming();
+<a class="jxr_linenumber" name="275" href="#275">275</a> }
+<a class="jxr_linenumber" name="276" href="#276">276</a>
+<a class="jxr_linenumber" name="277" href="#277">277</a> tomcat.getHost().setAppBase( <strong class="jxr_keyword">new</strong> File( extractDirectory, <span class="jxr_string">"webapps"</span> ).getAbsolutePath() );
+<a class="jxr_linenumber" name="278" href="#278">278</a>
+<a class="jxr_linenumber" name="279" href="#279">279</a> String connectorHttpProtocol = runtimeProperties.getProperty( HTTP_PROTOCOL_KEY );
<a class="jxr_linenumber" name="280" href="#280">280</a>
-<a class="jxr_linenumber" name="281" href="#281">281</a> String keystoreFile = System.getProperty( <span class="jxr_string">"javax.net.ssl.keyStore"</span> );
-<a class="jxr_linenumber" name="282" href="#282">282</a> String keystorePass = System.getProperty( <span class="jxr_string">"javax.net.ssl.keyStorePassword"</span> );
-<a class="jxr_linenumber" name="283" href="#283">283</a> String keystoreType = System.getProperty( <span class="jxr_string">"javax.net.ssl.keyStoreType"</span>, <span class="jxr_string">"jks"</span> );
-<a class="jxr_linenumber" name="284" href="#284">284</a>
-<a class="jxr_linenumber" name="285" href="#285">285</a> <strong class="jxr_keyword">if</strong> ( keystoreFile != <strong class="jxr_keyword">null</strong> )
-<a class="jxr_linenumber" name="286" href="#286">286</a> {
-<a class="jxr_linenumber" name="287" href="#287">287</a> httpsConnector.setAttribute( <span class="jxr_string">"keystoreFile"</span>, keystoreFile );
-<a class="jxr_linenumber" name="288" href="#288">288</a> }
-<a class="jxr_linenumber" name="289" href="#289">289</a> <strong class="jxr_keyword">if</strong> ( keystorePass != <strong class="jxr_keyword">null</strong> )
-<a class="jxr_linenumber" name="290" href="#290">290</a> {
-<a class="jxr_linenumber" name="291" href="#291">291</a> httpsConnector.setAttribute( <span class="jxr_string">"keystorePass"</span>, keystorePass );
-<a class="jxr_linenumber" name="292" href="#292">292</a> }
-<a class="jxr_linenumber" name="293" href="#293">293</a> httpsConnector.setAttribute( <span class="jxr_string">"keystoreType"</span>, keystoreType );
-<a class="jxr_linenumber" name="294" href="#294">294</a>
-<a class="jxr_linenumber" name="295" href="#295">295</a> String truststoreFile = System.getProperty( <span class="jxr_string">"javax.net.ssl.trustStore"</span> );
-<a class="jxr_linenumber" name="296" href="#296">296</a> String truststorePass = System.getProperty( <span class="jxr_string">"javax.net.ssl.trustStorePassword"</span> );
-<a class="jxr_linenumber" name="297" href="#297">297</a> String truststoreType = System.getProperty( <span class="jxr_string">"javax.net.ssl.trustStoreType"</span>, <span class="jxr_string">"jks"</span> );
-<a class="jxr_linenumber" name="298" href="#298">298</a> <strong class="jxr_keyword">if</strong> ( truststoreFile != <strong class="jxr_keyword">null</strong> )
-<a class="jxr_linenumber" name="299" href="#299">299</a> {
-<a class="jxr_linenumber" name="300" href="#300">300</a> httpsConnector.setAttribute( <span class="jxr_string">"truststoreFile"</span>, truststoreFile );
-<a class="jxr_linenumber" name="301" href="#301">301</a> }
-<a class="jxr_linenumber" name="302" href="#302">302</a> <strong class="jxr_keyword">if</strong> ( truststorePass != <strong class="jxr_keyword">null</strong> )
-<a class="jxr_linenumber" name="303" href="#303">303</a> {
-<a class="jxr_linenumber" name="304" href="#304">304</a> httpsConnector.setAttribute( <span class="jxr_string">"truststorePass"</span>, truststorePass );
-<a class="jxr_linenumber" name="305" href="#305">305</a> }
-<a class="jxr_linenumber" name="306" href="#306">306</a> httpsConnector.setAttribute( <span class="jxr_string">"truststoreType"</span>, truststoreType );
-<a class="jxr_linenumber" name="307" href="#307">307</a>
-<a class="jxr_linenumber" name="308" href="#308">308</a> httpsConnector.setAttribute( <span class="jxr_string">"clientAuth"</span>, clientAuth );
-<a class="jxr_linenumber" name="309" href="#309">309</a> httpsConnector.setAttribute( <span class="jxr_string">"keyAlias"</span>, keyAlias );
-<a class="jxr_linenumber" name="310" href="#310">310</a>
-<a class="jxr_linenumber" name="311" href="#311">311</a> tomcat.getService().addConnector( httpsConnector );
-<a class="jxr_linenumber" name="312" href="#312">312</a>
-<a class="jxr_linenumber" name="313" href="#313">313</a> <strong class="jxr_keyword">if</strong> ( httpPort <= 0 )
-<a class="jxr_linenumber" name="314" href="#314">314</a> {
-<a class="jxr_linenumber" name="315" href="#315">315</a> tomcat.setConnector( httpsConnector );
-<a class="jxr_linenumber" name="316" href="#316">316</a> }
-<a class="jxr_linenumber" name="317" href="#317">317</a> }
-<a class="jxr_linenumber" name="318" href="#318">318</a>
-<a class="jxr_linenumber" name="319" href="#319">319</a> <em class="jxr_comment">// create ajp connector</em>
-<a class="jxr_linenumber" name="320" href="#320">320</a> <strong class="jxr_keyword">if</strong> ( ajpPort > 0 )
-<a class="jxr_linenumber" name="321" href="#321">321</a> {
-<a class="jxr_linenumber" name="322" href="#322">322</a> Connector ajpConnector = <strong class="jxr_keyword">new</strong> Connector( <span class="jxr_string">"org.apache.coyote.ajp.AjpProtocol"</span> );
-<a class="jxr_linenumber" name="323" href="#323">323</a> ajpConnector.setPort( ajpPort );
-<a class="jxr_linenumber" name="324" href="#324">324</a> ajpConnector.setURIEncoding( uriEncoding );
-<a class="jxr_linenumber" name="325" href="#325">325</a> tomcat.getService().addConnector( ajpConnector );
-<a class="jxr_linenumber" name="326" href="#326">326</a> }
-<a class="jxr_linenumber" name="327" href="#327">327</a>
-<a class="jxr_linenumber" name="328" href="#328">328</a> <em class="jxr_comment">// add webapps</em>
-<a class="jxr_linenumber" name="329" href="#329">329</a> <strong class="jxr_keyword">for</strong> ( Map.Entry<String, String> entry : <strong class="jxr_keyword">this</strong>.webappWarPerContext.entrySet() )
-<a class="jxr_linenumber" name="330" href="#330">330</a> {
-<a class="jxr_linenumber" name="331" href="#331">331</a> String baseDir = <strong class="jxr_keyword">null</strong>;
-<a class="jxr_linenumber" name="332" href="#332">332</a> Context context = <strong class="jxr_keyword">null</strong>;
-<a class="jxr_linenumber" name="333" href="#333">333</a> <strong class="jxr_keyword">if</strong> ( entry.getKey().equals( <span class="jxr_string">"/"</span> ) )
-<a class="jxr_linenumber" name="334" href="#334">334</a> {
-<a class="jxr_linenumber" name="335" href="#335">335</a> baseDir = <strong class="jxr_keyword">new</strong> File( extractDirectory, <span class="jxr_string">"webapps/ROOT.war"</span> ).getAbsolutePath();
-<a class="jxr_linenumber" name="336" href="#336">336</a> context = tomcat.addWebapp( <span class="jxr_string">""</span>, baseDir );
-<a class="jxr_linenumber" name="337" href="#337">337</a> }
-<a class="jxr_linenumber" name="338" href="#338">338</a> <strong class="jxr_keyword">else</strong>
-<a class="jxr_linenumber" name="339" href="#339">339</a> {
-<a class="jxr_linenumber" name="340" href="#340">340</a> baseDir = <strong class="jxr_keyword">new</strong> File( extractDirectory, <span class="jxr_string">"webapps/"</span> + entry.getValue() ).getAbsolutePath();
-<a class="jxr_linenumber" name="341" href="#341">341</a> context = tomcat.addWebapp( entry.getKey(), baseDir );
-<a class="jxr_linenumber" name="342" href="#342">342</a> }
-<a class="jxr_linenumber" name="343" href="#343">343</a>
-<a class="jxr_linenumber" name="344" href="#344">344</a> URL contextFileUrl = getContextXml( baseDir );
-<a class="jxr_linenumber" name="345" href="#345">345</a> <strong class="jxr_keyword">if</strong> ( contextFileUrl != <strong class="jxr_keyword">null</strong> )
-<a class="jxr_linenumber" name="346" href="#346">346</a> {
-<a class="jxr_linenumber" name="347" href="#347">347</a> context.setConfigFile( contextFileUrl );
-<a class="jxr_linenumber" name="348" href="#348">348</a> }
-<a class="jxr_linenumber" name="349" href="#349">349</a> }
-<a class="jxr_linenumber" name="350" href="#350">350</a>
-<a class="jxr_linenumber" name="351" href="#351">351</a> tomcat.start();
-<a class="jxr_linenumber" name="352" href="#352">352</a> }
-<a class="jxr_linenumber" name="353" href="#353">353</a>
-<a class="jxr_linenumber" name="354" href="#354">354</a> waitIndefinitely();
-<a class="jxr_linenumber" name="355" href="#355">355</a>
-<a class="jxr_linenumber" name="356" href="#356">356</a> }
+<a class="jxr_linenumber" name="281" href="#281">281</a> <strong class="jxr_keyword">if</strong> ( httpProtocol != <strong class="jxr_keyword">null</strong> && httpProtocol.trim().length() > 0 )
+<a class="jxr_linenumber" name="282" href="#282">282</a> {
+<a class="jxr_linenumber" name="283" href="#283">283</a> connectorHttpProtocol = httpProtocol;
+<a class="jxr_linenumber" name="284" href="#284">284</a> }
+<a class="jxr_linenumber" name="285" href="#285">285</a>
+<a class="jxr_linenumber" name="286" href="#286">286</a> debugMessage( <span class="jxr_string">"use connectorHttpProtocol:"</span> + connectorHttpProtocol );
+<a class="jxr_linenumber" name="287" href="#287">287</a>
+<a class="jxr_linenumber" name="288" href="#288">288</a> <strong class="jxr_keyword">if</strong> ( httpPort > 0 )
+<a class="jxr_linenumber" name="289" href="#289">289</a> {
+<a class="jxr_linenumber" name="290" href="#290">290</a> Connector connector = <strong class="jxr_keyword">new</strong> Connector( connectorHttpProtocol );
+<a class="jxr_linenumber" name="291" href="#291">291</a> connector.setPort( httpPort );
+<a class="jxr_linenumber" name="292" href="#292">292</a>
+<a class="jxr_linenumber" name="293" href="#293">293</a> <strong class="jxr_keyword">if</strong> ( httpsPort > 0 )
+<a class="jxr_linenumber" name="294" href="#294">294</a> {
+<a class="jxr_linenumber" name="295" href="#295">295</a> connector.setRedirectPort( httpsPort );
+<a class="jxr_linenumber" name="296" href="#296">296</a> }
+<a class="jxr_linenumber" name="297" href="#297">297</a> connector.setURIEncoding( uriEncoding );
+<a class="jxr_linenumber" name="298" href="#298">298</a>
+<a class="jxr_linenumber" name="299" href="#299">299</a> tomcat.getService().addConnector( connector );
+<a class="jxr_linenumber" name="300" href="#300">300</a>
+<a class="jxr_linenumber" name="301" href="#301">301</a> tomcat.setConnector( connector );
+<a class="jxr_linenumber" name="302" href="#302">302</a> }
+<a class="jxr_linenumber" name="303" href="#303">303</a>
+<a class="jxr_linenumber" name="304" href="#304">304</a> <em class="jxr_comment">// add a default acces log valve</em>
+<a class="jxr_linenumber" name="305" href="#305">305</a> AccessLogValve alv = <strong class="jxr_keyword">new</strong> AccessLogValve();
+<a class="jxr_linenumber" name="306" href="#306">306</a> alv.setDirectory( <strong class="jxr_keyword">new</strong> File( extractDirectory, <span class="jxr_string">"logs"</span> ).getAbsolutePath() );
+<a class="jxr_linenumber" name="307" href="#307">307</a> alv.setPattern( runtimeProperties.getProperty( Tomcat7Runner.ACCESS_LOG_VALVE_FORMAT_KEY ) );
+<a class="jxr_linenumber" name="308" href="#308">308</a> tomcat.getHost().getPipeline().addValve( alv );
+<a class="jxr_linenumber" name="309" href="#309">309</a>
+<a class="jxr_linenumber" name="310" href="#310">310</a> <em class="jxr_comment">// create https connector</em>
+<a class="jxr_linenumber" name="311" href="#311">311</a> <strong class="jxr_keyword">if</strong> ( httpsPort > 0 )
+<a class="jxr_linenumber" name="312" href="#312">312</a> {
+<a class="jxr_linenumber" name="313" href="#313">313</a> Connector httpsConnector = <strong class="jxr_keyword">new</strong> Connector( connectorHttpProtocol );
+<a class="jxr_linenumber" name="314" href="#314">314</a> httpsConnector.setPort( httpsPort );
+<a class="jxr_linenumber" name="315" href="#315">315</a> httpsConnector.setSecure( <strong class="jxr_keyword">true</strong> );
+<a class="jxr_linenumber" name="316" href="#316">316</a> httpsConnector.setProperty( <span class="jxr_string">"SSLEnabled"</span>, <span class="jxr_string">"true"</span> );
+<a class="jxr_linenumber" name="317" href="#317">317</a> httpsConnector.setProperty( <span class="jxr_string">"sslProtocol"</span>, <span class="jxr_string">"TLS"</span> );
+<a class="jxr_linenumber" name="318" href="#318">318</a> httpsConnector.setURIEncoding( uriEncoding );
+<a class="jxr_linenumber" name="319" href="#319">319</a>
+<a class="jxr_linenumber" name="320" href="#320">320</a> String keystoreFile = System.getProperty( <span class="jxr_string">"javax.net.ssl.keyStore"</span> );
+<a class="jxr_linenumber" name="321" href="#321">321</a> String keystorePass = System.getProperty( <span class="jxr_string">"javax.net.ssl.keyStorePassword"</span> );
+<a class="jxr_linenumber" name="322" href="#322">322</a> String keystoreType = System.getProperty( <span class="jxr_string">"javax.net.ssl.keyStoreType"</span>, <span class="jxr_string">"jks"</span> );
+<a class="jxr_linenumber" name="323" href="#323">323</a>
+<a class="jxr_linenumber" name="324" href="#324">324</a> <strong class="jxr_keyword">if</strong> ( keystoreFile != <strong class="jxr_keyword">null</strong> )
+<a class="jxr_linenumber" name="325" href="#325">325</a> {
+<a class="jxr_linenumber" name="326" href="#326">326</a> httpsConnector.setAttribute( <span class="jxr_string">"keystoreFile"</span>, keystoreFile );
+<a class="jxr_linenumber" name="327" href="#327">327</a> }
+<a class="jxr_linenumber" name="328" href="#328">328</a> <strong class="jxr_keyword">if</strong> ( keystorePass != <strong class="jxr_keyword">null</strong> )
+<a class="jxr_linenumber" name="329" href="#329">329</a> {
+<a class="jxr_linenumber" name="330" href="#330">330</a> httpsConnector.setAttribute( <span class="jxr_string">"keystorePass"</span>, keystorePass );
+<a class="jxr_linenumber" name="331" href="#331">331</a> }
+<a class="jxr_linenumber" name="332" href="#332">332</a> httpsConnector.setAttribute( <span class="jxr_string">"keystoreType"</span>, keystoreType );
+<a class="jxr_linenumber" name="333" href="#333">333</a>
+<a class="jxr_linenumber" name="334" href="#334">334</a> String truststoreFile = System.getProperty( <span class="jxr_string">"javax.net.ssl.trustStore"</span> );
+<a class="jxr_linenumber" name="335" href="#335">335</a> String truststorePass = System.getProperty( <span class="jxr_string">"javax.net.ssl.trustStorePassword"</span> );
+<a class="jxr_linenumber" name="336" href="#336">336</a> String truststoreType = System.getProperty( <span class="jxr_string">"javax.net.ssl.trustStoreType"</span>, <span class="jxr_string">"jks"</span> );
+<a class="jxr_linenumber" name="337" href="#337">337</a> <strong class="jxr_keyword">if</strong> ( truststoreFile != <strong class="jxr_keyword">null</strong> )
+<a class="jxr_linenumber" name="338" href="#338">338</a> {
+<a class="jxr_linenumber" name="339" href="#339">339</a> httpsConnector.setAttribute( <span class="jxr_string">"truststoreFile"</span>, truststoreFile );
+<a class="jxr_linenumber" name="340" href="#340">340</a> }
+<a class="jxr_linenumber" name="341" href="#341">341</a> <strong class="jxr_keyword">if</strong> ( truststorePass != <strong class="jxr_keyword">null</strong> )
+<a class="jxr_linenumber" name="342" href="#342">342</a> {
+<a class="jxr_linenumber" name="343" href="#343">343</a> httpsConnector.setAttribute( <span class="jxr_string">"truststorePass"</span>, truststorePass );
+<a class="jxr_linenumber" name="344" href="#344">344</a> }
+<a class="jxr_linenumber" name="345" href="#345">345</a> httpsConnector.setAttribute( <span class="jxr_string">"truststoreType"</span>, truststoreType );
+<a class="jxr_linenumber" name="346" href="#346">346</a>
+<a class="jxr_linenumber" name="347" href="#347">347</a> httpsConnector.setAttribute( <span class="jxr_string">"clientAuth"</span>, clientAuth );
+<a class="jxr_linenumber" name="348" href="#348">348</a> httpsConnector.setAttribute( <span class="jxr_string">"keyAlias"</span>, keyAlias );
+<a class="jxr_linenumber" name="349" href="#349">349</a>
+<a class="jxr_linenumber" name="350" href="#350">350</a> tomcat.getService().addConnector( httpsConnector );
+<a class="jxr_linenumber" name="351" href="#351">351</a>
+<a class="jxr_linenumber" name="352" href="#352">352</a> <strong class="jxr_keyword">if</strong> ( httpPort <= 0 )
+<a class="jxr_linenumber" name="353" href="#353">353</a> {
+<a class="jxr_linenumber" name="354" href="#354">354</a> tomcat.setConnector( httpsConnector );
+<a class="jxr_linenumber" name="355" href="#355">355</a> }
+<a class="jxr_linenumber" name="356" href="#356">356</a> }
<a class="jxr_linenumber" name="357" href="#357">357</a>
-<a class="jxr_linenumber" name="358" href="#358">358</a> <strong class="jxr_keyword">private</strong> URL getContextXml( String warPath )
-<a class="jxr_linenumber" name="359" href="#359">359</a> <strong class="jxr_keyword">throws</strong> IOException
-<a class="jxr_linenumber" name="360" href="#360">360</a> {
-<a class="jxr_linenumber" name="361" href="#361">361</a> InputStream inputStream = <strong class="jxr_keyword">null</strong>;
-<a class="jxr_linenumber" name="362" href="#362">362</a> <strong class="jxr_keyword">try</strong>
-<a class="jxr_linenumber" name="363" href="#363">363</a> {
-<a class="jxr_linenumber" name="364" href="#364">364</a> String urlStr = <span class="jxr_string">"jar:file:"</span> + warPath + <span class="jxr_string">"!/META-INF/context.xml"</span>;
-<a class="jxr_linenumber" name="365" href="#365">365</a> debugMessage( <span class="jxr_string">"search context.xml in url:'"</span> + urlStr + <span class="jxr_string">"'"</span> );
-<a class="jxr_linenumber" name="366" href="#366">366</a> URL url = <strong class="jxr_keyword">new</strong> URL( urlStr );
-<a class="jxr_linenumber" name="367" href="#367">367</a> inputStream = url.openConnection().getInputStream();
-<a class="jxr_linenumber" name="368" href="#368">368</a> <strong class="jxr_keyword">if</strong> ( inputStream != <strong class="jxr_keyword">null</strong> )
+<a class="jxr_linenumber" name="358" href="#358">358</a> <em class="jxr_comment">// create ajp connector</em>
+<a class="jxr_linenumber" name="359" href="#359">359</a> <strong class="jxr_keyword">if</strong> ( ajpPort > 0 )
+<a class="jxr_linenumber" name="360" href="#360">360</a> {
+<a class="jxr_linenumber" name="361" href="#361">361</a> Connector ajpConnector = <strong class="jxr_keyword">new</strong> Connector( <span class="jxr_string">"org.apache.coyote.ajp.AjpProtocol"</span> );
+<a class="jxr_linenumber" name="362" href="#362">362</a> ajpConnector.setPort( ajpPort );
+<a class="jxr_linenumber" name="363" href="#363">363</a> ajpConnector.setURIEncoding( uriEncoding );
+<a class="jxr_linenumber" name="364" href="#364">364</a> tomcat.getService().addConnector( ajpConnector );
+<a class="jxr_linenumber" name="365" href="#365">365</a> }
+<a class="jxr_linenumber" name="366" href="#366">366</a>
+<a class="jxr_linenumber" name="367" href="#367">367</a> <em class="jxr_comment">// add webapps</em>
+<a class="jxr_linenumber" name="368" href="#368">368</a> <strong class="jxr_keyword">for</strong> ( Map.Entry<String, String> entry : <strong class="jxr_keyword">this</strong>.webappWarPerContext.entrySet() )
<a class="jxr_linenumber" name="369" href="#369">369</a> {
-<a class="jxr_linenumber" name="370" href="#370">370</a> <strong class="jxr_keyword">return</strong> url;
-<a class="jxr_linenumber" name="371" href="#371">371</a> }
-<a class="jxr_linenumber" name="372" href="#372">372</a> }
-<a class="jxr_linenumber" name="373" href="#373">373</a> <strong class="jxr_keyword">catch</strong> ( FileNotFoundException e )
-<a class="jxr_linenumber" name="374" href="#374">374</a> {
-<a class="jxr_linenumber" name="375" href="#375">375</a> <strong class="jxr_keyword">return</strong> <strong class="jxr_keyword">null</strong>;
-<a class="jxr_linenumber" name="376" href="#376">376</a> }
-<a class="jxr_linenumber" name="377" href="#377">377</a> <strong class="jxr_keyword">finally</strong>
-<a class="jxr_linenumber" name="378" href="#378">378</a> {
-<a class="jxr_linenumber" name="379" href="#379">379</a> IOUtils.closeQuietly( inputStream );
-<a class="jxr_linenumber" name="380" href="#380">380</a> }
-<a class="jxr_linenumber" name="381" href="#381">381</a> <strong class="jxr_keyword">return</strong> <strong class="jxr_keyword">null</strong>;
-<a class="jxr_linenumber" name="382" href="#382">382</a> }
-<a class="jxr_linenumber" name="383" href="#383">383</a>
-<a class="jxr_linenumber" name="384" href="#384">384</a> <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">void</strong> waitIndefinitely()
-<a class="jxr_linenumber" name="385" href="#385">385</a> {
-<a class="jxr_linenumber" name="386" href="#386">386</a> Object lock = <strong class="jxr_keyword">new</strong> Object();
-<a class="jxr_linenumber" name="387" href="#387">387</a>
-<a class="jxr_linenumber" name="388" href="#388">388</a> <strong class="jxr_keyword">synchronized</strong> ( lock )
-<a class="jxr_linenumber" name="389" href="#389">389</a> {
-<a class="jxr_linenumber" name="390" href="#390">390</a> <strong class="jxr_keyword">try</strong>
+<a class="jxr_linenumber" name="370" href="#370">370</a> String baseDir = <strong class="jxr_keyword">null</strong>;
+<a class="jxr_linenumber" name="371" href="#371">371</a> Context context = <strong class="jxr_keyword">null</strong>;
+<a class="jxr_linenumber" name="372" href="#372">372</a> <strong class="jxr_keyword">if</strong> ( entry.getKey().equals( <span class="jxr_string">"/"</span> ) )
+<a class="jxr_linenumber" name="373" href="#373">373</a> {
+<a class="jxr_linenumber" name="374" href="#374">374</a> baseDir = <strong class="jxr_keyword">new</strong> File( extractDirectory, <span class="jxr_string">"webapps/ROOT.war"</span> ).getAbsolutePath();
+<a class="jxr_linenumber" name="375" href="#375">375</a> context = tomcat.addWebapp( <span class="jxr_string">""</span>, baseDir );
+<a class="jxr_linenumber" name="376" href="#376">376</a> }
+<a class="jxr_linenumber" name="377" href="#377">377</a> <strong class="jxr_keyword">else</strong>
+<a class="jxr_linenumber" name="378" href="#378">378</a> {
+<a class="jxr_linenumber" name="379" href="#379">379</a> baseDir = <strong class="jxr_keyword">new</strong> File( extractDirectory, <span class="jxr_string">"webapps/"</span> + entry.getValue() ).getAbsolutePath();
+<a class="jxr_linenumber" name="380" href="#380">380</a> context = tomcat.addWebapp( entry.getKey(), baseDir );
+<a class="jxr_linenumber" name="381" href="#381">381</a> }
+<a class="jxr_linenumber" name="382" href="#382">382</a>
+<a class="jxr_linenumber" name="383" href="#383">383</a> URL contextFileUrl = getContextXml( baseDir );
+<a class="jxr_linenumber" name="384" href="#384">384</a> <strong class="jxr_keyword">if</strong> ( contextFileUrl != <strong class="jxr_keyword">null</strong> )
+<a class="jxr_linenumber" name="385" href="#385">385</a> {
+<a class="jxr_linenumber" name="386" href="#386">386</a> context.setConfigFile( contextFileUrl );
+<a class="jxr_linenumber" name="387" href="#387">387</a> }
+<a class="jxr_linenumber" name="388" href="#388">388</a> }
+<a class="jxr_linenumber" name="389" href="#389">389</a>
+<a class="jxr_linenumber" name="390" href="#390">390</a> <strong class="jxr_keyword">if</strong> ( codeSourceWar != <strong class="jxr_keyword">null</strong> )
<a class="jxr_linenumber" name="391" href="#391">391</a> {
-<a class="jxr_linenumber" name="392" href="#392">392</a> lock.wait();
-<a class="jxr_linenumber" name="393" href="#393">393</a> }
-<a class="jxr_linenumber" name="394" href="#394">394</a> <strong class="jxr_keyword">catch</strong> ( InterruptedException exception )
-<a class="jxr_linenumber" name="395" href="#395">395</a> {
-<a class="jxr_linenumber" name="396" href="#396">396</a> <strong class="jxr_keyword">throw</strong> <strong class="jxr_keyword">new</strong> Error( <span class="jxr_string">"InterruptedException on wait Indefinitely lock:"</span> + exception.getMessage(),
-<a class="jxr_linenumber" name="397" href="#397">397</a> exception );
-<a class="jxr_linenumber" name="398" href="#398">398</a> }
-<a class="jxr_linenumber" name="399" href="#399">399</a> }
-<a class="jxr_linenumber" name="400" href="#400">400</a> }
-<a class="jxr_linenumber" name="401" href="#401">401</a>
-<a class="jxr_linenumber" name="402" href="#402">402</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> stop()
-<a class="jxr_linenumber" name="403" href="#403">403</a> <strong class="jxr_keyword">throws</strong> Exception
-<a class="jxr_linenumber" name="404" href="#404">404</a> {
-<a class="jxr_linenumber" name="405" href="#405">405</a> <strong class="jxr_keyword">if</strong> ( container != <strong class="jxr_keyword">null</strong> )
-<a class="jxr_linenumber" name="406" href="#406">406</a> {
-<a class="jxr_linenumber" name="407" href="#407">407</a> container.stop();
-<a class="jxr_linenumber" name="408" href="#408">408</a> }
-<a class="jxr_linenumber" name="409" href="#409">409</a> <strong class="jxr_keyword">if</strong> ( tomcat != <strong class="jxr_keyword">null</strong> )
-<a class="jxr_linenumber" name="410" href="#410">410</a> {
-<a class="jxr_linenumber" name="411" href="#411">411</a> tomcat.stop();
-<a class="jxr_linenumber" name="412" href="#412">412</a> }
-<a class="jxr_linenumber" name="413" href="#413">413</a> }
-<a class="jxr_linenumber" name="414" href="#414">414</a>
-<a class="jxr_linenumber" name="415" href="#415">415</a> <strong class="jxr_keyword">protected</strong> <strong class="jxr_keyword">void</strong> extract()
-<a class="jxr_linenumber" name="416" href="#416">416</a> <strong class="jxr_keyword">throws</strong> Exception
-<a class="jxr_linenumber" name="417" href="#417">417</a> {
-<a class="jxr_linenumber" name="418" href="#418">418</a>
-<a class="jxr_linenumber" name="419" href="#419">419</a> <strong class="jxr_keyword">if</strong> ( extractDirectoryFile.exists() )
-<a class="jxr_linenumber" name="420" href="#420">420</a> {
-<a class="jxr_linenumber" name="421" href="#421">421</a> debugMessage( <span class="jxr_string">"delete extractDirectory:"</span> + extractDirectoryFile.getAbsolutePath() );
-<a class="jxr_linenumber" name="422" href="#422">422</a> FileUtils.deleteDirectory( extractDirectoryFile );
-<a class="jxr_linenumber" name="423" href="#423">423</a> }
-<a class="jxr_linenumber" name="424" href="#424">424</a>
-<a class="jxr_linenumber" name="425" href="#425">425</a> <strong class="jxr_keyword">if</strong> ( !<strong class="jxr_keyword">this</strong>.extractDirectoryFile.exists() )
-<a class="jxr_linenumber" name="426" href="#426">426</a> {
-<a class="jxr_linenumber" name="427" href="#427">427</a> <strong class="jxr_keyword">boolean</strong> created = <strong class="jxr_keyword">this</strong>.extractDirectoryFile.mkdirs();
-<a class="jxr_linenumber" name="428" href="#428">428</a> <strong class="jxr_keyword">if</strong> ( !created )
-<a class="jxr_linenumber" name="429" href="#429">429</a> {
-<a class="jxr_linenumber" name="430" href="#430">430</a> <strong class="jxr_keyword">throw</strong> <strong class="jxr_keyword">new</strong> Exception( <span class="jxr_string">"FATAL: impossible to create directory:"</span> + <strong class="jxr_keyword">this</strong>.extractDirectoryFile.getPath() );
-<a class="jxr_linenumber" name="431" href="#431">431</a> }
-<a class="jxr_linenumber" name="432" href="#432">432</a> }
+<a class="jxr_linenumber" name="392" href="#392">392</a> String baseDir = <strong class="jxr_keyword">new</strong> File( extractDirectory, <span class="jxr_string">"webapps/"</span> + codeSourceWar.getName() ).getAbsolutePath();
+<a class="jxr_linenumber" name="393" href="#393">393</a> Context context = tomcat.addWebapp( codeSourceContextPath, baseDir );
+<a class="jxr_linenumber" name="394" href="#394">394</a> URL contextFileUrl = getContextXml( baseDir );
+<a class="jxr_linenumber" name="395" href="#395">395</a> <strong class="jxr_keyword">if</strong> ( contextFileUrl != <strong class="jxr_keyword">null</strong> )
+<a class="jxr_linenumber" name="396" href="#396">396</a> {
+<a class="jxr_linenumber" name="397" href="#397">397</a> context.setConfigFile( contextFileUrl );
+<a class="jxr_linenumber" name="398" href="#398">398</a> }
+<a class="jxr_linenumber" name="399" href="#399">399</a> }
+<a class="jxr_linenumber" name="400" href="#400">400</a>
+<a class="jxr_linenumber" name="401" href="#401">401</a> tomcat.start();
+<a class="jxr_linenumber" name="402" href="#402">402</a> }
+<a class="jxr_linenumber" name="403" href="#403">403</a>
+<a class="jxr_linenumber" name="404" href="#404">404</a> waitIndefinitely();
+<a class="jxr_linenumber" name="405" href="#405">405</a>
+<a class="jxr_linenumber" name="406" href="#406">406</a> }
+<a class="jxr_linenumber" name="407" href="#407">407</a>
+<a class="jxr_linenumber" name="408" href="#408">408</a> <strong class="jxr_keyword">private</strong> URL getContextXml( String warPath )
+<a class="jxr_linenumber" name="409" href="#409">409</a> <strong class="jxr_keyword">throws</strong> IOException
+<a class="jxr_linenumber" name="410" href="#410">410</a> {
+<a class="jxr_linenumber" name="411" href="#411">411</a> InputStream inputStream = <strong class="jxr_keyword">null</strong>;
+<a class="jxr_linenumber" name="412" href="#412">412</a> <strong class="jxr_keyword">try</strong>
+<a class="jxr_linenumber" name="413" href="#413">413</a> {
+<a class="jxr_linenumber" name="414" href="#414">414</a> String urlStr = <span class="jxr_string">"jar:file:"</span> + warPath + <span class="jxr_string">"!/META-INF/context.xml"</span>;
+<a class="jxr_linenumber" name="415" href="#415">415</a> debugMessage( <span class="jxr_string">"search context.xml in url:'"</span> + urlStr + <span class="jxr_string">"'"</span> );
+<a class="jxr_linenumber" name="416" href="#416">416</a> URL url = <strong class="jxr_keyword">new</strong> URL( urlStr );
+<a class="jxr_linenumber" name="417" href="#417">417</a> inputStream = url.openConnection().getInputStream();
+<a class="jxr_linenumber" name="418" href="#418">418</a> <strong class="jxr_keyword">if</strong> ( inputStream != <strong class="jxr_keyword">null</strong> )
+<a class="jxr_linenumber" name="419" href="#419">419</a> {
+<a class="jxr_linenumber" name="420" href="#420">420</a> <strong class="jxr_keyword">return</strong> url;
+<a class="jxr_linenumber" name="421" href="#421">421</a> }
+<a class="jxr_linenumber" name="422" href="#422">422</a> }
+<a class="jxr_linenumber" name="423" href="#423">423</a> <strong class="jxr_keyword">catch</strong> ( FileNotFoundException e )
+<a class="jxr_linenumber" name="424" href="#424">424</a> {
+<a class="jxr_linenumber" name="425" href="#425">425</a> <strong class="jxr_keyword">return</strong> <strong class="jxr_keyword">null</strong>;
+<a class="jxr_linenumber" name="426" href="#426">426</a> }
+<a class="jxr_linenumber" name="427" href="#427">427</a> <strong class="jxr_keyword">finally</strong>
+<a class="jxr_linenumber" name="428" href="#428">428</a> {
+<a class="jxr_linenumber" name="429" href="#429">429</a> IOUtils.closeQuietly( inputStream );
+<a class="jxr_linenumber" name="430" href="#430">430</a> }
[... 570 lines stripped ...]
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org