Skip to content

Commit 8296e69

Browse files
committed
CARGO-1663: Add support for Jetty 12.x remote container
1 parent 19bc2b1 commit 8296e69

6 files changed

Lines changed: 176 additions & 19 deletions

File tree

‎cargo/Container.html‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -623,24 +623,24 @@ <h3 id="Container-SupportMatrix">Support Matrix</h3>
623623
</div>
624624
<h3 id="Container-Containerfeatures">Container features</h3>
625625
<ul class="childpages-macro conf-macro output-block">
626+
<li><a href="Container+Instantiation.html">Container Instantiation</a> — <span class="smalltext">Create a container instance</span></li>
626627
<li><a href="Local+Container.html">Local Container</a> — <span class="smalltext">A container executing on the machine where Cargo executes</span>
627628
<ul class="childpages-macro">
628629
<li><a href="Container+Start.html">Container Start</a> — <span class="smalltext">Start a container that is not already running</span></li>
629630
<li><a href="Container+Stop.html">Container Stop</a> — <span class="smalltext">Stop a running container</span></li>
630631
<li><a href="Container+Timeout.html">Container Timeout</a> — <span class="smalltext">Timeout after which the container start/stop is deemed failed</span></li>
631632
<li><a href="Installed+Container.html">Installed Container</a> — <span class="smalltext">A container installed on the machine where Cargo executes.</span>
632633
<ul class="childpages-macro">
633-
<li><a href="Passing+system+properties.html">Passing system properties</a> — <span class="smalltext">How to pass system properties that will be available to the container while executing</span></li>
634634
<li><a href="Installer.html">Installer</a> — <span class="smalltext">Installs a container</span></li>
635+
<li><a href="Passing+system+properties.html">Passing system properties</a> — <span class="smalltext">How to pass system properties that will be available to the container while executing</span></li>
635636
</ul></li>
636637
<li><a href="Embedded+Container.html">Embedded Container</a> — <span class="smalltext">A container executing in the same JVM where Cargo is running</span></li>
637638
<li><a href="Container+Classpath.html">Container Classpath</a> — <span class="smalltext">How to configure the executing container's classpath</span>
638639
<ul class="childpages-macro">
639-
<li><a href="Application+Classpath.html">Application Classpath</a> — <span class="smalltext">How to configure the classpath of the application without changing the container's own classpath</span></li>
640640
<li><a href="JBoss+7.x+onwards+and+WildFly+container+classpath.html">JBoss 7.x onwards and WildFly container classpath</a></li>
641+
<li><a href="Application+Classpath.html">Application Classpath</a> — <span class="smalltext">How to configure the classpath of the application without changing the container's own classpath</span></li>
641642
</ul></li>
642643
</ul></li>
643-
<li><a href="Container+Instantiation.html">Container Instantiation</a> — <span class="smalltext">Create a container instance</span></li>
644644
<li><a href="Remote+Container.html">Remote Container</a> — <span class="smalltext">A container that is already running on some machine (local or remote)</span></li>
645645
</ul>
646646
<h3 id="Container-Containersupport">Container support</h3>

‎cargo/Installation.html‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -676,10 +676,10 @@ <h3 id="Installation-JavaAPI">Java API</h3>
676676
<td class="confluenceTd">
677677
<ul>
678678
<li>
679-
<p><a href="https://repo.maven.apache.org/maven2/com/fasterxml/jackson/core/jackson-core/2.22.2/jackson-core-2.22.2.jar">Jackson core 2.22.2</a> or greater</p>
679+
<p><a href="https://repo.maven.apache.org/maven2/com/fasterxml/jackson/core/jackson-core/2.22.3/jackson-core-2.22.3.jar">Jackson core 2.22.3</a> or greater</p>
680680
</li>
681681
<li>
682-
<p><a href="https://repo.maven.apache.org/maven2/com/fasterxml/jackson/dataformat/jackson-dataformat-yaml/2.22.2/jackson-dataformat-yaml-2.22.2.jar">Jackson YAML dataformat 2.22.2</a> or greater, which itself depends on <a href="https://repo.maven.apache.org/maven2/org/yaml/snakeyaml/2.5/snakeyaml-2.5.jar">SnakeYAML 2.5</a> or greater</p>
682+
<p><a href="https://repo.maven.apache.org/maven2/com/fasterxml/jackson/dataformat/jackson-dataformat-yaml/2.22.3/jackson-dataformat-yaml-2.22.3.jar">Jackson YAML dataformat 2.22.3</a> or greater, which itself depends on <a href="https://repo.maven.apache.org/maven2/org/yaml/snakeyaml/2.5/snakeyaml-2.5.jar">SnakeYAML 2.5</a> or greater</p>
683683
</li>
684684
</ul>
685685
</td>

‎cargo/Jetty+12.x.html‎

Lines changed: 166 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -787,13 +787,13 @@ <h3 id="Jetty12.x-ContainerFeatures">Container Features</h3>
787787
<p><a href="Remote+Container.html">Remote Container</a></p>
788788
</td>
789789
<td class="confluenceTd">
790-
<p><img class="emoticon emoticon-cross" src="attachments/error.png" width="16" height="16" alt="(error)"></p>
790+
<p><img class="emoticon emoticon-tick" src="attachments/check.png" width="16" height="16" alt="(tick)"> <code>o.<wbr>c.<wbr>c.<wbr>c.<wbr>jetty.<wbr>Jetty12xRemoteContainer</code></p>
791791
</td>
792792
<td class="confluenceTd">
793-
<p><img class="emoticon emoticon-cross" src="attachments/error.png" width="16" height="16" alt="(error)"></p>
793+
<p><img class="emoticon emoticon-tick" src="attachments/check.png" width="16" height="16" alt="(tick)"></p>
794794
</td>
795795
<td class="confluenceTd">
796-
<p><img class="emoticon emoticon-cross" src="attachments/error.png" width="16" height="16" alt="(error)"></p>
796+
<p><img class="emoticon emoticon-tick" src="attachments/check.png" width="16" height="16" alt="(tick)"></p>
797797
</td>
798798
<td class="confluenceTd">
799799
<p>&nbsp;</p>
@@ -896,13 +896,13 @@ <h3 id="Jetty12.x-ConfigurationFeatures">Configuration Features</h3>
896896
<p><a href="Runtime+Configuration.html">Runtime Configuration</a></p>
897897
</td>
898898
<td class="confluenceTd">
899-
<p><img class="emoticon emoticon-cross" src="attachments/error.png" width="16" height="16" alt="(error)"></p>
899+
<p><img class="emoticon emoticon-tick" src="attachments/check.png" width="16" height="16" alt="(tick)"> <code>o.<wbr>c.<wbr>c.<wbr>c.<wbr>jetty.<wbr>Jetty12xRuntimeConfiguration</code></p>
900900
</td>
901901
<td class="confluenceTd">
902-
<p><img class="emoticon emoticon-cross" src="attachments/error.png" width="16" height="16" alt="(error)"></p>
902+
<p><img class="emoticon emoticon-tick" src="attachments/check.png" width="16" height="16" alt="(tick)"></p>
903903
</td>
904904
<td class="confluenceTd">
905-
<p><img class="emoticon emoticon-cross" src="attachments/error.png" width="16" height="16" alt="(error)"></p>
905+
<p><img class="emoticon emoticon-tick" src="attachments/check.png" width="16" height="16" alt="(tick)"></p>
906906
</td>
907907
<td class="confluenceTd">
908908
<p>&nbsp;</p>
@@ -1090,13 +1090,13 @@ <h3 id="Jetty12.x-DeployerFeatures">Deployer Features</h3>
10901090
<p><a href="Remote+Deployer.html">Remote Deployer</a></p>
10911091
</td>
10921092
<td class="confluenceTd">
1093-
<p><img class="emoticon emoticon-cross" src="attachments/error.png" width="16" height="16" alt="(error)"></p>
1093+
<p><img class="emoticon emoticon-tick" src="attachments/check.png" width="16" height="16" alt="(tick)"> <code>o.<wbr>c.<wbr>c.<wbr>c.<wbr>jetty.<wbr>Jetty12xRemoteDeployer</code></p>
10941094
</td>
10951095
<td class="confluenceTd">
1096-
<p><img class="emoticon emoticon-cross" src="attachments/error.png" width="16" height="16" alt="(error)"></p>
1096+
<p><img class="emoticon emoticon-tick" src="attachments/check.png" width="16" height="16" alt="(tick)"></p>
10971097
</td>
10981098
<td class="confluenceTd">
1099-
<p><img class="emoticon emoticon-cross" src="attachments/error.png" width="16" height="16" alt="(error)"></p>
1099+
<p><img class="emoticon emoticon-tick" src="attachments/check.png" width="16" height="16" alt="(tick)"></p>
11001100
</td>
11011101
<td class="confluenceTd">
11021102
<p>&nbsp;</p>
@@ -2180,6 +2180,163 @@ <h5 id="Jetty12.x-Forinstalledcontainero.c.c.c.jetty.Jetty12xInstalledLocalConta
21802180
<p>Starting from Codehaus Cargo 1.10.25, except when configured explicitly, the EE version for <code><a href="https://codehaus-cargo.github.io/apidocs/org/codehaus/cargo/container/jetty/JettyPropertySet.html#MODULES">JettyPropertySet.MODULES</a></code> will be automatically adjusted based on <code><a href="https://codehaus-cargo.github.io/apidocs/org/codehaus/cargo/container/jetty/JettyPropertySet.html#DEPLOYER_EE_VERSION">JettyPropertySet.DEPLOYER_EE_VERSION</a></code>.</p>
21812181
</div>
21822182
</div>
2183+
<h4 id="Jetty12.x-RuntimeConfigurationProperties">Runtime Configuration Properties</h4>
2184+
<div class="confluence-information-macro confluence-information-macro-information conf-macro output-block">
2185+
<span class="aui-icon aui-icon-small aui-iconfont-info confluence-information-macro-icon"> </span>
2186+
<div class="confluence-information-macro-body">
2187+
<p>Before using the Jetty remote deployer, please read: <a href="Jetty+Remote+Deployer.html">Jetty Remote Deployer</a></p>
2188+
</div>
2189+
</div>
2190+
<h5 id="Jetty12.x-Forremotecontainero.c.c.c.jetty.Jetty12xRemoteContainer">For remote container o.c.c.c.jetty.Jetty12xRemoteContainer</h5>
2191+
<div class="table-wrap">
2192+
<table class="confluenceTable">
2193+
<tbody>
2194+
<tr>
2195+
<th class="confluenceTh">
2196+
<p>Property name</p>
2197+
</th>
2198+
<th class="confluenceTh">
2199+
<p>Java Property</p>
2200+
</th>
2201+
<th class="confluenceTh">
2202+
<p>Supported?</p>
2203+
</th>
2204+
<th class="confluenceTh">
2205+
<p>Default value</p>
2206+
</th>
2207+
<th class="confluenceTh">
2208+
<p>Javadoc</p>
2209+
</th>
2210+
</tr>
2211+
<tr>
2212+
<td class="confluenceTd">
2213+
<p><a href="Configuration+properties.html">cargo.hostname</a></p>
2214+
</td>
2215+
<td class="confluenceTd">
2216+
<p><a href="Configuration+properties.html">GeneralPropertySet.HOSTNAME</a></p>
2217+
</td>
2218+
<td class="confluenceTd">
2219+
<p><img class="emoticon emoticon-tick" src="attachments/check.png" width="16" height="16" alt="(tick)"></p>
2220+
</td>
2221+
<td class="confluenceTd">
2222+
<p><code>localhost</code></p>
2223+
</td>
2224+
<td class="confluenceTd">
2225+
<p><a href="https://codehaus-cargo.github.io/apidocs/org/codehaus/cargo/container/property/GeneralPropertySet.html#HOSTNAME"><img class="emoticon emoticon-green-star" src="attachments/star_green.png" width="16" height="16" alt="(green star)"></a></p>
2226+
</td>
2227+
</tr>
2228+
<tr>
2229+
<td class="confluenceTd">
2230+
<p><a href="Configuration+properties.html">cargo.jetty.deployer.ee.version</a></p>
2231+
</td>
2232+
<td class="confluenceTd">
2233+
<p><a href="Configuration+properties.html">JettyPropertySet.DEPLOYER_EE_VERSION</a></p>
2234+
</td>
2235+
<td class="confluenceTd">
2236+
<p><img class="emoticon emoticon-tick" src="attachments/check.png" width="16" height="16" alt="(tick)"></p>
2237+
</td>
2238+
<td class="confluenceTd">
2239+
<p><code>ee10</code></p>
2240+
</td>
2241+
<td class="confluenceTd">
2242+
<p><a href="https://codehaus-cargo.github.io/apidocs/org/codehaus/cargo/container/jetty/JettyPropertySet.html#DEPLOYER_EE_VERSION"><img class="emoticon emoticon-green-star" src="attachments/star_green.png" width="16" height="16" alt="(green star)"></a></p>
2243+
</td>
2244+
</tr>
2245+
<tr>
2246+
<td class="confluenceTd">
2247+
<p><a href="Configuration+properties.html">cargo.jetty.deployer.url</a></p>
2248+
</td>
2249+
<td class="confluenceTd">
2250+
<p><a href="Configuration+properties.html">JettyPropertySet.DEPLOYER_URL</a></p>
2251+
</td>
2252+
<td class="confluenceTd">
2253+
<p><img class="emoticon emoticon-tick" src="attachments/check.png" width="16" height="16" alt="(tick)"></p>
2254+
</td>
2255+
<td class="confluenceTd">
2256+
<p>N/A</p>
2257+
</td>
2258+
<td class="confluenceTd">
2259+
<p><a href="https://codehaus-cargo.github.io/apidocs/org/codehaus/cargo/container/jetty/JettyPropertySet.html#DEPLOYER_URL"><img class="emoticon emoticon-green-star" src="attachments/star_green.png" width="16" height="16" alt="(green star)"></a></p>
2260+
</td>
2261+
</tr>
2262+
<tr>
2263+
<td class="confluenceTd">
2264+
<p><a href="Configuration+properties.html">cargo.remote.password</a></p>
2265+
</td>
2266+
<td class="confluenceTd">
2267+
<p><a href="Configuration+properties.html">RemotePropertySet.PASSWORD</a></p>
2268+
</td>
2269+
<td class="confluenceTd">
2270+
<p><img class="emoticon emoticon-tick" src="attachments/check.png" width="16" height="16" alt="(tick)"></p>
2271+
</td>
2272+
<td class="confluenceTd">
2273+
<p>N/A</p>
2274+
</td>
2275+
<td class="confluenceTd">
2276+
<p><a href="https://codehaus-cargo.github.io/apidocs/org/codehaus/cargo/container/property/RemotePropertySet.html#PASSWORD"><img class="emoticon emoticon-green-star" src="attachments/star_green.png" width="16" height="16" alt="(green star)"></a></p>
2277+
</td>
2278+
</tr>
2279+
<tr>
2280+
<td class="confluenceTd">
2281+
<p><a href="Configuration+properties.html">cargo.remote.timeout</a></p>
2282+
</td>
2283+
<td class="confluenceTd">
2284+
<p><a href="Configuration+properties.html">RemotePropertySet.TIMEOUT</a></p>
2285+
</td>
2286+
<td class="confluenceTd">
2287+
<p><img class="emoticon emoticon-tick" src="attachments/check.png" width="16" height="16" alt="(tick)"></p>
2288+
</td>
2289+
<td class="confluenceTd">
2290+
<p><code>120000</code></p>
2291+
</td>
2292+
<td class="confluenceTd">
2293+
<p><a href="https://codehaus-cargo.github.io/apidocs/org/codehaus/cargo/container/property/RemotePropertySet.html#TIMEOUT"><img class="emoticon emoticon-green-star" src="attachments/star_green.png" width="16" height="16" alt="(green star)"></a></p>
2294+
</td>
2295+
</tr>
2296+
<tr>
2297+
<td class="confluenceTd">
2298+
<p><a href="Configuration+properties.html">cargo.remote.username</a></p>
2299+
</td>
2300+
<td class="confluenceTd">
2301+
<p><a href="Configuration+properties.html">RemotePropertySet.USERNAME</a></p>
2302+
</td>
2303+
<td class="confluenceTd">
2304+
<p><img class="emoticon emoticon-tick" src="attachments/check.png" width="16" height="16" alt="(tick)"></p>
2305+
</td>
2306+
<td class="confluenceTd">
2307+
<p>N/A</p>
2308+
</td>
2309+
<td class="confluenceTd">
2310+
<p><a href="https://codehaus-cargo.github.io/apidocs/org/codehaus/cargo/container/property/RemotePropertySet.html#USERNAME"><img class="emoticon emoticon-green-star" src="attachments/star_green.png" width="16" height="16" alt="(green star)"></a></p>
2311+
</td>
2312+
</tr>
2313+
<tr>
2314+
<td class="confluenceTd">
2315+
<p><a href="Configuration+properties.html">cargo.servlet.port</a></p>
2316+
</td>
2317+
<td class="confluenceTd">
2318+
<p><a href="Configuration+properties.html">ServletPropertySet.PORT</a></p>
2319+
</td>
2320+
<td class="confluenceTd">
2321+
<p><img class="emoticon emoticon-tick" src="attachments/check.png" width="16" height="16" alt="(tick)"></p>
2322+
</td>
2323+
<td class="confluenceTd">
2324+
<p><code>8080</code></p>
2325+
</td>
2326+
<td class="confluenceTd">
2327+
<p><a href="https://codehaus-cargo.github.io/apidocs/org/codehaus/cargo/container/property/ServletPropertySet.html#PORT"><img class="emoticon emoticon-green-star" src="attachments/star_green.png" width="16" height="16" alt="(green star)"></a></p>
2328+
</td>
2329+
</tr>
2330+
</tbody>
2331+
</table>
2332+
</div>
2333+
<div class="confluence-information-macro confluence-information-macro-information conf-macro output-block">
2334+
<p class="title">Jetty modules and EE version</p>
2335+
<span class="aui-icon aui-icon-small aui-iconfont-info confluence-information-macro-icon"> </span>
2336+
<div class="confluence-information-macro-body">
2337+
<p>Starting from Codehaus Cargo 1.10.25, except when configured explicitly, the EE version for <code><a href="https://codehaus-cargo.github.io/apidocs/org/codehaus/cargo/container/jetty/JettyPropertySet.html#MODULES">JettyPropertySet.MODULES</a></code> will be automatically adjusted based on <code><a href="https://codehaus-cargo.github.io/apidocs/org/codehaus/cargo/container/jetty/JettyPropertySet.html#DEPLOYER_EE_VERSION">JettyPropertySet.DEPLOYER_EE_VERSION</a></code>.</p>
2338+
</div>
2339+
</div>
21832340
<h3 id="Jetty12.x-TestedOn">Tested On</h3>
21842341
<p>This container is automatically tested by the <a href="https://codehaus-cargo.semaphoreci.com/projects/cargo">Continous Integration (CI) system</a> every time there is a code change.
21852342
<br>

‎cargo/Local+Container.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -606,8 +606,8 @@ <h3 id="LocalContainer-Containerfeatures">Container features</h3>
606606
<li><a href="Embedded+Container.html">Embedded Container</a> — <span class="smalltext">A container executing in the same JVM where Cargo is running</span></li>
607607
<li><a href="Container+Classpath.html">Container Classpath</a> — <span class="smalltext">How to configure the executing container's classpath</span>
608608
<ul class="childpages-macro">
609-
<li><a href="Application+Classpath.html">Application Classpath</a> — <span class="smalltext">How to configure the classpath of the application without changing the container's own classpath</span></li>
610609
<li><a href="JBoss+7.x+onwards+and+WildFly+container+classpath.html">JBoss 7.x onwards and WildFly container classpath</a></li>
610+
<li><a href="Application+Classpath.html">Application Classpath</a> — <span class="smalltext">How to configure the classpath of the application without changing the container's own classpath</span></li>
611611
</ul></li>
612612
</ul>
613613
</td>

0 commit comments

Comments
 (0)