- CARGO-1611: The Jetty container has console-capture as a default mo…

…dule

- The Jetty INI file concept doesn't exist anymore with Jetty 9.1.x onwards
- Make the containerUrl optional for cargo:run, so that it downloads the default artifact of the tested CI version

cargo/Jetty+10.x.html

@@ -770,7 +770,7 @@ <h5 id="Jetty10.x-Forinstalledcontainero.c.c.c.jetty.Jetty10xInstalledLocalConta
               <td class="confluenceTd">
                <p><img class="emoticon emoticon-tick" src="attachments/check.png" width="16" height="16" alt="(tick)"></p></td>
               <td class="confluenceTd">
-               <p><code>console-capture,server,http,http2c,annotations,plus,websocket,jsp,ext,deploy</code></p></td>
+               <p><code>server,http,http2c,annotations,plus,websocket,jsp,ext,deploy</code></p></td>
               <td class="confluenceTd">
                <p><a href="https://codehaus-cargo.github.io/apidocs/org/codehaus/cargo/container/jetty/JettyPropertySet.html#MODULES"><img class="emoticon emoticon-green-star" src="attachments/star_green.png" width="16" height="16" alt="(green star)"></a></p></td>
              </tr>
@@ -1195,7 +1195,7 @@ <h5 id="Jetty10.x-Forinstalledcontainero.c.c.c.jetty.Jetty10xInstalledLocalConta
               <td class="confluenceTd">
                <p><img class="emoticon emoticon-tick" src="attachments/check.png" width="16" height="16" alt="(tick)"></p></td>
               <td class="confluenceTd">
-               <p><code>console-capture,server,http,http2c,annotations,plus,websocket,jsp,ext,deploy</code></p></td>
+               <p><code>server,http,http2c,annotations,plus,websocket,jsp,ext,deploy</code></p></td>
               <td class="confluenceTd">
                <p><a href="https://codehaus-cargo.github.io/apidocs/org/codehaus/cargo/container/jetty/JettyPropertySet.html#MODULES"><img class="emoticon emoticon-green-star" src="attachments/star_green.png" width="16" height="16" alt="(green star)"></a></p></td>
              </tr>
@@ -1286,12 +1286,6 @@ <h5 id="Jetty10.x-Forinstalledcontainero.c.c.c.jetty.Jetty10xInstalledLocalConta
             </tbody>
            </table>
           </div>
-          <div class="confluence-information-macro confluence-information-macro-information conf-macro output-block">
-           <span class="aui-icon aui-icon-small aui-iconfont-info confluence-information-macro-icon"> </span>
-           <div class="confluence-information-macro-body">
-            <p>If you specify <code>cargo.runtime.args</code> with <code>--ini=anyfile.ini</code> (where <code>anyfile.ini</code> points to a Jetty INI file), any property set in the Codehaus Cargo Jetty container will be ignored and the ones read from the INI file used instead.</p>
-           </div>
-          </div>
           <h4 id="Jetty10.x-RuntimeConfigurationProperties">Runtime Configuration Properties</h4>
           <div class="confluence-information-macro confluence-information-macro-information conf-macro output-block">
            <span class="aui-icon aui-icon-small aui-iconfont-info confluence-information-macro-icon"> </span>

cargo/Jetty+11.x.html

@@ -776,7 +776,7 @@ <h5 id="Jetty11.x-Forinstalledcontainero.c.c.c.jetty.Jetty11xInstalledLocalConta
               <td class="confluenceTd">
                <p><img class="emoticon emoticon-tick" src="attachments/check.png" width="16" height="16" alt="(tick)"></p></td>
               <td class="confluenceTd">
-               <p><code>console-capture,server,http,http2c,annotations,plus,websocket,jsp,ext,deploy</code></p></td>
+               <p><code>server,http,http2c,annotations,plus,websocket,jsp,ext,deploy</code></p></td>
               <td class="confluenceTd">
                <p><a href="https://codehaus-cargo.github.io/apidocs/org/codehaus/cargo/container/jetty/JettyPropertySet.html#MODULES"><img class="emoticon emoticon-green-star" src="attachments/star_green.png" width="16" height="16" alt="(green star)"></a></p></td>
              </tr>
@@ -1201,7 +1201,7 @@ <h5 id="Jetty11.x-Forinstalledcontainero.c.c.c.jetty.Jetty11xInstalledLocalConta
               <td class="confluenceTd">
                <p><img class="emoticon emoticon-tick" src="attachments/check.png" width="16" height="16" alt="(tick)"></p></td>
               <td class="confluenceTd">
-               <p><code>console-capture,server,http,http2c,annotations,plus,websocket,jsp,ext,deploy</code></p></td>
+               <p><code>server,http,http2c,annotations,plus,websocket,jsp,ext,deploy</code></p></td>
               <td class="confluenceTd">
                <p><a href="https://codehaus-cargo.github.io/apidocs/org/codehaus/cargo/container/jetty/JettyPropertySet.html#MODULES"><img class="emoticon emoticon-green-star" src="attachments/star_green.png" width="16" height="16" alt="(green star)"></a></p></td>
              </tr>
@@ -1292,12 +1292,6 @@ <h5 id="Jetty11.x-Forinstalledcontainero.c.c.c.jetty.Jetty11xInstalledLocalConta
             </tbody>
            </table>
           </div>
-          <div class="confluence-information-macro confluence-information-macro-information conf-macro output-block">
-           <span class="aui-icon aui-icon-small aui-iconfont-info confluence-information-macro-icon"> </span>
-           <div class="confluence-information-macro-body">
-            <p>If you specify <code>cargo.runtime.args</code> with <code>--ini=anyfile.ini</code> (where <code>anyfile.ini</code> points to a Jetty INI file), any property set in the Codehaus Cargo Jetty container will be ignored and the ones read from the INI file used instead.</p>
-           </div>
-          </div>
           <h4 id="Jetty11.x-RuntimeConfigurationProperties">Runtime Configuration Properties</h4>
           <div class="confluence-information-macro confluence-information-macro-information conf-macro output-block">
            <span class="aui-icon aui-icon-small aui-iconfont-info confluence-information-macro-icon"> </span>

cargo/Jetty+9.x.html

@@ -1266,6 +1266,7 @@ <h5 id="Jetty9.x-Forinstalledcontainero.c.c.c.jetty.Jetty9xInstalledLocalContain
            <span class="aui-icon aui-icon-small aui-iconfont-info confluence-information-macro-icon"> </span>
            <div class="confluence-information-macro-body">
             <p>If you specify <code>cargo.runtime.args</code> with <code>--ini=anyfile.ini</code> (where <code>anyfile.ini</code> points to a Jetty INI file), any property set in the Codehaus Cargo Jetty container will be ignored and the ones read from the INI file used instead.</p>
+            <p>Please note that the Jetty INI file concept doesn't exist anymore with Jetty 9.1.x onwards.</p>
            </div>
           </div>
           <h4 id="Jetty9.x-RuntimeConfigurationProperties">Runtime Configuration Properties</h4>

cargo/Maven+3+Plugin+Getting+Started.html

@@ -311,12 +311,27 @@ <h2 id="Maven3PluginGettingStarted-Veryquickstart">Very quick start</h2>
            <div class="codeContent panelContent pdl">
             <pre class="syntaxhighlighter-pre">mvn clean verify org.codehaus.cargo:cargo-maven3-plugin:run
     -Dcargo.maven.containerId=tomcat9x
+</pre>
+           </div>
+          </div>
+          <p>That command will automatically:</p>
+          <ul>
+           <li>Download the Maven artifact for the version of <a href="Tomcat+9.x.html">Tomcat 9.x</a> that our <a href="https://codehaus-cargo.semaphoreci.com/projects/cargo">Continous Integration</a> has validated as working fine</li>
+           <li>Instantiate the container</li>
+           <li>Create a local configuration with your application</li>
+           <li>... and, run it</li>
+          </ul>
+          <p>To use a specific version of <a href="Tomcat+9.x.html">Tomcat 9.x</a>, you simply need to run (in one line):</p>
+          <div class="code panel pdl conf-macro output-block" style="border-width: 1px;">
+           <div class="codeContent panelContent pdl">
+            <pre class="syntaxhighlighter-pre">mvn clean verify org.codehaus.cargo:cargo-maven3-plugin:run
+    -Dcargo.maven.containerId=tomcat9x
     -Dcargo.maven.containerUrl=https://repo.maven.apache.org/maven2/org/apache/tomcat/tomcat/9.0.45/tomcat-9.0.45.zip
 </pre>
            </div>
           </div>
-          <p>That command will automatically download Tomcat 9.0.45 from the specified URL (taking into account any proxy server setting you would have in Maven 3), instantiate the container, create a local configuration with your application and run it. It will also save the downloaded container in the default directory (see the <a href="Maven+3+Plugin+Reference+Guide.html">Maven 3 Plugin Reference Guide</a> for details), so it won't get downloaded when you run the same command twice.</p>
-          <p>Now, if you want to run this time on <a href="WildFly+20.x.html">WildFly 20.x</a> with with the HTTP port set to <code>9000</code>, run:</p>
+          <p>This time, the command will automatically download Tomcat 9.0.45 from the specified URL instead, taking into account any proxy server setting you would have in Maven 3, and will it in the default directory (see the <a href="Maven+3+Plugin+Reference+Guide.html">Maven 3 Plugin Reference Guide</a> for details), so it won't get downloaded when you run the same command twice.</p>
+          <p>If you now want to run this time on <a href="WildFly+20.x.html">WildFly 20.x</a> with with the HTTP port set to <code>9000</code>, run:</p>
           <div class="code panel pdl conf-macro output-block" style="border-width: 1px;">
            <div class="codeContent panelContent pdl">
             <pre class="syntaxhighlighter-pre">mvn clean verify org.codehaus.cargo:cargo-maven3-plugin:run
@@ -326,7 +341,7 @@ <h2 id="Maven3PluginGettingStarted-Veryquickstart">Very quick start</h2>
 </pre>
            </div>
           </div>
-          <p>Codehaus Cargo's main advantage is that the commands and configuration remains the same for any version of any supported container - be it Tomcat, Jetty, JBoss, JOnAS, GlassFish, WebLogic, WildFly, etc.</p>
+          <p>As you can see, Codehaus Cargo's main advantage is that the commands and configuration remains the same for any version of any supported container - be it Tomcat, Jetty, JBoss, JOnAS, GlassFish, WebLogic, WildFly, etc.</p>
           <p>Like it? Well, keep on reading, then!</p>
           <script type="text/javascript">
   // Google Ads code

cargo/Maven+3+Plugin.html

@@ -346,12 +346,27 @@ <h2 id="Maven3Plugin-Veryquickstart">Very quick start</h2>
             <div class="codeContent panelContent pdl">
              <pre class="syntaxhighlighter-pre">mvn clean verify org.codehaus.cargo:cargo-maven3-plugin:run
     -Dcargo.maven.containerId=tomcat9x
+</pre>
+            </div>
+           </div>
+           <p>That command will automatically:</p>
+           <ul>
+            <li>Download the Maven artifact for the version of <a href="Tomcat+9.x.html">Tomcat 9.x</a> that our <a href="https://codehaus-cargo.semaphoreci.com/projects/cargo">Continous Integration</a> has validated as working fine</li>
+            <li>Instantiate the container</li>
+            <li>Create a local configuration with your application</li>
+            <li>... and, run it</li>
+           </ul>
+           <p>To use a specific version of <a href="Tomcat+9.x.html">Tomcat 9.x</a>, you simply need to run (in one line):</p>
+           <div class="code panel pdl conf-macro output-block" style="border-width: 1px;">
+            <div class="codeContent panelContent pdl">
+             <pre class="syntaxhighlighter-pre">mvn clean verify org.codehaus.cargo:cargo-maven3-plugin:run
+    -Dcargo.maven.containerId=tomcat9x
     -Dcargo.maven.containerUrl=https://repo.maven.apache.org/maven2/org/apache/tomcat/tomcat/9.0.45/tomcat-9.0.45.zip
 </pre>
             </div>
            </div>
-           <p>That command will automatically download Tomcat 9.0.45 from the specified URL (taking into account any proxy server setting you would have in Maven 3), instantiate the container, create a local configuration with your application and run it. It will also save the downloaded container in the default directory (see the <a href="Maven+3+Plugin+Reference+Guide.html">Maven 3 Plugin Reference Guide</a> for details), so it won't get downloaded when you run the same command twice.</p>
-           <p>Now, if you want to run this time on <a href="WildFly+20.x.html">WildFly 20.x</a> with with the HTTP port set to <code>9000</code>, run:</p>
+           <p>This time, the command will automatically download Tomcat 9.0.45 from the specified URL instead, taking into account any proxy server setting you would have in Maven 3, and will it in the default directory (see the <a href="Maven+3+Plugin+Reference+Guide.html">Maven 3 Plugin Reference Guide</a> for details), so it won't get downloaded when you run the same command twice.</p>
+           <p>If you now want to run this time on <a href="WildFly+20.x.html">WildFly 20.x</a> with with the HTTP port set to <code>9000</code>, run:</p>
            <div class="code panel pdl conf-macro output-block" style="border-width: 1px;">
             <div class="codeContent panelContent pdl">
              <pre class="syntaxhighlighter-pre">mvn clean verify org.codehaus.cargo:cargo-maven3-plugin:run
@@ -361,7 +376,7 @@ <h2 id="Maven3Plugin-Veryquickstart">Very quick start</h2>
 </pre>
             </div>
            </div>
-           <p>Codehaus Cargo's main advantage is that the commands and configuration remains the same for any version of any supported container - be it Tomcat, Jetty, JBoss, JOnAS, GlassFish, WebLogic, WildFly, etc.</p>
+           <p>As you can see, Codehaus Cargo's main advantage is that the commands and configuration remains the same for any version of any supported container - be it Tomcat, Jetty, JBoss, JOnAS, GlassFish, WebLogic, WildFly, etc.</p>
            <p>Like it? Well, keep on reading, then!</p>
            <h2 id="Maven3Plugin-Moreexamples">More examples</h2>
            <p>As usual the best way to learn to use a tool is through examples.</p>