Skip to content

Commit

Permalink
Upgrade various container versions
Browse files Browse the repository at this point in the history
  • Loading branch information
@alitokmen
alitokmen committed Nov 18, 2023
1 parent 1046d3b commit 5709059
Show file tree
Hide file tree
Showing 7 changed files with 44 additions and 10 deletions.
39 changes: 36 additions & 3 deletions cargo/Cargo+Daemon.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -363,7 +363,7 @@ <h1 id="CargoDaemon-Installation">Installation</h1>
<td class="confluenceTd">
<p><code>daemon.<wbr>home</code></p></td>
<td class="confluenceTd">
<p>Directory in which the standaone daemon server stores its files. These include the temporary files (such as its own WAR and server temporary files) as well as the server log files (<code>AWS-xxxxxxxxxxxxx.<wbr>log</code>, where <code>xxxxxxxxxxxxx</code> is the timestamp at which the deamon was started).</p>
<p>Directory in which the standalone daemon server stores its files. These include the temporary files (such as its own WAR and server temporary files) as well as the server log files (<code>AWS-xxxxxxxxxxxxx.<wbr>log</code>, where <code>xxxxxxxxxxxxx</code> is the timestamp at which the deamon was started).</p>
<p>This property is not used and completely ignored if the daemon WAR file is deployed on an existing container.</p></td>
<td class="confluenceTd">
<p>👎</p></td>
Expand All @@ -381,6 +381,39 @@ <h1 id="CargoDaemon-Installation">Installation</h1>
<p><code>${user.<wbr>home}/.<wbr>cargo</code></p>
<p>Note that the standalone daemon by default sets this to <code>${daemon.<wbr>home}</code></p></td>
</tr>
<tr>
<td colspan="1" class="confluenceTd"><code>cargo.<wbr>daemon.<wbr>passwordFile</code></td>
<td colspan="1" class="confluenceTd">
<div class="content-wrapper">
<p>Property file with username and passwords which would be allowed to access the Cargo Daemon:</p>
<ul>
<li>Passwords can either be put in plaintext, or prefixed with <a href="https://docs.oracle.com/javase/8/docs/technotes/guides/security/StandardNames.html#MessageDigest">the hashing algorithm to use</a> and the associated hash.</li>
<li>Only <code>Basic</code> authentication is supported.</li>
</ul>
<p>Some examples:</p>
<div class="code panel pdl conf-macro output-block" style="border-width: 1px;">
<div class="codeContent panelContent pdl">
<pre class="syntaxhighlighter-pre"># Example 1: User without any password
cargo-daemon-user_=

# Example 2: User with a password written as plain text
cargo-daemon-user1=cargo-password

# Example 2, second variant: User with a password written as plain text, containing a curly bracket
cargo-daemon-user0={cargo-password

# Example 3: User with a password hashed in md5. The password is: cargo-password
cargo-daemon-user2={MD5}9addb63b65b01292700094b0ef056036

# Example 4: User with a password hashed in sha1. The password is: cargo-password
cargo-daemon-user3={SHA-1}2681c738294805939045be2a4af53b687c25bf4d</pre>
</div>
</div>
<p><strong>Note</strong>: This functionality is <a href="https://codehaus-cargo.atlassian.net/browse/CARGO-1618">new with Cargo Daemon version 1.10.11</a>.</p>
</div></td>
<td colspan="1" class="confluenceTd">👎</td>
<td colspan="1" class="confluenceTd">N/A</td>
</tr>
</tbody>
</table>
</div>
Expand All @@ -395,12 +428,12 @@ <h1 id="CargoDaemon-GettingstartedusingthebrowserUI">Getting started using the b
<li>Containers can also be submitted with the <code>autostart</code> property, this will automatically restart the container if the daemon notices it is stopped.</li>
</ul>
<h1 id="CargoDaemon-gettingStarted.1"><span class="confluence-anchor-link conf-macro output-inline" id="CargoDaemon-gettingStarted"><span class="confluence-anchor-link" id="gettingStarted"> </span></span></h1>
<h1 id="CargoDaemon-GettingstartedwiththeJavaAPI/ANTtasks/Maven3plugin">Getting started with the Java API / ANT tasks / Maven 3 plugin</h1>
<h1 id="CargoDaemon-GettingstartedwiththeJavaAPI/Anttasks/Maven3plugin">Getting started with the Java API /&nbsp;Ant tasks / Maven 3 plugin</h1>
<p>As stated before, the Cargo Daemon is also available programmatically:</p>
<ul>
<li>The details of the Java API can be seen on the <a href="https://codehaus-cargo.github.io/apidocs/org/codehaus/cargo/tools/daemon/DaemonClient.html">Javadoc for o.c.c.tools.daemon.DaemonClient</a></li>
<li>
<p>To use the Daemon via ANT tasks, simply add the <code><a href="Ant+Tasks+Reference+Guide.html#AntTasksReferenceGuide-daemon">&lt;daemon&gt;</a></code> tag in the task and use the <strong>daemon-start</strong> or <strong>daemon-stop</strong> tasks:<br><br></p>
<p>To use the Daemon via Ant tasks, simply add the <code><a href="Ant+Tasks+Reference+Guide.html#AntTasksReferenceGuide-daemon">&lt;daemon&gt;</a></code> tag in the task and use the <strong>daemon-start</strong> or <strong>daemon-stop</strong> tasks:<br><br></p>
<div class="code panel pdl conf-macro output-block" style="border-width: 1px;">
<div class="codeContent panelContent pdl">
<pre class="syntaxhighlighter-pre">&lt;cargo containerId="tomcat7x" action="daemon-start"&gt;
Expand Down
6 changes: 3 additions & 3 deletions cargo/Installation.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -319,7 +319,7 @@ <h3 id="Installation-JavaAPI">Java API</h3>
<td class="confluenceTd"><a href="Installer.html">Installer</a>s</td>
<td class="confluenceTd">
<ul>
<li><a href="https://repo.maven.apache.org/maven2/org/apache/commons/commons-compress/1.24.0/commons-compress-1.24.0.jar">Commons compress 1.24.0</a> or greater</li>
<li><a href="https://repo.maven.apache.org/maven2/org/apache/commons/commons-compress/1.25.0/commons-compress-1.25.0.jar">Commons compress 1.25.0</a> or greater</li>
<li><a href="https://repo.maven.apache.org/maven2/org/tukaani/xz/1.9/xz-1.9.jar">Tukaani XZ 1.9</a> or greater (for 7Z support)</li>
</ul></td>
</tr>
Expand Down Expand Up @@ -350,8 +350,8 @@ <h3 id="Installation-JavaAPI">Java API</h3>
<td colspan="1" class="confluenceTd">WildFly Swarm</td>
<td colspan="1" class="confluenceTd">
<ul>
<li><a href="https://repo.maven.apache.org/maven2/com/fasterxml/jackson/core/jackson-core/2.15.3/jackson-core-2.15.3.jar">Jackson core 2.15.3</a> or greater</li>
<li><a href="https://repo.maven.apache.org/maven2/com/fasterxml/jackson/dataformat/jackson-dataformat-yaml/2.15.3/jackson-dataformat-yaml-2.15.3.jar">Jackson YAML dataformat 2.15.3</a> or greater</li>
<li><a href="https://repo.maven.apache.org/maven2/com/fasterxml/jackson/core/jackson-core/2.16.0/jackson-core-2.16.0.jar">Jackson core 2.16.0</a> or greater</li>
<li><a href="https://repo.maven.apache.org/maven2/com/fasterxml/jackson/dataformat/jackson-dataformat-yaml/2.16.0/jackson-dataformat-yaml-2.16.0.jar">Jackson YAML dataformat 2.16.0</a> or greater</li>
<li><a href="https://repo.maven.apache.org/maven2/org/yaml/snakeyaml/1.33/snakeyaml-1.33.jar">SnakeYAML 1.33</a> or greater</li>
</ul></td>
</tr>
Expand Down
1 change: 1 addition & 0 deletions cargo/Project+Structure.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -402,6 +402,7 @@ <h3 class="heading3">RSS Feeds</h3>
<ul>
<li><span style="color: red;"><strong>browser/</strong></span>: Cargo Daemon Client - Browser</li>
<li><span style="color: red;"><strong>client/</strong></span>: Cargo Daemon Client - Java client</li>
<li><span style="color: red;"><strong>client-with-authentication/</strong></span>: Cargo Daemon client with authentication - Java client</li>
<li><span style="color: red;"><strong>deployable-on-jetty/</strong></span>: Cargo Daemon Client - Deployable on Jetty</li>
<li><span style="color: red;"><strong>deployable-on-tomcat/</strong></span>: Cargo Daemon Client - Deployable on Tomcat</li>
</ul></li>
Expand Down
2 changes: 1 addition & 1 deletion cargo/Tomcat+10.x.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2039,7 +2039,7 @@ <h5 id="Tomcat10.x-Forremotecontainero.c.c.c.tomcat.Tomcat10xRemoteContainer">Fo
</div>
<h3 id="Tomcat10.x-TestedOn">Tested On</h3>
<p>This container is automatically tested by the <a href="https://codehaus-cargo.semaphoreci.com/projects/cargo">Continous Integration system</a> every time there is a code change.<br>
The server used for tests is downloaded from: <a href="https://repo.maven.apache.org/maven2/org/apache/tomcat/tomcat/10.1.15/tomcat-10.1.15.zip">https://repo.maven.apache.org/maven2/org/apache/tomcat/tomcat/10.1.15/tomcat-10.1.15.zip</a></p></td>
The server used for tests is downloaded from: <a href="https://repo.maven.apache.org/maven2/org/apache/tomcat/tomcat/10.1.16/tomcat-10.1.16.zip">https://repo.maven.apache.org/maven2/org/apache/tomcat/tomcat/10.1.16/tomcat-10.1.16.zip</a></p></td>
</tr>
</tbody>
</table></td>
Expand Down
2 changes: 1 addition & 1 deletion cargo/Tomcat+11.x.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2032,7 +2032,7 @@ <h5 id="Tomcat11.x-Forremotecontainero.c.c.c.tomcat.Tomcat11xRemoteContainer">Fo
</div>
<h3 id="Tomcat11.x-TestedOn">Tested On</h3>
<p>This container is automatically tested by the <a href="https://codehaus-cargo.semaphoreci.com/projects/cargo">Continous Integration system</a> every time there is a code change.<br>
The server used for tests is downloaded from: <a href="https://repo.maven.apache.org/maven2/org/apache/tomcat/tomcat/11.0.0-M13/tomcat-11.0.0-M13.zip">https://repo.maven.apache.org/maven2/org/apache/tomcat/tomcat/11.0.0-M13/tomcat-11.0.0-M13.zip</a></p></td>
The server used for tests is downloaded from: <a href="https://repo.maven.apache.org/maven2/org/apache/tomcat/tomcat/11.0.0-M14/tomcat-11.0.0-M14.zip">https://repo.maven.apache.org/maven2/org/apache/tomcat/tomcat/11.0.0-M14/tomcat-11.0.0-M14.zip</a></p></td>
</tr>
</tbody>
</table></td>
Expand Down
2 changes: 1 addition & 1 deletion cargo/Tomcat+8.x.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2033,7 +2033,7 @@ <h5 id="Tomcat8.x-Forremotecontainero.c.c.c.tomcat.Tomcat8xRemoteContainer">For
</div>
<h3 id="Tomcat8.x-TestedOn">Tested On</h3>
<p>This container is automatically tested by the <a href="https://codehaus-cargo.semaphoreci.com/projects/cargo">Continous Integration system</a> every time there is a code change.<br>
The server used for tests is downloaded from: <a href="https://repo.maven.apache.org/maven2/org/apache/tomcat/tomcat/8.5.95/tomcat-8.5.95.zip">https://repo.maven.apache.org/maven2/org/apache/tomcat/tomcat/8.5.95/tomcat-8.5.95.zip</a></p></td>
The server used for tests is downloaded from: <a href="https://repo.maven.apache.org/maven2/org/apache/tomcat/tomcat/8.5.96/tomcat-8.5.96.zip">https://repo.maven.apache.org/maven2/org/apache/tomcat/tomcat/8.5.96/tomcat-8.5.96.zip</a></p></td>
</tr>
</tbody>
</table></td>
Expand Down
2 changes: 1 addition & 1 deletion cargo/Tomcat+9.x.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2033,7 +2033,7 @@ <h5 id="Tomcat9.x-Forremotecontainero.c.c.c.tomcat.Tomcat9xRemoteContainer">For
</div>
<h3 id="Tomcat9.x-TestedOn">Tested On</h3>
<p>This container is automatically tested by the <a href="https://codehaus-cargo.semaphoreci.com/projects/cargo">Continous Integration system</a> every time there is a code change.<br>
The server used for tests is downloaded from: <a href="https://repo.maven.apache.org/maven2/org/apache/tomcat/tomcat/9.0.82/tomcat-9.0.82.zip">https://repo.maven.apache.org/maven2/org/apache/tomcat/tomcat/9.0.82/tomcat-9.0.82.zip</a></p></td>
The server used for tests is downloaded from: <a href="https://repo.maven.apache.org/maven2/org/apache/tomcat/tomcat/9.0.83/tomcat-9.0.83.zip">https://repo.maven.apache.org/maven2/org/apache/tomcat/tomcat/9.0.83/tomcat-9.0.83.zip</a></p></td>
</tr>
</tbody>
</table></td>
Expand Down

0 comments on commit 5709059

Please sign in to comment.