Modified: tomcat/site/trunk/docs/maven-plugin-trunk/tomcat7-maven-plugin/xref/org/apache/tomcat/maven/plugin/tomcat7/run/AbstractStandaloneWarMojo.html URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/maven-plugin-trunk/tomcat7-maven-plugin/xref/org/apache/tomcat/maven/plugin/tomcat7/run/AbstractStandaloneWarMojo.html?rev=1469257&r1=1469256&r2=1469257&view=diff ============================================================================== --- tomcat/site/trunk/docs/maven-plugin-trunk/tomcat7-maven-plugin/xref/org/apache/tomcat/maven/plugin/tomcat7/run/AbstractStandaloneWarMojo.html (original) +++ tomcat/site/trunk/docs/maven-plugin-trunk/tomcat7-maven-plugin/xref/org/apache/tomcat/maven/plugin/tomcat7/run/AbstractStandaloneWarMojo.html Thu Apr 18 10:00:44 2013 @@ -78,214 +78,221 @@ <a class="jxr_linenumber" name="68" href="#68">68</a> required = <strong class="jxr_keyword">true</strong>) <a class="jxr_linenumber" name="69" href="#69">69</a> <strong class="jxr_keyword">protected</strong> String attachArtifactClassifier; <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">void</strong> execute() -<a class="jxr_linenumber" name="72" href="#72">72</a> <strong class="jxr_keyword">throws</strong> MojoExecutionException, MojoFailureException -<a class="jxr_linenumber" name="73" href="#73">73</a> { -<a class="jxr_linenumber" name="74" href="#74">74</a> <strong class="jxr_keyword">if</strong> ( !<span class="jxr_string">"war"</span>.equals( project.getPackaging() ) ) -<a class="jxr_linenumber" name="75" href="#75">75</a> { -<a class="jxr_linenumber" name="76" href="#76">76</a> <strong class="jxr_keyword">throw</strong> <strong class="jxr_keyword">new</strong> MojoFailureException( <span class="jxr_string">"Pacakaging must be of type war for standalone-war goal."</span> ); -<a class="jxr_linenumber" name="77" href="#77">77</a> } -<a class="jxr_linenumber" name="78" href="#78">78</a> -<a class="jxr_linenumber" name="79" href="#79">79</a> File warExecFile = <strong class="jxr_keyword">new</strong> File( buildDirectory, finalName ); -<a class="jxr_linenumber" name="80" href="#80">80</a> <strong class="jxr_keyword">if</strong> ( warExecFile.exists() ) -<a class="jxr_linenumber" name="81" href="#81">81</a> { -<a class="jxr_linenumber" name="82" href="#82">82</a> warExecFile.delete(); -<a class="jxr_linenumber" name="83" href="#83">83</a> } -<a class="jxr_linenumber" name="84" href="#84">84</a> -<a class="jxr_linenumber" name="85" href="#85">85</a> File execWarJar = <strong class="jxr_keyword">new</strong> File( buildDirectory, finalName ); -<a class="jxr_linenumber" name="86" href="#86">86</a> -<a class="jxr_linenumber" name="87" href="#87">87</a> FileOutputStream execWarJarOutputStream = <strong class="jxr_keyword">null</strong>; -<a class="jxr_linenumber" name="88" href="#88">88</a> ArchiveOutputStream os = <strong class="jxr_keyword">null</strong>; -<a class="jxr_linenumber" name="89" href="#89">89</a> File tmpPropertiesFile = <strong class="jxr_keyword">null</strong>; -<a class="jxr_linenumber" name="90" href="#90">90</a> File tmpManifestFile = <strong class="jxr_keyword">null</strong>; -<a class="jxr_linenumber" name="91" href="#91">91</a> FileOutputStream tmpPropertiesFileOutputStream = <strong class="jxr_keyword">null</strong>; -<a class="jxr_linenumber" name="92" href="#92">92</a> PrintWriter tmpManifestWriter = <strong class="jxr_keyword">null</strong>; +<a class="jxr_linenumber" name="71" href="#71">71</a> <em class="jxr_javadoccomment">/**</em> +<a class="jxr_linenumber" name="72" href="#72">72</a> <em class="jxr_javadoccomment"> * the type to use for the attached/generated artifact</em> +<a class="jxr_linenumber" name="73" href="#73">73</a> <em class="jxr_javadoccomment"> * @since 2.2</em> +<a class="jxr_linenumber" name="74" href="#74">74</a> <em class="jxr_javadoccomment"> */</em> +<a class="jxr_linenumber" name="75" href="#75">75</a> @Parameter( property = <span class="jxr_string">"maven.tomcat.exec.war.attachArtifactType"</span>, defaultValue = <span class="jxr_string">"war"</span>, required = <strong class="jxr_keyword">true</strong> ) +<a class="jxr_linenumber" name="76" href="#76">76</a> <strong class="jxr_keyword">protected</strong> String attachArtifactClassifierType; +<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">void</strong> execute() +<a class="jxr_linenumber" name="79" href="#79">79</a> <strong class="jxr_keyword">throws</strong> MojoExecutionException, MojoFailureException +<a class="jxr_linenumber" name="80" href="#80">80</a> { +<a class="jxr_linenumber" name="81" href="#81">81</a> <strong class="jxr_keyword">if</strong> ( !<span class="jxr_string">"war"</span>.equals( project.getPackaging() ) ) +<a class="jxr_linenumber" name="82" href="#82">82</a> { +<a class="jxr_linenumber" name="83" href="#83">83</a> <strong class="jxr_keyword">throw</strong> <strong class="jxr_keyword">new</strong> MojoFailureException( <span class="jxr_string">"Pacakaging must be of type war for standalone-war goal."</span> ); +<a class="jxr_linenumber" name="84" href="#84">84</a> } +<a class="jxr_linenumber" name="85" href="#85">85</a> +<a class="jxr_linenumber" name="86" href="#86">86</a> File warExecFile = <strong class="jxr_keyword">new</strong> File( buildDirectory, finalName ); +<a class="jxr_linenumber" name="87" href="#87">87</a> <strong class="jxr_keyword">if</strong> ( warExecFile.exists() ) +<a class="jxr_linenumber" name="88" href="#88">88</a> { +<a class="jxr_linenumber" name="89" href="#89">89</a> warExecFile.delete(); +<a class="jxr_linenumber" name="90" href="#90">90</a> } +<a class="jxr_linenumber" name="91" href="#91">91</a> +<a class="jxr_linenumber" name="92" href="#92">92</a> File execWarJar = <strong class="jxr_keyword">new</strong> File( buildDirectory, finalName ); <a class="jxr_linenumber" name="93" href="#93">93</a> -<a class="jxr_linenumber" name="94" href="#94">94</a> <strong class="jxr_keyword">try</strong> -<a class="jxr_linenumber" name="95" href="#95">95</a> { -<a class="jxr_linenumber" name="96" href="#96">96</a> tmpPropertiesFile = <strong class="jxr_keyword">new</strong> File( buildDirectory, <span class="jxr_string">"war-exec.properties"</span> ); -<a class="jxr_linenumber" name="97" href="#97">97</a> <strong class="jxr_keyword">if</strong> ( tmpPropertiesFile.exists() ) -<a class="jxr_linenumber" name="98" href="#98">98</a> { -<a class="jxr_linenumber" name="99" href="#99">99</a> tmpPropertiesFile.delete(); -<a class="jxr_linenumber" name="100" href="#100">100</a> } -<a class="jxr_linenumber" name="101" href="#101">101</a> tmpPropertiesFile.getParentFile().mkdirs(); -<a class="jxr_linenumber" name="102" href="#102">102</a> -<a class="jxr_linenumber" name="103" href="#103">103</a> tmpManifestFile = <strong class="jxr_keyword">new</strong> File( buildDirectory, <span class="jxr_string">"war-exec.manifest"</span> ); -<a class="jxr_linenumber" name="104" href="#104">104</a> <strong class="jxr_keyword">if</strong> ( tmpManifestFile.exists() ) +<a class="jxr_linenumber" name="94" href="#94">94</a> FileOutputStream execWarJarOutputStream = <strong class="jxr_keyword">null</strong>; +<a class="jxr_linenumber" name="95" href="#95">95</a> ArchiveOutputStream os = <strong class="jxr_keyword">null</strong>; +<a class="jxr_linenumber" name="96" href="#96">96</a> File tmpPropertiesFile = <strong class="jxr_keyword">null</strong>; +<a class="jxr_linenumber" name="97" href="#97">97</a> File tmpManifestFile = <strong class="jxr_keyword">null</strong>; +<a class="jxr_linenumber" name="98" href="#98">98</a> FileOutputStream tmpPropertiesFileOutputStream = <strong class="jxr_keyword">null</strong>; +<a class="jxr_linenumber" name="99" href="#99">99</a> PrintWriter tmpManifestWriter = <strong class="jxr_keyword">null</strong>; +<a class="jxr_linenumber" name="100" href="#100">100</a> +<a class="jxr_linenumber" name="101" href="#101">101</a> <strong class="jxr_keyword">try</strong> +<a class="jxr_linenumber" name="102" href="#102">102</a> { +<a class="jxr_linenumber" name="103" href="#103">103</a> tmpPropertiesFile = <strong class="jxr_keyword">new</strong> File( buildDirectory, <span class="jxr_string">"war-exec.properties"</span> ); +<a class="jxr_linenumber" name="104" href="#104">104</a> <strong class="jxr_keyword">if</strong> ( tmpPropertiesFile.exists() ) <a class="jxr_linenumber" name="105" href="#105">105</a> { -<a class="jxr_linenumber" name="106" href="#106">106</a> tmpManifestFile.delete(); +<a class="jxr_linenumber" name="106" href="#106">106</a> tmpPropertiesFile.delete(); <a class="jxr_linenumber" name="107" href="#107">107</a> } -<a class="jxr_linenumber" name="108" href="#108">108</a> tmpPropertiesFileOutputStream = <strong class="jxr_keyword">new</strong> FileOutputStream( tmpPropertiesFile ); -<a class="jxr_linenumber" name="109" href="#109">109</a> execWarJar.getParentFile().mkdirs(); -<a class="jxr_linenumber" name="110" href="#110">110</a> execWarJar.createNewFile(); -<a class="jxr_linenumber" name="111" href="#111">111</a> execWarJarOutputStream = <strong class="jxr_keyword">new</strong> FileOutputStream( execWarJar ); -<a class="jxr_linenumber" name="112" href="#112">112</a> -<a class="jxr_linenumber" name="113" href="#113">113</a> tmpManifestWriter = <strong class="jxr_keyword">new</strong> PrintWriter( tmpManifestFile ); -<a class="jxr_linenumber" name="114" href="#114">114</a> -<a class="jxr_linenumber" name="115" href="#115">115</a> <em class="jxr_comment">// store :</em> -<a class="jxr_linenumber" name="116" href="#116">116</a> /<em class="jxr_comment">/*<em class="jxr_comment"> wars in the root: foo.war</em></em> -<a class="jxr_linenumber" name="117" href="#117">117</a> <em class="jxr_comment"> //* tomcat jars</em> -<a class="jxr_linenumber" name="118" href="#118">118</a> <em class="jxr_comment"> //* file tomcat.standalone.properties with possible values :</em> -<a class="jxr_linenumber" name="119" href="#119">119</a> <em class="jxr_comment"> // * useServerXml=true/false to use directly the one provided</em> -<a class="jxr_linenumber" name="120" href="#120">120</a> <em class="jxr_comment"> // * enableNaming=true/false</em> -<a class="jxr_linenumber" name="121" href="#121">121</a> <em class="jxr_comment"> // * wars=foo.war|contextpath;bar.war ( |contextpath is optionnal if empty use the war name )</em> -<a class="jxr_linenumber" name="122" href="#122">122</a> <em class="jxr_comment"> // * accessLogValveFormat=</em> -<a class="jxr_linenumber" name="123" href="#123">123</a> <em class="jxr_comment"> // * connectorhttpProtocol: HTTP/1.1 or org.apache.coyote.http11.Http11NioProtocol</em> -<a class="jxr_linenumber" name="124" href="#124">124</a> <em class="jxr_comment"> // * codeSourceContextPath=path parameter, default is project.artifactId</em> -<a class="jxr_linenumber" name="125" href="#125">125</a> <em class="jxr_comment"> //* optionnal: conf/ with usual tomcat configuration files</em> -<a class="jxr_linenumber" name="126" href="#126">126</a> <em class="jxr_comment"> //* MANIFEST with Main-Class</em> -<a class="jxr_linenumber" name="127" href="#127">127</a> -<a class="jxr_linenumber" name="128" href="#128">128</a> <em class="jxr_comment"> Properties properties = new Properties();</em> -<a class="jxr_linenumber" name="129" href="#129">129</a> -<a class="jxr_linenumber" name="130" href="#130">130</a> <em class="jxr_comment"> properties.put( Tomcat7Runner.ARCHIVE_GENERATION_TIMESTAMP_KEY,</em> -<a class="jxr_linenumber" name="131" href="#131">131</a> <em class="jxr_comment"> Long.toString( System.currentTimeMillis() ) );</em> -<a class="jxr_linenumber" name="132" href="#132">132</a> <em class="jxr_comment"> properties.put( Tomcat7Runner.ENABLE_NAMING_KEY, Boolean.toString( enableNaming ) );</em> -<a class="jxr_linenumber" name="133" href="#133">133</a> <em class="jxr_comment"> properties.put( Tomcat7Runner.ACCESS_LOG_VALVE_FORMAT_KEY, accessLogValveFormat );</em> -<a class="jxr_linenumber" name="134" href="#134">134</a> <em class="jxr_comment"> properties.put( Tomcat7Runner.HTTP_PROTOCOL_KEY, connectorHttpProtocol );</em> -<a class="jxr_linenumber" name="135" href="#135">135</a> <em class="jxr_comment"> properties.put( Tomcat7Runner.CODE_SOURCE_CONTEXT_PATH, path );</em> +<a class="jxr_linenumber" name="108" href="#108">108</a> tmpPropertiesFile.getParentFile().mkdirs(); +<a class="jxr_linenumber" name="109" href="#109">109</a> +<a class="jxr_linenumber" name="110" href="#110">110</a> tmpManifestFile = <strong class="jxr_keyword">new</strong> File( buildDirectory, <span class="jxr_string">"war-exec.manifest"</span> ); +<a class="jxr_linenumber" name="111" href="#111">111</a> <strong class="jxr_keyword">if</strong> ( tmpManifestFile.exists() ) +<a class="jxr_linenumber" name="112" href="#112">112</a> { +<a class="jxr_linenumber" name="113" href="#113">113</a> tmpManifestFile.delete(); +<a class="jxr_linenumber" name="114" href="#114">114</a> } +<a class="jxr_linenumber" name="115" href="#115">115</a> tmpPropertiesFileOutputStream = <strong class="jxr_keyword">new</strong> FileOutputStream( tmpPropertiesFile ); +<a class="jxr_linenumber" name="116" href="#116">116</a> execWarJar.getParentFile().mkdirs(); +<a class="jxr_linenumber" name="117" href="#117">117</a> execWarJar.createNewFile(); +<a class="jxr_linenumber" name="118" href="#118">118</a> execWarJarOutputStream = <strong class="jxr_keyword">new</strong> FileOutputStream( execWarJar ); +<a class="jxr_linenumber" name="119" href="#119">119</a> +<a class="jxr_linenumber" name="120" href="#120">120</a> tmpManifestWriter = <strong class="jxr_keyword">new</strong> PrintWriter( tmpManifestFile ); +<a class="jxr_linenumber" name="121" href="#121">121</a> +<a class="jxr_linenumber" name="122" href="#122">122</a> <em class="jxr_comment">// store :</em> +<a class="jxr_linenumber" name="123" href="#123">123</a> /<em class="jxr_comment">/*<em class="jxr_comment"> wars in the root: foo.war</em></em> +<a class="jxr_linenumber" name="124" href="#124">124</a> <em class="jxr_comment"> //* tomcat jars</em> +<a class="jxr_linenumber" name="125" href="#125">125</a> <em class="jxr_comment"> //* file tomcat.standalone.properties with possible values :</em> +<a class="jxr_linenumber" name="126" href="#126">126</a> <em class="jxr_comment"> // * useServerXml=true/false to use directly the one provided</em> +<a class="jxr_linenumber" name="127" href="#127">127</a> <em class="jxr_comment"> // * enableNaming=true/false</em> +<a class="jxr_linenumber" name="128" href="#128">128</a> <em class="jxr_comment"> // * wars=foo.war|contextpath;bar.war ( |contextpath is optionnal if empty use the war name )</em> +<a class="jxr_linenumber" name="129" href="#129">129</a> <em class="jxr_comment"> // * accessLogValveFormat=</em> +<a class="jxr_linenumber" name="130" href="#130">130</a> <em class="jxr_comment"> // * connectorhttpProtocol: HTTP/1.1 or org.apache.coyote.http11.Http11NioProtocol</em> +<a class="jxr_linenumber" name="131" href="#131">131</a> <em class="jxr_comment"> // * codeSourceContextPath=path parameter, default is project.artifactId</em> +<a class="jxr_linenumber" name="132" href="#132">132</a> <em class="jxr_comment"> //* optionnal: conf/ with usual tomcat configuration files</em> +<a class="jxr_linenumber" name="133" href="#133">133</a> <em class="jxr_comment"> //* MANIFEST with Main-Class</em> +<a class="jxr_linenumber" name="134" href="#134">134</a> +<a class="jxr_linenumber" name="135" href="#135">135</a> <em class="jxr_comment"> Properties properties = new Properties();</em> <a class="jxr_linenumber" name="136" href="#136">136</a> -<a class="jxr_linenumber" name="137" href="#137">137</a> <em class="jxr_comment"> os = new ArchiveStreamFactory().createArchiveOutputStream( ArchiveStreamFactory.JAR,</em> -<a class="jxr_linenumber" name="138" href="#138">138</a> <em class="jxr_comment"> execWarJarOutputStream );</em> -<a class="jxr_linenumber" name="139" href="#139">139</a> -<a class="jxr_linenumber" name="140" href="#140">140</a> <em class="jxr_comment"> extractJarToArchive( new JarFile( projectArtifact.getFile() ), os );</em> -<a class="jxr_linenumber" name="141" href="#141">141</a> -<a class="jxr_linenumber" name="142" href="#142">142</a> <em class="jxr_comment"> if ( serverXml != null && serverXml.exists() )</em> -<a class="jxr_linenumber" name="143" href="#143">143</a> <em class="jxr_comment"> {</em> -<a class="jxr_linenumber" name="144" href="#144">144</a> <em class="jxr_comment"> os.putArchiveEntry( new JarArchiveEntry( "conf/server.xml" ) );</em> -<a class="jxr_linenumber" name="145" href="#145">145</a> <em class="jxr_comment"> IOUtils.copy( new FileInputStream( serverXml ), os );</em> -<a class="jxr_linenumber" name="146" href="#146">146</a> <em class="jxr_comment"> os.closeArchiveEntry();</em> -<a class="jxr_linenumber" name="147" href="#147">147</a> <em class="jxr_comment"> properties.put( Tomcat7Runner.USE_SERVER_XML_KEY, Boolean.TRUE.toString() );</em> -<a class="jxr_linenumber" name="148" href="#148">148</a> <em class="jxr_comment"> }</em> -<a class="jxr_linenumber" name="149" href="#149">149</a> <em class="jxr_comment"> else</em> +<a class="jxr_linenumber" name="137" href="#137">137</a> <em class="jxr_comment"> properties.put( Tomcat7Runner.ARCHIVE_GENERATION_TIMESTAMP_KEY,</em> +<a class="jxr_linenumber" name="138" href="#138">138</a> <em class="jxr_comment"> Long.toString( System.currentTimeMillis() ) );</em> +<a class="jxr_linenumber" name="139" href="#139">139</a> <em class="jxr_comment"> properties.put( Tomcat7Runner.ENABLE_NAMING_KEY, Boolean.toString( enableNaming ) );</em> +<a class="jxr_linenumber" name="140" href="#140">140</a> <em class="jxr_comment"> properties.put( Tomcat7Runner.ACCESS_LOG_VALVE_FORMAT_KEY, accessLogValveFormat );</em> +<a class="jxr_linenumber" name="141" href="#141">141</a> <em class="jxr_comment"> properties.put( Tomcat7Runner.HTTP_PROTOCOL_KEY, connectorHttpProtocol );</em> +<a class="jxr_linenumber" name="142" href="#142">142</a> <em class="jxr_comment"> properties.put( Tomcat7Runner.CODE_SOURCE_CONTEXT_PATH, path );</em> +<a class="jxr_linenumber" name="143" href="#143">143</a> +<a class="jxr_linenumber" name="144" href="#144">144</a> <em class="jxr_comment"> os = new ArchiveStreamFactory().createArchiveOutputStream( ArchiveStreamFactory.JAR,</em> +<a class="jxr_linenumber" name="145" href="#145">145</a> <em class="jxr_comment"> execWarJarOutputStream );</em> +<a class="jxr_linenumber" name="146" href="#146">146</a> +<a class="jxr_linenumber" name="147" href="#147">147</a> <em class="jxr_comment"> extractJarToArchive( new JarFile( projectArtifact.getFile() ), os );</em> +<a class="jxr_linenumber" name="148" href="#148">148</a> +<a class="jxr_linenumber" name="149" href="#149">149</a> <em class="jxr_comment"> if ( serverXml != null && serverXml.exists() )</em> <a class="jxr_linenumber" name="150" href="#150">150</a> <em class="jxr_comment"> {</em> -<a class="jxr_linenumber" name="151" href="#151">151</a> <em class="jxr_comment"> properties.put( Tomcat7Runner.USE_SERVER_XML_KEY, Boolean.FALSE.toString() );</em> -<a class="jxr_linenumber" name="152" href="#152">152</a> <em class="jxr_comment"> }</em> -<a class="jxr_linenumber" name="153" href="#153">153</a> -<a class="jxr_linenumber" name="154" href="#154">154</a> <em class="jxr_comment"> os.putArchiveEntry( new JarArchiveEntry( "conf/web.xml" ) );</em> -<a class="jxr_linenumber" name="155" href="#155">155</a> <em class="jxr_comment"> IOUtils.copy( getClass().getResourceAsStream( "/conf/web.xml" ), os );</em> -<a class="jxr_linenumber" name="156" href="#156">156</a> <em class="jxr_comment"> os.closeArchiveEntry();</em> -<a class="jxr_linenumber" name="157" href="#157">157</a> -<a class="jxr_linenumber" name="158" href="#158">158</a> <em class="jxr_comment"> properties.store( tmpPropertiesFileOutputStream, "created by Apache Tomcat Maven plugin" );</em> -<a class="jxr_linenumber" name="159" href="#159">159</a> -<a class="jxr_linenumber" name="160" href="#160">160</a> <em class="jxr_comment"> tmpPropertiesFileOutputStream.flush();</em> -<a class="jxr_linenumber" name="161" href="#161">161</a> <em class="jxr_comment"> tmpPropertiesFileOutputStream.close();</em> -<a class="jxr_linenumber" name="162" href="#162">162</a> -<a class="jxr_linenumber" name="163" href="#163">163</a> <em class="jxr_comment"> os.putArchiveEntry( new JarArchiveEntry( Tomcat7RunnerCli.STAND_ALONE_PROPERTIES_FILENAME ) );</em> -<a class="jxr_linenumber" name="164" href="#164">164</a> <em class="jxr_comment"> IOUtils.copy( new FileInputStream( tmpPropertiesFile ), os );</em> -<a class="jxr_linenumber" name="165" href="#165">165</a> <em class="jxr_comment"> os.closeArchiveEntry();</em> +<a class="jxr_linenumber" name="151" href="#151">151</a> <em class="jxr_comment"> os.putArchiveEntry( new JarArchiveEntry( "conf/server.xml" ) );</em> +<a class="jxr_linenumber" name="152" href="#152">152</a> <em class="jxr_comment"> IOUtils.copy( new FileInputStream( serverXml ), os );</em> +<a class="jxr_linenumber" name="153" href="#153">153</a> <em class="jxr_comment"> os.closeArchiveEntry();</em> +<a class="jxr_linenumber" name="154" href="#154">154</a> <em class="jxr_comment"> properties.put( Tomcat7Runner.USE_SERVER_XML_KEY, Boolean.TRUE.toString() );</em> +<a class="jxr_linenumber" name="155" href="#155">155</a> <em class="jxr_comment"> }</em> +<a class="jxr_linenumber" name="156" href="#156">156</a> <em class="jxr_comment"> else</em> +<a class="jxr_linenumber" name="157" href="#157">157</a> <em class="jxr_comment"> {</em> +<a class="jxr_linenumber" name="158" href="#158">158</a> <em class="jxr_comment"> properties.put( Tomcat7Runner.USE_SERVER_XML_KEY, Boolean.FALSE.toString() );</em> +<a class="jxr_linenumber" name="159" href="#159">159</a> <em class="jxr_comment"> }</em> +<a class="jxr_linenumber" name="160" href="#160">160</a> +<a class="jxr_linenumber" name="161" href="#161">161</a> <em class="jxr_comment"> os.putArchiveEntry( new JarArchiveEntry( "conf/web.xml" ) );</em> +<a class="jxr_linenumber" name="162" href="#162">162</a> <em class="jxr_comment"> IOUtils.copy( getClass().getResourceAsStream( "/conf/web.xml" ), os );</em> +<a class="jxr_linenumber" name="163" href="#163">163</a> <em class="jxr_comment"> os.closeArchiveEntry();</em> +<a class="jxr_linenumber" name="164" href="#164">164</a> +<a class="jxr_linenumber" name="165" href="#165">165</a> <em class="jxr_comment"> properties.store( tmpPropertiesFileOutputStream, "created by Apache Tomcat Maven plugin" );</em> <a class="jxr_linenumber" name="166" href="#166">166</a> -<a class="jxr_linenumber" name="167" href="#167">167</a> <em class="jxr_comment"> // add tomcat classes</em> -<a class="jxr_linenumber" name="168" href="#168">168</a> <em class="jxr_comment"> for ( Artifact pluginArtifact : pluginArtifacts )</em> -<a class="jxr_linenumber" name="169" href="#169">169</a> <em class="jxr_comment"> {</em> -<a class="jxr_linenumber" name="170" href="#170">170</a> <em class="jxr_comment"> if ( StringUtils.equals( "org.apache.tomcat", pluginArtifact.getGroupId() ) || StringUtils.equals(</em> -<a class="jxr_linenumber" name="171" href="#171">171</a> <em class="jxr_comment"> "org.apache.tomcat.embed", pluginArtifact.getGroupId() ) || StringUtils.equals(</em> -<a class="jxr_linenumber" name="172" href="#172">172</a> <em class="jxr_comment"> "org.eclipse.jdt.core.compiler", pluginArtifact.getGroupId() ) || StringUtils.equals( "commons-cli",</em> -<a class="jxr_linenumber" name="173" href="#173">173</a> <em class="jxr_comment"> pluginArtifact.getArtifactId() )</em> -<a class="jxr_linenumber" name="174" href="#174">174</a> <em class="jxr_comment"> || StringUtils.equals( "tomcat7-war-runner", pluginArtifact.getArtifactId() ) )</em> -<a class="jxr_linenumber" name="175" href="#175">175</a> <em class="jxr_comment"> {</em> -<a class="jxr_linenumber" name="176" href="#176">176</a> <em class="jxr_comment"> JarFile jarFile = new JarFile( pluginArtifact.getFile() );</em> -<a class="jxr_linenumber" name="177" href="#177">177</a> <em class="jxr_comment"> extractJarToArchive( jarFile, os );</em> -<a class="jxr_linenumber" name="178" href="#178">178</a> <em class="jxr_comment"> }</em> -<a class="jxr_linenumber" name="179" href="#179">179</a> <em class="jxr_comment"> }</em> -<a class="jxr_linenumber" name="180" href="#180">180</a> -<a class="jxr_linenumber" name="181" href="#181">181</a> <em class="jxr_comment"> // add extra dependencies</em> -<a class="jxr_linenumber" name="182" href="#182">182</a> <em class="jxr_comment"> if ( extraDependencies != null && !extraDependencies.isEmpty() )</em> -<a class="jxr_linenumber" name="183" href="#183">183</a> <em class="jxr_comment"> {</em> -<a class="jxr_linenumber" name="184" href="#184">184</a> <em class="jxr_comment"> for ( Dependency dependency : extraDependencies )</em> -<a class="jxr_linenumber" name="185" href="#185">185</a> <em class="jxr_comment"> {</em> -<a class="jxr_linenumber" name="186" href="#186">186</a> <em class="jxr_comment"> // String groupId, String artifactId, String version, String scope, String type</em> -<a class="jxr_linenumber" name="187" href="#187">187</a> <em class="jxr_comment"> Artifact artifact =</em> -<a class="jxr_linenumber" name="188" href="#188">188</a> <em class="jxr_comment"> artifactFactory.createArtifact( dependency.getGroupId(), dependency.getArtifactId(),</em> -<a class="jxr_linenumber" name="189" href="#189">189</a> <em class="jxr_comment"> dependency.getVersion(), dependency.getScope(),</em> -<a class="jxr_linenumber" name="190" href="#190">190</a> <em class="jxr_comment"> dependency.getType() );</em> -<a class="jxr_linenumber" name="191" href="#191">191</a> -<a class="jxr_linenumber" name="192" href="#192">192</a> <em class="jxr_comment"> artifactResolver.resolve( artifact, this.remoteRepos, this.local );</em> -<a class="jxr_linenumber" name="193" href="#193">193</a> <em class="jxr_comment"> JarFile jarFile = new JarFile( artifact.getFile() );</em> -<a class="jxr_linenumber" name="194" href="#194">194</a> <em class="jxr_comment"> extractJarToArchive( jarFile, os );</em> -<a class="jxr_linenumber" name="195" href="#195">195</a> <em class="jxr_comment"> }</em> -<a class="jxr_linenumber" name="196" href="#196">196</a> <em class="jxr_comment"> }</em> -<a class="jxr_linenumber" name="197" href="#197">197</a> -<a class="jxr_linenumber" name="198" href="#198">198</a> <em class="jxr_comment"> Manifest manifest = new Manifest();</em> -<a class="jxr_linenumber" name="199" href="#199">199</a> -<a class="jxr_linenumber" name="200" href="#200">200</a> <em class="jxr_comment"> Manifest.Attribute mainClassAtt = new Manifest.Attribute();</em> -<a class="jxr_linenumber" name="201" href="#201">201</a> <em class="jxr_comment"> mainClassAtt.setName( "Main-Class" );</em> -<a class="jxr_linenumber" name="202" href="#202">202</a> <em class="jxr_comment"> mainClassAtt.setValue( mainClass );</em> -<a class="jxr_linenumber" name="203" href="#203">203</a> <em class="jxr_comment"> manifest.addConfiguredAttribute( mainClassAtt );</em> +<a class="jxr_linenumber" name="167" href="#167">167</a> <em class="jxr_comment"> tmpPropertiesFileOutputStream.flush();</em> +<a class="jxr_linenumber" name="168" href="#168">168</a> <em class="jxr_comment"> tmpPropertiesFileOutputStream.close();</em> +<a class="jxr_linenumber" name="169" href="#169">169</a> +<a class="jxr_linenumber" name="170" href="#170">170</a> <em class="jxr_comment"> os.putArchiveEntry( new JarArchiveEntry( Tomcat7RunnerCli.STAND_ALONE_PROPERTIES_FILENAME ) );</em> +<a class="jxr_linenumber" name="171" href="#171">171</a> <em class="jxr_comment"> IOUtils.copy( new FileInputStream( tmpPropertiesFile ), os );</em> +<a class="jxr_linenumber" name="172" href="#172">172</a> <em class="jxr_comment"> os.closeArchiveEntry();</em> +<a class="jxr_linenumber" name="173" href="#173">173</a> +<a class="jxr_linenumber" name="174" href="#174">174</a> <em class="jxr_comment"> // add tomcat classes</em> +<a class="jxr_linenumber" name="175" href="#175">175</a> <em class="jxr_comment"> for ( Artifact pluginArtifact : pluginArtifacts )</em> +<a class="jxr_linenumber" name="176" href="#176">176</a> <em class="jxr_comment"> {</em> +<a class="jxr_linenumber" name="177" href="#177">177</a> <em class="jxr_comment"> if ( StringUtils.equals( "org.apache.tomcat", pluginArtifact.getGroupId() ) || StringUtils.equals(</em> +<a class="jxr_linenumber" name="178" href="#178">178</a> <em class="jxr_comment"> "org.apache.tomcat.embed", pluginArtifact.getGroupId() ) || StringUtils.equals(</em> +<a class="jxr_linenumber" name="179" href="#179">179</a> <em class="jxr_comment"> "org.eclipse.jdt.core.compiler", pluginArtifact.getGroupId() ) || StringUtils.equals( "commons-cli",</em> +<a class="jxr_linenumber" name="180" href="#180">180</a> <em class="jxr_comment"> pluginArtifact.getArtifactId() )</em> +<a class="jxr_linenumber" name="181" href="#181">181</a> <em class="jxr_comment"> || StringUtils.equals( "tomcat7-war-runner", pluginArtifact.getArtifactId() ) )</em> +<a class="jxr_linenumber" name="182" href="#182">182</a> <em class="jxr_comment"> {</em> +<a class="jxr_linenumber" name="183" href="#183">183</a> <em class="jxr_comment"> JarFile jarFile = new JarFile( pluginArtifact.getFile() );</em> +<a class="jxr_linenumber" name="184" href="#184">184</a> <em class="jxr_comment"> extractJarToArchive( jarFile, os );</em> +<a class="jxr_linenumber" name="185" href="#185">185</a> <em class="jxr_comment"> }</em> +<a class="jxr_linenumber" name="186" href="#186">186</a> <em class="jxr_comment"> }</em> +<a class="jxr_linenumber" name="187" href="#187">187</a> +<a class="jxr_linenumber" name="188" href="#188">188</a> <em class="jxr_comment"> // add extra dependencies</em> +<a class="jxr_linenumber" name="189" href="#189">189</a> <em class="jxr_comment"> if ( extraDependencies != null && !extraDependencies.isEmpty() )</em> +<a class="jxr_linenumber" name="190" href="#190">190</a> <em class="jxr_comment"> {</em> +<a class="jxr_linenumber" name="191" href="#191">191</a> <em class="jxr_comment"> for ( Dependency dependency : extraDependencies )</em> +<a class="jxr_linenumber" name="192" href="#192">192</a> <em class="jxr_comment"> {</em> +<a class="jxr_linenumber" name="193" href="#193">193</a> <em class="jxr_comment"> // String groupId, String artifactId, String version, String scope, String type</em> +<a class="jxr_linenumber" name="194" href="#194">194</a> <em class="jxr_comment"> Artifact artifact =</em> +<a class="jxr_linenumber" name="195" href="#195">195</a> <em class="jxr_comment"> artifactFactory.createArtifact( dependency.getGroupId(), dependency.getArtifactId(),</em> +<a class="jxr_linenumber" name="196" href="#196">196</a> <em class="jxr_comment"> dependency.getVersion(), dependency.getScope(),</em> +<a class="jxr_linenumber" name="197" href="#197">197</a> <em class="jxr_comment"> dependency.getType() );</em> +<a class="jxr_linenumber" name="198" href="#198">198</a> +<a class="jxr_linenumber" name="199" href="#199">199</a> <em class="jxr_comment"> artifactResolver.resolve( artifact, this.remoteRepos, this.local );</em> +<a class="jxr_linenumber" name="200" href="#200">200</a> <em class="jxr_comment"> JarFile jarFile = new JarFile( artifact.getFile() );</em> +<a class="jxr_linenumber" name="201" href="#201">201</a> <em class="jxr_comment"> extractJarToArchive( jarFile, os );</em> +<a class="jxr_linenumber" name="202" href="#202">202</a> <em class="jxr_comment"> }</em> +<a class="jxr_linenumber" name="203" href="#203">203</a> <em class="jxr_comment"> }</em> <a class="jxr_linenumber" name="204" href="#204">204</a> -<a class="jxr_linenumber" name="205" href="#205">205</a> <em class="jxr_comment"> manifest.write( tmpManifestWriter );</em> -<a class="jxr_linenumber" name="206" href="#206">206</a> <em class="jxr_comment"> tmpManifestWriter.flush();</em> -<a class="jxr_linenumber" name="207" href="#207">207</a> <em class="jxr_comment"> tmpManifestWriter.close();</em> -<a class="jxr_linenumber" name="208" href="#208">208</a> -<a class="jxr_linenumber" name="209" href="#209">209</a> <em class="jxr_comment"> os.putArchiveEntry( new JarArchiveEntry( "META-INF/MANIFEST.MF" ) );</em> -<a class="jxr_linenumber" name="210" href="#210">210</a> <em class="jxr_comment"> IOUtils.copy( new FileInputStream( tmpManifestFile ), os );</em> -<a class="jxr_linenumber" name="211" href="#211">211</a> <em class="jxr_comment"> os.closeArchiveEntry();</em> -<a class="jxr_linenumber" name="212" href="#212">212</a> -<a class="jxr_linenumber" name="213" href="#213">213</a> <em class="jxr_comment"> if ( attachArtifact )</em> -<a class="jxr_linenumber" name="214" href="#214">214</a> <em class="jxr_comment"> {</em> -<a class="jxr_linenumber" name="215" href="#215">215</a> <em class="jxr_comment"> //MavenProject project, String artifactType, String artifactClassifier, File artifactFile</em> -<a class="jxr_linenumber" name="216" href="#216">216</a> <em class="jxr_comment"> projectHelper.attachArtifact( project, attachArtifactClassifierType, attachArtifactClassifier,</em> -<a class="jxr_linenumber" name="217" href="#217">217</a> <em class="jxr_comment"> execWarJar );</em> -<a class="jxr_linenumber" name="218" href="#218">218</a> <em class="jxr_comment"> }</em> +<a class="jxr_linenumber" name="205" href="#205">205</a> <em class="jxr_comment"> Manifest manifest = new Manifest();</em> +<a class="jxr_linenumber" name="206" href="#206">206</a> +<a class="jxr_linenumber" name="207" href="#207">207</a> <em class="jxr_comment"> Manifest.Attribute mainClassAtt = new Manifest.Attribute();</em> +<a class="jxr_linenumber" name="208" href="#208">208</a> <em class="jxr_comment"> mainClassAtt.setName( "Main-Class" );</em> +<a class="jxr_linenumber" name="209" href="#209">209</a> <em class="jxr_comment"> mainClassAtt.setValue( mainClass );</em> +<a class="jxr_linenumber" name="210" href="#210">210</a> <em class="jxr_comment"> manifest.addConfiguredAttribute( mainClassAtt );</em> +<a class="jxr_linenumber" name="211" href="#211">211</a> +<a class="jxr_linenumber" name="212" href="#212">212</a> <em class="jxr_comment"> manifest.write( tmpManifestWriter );</em> +<a class="jxr_linenumber" name="213" href="#213">213</a> <em class="jxr_comment"> tmpManifestWriter.flush();</em> +<a class="jxr_linenumber" name="214" href="#214">214</a> <em class="jxr_comment"> tmpManifestWriter.close();</em> +<a class="jxr_linenumber" name="215" href="#215">215</a> +<a class="jxr_linenumber" name="216" href="#216">216</a> <em class="jxr_comment"> os.putArchiveEntry( new JarArchiveEntry( "META-INF/MANIFEST.MF" ) );</em> +<a class="jxr_linenumber" name="217" href="#217">217</a> <em class="jxr_comment"> IOUtils.copy( new FileInputStream( tmpManifestFile ), os );</em> +<a class="jxr_linenumber" name="218" href="#218">218</a> <em class="jxr_comment"> os.closeArchiveEntry();</em> <a class="jxr_linenumber" name="219" href="#219">219</a> -<a class="jxr_linenumber" name="220" href="#220">220</a> <em class="jxr_comment"> if ( extraResources != null )</em> +<a class="jxr_linenumber" name="220" href="#220">220</a> <em class="jxr_comment"> if ( attachArtifact )</em> <a class="jxr_linenumber" name="221" href="#221">221</a> <em class="jxr_comment"> {</em> -<a class="jxr_linenumber" name="222" href="#222">222</a> <em class="jxr_comment"> for ( ExtraResource extraResource : extraResources )</em> -<a class="jxr_linenumber" name="223" href="#223">223</a> <em class="jxr_comment"> {</em> -<a class="jxr_linenumber" name="224" href="#224">224</a> -<a class="jxr_linenumber" name="225" href="#225">225</a> <em class="jxr_comment"> DirectoryScanner directoryScanner = new DirectoryScanner();</em> -<a class="jxr_linenumber" name="226" href="#226">226</a> <em class="jxr_comment"> directoryScanner.setBasedir( extraResource.getDirectory() );</em> -<a class="jxr_linenumber" name="227" href="#227">227</a> <em class="jxr_comment"> directoryScanner.addDefaultExcludes();</em> -<a class="jxr_linenumber" name="228" href="#228">228</a> <em class="jxr_comment"> directoryScanner.setExcludes( toStringArray( extraResource.getExcludes() ) );</em> -<a class="jxr_linenumber" name="229" href="#229">229</a> <em class="jxr_comment"> directoryScanner.setIncludes( toStringArray( extraResource.getIncludes() ) );</em> -<a class="jxr_linenumber" name="230" href="#230">230</a> <em class="jxr_comment"> directoryScanner.scan();</em> -<a class="jxr_linenumber" name="231" href="#231">231</a> <em class="jxr_comment"> for ( String includeFile : directoryScanner.getIncludedFiles() )</em> -<a class="jxr_linenumber" name="232" href="#232">232</a> <em class="jxr_comment"> {</em> -<a class="jxr_linenumber" name="233" href="#233">233</a> <em class="jxr_comment"> getLog().debug( "include file:" + includeFile );</em> -<a class="jxr_linenumber" name="234" href="#234">234</a> <em class="jxr_comment"> os.putArchiveEntry( new JarArchiveEntry( includeFile ) );</em> -<a class="jxr_linenumber" name="235" href="#235">235</a> <em class="jxr_comment"> IOUtils.copy( new FileInputStream( new File( extraResource.getDirectory(), includeFile ) ),</em> -<a class="jxr_linenumber" name="236" href="#236">236</a> <em class="jxr_comment"> os );</em> -<a class="jxr_linenumber" name="237" href="#237">237</a> <em class="jxr_comment"> os.closeArchiveEntry();</em> -<a class="jxr_linenumber" name="238" href="#238">238</a> <em class="jxr_comment"> }</em> -<a class="jxr_linenumber" name="239" href="#239">239</a> <em class="jxr_comment"> }</em> -<a class="jxr_linenumber" name="240" href="#240">240</a> <em class="jxr_comment"> }</em> -<a class="jxr_linenumber" name="241" href="#241">241</a> -<a class="jxr_linenumber" name="242" href="#242">242</a> <em class="jxr_comment"> if ( tomcatConfigurationFilesDirectory != null && tomcatConfigurationFilesDirectory.exists() )</em> -<a class="jxr_linenumber" name="243" href="#243">243</a> <em class="jxr_comment"> {</em> -<a class="jxr_linenumber" name="244" href="#244">244</a> <em class="jxr_comment"> // Because its the tomcat default dir for configs</em> -<a class="jxr_linenumber" name="245" href="#245">245</a> <em class="jxr_comment"> String aConfigOutputDir = "conf/";</em> -<a class="jxr_linenumber" name="246" href="#246">246</a> <em class="jxr_comment"> copyDirectoryContentIntoArchive( tomcatConfigurationFilesDirectory, aConfigOutputDir, os );</em> +<a class="jxr_linenumber" name="222" href="#222">222</a> <em class="jxr_comment"> //MavenProject project, String artifactType, String artifactClassifier, File artifactFile</em> +<a class="jxr_linenumber" name="223" href="#223">223</a> <em class="jxr_comment"> projectHelper.attachArtifact( project, attachArtifactClassifierType, attachArtifactClassifier,</em> +<a class="jxr_linenumber" name="224" href="#224">224</a> <em class="jxr_comment"> execWarJar );</em> +<a class="jxr_linenumber" name="225" href="#225">225</a> <em class="jxr_comment"> }</em> +<a class="jxr_linenumber" name="226" href="#226">226</a> +<a class="jxr_linenumber" name="227" href="#227">227</a> <em class="jxr_comment"> if ( extraResources != null )</em> +<a class="jxr_linenumber" name="228" href="#228">228</a> <em class="jxr_comment"> {</em> +<a class="jxr_linenumber" name="229" href="#229">229</a> <em class="jxr_comment"> for ( ExtraResource extraResource : extraResources )</em> +<a class="jxr_linenumber" name="230" href="#230">230</a> <em class="jxr_comment"> {</em> +<a class="jxr_linenumber" name="231" href="#231">231</a> +<a class="jxr_linenumber" name="232" href="#232">232</a> <em class="jxr_comment"> DirectoryScanner directoryScanner = new DirectoryScanner();</em> +<a class="jxr_linenumber" name="233" href="#233">233</a> <em class="jxr_comment"> directoryScanner.setBasedir( extraResource.getDirectory() );</em> +<a class="jxr_linenumber" name="234" href="#234">234</a> <em class="jxr_comment"> directoryScanner.addDefaultExcludes();</em> +<a class="jxr_linenumber" name="235" href="#235">235</a> <em class="jxr_comment"> directoryScanner.setExcludes( toStringArray( extraResource.getExcludes() ) );</em> +<a class="jxr_linenumber" name="236" href="#236">236</a> <em class="jxr_comment"> directoryScanner.setIncludes( toStringArray( extraResource.getIncludes() ) );</em> +<a class="jxr_linenumber" name="237" href="#237">237</a> <em class="jxr_comment"> directoryScanner.scan();</em> +<a class="jxr_linenumber" name="238" href="#238">238</a> <em class="jxr_comment"> for ( String includeFile : directoryScanner.getIncludedFiles() )</em> +<a class="jxr_linenumber" name="239" href="#239">239</a> <em class="jxr_comment"> {</em> +<a class="jxr_linenumber" name="240" href="#240">240</a> <em class="jxr_comment"> getLog().debug( "include file:" + includeFile );</em> +<a class="jxr_linenumber" name="241" href="#241">241</a> <em class="jxr_comment"> os.putArchiveEntry( new JarArchiveEntry( includeFile ) );</em> +<a class="jxr_linenumber" name="242" href="#242">242</a> <em class="jxr_comment"> IOUtils.copy( new FileInputStream( new File( extraResource.getDirectory(), includeFile ) ),</em> +<a class="jxr_linenumber" name="243" href="#243">243</a> <em class="jxr_comment"> os );</em> +<a class="jxr_linenumber" name="244" href="#244">244</a> <em class="jxr_comment"> os.closeArchiveEntry();</em> +<a class="jxr_linenumber" name="245" href="#245">245</a> <em class="jxr_comment"> }</em> +<a class="jxr_linenumber" name="246" href="#246">246</a> <em class="jxr_comment"> }</em> <a class="jxr_linenumber" name="247" href="#247">247</a> <em class="jxr_comment"> }</em> -<a class="jxr_linenumber" name="248" href="#248">248</a> <em class="jxr_comment"> }</em> -<a class="jxr_linenumber" name="249" href="#249">249</a> <em class="jxr_comment"> catch ( ManifestException e )</em> -<a class="jxr_linenumber" name="250" href="#250">250</a> <em class="jxr_comment"> {</em> -<a class="jxr_linenumber" name="251" href="#251">251</a> <em class="jxr_comment"> throw new MojoExecutionException( e.getMessage(), e );</em> -<a class="jxr_linenumber" name="252" href="#252">252</a> <em class="jxr_comment"> }</em> -<a class="jxr_linenumber" name="253" href="#253">253</a> <em class="jxr_comment"> catch ( IOException e )</em> -<a class="jxr_linenumber" name="254" href="#254">254</a> <em class="jxr_comment"> {</em> -<a class="jxr_linenumber" name="255" href="#255">255</a> <em class="jxr_comment"> throw new MojoExecutionException( e.getMessage(), e );</em> -<a class="jxr_linenumber" name="256" href="#256">256</a> <em class="jxr_comment"> }</em> -<a class="jxr_linenumber" name="257" href="#257">257</a> <em class="jxr_comment"> catch ( ArchiveException e )</em> -<a class="jxr_linenumber" name="258" href="#258">258</a> <em class="jxr_comment"> {</em> -<a class="jxr_linenumber" name="259" href="#259">259</a> <em class="jxr_comment"> throw new MojoExecutionException( e.getMessage(), e );</em> -<a class="jxr_linenumber" name="260" href="#260">260</a> <em class="jxr_comment"> }</em> -<a class="jxr_linenumber" name="261" href="#261">261</a> <em class="jxr_comment"> catch ( ArtifactNotFoundException e )</em> -<a class="jxr_linenumber" name="262" href="#262">262</a> <em class="jxr_comment"> {</em> -<a class="jxr_linenumber" name="263" href="#263">263</a> <em class="jxr_comment"> throw new MojoExecutionException( e.getMessage(), e );</em> -<a class="jxr_linenumber" name="264" href="#264">264</a> <em class="jxr_comment"> }</em> -<a class="jxr_linenumber" name="265" href="#265">265</a> <em class="jxr_comment"> catch ( ArtifactResolutionException e )</em> -<a class="jxr_linenumber" name="266" href="#266">266</a> <em class="jxr_comment"> {</em> -<a class="jxr_linenumber" name="267" href="#267">267</a> <em class="jxr_comment"> throw new MojoExecutionException( e.getMessage(), e );</em> -<a class="jxr_linenumber" name="268" href="#268">268</a> <em class="jxr_comment"> }</em> -<a class="jxr_linenumber" name="269" href="#269">269</a> <em class="jxr_comment"> finally</em> -<a class="jxr_linenumber" name="270" href="#270">270</a> <em class="jxr_comment"> {</em> -<a class="jxr_linenumber" name="271" href="#271">271</a> <em class="jxr_comment"> IOUtils.closeQuietly( os );</em> -<a class="jxr_linenumber" name="272" href="#272">272</a> <em class="jxr_comment"> IOUtils.closeQuietly( tmpManifestWriter );</em> -<a class="jxr_linenumber" name="273" href="#273">273</a> <em class="jxr_comment"> IOUtils.closeQuietly( execWarJarOutputStream );</em> -<a class="jxr_linenumber" name="274" href="#274">274</a> <em class="jxr_comment"> IOUtils.closeQuietly( tmpPropertiesFileOutputStream );</em> +<a class="jxr_linenumber" name="248" href="#248">248</a> +<a class="jxr_linenumber" name="249" href="#249">249</a> <em class="jxr_comment"> if ( tomcatConfigurationFilesDirectory != null && tomcatConfigurationFilesDirectory.exists() )</em> +<a class="jxr_linenumber" name="250" href="#250">250</a> <em class="jxr_comment"> {</em> +<a class="jxr_linenumber" name="251" href="#251">251</a> <em class="jxr_comment"> // Because its the tomcat default dir for configs</em> +<a class="jxr_linenumber" name="252" href="#252">252</a> <em class="jxr_comment"> String aConfigOutputDir = "conf/";</em> +<a class="jxr_linenumber" name="253" href="#253">253</a> <em class="jxr_comment"> copyDirectoryContentIntoArchive( tomcatConfigurationFilesDirectory, aConfigOutputDir, os );</em> +<a class="jxr_linenumber" name="254" href="#254">254</a> <em class="jxr_comment"> }</em> +<a class="jxr_linenumber" name="255" href="#255">255</a> <em class="jxr_comment"> }</em> +<a class="jxr_linenumber" name="256" href="#256">256</a> <em class="jxr_comment"> catch ( ManifestException e )</em> +<a class="jxr_linenumber" name="257" href="#257">257</a> <em class="jxr_comment"> {</em> +<a class="jxr_linenumber" name="258" href="#258">258</a> <em class="jxr_comment"> throw new MojoExecutionException( e.getMessage(), e );</em> +<a class="jxr_linenumber" name="259" href="#259">259</a> <em class="jxr_comment"> }</em> +<a class="jxr_linenumber" name="260" href="#260">260</a> <em class="jxr_comment"> catch ( IOException e )</em> +<a class="jxr_linenumber" name="261" href="#261">261</a> <em class="jxr_comment"> {</em> +<a class="jxr_linenumber" name="262" href="#262">262</a> <em class="jxr_comment"> throw new MojoExecutionException( e.getMessage(), e );</em> +<a class="jxr_linenumber" name="263" href="#263">263</a> <em class="jxr_comment"> }</em> +<a class="jxr_linenumber" name="264" href="#264">264</a> <em class="jxr_comment"> catch ( ArchiveException e )</em> +<a class="jxr_linenumber" name="265" href="#265">265</a> <em class="jxr_comment"> {</em> +<a class="jxr_linenumber" name="266" href="#266">266</a> <em class="jxr_comment"> throw new MojoExecutionException( e.getMessage(), e );</em> +<a class="jxr_linenumber" name="267" href="#267">267</a> <em class="jxr_comment"> }</em> +<a class="jxr_linenumber" name="268" href="#268">268</a> <em class="jxr_comment"> catch ( ArtifactNotFoundException e )</em> +<a class="jxr_linenumber" name="269" href="#269">269</a> <em class="jxr_comment"> {</em> +<a class="jxr_linenumber" name="270" href="#270">270</a> <em class="jxr_comment"> throw new MojoExecutionException( e.getMessage(), e );</em> +<a class="jxr_linenumber" name="271" href="#271">271</a> <em class="jxr_comment"> }</em> +<a class="jxr_linenumber" name="272" href="#272">272</a> <em class="jxr_comment"> catch ( ArtifactResolutionException e )</em> +<a class="jxr_linenumber" name="273" href="#273">273</a> <em class="jxr_comment"> {</em> +<a class="jxr_linenumber" name="274" href="#274">274</a> <em class="jxr_comment"> throw new MojoExecutionException( e.getMessage(), e );</em> <a class="jxr_linenumber" name="275" href="#275">275</a> <em class="jxr_comment"> }</em> -<a class="jxr_linenumber" name="276" href="#276">276</a> -<a class="jxr_linenumber" name="277" href="#277">277</a> <em class="jxr_comment"> }</em> -<a class="jxr_linenumber" name="278" href="#278">278</a> <em class="jxr_comment">}</em> +<a class="jxr_linenumber" name="276" href="#276">276</a> <em class="jxr_comment"> finally</em> +<a class="jxr_linenumber" name="277" href="#277">277</a> <em class="jxr_comment"> {</em> +<a class="jxr_linenumber" name="278" href="#278">278</a> <em class="jxr_comment"> IOUtils.closeQuietly( os );</em> +<a class="jxr_linenumber" name="279" href="#279">279</a> <em class="jxr_comment"> IOUtils.closeQuietly( tmpManifestWriter );</em> +<a class="jxr_linenumber" name="280" href="#280">280</a> <em class="jxr_comment"> IOUtils.closeQuietly( execWarJarOutputStream );</em> +<a class="jxr_linenumber" name="281" href="#281">281</a> <em class="jxr_comment"> IOUtils.closeQuietly( tmpPropertiesFileOutputStream );</em> +<a class="jxr_linenumber" name="282" href="#282">282</a> <em class="jxr_comment"> }</em> +<a class="jxr_linenumber" name="283" href="#283">283</a> +<a class="jxr_linenumber" name="284" href="#284">284</a> <em class="jxr_comment"> }</em> +<a class="jxr_linenumber" name="285" href="#285">285</a> <em class="jxr_comment">}</em> </pre> <hr/><div id="footer">This page was automatically generated by <a href="http://maven.apache.org/";>Maven</a></div></body> </html>
Modified: tomcat/site/trunk/docs/maven-plugin-trunk/tomcat7-maven-plugin/xref/org/apache/tomcat/maven/plugin/tomcat7/run/StandaloneWarMojo.html URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/maven-plugin-trunk/tomcat7-maven-plugin/xref/org/apache/tomcat/maven/plugin/tomcat7/run/StandaloneWarMojo.html?rev=1469257&r1=1469256&r2=1469257&view=diff ============================================================================== --- tomcat/site/trunk/docs/maven-plugin-trunk/tomcat7-maven-plugin/xref/org/apache/tomcat/maven/plugin/tomcat7/run/StandaloneWarMojo.html (original) +++ tomcat/site/trunk/docs/maven-plugin-trunk/tomcat7-maven-plugin/xref/org/apache/tomcat/maven/plugin/tomcat7/run/StandaloneWarMojo.html Thu Apr 18 10:00:44 2013 @@ -8,7 +8,7 @@ <body> <div id="overview"><a href="../../../../../../../../apidocs/org/apache/tomcat/maven/plugin/tomcat7/run/StandaloneWarMojo.html">View Javadoc</a></div><pre> -<a class="jxr_linenumber" name="1" href="#1">1</a> <strong class="jxr_keyword">package</strong> org.apache.tomcat.maven.plugin.tomcat7.run; +<a class="jxr_linenumber" name="1" href="#1">1</a> <em class="jxr_comment">package org.apache.tomcat.maven.plugin.tomcat7.run;</em> <a class="jxr_linenumber" name="2" href="#2">2</a> <em class="jxr_comment">/*</em> <a class="jxr_linenumber" name="3" href="#3">3</a> <em class="jxr_comment"> * Licensed to the Apache Software Foundation (ASF) under one</em> <a class="jxr_linenumber" name="4" href="#4">4</a> <em class="jxr_comment"> * or more contributor license agreements. See the NOTICE file</em> --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
