From 2381f9284c72b139b605881c37b935e8749933ca Mon Sep 17 00:00:00 2001
From: Alex O'Ree <alexoree@apache.org>
Date: Sun, 9 Aug 2026 09:17:51 -0400
Subject: [PATCH 1/2] per the last release vote on v3.0.0, this adds an example
 to the cargo plugin for TLS support however it appears to work just fine with
 http. Updates the readme to remove the reference to install.jsp which no
 longer exists. adds some additional documentation to jspwiki.properties for
 the secure cookie flag

---
 README.md                                              | 10 ++--------
 jspwiki-main/src/main/resources/ini/jspwiki.properties |  4 ++++
 pom.xml                                                | 10 ++++++++++
 3 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/README.md b/README.md
index 69dda78b98..cf7d942f8c 100644
--- a/README.md
+++ b/README.md
@@ -62,7 +62,7 @@ Since JSPWiki 2.1.153, JSPWiki comes with a really simple installation
 engine.  Just do the following:
 
 1) Install Tomcat from https://tomcat.apache.org/ (or any other servlet
-   container)
+   container) and unzip it somewhere.
 
 2) Rename the JSPWiki.war file from the download and rename it based on
    your desired URL (if you want it different from /JSPWiki).  For example,
@@ -70,13 +70,7 @@ engine.  Just do the following:
    This name will be referred to as <appname> below.
    Place this WAR in your `$TOMCAT_HOME/webapps` folder and then start Tomcat.
 
-3) Point your browser at http://&lt;myhost>/&lt;appname>/Install.jsp
-
-4) Answer a couple of simple questions
-
-5) Restart your container
-
-6) Point your browser to http://&lt;myhost>/&lt;appname>/
+3) Point your browser to http://&lt;myhost>/&lt;appname>/
 
 That's it!
 
diff --git a/jspwiki-main/src/main/resources/ini/jspwiki.properties b/jspwiki-main/src/main/resources/ini/jspwiki.properties
index 167c8b1352..eea8691f27 100644
--- a/jspwiki-main/src/main/resources/ini/jspwiki.properties
+++ b/jspwiki-main/src/main/resources/ini/jspwiki.properties
@@ -667,6 +667,10 @@ jspwiki.aclManager = org.apache.wiki.auth.acl.DefaultAclManager
 # Secure Cookie flag, when setting a browser cookie, this will set the
 # secure flag to true and the http flag to true.
 # set to false if you're using non-SSL/TLS connections
+# in most cases, you want this set to true.
+# when it is true, it may trigger authentication issues
+# when accessing the wiki over http. if that causes you issues, 
+# switch to TLS or set this to false (insecure).
 jspwiki.securecookie = true
 
 #############################################################################
diff --git a/pom.xml b/pom.xml
index 7a756aebab..bededa6e0e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -892,7 +892,17 @@
               <type>standalone</type>
               <home>${project.build.directory}/tomcat10x</home>
               <properties>
+                <cargo.protocol>http</cargo.protocol>
                 <cargo.servlet.port>8080</cargo.servlet.port>
+                <!--example for cargo plugin with https-->
+                <!--
+                <cargo.protocol>https</cargo.protocol>
+                <cargo.servlet.port>8443</cargo.servlet.port>
+                <cargo.tomcat.httpSecure>true</cargo.tomcat.httpSecure>
+                <cargo.tomcat.connector.sslProtocol>TLS</cargo.tomcat.connector.sslProtocol>
+                <cargo.tomcat.connector.keystoreFile>${project.basedir}/../jspwiki-portable/src/overlay/tomcat/conf/test-use-only.p12</cargo.tomcat.connector.keystoreFile>
+                <cargo.tomcat.connector.keystorePass></cargo.tomcat.connector.keystorePass>
+                -->
                 <cargo.jvmargs>-Xms256m -Xmx3072m -Xdebug -Xnoagent -Xrunjdwp:transport=dt_socket,server=y,suspend=n,address=5005 -XX:+DisableExplicitGC -Xverify:none -Djava.awt.headless=true</cargo.jvmargs>
               </properties>
             </configuration>

From 0de90b88d1863b6aa385f02d216c08da56140f5e Mon Sep 17 00:00:00 2001
From: Alex O'Ree <alexoree@apache.org>
Date: Sun, 9 Aug 2026 11:21:54 -0400
Subject: [PATCH 2/2] rolls back the removal of the readme note on Install.jsp

---
 README.md | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/README.md b/README.md
index cf7d942f8c..85423ea2e9 100644
--- a/README.md
+++ b/README.md
@@ -70,7 +70,13 @@ engine.  Just do the following:
    This name will be referred to as <appname> below.
    Place this WAR in your `$TOMCAT_HOME/webapps` folder and then start Tomcat.
 
-3) Point your browser to http://&lt;myhost>/&lt;appname>/
+3) Point your browser at http://&lt;myhost>/&lt;appname>/Install.jsp
+
+4) Answer a couple of simple questions
+
+5) Restart your container
+
+6) Point your browser to http://&lt;myhost>/&lt;appname>/
 
 That's it!