tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ol...@apache.org
Subject svn commit: r1539210 [12/12] - in /tomcat/site/trunk/docs/maven-plugin-trunk: ./ apidocs/org/apache/tomcat/maven/plugin/tomcat7/run/ common-tomcat-maven-plugin/ common-tomcat-maven-plugin/xref/org/apache/tomcat/maven/common/run/ tomcat-maven-archetype/...
Date Wed, 06 Nov 2013 01:39:45 GMT
Modified: tomcat/site/trunk/docs/maven-plugin-trunk/tomcat7-war-runner/xref/org/apache/tomcat/maven/runner/Tomcat7Runner.html
URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/maven-plugin-trunk/tomcat7-war-runner/xref/org/apache/tomcat/maven/runner/Tomcat7Runner.html?rev=1539210&r1=1539209&r2=1539210&view=diff
==============================================================================
--- tomcat/site/trunk/docs/maven-plugin-trunk/tomcat7-war-runner/xref/org/apache/tomcat/maven/runner/Tomcat7Runner.html (original)
+++ tomcat/site/trunk/docs/maven-plugin-trunk/tomcat7-war-runner/xref/org/apache/tomcat/maven/runner/Tomcat7Runner.html Wed Nov  6 01:39:41 2013
@@ -570,260 +570,267 @@
 <a class="jxr_linenumber" name="560" href="#560">560</a>             InputStream inputStream = <strong class="jxr_keyword">null</strong>;
 <a class="jxr_linenumber" name="561" href="#561">561</a>             <strong class="jxr_keyword">try</strong>
 <a class="jxr_linenumber" name="562" href="#562">562</a>             {
-<a class="jxr_linenumber" name="563" href="#563">563</a>                 inputStream = Thread.currentThread().getContextClassLoader().getResourceAsStream( entry.getValue() );
-<a class="jxr_linenumber" name="564" href="#564">564</a>                 <strong class="jxr_keyword">if</strong> ( !useServerXml() )
-<a class="jxr_linenumber" name="565" href="#565">565</a>                 {
-<a class="jxr_linenumber" name="566" href="#566">566</a>                     <strong class="jxr_keyword">if</strong> ( entry.getKey().equals( <span class="jxr_string">"/"</span> ) )
-<a class="jxr_linenumber" name="567" href="#567">567</a>                     {
-<a class="jxr_linenumber" name="568" href="#568">568</a>                         File expandFile = <strong class="jxr_keyword">new</strong> File( extractDirectory, <span class="jxr_string">"webapps/ROOT.war"</span> );
-<a class="jxr_linenumber" name="569" href="#569">569</a>                         debugMessage( <span class="jxr_string">"expand to file:"</span> + expandFile.getPath() );
-<a class="jxr_linenumber" name="570" href="#570">570</a>                         expand( inputStream, expandFile );
-<a class="jxr_linenumber" name="571" href="#571">571</a>                     }
-<a class="jxr_linenumber" name="572" href="#572">572</a>                     <strong class="jxr_keyword">else</strong>
-<a class="jxr_linenumber" name="573" href="#573">573</a>                     {
-<a class="jxr_linenumber" name="574" href="#574">574</a>                         File expandFile = <strong class="jxr_keyword">new</strong> File( extractDirectory, <span class="jxr_string">"webapps/"</span> + entry.getValue() );
-<a class="jxr_linenumber" name="575" href="#575">575</a>                         debugMessage( <span class="jxr_string">"expand to file:"</span> + expandFile.getPath() );
-<a class="jxr_linenumber" name="576" href="#576">576</a>                         expand( inputStream, expandFile );
-<a class="jxr_linenumber" name="577" href="#577">577</a>                     }
-<a class="jxr_linenumber" name="578" href="#578">578</a>                 }
-<a class="jxr_linenumber" name="579" href="#579">579</a>                 <strong class="jxr_keyword">else</strong>
-<a class="jxr_linenumber" name="580" href="#580">580</a>                 {
-<a class="jxr_linenumber" name="581" href="#581">581</a>                     File expandFile = <strong class="jxr_keyword">new</strong> File( extractDirectory, <span class="jxr_string">"webapps/"</span> + entry.getValue() );
-<a class="jxr_linenumber" name="582" href="#582">582</a>                     debugMessage( <span class="jxr_string">"expand to file:"</span> + expandFile.getPath() );
-<a class="jxr_linenumber" name="583" href="#583">583</a>                     expand( inputStream, <strong class="jxr_keyword">new</strong> File( extractDirectory, <span class="jxr_string">"webapps/"</span> + entry.getValue() ) );
-<a class="jxr_linenumber" name="584" href="#584">584</a>                 }
-<a class="jxr_linenumber" name="585" href="#585">585</a>             }
-<a class="jxr_linenumber" name="586" href="#586">586</a>             <strong class="jxr_keyword">finally</strong>
-<a class="jxr_linenumber" name="587" href="#587">587</a>             {
-<a class="jxr_linenumber" name="588" href="#588">588</a>                 <strong class="jxr_keyword">if</strong> ( inputStream != <strong class="jxr_keyword">null</strong> )
-<a class="jxr_linenumber" name="589" href="#589">589</a>                 {
-<a class="jxr_linenumber" name="590" href="#590">590</a>                     inputStream.close();
-<a class="jxr_linenumber" name="591" href="#591">591</a>                 }
+<a class="jxr_linenumber" name="563" href="#563">563</a>                 File expandFile = <strong class="jxr_keyword">null</strong>;
+<a class="jxr_linenumber" name="564" href="#564">564</a>                 inputStream = Thread.currentThread().getContextClassLoader().getResourceAsStream( entry.getValue() );
+<a class="jxr_linenumber" name="565" href="#565">565</a>                 <strong class="jxr_keyword">if</strong> ( !useServerXml() )
+<a class="jxr_linenumber" name="566" href="#566">566</a>                 {
+<a class="jxr_linenumber" name="567" href="#567">567</a>                     <strong class="jxr_keyword">if</strong> ( entry.getKey().equals( <span class="jxr_string">"/"</span> ) )
+<a class="jxr_linenumber" name="568" href="#568">568</a>                     {
+<a class="jxr_linenumber" name="569" href="#569">569</a>                         expandFile = <strong class="jxr_keyword">new</strong> File( extractDirectory, <span class="jxr_string">"webapps/ROOT.war"</span> );
+<a class="jxr_linenumber" name="570" href="#570">570</a>                     }
+<a class="jxr_linenumber" name="571" href="#571">571</a>                     <strong class="jxr_keyword">else</strong>
+<a class="jxr_linenumber" name="572" href="#572">572</a>                     {
+<a class="jxr_linenumber" name="573" href="#573">573</a>                         expandFile = <strong class="jxr_keyword">new</strong> File( extractDirectory, <span class="jxr_string">"webapps/"</span> + entry.getValue() );
+<a class="jxr_linenumber" name="574" href="#574">574</a>                     }
+<a class="jxr_linenumber" name="575" href="#575">575</a>                 }
+<a class="jxr_linenumber" name="576" href="#576">576</a>                 <strong class="jxr_keyword">else</strong>
+<a class="jxr_linenumber" name="577" href="#577">577</a>                 {
+<a class="jxr_linenumber" name="578" href="#578">578</a>                     expandFile = <strong class="jxr_keyword">new</strong> File( extractDirectory, <span class="jxr_string">"webapps/"</span> + entry.getValue() );
+<a class="jxr_linenumber" name="579" href="#579">579</a>                 }
+<a class="jxr_linenumber" name="580" href="#580">580</a> 
+<a class="jxr_linenumber" name="581" href="#581">581</a>                 debugMessage( <span class="jxr_string">"expand to file:"</span> + expandFile.getPath() );
+<a class="jxr_linenumber" name="582" href="#582">582</a> 
+<a class="jxr_linenumber" name="583" href="#583">583</a>                 <em class="jxr_comment">// MTOMCAT-211 ensure parent directories created</em>
+<a class="jxr_linenumber" name="584" href="#584">584</a> 
+<a class="jxr_linenumber" name="585" href="#585">585</a>                 <strong class="jxr_keyword">if</strong> ( !expandFile.getParentFile().mkdirs() )
+<a class="jxr_linenumber" name="586" href="#586">586</a>                 {
+<a class="jxr_linenumber" name="587" href="#587">587</a>                     <strong class="jxr_keyword">throw</strong> <strong class="jxr_keyword">new</strong> Exception( <span class="jxr_string">"FATAL: impossible to create directories:"</span> + expandFile.getParentFile() );
+<a class="jxr_linenumber" name="588" href="#588">588</a>                 }
+<a class="jxr_linenumber" name="589" href="#589">589</a> 
+<a class="jxr_linenumber" name="590" href="#590">590</a>                 expand( inputStream, expandFile );
+<a class="jxr_linenumber" name="591" href="#591">591</a> 
 <a class="jxr_linenumber" name="592" href="#592">592</a>             }
-<a class="jxr_linenumber" name="593" href="#593">593</a>         }
-<a class="jxr_linenumber" name="594" href="#594">594</a> 
-<a class="jxr_linenumber" name="595" href="#595">595</a>         <em class="jxr_comment">//Copy code source to webapps folder</em>
-<a class="jxr_linenumber" name="596" href="#596">596</a>         <strong class="jxr_keyword">if</strong> ( codeSourceWar != <strong class="jxr_keyword">null</strong> )
-<a class="jxr_linenumber" name="597" href="#597">597</a>         {
-<a class="jxr_linenumber" name="598" href="#598">598</a>             FileInputStream inputStream = <strong class="jxr_keyword">null</strong>;
-<a class="jxr_linenumber" name="599" href="#599">599</a>             <strong class="jxr_keyword">try</strong>
-<a class="jxr_linenumber" name="600" href="#600">600</a>             {
-<a class="jxr_linenumber" name="601" href="#601">601</a>                 File expandFile = <strong class="jxr_keyword">new</strong> File( extractDirectory, <span class="jxr_string">"webapps/"</span> + codeSourceContextPath + <span class="jxr_string">".war"</span> );
-<a class="jxr_linenumber" name="602" href="#602">602</a>                 inputStream = <strong class="jxr_keyword">new</strong> FileInputStream( codeSourceWar );
-<a class="jxr_linenumber" name="603" href="#603">603</a>                 debugMessage( <span class="jxr_string">"move code source to file:"</span> + expandFile.getPath() );
-<a class="jxr_linenumber" name="604" href="#604">604</a>                 expand( inputStream, expandFile );
-<a class="jxr_linenumber" name="605" href="#605">605</a>             }
-<a class="jxr_linenumber" name="606" href="#606">606</a>             <strong class="jxr_keyword">finally</strong>
+<a class="jxr_linenumber" name="593" href="#593">593</a>             <strong class="jxr_keyword">finally</strong>
+<a class="jxr_linenumber" name="594" href="#594">594</a>             {
+<a class="jxr_linenumber" name="595" href="#595">595</a>                 <strong class="jxr_keyword">if</strong> ( inputStream != <strong class="jxr_keyword">null</strong> )
+<a class="jxr_linenumber" name="596" href="#596">596</a>                 {
+<a class="jxr_linenumber" name="597" href="#597">597</a>                     inputStream.close();
+<a class="jxr_linenumber" name="598" href="#598">598</a>                 }
+<a class="jxr_linenumber" name="599" href="#599">599</a>             }
+<a class="jxr_linenumber" name="600" href="#600">600</a>         }
+<a class="jxr_linenumber" name="601" href="#601">601</a> 
+<a class="jxr_linenumber" name="602" href="#602">602</a>         <em class="jxr_comment">//Copy code source to webapps folder</em>
+<a class="jxr_linenumber" name="603" href="#603">603</a>         <strong class="jxr_keyword">if</strong> ( codeSourceWar != <strong class="jxr_keyword">null</strong> )
+<a class="jxr_linenumber" name="604" href="#604">604</a>         {
+<a class="jxr_linenumber" name="605" href="#605">605</a>             FileInputStream inputStream = <strong class="jxr_keyword">null</strong>;
+<a class="jxr_linenumber" name="606" href="#606">606</a>             <strong class="jxr_keyword">try</strong>
 <a class="jxr_linenumber" name="607" href="#607">607</a>             {
-<a class="jxr_linenumber" name="608" href="#608">608</a>                 <strong class="jxr_keyword">if</strong> ( inputStream != <strong class="jxr_keyword">null</strong> )
-<a class="jxr_linenumber" name="609" href="#609">609</a>                 {
-<a class="jxr_linenumber" name="610" href="#610">610</a>                     inputStream.close();
-<a class="jxr_linenumber" name="611" href="#611">611</a>                 }
+<a class="jxr_linenumber" name="608" href="#608">608</a>                 File expandFile = <strong class="jxr_keyword">new</strong> File( extractDirectory, <span class="jxr_string">"webapps/"</span> + codeSourceContextPath + <span class="jxr_string">".war"</span> );
+<a class="jxr_linenumber" name="609" href="#609">609</a>                 inputStream = <strong class="jxr_keyword">new</strong> FileInputStream( codeSourceWar );
+<a class="jxr_linenumber" name="610" href="#610">610</a>                 debugMessage( <span class="jxr_string">"move code source to file:"</span> + expandFile.getPath() );
+<a class="jxr_linenumber" name="611" href="#611">611</a>                 expand( inputStream, expandFile );
 <a class="jxr_linenumber" name="612" href="#612">612</a>             }
-<a class="jxr_linenumber" name="613" href="#613">613</a>         }
-<a class="jxr_linenumber" name="614" href="#614">614</a> 
-<a class="jxr_linenumber" name="615" href="#615">615</a>         <em class="jxr_comment">// expand tomcat configuration files if there</em>
-<a class="jxr_linenumber" name="616" href="#616">616</a>         expandConfigurationFile( <span class="jxr_string">"catalina.properties"</span>, extractDirectoryFile );
-<a class="jxr_linenumber" name="617" href="#617">617</a>         expandConfigurationFile( <span class="jxr_string">"logging.properties"</span>, extractDirectoryFile );
-<a class="jxr_linenumber" name="618" href="#618">618</a>         expandConfigurationFile( <span class="jxr_string">"tomcat-users.xml"</span>, extractDirectoryFile );
-<a class="jxr_linenumber" name="619" href="#619">619</a>         expandConfigurationFile( <span class="jxr_string">"catalina.policy"</span>, extractDirectoryFile );
-<a class="jxr_linenumber" name="620" href="#620">620</a>         expandConfigurationFile( <span class="jxr_string">"context.xml"</span>, extractDirectoryFile );
-<a class="jxr_linenumber" name="621" href="#621">621</a>         expandConfigurationFile( <span class="jxr_string">"server.xml"</span>, extractDirectoryFile );
-<a class="jxr_linenumber" name="622" href="#622">622</a>         expandConfigurationFile( <span class="jxr_string">"web.xml"</span>, extractDirectoryFile );
-<a class="jxr_linenumber" name="623" href="#623">623</a> 
-<a class="jxr_linenumber" name="624" href="#624">624</a>     }
-<a class="jxr_linenumber" name="625" href="#625">625</a> 
-<a class="jxr_linenumber" name="626" href="#626">626</a>     <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">static</strong> <strong class="jxr_keyword">void</strong> expandConfigurationFile( String fileName, File extractDirectory )
-<a class="jxr_linenumber" name="627" href="#627">627</a>         <strong class="jxr_keyword">throws</strong> Exception
-<a class="jxr_linenumber" name="628" href="#628">628</a>     {
-<a class="jxr_linenumber" name="629" href="#629">629</a>         InputStream inputStream = <strong class="jxr_keyword">null</strong>;
-<a class="jxr_linenumber" name="630" href="#630">630</a>         <strong class="jxr_keyword">try</strong>
-<a class="jxr_linenumber" name="631" href="#631">631</a>         {
-<a class="jxr_linenumber" name="632" href="#632">632</a>             inputStream = Thread.currentThread().getContextClassLoader().getResourceAsStream( <span class="jxr_string">"conf/"</span> + fileName );
-<a class="jxr_linenumber" name="633" href="#633">633</a>             <strong class="jxr_keyword">if</strong> ( inputStream != <strong class="jxr_keyword">null</strong> )
-<a class="jxr_linenumber" name="634" href="#634">634</a>             {
-<a class="jxr_linenumber" name="635" href="#635">635</a>                 File confDirectory = <strong class="jxr_keyword">new</strong> File( extractDirectory, <span class="jxr_string">"conf"</span> );
-<a class="jxr_linenumber" name="636" href="#636">636</a>                 <strong class="jxr_keyword">if</strong> ( !confDirectory.exists() )
-<a class="jxr_linenumber" name="637" href="#637">637</a>                 {
-<a class="jxr_linenumber" name="638" href="#638">638</a>                     confDirectory.mkdirs();
-<a class="jxr_linenumber" name="639" href="#639">639</a>                 }
-<a class="jxr_linenumber" name="640" href="#640">640</a>                 expand( inputStream, <strong class="jxr_keyword">new</strong> File( confDirectory, fileName ) );
-<a class="jxr_linenumber" name="641" href="#641">641</a>             }
-<a class="jxr_linenumber" name="642" href="#642">642</a>         }
-<a class="jxr_linenumber" name="643" href="#643">643</a>         <strong class="jxr_keyword">finally</strong>
-<a class="jxr_linenumber" name="644" href="#644">644</a>         {
-<a class="jxr_linenumber" name="645" href="#645">645</a>             <strong class="jxr_keyword">if</strong> ( inputStream != <strong class="jxr_keyword">null</strong> )
-<a class="jxr_linenumber" name="646" href="#646">646</a>             {
-<a class="jxr_linenumber" name="647" href="#647">647</a>                 inputStream.close();
+<a class="jxr_linenumber" name="613" href="#613">613</a>             <strong class="jxr_keyword">finally</strong>
+<a class="jxr_linenumber" name="614" href="#614">614</a>             {
+<a class="jxr_linenumber" name="615" href="#615">615</a>                 <strong class="jxr_keyword">if</strong> ( inputStream != <strong class="jxr_keyword">null</strong> )
+<a class="jxr_linenumber" name="616" href="#616">616</a>                 {
+<a class="jxr_linenumber" name="617" href="#617">617</a>                     inputStream.close();
+<a class="jxr_linenumber" name="618" href="#618">618</a>                 }
+<a class="jxr_linenumber" name="619" href="#619">619</a>             }
+<a class="jxr_linenumber" name="620" href="#620">620</a>         }
+<a class="jxr_linenumber" name="621" href="#621">621</a> 
+<a class="jxr_linenumber" name="622" href="#622">622</a>         <em class="jxr_comment">// expand tomcat configuration files if there</em>
+<a class="jxr_linenumber" name="623" href="#623">623</a>         expandConfigurationFile( <span class="jxr_string">"catalina.properties"</span>, extractDirectoryFile );
+<a class="jxr_linenumber" name="624" href="#624">624</a>         expandConfigurationFile( <span class="jxr_string">"logging.properties"</span>, extractDirectoryFile );
+<a class="jxr_linenumber" name="625" href="#625">625</a>         expandConfigurationFile( <span class="jxr_string">"tomcat-users.xml"</span>, extractDirectoryFile );
+<a class="jxr_linenumber" name="626" href="#626">626</a>         expandConfigurationFile( <span class="jxr_string">"catalina.policy"</span>, extractDirectoryFile );
+<a class="jxr_linenumber" name="627" href="#627">627</a>         expandConfigurationFile( <span class="jxr_string">"context.xml"</span>, extractDirectoryFile );
+<a class="jxr_linenumber" name="628" href="#628">628</a>         expandConfigurationFile( <span class="jxr_string">"server.xml"</span>, extractDirectoryFile );
+<a class="jxr_linenumber" name="629" href="#629">629</a>         expandConfigurationFile( <span class="jxr_string">"web.xml"</span>, extractDirectoryFile );
+<a class="jxr_linenumber" name="630" href="#630">630</a> 
+<a class="jxr_linenumber" name="631" href="#631">631</a>     }
+<a class="jxr_linenumber" name="632" href="#632">632</a> 
+<a class="jxr_linenumber" name="633" href="#633">633</a>     <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">static</strong> <strong class="jxr_keyword">void</strong> expandConfigurationFile( String fileName, File extractDirectory )
+<a class="jxr_linenumber" name="634" href="#634">634</a>         <strong class="jxr_keyword">throws</strong> Exception
+<a class="jxr_linenumber" name="635" href="#635">635</a>     {
+<a class="jxr_linenumber" name="636" href="#636">636</a>         InputStream inputStream = <strong class="jxr_keyword">null</strong>;
+<a class="jxr_linenumber" name="637" href="#637">637</a>         <strong class="jxr_keyword">try</strong>
+<a class="jxr_linenumber" name="638" href="#638">638</a>         {
+<a class="jxr_linenumber" name="639" href="#639">639</a>             inputStream = Thread.currentThread().getContextClassLoader().getResourceAsStream( <span class="jxr_string">"conf/"</span> + fileName );
+<a class="jxr_linenumber" name="640" href="#640">640</a>             <strong class="jxr_keyword">if</strong> ( inputStream != <strong class="jxr_keyword">null</strong> )
+<a class="jxr_linenumber" name="641" href="#641">641</a>             {
+<a class="jxr_linenumber" name="642" href="#642">642</a>                 File confDirectory = <strong class="jxr_keyword">new</strong> File( extractDirectory, <span class="jxr_string">"conf"</span> );
+<a class="jxr_linenumber" name="643" href="#643">643</a>                 <strong class="jxr_keyword">if</strong> ( !confDirectory.exists() )
+<a class="jxr_linenumber" name="644" href="#644">644</a>                 {
+<a class="jxr_linenumber" name="645" href="#645">645</a>                     confDirectory.mkdirs();
+<a class="jxr_linenumber" name="646" href="#646">646</a>                 }
+<a class="jxr_linenumber" name="647" href="#647">647</a>                 expand( inputStream, <strong class="jxr_keyword">new</strong> File( confDirectory, fileName ) );
 <a class="jxr_linenumber" name="648" href="#648">648</a>             }
 <a class="jxr_linenumber" name="649" href="#649">649</a>         }
-<a class="jxr_linenumber" name="650" href="#650">650</a> 
-<a class="jxr_linenumber" name="651" href="#651">651</a>     }
-<a class="jxr_linenumber" name="652" href="#652">652</a> 
-<a class="jxr_linenumber" name="653" href="#653">653</a>     <em class="jxr_javadoccomment">/**</em>
-<a class="jxr_linenumber" name="654" href="#654">654</a> <em class="jxr_javadoccomment">     * @param warsValue we can value in format: wars=foo.war|contextpath;bar.war  ( |contextpath is optionnal if empty use the war name)</em>
-<a class="jxr_linenumber" name="655" href="#655">655</a> <em class="jxr_javadoccomment">     *                  so here we return war file name and populate webappWarPerContext</em>
-<a class="jxr_linenumber" name="656" href="#656">656</a> <em class="jxr_javadoccomment">     */</em>
-<a class="jxr_linenumber" name="657" href="#657">657</a>     <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">void</strong> populateWebAppWarPerContext( String warsValue )
-<a class="jxr_linenumber" name="658" href="#658">658</a>     {
-<a class="jxr_linenumber" name="659" href="#659">659</a>         <strong class="jxr_keyword">if</strong> ( warsValue == <strong class="jxr_keyword">null</strong> )
-<a class="jxr_linenumber" name="660" href="#660">660</a>         {
-<a class="jxr_linenumber" name="661" href="#661">661</a>             <strong class="jxr_keyword">return</strong>;
-<a class="jxr_linenumber" name="662" href="#662">662</a>         }
-<a class="jxr_linenumber" name="663" href="#663">663</a> 
-<a class="jxr_linenumber" name="664" href="#664">664</a>         StringTokenizer st = <strong class="jxr_keyword">new</strong> StringTokenizer( warsValue, <span class="jxr_string">";"</span> );
-<a class="jxr_linenumber" name="665" href="#665">665</a>         <strong class="jxr_keyword">while</strong> ( st.hasMoreTokens() )
-<a class="jxr_linenumber" name="666" href="#666">666</a>         {
-<a class="jxr_linenumber" name="667" href="#667">667</a>             String warValue = st.nextToken();
-<a class="jxr_linenumber" name="668" href="#668">668</a>             debugMessage( <span class="jxr_string">"populateWebAppWarPerContext warValue:"</span> + warValue );
-<a class="jxr_linenumber" name="669" href="#669">669</a>             String warFileName = <span class="jxr_string">""</span>;
-<a class="jxr_linenumber" name="670" href="#670">670</a>             String contextValue = <span class="jxr_string">""</span>;
-<a class="jxr_linenumber" name="671" href="#671">671</a>             <strong class="jxr_keyword">int</strong> separatorIndex = warValue.indexOf( <span class="jxr_string">"|"</span> );
-<a class="jxr_linenumber" name="672" href="#672">672</a>             <strong class="jxr_keyword">if</strong> ( separatorIndex &gt;= 0 )
-<a class="jxr_linenumber" name="673" href="#673">673</a>             {
-<a class="jxr_linenumber" name="674" href="#674">674</a>                 warFileName = warValue.substring( 0, separatorIndex );
-<a class="jxr_linenumber" name="675" href="#675">675</a>                 contextValue = warValue.substring( separatorIndex + 1, warValue.length() );
-<a class="jxr_linenumber" name="676" href="#676">676</a> 
-<a class="jxr_linenumber" name="677" href="#677">677</a>             }
-<a class="jxr_linenumber" name="678" href="#678">678</a>             <strong class="jxr_keyword">else</strong>
-<a class="jxr_linenumber" name="679" href="#679">679</a>             {
-<a class="jxr_linenumber" name="680" href="#680">680</a>                 warFileName = contextValue;
-<a class="jxr_linenumber" name="681" href="#681">681</a>             }
-<a class="jxr_linenumber" name="682" href="#682">682</a>             debugMessage( <span class="jxr_string">"populateWebAppWarPerContext contextValue/warFileName:"</span> + contextValue + <span class="jxr_string">"/"</span> + warFileName );
-<a class="jxr_linenumber" name="683" href="#683">683</a>             <strong class="jxr_keyword">this</strong>.webappWarPerContext.put( contextValue, warFileName );
-<a class="jxr_linenumber" name="684" href="#684">684</a>         }
-<a class="jxr_linenumber" name="685" href="#685">685</a>     }
-<a class="jxr_linenumber" name="686" href="#686">686</a> 
-<a class="jxr_linenumber" name="687" href="#687">687</a> 
-<a class="jxr_linenumber" name="688" href="#688">688</a>     <em class="jxr_javadoccomment">/**</em>
-<a class="jxr_linenumber" name="689" href="#689">689</a> <em class="jxr_javadoccomment">     * Expand the specified input stream into the specified file.</em>
-<a class="jxr_linenumber" name="690" href="#690">690</a> <em class="jxr_javadoccomment">     *</em>
-<a class="jxr_linenumber" name="691" href="#691">691</a> <em class="jxr_javadoccomment">     * @param input InputStream to be copied</em>
-<a class="jxr_linenumber" name="692" href="#692">692</a> <em class="jxr_javadoccomment">     * @param file  The file to be created</em>
-<a class="jxr_linenumber" name="693" href="#693">693</a> <em class="jxr_javadoccomment">     * @throws java.io.IOException if an input/output error occurs</em>
-<a class="jxr_linenumber" name="694" href="#694">694</a> <em class="jxr_javadoccomment">     */</em>
-<a class="jxr_linenumber" name="695" href="#695">695</a>     <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">static</strong> <strong class="jxr_keyword">void</strong> expand( InputStream input, File file )
-<a class="jxr_linenumber" name="696" href="#696">696</a>         <strong class="jxr_keyword">throws</strong> IOException
-<a class="jxr_linenumber" name="697" href="#697">697</a>     {
-<a class="jxr_linenumber" name="698" href="#698">698</a>         BufferedOutputStream output = <strong class="jxr_keyword">null</strong>;
-<a class="jxr_linenumber" name="699" href="#699">699</a>         <strong class="jxr_keyword">try</strong>
-<a class="jxr_linenumber" name="700" href="#700">700</a>         {
-<a class="jxr_linenumber" name="701" href="#701">701</a>             output = <strong class="jxr_keyword">new</strong> BufferedOutputStream( <strong class="jxr_keyword">new</strong> FileOutputStream( file ) );
-<a class="jxr_linenumber" name="702" href="#702">702</a>             byte buffer[] = <strong class="jxr_keyword">new</strong> byte[2048];
-<a class="jxr_linenumber" name="703" href="#703">703</a>             <strong class="jxr_keyword">while</strong> ( <strong class="jxr_keyword">true</strong> )
-<a class="jxr_linenumber" name="704" href="#704">704</a>             {
-<a class="jxr_linenumber" name="705" href="#705">705</a>                 <strong class="jxr_keyword">int</strong> n = input.read( buffer );
-<a class="jxr_linenumber" name="706" href="#706">706</a>                 <strong class="jxr_keyword">if</strong> ( n &lt;= 0 )
-<a class="jxr_linenumber" name="707" href="#707">707</a>                 {
-<a class="jxr_linenumber" name="708" href="#708">708</a>                     <strong class="jxr_keyword">break</strong>;
-<a class="jxr_linenumber" name="709" href="#709">709</a>                 }
-<a class="jxr_linenumber" name="710" href="#710">710</a>                 output.write( buffer, 0, n );
-<a class="jxr_linenumber" name="711" href="#711">711</a>             }
-<a class="jxr_linenumber" name="712" href="#712">712</a>         }
-<a class="jxr_linenumber" name="713" href="#713">713</a>         <strong class="jxr_keyword">finally</strong>
-<a class="jxr_linenumber" name="714" href="#714">714</a>         {
-<a class="jxr_linenumber" name="715" href="#715">715</a>             <strong class="jxr_keyword">if</strong> ( output != <strong class="jxr_keyword">null</strong> )
-<a class="jxr_linenumber" name="716" href="#716">716</a>             {
-<a class="jxr_linenumber" name="717" href="#717">717</a>                 <strong class="jxr_keyword">try</strong>
-<a class="jxr_linenumber" name="718" href="#718">718</a>                 {
-<a class="jxr_linenumber" name="719" href="#719">719</a>                     output.close();
-<a class="jxr_linenumber" name="720" href="#720">720</a>                 }
-<a class="jxr_linenumber" name="721" href="#721">721</a>                 <strong class="jxr_keyword">catch</strong> ( IOException e )
-<a class="jxr_linenumber" name="722" href="#722">722</a>                 {
-<a class="jxr_linenumber" name="723" href="#723">723</a>                     <em class="jxr_comment">// Ignore</em>
-<a class="jxr_linenumber" name="724" href="#724">724</a>                 }
-<a class="jxr_linenumber" name="725" href="#725">725</a>             }
-<a class="jxr_linenumber" name="726" href="#726">726</a>         }
-<a class="jxr_linenumber" name="727" href="#727">727</a>     }
-<a class="jxr_linenumber" name="728" href="#728">728</a> 
-<a class="jxr_linenumber" name="729" href="#729">729</a>     <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">boolean</strong> useServerXml()
-<a class="jxr_linenumber" name="730" href="#730">730</a>     {
-<a class="jxr_linenumber" name="731" href="#731">731</a>         <strong class="jxr_keyword">return</strong> Boolean.parseBoolean( runtimeProperties.getProperty( USE_SERVER_XML_KEY, Boolean.FALSE.toString() ) );
-<a class="jxr_linenumber" name="732" href="#732">732</a>     }
-<a class="jxr_linenumber" name="733" href="#733">733</a> 
-<a class="jxr_linenumber" name="734" href="#734">734</a> 
-<a class="jxr_linenumber" name="735" href="#735">735</a>     <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> debugMessage( String message )
-<a class="jxr_linenumber" name="736" href="#736">736</a>     {
-<a class="jxr_linenumber" name="737" href="#737">737</a>         <strong class="jxr_keyword">if</strong> ( debug )
-<a class="jxr_linenumber" name="738" href="#738">738</a>         {
-<a class="jxr_linenumber" name="739" href="#739">739</a>             System.out.println( message );
-<a class="jxr_linenumber" name="740" href="#740">740</a>         }
-<a class="jxr_linenumber" name="741" href="#741">741</a>     }
-<a class="jxr_linenumber" name="742" href="#742">742</a> 
-<a class="jxr_linenumber" name="743" href="#743">743</a> 
-<a class="jxr_linenumber" name="744" href="#744">744</a>     <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">boolean</strong> enableNaming()
-<a class="jxr_linenumber" name="745" href="#745">745</a>     {
-<a class="jxr_linenumber" name="746" href="#746">746</a>         <strong class="jxr_keyword">return</strong> Boolean.parseBoolean( runtimeProperties.getProperty( ENABLE_NAMING_KEY, Boolean.FALSE.toString() ) );
-<a class="jxr_linenumber" name="747" href="#747">747</a>     }
-<a class="jxr_linenumber" name="748" href="#748">748</a> 
-<a class="jxr_linenumber" name="749" href="#749">749</a>     <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">void</strong> installLogger( String loggerName )
-<a class="jxr_linenumber" name="750" href="#750">750</a>         <strong class="jxr_keyword">throws</strong> SecurityException, NoSuchMethodException, IllegalArgumentException, IllegalAccessException,
-<a class="jxr_linenumber" name="751" href="#751">751</a>         InvocationTargetException
+<a class="jxr_linenumber" name="650" href="#650">650</a>         <strong class="jxr_keyword">finally</strong>
+<a class="jxr_linenumber" name="651" href="#651">651</a>         {
+<a class="jxr_linenumber" name="652" href="#652">652</a>             <strong class="jxr_keyword">if</strong> ( inputStream != <strong class="jxr_keyword">null</strong> )
+<a class="jxr_linenumber" name="653" href="#653">653</a>             {
+<a class="jxr_linenumber" name="654" href="#654">654</a>                 inputStream.close();
+<a class="jxr_linenumber" name="655" href="#655">655</a>             }
+<a class="jxr_linenumber" name="656" href="#656">656</a>         }
+<a class="jxr_linenumber" name="657" href="#657">657</a> 
+<a class="jxr_linenumber" name="658" href="#658">658</a>     }
+<a class="jxr_linenumber" name="659" href="#659">659</a> 
+<a class="jxr_linenumber" name="660" href="#660">660</a>     <em class="jxr_javadoccomment">/**</em>
+<a class="jxr_linenumber" name="661" href="#661">661</a> <em class="jxr_javadoccomment">     * @param warsValue we can value in format: wars=foo.war|contextpath;bar.war  ( |contextpath is optionnal if empty use the war name)</em>
+<a class="jxr_linenumber" name="662" href="#662">662</a> <em class="jxr_javadoccomment">     *                  so here we return war file name and populate webappWarPerContext</em>
+<a class="jxr_linenumber" name="663" href="#663">663</a> <em class="jxr_javadoccomment">     */</em>
+<a class="jxr_linenumber" name="664" href="#664">664</a>     <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">void</strong> populateWebAppWarPerContext( String warsValue )
+<a class="jxr_linenumber" name="665" href="#665">665</a>     {
+<a class="jxr_linenumber" name="666" href="#666">666</a>         <strong class="jxr_keyword">if</strong> ( warsValue == <strong class="jxr_keyword">null</strong> )
+<a class="jxr_linenumber" name="667" href="#667">667</a>         {
+<a class="jxr_linenumber" name="668" href="#668">668</a>             <strong class="jxr_keyword">return</strong>;
+<a class="jxr_linenumber" name="669" href="#669">669</a>         }
+<a class="jxr_linenumber" name="670" href="#670">670</a> 
+<a class="jxr_linenumber" name="671" href="#671">671</a>         StringTokenizer st = <strong class="jxr_keyword">new</strong> StringTokenizer( warsValue, <span class="jxr_string">";"</span> );
+<a class="jxr_linenumber" name="672" href="#672">672</a>         <strong class="jxr_keyword">while</strong> ( st.hasMoreTokens() )
+<a class="jxr_linenumber" name="673" href="#673">673</a>         {
+<a class="jxr_linenumber" name="674" href="#674">674</a>             String warValue = st.nextToken();
+<a class="jxr_linenumber" name="675" href="#675">675</a>             debugMessage( <span class="jxr_string">"populateWebAppWarPerContext warValue:"</span> + warValue );
+<a class="jxr_linenumber" name="676" href="#676">676</a>             String warFileName = <span class="jxr_string">""</span>;
+<a class="jxr_linenumber" name="677" href="#677">677</a>             String contextValue = <span class="jxr_string">""</span>;
+<a class="jxr_linenumber" name="678" href="#678">678</a>             <strong class="jxr_keyword">int</strong> separatorIndex = warValue.indexOf( <span class="jxr_string">"|"</span> );
+<a class="jxr_linenumber" name="679" href="#679">679</a>             <strong class="jxr_keyword">if</strong> ( separatorIndex &gt;= 0 )
+<a class="jxr_linenumber" name="680" href="#680">680</a>             {
+<a class="jxr_linenumber" name="681" href="#681">681</a>                 warFileName = warValue.substring( 0, separatorIndex );
+<a class="jxr_linenumber" name="682" href="#682">682</a>                 contextValue = warValue.substring( separatorIndex + 1, warValue.length() );
+<a class="jxr_linenumber" name="683" href="#683">683</a> 
+<a class="jxr_linenumber" name="684" href="#684">684</a>             }
+<a class="jxr_linenumber" name="685" href="#685">685</a>             <strong class="jxr_keyword">else</strong>
+<a class="jxr_linenumber" name="686" href="#686">686</a>             {
+<a class="jxr_linenumber" name="687" href="#687">687</a>                 warFileName = contextValue;
+<a class="jxr_linenumber" name="688" href="#688">688</a>             }
+<a class="jxr_linenumber" name="689" href="#689">689</a>             debugMessage( <span class="jxr_string">"populateWebAppWarPerContext contextValue/warFileName:"</span> + contextValue + <span class="jxr_string">"/"</span> + warFileName );
+<a class="jxr_linenumber" name="690" href="#690">690</a>             <strong class="jxr_keyword">this</strong>.webappWarPerContext.put( contextValue, warFileName );
+<a class="jxr_linenumber" name="691" href="#691">691</a>         }
+<a class="jxr_linenumber" name="692" href="#692">692</a>     }
+<a class="jxr_linenumber" name="693" href="#693">693</a> 
+<a class="jxr_linenumber" name="694" href="#694">694</a> 
+<a class="jxr_linenumber" name="695" href="#695">695</a>     <em class="jxr_javadoccomment">/**</em>
+<a class="jxr_linenumber" name="696" href="#696">696</a> <em class="jxr_javadoccomment">     * Expand the specified input stream into the specified file.</em>
+<a class="jxr_linenumber" name="697" href="#697">697</a> <em class="jxr_javadoccomment">     *</em>
+<a class="jxr_linenumber" name="698" href="#698">698</a> <em class="jxr_javadoccomment">     * @param input InputStream to be copied</em>
+<a class="jxr_linenumber" name="699" href="#699">699</a> <em class="jxr_javadoccomment">     * @param file  The file to be created</em>
+<a class="jxr_linenumber" name="700" href="#700">700</a> <em class="jxr_javadoccomment">     * @throws java.io.IOException if an input/output error occurs</em>
+<a class="jxr_linenumber" name="701" href="#701">701</a> <em class="jxr_javadoccomment">     */</em>
+<a class="jxr_linenumber" name="702" href="#702">702</a>     <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">static</strong> <strong class="jxr_keyword">void</strong> expand( InputStream input, File file )
+<a class="jxr_linenumber" name="703" href="#703">703</a>         <strong class="jxr_keyword">throws</strong> IOException
+<a class="jxr_linenumber" name="704" href="#704">704</a>     {
+<a class="jxr_linenumber" name="705" href="#705">705</a>         BufferedOutputStream output = <strong class="jxr_keyword">null</strong>;
+<a class="jxr_linenumber" name="706" href="#706">706</a>         <strong class="jxr_keyword">try</strong>
+<a class="jxr_linenumber" name="707" href="#707">707</a>         {
+<a class="jxr_linenumber" name="708" href="#708">708</a>             output = <strong class="jxr_keyword">new</strong> BufferedOutputStream( <strong class="jxr_keyword">new</strong> FileOutputStream( file ) );
+<a class="jxr_linenumber" name="709" href="#709">709</a>             byte buffer[] = <strong class="jxr_keyword">new</strong> byte[2048];
+<a class="jxr_linenumber" name="710" href="#710">710</a>             <strong class="jxr_keyword">while</strong> ( <strong class="jxr_keyword">true</strong> )
+<a class="jxr_linenumber" name="711" href="#711">711</a>             {
+<a class="jxr_linenumber" name="712" href="#712">712</a>                 <strong class="jxr_keyword">int</strong> n = input.read( buffer );
+<a class="jxr_linenumber" name="713" href="#713">713</a>                 <strong class="jxr_keyword">if</strong> ( n &lt;= 0 )
+<a class="jxr_linenumber" name="714" href="#714">714</a>                 {
+<a class="jxr_linenumber" name="715" href="#715">715</a>                     <strong class="jxr_keyword">break</strong>;
+<a class="jxr_linenumber" name="716" href="#716">716</a>                 }
+<a class="jxr_linenumber" name="717" href="#717">717</a>                 output.write( buffer, 0, n );
+<a class="jxr_linenumber" name="718" href="#718">718</a>             }
+<a class="jxr_linenumber" name="719" href="#719">719</a>         }
+<a class="jxr_linenumber" name="720" href="#720">720</a>         <strong class="jxr_keyword">finally</strong>
+<a class="jxr_linenumber" name="721" href="#721">721</a>         {
+<a class="jxr_linenumber" name="722" href="#722">722</a>             <strong class="jxr_keyword">if</strong> ( output != <strong class="jxr_keyword">null</strong> )
+<a class="jxr_linenumber" name="723" href="#723">723</a>             {
+<a class="jxr_linenumber" name="724" href="#724">724</a>                 <strong class="jxr_keyword">try</strong>
+<a class="jxr_linenumber" name="725" href="#725">725</a>                 {
+<a class="jxr_linenumber" name="726" href="#726">726</a>                     output.close();
+<a class="jxr_linenumber" name="727" href="#727">727</a>                 }
+<a class="jxr_linenumber" name="728" href="#728">728</a>                 <strong class="jxr_keyword">catch</strong> ( IOException e )
+<a class="jxr_linenumber" name="729" href="#729">729</a>                 {
+<a class="jxr_linenumber" name="730" href="#730">730</a>                     <em class="jxr_comment">// Ignore</em>
+<a class="jxr_linenumber" name="731" href="#731">731</a>                 }
+<a class="jxr_linenumber" name="732" href="#732">732</a>             }
+<a class="jxr_linenumber" name="733" href="#733">733</a>         }
+<a class="jxr_linenumber" name="734" href="#734">734</a>     }
+<a class="jxr_linenumber" name="735" href="#735">735</a> 
+<a class="jxr_linenumber" name="736" href="#736">736</a>     <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">boolean</strong> useServerXml()
+<a class="jxr_linenumber" name="737" href="#737">737</a>     {
+<a class="jxr_linenumber" name="738" href="#738">738</a>         <strong class="jxr_keyword">return</strong> Boolean.parseBoolean( runtimeProperties.getProperty( USE_SERVER_XML_KEY, Boolean.FALSE.toString() ) );
+<a class="jxr_linenumber" name="739" href="#739">739</a>     }
+<a class="jxr_linenumber" name="740" href="#740">740</a> 
+<a class="jxr_linenumber" name="741" href="#741">741</a> 
+<a class="jxr_linenumber" name="742" href="#742">742</a>     <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> debugMessage( String message )
+<a class="jxr_linenumber" name="743" href="#743">743</a>     {
+<a class="jxr_linenumber" name="744" href="#744">744</a>         <strong class="jxr_keyword">if</strong> ( debug )
+<a class="jxr_linenumber" name="745" href="#745">745</a>         {
+<a class="jxr_linenumber" name="746" href="#746">746</a>             System.out.println( message );
+<a class="jxr_linenumber" name="747" href="#747">747</a>         }
+<a class="jxr_linenumber" name="748" href="#748">748</a>     }
+<a class="jxr_linenumber" name="749" href="#749">749</a> 
+<a class="jxr_linenumber" name="750" href="#750">750</a> 
+<a class="jxr_linenumber" name="751" href="#751">751</a>     <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">boolean</strong> enableNaming()
 <a class="jxr_linenumber" name="752" href="#752">752</a>     {
-<a class="jxr_linenumber" name="753" href="#753">753</a>         <strong class="jxr_keyword">if</strong> ( <span class="jxr_string">"slf4j"</span>.equals( loggerName ) )
-<a class="jxr_linenumber" name="754" href="#754">754</a>         {
+<a class="jxr_linenumber" name="753" href="#753">753</a>         <strong class="jxr_keyword">return</strong> Boolean.parseBoolean( runtimeProperties.getProperty( ENABLE_NAMING_KEY, Boolean.FALSE.toString() ) );
+<a class="jxr_linenumber" name="754" href="#754">754</a>     }
 <a class="jxr_linenumber" name="755" href="#755">755</a> 
-<a class="jxr_linenumber" name="756" href="#756">756</a>             <strong class="jxr_keyword">try</strong>
-<a class="jxr_linenumber" name="757" href="#757">757</a>             {
-<a class="jxr_linenumber" name="758" href="#758">758</a>                 <em class="jxr_comment">// Check class is available</em>
-<a class="jxr_linenumber" name="759" href="#759">759</a> 
-<a class="jxr_linenumber" name="760" href="#760">760</a>                 <em class="jxr_comment">//final Class&lt;?&gt; clazz = Class.forName( "org.slf4j.bridge.SLF4JBridgeHandler" );</em>
-<a class="jxr_linenumber" name="761" href="#761">761</a>                 <strong class="jxr_keyword">final</strong> Class&lt;?&gt; clazz =
-<a class="jxr_linenumber" name="762" href="#762">762</a>                     Thread.currentThread().getContextClassLoader().loadClass( <span class="jxr_string">"org.slf4j.bridge.SLF4JBridgeHandler"</span> );
-<a class="jxr_linenumber" name="763" href="#763">763</a> 
-<a class="jxr_linenumber" name="764" href="#764">764</a>                 <em class="jxr_comment">// Remove all JUL handlers</em>
-<a class="jxr_linenumber" name="765" href="#765">765</a>                 java.util.logging.LogManager.getLogManager().reset();
+<a class="jxr_linenumber" name="756" href="#756">756</a>     <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">void</strong> installLogger( String loggerName )
+<a class="jxr_linenumber" name="757" href="#757">757</a>         <strong class="jxr_keyword">throws</strong> SecurityException, NoSuchMethodException, IllegalArgumentException, IllegalAccessException,
+<a class="jxr_linenumber" name="758" href="#758">758</a>         InvocationTargetException
+<a class="jxr_linenumber" name="759" href="#759">759</a>     {
+<a class="jxr_linenumber" name="760" href="#760">760</a>         <strong class="jxr_keyword">if</strong> ( <span class="jxr_string">"slf4j"</span>.equals( loggerName ) )
+<a class="jxr_linenumber" name="761" href="#761">761</a>         {
+<a class="jxr_linenumber" name="762" href="#762">762</a> 
+<a class="jxr_linenumber" name="763" href="#763">763</a>             <strong class="jxr_keyword">try</strong>
+<a class="jxr_linenumber" name="764" href="#764">764</a>             {
+<a class="jxr_linenumber" name="765" href="#765">765</a>                 <em class="jxr_comment">// Check class is available</em>
 <a class="jxr_linenumber" name="766" href="#766">766</a> 
-<a class="jxr_linenumber" name="767" href="#767">767</a>                 <em class="jxr_comment">// Install slf4j bridge handler</em>
-<a class="jxr_linenumber" name="768" href="#768">768</a>                 <strong class="jxr_keyword">final</strong> Method method = clazz.getMethod( <span class="jxr_string">"install"</span>, <strong class="jxr_keyword">null</strong> );
-<a class="jxr_linenumber" name="769" href="#769">769</a>                 method.invoke( <strong class="jxr_keyword">null</strong> );
-<a class="jxr_linenumber" name="770" href="#770">770</a>             }
-<a class="jxr_linenumber" name="771" href="#771">771</a>             <strong class="jxr_keyword">catch</strong> ( ClassNotFoundException e )
-<a class="jxr_linenumber" name="772" href="#772">772</a>             {
-<a class="jxr_linenumber" name="773" href="#773">773</a>                 System.out.println( <span class="jxr_string">"WARNING: issue configuring slf4j jul bridge, skip it"</span> );
-<a class="jxr_linenumber" name="774" href="#774">774</a>             }
-<a class="jxr_linenumber" name="775" href="#775">775</a>         }
-<a class="jxr_linenumber" name="776" href="#776">776</a>         <strong class="jxr_keyword">else</strong>
-<a class="jxr_linenumber" name="777" href="#777">777</a>         {
-<a class="jxr_linenumber" name="778" href="#778">778</a>             System.out.println( <span class="jxr_string">"WARNING: loggerName "</span> + loggerName + <span class="jxr_string">" not supported, skip it"</span> );
-<a class="jxr_linenumber" name="779" href="#779">779</a>         }
-<a class="jxr_linenumber" name="780" href="#780">780</a>     }
-<a class="jxr_linenumber" name="781" href="#781">781</a> 
-<a class="jxr_linenumber" name="782" href="#782">782</a>     <strong class="jxr_keyword">private</strong> Properties loadProperties( File file )
-<a class="jxr_linenumber" name="783" href="#783">783</a>         <strong class="jxr_keyword">throws</strong> FileNotFoundException, IOException
-<a class="jxr_linenumber" name="784" href="#784">784</a>     {
-<a class="jxr_linenumber" name="785" href="#785">785</a>         Properties properties = <strong class="jxr_keyword">new</strong> Properties();
-<a class="jxr_linenumber" name="786" href="#786">786</a>         <strong class="jxr_keyword">if</strong> ( file.exists() )
-<a class="jxr_linenumber" name="787" href="#787">787</a>         {
+<a class="jxr_linenumber" name="767" href="#767">767</a>                 <em class="jxr_comment">//final Class&lt;?&gt; clazz = Class.forName( "org.slf4j.bridge.SLF4JBridgeHandler" );</em>
+<a class="jxr_linenumber" name="768" href="#768">768</a>                 <strong class="jxr_keyword">final</strong> Class&lt;?&gt; clazz =
+<a class="jxr_linenumber" name="769" href="#769">769</a>                     Thread.currentThread().getContextClassLoader().loadClass( <span class="jxr_string">"org.slf4j.bridge.SLF4JBridgeHandler"</span> );
+<a class="jxr_linenumber" name="770" href="#770">770</a> 
+<a class="jxr_linenumber" name="771" href="#771">771</a>                 <em class="jxr_comment">// Remove all JUL handlers</em>
+<a class="jxr_linenumber" name="772" href="#772">772</a>                 java.util.logging.LogManager.getLogManager().reset();
+<a class="jxr_linenumber" name="773" href="#773">773</a> 
+<a class="jxr_linenumber" name="774" href="#774">774</a>                 <em class="jxr_comment">// Install slf4j bridge handler</em>
+<a class="jxr_linenumber" name="775" href="#775">775</a>                 <strong class="jxr_keyword">final</strong> Method method = clazz.getMethod( <span class="jxr_string">"install"</span>, <strong class="jxr_keyword">null</strong> );
+<a class="jxr_linenumber" name="776" href="#776">776</a>                 method.invoke( <strong class="jxr_keyword">null</strong> );
+<a class="jxr_linenumber" name="777" href="#777">777</a>             }
+<a class="jxr_linenumber" name="778" href="#778">778</a>             <strong class="jxr_keyword">catch</strong> ( ClassNotFoundException e )
+<a class="jxr_linenumber" name="779" href="#779">779</a>             {
+<a class="jxr_linenumber" name="780" href="#780">780</a>                 System.out.println( <span class="jxr_string">"WARNING: issue configuring slf4j jul bridge, skip it"</span> );
+<a class="jxr_linenumber" name="781" href="#781">781</a>             }
+<a class="jxr_linenumber" name="782" href="#782">782</a>         }
+<a class="jxr_linenumber" name="783" href="#783">783</a>         <strong class="jxr_keyword">else</strong>
+<a class="jxr_linenumber" name="784" href="#784">784</a>         {
+<a class="jxr_linenumber" name="785" href="#785">785</a>             System.out.println( <span class="jxr_string">"WARNING: loggerName "</span> + loggerName + <span class="jxr_string">" not supported, skip it"</span> );
+<a class="jxr_linenumber" name="786" href="#786">786</a>         }
+<a class="jxr_linenumber" name="787" href="#787">787</a>     }
 <a class="jxr_linenumber" name="788" href="#788">788</a> 
-<a class="jxr_linenumber" name="789" href="#789">789</a>             FileInputStream fileInputStream = <strong class="jxr_keyword">new</strong> FileInputStream( file );
-<a class="jxr_linenumber" name="790" href="#790">790</a>             <strong class="jxr_keyword">try</strong>
-<a class="jxr_linenumber" name="791" href="#791">791</a>             {
-<a class="jxr_linenumber" name="792" href="#792">792</a>                 properties.load( fileInputStream );
-<a class="jxr_linenumber" name="793" href="#793">793</a>             }
-<a class="jxr_linenumber" name="794" href="#794">794</a>             <strong class="jxr_keyword">finally</strong>
-<a class="jxr_linenumber" name="795" href="#795">795</a>             {
-<a class="jxr_linenumber" name="796" href="#796">796</a>                 fileInputStream.close();
-<a class="jxr_linenumber" name="797" href="#797">797</a>             }
-<a class="jxr_linenumber" name="798" href="#798">798</a> 
-<a class="jxr_linenumber" name="799" href="#799">799</a>         }
-<a class="jxr_linenumber" name="800" href="#800">800</a>         <strong class="jxr_keyword">return</strong> properties;
-<a class="jxr_linenumber" name="801" href="#801">801</a>     }
-<a class="jxr_linenumber" name="802" href="#802">802</a> 
-<a class="jxr_linenumber" name="803" href="#803">803</a>     <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">void</strong> saveProperties( Properties properties, File file )
-<a class="jxr_linenumber" name="804" href="#804">804</a>         <strong class="jxr_keyword">throws</strong> FileNotFoundException, IOException
-<a class="jxr_linenumber" name="805" href="#805">805</a>     {
-<a class="jxr_linenumber" name="806" href="#806">806</a>         FileOutputStream fileOutputStream = <strong class="jxr_keyword">new</strong> FileOutputStream( file );
-<a class="jxr_linenumber" name="807" href="#807">807</a>         <strong class="jxr_keyword">try</strong>
-<a class="jxr_linenumber" name="808" href="#808">808</a>         {
-<a class="jxr_linenumber" name="809" href="#809">809</a>             properties.store( fileOutputStream, <span class="jxr_string">"Timestamp file for executable war/jar"</span> );
-<a class="jxr_linenumber" name="810" href="#810">810</a>         }
-<a class="jxr_linenumber" name="811" href="#811">811</a>         <strong class="jxr_keyword">finally</strong>
-<a class="jxr_linenumber" name="812" href="#812">812</a>         {
-<a class="jxr_linenumber" name="813" href="#813">813</a>             fileOutputStream.close();
-<a class="jxr_linenumber" name="814" href="#814">814</a>         }
-<a class="jxr_linenumber" name="815" href="#815">815</a>     }
-<a class="jxr_linenumber" name="816" href="#816">816</a> }
+<a class="jxr_linenumber" name="789" href="#789">789</a>     <strong class="jxr_keyword">private</strong> Properties loadProperties( File file )
+<a class="jxr_linenumber" name="790" href="#790">790</a>         <strong class="jxr_keyword">throws</strong> FileNotFoundException, IOException
+<a class="jxr_linenumber" name="791" href="#791">791</a>     {
+<a class="jxr_linenumber" name="792" href="#792">792</a>         Properties properties = <strong class="jxr_keyword">new</strong> Properties();
+<a class="jxr_linenumber" name="793" href="#793">793</a>         <strong class="jxr_keyword">if</strong> ( file.exists() )
+<a class="jxr_linenumber" name="794" href="#794">794</a>         {
+<a class="jxr_linenumber" name="795" href="#795">795</a> 
+<a class="jxr_linenumber" name="796" href="#796">796</a>             FileInputStream fileInputStream = <strong class="jxr_keyword">new</strong> FileInputStream( file );
+<a class="jxr_linenumber" name="797" href="#797">797</a>             <strong class="jxr_keyword">try</strong>
+<a class="jxr_linenumber" name="798" href="#798">798</a>             {
+<a class="jxr_linenumber" name="799" href="#799">799</a>                 properties.load( fileInputStream );
+<a class="jxr_linenumber" name="800" href="#800">800</a>             }
+<a class="jxr_linenumber" name="801" href="#801">801</a>             <strong class="jxr_keyword">finally</strong>
+<a class="jxr_linenumber" name="802" href="#802">802</a>             {
+<a class="jxr_linenumber" name="803" href="#803">803</a>                 fileInputStream.close();
+<a class="jxr_linenumber" name="804" href="#804">804</a>             }
+<a class="jxr_linenumber" name="805" href="#805">805</a> 
+<a class="jxr_linenumber" name="806" href="#806">806</a>         }
+<a class="jxr_linenumber" name="807" href="#807">807</a>         <strong class="jxr_keyword">return</strong> properties;
+<a class="jxr_linenumber" name="808" href="#808">808</a>     }
+<a class="jxr_linenumber" name="809" href="#809">809</a> 
+<a class="jxr_linenumber" name="810" href="#810">810</a>     <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">void</strong> saveProperties( Properties properties, File file )
+<a class="jxr_linenumber" name="811" href="#811">811</a>         <strong class="jxr_keyword">throws</strong> FileNotFoundException, IOException
+<a class="jxr_linenumber" name="812" href="#812">812</a>     {
+<a class="jxr_linenumber" name="813" href="#813">813</a>         FileOutputStream fileOutputStream = <strong class="jxr_keyword">new</strong> FileOutputStream( file );
+<a class="jxr_linenumber" name="814" href="#814">814</a>         <strong class="jxr_keyword">try</strong>
+<a class="jxr_linenumber" name="815" href="#815">815</a>         {
+<a class="jxr_linenumber" name="816" href="#816">816</a>             properties.store( fileOutputStream, <span class="jxr_string">"Timestamp file for executable war/jar"</span> );
+<a class="jxr_linenumber" name="817" href="#817">817</a>         }
+<a class="jxr_linenumber" name="818" href="#818">818</a>         <strong class="jxr_keyword">finally</strong>
+<a class="jxr_linenumber" name="819" href="#819">819</a>         {
+<a class="jxr_linenumber" name="820" href="#820">820</a>             fileOutputStream.close();
+<a class="jxr_linenumber" name="821" href="#821">821</a>         }
+<a class="jxr_linenumber" name="822" href="#822">822</a>     }
+<a class="jxr_linenumber" name="823" href="#823">823</a> }
 </pre>
 <hr/><div id="footer">This page was automatically generated by <a href="http://maven.apache.org/">Maven</a></div></body>
 </html>



---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org


Mime
View raw message