Update instructions and files for tomcat 11 compatiblity

README.md

@@ -22,7 +22,7 @@ This repository only contains scripts and configuration files, and does not redi
 The following steps must be done to add these software packages on top of this codebase:
 
 1. Unzip the entire package downloaded from git.
-2. Download [Apache Tomcat 9](https://tomcat.apache.org/download-90.cgi), the `zip` binary distribution.
+2. Download [Apache Tomcat](https://tomcat.apache.org/download-90.cgi), the `zip` binary distribution. Consider the version to download based on the ThingWorx version you are using. For example, if you are using ThingWorx 9.5, download Tomcat 9. If you are using ThingWorx 10, download Tomcat 11. Consult the official PTC documentation for the exact version of Tomcat that is compatible with your ThingWorx version.
 3. Unzip it into the `apache-tomcat` folder, ensuring that the files that already exist in it are not overwritten (`/conf` and `/webapps/ROOT` folders).
 4. Download the ThingWorx version of your choosing from the PTC Support portal.
 5. Place the `Thingworx.war` file in `apache-tomcat/webapps`.
@@ -46,9 +46,9 @@ Here are the links to the default ports:
 
 ## Advanced Usages
 
-### Changing the Thingworx Version or the Persistance Package
+### Changing the Thingworx Version or the Persistence Package
 
-By default, this package uses Thingworx with PostgreSQL. To change the TWX version just replace the `Thingworx.war` file in `apache-tomcat/webapps` with your war file. Please refer to the migration guide for information on how to move across persistance provider packages. If you want to change the `platform-settings.json` file, you can find it in the root directory of the archive.
+By default, this package uses Thingworx with PostgreSQL. To change the TWX version just replace the `Thingworx.war` file in `apache-tomcat/webapps` with your war file. Please refer to the migration guide for information on how to move across persistence provider packages. If you want to change the `platform-settings.json` file, you can find it in the root directory of the archive.
 
 ### Generating services for an instance
 

apache-tomcat/conf/catalina.properties

@@ -13,26 +13,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-#
-# List of comma-separated packages that start with or equal this string
-# will cause a security exception to be thrown when
-# passed to checkPackageAccess unless the
-# corresponding RuntimePermission ("accessClassInPackage."+package) has
-# been granted.
-package.access=sun.,org.apache.catalina.,org.apache.coyote.,org.apache.jasper.,org.apache.tomcat.
-#
-# List of comma-separated packages that start with or equal this string
-# will cause a security exception to be thrown when
-# passed to checkPackageDefinition unless the
-# corresponding RuntimePermission ("defineClassInPackage."+package) has
-# been granted.
-#
-# by default, no packages are restricted for definition, and none of
-# the class loaders supplied with the JDK call checkPackageDefinition.
-#
-package.definition=sun.,java.,org.apache.catalina.,org.apache.coyote.,\
-org.apache.jasper.,org.apache.naming.,org.apache.tomcat.
-
 #
 #
 # List of comma-separated paths defining the contents of the "common"
@@ -149,6 +129,7 @@ hamcrest-*.jar,\
 hibernate*.jar,\
 httpclient*.jar,\
 icu4j-*.jar,\
+jakartaee-migration-*.jar,\
 jasper-el.jar,\
 jasper.jar,\
 jaspic-api.jar,\
@@ -178,6 +159,7 @@ taglibs-standard-spec-*.jar,\
 tagsoup-*.jar,\
 tomcat-api.jar,\
 tomcat-coyote.jar,\
+tomcat-coyote-ffm.jar,\
 tomcat-dbcp.jar,\
 tomcat-i18n-*.jar,\
 tomcat-jdbc.jar,\
@@ -190,6 +172,7 @@ tomcat-websocket.jar,\
 tools.jar,\
 unboundid-ldapsdk-*.jar,\
 websocket-api.jar,\
+websocket-client-api.jar,\
 wsdl4j*.jar,\
 xercesImpl.jar,\
 xml-apis.jar,\
@@ -204,7 +187,7 @@ xom-*.jar
 # scan types by configuring a JarScanner with a nested JarScanFilter.
 tomcat.util.scan.StandardJarScanFilter.jarsToScan=\
 log4j-taglib*.jar,\
-log4j-web*.jar,\
+log4j-jakarta-web*.jar,\
 log4javascript*.jar,\
 slf4j-taglib*.jar
 
@@ -213,7 +196,3 @@ tomcat.util.buf.StringCache.byte.enabled=true
 #tomcat.util.buf.StringCache.char.enabled=true
 #tomcat.util.buf.StringCache.trainThreshold=500000
 #tomcat.util.buf.StringCache.cacheSize=5000
-
-# Disable use of some privilege blocks Tomcat doesn't need since calls to the
-# code in question are always already inside a privilege block
-org.apache.el.GET_CLASSLOADER_USE_PRIVILEGED=false

apache-tomcat/conf/context.xml

@@ -24,8 +24,8 @@
     <WatchedResource>WEB-INF/tomcat-web.xml</WatchedResource>
     <WatchedResource>${catalina.base}/conf/web.xml</WatchedResource>
 
-    <!-- Uncomment this to disable session persistence across Tomcat restarts -->
+    <!-- Uncomment this to enable session persistence across Tomcat restarts -->
     <!--
-    <Manager pathname="" />
+    <Manager pathname="SESSIONS.ser" />
     -->
 </Context>