diff --git a/Dockerfile b/Dockerfile index 242b391..170d756 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,82 +1,21 @@ -FROM eclipse-temurin:11 +FROM alpine:latest LABEL org.opencontainers.image.authors="Hazza" -ENV DOCKER_NAME="docker-smartconnect7" +ENV JAVA_HOME=/usr/lib/jvm/java-11-openjdk -ARG CATALINA_HOME +ENV CATALINA_HOME=/opt/tomcat9 -ARG SC_PUBLISHED_HOST +ENV PATH=$PATH:$JAVA_HOME/bin:$CATALINA_HOME/bin -ARG SC_FILESTORE_LOCATION +RUN apk update && apk add openjdk11 openssl -ARG SC_SERVER_ADMIN +RUN mkdir -p /data/SMARTConnect -ARG POSTGRES_PASSWORD +ENV SMARTCONNECT_DATA=/data/SMARTConnect -ARG DNS_CLOUDFLARE_API_TOKEN +WORKDIR / -ENV TIME_ZONE="Asia/Jakarta" +ADD ./app / -ENV CATALINA_HOME=$CATALINA_HOME - -ENV SC_PUBLISHED_HOST=$SC_PUBLISHED_HOST - -ENV PATH=$CATALINA_HOME/bin:$PATH - -RUN mkdir /app && mkdir -p $SC_FILESTORE_LOCATION - -WORKDIR /app - -ADD ./app /app/ - -ENV SMARTCONNECT_DATA=$SC_FILESTORE_LOCATION - -RUN apt update - -RUN apt install certbot python3-certbot-dns-cloudflare build-essential autoconf libtool libapr1-dev libssl-dev -y && apt clean && rm -rf /var/lib/apt/lists/* - -RUN set -eux; \ -export TOMCAT_VERSION=$(curl --silent https://dlcdn.apache.org/tomcat/tomcat-9/ | grep v9 | tail -n 1 | grep -oE 'v[0-9]+\.[0-9]+\.[0-9]+' | tail -n 1); \ -echo ">>> latest Tomcat version: ${TOMCAT_VERSION}"; \ -export TOMCAT_URL="https://dlcdn.apache.org/tomcat/tomcat-9/${TOMCAT_VERSION}/bin/apache-tomcat-${TOMCAT_VERSION#v}.tar.gz"; \ -export TOMCAT_FILE=tomcat.tar.gz; \ -export TOMCAT_SHA512_URL="https://dlcdn.apache.org/tomcat/tomcat-9/${TOMCAT_VERSION}/bin/apache-tomcat-${TOMCAT_VERSION#v}.tar.gz.sha512"; \ -export TOMCAT_SHA512_FILE=tomcat.tar.gz.sha512; \ -wget -O "$TOMCAT_FILE" "$TOMCAT_URL"; \ -wget -O "$TOMCAT_SHA512_FILE" "$TOMCAT_SHA512_URL"; \ -HASH=$(cat $TOMCAT_SHA512_FILE | cut -d ' ' -f 1); \ -HASH="$HASH $TOMCAT_FILE"; \ -echo ">>> $HASH"; \ -echo $HASH | sha512sum -c; \ -mkdir -p "$CATALINA_HOME"; \ -tar --extract --file "$TOMCAT_FILE" --directory "$CATALINA_HOME" --strip-components 1 --no-same-owner; \ -rm "$TOMCAT_FILE"; \ -echo "[$(date)] [$DOCKER_NAME] [$TOMCAT_URL]" >> /.components; - -RUN rm $TOMCAT_SHA512_FILE - -RUN wget https://dlcdn.apache.org/tomcat/tomcat-connectors/native/2.0.9/source/tomcat-native-2.0.9-src.tar.gz - -RUN tar -xzf tomcat-native-2.0.9-src.tar.gz - -RUN (cd tomcat-native-2.0.9-src/native && ./configure --with-apr=/usr/bin/apr-1-config --with-java-home=$JAVA_HOME --with-ssl=/usr/lib/ssl --prefix=$CATALINA_HOME && make && make install) - -RUN rm tomcat-native-2.0.9-src.tar.gz && rm -rf omcat-native-2.0.9-src - -RUN mkdir -p ~/.secrets/certbot && printf "dns_cloudflare_api_token=$DNS_CLOUDFLARE_API_TOKEN" >> ~/.secrets/certbot/cloudflare.ini && chmod 600 ~/.secrets/certbot/cloudflare.ini - -RUN certbot certonly --dns-cloudflare --dns-cloudflare-credentials ~/.secrets/certbot/cloudflare.ini --non-interactive --agree-tos --no-eff-email -m hendra@yel.or.id -d $SC_PUBLISHED_HOST - -RUN rm -rf $CATALINA_HOME/webapps && mkdir $CATALINA_HOME/conf/cert && mv -f conf $CATALINA_HOME/ && mv -f webapps $CATALINA_HOME/ && mv lib $CATALINA_HOME/ - -RUN cp -Lf /etc/letsencrypt/live/$SC_PUBLISHED_HOST/*.pem $CATALINA_HOME/conf/cert/ - -RUN printf "#!/bin/sh\n\n\ -cp -Lf /etc/letsencrypt/live/$SC_PUBLISHED_HOST/*.pem /opt/tomcat9/conf/cert/\n\n\ -$CATALINA_HOME/bin/shutdown.sh\n\ -sleep 5\n\ -$CATALINA_HOME/bin/startup.sh" >> /etc/letsencrypt/renewal-hooks/deploy/sc7_certbot_deploy.sh \ -&& chmod 750 /etc/letsencrypt/renewal-hooks/deploy/sc7_certbot_deploy.sh - -CMD ["sh"] \ No newline at end of file +CMD ["catalina.sh", "run"] \ No newline at end of file diff --git a/app/opt/tomcat9/BUILDING.txt b/app/opt/tomcat9/BUILDING.txt new file mode 100644 index 0000000..b3f0381 --- /dev/null +++ b/app/opt/tomcat9/BUILDING.txt @@ -0,0 +1,673 @@ +================================================================================ + Licensed to the Apache Software Foundation (ASF) under one or more + contributor license agreements. See the NOTICE file distributed with + this work for additional information regarding copyright ownership. + The ASF licenses this file to You under the Apache License, Version 2.0 + (the "License"); you may not use this file except in compliance with + the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +================================================================================ + + ==================================================== + Building The Apache Tomcat 9.0 Servlet/JSP Container + ==================================================== + +This project contains the source code for Tomcat 9.0, a container that +implements the Servlet 4.0, JSP 2.3, EL 3.0, WebSocket 1.1 and JASPIC 1.1 +specifications from the Java Community Process . + +Note: If you just need to run Apache Tomcat, it is not necessary to build +it. You may simply download a binary distribution. It is cross-platform. +Read RUNNING.txt for the instruction on how to run it. + +In order to build a binary distribution version of Apache Tomcat from a +source distribution, do the following: + + +(1) Download and Install a Java Development Kit + + 1. If the JDK is already installed, skip to (2). + + 2. Download a version 17 or later of Java Development Kit (JDK) release (use + the latest update available for your chosen version) from one of: + + http://www.oracle.com/technetwork/java/javase/downloads/index.html + http://openjdk.java.net/install/index.html + or another JDK vendor. + + Note regarding later versions of Java: + + As documented elsewhere, one of components in Apache Tomcat includes + a private copy of the Apache Commons DBCP 2 library. + + The JDBC interfaces implemented by DBCP frequently change in non-backwards + compatible ways between versions of the Java SE specification. Therefore, + it is likely that DBCP 2 will only compile with the specific version of Java + listed above and that compilation will fail if a later version of Java is + used. + + See Apache Commons DBCP 2 project web site for more details on + available versions of the library and its requirements, + + https://commons.apache.org/dbcp/ + + 3. Install the JDK according to the instructions included with the release. + + 4. Set an environment variable JAVA_HOME to the pathname of the directory + into which you installed the JDK release. + + +(2) Install Apache Ant version 1.10.2 or later on your computer. + + 1. If Apache Ant version 1.10.2 or later is already installed on your + computer, skip to (3). + + 2. Download a binary distribution of Ant from: + + https://ant.apache.org/bindownload.cgi + + 3. Unpack the binary distribution into a convenient location so that the + Ant release resides in its own directory (conventionally named + "apache-ant-[version]"). + + For the purposes of the remainder of this document, the symbolic name + "${ant.home}" is used to refer to the full pathname of the release + directory. + + 4. Create an ANT_HOME environment variable to point the directory + ${ant.home}. + + 5. Modify the PATH environment variable to include the directory + ${ant.home}/bin in its list. This makes the "ant" command line script + available, which will be used to actually perform the build. + + +(3) Building Tomcat 9.0 + +(3.1) Checkout or obtain the source code for Tomcat 9.0 + +Clone the source using git, then checkout a specific major branch or +main for the latest code development, or download and unpack a source +package. + + * Tomcat GitHub repository URL: + + https://github.com/apache/tomcat + + * Source packages can be downloaded from: + + https://tomcat.apache.org/download-90.cgi + +The location where the source has been placed will be further referred as +${tomcat.source}. + +The Tomcat local build process does not modify line-endings. The svn repository +is configured so that all files will be checked out with the line-ending +appropriate for the current platform. When using a source package you should +ensure that you use the source package that has the appropriate line-ending +for your platform: + + zip -> CRLF + tar.gz -> LF + +Note that the release build process does modify line-endings to ensure that +each release package has the appropriate line-endings. + +(3.2) Building + + 1. The build is controlled by creating a ${tomcat.source}/build.properties + file. + + It is recommended to always create the file, because of unfortunate + default value of base.path property. You may start with the following + content for the file: + + # ----- Default Base Path for Dependent Packages ----- + # Replace this path with the directory path where dependencies binaries + # should be downloaded + base.path=/home/me/some-place-to-download-to + + 2. Configure base.path property by adding it to the + ${tomcat.source}/build.properties file. + + The base.path property specifies the place where Tomcat dependencies + required by the build are downloaded. It is recommended to place this + directory outside of the source tree, so that you do not waste your + time re-downloading the libraries. + +* NOTE: The default value of the base.path property configures the build script + to download the libraries required to build Tomcat to the + ${user.home}/tomcat-build-libs directory. + +* NOTE: Users accessing the Internet through a proxy must use the properties + file to indicate to Ant the proxy configuration. + + The following properties should be added to the ${tomcat.source}/build.properties + file. + + proxy.use=true + proxy.host=proxy.domain + proxy.port=8080 + proxy.user=username + proxy.password=password + + See Apache Ant documentation for the task for details. + + 3. Go to the sources directory and run Ant: + + cd ${tomcat.source} + ant + + This will execute the "deploy" target in build.xml. + + Once the build has completed successfully, a usable Tomcat installation + will have been produced in the ${tomcat.source}/output/build directory, + and can be started and stopped with the usual scripts. + + Note that the build includes Tomcat documentation, which can be found + in the output/build/webapps/docs directory. + + The path of the output directory can be controlled by specifying the + "tomcat.output" property in the build.properties file. + +* NOTE: Do not run the build as the root user. Building and running Tomcat + does not require root privileges. + + +(4) Updating sources and rebuilding + +It is recommended that you regularly update the downloaded Tomcat 9.0 +sources using your git client. + +For a quick rebuild of only modified code you can use: + + cd ${tomcat.source} + ant + + +(5) Special builds + +There are several targets in Tomcat build files that are useful to be +called separately. They build components that you may want to build +quickly, or ones that are included in the full release and are not built +during the default "deploy" build. + +(5.1) Building documentation + +The documentation web application is built during the default "deploy" +build. + +It can be built quickly by using the following commands: + + cd ${tomcat.source} + ant build-docs + +The output of this command will be found in the following directory: + + output/build/webapps/docs + + +The API documentation (Javadoc) is built during a "release" build. It is +easy to build it separately by using the following commands: + + cd ${tomcat.source} + ant javadoc + +The output of this command will be found in the following directories: + + output/dist/webapps/docs/api + output/dist/webapps/docs/elapi + output/dist/webapps/docs/jspapi + output/dist/webapps/docs/servletapi + + +(5.2) Building the extras (commons-logging, webservices etc.) + +These components are documented on the "Additional Components" +(extras.html) page of documentation. They are built during a "release" +build. + +You can build them by using the following commands: + + cd ${tomcat.source} + ant extras + +(5.3) Building the embedded packages + +These are built during a "release" build. + +You can build them by using the following commands: + + cd ${tomcat.source} + ant embed + +(5.4) Building the Windows installer + +The Windows installer uses the NSIS installer framework. +It can be build on Windows, on any other platform which provides +the Wine Windows emulator or the NSIS binary "makensis". + +Linux and MacOS are platforms, on which you can install Wine or +"makensis". + +Selecting between Wine and makensis on non-Windows platforms can +be done by setting the ant property "nsis.tool" to either "wine" +or "makensis" in build.properties. + +If you want to sign the installer, you will need to set some +properties with names prefixed with "codesigning" in your build.properties. +For details see the targets "jsign-installer" and "jsign-uninstaller" +in build.xml and the default property values in build.properties.default. + + +(6) Building a full release (as provided via the ASF download pages) + + 1. Remark on building the Windows installer + + A full release includes the Windows installer which requires a Windows + environment, an installed Wine emulator or an installed native + "makensis" binary from the NSIS project. Creating a reproducible + installer using the "makensis" option needs a special build of "makensis". + For details see below. + + Provided that Wine or "makensis" is available on non-Windows platforms, + a full release build may be made on Windows, Linux or MacOS. + + If you do not want to build the Windows installer, the skip.installer + property may be set to skip the creation of the Windows installer. + + 2. Configure GPG, if needed + + If the released artifacts have to be cryptographically signed with a + PGP signature, like the official ASF releases are, the following + property can be added to the build.properties file: + + # Location of GPG executable (used only for releases) + gpg.exec=/path/to/gpg + + You do not need it if you do not plan to sign the release. + + If "gpg.exec" property does not point to an existing file, it will be + ignored and this feature will be deactivated. + + You will be prompted for the GPG passphrase when the release build + starts, unless "gpg.passphrase" property is set. + + 3. If building the Windows installer on Windows + + If running the build in a UAC enabled environment, building the Windows + installer requires elevated privileges. The simplest way to do this is to + open the command prompt used for the build with the "Run as administrator" + option. + + 4. Configure the code signing service + + ASF committers performing official releases will need to configure the code + signing service so that the Windows installer is signed during the build + process. The following properties need to be added to the build.properties + file: + + # Location of GPG executable (used only for releases) + gpg.exec=/path/to/gpg + # Code signing of Windows installer + do.codesigning=true + codesigning.storepass=request-via-pmc + codesigning.keypass=request-via-pmc + + Release managers will be provided with the necessary credentials by the PMC. + + If you want to verify the installer from a release by rebuilding it, + you can use the detached signatures provided in the official releases. + In this case you have to use the sources from the source release + archive, which contains these signatures. You also have to build + on Windows, use Wine, or use a special build of makensis to create + a reproducible installer, that fits the signature files. + + 5. Using a special "makensis" build on non-Windows (optional) + + If you want to build a reproducible installer on non-Windows + by using "makensis" instead of "Wine", you need to build + "makensis" from a source download yourself. To build "makensis", + you need python, scons and a C compiler. You can build "makensis" + via an Ant target: + + ant local-makensis + + or you can build it manually using the following recipe. + + First detect the needed version by looking for nsis.version + in build.properties.default. + + Download and extract NSIS for Windows by running "ant download-dist". Note + the NSIS installation path from the output or by checking "nsis.bin.home" in + build.properties.default. For example by default: + nsis.bin.home=${base.path}/nsis-${nsis.version} + + The corresponding sources will be downloaded to "nsis.src.home" in + build.properties.default. For example by default: + nsis.src.home=${base.path}/nsis-${nsis.version}-src + + Install the scons Python software construction tool. + + Run the following command in the extracted NSIS source directory: + + scons UNICODE=yes PREFIX=${base.path}/nsis-${nsis.version}/Bin SKIPPLUGINS=all SKIPUTILS=all SKIPMISC=all NSIS_CONFIG_CONST_DATA_PATH=no VERSION=${nsis.version} install-compiler + + You need to specify the correct value in VERSION (this ends up in the installer binary + so it needs to match). The PREFIX is not important, but you need to make sure + that the created binary "makensis" gets finally put into the "Bin" directory of + the NSIS binary distribution that "ant download-dist" installed. When using + "NSIS_CONFIG_CONST_DATA_PATH=no" the binary is independent of the value of "PREFIX". + + In addition set the ant property "nsis.tool" to "makensis" in + build.properties. + + 6. Build the release: + + Apache Tomcat releases are fully reproducible. + + Release managers producing release builds must follow the following + procedure: + + cd ${tomcat.source} + ant pre-release + ant release + git commit -a -m "Tag " + git tag + git push origin + ant release + git reset --hard HEAD~1 + + The output from either 'ant release' call may be uploaded as the official + release since they will be identical. It is recommended that the output from + the second call is used. + + Anyone wishing to reproduce an official build must do so from an official + source release. The build tool chain defined in build.properties.release + must be used to reproduce an official build. Once unpacked to + ${tomcat.source}, the following steps must be followed + + cd ${tomcat.source} + ant release + + Following the same steps without using the defined build tool chain will + create a release that is functionally the same as an official release but + not bit for bit identical. + + +(7) Tests + +(7.1) Running Tomcat tests + +Tomcat includes a number of junit tests. The tests are not run when a +release is built. There is separate command to run them. + +To run the testsuite use the following command: + + cd ${tomcat.source} + ant test + +It is advisable to redirect output of the above command to a file for later +inspection. + +The JUnit reports generated by the tests will be written to the following +directory: + + output/build/logs + +By default the testsuite is run three times to test 3 different +implementations of Tomcat connectors: NIO, NIO2 and APR. (If you are not +familiar with Tomcat connectors, see config/http.html in documentation for +details). + +The 3 runs are activated and deactivated individually by the following +properties, which all are "true" by default: + + execute.test.nio=true + execute.test.nio2=true + execute.test.apr=true + +The APR connector can be tested only if Tomcat-Native library binaries are +found by the testsuite. The "test.apr.loc" property specifies the directory +where the library binaries are located. + +By default the "test.apr.loc" property specifies the following location: + + output/build/bin/ + +If you are on Windows and want to test the APR connector you can put the +tcnative-1.dll file into ${tomcat.source}/bin/ and it will be copied +into the above directory when the build runs. + +The unit tests include tests of the clustering functionality which require +multicast to be enabled. There is a simple application provided in the Tomcat +test source (org.apache.catalina.tribes.TesterMulticast) that can be used to +check if a machine supports multicast. Notes on enabling multicast for different +operating systems are provided in the Javadoc for that class. + + +(7.2) Running a single test + +It is possible to run a single JUnit test class by adding the "test.entry" +property to the build.properties file. The property specifies the name of +the test class. + +For example: + + test.entry=org.apache.catalina.util.TestServerInfo + +It is possible to further limit such run to a number of selected test +methods by adding "test.entry.methods" property. The property specifies a +comma-separated list of test case methods. + +For example: + + test.entry=org.apache.el.lang.TestELArithmetic + test.entry.methods=testMultiply01,testMultiply02 + + +(7.3) Running a set of tests + +It is possible to run a set of JUnit test classes by adding the "test.name" +property to the build.properties file. The property specifies an Ant +includes pattern for the fileset of test class files to run. + +The default value is "**/Test*.java", so all test classes are being +executed (with few exceptions - see build.xml for several exclude patterns). + +You can include multiple patterns by concatenating them with a comma (",") +as the separator. + +For example: + + test.name=**/TestSsl.java,**/TestWebSocketFrameClientSSL.java + +You can exclude specific JUnit test classes by adding the "test.exclude" +property to the build.properties file. The property specifies an Ant +excludes pattern for the fileset of test class files to exclude form the run. +The default value is empty, so no classes are excluded. The syntax is the same +as for the property "test.name". + + +(7.4) Other configuration options + + 1. It is possible to configure the directory where JUnit reports are + written to. It is configured by "test.reports" property. The default + value is + + output/build/logs + + 2. It is possible to enable generation of access log file when the tests + are run. This is off by default and can be enabled by the following + property: + + test.accesslog=true + + The "access_log." file will be written to the same directory as + JUnit reports, + + output/build/logs + + 3. The testsuite respects logging configuration as configured by + ${tomcat.source}/conf/logging.properties + + The log files will be written to the temporary directory used by the + tests, + + output/test-tmp/logs + + 4. It is possible to configure formatter used by JUnit reports. + Configuration properties are "junit.formatter.type", + "junit.formatter.extension" and "junit.formatter.usefile". + + For example the following property deactivates generation of separate report + files: + + junit.formatter.usefile=false + + 5. It is possible to speed up testing by letting JUnit to run several + tests in parallel. + + This is configured by setting "test.threads" property. The recommended + value is one thread per core. + + 6. Optional support is provided for the Cobertura code coverage tool. + +NOTE: Cobertura is licensed under GPL v2 with parts of it being under + Apache License v1.1. See https://cobertura.github.io/cobertura/ for details. + Using it during Tomcat build is optional and is off by default. + + Cobertura can be enabled using the following properties: + + test.cobertura=true + test.threads=1 + + Using Cobertura currently requires setting test.threads configuration + property to the value of 1. Setting that property to a different value + will deactivate code coverage. + + The report files by default are written to + + output/coverage + + 7. The performance tests are written to run on reasonably powerful machines + (such as a developer may use day to day) assuming no other resource hungry + processes are running. + + Performance tests may be an absolute test (how long to complete a number + of iterations of an operation or set of operations) or may be a relative + test (how long two or more different approaches take to generate the same + result). The absolute tests may be destructive in that they run until the + system runs out of resources. + + Where there is no benefit in running an absolute performance test as part + of a standard test run, the test will be excluded by naming it + Tester*Performance.java. + + The relative tests are included as part of a standard test run however, + where the assumptions made about host capabilities are not true (e.g. on + CI systems running in virtual machine) the tests may be deactivated by + using the following property: + + test.excludePerformance=true + + 8. Some tests are require large heaps (e.g. 8GB). The CI systems used by the + project either cannot support heaps of this size or do not support them by + default. These tests are therefore disabled by default and may be enabled by + using the following property: + + test.includeLargeHeap=true + + 9. Some tests include checks that the access log valve entries are as expected. + These checks include timings. On slower / loaded systems these checks will + often fail. The checks may be relaxed by using the following property: + + test.relaxTiming=true + + 10. It is known that some platforms (e.g. OSX El Capitan) require IPv4 to + be the default for the multicast tests to work. This is configured by + the following property: + + java.net.preferIPv4Stack=true + + 11. By default the output of unit tests is sent to the console and can be + quite verbose. The output can be deactivated by setting the property: + + test.verbose=false + +(8) Source code checks + +(8.1) Checkstyle + +NOTE: Checkstyle is licensed under LGPL. Using Checkstyle during Tomcat + build is optional and is off by default. + + See http://checkstyle.sourceforge.net/ for more information. + +Tomcat comes with a Checkstyle configuration that tests its source code +for certain conventions, like presence of the license header. + +To enable Checkstyle, add the following property to build.properties file: + + execute.validate=true + +Once Checkstyle is enabled, the check will be performed automatically +during the build. The check is run before compilation of the source code. + +To speed-up repeated runs of this check, a cache is configured. The cache +is located in the following directory: + + output/res/checkstyle + +It is possible to run the check separately by calling the "validate" +target. The command is: + + cd ${tomcat.source} + ant -Dexecute.validate=true validate + + +(8.2) SpotBugs + +NOTE: SpotBugs is licensed under LGPL. Using SpotBugs during Tomcat build is + optional and is off by default. + + See https://spotbugs.github.io/ for more information. + +To enable SpotBugs, add the following property to build.properties file: + + execute.spotbugs=true + +To compile Tomcat classes and generate a SpotBugs report, call the +"spotbugs" target. For example: + + cd ${tomcat.source} + ant -Dexecute.spotbugs=true spotbugs + +The report file by default is written to + + output/spotbugs + + +(8.3) End-of-line conventions check + +You usually would not need to run this check. You can skip this section. + +Apache Tomcat project has convention that all of its textual source files, +stored in the Git repository, use Unix style LF line endings. + +This test is used by developers to check that the source code adheres to +this convention. It verifies that the ends of lines in textual files are +appropriate. The idea is to run this check regularly and notify developers +when an inconsistency is detected. + +The command to run this test is: + + cd ${tomcat.source} + ant validate-eoln diff --git a/app/opt/tomcat9/CONTRIBUTING.md b/app/opt/tomcat9/CONTRIBUTING.md new file mode 100644 index 0000000..1f94bf2 --- /dev/null +++ b/app/opt/tomcat9/CONTRIBUTING.md @@ -0,0 +1,164 @@ +# Contributing to Apache Tomcat + +Firstly, thanks for your interest in contributing! I hope that this will be a +pleasant experience for you, and that you will return to continue +contributing. + +Please visit our [Get Involved page](https://tomcat.apache.org/getinvolved.html) +for more information on how to contribute. + +## Code of Conduct + +This project and everyone participating in it are governed by the Apache +software Foundation's +[Code of Conduct](https://www.apache.org/foundation/policies/conduct.html). By +participating, you are expected to adhere to this code. If you are aware of +unacceptable behavior, please visit the +[Reporting Guidelines page](https://www.apache.org/foundation/policies/conduct.html#reporting-guidelines) +and follow the instructions there. + +## How Can I Contribute? + +Most of the contributions that we receive are code contributions, but you can +also contribute to the documentation, wiki, etc., or simply report solid bugs +for us to fix. + +### Reporting Bugs + +Please review our [guide](https://tomcat.apache.org/bugreport.html) on how to +submit a bug report. This page also has links to other resources to assist +you. + +### Reporting Translation improvements + +Apache Tomcat project uses POEditor for managing the localization files. +Please see more at https://cwiki.apache.org/confluence/x/vIPzBQ + +### Your First Code Contribution + +### Trouble Deciding How to Contribute? + +Unsure where to begin contributing to Tomcat? You can start by taking a look at +the issues marked 'Beginner', link below. Please note that the Beginner keyword +is pretty new to the project, so if there aren't any issues in the filter feel +free to ask on the [dev list](https://tomcat.apache.org/lists.html#tomcat-dev). + +* [Beginner issues](https://bz.apache.org/bugzilla/buglist.cgi?bug_status=NEW&bug_status=ASSIGNED&bug_status=REOPENED&bug_status=NEEDINFO&keywords=Beginner&keywords_type=allwords&list_id=160824&product=Tomcat%207&product=Tomcat%208.5&product=Tomcat%209&query_format=advanced) - +issues which should only require a few lines of code, and a test or two to +resolve. + +The list above shows all bugs that are marked 'Beginner' and are open in the +currently supported Tomcat versions (9.0, 10.1, 11.0 and 12.0). + +If you prefer C over Java, you may also take a look at the tomcat-native and +Tomcat Connectors products in Bugzilla. + +### How to Provide Your First Patch + +Excited yet? This section will guide you through providing a patch to the +committers of the project for review and acceptance. + +##### Choose Your Method of Submission + +You can provide a patch in one of the following ways (in order of preference): + +* GitHub Pull Request +* Patch attachment to the Bugzilla issue +* Email the patch to the developer list. This is not preferred, but if no bug +is associated with the patch, or you would like a developer review, an email +may be appropriate. + +##### Get the Sources + +Now that you've chosen how you want to submit a patch, you need to get the +source code. + +###### Download The Source Distribution + +This method works if you want to submit a patch via email, but +the difference in using the sources distribution and a VCS is that you have to +manually generate the patch file by using diff. If this is what you want, you +can download the sources from the "Source Code Distributions" section of the +Download Page. There is one such page for every major Tomcat version: + +- [Tomcat 11](https://tomcat.apache.org/download-11.cgi) +- [Tomcat 10](https://tomcat.apache.org/download-10.cgi) +- [Tomcat 9](https://tomcat.apache.org/download-90.cgi) + +##### Manual Patch Generation + +If you have chosen to attach a patch to the Bugzilla issue (or email +one), then you'll need to download the sources as noted above, make your +desired changes and then manually generate your patch using diff (or any +other tool). + +##### GitHub + +To submit a GitHub Pull Request you'll need to fork the +[repository](https://github.com/apache/tomcat), clone your fork to do the work: + +``` +$ git clone https://github.com/$USERNAME/tomcat.git +``` + +and then push your changes, and submit a Pull Request via the GitHub UI. + +#### Submitting Your Patch! + +After you've chosen your method of submission, retrieved the sources, and +fixed the issue it's time to submit your work. At this point, just follow +the method of submission you chose earlier. + +* GitHub PR - after resolving the issue in your local fork and pushing to your +copy of the repository, open a GitHub PR for review. +* Bugzilla attachment - attach the patch to the Bugzilla issue +* Email - again, not preferred, but you may send an email to the developer list +with a patch attached for review. + +#### Waiting For Feedback + +It may take a while for committers to review. Please be patient during this +time as all committers are volunteers on the project. If a significant amount +of time has lapsed since your submission, such as a couple of months, feel free +to either update your BZ, PR, or email the dev list with a message to bump your +issue. Sometimes things get lost in all the work and we need a reminder :smile: + +## IDE Support + +Special IDE support for +[Eclipse](https://www.eclipse.org/ide/), +[IntelliJ IDEA](https://www.jetbrains.com/idea/) and +[NetBeans](https://netbeans.org/) +is provided through special ant targets: + +```bash +ant ide-eclipse +``` +```bash +ant ide-intellij +``` +```bash +ant ide-netbeans +``` + +Just execute the ant target for your IDE after checking out the sources +to set up the appropriate configuration files. +Also make sure to re-execute the target after switching branches or +after pulling upstream changes in order to keep your IDE configurations in sync. + +## Style Guide + +Apache Tomcat has very loosely defined coding conventions, but the following +guidelines will be useful: + +* Use spaces for indenting, not tabs +* 100 char line width for Java source, 80 char line width for documentation +source (.txt, .xml) +* Java source: { at end of line, 4 space indents +* XML source: 2 space indents + +## Did we miss something? + +Have you reviewed this guide and found it lacking? Or are you confused about +some particular step? If so, please let us know! Or better yet, submit a PR to +address the issue :wink: diff --git a/app/opt/tomcat9/LICENSE b/app/opt/tomcat9/LICENSE new file mode 100644 index 0000000..e6a6baf --- /dev/null +++ b/app/opt/tomcat9/LICENSE @@ -0,0 +1,1061 @@ + + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + + APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "[]" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + + Copyright [yyyy] [name of copyright owner] + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + + + +APACHE TOMCAT SUBCOMPONENTS: + +Apache Tomcat includes a number of subcomponents with separate copyright notices +and license terms. Your use of these subcomponents is subject to the terms and +conditions of the following licenses. + + +For the Eclipse JDT Core Batch Compiler (ecj-x.x.x.jar) component: + +Eclipse Public License - v 1.0 + +THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE PUBLIC +LICENSE ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THE PROGRAM +CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT. + +1. DEFINITIONS + +"Contribution" means: + +a) in the case of the initial Contributor, the initial code and documentation +distributed under this Agreement, and + +b) in the case of each subsequent Contributor: + +i) changes to the Program, and + +ii) additions to the Program; + +where such changes and/or additions to the Program originate from and are +distributed by that particular Contributor. A Contribution 'originates' from a +Contributor if it was added to the Program by such Contributor itself or anyone +acting on such Contributor's behalf. Contributions do not include additions to +the Program which: (i) are separate modules of software distributed in +conjunction with the Program under their own license agreement, and (ii) are not +derivative works of the Program. + +"Contributor" means any person or entity that distributes the Program. + +"Licensed Patents" mean patent claims licensable by a Contributor which are +necessarily infringed by the use or sale of its Contribution alone or when +combined with the Program. + +"Program" means the Contributions distributed in accordance with this Agreement. + +"Recipient" means anyone who receives the Program under this Agreement, +including all Contributors. + +2. GRANT OF RIGHTS + +a) Subject to the terms of this Agreement, each Contributor hereby grants +Recipient a non-exclusive, worldwide, royalty-free copyright license to +reproduce, prepare derivative works of, publicly display, publicly perform, +distribute and sublicense the Contribution of such Contributor, if any, and such +derivative works, in source code and object code form. + +b) Subject to the terms of this Agreement, each Contributor hereby grants +Recipient a non-exclusive, worldwide, royalty-free patent license under Licensed +Patents to make, use, sell, offer to sell, import and otherwise transfer the +Contribution of such Contributor, if any, in source code and object code form. +This patent license shall apply to the combination of the Contribution and the +Program if, at the time the Contribution is added by the Contributor, such +addition of the Contribution causes such combination to be covered by the +Licensed Patents. The patent license shall not apply to any other combinations +which include the Contribution. No hardware per se is licensed hereunder. + +c) Recipient understands that although each Contributor grants the licenses to +its Contributions set forth herein, no assurances are provided by any +Contributor that the Program does not infringe the patent or other intellectual +property rights of any other entity. Each Contributor disclaims any liability to +Recipient for claims brought by any other entity based on infringement of +intellectual property rights or otherwise. As a condition to exercising the +rights and licenses granted hereunder, each Recipient hereby assumes sole +responsibility to secure any other intellectual property rights needed, if any. +For example, if a third party patent license is required to allow Recipient to +distribute the Program, it is Recipient's responsibility to acquire that license +before distributing the Program. + +d) Each Contributor represents that to its knowledge it has sufficient copyright +rights in its Contribution, if any, to grant the copyright license set forth in +this Agreement. + +3. REQUIREMENTS + +A Contributor may choose to distribute the Program in object code form under its +own license agreement, provided that: + +a) it complies with the terms and conditions of this Agreement; and + +b) its license agreement: + +i) effectively disclaims on behalf of all Contributors all warranties and +conditions, express and implied, including warranties or conditions of title and +non-infringement, and implied warranties or conditions of merchantability and +fitness for a particular purpose; + +ii) effectively excludes on behalf of all Contributors all liability for +damages, including direct, indirect, special, incidental and consequential +damages, such as lost profits; + +iii) states that any provisions which differ from this Agreement are offered by +that Contributor alone and not by any other party; and + +iv) states that source code for the Program is available from such Contributor, +and informs licensees how to obtain it in a reasonable manner on or through a +medium customarily used for software exchange. + +When the Program is made available in source code form: + +a) it must be made available under this Agreement; and + +b) a copy of this Agreement must be included with each copy of the Program. + +Contributors may not remove or alter any copyright notices contained within the +Program. + +Each Contributor must identify itself as the originator of its Contribution, if +any, in a manner that reasonably allows subsequent Recipients to identify the +originator of the Contribution. + +4. COMMERCIAL DISTRIBUTION + +Commercial distributors of software may accept certain responsibilities with +respect to end users, business partners and the like. While this license is +intended to facilitate the commercial use of the Program, the Contributor who +includes the Program in a commercial product offering should do so in a manner +which does not create potential liability for other Contributors. Therefore, if +a Contributor includes the Program in a commercial product offering, such +Contributor ("Commercial Contributor") hereby agrees to defend and indemnify +every other Contributor ("Indemnified Contributor") against any losses, damages +and costs (collectively "Losses") arising from claims, lawsuits and other legal +actions brought by a third party against the Indemnified Contributor to the +extent caused by the acts or omissions of such Commercial Contributor in +connection with its distribution of the Program in a commercial product +offering. The obligations in this section do not apply to any claims or Losses +relating to any actual or alleged intellectual property infringement. In order +to qualify, an Indemnified Contributor must: a) promptly notify the Commercial +Contributor in writing of such claim, and b) allow the Commercial Contributor +to control, and cooperate with the Commercial Contributor in, the defense and +any related settlement negotiations. The Indemnified Contributor may +participate in any such claim at its own expense. + +For example, a Contributor might include the Program in a commercial product +offering, Product X. That Contributor is then a Commercial Contributor. If that +Commercial Contributor then makes performance claims, or offers warranties +related to Product X, those performance claims and warranties are such +Commercial Contributor's responsibility alone. Under this section, the +Commercial Contributor would have to defend claims against the other +Contributors related to those performance claims and warranties, and if a court +requires any other Contributor to pay any damages as a result, the Commercial +Contributor must pay those damages. + +5. NO WARRANTY + +EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, THE PROGRAM IS PROVIDED ON AN +"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR +IMPLIED INCLUDING, WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, +NON-INFRINGEMENT, MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each +Recipient is solely responsible for determining the appropriateness of using and +distributing the Program and assumes all risks associated with its exercise of +rights under this Agreement , including but not limited to the risks and costs +of program errors, compliance with applicable laws, damage to or loss of data, +programs or equipment, and unavailability or interruption of operations. + +6. DISCLAIMER OF LIABILITY + +EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, NEITHER RECIPIENT NOR ANY +CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR ANY DIRECT, INDIRECT, INCIDENTAL, +SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING WITHOUT LIMITATION LOST +PROFITS), HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, +STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY +OUT OF THE USE OR DISTRIBUTION OF THE PROGRAM OR THE EXERCISE OF ANY RIGHTS +GRANTED HEREUNDER, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. + +7. GENERAL + +If any provision of this Agreement is invalid or unenforceable under applicable +law, it shall not affect the validity or enforceability of the remainder of the +terms of this Agreement, and without further action by the parties hereto, such +provision shall be reformed to the minimum extent necessary to make such +provision valid and enforceable. + +If Recipient institutes patent litigation against any entity (including a +cross-claim or counterclaim in a lawsuit) alleging that the Program itself +(excluding combinations of the Program with other software or hardware) +infringes such Recipient's patent(s), then such Recipient's rights granted under +Section 2(b) shall terminate as of the date such litigation is filed. + +All Recipient's rights under this Agreement shall terminate if it fails to +comply with any of the material terms or conditions of this Agreement and does +not cure such failure in a reasonable period of time after becoming aware of +such noncompliance. If all Recipient's rights under this Agreement terminate, +Recipient agrees to cease use and distribution of the Program as soon as +reasonably practicable. However, Recipient's obligations under this Agreement +and any licenses granted by Recipient relating to the Program shall continue and +survive. + +Everyone is permitted to copy and distribute copies of this Agreement, but in +order to avoid inconsistency the Agreement is copyrighted and may only be +modified in the following manner. The Agreement Steward reserves the right to +publish new versions (including revisions) of this Agreement from time to time. +No one other than the Agreement Steward has the right to modify this Agreement. +The Eclipse Foundation is the initial Agreement Steward. The Eclipse Foundation +may assign the responsibility to serve as the Agreement Steward to a suitable +separate entity. Each new version of the Agreement will be given a +distinguishing version number. The Program (including Contributions) may always +be distributed subject to the version of the Agreement under which it was +received. In addition, after a new version of the Agreement is published, +Contributor may elect to distribute the Program (including its Contributions) +under the new version. Except as expressly stated in Sections 2(a) and 2(b) +above, Recipient receives no rights or licenses to the intellectual property of +any Contributor under this Agreement, whether expressly, by implication, +estoppel or otherwise. All rights in the Program not expressly granted under +this Agreement are reserved. + +This Agreement is governed by the laws of the State of New York and the +intellectual property laws of the United States of America. No party to this +Agreement will bring a legal action under this Agreement more than one year +after the cause of action arose. Each party waives its rights to a jury trial in +any resulting litigation. + + +For the Windows Installer component: + + * All NSIS source code, plug-ins, documentation, examples, header files and + graphics, with the exception of the compression modules and where + otherwise noted, are licensed under the zlib/libpng license. + * The zlib compression module for NSIS is licensed under the zlib/libpng + license. + * The bzip2 compression module for NSIS is licensed under the bzip2 license. + * The lzma compression module for NSIS is licensed under the Common Public + License version 1.0. + +zlib/libpng license + +This software is provided 'as-is', without any express or implied warranty. In +no event will the authors be held liable for any damages arising from the use of +this software. + +Permission is granted to anyone to use this software for any purpose, including +commercial applications, and to alter it and redistribute it freely, subject to +the following restrictions: + + 1. The origin of this software must not be misrepresented; you must not claim + that you wrote the original software. If you use this software in a + product, an acknowledgment in the product documentation would be + appreciated but is not required. + 2. Altered source versions must be plainly marked as such, and must not be + misrepresented as being the original software. + 3. This notice may not be removed or altered from any source distribution. + +bzip2 license + +Redistribution and use in source and binary forms, with or without modification, +are permitted provided that the following conditions are met: + + 1. Redistributions of source code must retain the above copyright notice, + this list of conditions and the following disclaimer. + 2. The origin of this software must not be misrepresented; you must not claim + that you wrote the original software. If you use this software in a + product, an acknowledgment in the product documentation would be + appreciated but is not required. + 3. Altered source versions must be plainly marked as such, and must not be + misrepresented as being the original software. + 4. The name of the author may not be used to endorse or promote products + derived from this software without specific prior written permission. + +THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS AND ANY EXPRESS OR IMPLIED +WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT +SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, +EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT +OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS +INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN +CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING +IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY +OF SUCH DAMAGE. + +Julian Seward, Cambridge, UK. + +jseward@acm.org +Common Public License version 1.0 + +THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS COMMON PUBLIC +LICENSE ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THE PROGRAM +CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT. + +1. DEFINITIONS + +"Contribution" means: + +a) in the case of the initial Contributor, the initial code and documentation +distributed under this Agreement, and b) in the case of each subsequent +Contributor: + +i) changes to the Program, and + +ii) additions to the Program; + +where such changes and/or additions to the Program originate from and are +distributed by that particular Contributor. A Contribution 'originates' from a +Contributor if it was added to the Program by such Contributor itself or anyone +acting on such Contributor's behalf. Contributions do not include additions to +the Program which: (i) are separate modules of software distributed in +conjunction with the Program under their own license agreement, and (ii) are not +derivative works of the Program. + +"Contributor" means any person or entity that distributes the Program. + +"Licensed Patents " mean patent claims licensable by a Contributor which are +necessarily infringed by the use or sale of its Contribution alone or when +combined with the Program. + +"Program" means the Contributions distributed in accordance with this Agreement. + +"Recipient" means anyone who receives the Program under this Agreement, +including all Contributors. + +2. GRANT OF RIGHTS + +a) Subject to the terms of this Agreement, each Contributor hereby grants +Recipient a non-exclusive, worldwide, royalty-free copyright license to +reproduce, prepare derivative works of, publicly display, publicly perform, +distribute and sublicense the Contribution of such Contributor, if any, and such +derivative works, in source code and object code form. + +b) Subject to the terms of this Agreement, each Contributor hereby grants +Recipient a non-exclusive, worldwide, royalty-free patent license under Licensed +Patents to make, use, sell, offer to sell, import and otherwise transfer the +Contribution of such Contributor, if any, in source code and object code form. +This patent license shall apply to the combination of the Contribution and the +Program if, at the time the Contribution is added by the Contributor, such +addition of the Contribution causes such combination to be covered by the +Licensed Patents. The patent license shall not apply to any other combinations +which include the Contribution. No hardware per se is licensed hereunder. + +c) Recipient understands that although each Contributor grants the licenses to +its Contributions set forth herein, no assurances are provided by any +Contributor that the Program does not infringe the patent or other intellectual +property rights of any other entity. Each Contributor disclaims any liability to +Recipient for claims brought by any other entity based on infringement of +intellectual property rights or otherwise. As a condition to exercising the +rights and licenses granted hereunder, each Recipient hereby assumes sole +responsibility to secure any other intellectual property rights needed, if any. +For example, if a third party patent license is required to allow Recipient to +distribute the Program, it is Recipient's responsibility to acquire that license +before distributing the Program. + +d) Each Contributor represents that to its knowledge it has sufficient copyright +rights in its Contribution, if any, to grant the copyright license set forth in +this Agreement. + +3. REQUIREMENTS + +A Contributor may choose to distribute the Program in object code form under its +own license agreement, provided that: + +a) it complies with the terms and conditions of this Agreement; and + +b) its license agreement: + +i) effectively disclaims on behalf of all Contributors all warranties and +conditions, express and implied, including warranties or conditions of title and +non-infringement, and implied warranties or conditions of merchantability and +fitness for a particular purpose; + +ii) effectively excludes on behalf of all Contributors all liability for +damages, including direct, indirect, special, incidental and consequential +damages, such as lost profits; + +iii) states that any provisions which differ from this Agreement are offered by +that Contributor alone and not by any other party; and + +iv) states that source code for the Program is available from such Contributor, +and informs licensees how to obtain it in a reasonable manner on or through a +medium customarily used for software exchange. + +When the Program is made available in source code form: + +a) it must be made available under this Agreement; and + +b) a copy of this Agreement must be included with each copy of the Program. + +Contributors may not remove or alter any copyright notices contained within the +Program. + +Each Contributor must identify itself as the originator of its Contribution, if +any, in a manner that reasonably allows subsequent Recipients to identify the +originator of the Contribution. + +4. COMMERCIAL DISTRIBUTION + +Commercial distributors of software may accept certain responsibilities with +respect to end users, business partners and the like. While this license is +intended to facilitate the commercial use of the Program, the Contributor who +includes the Program in a commercial product offering should do so in a manner +which does not create potential liability for other Contributors. Therefore, if +a Contributor includes the Program in a commercial product offering, such +Contributor ("Commercial Contributor") hereby agrees to defend and indemnify +every other Contributor ("Indemnified Contributor") against any losses, damages +and costs (collectively "Losses") arising from claims, lawsuits and other legal +actions brought by a third party against the Indemnified Contributor to the +extent caused by the acts or omissions of such Commercial Contributor in +connection with its distribution of the Program in a commercial product +offering. The obligations in this section do not apply to any claims or Losses +relating to any actual or alleged intellectual property infringement. In order +to qualify, an Indemnified Contributor must: a) promptly notify the Commercial +Contributor in writing of such claim, and b) allow the Commercial Contributor to +control, and cooperate with the Commercial Contributor in, the defense and any +related settlement negotiations. The Indemnified Contributor may participate in +any such claim at its own expense. + +For example, a Contributor might include the Program in a commercial product +offering, Product X. That Contributor is then a Commercial Contributor. If that +Commercial Contributor then makes performance claims, or offers warranties +related to Product X, those performance claims and warranties are such +Commercial Contributor's responsibility alone. Under this section, the +Commercial Contributor would have to defend claims against the other +Contributors related to those performance claims and warranties, and if a court +requires any other Contributor to pay any damages as a result, the Commercial +Contributor must pay those damages. + +5. NO WARRANTY + +EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, THE PROGRAM IS PROVIDED ON AN +"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR +IMPLIED INCLUDING, WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, +NON-INFRINGEMENT, MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each +Recipient is solely responsible for determining the appropriateness of using and +distributing the Program and assumes all risks associated with its exercise of +rights under this Agreement, including but not limited to the risks and costs of +program errors, compliance with applicable laws, damage to or loss of data, +programs or equipment, and unavailability or interruption of operations. + +6. DISCLAIMER OF LIABILITY + +EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, NEITHER RECIPIENT NOR ANY +CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR ANY DIRECT, INDIRECT, INCIDENTAL, +SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING WITHOUT LIMITATION LOST +PROFITS), HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, +STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY +OUT OF THE USE OR DISTRIBUTION OF THE PROGRAM OR THE EXERCISE OF ANY RIGHTS +GRANTED HEREUNDER, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. + +7. GENERAL + +If any provision of this Agreement is invalid or unenforceable under applicable +law, it shall not affect the validity or enforceability of the remainder of the +terms of this Agreement, and without further action by the parties hereto, such +provision shall be reformed to the minimum extent necessary to make such +provision valid and enforceable. + +If Recipient institutes patent litigation against a Contributor with respect to +a patent applicable to software (including a cross-claim or counterclaim in a +lawsuit), then any patent licenses granted by that Contributor to such Recipient +under this Agreement shall terminate as of the date such litigation is filed. In +addition, if Recipient institutes patent litigation against any entity +(including a cross-claim or counterclaim in a lawsuit) alleging that the Program +itself (excluding combinations of the Program with other software or hardware) +infringes such Recipient's patent(s), then such Recipient's rights granted under +Section 2(b) shall terminate as of the date such litigation is filed. + +All Recipient's rights under this Agreement shall terminate if it fails to +comply with any of the material terms or conditions of this Agreement and does +not cure such failure in a reasonable period of time after becoming aware of +such noncompliance. If all Recipient's rights under this Agreement terminate, +Recipient agrees to cease use and distribution of the Program as soon as +reasonably practicable. However, Recipient's obligations under this Agreement +and any licenses granted by Recipient relating to the Program shall continue and +survive. + +Everyone is permitted to copy and distribute copies of this Agreement, but in +order to avoid inconsistency the Agreement is copyrighted and may only be +modified in the following manner. The Agreement Steward reserves the right to +publish new versions (including revisions) of this Agreement from time to time. +No one other than the Agreement Steward has the right to modify this Agreement. +IBM is the initial Agreement Steward. IBM may assign the responsibility to serve +as the Agreement Steward to a suitable separate entity. Each new version of the +Agreement will be given a distinguishing version number. The Program (including +Contributions) may always be distributed subject to the version of the Agreement +under which it was received. In addition, after a new version of the Agreement +is published, Contributor may elect to distribute the Program (including its +Contributions) under the new version. Except as expressly stated in Sections +2(a) and 2(b) above, Recipient receives no rights or licenses to the +intellectual property of any Contributor under this Agreement, whether +expressly, by implication, estoppel or otherwise. All rights in the Program not +expressly granted under this Agreement are reserved. + +This Agreement is governed by the laws of the State of New York and the +intellectual property laws of the United States of America. No party to this +Agreement will bring a legal action under this Agreement more than one year +after the cause of action arose. Each party waives its rights to a jury trial in +any resulting litigation. + +Special exception for LZMA compression module + +Igor Pavlov and Amir Szekely, the authors of the LZMA compression module for +NSIS, expressly permit you to statically or dynamically link your code (or bind +by name) to the files from the LZMA compression module for NSIS without +subjecting your linked code to the terms of the Common Public license version +1.0. Any modifications or additions to files from the LZMA compression module +for NSIS, however, are subject to the terms of the Common Public License version +1.0. + + +For the following XML Schemas for Java EE Deployment Descriptors: + - javaee_5.xsd + - javaee_web_services_1_2.xsd + - javaee_web_services_client_1_2.xsd + - javaee_6.xsd + - javaee_web_services_1_3.xsd + - javaee_web_services_client_1_3.xsd + - jsp_2_2.xsd + - web-app_3_0.xsd + - web-common_3_0.xsd + - web-fragment_3_0.xsd + - javaee_7.xsd + - javaee_web_services_1_4.xsd + - javaee_web_services_client_1_4.xsd + - jsp_2_3.xsd + - web-app_3_1.xsd + - web-common_3_1.xsd + - web-fragment_3_1.xsd + - javaee_8.xsd + - web-app_4_0.xsd + - web-common_4_0.xsd + - web-fragment_4_0.xsd + +COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 + +1. Definitions. + + 1.1. Contributor. means each individual or entity that creates or contributes + to the creation of Modifications. + + 1.2. Contributor Version. means the combination of the Original Software, + prior Modifications used by a Contributor (if any), and the + Modifications made by that particular Contributor. + + 1.3. Covered Software. means (a) the Original Software, or (b) Modifications, + or (c) the combination of files containing Original Software with files + containing Modifications, in each case including portions thereof. + + 1.4. Executable. means the Covered Software in any form other than Source + Code. + + 1.5. Initial Developer. means the individual or entity that first makes + Original Software available under this License. + + 1.6. Larger Work. means a work which combines Covered Software or portions + thereof with code not governed by the terms of this License. + + 1.7. License. means this document. + + 1.8. Licensable. means having the right to grant, to the maximum extent + possible, whether at the time of the initial grant or subsequently + acquired, any and all of the rights conveyed herein. + + 1.9. Modifications. means the Source Code and Executable form of any of the + following: + + A. Any file that results from an addition to, deletion from or + modification of the contents of a file containing Original Software + or previous Modifications; + + B. Any new file that contains any part of the Original Software or + previous Modification; or + + C. Any new file that is contributed or otherwise made available under + the terms of this License. + + 1.10. Original Software. means the Source Code and Executable form of + computer software code that is originally released under this License. + + 1.11. Patent Claims. means any patent claim(s), now owned or hereafter + acquired, including without limitation, method, process, and apparatus + claims, in any patent Licensable by grantor. + + 1.12. Source Code. means (a) the common form of computer software code in + which modifications are made and (b) associated documentation included + in or with such code. + + 1.13. You. (or .Your.) means an individual or a legal entity exercising + rights under, and complying with all of the terms of, this License. For + legal entities, .You. includes any entity which controls, is controlled + by, or is under common control with You. For purposes of this + definition, .control. means (a) the power, direct or indirect, to cause + the direction or management of such entity, whether by contract or + otherwise, or (b) ownership of more than fifty percent (50%) of the + outstanding shares or beneficial ownership of such entity. + +2. License Grants. + + 2.1. The Initial Developer Grant. + + Conditioned upon Your compliance with Section 3.1 below and subject to + third party intellectual property claims, the Initial Developer hereby + grants You a world-wide, royalty-free, non-exclusive license: + + (a) under intellectual property rights (other than patent or trademark) + Licensable by Initial Developer, to use, reproduce, modify, display, + perform, sublicense and distribute the Original Software (or + portions thereof), with or without Modifications, and/or as part of + a Larger Work; and + + (b) under Patent Claims infringed by the making, using or selling of + Original Software, to make, have made, use, practice, sell, and + offer for sale, and/or otherwise dispose of the Original Software + (or portions thereof). + + (c) The licenses granted in Sections 2.1(a) and (b) are effective on the + date Initial Developer first distributes or otherwise makes the + Original Software available to a third party under the terms of this + License. + + (d) Notwithstanding Section 2.1(b) above, no patent license is granted: + (1) for code that You delete from the Original Software, or (2) for + infringements caused by: (i) the modification of the Original + Software, or (ii) the combination of the Original Software with + other software or devices. + + 2.2. Contributor Grant. + + Conditioned upon Your compliance with Section 3.1 below and subject to third + party intellectual property claims, each Contributor hereby grants You a + world-wide, royalty-free, non-exclusive license: + + (a) under intellectual property rights (other than patent or trademark) + Licensable by Contributor to use, reproduce, modify, display, + perform, sublicense and distribute the Modifications created by such + Contributor (or portions thereof), either on an unmodified basis, + with other Modifications, as Covered Software and/or as part of a + Larger Work; and + + (b) under Patent Claims infringed by the making, using, or selling of + Modifications made by that Contributor either alone and/or in + combination with its Contributor Version (or portions of such + combination), to make, use, sell, offer for sale, have made, and/or + otherwise dispose of: (1) Modifications made by that Contributor (or + portions thereof); and (2) the combination of Modifications made by + that Contributor with its Contributor Version (or portions of such + combination). + + (c) The licenses granted in Sections 2.2(a) and 2.2(b) are effective on + the date Contributor first distributes or otherwise makes the + Modifications available to a third party. + + (d) Notwithstanding Section 2.2(b) above, no patent license is granted: + (1) for any code that Contributor has deleted from the Contributor + Version; (2) for infringements caused by: (i) third party + modifications of Contributor Version, or (ii) the combination of + Modifications made by that Contributor with other software (except + as part of the Contributor Version) or other devices; or (3) under + Patent Claims infringed by Covered Software in the absence of + Modifications made by that Contributor. + +3. Distribution Obligations. + + 3.1. Availability of Source Code. + Any Covered Software that You distribute or otherwise make available in + Executable form must also be made available in Source Code form and that + Source Code form must be distributed only under the terms of this License. + You must include a copy of this License with every copy of the Source Code + form of the Covered Software You distribute or otherwise make available. + You must inform recipients of any such Covered Software in Executable form + as to how they can obtain such Covered Software in Source Code form in a + reasonable manner on or through a medium customarily used for software + exchange. + + 3.2. Modifications. + The Modifications that You create or to which You contribute are governed + by the terms of this License. You represent that You believe Your + Modifications are Your original creation(s) and/or You have sufficient + rights to grant the rights conveyed by this License. + + 3.3. Required Notices. + You must include a notice in each of Your Modifications that identifies + You as the Contributor of the Modification. You may not remove or alter + any copyright, patent or trademark notices contained within the Covered + Software, or any notices of licensing or any descriptive text giving + attribution to any Contributor or the Initial Developer. + + 3.4. Application of Additional Terms. + You may not offer or impose any terms on any Covered Software in Source + Code form that alters or restricts the applicable version of this License + or the recipients. rights hereunder. You may choose to offer, and to + charge a fee for, warranty, support, indemnity or liability obligations to + one or more recipients of Covered Software. However, you may do so only on + Your own behalf, and not on behalf of the Initial Developer or any + Contributor. You must make it absolutely clear that any such warranty, + support, indemnity or liability obligation is offered by You alone, and + You hereby agree to indemnify the Initial Developer and every Contributor + for any liability incurred by the Initial Developer or such Contributor as + a result of warranty, support, indemnity or liability terms You offer. + + 3.5. Distribution of Executable Versions. + You may distribute the Executable form of the Covered Software under the + terms of this License or under the terms of a license of Your choice, + which may contain terms different from this License, provided that You are + in compliance with the terms of this License and that the license for the + Executable form does not attempt to limit or alter the recipient.s rights + in the Source Code form from the rights set forth in this License. If You + distribute the Covered Software in Executable form under a different + license, You must make it absolutely clear that any terms which differ + from this License are offered by You alone, not by the Initial Developer + or Contributor. You hereby agree to indemnify the Initial Developer and + every Contributor for any liability incurred by the Initial Developer or + such Contributor as a result of any such terms You offer. + + 3.6. Larger Works. + You may create a Larger Work by combining Covered Software with other code + not governed by the terms of this License and distribute the Larger Work + as a single product. In such a case, You must make sure the requirements + of this License are fulfilled for the Covered Software. + +4. Versions of the License. + + 4.1. New Versions. + Sun Microsystems, Inc. is the initial license steward and may publish + revised and/or new versions of this License from time to time. Each + version will be given a distinguishing version number. Except as provided + in Section 4.3, no one other than the license steward has the right to + modify this License. + + 4.2. Effect of New Versions. + You may always continue to use, distribute or otherwise make the Covered + Software available under the terms of the version of the License under + which You originally received the Covered Software. If the Initial + Developer includes a notice in the Original Software prohibiting it from + being distributed or otherwise made available under any subsequent version + of the License, You must distribute and make the Covered Software + available under the terms of the version of the License under which You + originally received the Covered Software. Otherwise, You may also choose + to use, distribute or otherwise make the Covered Software available under + the terms of any subsequent version of the License published by the + license steward. + + 4.3. Modified Versions. + When You are an Initial Developer and You want to create a new license for + Your Original Software, You may create and use a modified version of this + License if You: (a) rename the license and remove any references to the + name of the license steward (except to note that the license differs from + this License); and (b) otherwise make it clear that the license contains + terms which differ from this License. + +5. DISCLAIMER OF WARRANTY. + + COVERED SOFTWARE IS PROVIDED UNDER THIS LICENSE ON AN .AS IS. BASIS, WITHOUT + WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, WITHOUT + LIMITATION, WARRANTIES THAT THE COVERED SOFTWARE IS FREE OF DEFECTS, + MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE OR NON-INFRINGING. THE ENTIRE RISK + AS TO THE QUALITY AND PERFORMANCE OF THE COVERED SOFTWARE IS WITH YOU. SHOULD + ANY COVERED SOFTWARE PROVE DEFECTIVE IN ANY RESPECT, YOU (NOT THE INITIAL + DEVELOPER OR ANY OTHER CONTRIBUTOR) ASSUME THE COST OF ANY NECESSARY + SERVICING, REPAIR OR CORRECTION. THIS DISCLAIMER OF WARRANTY CONSTITUTES AN + ESSENTIAL PART OF THIS LICENSE. NO USE OF ANY COVERED SOFTWARE IS AUTHORIZED + HEREUNDER EXCEPT UNDER THIS DISCLAIMER. + +6. TERMINATION. + + 6.1. This License and the rights granted hereunder will terminate + automatically if You fail to comply with terms herein and fail to + cure such breach within 30 days of becoming aware of the breach. + Provisions which, by their nature, must remain in effect beyond the + termination of this License shall survive. + + 6.2. If You assert a patent infringement claim (excluding declaratory + judgment actions) against Initial Developer or a Contributor (the + Initial Developer or Contributor against whom You assert such claim + is referred to as .Participant.) alleging that the Participant + Software (meaning the Contributor Version where the Participant is a + Contributor or the Original Software where the Participant is the + Initial Developer) directly or indirectly infringes any patent, then + any and all rights granted directly or indirectly to You by such + Participant, the Initial Developer (if the Initial Developer is not + the Participant) and all Contributors under Sections 2.1 and/or 2.2 + of this License shall, upon 60 days notice from Participant terminate + prospectively and automatically at the expiration of such 60 day + notice period, unless if within such 60 day period You withdraw Your + claim with respect to the Participant Software against such + Participant either unilaterally or pursuant to a written agreement + with Participant. + + 6.3. In the event of termination under Sections 6.1 or 6.2 above, all end + user licenses that have been validly granted by You or any + distributor hereunder prior to termination (excluding licenses + granted to You by any distributor) shall survive termination. + +7. LIMITATION OF LIABILITY. + + UNDER NO CIRCUMSTANCES AND UNDER NO LEGAL THEORY, WHETHER TORT (INCLUDING + NEGLIGENCE), CONTRACT, OR OTHERWISE, SHALL YOU, THE INITIAL DEVELOPER, ANY + OTHER CONTRIBUTOR, OR ANY DISTRIBUTOR OF COVERED SOFTWARE, OR ANY SUPPLIER OF + ANY OF SUCH PARTIES, BE LIABLE TO ANY PERSON FOR ANY INDIRECT, SPECIAL, + INCIDENTAL, OR CONSEQUENTIAL DAMAGES OF ANY CHARACTER INCLUDING, WITHOUT + LIMITATION, DAMAGES FOR LOST PROFITS, LOSS OF GOODWILL, WORK STOPPAGE, + COMPUTER FAILURE OR MALFUNCTION, OR ANY AND ALL OTHER COMMERCIAL DAMAGES OR + LOSSES, EVEN IF SUCH PARTY SHALL HAVE BEEN INFORMED OF THE POSSIBILITY OF + SUCH DAMAGES. THIS LIMITATION OF LIABILITY SHALL NOT APPLY TO LIABILITY FOR + DEATH OR PERSONAL INJURY RESULTING FROM SUCH PARTY.S NEGLIGENCE TO THE EXTENT + APPLICABLE LAW PROHIBITS SUCH LIMITATION. SOME JURISDICTIONS DO NOT ALLOW THE + EXCLUSION OR LIMITATION OF INCIDENTAL OR CONSEQUENTIAL DAMAGES, SO THIS + EXCLUSION AND LIMITATION MAY NOT APPLY TO YOU. + +8. U.S. GOVERNMENT END USERS. + + The Covered Software is a .commercial item,. as that term is defined in 48 + C.F.R. 2.101 (Oct. 1995), consisting of .commercial computer software. (as + that term is defined at 48 C.F.R. ? 252.227-7014(a)(1)) and commercial + computer software documentation. as such terms are used in 48 C.F.R. 12.212 + (Sept. 1995). Consistent with 48 C.F.R. 12.212 and 48 C.F.R. 227.7202-1 + through 227.7202-4 (June 1995), all U.S. Government End Users acquire Covered + Software with only those rights set forth herein. This U.S. Government Rights + clause is in lieu of, and supersedes, any other FAR, DFAR, or other clause or + provision that addresses Government rights in computer software under this + License. + +9. MISCELLANEOUS. + + This License represents the complete agreement concerning subject matter + hereof. If any provision of this License is held to be unenforceable, such + provision shall be reformed only to the extent necessary to make it + enforceable. This License shall be governed by the law of the jurisdiction + specified in a notice contained within the Original Software (except to the + extent applicable law, if any, provides otherwise), excluding such + jurisdiction's conflict-of-law provisions. Any litigation relating to this + License shall be subject to the jurisdiction of the courts located in the + jurisdiction and venue specified in a notice contained within the Original + Software, with the losing party responsible for costs, including, without + limitation, court costs and reasonable attorneys. fees and expenses. The + application of the United Nations Convention on Contracts for the + International Sale of Goods is expressly excluded. Any law or regulation + which provides that the language of a contract shall be construed against + the drafter shall not apply to this License. You agree that You alone are + responsible for compliance with the United States export administration + regulations (and the export control laws and regulation of any other + countries) when You use, distribute or otherwise make available any Covered + Software. + +10. RESPONSIBILITY FOR CLAIMS. + + As between Initial Developer and the Contributors, each party is responsible + for claims and damages arising, directly or indirectly, out of its + utilization of rights under this License and You agree to work with Initial + Developer and Contributors to distribute such responsibility on an equitable + basis. Nothing herein is intended or shall be deemed to constitute any + admission of liability. + + NOTICE PURSUANT TO SECTION 9 OF THE COMMON DEVELOPMENT AND DISTRIBUTION + LICENSE (CDDL) + + The code released under the CDDL shall be governed by the laws of the State + of California (excluding conflict-of-law provisions). Any litigation relating + to this License shall be subject to the jurisdiction of the Federal Courts of + the Northern District of California and the state courts of the State of + California, with venue lying in Santa Clara County, California. + diff --git a/app/opt/tomcat9/NOTICE b/app/opt/tomcat9/NOTICE new file mode 100644 index 0000000..a15bad8 --- /dev/null +++ b/app/opt/tomcat9/NOTICE @@ -0,0 +1,68 @@ +Apache Tomcat +Copyright 1999-2025 The Apache Software Foundation + +This product includes software developed at +The Apache Software Foundation (https://www.apache.org/). + +This software contains code derived from netty-native +developed by the Netty project +(https://netty.io, https://github.com/netty/netty-tcnative/) +and from finagle-native developed at Twitter +(https://github.com/twitter/finagle). + +This software contains code derived from jgroups-kubernetes +developed by the JGroups project (http://www.jgroups.org/). + +The Windows Installer is built with the Nullsoft +Scriptable Install System (NSIS), which is +open source software. The original software and +related information is available at +http://nsis.sourceforge.net. + +Java compilation software for JSP pages is provided by the Eclipse +JDT Core Batch Compiler component, which is open source software. +The original software and related information is available at +https://www.eclipse.org/jdt/core/. + +org.apache.tomcat.util.json.JSONParser.jj is a public domain javacc grammar +for JSON written by Robert Fischer. +https://github.com/RobertFischer/json-parser + +For portions of the Tomcat JNI OpenSSL API and the OpenSSL JSSE integration +The org.apache.tomcat.jni and the org.apache.tomcat.net.openssl packages +are derivative work originating from the Netty project and the finagle-native +project developed at Twitter +* Copyright 2014 The Netty Project +* Copyright 2014 Twitter + +For portions of the Tomcat cloud support +The org.apache.catalina.tribes.membership.cloud package contains derivative +work originating from the jgroups project. +https://github.com/jgroups-extras/jgroups-kubernetes +Copyright 2002-2018 Red Hat Inc. + +The original XML Schemas for Java EE Deployment Descriptors: + - javaee_5.xsd + - javaee_web_services_1_2.xsd + - javaee_web_services_client_1_2.xsd + - javaee_6.xsd + - javaee_web_services_1_3.xsd + - javaee_web_services_client_1_3.xsd + - jsp_2_2.xsd + - web-app_3_0.xsd + - web-common_3_0.xsd + - web-fragment_3_0.xsd + - javaee_7.xsd + - javaee_web_services_1_4.xsd + - javaee_web_services_client_1_4.xsd + - jsp_2_3.xsd + - web-app_3_1.xsd + - web-common_3_1.xsd + - web-fragment_3_1.xsd + - javaee_8.xsd + - web-app_4_0.xsd + - web-common_4_0.xsd + - web-fragment_4_0.xsd + +may be obtained from: +http://www.oracle.com/webfolder/technetwork/jsc/xml/ns/javaee/index.html diff --git a/app/opt/tomcat9/README.md b/app/opt/tomcat9/README.md new file mode 100644 index 0000000..1961da6 --- /dev/null +++ b/app/opt/tomcat9/README.md @@ -0,0 +1,79 @@ +## Welcome to Apache Tomcat! + +### What Is It? + +The Apache Tomcat® software is an open source implementation of the Java +Servlet, JavaServer Pages, Java Expression Language and Java WebSocket +technologies. The Java Servlet, JavaServer Pages, Java Expression Language and +Java WebSocket specifications are developed under the +[Java Community Process](https://jcp.org/en/introduction/overview). + +The Apache Tomcat software is developed in an open and participatory +environment and released under the +[Apache License version 2](https://www.apache.org/licenses/). The Apache Tomcat +project is intended to be a collaboration of the best-of-breed developers from +around the world. We invite you to participate in this open development +project. To learn more about getting involved, +[click here](https://tomcat.apache.org/getinvolved.html) or keep reading. + +Apache Tomcat software powers numerous large-scale, mission-critical web +applications across a diverse range of industries and organizations. Some of +these users and their stories are listed on the +[PoweredBy wiki page](https://cwiki.apache.org/confluence/display/TOMCAT/PoweredBy). + +Apache Tomcat, Tomcat, Apache, the Apache feather, and the Apache Tomcat +project logo are trademarks of the Apache Software Foundation. + +### Get It + +For every major Tomcat version there is one download page containing +links to the latest binary and source code downloads, but also +links for browsing the download directories and archives: +- [Tomcat 11](https://tomcat.apache.org/download-11.cgi) +- [Tomcat 10](https://tomcat.apache.org/download-10.cgi) +- [Tomcat 9](https://tomcat.apache.org/download-90.cgi) + +To facilitate choosing the right major Tomcat version one, we have provided a +[version overview page](https://tomcat.apache.org/whichversion.html). + +### Documentation + +The documentation available as of the date of this release is +included in the docs webapp which ships with tomcat. You can access that webapp +by starting tomcat and visiting in your browser. +The most up-to-date documentation for each version can be found at: +- [Tomcat 11](https://tomcat.apache.org/tomcat-11.0-doc/) +- [Tomcat 10](https://tomcat.apache.org/tomcat-10.1-doc/) +- [Tomcat 9](https://tomcat.apache.org/tomcat-9.0-doc/) + +### Installation + +Please see [RUNNING.txt](RUNNING.txt) for more info. + +### Licensing + +Please see [LICENSE](LICENSE) for more info. + +### Support and Mailing List Information + +* Free community support is available through the +[tomcat-users](https://tomcat.apache.org/lists.html#tomcat-users) email list and +a dedicated [IRC channel](https://tomcat.apache.org/irc.html) (#tomcat on +Freenode). + +* If you want freely available support for running Apache Tomcat, please see the +resources page [here](https://tomcat.apache.org/findhelp.html). + +* If you want to be informed about new code releases, bug fixes, +security fixes, general news and information about Apache Tomcat, please +subscribe to the +[tomcat-announce](https://tomcat.apache.org/lists.html#tomcat-announce) email +list. + +* If you have a concrete bug report for Apache Tomcat, please see the +instructions for reporting a bug +[here](https://tomcat.apache.org/bugreport.html). + +### Contributing + +Please see [CONTRIBUTING](CONTRIBUTING.md) for more info. diff --git a/app/opt/tomcat9/RELEASE-NOTES b/app/opt/tomcat9/RELEASE-NOTES new file mode 100644 index 0000000..ecfcd01 --- /dev/null +++ b/app/opt/tomcat9/RELEASE-NOTES @@ -0,0 +1,174 @@ +================================================================================ + Licensed to the Apache Software Foundation (ASF) under one or more + contributor license agreements. See the NOTICE file distributed with + this work for additional information regarding copyright ownership. + The ASF licenses this file to You under the Apache License, Version 2.0 + (the "License"); you may not use this file except in compliance with + the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +================================================================================ + + + Apache Tomcat Version 9.0.107 + Release Notes + + +========= +CONTENTS: +========= + +* Dependency Changes +* API Stability +* Bundled APIs +* Web application reloading and static fields in shared libraries +* Security manager URLs +* Symlinking static resources +* Viewing the Tomcat Change Log +* Cryptographic software notice +* When all else fails + + +=================== +Dependency Changes: +=================== +Tomcat 9.0 is designed to run on Java 8 and later. + + +============== +API Stability: +============== + +The public interfaces for the following classes are fixed and will not be +changed at all during the remaining lifetime of the 9.x series: +- All classes in the javax namespace + +The public interfaces for the following classes may be added to in order to +resolve bugs and/or add new features. No existing interface method will be +removed or changed although it may be deprecated. +- org.apache.catalina.* (excluding sub-packages) + +Note: As Tomcat 9 matures, the above list will be added to. The list is not + considered complete at this time. + +The remaining classes are considered part of the Tomcat internals and may change +without notice between point releases. + + +============= +Bundled APIs: +============= +A standard installation of Tomcat 9.0 makes all of the following APIs available +for use by web applications (by placing them in "lib"): +* annotations-api.jar (Annotations package) +* catalina.jar (Tomcat Catalina implementation) +* catalina-ant.jar (Tomcat Catalina Ant tasks) +* catalina-ha.jar (High availability package) +* catalina-ssi.jar (Server-side Includes module) +* catalina-storeconfig.jar (Generation of XML configuration from current state) +* catalina-tribes.jar (Group communication) +* ecj-4.20.jar (Eclipse JDT Java compiler) +* el-api.jar (EL 3.0 API) +* jasper.jar (Jasper 2 Compiler and Runtime) +* jasper-el.jar (Jasper 2 EL implementation) +* jsp-api.jar (JSP 2.3 API) +* servlet-api.jar (Servlet 4.0 API) +* tomcat-api.jar (Interfaces shared by Catalina and Jasper) +* tomcat-coyote.jar (Tomcat connectors and utility classes) +* tomcat-dbcp.jar (package renamed database connection pool based on Commons DBCP 2) +* tomcat-jdbc.jar (Tomcat's database connection pooling solution) +* tomcat-jni.jar (Interface to the native component of the APR/native connector) +* tomcat-util.jar (Various utilities) +* tomcat-websocket.jar (WebSocket 1.1 implementation) +* websocket-api.jar (WebSocket 1.1 API) + +You can make additional APIs available to all of your web applications by +putting unpacked classes into a "classes" directory (not created by default), +or by placing them in JAR files in the "lib" directory. + +To override the XML parser implementation or interfaces, use the appropriate +feature for your JVM. For Java <= 8 use the endorsed standards override +feature. The default configuration defines JARs located in "endorsed" as endorsed. +For Java 9+ use the upgradeable modules feature. + + +================================================================ +Web application reloading and static fields in shared libraries: +================================================================ +Some shared libraries (many are part of the JDK) keep references to objects +instantiated by the web application. To avoid class loading related problems +(ClassCastExceptions, messages indicating that the classloader +is stopped, etc.), the shared libraries state should be reinitialized. + +Something which might help is to avoid putting classes which would be +referenced by a shared static field in the web application classloader, +and putting them in the shared classloader instead (JARs should be put in the +"lib" folder, and classes should be put in the "classes" folder). + + +====================== +Security manager URLs: +====================== +In order to grant security permissions to JARs located inside the +web application repository, use URLs of the following format +in your policy file: + +file:${catalina.base}/webapps/examples/WEB-INF/lib/driver.jar + + +============================ +Symlinking static resources: +============================ +By default, Unix symlinks will not work when used in a web application to link +resources located outside the web application root directory. + +This behavior is optional, and the "allowLinking" flag may be used to deactivate +the check. + + +============================== +Viewing the Tomcat Change Log: +============================== +The full change log is available from https://tomcat.apache.org and is also +included in the documentation web application. + + +============================= +Cryptographic software notice +============================= +This distribution includes cryptographic software. The country in +which you currently reside may have restrictions on the import, +possession, use, and/or re-export to another country, of +encryption software. BEFORE using any encryption software, please +check your country's laws, regulations and policies concerning the +import, possession, or use, and re-export of encryption software, to +see if this is permitted. See for more +information. + +The U.S. Government Department of Commerce, Bureau of Industry and +Security (BIS), has classified this software as Export Commodity +Control Number (ECCN) 5D002.C.1, which includes information security +software using or performing cryptographic functions with asymmetric +algorithms. The form and manner of this Apache Software Foundation +distribution makes it eligible for export under the License Exception +ENC Technology Software Unrestricted (TSU) exception (see the BIS +Export Administration Regulations, Section 740.13) for both object +code and source code. + +The following provides more details on the included cryptographic +software: + - Tomcat includes code designed to work with JSSE + - Tomcat includes code designed to work with OpenSSL + + +==================== +When all else fails: +==================== +See the FAQ +https://tomcat.apache.org/faq/ diff --git a/app/opt/tomcat9/RUNNING.txt b/app/opt/tomcat9/RUNNING.txt new file mode 100644 index 0000000..a368021 --- /dev/null +++ b/app/opt/tomcat9/RUNNING.txt @@ -0,0 +1,478 @@ +================================================================================ + Licensed to the Apache Software Foundation (ASF) under one or more + contributor license agreements. See the NOTICE file distributed with + this work for additional information regarding copyright ownership. + The ASF licenses this file to You under the Apache License, Version 2.0 + (the "License"); you may not use this file except in compliance with + the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +================================================================================ + + =================================================== + Running The Apache Tomcat 9.0 Servlet/JSP Container + =================================================== + +Apache Tomcat 9.0 requires a Java Standard Edition Runtime +Environment (JRE) version 8 or later. + +============================= +Running With JRE 8 Or Later +============================= + +(1) Download and Install a Java SE Runtime Environment (JRE) + +(1.1) Download a Java SE Runtime Environment (JRE), + release version 8 or later, from + http://www.oracle.com/technetwork/java/javase/downloads/index.html + +(1.2) Install the JRE according to the instructions included with the + release. + + You may also use a full Java Development Kit (JDK) rather than just + a JRE. + + +(2) Download and Install Apache Tomcat + +(2.1) Download a binary distribution of Tomcat from: + + https://tomcat.apache.org/ + +(2.2) Unpack the binary distribution so that it resides in its own + directory (conventionally named "apache-tomcat-[version]"). + + For the purposes of the remainder of this document, the name + "CATALINA_HOME" is used to refer to the full pathname of that + directory. + +NOTE: As an alternative to downloading a binary distribution, you can +create your own from the Tomcat source code, as described in +"BUILDING.txt". You can either + + a) Do the full "release" build and find the created distribution in the + "output/release" directory and then proceed with unpacking as above, or + + b) Do a simple build and use the "output/build" directory as + "CATALINA_HOME". Be warned that there are some differences between the + contents of the "output/build" directory and a full "release" + distribution. + + +(3) Configure Environment Variables + +Tomcat is a Java application and does not use environment variables directly. +Environment variables are used by the Tomcat startup scripts. The scripts use +the environment variables to prepare the command that starts Tomcat. + +(3.1) Set CATALINA_HOME (required) and CATALINA_BASE (optional) + +The CATALINA_HOME environment variable should be set to the location of the +root directory of the "binary" distribution of Tomcat. + +The Tomcat startup scripts have some logic to set this variable +automatically if it is absent, based on the location of the startup script +in *nix and on the current directory in Windows. That logic might not work +in all circumstances, so setting the variable explicitly is recommended. + +The CATALINA_BASE environment variable specifies location of the root +directory of the "active configuration" of Tomcat. It is optional. It +defaults to be equal to CATALINA_HOME. + +Using distinct values for the CATALINA_HOME and CATALINA_BASE variables is +recommended to simplify further upgrades and maintenance. It is documented +in the "Multiple Tomcat Instances" section below. + + +(3.2) Set JRE_HOME or JAVA_HOME (required) + +These variables are used to specify location of a Java Runtime +Environment or of a Java Development Kit that is used to start Tomcat. + +The JRE_HOME variable is used to specify location of a JRE. The JAVA_HOME +variable is used to specify location of a JDK. + +Using JAVA_HOME provides access to certain additional startup options that +are not allowed when JRE_HOME is used. + +If both JRE_HOME and JAVA_HOME are specified, JRE_HOME is used. + +The recommended place to specify these variables is a "setenv" script. See +below. + + +(3.3) Other variables (optional) + +Other environment variables exist, besides the four described above. +See the comments at the top of catalina.bat or catalina.sh scripts for +the list and a description of each of them. + +One frequently used variable is CATALINA_OPTS. It allows specification of +additional options for the java command that starts Tomcat. + +See the Java documentation for the options that affect the Java Runtime +Environment. + +See the "System Properties" page in the Tomcat Configuration Reference for +the system properties that are specific to Tomcat. + +A similar variable is JAVA_OPTS. It is used less frequently. It allows +specification of options that are used both to start and to stop Tomcat as well +as for other commands. + +Note: Do not use JAVA_OPTS to specify memory limits. You do not need much +memory for a small process that is used to stop Tomcat. Those settings +belong to CATALINA_OPTS. + +Another frequently used variable is CATALINA_PID (on *nix only). It +specifies the location of the file where process id of the forked Tomcat +java process will be written. This setting is optional. It will activate +the following features: + + * better protection against duplicate start attempts and + * allows forceful termination of Tomcat process when it does not react to + the standard shutdown command. + + +(3.4) Using the "setenv" script (optional, recommended) + +Apart from CATALINA_HOME and CATALINA_BASE, all environment variables can +be specified in the "setenv" script. The script is placed either into +CATALINA_BASE/bin or into CATALINA_HOME/bin directory and is named +setenv.bat (on Windows) or setenv.sh (on *nix). The file has to be +readable. + +By default the setenv script file is absent. If the script file is present +both in CATALINA_BASE and in CATALINA_HOME, the one in CATALINA_BASE is +preferred. + +For example, to configure the JRE_HOME and CATALINA_PID variables you can +create the following script file: + +On Windows, %CATALINA_BASE%\bin\setenv.bat: + + set "JRE_HOME=%ProgramFiles%\Java\jre8" + exit /b 0 + +On *nix, $CATALINA_BASE/bin/setenv.sh: + + JRE_HOME=/usr/java/latest + CATALINA_PID="/run/tomcat.pid" + + +The CATALINA_HOME and CATALINA_BASE variables cannot be configured in the +setenv script, because they are used to locate that file. + +All the environment variables described here and the "setenv" script are +used only if you use the standard scripts to launch Tomcat. For example, if +you have installed Tomcat as a service on Windows, the service wrapper +launches Java directly and does not use the script files. + + +(4) Start Up Tomcat + +(4.1) Tomcat can be started by executing one of the following commands: + + On Windows: + + %CATALINA_HOME%\bin\startup.bat + + or + + %CATALINA_HOME%\bin\catalina.bat start + + On *nix: + + $CATALINA_HOME/bin/startup.sh + + or + + $CATALINA_HOME/bin/catalina.sh start + +(4.2) After startup, the default web applications included with Tomcat will be + available by visiting: + + http://localhost:8080/ + +(4.3) Further information about configuring and running Tomcat can be found in + the documentation included here, as well as on the Tomcat web site: + + https://tomcat.apache.org/ + + +(5) Shut Down Tomcat + +(5.1) Tomcat can be shut down by executing one of the following commands: + + On Windows: + + %CATALINA_HOME%\bin\shutdown.bat + + or + + %CATALINA_HOME%\bin\catalina.bat stop + + On *nix: + + $CATALINA_HOME/bin/shutdown.sh + + or + + $CATALINA_HOME/bin/catalina.sh stop + +================================================== +Advanced Configuration - Multiple Tomcat Instances +================================================== + +In many circumstances, it is desirable to have a single copy of a Tomcat +binary distribution shared among multiple users on the same server. To make +this possible, you can set the CATALINA_BASE environment variable to the +directory that contains the files for your 'personal' Tomcat instance. + +When running with a separate CATALINA_HOME and CATALINA_BASE, the files +and directories are split as following: + +In CATALINA_BASE: + + * bin - Only the following files: + + * setenv.sh (*nix) or setenv.bat (Windows), + * tomcat-juli.jar + + The setenv scripts were described above. The tomcat-juli library + is documented in the Logging chapter in the User Guide. + + * conf - Server configuration files (typically all of them, including + server.xml) + + * lib - Libraries and classes, as explained below + + * logs - Log and output files + + * webapps - Automatically loaded web applications + + * work - Temporary working directories for web applications + + * temp - Directory used by the JVM for temporary files (java.io.tmpdir) + + +In CATALINA_HOME: + + * bin - Startup and shutdown scripts + + The following files will be used only if they are absent in + CATALINA_BASE/bin: + + setenv.sh (*nix), setenv.bat (Windows), tomcat-juli.jar + + * lib - Libraries and classes, as explained below + + * endorsed - Libraries that override standard "Endorsed Standards" + libraries provided by JRE. See Classloading documentation + in the User Guide for details. + This is only supported for Java <= 8. + By default this "endorsed" directory is absent. + +In the default configuration the JAR libraries and classes both in +CATALINA_BASE/lib and in CATALINA_HOME/lib will be added to the common +classpath, but the ones in CATALINA_BASE will be added first and thus will +be searched first. + +The idea is that you may leave the standard Tomcat libraries in +CATALINA_HOME/lib and add other ones such as database drivers into +CATALINA_BASE/lib. + +In general it is advised to never share libraries between web applications, +but put them into WEB-INF/lib directories inside the applications. See +Classloading documentation in the User Guide for details. + + +It might be useful to note that the values of CATALINA_HOME and +CATALINA_BASE can be referenced in the XML configuration files processed +by Tomcat as ${catalina.home} and ${catalina.base} respectively. + +For example, the standard manager web application can be kept in +CATALINA_HOME/webapps/manager and loaded into CATALINA_BASE by copying +its deployment descriptor into the desired virtual host: + + * Copy the CATALINA_HOME/webapps/manager/META-INF/context.xml + file as CATALINA_BASE/conf/Catalina/localhost/manager.xml + + * Add docBase attribute as shown below. + +The file will look like the following: + + + + + + + +See Deployer chapter in User Guide and Context and Host chapters in the +Configuration Reference for more information on contexts and web +application deployment. + + +================ +Troubleshooting +================ + +There are only really 2 things likely to go wrong during the stand-alone +Tomcat install: + +(1) The most common hiccup is when another web server (or any process for that + matter) has laid claim to port 8080. This is the default HTTP port that + Tomcat attempts to bind to at startup. To change this, open the file: + + $CATALINA_HOME/conf/server.xml + + and search for '8080'. Change it to a port that isn't in use, and is + greater than 1024, as ports less than or equal to 1024 require superuser + access to bind under UNIX. + + Restart Tomcat and you're in business. Be sure that you replace the "8080" + in the URL you're using to access Tomcat. For example, if you change the + port to 1977, you would request the URL http://localhost:1977/ in your + browser. + +(2) The 'localhost' machine isn't found. This could happen if you're behind a + proxy. If that's the case, make sure the proxy configuration for your + browser knows that you shouldn't be going through the proxy to access the + "localhost". + + In Firefox, this is under Tools/Preferences -> Advanced/Network -> + Connection -> Settings..., and in Internet Explorer it is Tools -> + Internet Options -> Connections -> LAN Settings. + + +==================== +Optional Components +==================== + +The following optional components may be included with the Apache Tomcat binary +distribution. If they are not included, you can install them separately. + + 1. Apache Tomcat Native library + + 2. Apache Commons Daemon service launcher + +Both of them are implemented in C language and as such have to be compiled +into binary code. The binary code will be specific for a platform and CPU +architecture and it must match the Java Runtime Environment executables +that will be used to launch Tomcat. + +The Windows-specific binary distributions of Apache Tomcat include binary +files for these components. On other platforms you would have to look for +binary versions elsewhere or compile them yourself. + +If you are new to Tomcat, do not bother with these components to start with. +If you do use them, do not forget to read their documentation. + + +Apache Tomcat Native library +----------------------------- + +It is a library that allows to use the "Apr" variant of HTTP and AJP +protocol connectors in Apache Tomcat. It is built around OpenSSL and Apache +Portable Runtime (APR) libraries. Those are the same libraries as used by +Apache HTTPD Server project. + +This feature was especially important in the old days when Java performance +was poor. It is less important nowadays, but it is still used and respected +by many. See Tomcat documentation for more details. + +For further reading: + + - Apache Tomcat documentation + + * Documentation for APR/Native library in the Tomcat User's Guide + + https://tomcat.apache.org/tomcat-9.0-doc/apr.html + + * Documentation for the HTTP and AJP protocol connectors in the Tomcat + Configuration Reference + + https://tomcat.apache.org/tomcat-9.0-doc/config/http.html + + https://tomcat.apache.org/tomcat-9.0-doc/config/ajp.html + + - Apache Tomcat Native project home + + https://tomcat.apache.org/native-doc/ + + - Other projects + + * OpenSSL + + https://www.openssl.org/ + + * Apache Portable Runtime + + https://apr.apache.org/ + + * Apache HTTP Server + + https://httpd.apache.org/ + +To deactivate Apache Tomcat Native library: + + - To deactivate Apache Tomcat Native library when it is installed, or + - To remove the warning that is logged during Tomcat startup when the + library is not installed: + + Edit the "conf/server.xml" file and remove "AprLifecycleListener" from + it. + +The binary file of Apache Tomcat Native library is usually named + + - "tcnative-1.dll" on Windows + - "libtcnative-1.so" on *nix systems + + +Apache Commons Daemon +---------------------- + +Apache Commons Daemon project provides wrappers that can be used to +install Apache Tomcat as a service on Windows or as a daemon on *nix +systems. + +The Windows-specific implementation of Apache Commons Daemon is called +"procrun". The *nix-specific one is called "jsvc". + +For further reading: + + - Apache Commons Daemon project + + https://commons.apache.org/daemon/ + + - Apache Tomcat documentation + + * Installing Apache Tomcat + + https://tomcat.apache.org/tomcat-9.0-doc/setup.html + + * Windows Service How-To + + https://tomcat.apache.org/tomcat-9.0-doc/windows-service-howto.html + +The binary files of Apache Commons Daemon in Apache Tomcat distributions +for Windows are named: + + - "tomcat9.exe" + - "tomcat9w.exe" + +These files are renamed copies of "prunsrv.exe" and "prunmgr.exe" from +Apache Commons Daemon distribution. The file names have a meaning: they are +used as the service name to register the service in Windows, as well as the +key name to store distinct configuration for this installation of +"procrun". If you would like to install several instances of Tomcat 9.0 +in parallel, you have to further rename those files, using the same naming +scheme. diff --git a/app/opt/tomcat9/bin/bootstrap.jar b/app/opt/tomcat9/bin/bootstrap.jar new file mode 100644 index 0000000..c2b2506 Binary files /dev/null and b/app/opt/tomcat9/bin/bootstrap.jar differ diff --git a/app/opt/tomcat9/bin/catalina-tasks.xml b/app/opt/tomcat9/bin/catalina-tasks.xml new file mode 100644 index 0000000..c7c9c28 --- /dev/null +++ b/app/opt/tomcat9/bin/catalina-tasks.xml @@ -0,0 +1,39 @@ + + + + + + Catalina Ant Manager, JMX and JSPC Tasks + + + + + + + + + + + + + + + diff --git a/app/opt/tomcat9/bin/catalina.bat b/app/opt/tomcat9/bin/catalina.bat new file mode 100644 index 0000000..d104b70 --- /dev/null +++ b/app/opt/tomcat9/bin/catalina.bat @@ -0,0 +1,398 @@ +@echo off +rem Licensed to the Apache Software Foundation (ASF) under one or more +rem contributor license agreements. See the NOTICE file distributed with +rem this work for additional information regarding copyright ownership. +rem The ASF licenses this file to You under the Apache License, Version 2.0 +rem (the "License"); you may not use this file except in compliance with +rem the License. You may obtain a copy of the License at +rem +rem http://www.apache.org/licenses/LICENSE-2.0 +rem +rem Unless required by applicable law or agreed to in writing, software +rem distributed under the License is distributed on an "AS IS" BASIS, +rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +rem See the License for the specific language governing permissions and +rem limitations under the License. + +rem --------------------------------------------------------------------------- +rem Start/Stop Script for the CATALINA Server +rem +rem For supported commands call "catalina.bat help" or see the usage section +rem towards the end of this file. +rem +rem Environment Variable Prerequisites +rem +rem Do not set the variables in this script. Instead put them into a script +rem setenv.bat in CATALINA_BASE/bin to keep your customizations separate. +rem +rem WHEN RUNNING TOMCAT AS A WINDOWS SERVICE: +rem Note that the environment variables that affect the behavior of this +rem script will have no effect at all on Windows Services. As such, any +rem local customizations made in a CATALINA_BASE/bin/setenv.bat script +rem will also have no effect on Tomcat when launched as a Windows Service. +rem The configuration that controls Windows Services is stored in the Windows +rem Registry, and is most conveniently maintained using the "tomcat9w.exe" +rem maintenance utility. +rem +rem CATALINA_HOME May point at your Catalina "build" directory. +rem +rem CATALINA_BASE (Optional) Base directory for resolving dynamic portions +rem of a Catalina installation. If not present, resolves to +rem the same directory that CATALINA_HOME points to. +rem +rem CATALINA_OPTS (Optional) Java runtime options used when the "start", +rem "run" or "debug" command is executed. +rem Include here and not in JAVA_OPTS all options, that should +rem only be used by Tomcat itself, not by the stop process, +rem the version command etc. +rem Examples are heap size, GC logging, JMX ports etc. +rem +rem CATALINA_TMPDIR (Optional) Directory path location of temporary directory +rem the JVM should use (java.io.tmpdir). Defaults to +rem %CATALINA_BASE%\temp. +rem +rem JAVA_HOME Must point at your Java Development Kit installation. +rem Required to run the with the "debug" argument. +rem +rem JRE_HOME Must point at your Java Runtime installation. +rem Defaults to JAVA_HOME if empty. If JRE_HOME and JAVA_HOME +rem are both set, JRE_HOME is used. +rem +rem JAVA_OPTS (Optional) Java runtime options used when any command +rem is executed. +rem Include here and not in CATALINA_OPTS all options, that +rem should be used by Tomcat and also by the stop process, +rem the version command etc. +rem Most options should go into CATALINA_OPTS. +rem +rem JAVA_ENDORSED_DIRS (Optional) Lists of of semi-colon separated directories +rem containing some jars in order to allow replacement of APIs +rem created outside of the JCP (i.e. DOM and SAX from W3C). +rem It can also be used to update the XML parser implementation. +rem This is only supported for Java <= 8. +rem Defaults to $CATALINA_HOME/endorsed. +rem +rem JPDA_TRANSPORT (Optional) JPDA transport used when the "jpda start" +rem command is executed. The default is "dt_socket". +rem +rem JPDA_ADDRESS (Optional) Java runtime options used when the "jpda start" +rem command is executed. The default is localhost:8000. +rem +rem JPDA_SUSPEND (Optional) Java runtime options used when the "jpda start" +rem command is executed. Specifies whether JVM should suspend +rem execution immediately after startup. Default is "n". +rem +rem JPDA_OPTS (Optional) Java runtime options used when the "jpda start" +rem command is executed. If used, JPDA_TRANSPORT, JPDA_ADDRESS, +rem and JPDA_SUSPEND are ignored. Thus, all required jpda +rem options MUST be specified. The default is: +rem +rem -agentlib:jdwp=transport=%JPDA_TRANSPORT%, +rem address=%JPDA_ADDRESS%,server=y,suspend=%JPDA_SUSPEND% +rem +rem JSSE_OPTS (Optional) Java runtime options used to control the TLS +rem implementation when JSSE is used. Default is: +rem "-Djdk.tls.ephemeralDHKeySize=2048" +rem +rem CATALINA_LOGGING_CONFIG (Optional) Override Tomcat's logging config file +rem Example (all one line) +rem set CATALINA_LOGGING_CONFIG=-Djava.util.logging.config.file="%CATALINA_BASE%\conf\logging.properties" +rem +rem LOGGING_CONFIG Deprecated +rem Use CATALINA_LOGGING_CONFIG +rem This is only used if CATALINA_LOGGING_CONFIG is not set +rem and LOGGING_CONFIG starts with "-D..." +rem +rem LOGGING_MANAGER (Optional) Override Tomcat's logging manager +rem Example (all one line) +rem set LOGGING_MANAGER=-Djava.util.logging.manager=org.apache.juli.ClassLoaderLogManager +rem +rem TITLE (Optional) Specify the title of Tomcat window. The default +rem TITLE is Tomcat if it's not specified. +rem Example (all one line) +rem set TITLE=Tomcat.Cluster#1.Server#1 [%DATE% %TIME%] +rem --------------------------------------------------------------------------- + +setlocal + +rem Suppress Terminate batch job on CTRL+C +if not ""%1"" == ""run"" goto mainEntry +if "%TEMP%" == "" goto mainEntry +if exist "%TEMP%\%~nx0.run" goto mainEntry +echo Y>"%TEMP%\%~nx0.run" +if not exist "%TEMP%\%~nx0.run" goto mainEntry +echo Y>"%TEMP%\%~nx0.Y" +call "%~f0" %* <"%TEMP%\%~nx0.Y" +rem Use provided errorlevel +set RETVAL=%ERRORLEVEL% +del /Q "%TEMP%\%~nx0.Y" >NUL 2>&1 +exit /B %RETVAL% +:mainEntry +del /Q "%TEMP%\%~nx0.run" >NUL 2>&1 + +rem Guess CATALINA_HOME if not defined +set "CURRENT_DIR=%cd%" +if not "%CATALINA_HOME%" == "" goto gotHome +set "CATALINA_HOME=%CURRENT_DIR%" +if exist "%CATALINA_HOME%\bin\catalina.bat" goto okHome +cd .. +set "CATALINA_HOME=%cd%" +cd "%CURRENT_DIR%" +:gotHome + +if exist "%CATALINA_HOME%\bin\catalina.bat" goto okHome +echo The CATALINA_HOME environment variable is not defined correctly +echo This environment variable is needed to run this program +goto end +:okHome + +rem Copy CATALINA_BASE from CATALINA_HOME if not defined +if not "%CATALINA_BASE%" == "" goto gotBase +set "CATALINA_BASE=%CATALINA_HOME%" +:gotBase + +rem Ensure that neither CATALINA_HOME nor CATALINA_BASE contains a semi-colon +rem as this is used as the separator in the classpath and Java provides no +rem mechanism for escaping if the same character appears in the path. Check this +rem by replacing all occurrences of ';' with '' and checking that neither +rem CATALINA_HOME nor CATALINA_BASE have changed +if "%CATALINA_HOME%" == "%CATALINA_HOME:;=%" goto homeNoSemicolon +echo Using CATALINA_HOME: "%CATALINA_HOME%" +echo Unable to start as CATALINA_HOME contains a semicolon (;) character +goto end +:homeNoSemicolon + +if "%CATALINA_BASE%" == "%CATALINA_BASE:;=%" goto baseNoSemicolon +echo Using CATALINA_BASE: "%CATALINA_BASE%" +echo Unable to start as CATALINA_BASE contains a semicolon (;) character +goto end +:baseNoSemicolon + +rem Ensure that any user defined CLASSPATH variables are not used on startup, +rem but allow them to be specified in setenv.bat, in rare case when it is needed. +set CLASSPATH= + +rem Get standard environment variables +if not exist "%CATALINA_BASE%\bin\setenv.bat" goto checkSetenvHome +call "%CATALINA_BASE%\bin\setenv.bat" +goto setenvDone +:checkSetenvHome +if exist "%CATALINA_HOME%\bin\setenv.bat" call "%CATALINA_HOME%\bin\setenv.bat" +:setenvDone + +rem Get standard Java environment variables +if exist "%CATALINA_HOME%\bin\setclasspath.bat" goto okSetclasspath +echo Cannot find "%CATALINA_HOME%\bin\setclasspath.bat" +echo This file is needed to run this program +goto end +:okSetclasspath +call "%CATALINA_HOME%\bin\setclasspath.bat" %1 +if errorlevel 1 goto end + +rem Add on extra jar file to CLASSPATH +rem Note that there are no quotes as we do not want to introduce random +rem quotes into the CLASSPATH +if "%CLASSPATH%" == "" goto emptyClasspath +set "CLASSPATH=%CLASSPATH%;" +:emptyClasspath +set "CLASSPATH=%CLASSPATH%%CATALINA_HOME%\bin\bootstrap.jar" + +if not "%CATALINA_TMPDIR%" == "" goto gotTmpdir +set "CATALINA_TMPDIR=%CATALINA_BASE%\temp" +:gotTmpdir + +rem Add tomcat-juli.jar to classpath +rem tomcat-juli.jar can be over-ridden per instance +if not exist "%CATALINA_BASE%\bin\tomcat-juli.jar" goto juliClasspathHome +set "CLASSPATH=%CLASSPATH%;%CATALINA_BASE%\bin\tomcat-juli.jar" +goto juliClasspathDone +:juliClasspathHome +set "CLASSPATH=%CLASSPATH%;%CATALINA_HOME%\bin\tomcat-juli.jar" +:juliClasspathDone + +if not "%JSSE_OPTS%" == "" goto gotJsseOpts +set "JSSE_OPTS=-Djdk.tls.ephemeralDHKeySize=2048" +:gotJsseOpts +set "JAVA_OPTS=%JAVA_OPTS% %JSSE_OPTS%" + +rem Register custom URL handlers +rem Do this here so custom URL handles (specifically 'war:...') can be used in the security policy +set "JAVA_OPTS=%JAVA_OPTS% -Djava.protocol.handler.pkgs=org.apache.catalina.webresources" + +rem Disable the global canonical file name cache to protect against CVE-2024-56337 +rem Note: The cache is disabled by default in Java 12 to 20 inclusive +rem The cache is removed in Java 21 onwards +rem Need to set this here as java.io.FileSystem caches this in a static field during class +rem initialisation so it needs to be set before any file system access +set "JAVA_OPTS=%JAVA_OPTS% -Dsun.io.useCanonCaches=false" + +rem Check for the deprecated LOGGING_CONFIG +rem Only use it if CATALINA_LOGGING_CONFIG is not set and LOGGING_CONFIG starts with "-D..." +if not "%LOGGING_CONFIG:~0,2%"=="-D" goto noLoggingDeprecation +if not "%CATALINA_LOGGING_CONFIG%" == "" goto noLoggingDeprecation +set "CATALINA_LOGGING_CONFIG=%LOGGING_CONFIG%" +:noLoggingDeprecation + +if not "%CATALINA_LOGGING_CONFIG%" == "" goto noJuliConfig +set CATALINA_LOGGING_CONFIG=-Dnop +if not exist "%CATALINA_BASE%\conf\logging.properties" goto noJuliConfig +set CATALINA_LOGGING_CONFIG=-Djava.util.logging.config.file="%CATALINA_BASE%\conf\logging.properties" +:noJuliConfig + +if not "%LOGGING_MANAGER%" == "" goto noJuliManager +set LOGGING_MANAGER=-Djava.util.logging.manager=org.apache.juli.ClassLoaderLogManager +:noJuliManager + +rem Configure JAVA 9 specific start-up parameters - ensure to keep it in line with service.bat +set "JDK_JAVA_OPTIONS=%JDK_JAVA_OPTIONS% --add-opens=java.base/java.lang=ALL-UNNAMED" +set "JDK_JAVA_OPTIONS=%JDK_JAVA_OPTIONS% --add-opens=java.base/java.lang.invoke=ALL-UNNAMED" +set "JDK_JAVA_OPTIONS=%JDK_JAVA_OPTIONS% --add-opens=java.base/java.lang.reflect=ALL-UNNAMED" +set "JDK_JAVA_OPTIONS=%JDK_JAVA_OPTIONS% --add-opens=java.base/java.io=ALL-UNNAMED" +set "JDK_JAVA_OPTIONS=%JDK_JAVA_OPTIONS% --add-opens=java.base/java.util=ALL-UNNAMED" +set "JDK_JAVA_OPTIONS=%JDK_JAVA_OPTIONS% --add-opens=java.base/java.util.concurrent=ALL-UNNAMED" +set "JDK_JAVA_OPTIONS=%JDK_JAVA_OPTIONS% --add-opens=java.rmi/sun.rmi.transport=ALL-UNNAMED" + +rem Java 9 no longer supports the java.endorsed.dirs +rem system property. Only try to use it if +rem JAVA_ENDORSED_DIRS was explicitly set +rem or CATALINA_HOME/endorsed exists. +set ENDORSED_PROP=ignore.endorsed.dirs +if "%JAVA_ENDORSED_DIRS%" == "" goto noEndorsedVar +set ENDORSED_PROP=java.endorsed.dirs +goto doneEndorsed +:noEndorsedVar +if not exist "%CATALINA_HOME%\endorsed" goto doneEndorsed +set ENDORSED_PROP=java.endorsed.dirs +:doneEndorsed + +rem ----- Execute The Requested Command --------------------------------------- + +echo Using CATALINA_BASE: "%CATALINA_BASE%" +echo Using CATALINA_HOME: "%CATALINA_HOME%" +echo Using CATALINA_TMPDIR: "%CATALINA_TMPDIR%" +if ""%1"" == ""debug"" goto use_jdk +echo Using JRE_HOME: "%JRE_HOME%" +goto java_dir_displayed +:use_jdk +echo Using JAVA_HOME: "%JAVA_HOME%" +:java_dir_displayed +echo Using CLASSPATH: "%CLASSPATH%" +echo Using CATALINA_OPTS: "%CATALINA_OPTS%" + +set _EXECJAVA="%_RUNJAVA%" +set MAINCLASS=org.apache.catalina.startup.Bootstrap +set ACTION=start +set SECURITY_POLICY_FILE= +set DEBUG_OPTS= +set JPDA= + +if not ""%1"" == ""jpda"" goto noJpda +set JPDA=jpda +if not "%JPDA_TRANSPORT%" == "" goto gotJpdaTransport +set JPDA_TRANSPORT=dt_socket +:gotJpdaTransport +if not "%JPDA_ADDRESS%" == "" goto gotJpdaAddress +set JPDA_ADDRESS=localhost:8000 +:gotJpdaAddress +if not "%JPDA_SUSPEND%" == "" goto gotJpdaSuspend +set JPDA_SUSPEND=n +:gotJpdaSuspend +if not "%JPDA_OPTS%" == "" goto gotJpdaOpts +set JPDA_OPTS=-agentlib:jdwp=transport=%JPDA_TRANSPORT%,address=%JPDA_ADDRESS%,server=y,suspend=%JPDA_SUSPEND% +:gotJpdaOpts +shift +:noJpda + +if ""%1"" == ""debug"" goto doDebug +if ""%1"" == ""run"" goto doRun +if ""%1"" == ""start"" goto doStart +if ""%1"" == ""stop"" goto doStop +if ""%1"" == ""configtest"" goto doConfigTest +if ""%1"" == ""version"" goto doVersion + +echo Usage: catalina ( commands ... ) +echo commands: +echo debug Start Catalina in a debugger +echo debug -security Debug Catalina with a security manager +echo jpda start Start Catalina under JPDA debugger +echo run Start Catalina in the current window +echo run -security Start in the current window with security manager +echo start Start Catalina in a separate window +echo start -security Start in a separate window with security manager +echo stop Stop Catalina +echo configtest Run a basic syntax check on server.xml +echo version What version of tomcat are you running? +goto end + +:doDebug +shift +set _EXECJAVA="%_RUNJDB%" +set DEBUG_OPTS=-sourcepath "%CATALINA_HOME%\..\..\java" +if not ""%1"" == ""-security"" goto execCmd +shift +echo Using Security Manager +set "SECURITY_POLICY_FILE=%CATALINA_BASE%\conf\catalina.policy" +goto execCmd + +:doRun +shift +if not ""%1"" == ""-security"" goto execCmd +shift +echo Using Security Manager +set "SECURITY_POLICY_FILE=%CATALINA_BASE%\conf\catalina.policy" +goto execCmd + +:doStart +shift +if "%TITLE%" == "" set TITLE=Tomcat +set _EXECJAVA=start "%TITLE%" "%_RUNJAVA%" +if not ""%1"" == ""-security"" goto execCmd +shift +echo Using Security Manager +set "SECURITY_POLICY_FILE=%CATALINA_BASE%\conf\catalina.policy" +goto execCmd + +:doStop +shift +set ACTION=stop +set CATALINA_OPTS= +goto execCmd + +:doConfigTest +shift +set ACTION=configtest +set CATALINA_OPTS= +goto execCmd + +:doVersion +%_EXECJAVA% %JAVA_OPTS% -classpath "%CATALINA_HOME%\lib\catalina.jar" org.apache.catalina.util.ServerInfo +goto end + + +:execCmd +rem Get remaining unshifted command line arguments and save them in the +set CMD_LINE_ARGS= +:setArgs +if ""%1""=="""" goto doneSetArgs +set CMD_LINE_ARGS=%CMD_LINE_ARGS% %1 +shift +goto setArgs +:doneSetArgs + +rem Execute Java with the applicable properties +if not "%JPDA%" == "" goto doJpda +if not "%SECURITY_POLICY_FILE%" == "" goto doSecurity +%_EXECJAVA% %CATALINA_LOGGING_CONFIG% %LOGGING_MANAGER% %JAVA_OPTS% %CATALINA_OPTS% %DEBUG_OPTS% -D%ENDORSED_PROP%="%JAVA_ENDORSED_DIRS%" -classpath "%CLASSPATH%" -Dcatalina.base="%CATALINA_BASE%" -Dcatalina.home="%CATALINA_HOME%" -Djava.io.tmpdir="%CATALINA_TMPDIR%" %MAINCLASS% %CMD_LINE_ARGS% %ACTION% +goto end +:doSecurity +%_EXECJAVA% %CATALINA_LOGGING_CONFIG% %LOGGING_MANAGER% %JAVA_OPTS% %CATALINA_OPTS% %DEBUG_OPTS% -D%ENDORSED_PROP%="%JAVA_ENDORSED_DIRS%" -classpath "%CLASSPATH%" -Djava.security.manager -Djava.security.policy=="%SECURITY_POLICY_FILE%" -Dcatalina.base="%CATALINA_BASE%" -Dcatalina.home="%CATALINA_HOME%" -Djava.io.tmpdir="%CATALINA_TMPDIR%" %MAINCLASS% %CMD_LINE_ARGS% %ACTION% +goto end +:doJpda +if not "%SECURITY_POLICY_FILE%" == "" goto doSecurityJpda +%_EXECJAVA% %CATALINA_LOGGING_CONFIG% %LOGGING_MANAGER% %JAVA_OPTS% %JPDA_OPTS% %CATALINA_OPTS% %DEBUG_OPTS% -D%ENDORSED_PROP%="%JAVA_ENDORSED_DIRS%" -classpath "%CLASSPATH%" -Dcatalina.base="%CATALINA_BASE%" -Dcatalina.home="%CATALINA_HOME%" -Djava.io.tmpdir="%CATALINA_TMPDIR%" %MAINCLASS% %CMD_LINE_ARGS% %ACTION% +goto end +:doSecurityJpda +%_EXECJAVA% %CATALINA_LOGGING_CONFIG% %LOGGING_MANAGER% %JAVA_OPTS% %JPDA_OPTS% %CATALINA_OPTS% %DEBUG_OPTS% -D%ENDORSED_PROP%="%JAVA_ENDORSED_DIRS%" -classpath "%CLASSPATH%" -Djava.security.manager -Djava.security.policy=="%SECURITY_POLICY_FILE%" -Dcatalina.base="%CATALINA_BASE%" -Dcatalina.home="%CATALINA_HOME%" -Djava.io.tmpdir="%CATALINA_TMPDIR%" %MAINCLASS% %CMD_LINE_ARGS% %ACTION% +goto end + +:end diff --git a/app/opt/tomcat9/bin/catalina.sh b/app/opt/tomcat9/bin/catalina.sh new file mode 100755 index 0000000..e312cf5 --- /dev/null +++ b/app/opt/tomcat9/bin/catalina.sh @@ -0,0 +1,697 @@ +#!/bin/sh + +# Licensed to the Apache Software Foundation (ASF) under one or more +# contributor license agreements. See the NOTICE file distributed with +# this work for additional information regarding copyright ownership. +# The ASF licenses this file to You under the Apache License, Version 2.0 +# (the "License"); you may not use this file except in compliance with +# the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +# ----------------------------------------------------------------------------- +# Control Script for the CATALINA Server +# +# For supported commands call "catalina.sh help" or see the usage section at +# the end of this file. +# +# Environment Variable Prerequisites +# +# Do not set the variables in this script. Instead put them into a script +# setenv.sh in CATALINA_BASE/bin to keep your customizations separate. +# +# CATALINA_HOME May point at your Catalina "build" directory. +# +# CATALINA_BASE (Optional) Base directory for resolving dynamic portions +# of a Catalina installation. If not present, resolves to +# the same directory that CATALINA_HOME points to. +# +# CATALINA_OUT (Optional) Full path to a file where stdout and stderr +# will be redirected. +# Default is $CATALINA_BASE/logs/catalina.out +# +# CATALINA_OUT_CMD (Optional) Command which will be executed and receive +# as its stdin the stdout and stderr from the Tomcat java +# process. If CATALINA_OUT_CMD is set, the value of +# CATALINA_OUT will be used as a named pipe. +# No default. +# Example (all one line) +# CATALINA_OUT_CMD="/usr/bin/rotatelogs -f $CATALINA_BASE/logs/catalina.out.%Y-%m-%d.log 86400" +# +# CATALINA_OPTS (Optional) Java runtime options used when the "start", +# "run" or "debug" command is executed. +# Include here and not in JAVA_OPTS all options, that should +# only be used by Tomcat itself, not by the stop process, +# the version command etc. +# Examples are heap size, GC logging, JMX ports etc. +# +# CATALINA_TMPDIR (Optional) Directory path location of temporary directory +# the JVM should use (java.io.tmpdir). Defaults to +# $CATALINA_BASE/temp. +# +# JAVA_HOME Must point at your Java Development Kit installation. +# Required to run the with the "debug" argument. +# +# JRE_HOME Must point at your Java Runtime installation. +# Defaults to JAVA_HOME if empty. If JRE_HOME and JAVA_HOME +# are both set, JRE_HOME is used. +# +# JAVA_OPTS (Optional) Java runtime options used when any command +# is executed. +# Include here and not in CATALINA_OPTS all options, that +# should be used by Tomcat and also by the stop process, +# the version command etc. +# Most options should go into CATALINA_OPTS. +# +# JAVA_ENDORSED_DIRS (Optional) Lists of of colon separated directories +# containing some jars in order to allow replacement of APIs +# created outside of the JCP (i.e. DOM and SAX from W3C). +# It can also be used to update the XML parser implementation. +# This is only supported for Java <= 8. +# Defaults to $CATALINA_HOME/endorsed. +# +# JPDA_TRANSPORT (Optional) JPDA transport used when the "jpda start" +# command is executed. The default is "dt_socket". +# +# JPDA_ADDRESS (Optional) Java runtime options used when the "jpda start" +# command is executed. The default is localhost:8000. +# +# JPDA_SUSPEND (Optional) Java runtime options used when the "jpda start" +# command is executed. Specifies whether JVM should suspend +# execution immediately after startup. Default is "n". +# +# JPDA_OPTS (Optional) Java runtime options used when the "jpda start" +# command is executed. If used, JPDA_TRANSPORT, JPDA_ADDRESS, +# and JPDA_SUSPEND are ignored. Thus, all required jpda +# options MUST be specified. The default is: +# +# -agentlib:jdwp=transport=$JPDA_TRANSPORT, +# address=$JPDA_ADDRESS,server=y,suspend=$JPDA_SUSPEND +# +# JSSE_OPTS (Optional) Java runtime options used to control the TLS +# implementation when JSSE is used. Default is: +# "-Djdk.tls.ephemeralDHKeySize=2048" +# +# CATALINA_PID (Optional) Path of the file which should contains the pid +# of the catalina startup java process, when start (fork) is +# used +# +# CATALINA_LOGGING_CONFIG (Optional) Override Tomcat's logging config file +# Example (all one line) +# CATALINA_LOGGING_CONFIG="-Djava.util.logging.config.file=$CATALINA_BASE/conf/logging.properties" +# +# LOGGING_CONFIG Deprecated +# Use CATALINA_LOGGING_CONFIG +# This is only used if CATALINA_LOGGING_CONFIG is not set +# and LOGGING_CONFIG starts with "-D..." +# +# LOGGING_MANAGER (Optional) Override Tomcat's logging manager +# Example (all one line) +# LOGGING_MANAGER="-Djava.util.logging.manager=org.apache.juli.ClassLoaderLogManager" +# +# UMASK (Optional) Override Tomcat's default UMASK of 0027 +# +# USE_NOHUP (Optional) If set to the string true the start command will +# use nohup so that the Tomcat process will ignore any hangup +# signals. Default is "false" unless running on HP-UX in which +# case the default is "true" +# ----------------------------------------------------------------------------- + +# OS specific support. $var _must_ be set to either true or false. +cygwin=false +darwin=false +os400=false +hpux=false +case "`uname`" in +CYGWIN*) cygwin=true;; +Darwin*) darwin=true;; +OS400*) os400=true;; +HP-UX*) hpux=true;; +esac + +# resolve links - $0 may be a softlink +PRG="$0" + +while [ -h "$PRG" ]; do + ls=`ls -ld "$PRG"` + link=`expr "$ls" : '.*-> \(.*\)$'` + if expr "$link" : '/.*' > /dev/null; then + PRG="$link" + else + PRG=`dirname "$PRG"`/"$link" + fi +done + +# Get standard environment variables +PRGDIR=`dirname "$PRG"` + +# Only set CATALINA_HOME if not already set +[ -z "$CATALINA_HOME" ] && CATALINA_HOME=`cd "$PRGDIR/.." >/dev/null; pwd` + +# Copy CATALINA_BASE from CATALINA_HOME if not already set +[ -z "$CATALINA_BASE" ] && CATALINA_BASE="$CATALINA_HOME" + +# Ensure that any user defined CLASSPATH variables are not used on startup, +# but allow them to be specified in setenv.sh, in rare case when it is needed. +CLASSPATH= + +if [ -r "$CATALINA_BASE/bin/setenv.sh" ]; then + . "$CATALINA_BASE/bin/setenv.sh" +elif [ -r "$CATALINA_HOME/bin/setenv.sh" ]; then + . "$CATALINA_HOME/bin/setenv.sh" +fi + +# For Cygwin, ensure paths are in UNIX format before anything is touched +if $cygwin; then + [ -n "$JAVA_HOME" ] && JAVA_HOME=`cygpath --unix "$JAVA_HOME"` + [ -n "$JRE_HOME" ] && JRE_HOME=`cygpath --unix "$JRE_HOME"` + [ -n "$CATALINA_HOME" ] && CATALINA_HOME=`cygpath --unix "$CATALINA_HOME"` + [ -n "$CATALINA_BASE" ] && CATALINA_BASE=`cygpath --unix "$CATALINA_BASE"` + [ -n "$CLASSPATH" ] && CLASSPATH=`cygpath --path --unix "$CLASSPATH"` +fi + +# Ensure that neither CATALINA_HOME nor CATALINA_BASE contains a colon +# as this is used as the separator in the classpath and Java provides no +# mechanism for escaping if the same character appears in the path. +case $CATALINA_HOME in + *:*) echo "Using CATALINA_HOME: $CATALINA_HOME"; + echo "Unable to start as CATALINA_HOME contains a colon (:) character"; + exit 1; +esac +case $CATALINA_BASE in + *:*) echo "Using CATALINA_BASE: $CATALINA_BASE"; + echo "Unable to start as CATALINA_BASE contains a colon (:) character"; + exit 1; +esac + +# For OS400 +if $os400; then + # Set job priority to standard for interactive (interactive - 6) by using + # the interactive priority - 6, the helper threads that respond to requests + # will be running at the same priority as interactive jobs. + COMMAND='chgjob job('$JOBNAME') runpty(6)' + system $COMMAND + + # Enable multi threading + export QIBM_MULTI_THREADED=Y +fi + +# Get standard Java environment variables +if $os400; then + # -r will Only work on the os400 if the files are: + # 1. owned by the user + # 2. owned by the PRIMARY group of the user + # this will not work if the user belongs in secondary groups + . "$CATALINA_HOME"/bin/setclasspath.sh +else + if [ -r "$CATALINA_HOME"/bin/setclasspath.sh ]; then + . "$CATALINA_HOME"/bin/setclasspath.sh + else + echo "Cannot find $CATALINA_HOME/bin/setclasspath.sh" + echo "This file is needed to run this program" + exit 1 + fi +fi + +# Add on extra jar files to CLASSPATH +if [ ! -z "$CLASSPATH" ] ; then + CLASSPATH="$CLASSPATH": +fi +CLASSPATH="$CLASSPATH""$CATALINA_HOME"/bin/bootstrap.jar + +if [ -z "$CATALINA_OUT" ] ; then + CATALINA_OUT="$CATALINA_BASE"/logs/catalina.out +fi + +if [ -z "$CATALINA_TMPDIR" ] ; then + # Define the java.io.tmpdir to use for Catalina + CATALINA_TMPDIR="$CATALINA_BASE"/temp +fi + +# Add tomcat-juli.jar to classpath +# tomcat-juli.jar can be over-ridden per instance +if [ -r "$CATALINA_BASE/bin/tomcat-juli.jar" ] ; then + CLASSPATH=$CLASSPATH:$CATALINA_BASE/bin/tomcat-juli.jar +else + CLASSPATH=$CLASSPATH:$CATALINA_HOME/bin/tomcat-juli.jar +fi + +# Bugzilla 37848: When no TTY is available, don't output to console +have_tty=0 +if [ -t 0 ]; then + have_tty=1 +fi + +# For Cygwin, switch paths to Windows format before running java +if $cygwin; then + JAVA_HOME=`cygpath --absolute --windows "$JAVA_HOME"` + JRE_HOME=`cygpath --absolute --windows "$JRE_HOME"` + CATALINA_HOME=`cygpath --absolute --windows "$CATALINA_HOME"` + CATALINA_BASE=`cygpath --absolute --windows "$CATALINA_BASE"` + CATALINA_TMPDIR=`cygpath --absolute --windows "$CATALINA_TMPDIR"` + CLASSPATH=`cygpath --path --windows "$CLASSPATH"` + [ -n "$JAVA_ENDORSED_DIRS" ] && JAVA_ENDORSED_DIRS=`cygpath --path --windows "$JAVA_ENDORSED_DIRS"` +fi + +if [ -z "$JSSE_OPTS" ] ; then + JSSE_OPTS="-Djdk.tls.ephemeralDHKeySize=2048" +fi +JAVA_OPTS="$JAVA_OPTS $JSSE_OPTS" + +# Register custom URL handlers +# Do this here so custom URL handles (specifically 'war:...') can be used in the security policy +JAVA_OPTS="$JAVA_OPTS -Djava.protocol.handler.pkgs=org.apache.catalina.webresources" + +# Disable the global canonical file name cache to protect against CVE-2024-56337 +# Note: The cache is disabled by default in Java 12 to 20 inclusive +# The cache is removed in Java 21 onwards +# Need to set this here as java.io.FileSystem caches this in a static field during class +# initialisation so it needs to be set before any file system access +JAVA_OPTS="$JAVA_OPTS -Dsun.io.useCanonCaches=false" + +# Check for the deprecated LOGGING_CONFIG +# Only use it if CATALINA_LOGGING_CONFIG is not set and LOGGING_CONFIG starts with "-D..." +if [ -z "$CATALINA_LOGGING_CONFIG" ]; then + case $LOGGING_CONFIG in + -D*) CATALINA_LOGGING_CONFIG="$LOGGING_CONFIG" + esac +fi + +# Set juli LogManager config file if it is present and an override has not been issued +if [ -z "$CATALINA_LOGGING_CONFIG" ]; then + if [ -r "$CATALINA_BASE"/conf/logging.properties ]; then + CATALINA_LOGGING_CONFIG="-Djava.util.logging.config.file=$CATALINA_BASE/conf/logging.properties" + else + # Bugzilla 45585 + CATALINA_LOGGING_CONFIG="-Dnop" + fi +fi + +if [ -z "$LOGGING_MANAGER" ]; then + LOGGING_MANAGER="-Djava.util.logging.manager=org.apache.juli.ClassLoaderLogManager" +fi + +# Set UMASK unless it has been overridden +if [ -z "$UMASK" ]; then + UMASK="0027" +fi +umask $UMASK + +# Java 9 no longer supports the java.endorsed.dirs +# system property. Only try to use it if +# JAVA_ENDORSED_DIRS was explicitly set +# or CATALINA_HOME/endorsed exists. +ENDORSED_PROP=ignore.endorsed.dirs +if [ -n "$JAVA_ENDORSED_DIRS" ]; then + ENDORSED_PROP=java.endorsed.dirs +fi +if [ -d "$CATALINA_HOME/endorsed" ]; then + ENDORSED_PROP=java.endorsed.dirs +fi + +# Make the umask available when using the org.apache.catalina.security.SecurityListener +JAVA_OPTS="$JAVA_OPTS -Dorg.apache.catalina.security.SecurityListener.UMASK=`umask`" + +if [ -z "$USE_NOHUP" ]; then + if $hpux; then + USE_NOHUP="true" + else + USE_NOHUP="false" + fi +fi +unset _NOHUP +if [ "$USE_NOHUP" = "true" ]; then + _NOHUP="nohup" +fi + +# Add the JAVA 9 specific start-up parameters required by Tomcat +JDK_JAVA_OPTIONS="$JDK_JAVA_OPTIONS --add-opens=java.base/java.lang=ALL-UNNAMED" +JDK_JAVA_OPTIONS="$JDK_JAVA_OPTIONS --add-opens=java.base/java.lang.invoke=ALL-UNNAMED" +JDK_JAVA_OPTIONS="$JDK_JAVA_OPTIONS --add-opens=java.base/java.lang.reflect=ALL-UNNAMED" +JDK_JAVA_OPTIONS="$JDK_JAVA_OPTIONS --add-opens=java.base/java.io=ALL-UNNAMED" +JDK_JAVA_OPTIONS="$JDK_JAVA_OPTIONS --add-opens=java.base/java.util=ALL-UNNAMED" +JDK_JAVA_OPTIONS="$JDK_JAVA_OPTIONS --add-opens=java.base/java.util.concurrent=ALL-UNNAMED" +JDK_JAVA_OPTIONS="$JDK_JAVA_OPTIONS --add-opens=java.rmi/sun.rmi.transport=ALL-UNNAMED" +export JDK_JAVA_OPTIONS + +# ----- Execute The Requested Command ----------------------------------------- + +# Bugzilla 37848: only output this if we have a TTY +if [ $have_tty -eq 1 ]; then + echo "Using CATALINA_BASE: $CATALINA_BASE" + echo "Using CATALINA_HOME: $CATALINA_HOME" + echo "Using CATALINA_TMPDIR: $CATALINA_TMPDIR" + if [ "$1" = "debug" ] ; then + echo "Using JAVA_HOME: $JAVA_HOME" + else + echo "Using JRE_HOME: $JRE_HOME" + fi + echo "Using CLASSPATH: $CLASSPATH" + echo "Using CATALINA_OPTS: $CATALINA_OPTS" + if [ ! -z "$CATALINA_PID" ]; then + echo "Using CATALINA_PID: $CATALINA_PID" + fi +fi + +if [ "$1" = "jpda" ] ; then + if [ -z "$JPDA_TRANSPORT" ]; then + JPDA_TRANSPORT="dt_socket" + fi + if [ -z "$JPDA_ADDRESS" ]; then + JPDA_ADDRESS="localhost:8000" + fi + if [ -z "$JPDA_SUSPEND" ]; then + JPDA_SUSPEND="n" + fi + if [ -z "$JPDA_OPTS" ]; then + JPDA_OPTS="-agentlib:jdwp=transport=$JPDA_TRANSPORT,address=$JPDA_ADDRESS,server=y,suspend=$JPDA_SUSPEND" + fi + CATALINA_OPTS="$JPDA_OPTS $CATALINA_OPTS" + shift +fi + +if [ "$1" = "debug" ] ; then + if $os400; then + echo "Debug command not available on OS400" + exit 1 + else + shift + if [ "$1" = "-security" ] ; then + if [ $have_tty -eq 1 ]; then + echo "Using Security Manager" + fi + shift + eval exec "\"$_RUNJDB\"" "\"$CATALINA_LOGGING_CONFIG\"" $LOGGING_MANAGER "$JAVA_OPTS" "$CATALINA_OPTS" \ + -D$ENDORSED_PROP="$JAVA_ENDORSED_DIRS" \ + -classpath "$CLASSPATH" \ + -sourcepath "$CATALINA_HOME"/../../java \ + -Djava.security.manager \ + -Djava.security.policy=="$CATALINA_BASE"/conf/catalina.policy \ + -Dcatalina.base="$CATALINA_BASE" \ + -Dcatalina.home="$CATALINA_HOME" \ + -Djava.io.tmpdir="$CATALINA_TMPDIR" \ + org.apache.catalina.startup.Bootstrap "$@" start + else + eval exec "\"$_RUNJDB\"" "\"$CATALINA_LOGGING_CONFIG\"" $LOGGING_MANAGER "$JAVA_OPTS" "$CATALINA_OPTS" \ + -D$ENDORSED_PROP="$JAVA_ENDORSED_DIRS" \ + -classpath "$CLASSPATH" \ + -sourcepath "$CATALINA_HOME"/../../java \ + -Dcatalina.base="$CATALINA_BASE" \ + -Dcatalina.home="$CATALINA_HOME" \ + -Djava.io.tmpdir="$CATALINA_TMPDIR" \ + org.apache.catalina.startup.Bootstrap "$@" start + fi + fi + +elif [ "$1" = "run" ]; then + + shift + if [ "$1" = "-security" ] ; then + if [ $have_tty -eq 1 ]; then + echo "Using Security Manager" + fi + shift + eval exec "\"$_RUNJAVA\"" "\"$CATALINA_LOGGING_CONFIG\"" $LOGGING_MANAGER "$JAVA_OPTS" "$CATALINA_OPTS" \ + -D$ENDORSED_PROP="\"$JAVA_ENDORSED_DIRS\"" \ + -classpath "\"$CLASSPATH\"" \ + -Djava.security.manager \ + -Djava.security.policy=="\"$CATALINA_BASE/conf/catalina.policy\"" \ + -Dcatalina.base="\"$CATALINA_BASE\"" \ + -Dcatalina.home="\"$CATALINA_HOME\"" \ + -Djava.io.tmpdir="\"$CATALINA_TMPDIR\"" \ + org.apache.catalina.startup.Bootstrap "$@" start + else + eval exec "\"$_RUNJAVA\"" "\"$CATALINA_LOGGING_CONFIG\"" $LOGGING_MANAGER "$JAVA_OPTS" "$CATALINA_OPTS" \ + -D$ENDORSED_PROP="\"$JAVA_ENDORSED_DIRS\"" \ + -classpath "\"$CLASSPATH\"" \ + -Dcatalina.base="\"$CATALINA_BASE\"" \ + -Dcatalina.home="\"$CATALINA_HOME\"" \ + -Djava.io.tmpdir="\"$CATALINA_TMPDIR\"" \ + org.apache.catalina.startup.Bootstrap "$@" start + fi + +elif [ "$1" = "start" ] ; then + + if [ ! -z "$CATALINA_PID" ]; then + if [ -f "$CATALINA_PID" ]; then + if [ -s "$CATALINA_PID" ]; then + echo "Existing PID file found during start." + if [ -r "$CATALINA_PID" ]; then + PID=`cat "$CATALINA_PID"` + ps -p $PID >/dev/null 2>&1 + if [ $? -eq 0 ] ; then + echo "Tomcat appears to still be running with PID $PID. Start aborted." + echo "If the following process is not a Tomcat process, remove the PID file and try again:" + ps -f -p $PID + exit 1 + else + echo "Removing/clearing stale PID file." + rm -f "$CATALINA_PID" >/dev/null 2>&1 + if [ $? != 0 ]; then + if [ -w "$CATALINA_PID" ]; then + cat /dev/null > "$CATALINA_PID" + else + echo "Unable to remove or clear stale PID file. Start aborted." + exit 1 + fi + fi + fi + else + echo "Unable to read PID file. Start aborted." + exit 1 + fi + else + rm -f "$CATALINA_PID" >/dev/null 2>&1 + if [ $? != 0 ]; then + if [ ! -w "$CATALINA_PID" ]; then + echo "Unable to remove or write to empty PID file. Start aborted." + exit 1 + fi + fi + fi + fi + fi + + shift + if [ -z "$CATALINA_OUT_CMD" ] ; then + touch "$CATALINA_OUT" + else + if [ ! -e "$CATALINA_OUT" ]; then + if ! mkfifo "$CATALINA_OUT"; then + echo "cannot create named pipe $CATALINA_OUT. Start aborted." + exit 1 + fi + elif [ ! -p "$CATALINA_OUT" ]; then + echo "$CATALINA_OUT exists and is not a named pipe. Start aborted." + exit 1 + fi + $CATALINA_OUT_CMD <"$CATALINA_OUT" & + fi + if [ "$1" = "-security" ] ; then + if [ $have_tty -eq 1 ]; then + echo "Using Security Manager" + fi + shift + eval $_NOHUP "\"$_RUNJAVA\"" "\"$CATALINA_LOGGING_CONFIG\"" $LOGGING_MANAGER "$JAVA_OPTS" "$CATALINA_OPTS" \ + -D$ENDORSED_PROP="\"$JAVA_ENDORSED_DIRS\"" \ + -classpath "\"$CLASSPATH\"" \ + -Djava.security.manager \ + -Djava.security.policy=="\"$CATALINA_BASE/conf/catalina.policy\"" \ + -Dcatalina.base="\"$CATALINA_BASE\"" \ + -Dcatalina.home="\"$CATALINA_HOME\"" \ + -Djava.io.tmpdir="\"$CATALINA_TMPDIR\"" \ + org.apache.catalina.startup.Bootstrap "$@" start \ + >> "$CATALINA_OUT" 2>&1 "&" + + else + eval $_NOHUP "\"$_RUNJAVA\"" "\"$CATALINA_LOGGING_CONFIG\"" $LOGGING_MANAGER "$JAVA_OPTS" "$CATALINA_OPTS" \ + -D$ENDORSED_PROP="\"$JAVA_ENDORSED_DIRS\"" \ + -classpath "\"$CLASSPATH\"" \ + -Dcatalina.base="\"$CATALINA_BASE\"" \ + -Dcatalina.home="\"$CATALINA_HOME\"" \ + -Djava.io.tmpdir="\"$CATALINA_TMPDIR\"" \ + org.apache.catalina.startup.Bootstrap "$@" start \ + >> "$CATALINA_OUT" 2>&1 "&" + + fi + + if [ ! -z "$CATALINA_PID" ]; then + echo $! > "$CATALINA_PID" + fi + + echo "Tomcat started." + +elif [ "$1" = "stop" ] ; then + + shift + + SLEEP=5 + if [ ! -z "$1" ]; then + echo $1 | grep "[^0-9]" >/dev/null 2>&1 + if [ $? -gt 0 ]; then + SLEEP=$1 + shift + fi + fi + + FORCE=0 + if [ "$1" = "-force" ]; then + shift + FORCE=1 + fi + + if [ ! -z "$CATALINA_PID" ]; then + if [ -f "$CATALINA_PID" ]; then + if [ -s "$CATALINA_PID" ]; then + kill -0 `cat "$CATALINA_PID"` >/dev/null 2>&1 + if [ $? -gt 0 ]; then + echo "PID file found but either no matching process was found or the current user does not have permission to stop the process. Stop aborted." + exit 1 + fi + else + echo "PID file is empty and has been ignored." + fi + else + echo "\$CATALINA_PID was set but the specified file does not exist. Is Tomcat running? Stop aborted." + exit 1 + fi + fi + + eval "\"$_RUNJAVA\"" $LOGGING_MANAGER "$JAVA_OPTS" \ + -D$ENDORSED_PROP="\"$JAVA_ENDORSED_DIRS\"" \ + -classpath "\"$CLASSPATH\"" \ + -Dcatalina.base="\"$CATALINA_BASE\"" \ + -Dcatalina.home="\"$CATALINA_HOME\"" \ + -Djava.io.tmpdir="\"$CATALINA_TMPDIR\"" \ + org.apache.catalina.startup.Bootstrap "$@" stop + + # stop failed. Shutdown port disabled? Try a normal kill. + if [ $? != 0 ]; then + if [ ! -z "$CATALINA_PID" ]; then + echo "The stop command failed. Attempting to signal the process to stop through OS signal." + kill -15 `cat "$CATALINA_PID"` >/dev/null 2>&1 + fi + fi + + if [ ! -z "$CATALINA_PID" ]; then + if [ -f "$CATALINA_PID" ]; then + while [ $SLEEP -ge 0 ]; do + kill -0 `cat "$CATALINA_PID"` >/dev/null 2>&1 + if [ $? -gt 0 ]; then + rm -f "$CATALINA_PID" >/dev/null 2>&1 + if [ $? != 0 ]; then + if [ -w "$CATALINA_PID" ]; then + cat /dev/null > "$CATALINA_PID" + # If Tomcat has stopped don't try and force a stop with an empty PID file + FORCE=0 + else + echo "The PID file could not be removed or cleared." + fi + fi + echo "Tomcat stopped." + break + fi + if [ $SLEEP -gt 0 ]; then + sleep 1 + fi + if [ $SLEEP -eq 0 ]; then + echo "Tomcat did not stop in time." + if [ $FORCE -eq 0 ]; then + echo "PID file was not removed." + fi + echo "To aid diagnostics a thread dump has been written to standard out." + kill -3 `cat "$CATALINA_PID"` + fi + SLEEP=`expr $SLEEP - 1 ` + done + fi + fi + + KILL_SLEEP_INTERVAL=5 + if [ $FORCE -eq 1 ]; then + if [ -z "$CATALINA_PID" ]; then + echo "Kill failed: \$CATALINA_PID not set" + else + if [ -f "$CATALINA_PID" ]; then + PID=`cat "$CATALINA_PID"` + echo "Killing Tomcat with the PID: $PID" + kill -9 $PID + while [ $KILL_SLEEP_INTERVAL -ge 0 ]; do + kill -0 `cat "$CATALINA_PID"` >/dev/null 2>&1 + if [ $? -gt 0 ]; then + rm -f "$CATALINA_PID" >/dev/null 2>&1 + if [ $? != 0 ]; then + if [ -w "$CATALINA_PID" ]; then + cat /dev/null > "$CATALINA_PID" + else + echo "The PID file could not be removed." + fi + fi + echo "The Tomcat process has been killed." + break + fi + if [ $KILL_SLEEP_INTERVAL -gt 0 ]; then + sleep 1 + fi + KILL_SLEEP_INTERVAL=`expr $KILL_SLEEP_INTERVAL - 1 ` + done + if [ $KILL_SLEEP_INTERVAL -lt 0 ]; then + echo "Tomcat has not been killed completely yet. The process might be waiting on some system call or might be UNINTERRUPTIBLE." + fi + fi + fi + fi + +elif [ "$1" = "configtest" ] ; then + + eval "\"$_RUNJAVA\"" $LOGGING_MANAGER "$JAVA_OPTS" \ + -D$ENDORSED_PROP="\"$JAVA_ENDORSED_DIRS\"" \ + -classpath "\"$CLASSPATH\"" \ + -Dcatalina.base="\"$CATALINA_BASE\"" \ + -Dcatalina.home="\"$CATALINA_HOME\"" \ + -Djava.io.tmpdir="\"$CATALINA_TMPDIR\"" \ + org.apache.catalina.startup.Bootstrap configtest + result=$? + if [ $result -ne 0 ]; then + echo "Configuration error detected!" + fi + exit $result + +elif [ "$1" = "version" ] ; then + + eval "\"$_RUNJAVA\"" "$JAVA_OPTS" \ + -classpath "\"$CATALINA_HOME/lib/catalina.jar\"" \ + org.apache.catalina.util.ServerInfo + +else + + echo "Usage: catalina.sh ( commands ... )" + echo "commands:" + if $os400; then + echo " debug Start Catalina in a debugger (not available on OS400)" + echo " debug -security Debug Catalina with a security manager (not available on OS400)" + else + echo " debug Start Catalina in a debugger" + echo " debug -security Debug Catalina with a security manager" + fi + echo " jpda start Start Catalina under JPDA debugger" + echo " run Start Catalina in the current window" + echo " run -security Start in the current window with security manager" + echo " start Start Catalina in a separate window" + echo " start -security Start in a separate window with security manager" + echo " stop Stop Catalina, waiting up to 5 seconds for the process to end" + echo " stop n Stop Catalina, waiting up to n seconds for the process to end" + echo " stop -force Stop Catalina, wait up to 5 seconds and then use kill -KILL if still running" + echo " stop n -force Stop Catalina, wait up to n seconds and then use kill -KILL if still running" + echo " configtest Run a basic syntax check on server.xml - check exit code for result" + echo " version What version of tomcat are you running?" + echo "Note: Waiting for the process to end and use of the -force option require that \$CATALINA_PID is defined" + exit 1 + +fi diff --git a/app/opt/tomcat9/bin/ciphers.bat b/app/opt/tomcat9/bin/ciphers.bat new file mode 100644 index 0000000..eb606c8 --- /dev/null +++ b/app/opt/tomcat9/bin/ciphers.bat @@ -0,0 +1,58 @@ +@echo off +rem Licensed to the Apache Software Foundation (ASF) under one or more +rem contributor license agreements. See the NOTICE file distributed with +rem this work for additional information regarding copyright ownership. +rem The ASF licenses this file to You under the Apache License, Version 2.0 +rem (the "License"); you may not use this file except in compliance with +rem the License. You may obtain a copy of the License at +rem +rem http://www.apache.org/licenses/LICENSE-2.0 +rem +rem Unless required by applicable law or agreed to in writing, software +rem distributed under the License is distributed on an "AS IS" BASIS, +rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +rem See the License for the specific language governing permissions and +rem limitations under the License. + +rem --------------------------------------------------------------------------- +rem Script to digest password using the algorithm specified +rem --------------------------------------------------------------------------- + +setlocal + +rem Guess CATALINA_HOME if not defined +set "CURRENT_DIR=%cd%" +if not "%CATALINA_HOME%" == "" goto gotHome +set "CATALINA_HOME=%CURRENT_DIR%" +if exist "%CATALINA_HOME%\bin\tool-wrapper.bat" goto okHome +cd .. +set "CATALINA_HOME=%cd%" +cd "%CURRENT_DIR%" +:gotHome +if exist "%CATALINA_HOME%\bin\tool-wrapper.bat" goto okHome +echo The CATALINA_HOME environment variable is not defined correctly +echo This environment variable is needed to run this program +goto end +:okHome + +set "EXECUTABLE=%CATALINA_HOME%\bin\tool-wrapper.bat" + +rem Check that target executable exists +if exist "%EXECUTABLE%" goto okExec +echo Cannot find "%EXECUTABLE%" +echo This file is needed to run this program +goto end +:okExec + +rem Get remaining unshifted command line arguments and save them in the +set CMD_LINE_ARGS= +:setArgs +if ""%1""=="""" goto doneSetArgs +set CMD_LINE_ARGS=%CMD_LINE_ARGS% %1 +shift +goto setArgs +:doneSetArgs + +call "%EXECUTABLE%" org.apache.tomcat.util.net.openssl.ciphers.OpenSSLCipherConfigurationParser %CMD_LINE_ARGS% + +:end diff --git a/app/opt/tomcat9/bin/ciphers.sh b/app/opt/tomcat9/bin/ciphers.sh new file mode 100755 index 0000000..d4a87b5 --- /dev/null +++ b/app/opt/tomcat9/bin/ciphers.sh @@ -0,0 +1,60 @@ +#!/bin/sh + +# Licensed to the Apache Software Foundation (ASF) under one or more +# contributor license agreements. See the NOTICE file distributed with +# this work for additional information regarding copyright ownership. +# The ASF licenses this file to You under the Apache License, Version 2.0 +# (the "License"); you may not use this file except in compliance with +# the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +# ----------------------------------------------------------------------------- +# Script to digest password using the algorithm specified +# ----------------------------------------------------------------------------- + +# Better OS/400 detection: see Bugzilla 31132 +os400=false +case "`uname`" in +OS400*) os400=true;; +esac + +# resolve links - $0 may be a softlink +PRG="$0" + +while [ -h "$PRG" ] ; do + ls=`ls -ld "$PRG"` + link=`expr "$ls" : '.*-> \(.*\)$'` + if expr "$link" : '/.*' > /dev/null; then + PRG="$link" + else + PRG=`dirname "$PRG"`/"$link" + fi +done + +PRGDIR=`dirname "$PRG"` +EXECUTABLE=tool-wrapper.sh + +# Check that target executable exists +if $os400; then + # -x will Only work on the os400 if the files are: + # 1. owned by the user + # 2. owned by the PRIMARY group of the user + # this will not work if the user belongs in secondary groups + eval +else + if [ ! -x "$PRGDIR"/"$EXECUTABLE" ]; then + echo "Cannot find $PRGDIR/$EXECUTABLE" + echo "The file is absent or does not have execute permission" + echo "This file is needed to run this program" + exit 1 + fi +fi + +exec "$PRGDIR"/"$EXECUTABLE" org.apache.tomcat.util.net.openssl.ciphers.OpenSSLCipherConfigurationParser "$@" diff --git a/app/opt/tomcat9/bin/commons-daemon-native.tar.gz b/app/opt/tomcat9/bin/commons-daemon-native.tar.gz new file mode 100644 index 0000000..749081f Binary files /dev/null and b/app/opt/tomcat9/bin/commons-daemon-native.tar.gz differ diff --git a/app/opt/tomcat9/bin/commons-daemon.jar b/app/opt/tomcat9/bin/commons-daemon.jar new file mode 100644 index 0000000..6714b9b Binary files /dev/null and b/app/opt/tomcat9/bin/commons-daemon.jar differ diff --git a/app/opt/tomcat9/bin/configtest.bat b/app/opt/tomcat9/bin/configtest.bat new file mode 100644 index 0000000..02448e1 --- /dev/null +++ b/app/opt/tomcat9/bin/configtest.bat @@ -0,0 +1,58 @@ +@echo off +rem Licensed to the Apache Software Foundation (ASF) under one or more +rem contributor license agreements. See the NOTICE file distributed with +rem this work for additional information regarding copyright ownership. +rem The ASF licenses this file to You under the Apache License, Version 2.0 +rem (the "License"); you may not use this file except in compliance with +rem the License. You may obtain a copy of the License at +rem +rem http://www.apache.org/licenses/LICENSE-2.0 +rem +rem Unless required by applicable law or agreed to in writing, software +rem distributed under the License is distributed on an "AS IS" BASIS, +rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +rem See the License for the specific language governing permissions and +rem limitations under the License. + +rem --------------------------------------------------------------------------- +rem Configuration test script for the CATALINA Server +rem --------------------------------------------------------------------------- + +setlocal + +rem Guess CATALINA_HOME if not defined +set "CURRENT_DIR=%cd%" +if not "%CATALINA_HOME%" == "" goto gotHome +set "CATALINA_HOME=%CURRENT_DIR%" +if exist "%CATALINA_HOME%\bin\catalina.bat" goto okHome +cd .. +set "CATALINA_HOME=%cd%" +cd "%CURRENT_DIR%" +:gotHome +if exist "%CATALINA_HOME%\bin\catalina.bat" goto okHome +echo The CATALINA_HOME environment variable is not defined correctly +echo This environment variable is needed to run this program +goto end +:okHome + +set "EXECUTABLE=%CATALINA_HOME%\bin\catalina.bat" + +rem Check that target executable exists +if exist "%EXECUTABLE%" goto okExec +echo Cannot find "%EXECUTABLE%" +echo This file is needed to run this program +goto end +:okExec + +rem Get remaining unshifted command line arguments and save them in the +set CMD_LINE_ARGS= +:setArgs +if ""%1""=="""" goto doneSetArgs +set CMD_LINE_ARGS=%CMD_LINE_ARGS% %1 +shift +goto setArgs +:doneSetArgs + +call "%EXECUTABLE%" configtest %CMD_LINE_ARGS% + +:end diff --git a/app/opt/tomcat9/bin/configtest.sh b/app/opt/tomcat9/bin/configtest.sh new file mode 100755 index 0000000..9a8ebff --- /dev/null +++ b/app/opt/tomcat9/bin/configtest.sh @@ -0,0 +1,60 @@ +#!/bin/sh + +# Licensed to the Apache Software Foundation (ASF) under one or more +# contributor license agreements. See the NOTICE file distributed with +# this work for additional information regarding copyright ownership. +# The ASF licenses this file to You under the Apache License, Version 2.0 +# (the "License"); you may not use this file except in compliance with +# the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +# ----------------------------------------------------------------------------- +# Configuration Test Script for the CATALINA Server +# ----------------------------------------------------------------------------- + +# Better OS/400 detection: see Bugzilla 31132 +os400=false +case "`uname`" in +OS400*) os400=true;; +esac + +# resolve links - $0 may be a softlink +PRG="$0" + +while [ -h "$PRG" ] ; do + ls=`ls -ld "$PRG"` + link=`expr "$ls" : '.*-> \(.*\)$'` + if expr "$link" : '/.*' > /dev/null; then + PRG="$link" + else + PRG=`dirname "$PRG"`/"$link" + fi +done + +PRGDIR=`dirname "$PRG"` +EXECUTABLE=catalina.sh + +# Check that target executable exists +if $os400; then + # -x will Only work on the os400 if the files are: + # 1. owned by the user + # 2. owned by the PRIMARY group of the user + # this will not work if the user belongs in secondary groups + eval +else + if [ ! -x "$PRGDIR"/"$EXECUTABLE" ]; then + echo "Cannot find $PRGDIR/$EXECUTABLE" + echo "The file is absent or does not have execute permission" + echo "This file is needed to run this program" + exit 1 + fi +fi + +exec "$PRGDIR"/"$EXECUTABLE" configtest "$@" diff --git a/app/opt/tomcat9/bin/daemon.sh b/app/opt/tomcat9/bin/daemon.sh new file mode 100755 index 0000000..014a350 --- /dev/null +++ b/app/opt/tomcat9/bin/daemon.sh @@ -0,0 +1,293 @@ +#!/bin/sh + +# Licensed to the Apache Software Foundation (ASF) under one or more +# contributor license agreements. See the NOTICE file distributed with +# this work for additional information regarding copyright ownership. +# The ASF licenses this file to You under the Apache License, Version 2.0 +# (the "License"); you may not use this file except in compliance with +# the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# +# ----------------------------------------------------------------------------- +# Commons Daemon wrapper script. +# ----------------------------------------------------------------------------- + +# resolve links - $0 may be a softlink +PRG="$0" + +while [ -h "$PRG" ]; do + ls=`ls -ld "$PRG"` + link=`expr "$ls" : '.*-> \(.*\)$'` + if expr "$link" : '/.*' > /dev/null; then + PRG="$link" + else + PRG=`dirname "$PRG"`/"$link" + fi +done + +DIRNAME="`dirname "$PRG"`" +PROGRAM="`basename "$PRG"`" +while [ ".$1" != . ] +do + case "$1" in + --java-home ) + JAVA_HOME="$2" + shift; shift; + continue + ;; + --catalina-home ) + CATALINA_HOME="$2" + shift; shift; + continue + ;; + --catalina-base ) + CATALINA_BASE="$2" + shift; shift; + continue + ;; + --catalina-pid ) + CATALINA_PID="$2" + shift; shift; + continue + ;; + --tomcat-user ) + TOMCAT_USER="$2" + shift; shift; + continue + ;; + --service-start-wait-time ) + SERVICE_START_WAIT_TIME="$2" + shift; shift; + continue + ;; + * ) + break + ;; + esac +done +# OS specific support (must be 'true' or 'false'). +cygwin=false; +darwin=false; +case "`uname`" in + CYGWIN*) + cygwin=true + ;; + Darwin*) + darwin=true + ;; +esac + +# Use the maximum available, or set MAX_FD != -1 to use that +test ".$MAX_FD" = . && MAX_FD="maximum" +# Setup parameters for running the jsvc +# +test ".$TOMCAT_USER" = . && TOMCAT_USER=tomcat +# Set JAVA_HOME to working JDK or JRE +# If not set we'll try to guess the JAVA_HOME +# from java binary if on the PATH +# +if [ -z "$JAVA_HOME" ]; then + JAVA_BIN="`which java 2>/dev/null || type java 2>&1`" + while [ -h "$JAVA_BIN" ]; do + ls=`ls -ld "$JAVA_BIN"` + link=`expr "$ls" : '.*-> \(.*\)$'` + if expr "$link" : '/.*' > /dev/null; then + JAVA_BIN="$link" + else + JAVA_BIN="`dirname "$JAVA_BIN"`/$link" + fi + done + test -x "$JAVA_BIN" && JAVA_HOME="`dirname "$JAVA_BIN"`" + test ".$JAVA_HOME" != . && JAVA_HOME=`cd "$JAVA_HOME/.." >/dev/null; pwd` +else + JAVA_BIN="$JAVA_HOME/bin/java" +fi + +# Only set CATALINA_HOME if not already set +test ".$CATALINA_HOME" = . && CATALINA_HOME=`cd "$DIRNAME/.." >/dev/null; pwd` +test ".$CATALINA_BASE" = . && CATALINA_BASE="$CATALINA_HOME" +test ".$CATALINA_MAIN" = . && CATALINA_MAIN=org.apache.catalina.startup.Bootstrap +# If not explicitly set, look for jsvc in CATALINA_BASE first then CATALINA_HOME +if [ -z "$JSVC" ]; then + JSVC="$CATALINA_BASE/bin/jsvc" + if [ ! -x "$JSVC" ]; then + JSVC="$CATALINA_HOME/bin/jsvc" + fi +fi +# Set the default service-start wait time if necessary +test ".$SERVICE_START_WAIT_TIME" = . && SERVICE_START_WAIT_TIME=10 + +# Ensure that any user defined CLASSPATH variables are not used on startup, +# but allow them to be specified in setenv.sh, in rare case when it is needed. +CLASSPATH= +JAVA_OPTS= +if [ -r "$CATALINA_BASE/bin/setenv.sh" ]; then + . "$CATALINA_BASE/bin/setenv.sh" +elif [ -r "$CATALINA_HOME/bin/setenv.sh" ]; then + . "$CATALINA_HOME/bin/setenv.sh" +fi + +# Add on extra jar files to CLASSPATH +test ".$CLASSPATH" != . && CLASSPATH="$CLASSPATH:" +CLASSPATH="$CLASSPATH$CATALINA_HOME/bin/bootstrap.jar:$CATALINA_HOME/bin/commons-daemon.jar" + +test ".$CATALINA_OUT" = . && CATALINA_OUT="$CATALINA_BASE/logs/catalina-daemon.out" +test ".$CATALINA_TMP" = . && CATALINA_TMP="$CATALINA_BASE/temp" + +# Add tomcat-juli.jar to classpath +# tomcat-juli.jar can be over-ridden per instance +if [ -r "$CATALINA_BASE/bin/tomcat-juli.jar" ] ; then + CLASSPATH="$CLASSPATH:$CATALINA_BASE/bin/tomcat-juli.jar" +else + CLASSPATH="$CLASSPATH:$CATALINA_HOME/bin/tomcat-juli.jar" +fi + +# Check for the deprecated LOGGING_CONFIG +# Only use it if CATALINA_LOGGING_CONFIG is not set and LOGGING_CONFIG starts with "-D..." +if [ -z "$CATALINA_LOGGING_CONFIG" ]; then + case $LOGGING_CONFIG in + -D*) CATALINA_LOGGING_CONFIG="$LOGGING_CONFIG" + esac +fi + +# Set juli LogManager config file if it is present and an override has not been issued +if [ -z "$CATALINA_LOGGING_CONFIG" ]; then + if [ -r "$CATALINA_BASE/conf/logging.properties" ]; then + CATALINA_LOGGING_CONFIG="-Djava.util.logging.config.file=$CATALINA_BASE/conf/logging.properties" + else + # Bugzilla 45585 + CATALINA_LOGGING_CONFIG="-Dnop" + fi +fi + +test ".$LOGGING_MANAGER" = . && LOGGING_MANAGER="-Djava.util.logging.manager=org.apache.juli.ClassLoaderLogManager" +JAVA_OPTS="$JAVA_OPTS $LOGGING_MANAGER" + +# Set -pidfile +test ".$CATALINA_PID" = . && CATALINA_PID="$CATALINA_BASE/logs/catalina-daemon.pid" + +# Increase the maximum file descriptors if we can +if [ "$cygwin" = "false" ]; then + MAX_FD_LIMIT=`ulimit -H -n` + if [ "$?" -eq 0 ]; then + # Darwin does not allow RLIMIT_INFINITY on file soft limit + if [ "$darwin" = "true" ] && [ "$MAX_FD_LIMIT" = "unlimited" ]; then + MAX_FD_LIMIT=`/usr/sbin/sysctl -n kern.maxfilesperproc` + fi + test ".$MAX_FD" = ".maximum" && MAX_FD="$MAX_FD_LIMIT" + ulimit -n $MAX_FD + if [ "$?" -ne 0 ]; then + echo "$PROGRAM: Could not set maximum file descriptor limit: $MAX_FD" + fi + else + echo "$PROGRAM: Could not query system maximum file descriptor limit: $MAX_FD_LIMIT" + fi +fi + +# Set UMASK unless it has been overridden +if [ -z "$UMASK" ]; then + UMASK="0027" +fi +umask $UMASK + +# Java 9 no longer supports the java.endorsed.dirs +# system property. Only try to use it if +# JAVA_ENDORSED_DIRS was explicitly set +# or CATALINA_HOME/endorsed exists. +ENDORSED_PROP=ignore.endorsed.dirs +if [ -n "$JAVA_ENDORSED_DIRS" ]; then + ENDORSED_PROP=java.endorsed.dirs +fi +if [ -d "$CATALINA_HOME/endorsed" ]; then + ENDORSED_PROP=java.endorsed.dirs +fi + +# ----- Execute The Requested Command ----------------------------------------- +case "$1" in + run ) + shift + eval exec "\"$JSVC\"" $* \ + "$JSVC_OPTS" \ + -java-home "\"$JAVA_HOME\"" \ + -pidfile "\"$CATALINA_PID\"" \ + -wait $SERVICE_START_WAIT_TIME \ + -umask $UMASK \ + -nodetach \ + -outfile "\"&1\"" \ + -errfile "\"&2\"" \ + -classpath "\"$CLASSPATH\"" \ + "\"$CATALINA_LOGGING_CONFIG\"" "$JAVA_OPTS" "$CATALINA_OPTS" \ + -D$ENDORSED_PROP="\"$JAVA_ENDORSED_DIRS\"" \ + -Dcatalina.base="\"$CATALINA_BASE\"" \ + -Dcatalina.home="\"$CATALINA_HOME\"" \ + -Djava.io.tmpdir="\"$CATALINA_TMP\"" \ + $CATALINA_MAIN + exit $? + ;; + start ) + eval "\"$JSVC\"" \ + "$JSVC_OPTS" \ + -java-home "\"$JAVA_HOME\"" \ + -user $TOMCAT_USER \ + -pidfile "\"$CATALINA_PID\"" \ + -wait $SERVICE_START_WAIT_TIME \ + -umask $UMASK \ + -outfile "\"$CATALINA_OUT\"" \ + -errfile "\"&1\"" \ + -classpath "\"$CLASSPATH\"" \ + "\"$CATALINA_LOGGING_CONFIG\"" "$JAVA_OPTS" "$CATALINA_OPTS" \ + -D$ENDORSED_PROP="\"$JAVA_ENDORSED_DIRS\"" \ + -Dcatalina.base="\"$CATALINA_BASE\"" \ + -Dcatalina.home="\"$CATALINA_HOME\"" \ + -Djava.io.tmpdir="\"$CATALINA_TMP\"" \ + $CATALINA_MAIN + exit $? + ;; + stop ) + eval "\"$JSVC\"" \ + "$JSVC_OPTS" \ + -stop \ + -pidfile "\"$CATALINA_PID\"" \ + -classpath "\"$CLASSPATH\"" \ + -D$ENDORSED_PROP="\"$JAVA_ENDORSED_DIRS\"" \ + -Dcatalina.base="\"$CATALINA_BASE\"" \ + -Dcatalina.home="\"$CATALINA_HOME\"" \ + -Djava.io.tmpdir="\"$CATALINA_TMP\"" \ + $CATALINA_MAIN + exit $? + ;; + version ) + "$JSVC" \ + -java-home "$JAVA_HOME" \ + -pidfile "$CATALINA_PID" \ + -classpath "$CLASSPATH" \ + -errfile "&2" \ + -version \ + -check \ + $CATALINA_MAIN + if [ "$?" = 0 ]; then + "$JAVA_BIN" \ + -classpath "$CATALINA_HOME/lib/catalina.jar" \ + org.apache.catalina.util.ServerInfo + fi + exit $? + ;; + * ) + echo "Unknown command: '$1'" + echo "Usage: $PROGRAM ( commands ... )" + echo "commands:" + echo " run Start Tomcat without detaching from console" + echo " start Start Tomcat" + echo " stop Stop Tomcat" + echo " version What version of commons daemon and Tomcat" + echo " are you running?" + exit 1 + ;; +esac diff --git a/app/opt/tomcat9/bin/digest.bat b/app/opt/tomcat9/bin/digest.bat new file mode 100644 index 0000000..428b9d1 --- /dev/null +++ b/app/opt/tomcat9/bin/digest.bat @@ -0,0 +1,58 @@ +@echo off +rem Licensed to the Apache Software Foundation (ASF) under one or more +rem contributor license agreements. See the NOTICE file distributed with +rem this work for additional information regarding copyright ownership. +rem The ASF licenses this file to You under the Apache License, Version 2.0 +rem (the "License"); you may not use this file except in compliance with +rem the License. You may obtain a copy of the License at +rem +rem http://www.apache.org/licenses/LICENSE-2.0 +rem +rem Unless required by applicable law or agreed to in writing, software +rem distributed under the License is distributed on an "AS IS" BASIS, +rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +rem See the License for the specific language governing permissions and +rem limitations under the License. + +rem --------------------------------------------------------------------------- +rem Script to digest password using the algorithm specified +rem --------------------------------------------------------------------------- + +setlocal + +rem Guess CATALINA_HOME if not defined +set "CURRENT_DIR=%cd%" +if not "%CATALINA_HOME%" == "" goto gotHome +set "CATALINA_HOME=%CURRENT_DIR%" +if exist "%CATALINA_HOME%\bin\tool-wrapper.bat" goto okHome +cd .. +set "CATALINA_HOME=%cd%" +cd "%CURRENT_DIR%" +:gotHome +if exist "%CATALINA_HOME%\bin\tool-wrapper.bat" goto okHome +echo The CATALINA_HOME environment variable is not defined correctly +echo This environment variable is needed to run this program +goto end +:okHome + +set "EXECUTABLE=%CATALINA_HOME%\bin\tool-wrapper.bat" + +rem Check that target executable exists +if exist "%EXECUTABLE%" goto okExec +echo Cannot find "%EXECUTABLE%" +echo This file is needed to run this program +goto end +:okExec + +rem Get remaining unshifted command line arguments and save them in the +set CMD_LINE_ARGS= +:setArgs +if ""%1""=="""" goto doneSetArgs +set CMD_LINE_ARGS=%CMD_LINE_ARGS% %1 +shift +goto setArgs +:doneSetArgs + +call "%EXECUTABLE%" -server org.apache.catalina.realm.RealmBase %CMD_LINE_ARGS% + +:end diff --git a/app/opt/tomcat9/bin/digest.sh b/app/opt/tomcat9/bin/digest.sh new file mode 100755 index 0000000..62ed5d0 --- /dev/null +++ b/app/opt/tomcat9/bin/digest.sh @@ -0,0 +1,60 @@ +#!/bin/sh + +# Licensed to the Apache Software Foundation (ASF) under one or more +# contributor license agreements. See the NOTICE file distributed with +# this work for additional information regarding copyright ownership. +# The ASF licenses this file to You under the Apache License, Version 2.0 +# (the "License"); you may not use this file except in compliance with +# the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +# ----------------------------------------------------------------------------- +# Script to digest password using the algorithm specified +# ----------------------------------------------------------------------------- + +# Better OS/400 detection: see Bugzilla 31132 +os400=false +case "`uname`" in +OS400*) os400=true;; +esac + +# resolve links - $0 may be a softlink +PRG="$0" + +while [ -h "$PRG" ] ; do + ls=`ls -ld "$PRG"` + link=`expr "$ls" : '.*-> \(.*\)$'` + if expr "$link" : '/.*' > /dev/null; then + PRG="$link" + else + PRG=`dirname "$PRG"`/"$link" + fi +done + +PRGDIR=`dirname "$PRG"` +EXECUTABLE=tool-wrapper.sh + +# Check that target executable exists +if $os400; then + # -x will Only work on the os400 if the files are: + # 1. owned by the user + # 2. owned by the PRIMARY group of the user + # this will not work if the user belongs in secondary groups + eval +else + if [ ! -x "$PRGDIR"/"$EXECUTABLE" ]; then + echo "Cannot find $PRGDIR/$EXECUTABLE" + echo "The file is absent or does not have execute permission" + echo "This file is needed to run this program" + exit 1 + fi +fi + +exec "$PRGDIR"/"$EXECUTABLE" -server org.apache.catalina.realm.RealmBase "$@" diff --git a/app/opt/tomcat9/bin/makebase.bat b/app/opt/tomcat9/bin/makebase.bat new file mode 100644 index 0000000..93d7c96 --- /dev/null +++ b/app/opt/tomcat9/bin/makebase.bat @@ -0,0 +1,114 @@ +@echo off +rem Licensed to the Apache Software Foundation (ASF) under one or more +rem contributor license agreements. See the NOTICE file distributed with +rem this work for additional information regarding copyright ownership. +rem The ASF licenses this file to You under the Apache License, Version 2.0 +rem (the "License"); you may not use this file except in compliance with +rem the License. You may obtain a copy of the License at +rem +rem http://www.apache.org/licenses/LICENSE-2.0 +rem +rem Unless required by applicable law or agreed to in writing, software +rem distributed under the License is distributed on an "AS IS" BASIS, +rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +rem See the License for the specific language governing permissions and +rem limitations under the License. + +rem This script creates the directory structure required for running Tomcat +rem in a separate directory by pointing %CATALINA_BASE% to it. It copies the +rem conf directory from %CATALINA_HOME%, and creates empty directories for +rem bin, lib, logs, temp, webapps, and work. +rem +rem If the file %CATALINA_HOME%/bin/setenv.sh exists then it is copied to +rem the target directory as well. +rem +rem Usage: makebase [-w | --webapps] + +setlocal + +rem Guess CATALINA_HOME if not defined +set "CURRENT_DIR=%cd%" +if not "%CATALINA_HOME%" == "" goto gotHome +set "CATALINA_HOME=%CURRENT_DIR%" +if exist "%CATALINA_HOME%\bin\catalina.bat" goto okHome +cd .. +set "CATALINA_HOME=%cd%" +cd "%CURRENT_DIR%" +:gotHome + +if exist "%CATALINA_HOME%\bin\catalina.bat" goto okHome +echo The CATALINA_HOME environment variable is not defined correctly +echo This environment variable is needed to run this program +goto EOF +:okHome + +rem first arg is the target directory +set BASE_TGT=%1 + +if %BASE_TGT%.==. ( + rem target directory not provided; exit + echo Usage: makebase ^ + goto :EOF +) + +set COPY_WEBAPPS=false + +rem parse args +for %%a in (%*) do ( + if "%%~a"=="--webapps" ( + set COPY_WEBAPPS=true + ) + if "%%~a"=="-w" ( + set COPY_WEBAPPS=true + ) +) + +if exist %BASE_TGT% ( + rem target directory exists + echo Target directory exists + + rem exit if target directory is not empty + for /F %%i in ('dir /b %BASE_TGT%\*.*') do ( + echo Target directory is not empty + goto :EOF + ) +) else ( + rem create the target directory + mkdir %BASE_TGT% +) + +rem create empty directories +for %%d in (bin, conf, lib, logs, temp, webapps, work) do ( + mkdir %BASE_TGT%\%%d +) + +if "%COPY_WEBAPPS%" == "true" ( + echo Copying webapps + robocopy %CATALINA_HOME%\webapps %BASE_TGT%\webapps /E > nul + rem copy conf directory recursively + robocopy %CATALINA_HOME%\conf %BASE_TGT%\conf /E > nul +) else ( + rem copy conf directory without subdirectories and suppress warning + robocopy %CATALINA_HOME%\conf %BASE_TGT%\conf > nul + rem create empty ROOT directory + mkdir %BASE_TGT%\webapps\ROOT +) + +rem copy setenv.bat if exists +robocopy %CATALINA_HOME%\bin %BASE_TGT%\bin setenv.bat > nul + +echo Created CATALINA_BASE directory at %BASE_TGT% + +echo. +echo You can launch the new instance by running: +echo set CATALINA_HOME=%CATALINA_HOME% +echo set CATALINA_BASE=%BASE_TGT% +echo %%CATALINA_HOME%%/bin/catalina.bat run + +echo. +echo Attention: The ports in conf\server.xml might be bound by a +echo different instance. Please review your config files +echo and update them where necessary. +echo. + +:EOF diff --git a/app/opt/tomcat9/bin/makebase.sh b/app/opt/tomcat9/bin/makebase.sh new file mode 100755 index 0000000..2b6eada --- /dev/null +++ b/app/opt/tomcat9/bin/makebase.sh @@ -0,0 +1,115 @@ +#!/bin/sh + +# Licensed to the Apache Software Foundation (ASF) under one or more +# contributor license agreements. See the NOTICE file distributed with +# this work for additional information regarding copyright ownership. +# The ASF licenses this file to You under the Apache License, Version 2.0 +# (the "License"); you may not use this file except in compliance with +# the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +# This script creates the directory structure required for running Tomcat +# in a separate directory by pointing $CATALINA_BASE to it. It copies the +# conf directory from $CATALINA_HOME, and creates empty directories for +# bin, lib, logs, temp, webapps, and work. +# +# If the file $CATALINA_HOME/bin/setenv.sh exists then it is copied to +# the target directory as well. +# +# Usage: makebase [-w | --webapps] + +# resolve links - $0 may be a softlink +PRG="$0" + +while [ -h "$PRG" ]; do + ls=`ls -ld "$PRG"` + link=`expr "$ls" : '.*-> \(.*\)$'` + if expr "$link" : '/.*' > /dev/null; then + PRG="$link" + else + PRG=`dirname "$PRG"`/"$link" + fi +done + +# Get standard environment variables +PRGDIR=`dirname "$PRG"` + +# Only set CATALINA_HOME if not already set +[ -z "$CATALINA_HOME" ] && CATALINA_HOME=`cd "$PRGDIR/.." >/dev/null; pwd` + +# first arg is the target directory +BASE_TGT=$1 + +if [ -z "$BASE_TGT" ]; then + # target directory not provided; exit + echo "Usage: makebase " + exit 1 +fi + +COPY_WEBAPPS=false + +# parse args +while [ "$1" != "" ]; do + case $1 in + -w | --webapps) + COPY_WEBAPPS=true + ;; + esac + shift +done + +if [ -d "$BASE_TGT" ]; then + # target directory exists + echo "Target directory exists" + + # exit if target directory is not empty + [ "`ls -A "$BASE_TGT"`" ] && \ + echo "Target directory is not empty" && \ + exit 1 +else + # create the target directory + mkdir -p "$BASE_TGT" +fi + +for dir in bin conf lib logs temp webapps work; +do + # create empty directories + mkdir "$BASE_TGT/$dir" +done + +if [ "$COPY_WEBAPPS" = true ]; then + echo "Copying webapps" + cp -r "$CATALINA_HOME/webapps" "$BASE_TGT/" + # copy conf directory recursively + cp -r "$CATALINA_HOME/conf" "$BASE_TGT/" +else + # copy conf directory without subdirectories and suppress warning + cp "${CATALINA_HOME}/conf"/* "$BASE_TGT/conf" 2> /dev/null + # create empty ROOT directory + mkdir "$BASE_TGT/webapps/ROOT" +fi + +# copy setenv.sh if exists +[ -f "$CATALINA_HOME/bin/setenv.sh" ] && \ + cp "$CATALINA_HOME/bin/setenv.sh" "$BASE_TGT/bin/" + +echo "Created CATALINA_BASE directory at $BASE_TGT" + +echo +echo "You can launch the new instance by running:" +echo " export CATALINA_HOME=$CATALINA_HOME" +echo " export CATALINA_BASE=$BASE_TGT" +echo " \$CATALINA_HOME/bin/catalina.sh run" + +echo +echo "Attention: The ports in conf/server.xml might be bound by a " +echo " different instance. Please review your config files " +echo " and update them as necessary." +echo diff --git a/app/opt/tomcat9/bin/setclasspath.bat b/app/opt/tomcat9/bin/setclasspath.bat new file mode 100644 index 0000000..c68e3ef --- /dev/null +++ b/app/opt/tomcat9/bin/setclasspath.bat @@ -0,0 +1,105 @@ +@echo off +rem Licensed to the Apache Software Foundation (ASF) under one or more +rem contributor license agreements. See the NOTICE file distributed with +rem this work for additional information regarding copyright ownership. +rem The ASF licenses this file to You under the Apache License, Version 2.0 +rem (the "License"); you may not use this file except in compliance with +rem the License. You may obtain a copy of the License at +rem +rem http://www.apache.org/licenses/LICENSE-2.0 +rem +rem Unless required by applicable law or agreed to in writing, software +rem distributed under the License is distributed on an "AS IS" BASIS, +rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +rem See the License for the specific language governing permissions and +rem limitations under the License. + +rem --------------------------------------------------------------------------- +rem Set JAVA_HOME or JRE_HOME if not already set, ensure any provided settings +rem are valid and consistent with the selected start-up options and set up the +rem endorsed directory. +rem --------------------------------------------------------------------------- + +rem Make sure prerequisite environment variables are set + +rem In debug mode we need a real JDK (JAVA_HOME) +if ""%1"" == ""debug"" goto needJavaHome + +rem Otherwise either JRE or JDK are fine +if not "%JRE_HOME%" == "" goto gotJreHome +if not "%JAVA_HOME%" == "" goto gotJavaHome +echo Neither the JAVA_HOME nor the JRE_HOME environment variable is defined +echo At least one of these environment variable is needed to run this program +goto exit + +:needJavaHome +rem Check if we have a usable JDK +if "%JAVA_HOME%" == "" goto noJavaHome +if not exist "%JAVA_HOME%\bin\java.exe" goto noJavaHome +if not exist "%JAVA_HOME%\bin\jdb.exe" goto noJavaHome +if not exist "%JAVA_HOME%\bin\javac.exe" goto noJavaHome +set "JRE_HOME=%JAVA_HOME%" +goto okJava + +:noJavaHome +echo The JAVA_HOME environment variable is not defined correctly. +echo JAVA_HOME=%JAVA_HOME% +echo It is needed to run this program in debug mode. +echo NB: JAVA_HOME should point to a JDK not a JRE. +goto exit + +:gotJavaHome +rem No JRE given, check if JAVA_HOME is usable as JRE_HOME +if not exist "%JAVA_HOME%\bin\java.exe" goto noJavaHomeAsJre +rem Use JAVA_HOME as JRE_HOME +set "JRE_HOME=%JAVA_HOME%" +goto okJava + +:noJavaHomeAsJre +echo The JAVA_HOME environment variable is not defined correctly. +echo JAVA_HOME=%JAVA_HOME% +echo NB: JAVA_HOME should point to a JDK not a JRE. +goto exit + +:gotJreHome +rem Check if we have a usable JRE +if not exist "%JRE_HOME%\bin\java.exe" goto noJreHome +goto okJava + +:noJreHome +rem Needed at least a JRE +echo The JRE_HOME environment variable is not defined correctly +echo JRE_HOME=%JRE_HOME% +echo This environment variable is needed to run this program +goto exit + +:okJava +rem Don't override the endorsed dir if the user has set it previously +if not "%JAVA_ENDORSED_DIRS%" == "" goto gotEndorseddir +rem Java 9 no longer supports the java.endorsed.dirs +rem system property. Only try to use it if +rem CATALINA_HOME/endorsed exists. +if not exist "%CATALINA_HOME%\endorsed" goto gotEndorseddir +set "JAVA_ENDORSED_DIRS=%CATALINA_HOME%\endorsed" +:gotEndorseddir + +rem Don't override _RUNJAVA if the user has set it previously +if not "%_RUNJAVA%" == "" goto gotRunJava +rem Set standard command for invoking Java. +rem Also note the quoting as JRE_HOME may contain spaces. +set "_RUNJAVA=%JRE_HOME%\bin\java.exe" +:gotRunJava + +rem Don't override _RUNJDB if the user has set it previously +rem Also note the quoting as JAVA_HOME may contain spaces. +if not "%_RUNJDB%" == "" goto gotRunJdb +set "_RUNJDB=%JAVA_HOME%\bin\jdb.exe" +:gotRunJdb + +goto end + +:exit +exit /b 1 + +:end +exit /b 0 diff --git a/app/opt/tomcat9/bin/setclasspath.sh b/app/opt/tomcat9/bin/setclasspath.sh new file mode 100755 index 0000000..77f1cb2 --- /dev/null +++ b/app/opt/tomcat9/bin/setclasspath.sh @@ -0,0 +1,116 @@ +#!/bin/sh + +# Licensed to the Apache Software Foundation (ASF) under one or more +# contributor license agreements. See the NOTICE file distributed with +# this work for additional information regarding copyright ownership. +# The ASF licenses this file to You under the Apache License, Version 2.0 +# (the "License"); you may not use this file except in compliance with +# the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +# ----------------------------------------------------------------------------- +# Set JAVA_HOME or JRE_HOME if not already set, ensure any provided settings +# are valid and consistent with the selected start-up options and set up the +# endorsed directory. +# ----------------------------------------------------------------------------- + +# Make sure prerequisite environment variables are set +if [ -z "$JAVA_HOME" ] && [ -z "$JRE_HOME" ]; then + if $darwin; then + # Bugzilla 54390 + if [ -x '/usr/libexec/java_home' ] ; then + export JAVA_HOME=`/usr/libexec/java_home` + # Bugzilla 37284 (reviewed). + elif [ -d "/System/Library/Frameworks/JavaVM.framework/Versions/CurrentJDK/Home" ]; then + export JAVA_HOME="/System/Library/Frameworks/JavaVM.framework/Versions/CurrentJDK/Home" + fi + else + JAVA_PATH=`which java 2>/dev/null` + if [ "x$JAVA_PATH" != "x" ]; then + JAVA_PATH=`dirname "$JAVA_PATH" 2>/dev/null` + JRE_HOME=`dirname "$JAVA_PATH" 2>/dev/null` + fi + if [ "x$JRE_HOME" = "x" ]; then + # XXX: Should we try other locations? + if [ -x /usr/bin/java ]; then + JRE_HOME=/usr + fi + fi + fi + if [ -z "$JAVA_HOME" ] && [ -z "$JRE_HOME" ]; then + echo "Neither the JAVA_HOME nor the JRE_HOME environment variable is defined" + echo "At least one of these environment variable is needed to run this program" + exit 1 + fi +fi +if [ -z "$JAVA_HOME" ] && [ "$1" = "debug" ]; then + echo "JAVA_HOME should point to a JDK in order to run in debug mode." + exit 1 +fi + +# If we're running under jdb, we need a full jdk. +if [ "$1" = "debug" ] ; then + if [ "$os400" = "true" ]; then + if [ ! -x "$JAVA_HOME"/bin/java ] || [ ! -x "$JAVA_HOME"/bin/javac ]; then + echo "The JAVA_HOME environment variable is not defined correctly" + echo "JAVA_HOME=$JAVA_HOME" + echo "This environment variable is needed to run this program" + echo "NB: JAVA_HOME should point to a JDK not a JRE" + exit 1 + fi + else + if [ ! -x "$JAVA_HOME"/bin/java ] || [ ! -x "$JAVA_HOME"/bin/jdb ] || [ ! -x "$JAVA_HOME"/bin/javac ]; then + echo "The JAVA_HOME environment variable is not defined correctly" + echo "JAVA_HOME=$JAVA_HOME" + echo "This environment variable is needed to run this program" + echo "NB: JAVA_HOME should point to a JDK not a JRE" + exit 1 + fi + fi +fi + +if [ -z "$JRE_HOME" ]; then + # JAVA_HOME_MUST be set + if [ ! -x "$JAVA_HOME"/bin/java ]; then + echo "The JAVA_HOME environment variable is not defined correctly" + echo "JAVA_HOME=$JAVA_HOME" + echo "This environment variable is needed to run this program" + echo "NB: JAVA_HOME should point to a JDK not a JRE" + exit 1 + fi + JRE_HOME="$JAVA_HOME" +else + if [ ! -x "$JRE_HOME"/bin/java ]; then + echo "The JRE_HOME environment variable is not defined correctly" + echo "JRE_HOME=$JRE_HOME" + echo "This environment variable is needed to run this program" + exit 1 + fi +fi + +# Don't override the endorsed dir if the user has set it previously +if [ -z "$JAVA_ENDORSED_DIRS" ]; then + # Java 9 no longer supports the java.endorsed.dirs + # system property. Only try to use it if + # CATALINA_HOME/endorsed exists. + if [ -d "$CATALINA_HOME"/endorsed ]; then + JAVA_ENDORSED_DIRS="$CATALINA_HOME"/endorsed + fi +fi + +# Set standard commands for invoking Java, if not already set. +if [ -z "$_RUNJAVA" ]; then + _RUNJAVA="$JRE_HOME"/bin/java +fi +if [ "$os400" != "true" ]; then + if [ -z "$_RUNJDB" ]; then + _RUNJDB="$JAVA_HOME"/bin/jdb + fi +fi diff --git a/app/opt/tomcat9/bin/setenv.sh b/app/opt/tomcat9/bin/setenv.sh new file mode 100755 index 0000000..65e2f19 --- /dev/null +++ b/app/opt/tomcat9/bin/setenv.sh @@ -0,0 +1 @@ +export CATALINA_OPTS="-Xms4096m -Xms4096m -XX:+UseG1GC -XX:MaxMetaspaceSize=512m -server" \ No newline at end of file diff --git a/app/opt/tomcat9/bin/shutdown.bat b/app/opt/tomcat9/bin/shutdown.bat new file mode 100644 index 0000000..119fb99 --- /dev/null +++ b/app/opt/tomcat9/bin/shutdown.bat @@ -0,0 +1,58 @@ +@echo off +rem Licensed to the Apache Software Foundation (ASF) under one or more +rem contributor license agreements. See the NOTICE file distributed with +rem this work for additional information regarding copyright ownership. +rem The ASF licenses this file to You under the Apache License, Version 2.0 +rem (the "License"); you may not use this file except in compliance with +rem the License. You may obtain a copy of the License at +rem +rem http://www.apache.org/licenses/LICENSE-2.0 +rem +rem Unless required by applicable law or agreed to in writing, software +rem distributed under the License is distributed on an "AS IS" BASIS, +rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +rem See the License for the specific language governing permissions and +rem limitations under the License. + +rem --------------------------------------------------------------------------- +rem Stop script for the CATALINA Server +rem --------------------------------------------------------------------------- + +setlocal + +rem Guess CATALINA_HOME if not defined +set "CURRENT_DIR=%cd%" +if not "%CATALINA_HOME%" == "" goto gotHome +set "CATALINA_HOME=%CURRENT_DIR%" +if exist "%CATALINA_HOME%\bin\catalina.bat" goto okHome +cd .. +set "CATALINA_HOME=%cd%" +cd "%CURRENT_DIR%" +:gotHome +if exist "%CATALINA_HOME%\bin\catalina.bat" goto okHome +echo The CATALINA_HOME environment variable is not defined correctly +echo This environment variable is needed to run this program +goto end +:okHome + +set "EXECUTABLE=%CATALINA_HOME%\bin\catalina.bat" + +rem Check that target executable exists +if exist "%EXECUTABLE%" goto okExec +echo Cannot find "%EXECUTABLE%" +echo This file is needed to run this program +goto end +:okExec + +rem Get remaining unshifted command line arguments and save them in the +set CMD_LINE_ARGS= +:setArgs +if ""%1""=="""" goto doneSetArgs +set CMD_LINE_ARGS=%CMD_LINE_ARGS% %1 +shift +goto setArgs +:doneSetArgs + +call "%EXECUTABLE%" stop %CMD_LINE_ARGS% + +:end diff --git a/app/opt/tomcat9/bin/shutdown.sh b/app/opt/tomcat9/bin/shutdown.sh new file mode 100755 index 0000000..cd0c97d --- /dev/null +++ b/app/opt/tomcat9/bin/shutdown.sh @@ -0,0 +1,60 @@ +#!/bin/sh + +# Licensed to the Apache Software Foundation (ASF) under one or more +# contributor license agreements. See the NOTICE file distributed with +# this work for additional information regarding copyright ownership. +# The ASF licenses this file to You under the Apache License, Version 2.0 +# (the "License"); you may not use this file except in compliance with +# the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +# ----------------------------------------------------------------------------- +# Stop script for the CATALINA Server +# ----------------------------------------------------------------------------- + +# Better OS/400 detection: see Bugzilla 31132 +os400=false +case "`uname`" in +OS400*) os400=true;; +esac + +# resolve links - $0 may be a softlink +PRG="$0" + +while [ -h "$PRG" ] ; do + ls=`ls -ld "$PRG"` + link=`expr "$ls" : '.*-> \(.*\)$'` + if expr "$link" : '/.*' > /dev/null; then + PRG="$link" + else + PRG=`dirname "$PRG"`/"$link" + fi +done + +PRGDIR=`dirname "$PRG"` +EXECUTABLE=catalina.sh + +# Check that target executable exists +if $os400; then + # -x will Only work on the os400 if the files are: + # 1. owned by the user + # 2. owned by the PRIMARY group of the user + # this will not work if the user belongs in secondary groups + eval +else + if [ ! -x "$PRGDIR"/"$EXECUTABLE" ]; then + echo "Cannot find $PRGDIR/$EXECUTABLE" + echo "The file is absent or does not have execute permission" + echo "This file is needed to run this program" + exit 1 + fi +fi + +exec "$PRGDIR"/"$EXECUTABLE" stop "$@" diff --git a/app/opt/tomcat9/bin/startup.bat b/app/opt/tomcat9/bin/startup.bat new file mode 100644 index 0000000..e9f46b8 --- /dev/null +++ b/app/opt/tomcat9/bin/startup.bat @@ -0,0 +1,58 @@ +@echo off +rem Licensed to the Apache Software Foundation (ASF) under one or more +rem contributor license agreements. See the NOTICE file distributed with +rem this work for additional information regarding copyright ownership. +rem The ASF licenses this file to You under the Apache License, Version 2.0 +rem (the "License"); you may not use this file except in compliance with +rem the License. You may obtain a copy of the License at +rem +rem http://www.apache.org/licenses/LICENSE-2.0 +rem +rem Unless required by applicable law or agreed to in writing, software +rem distributed under the License is distributed on an "AS IS" BASIS, +rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +rem See the License for the specific language governing permissions and +rem limitations under the License. + +rem --------------------------------------------------------------------------- +rem Start script for the CATALINA Server +rem --------------------------------------------------------------------------- + +setlocal + +rem Guess CATALINA_HOME if not defined +set "CURRENT_DIR=%cd%" +if not "%CATALINA_HOME%" == "" goto gotHome +set "CATALINA_HOME=%CURRENT_DIR%" +if exist "%CATALINA_HOME%\bin\catalina.bat" goto okHome +cd .. +set "CATALINA_HOME=%cd%" +cd "%CURRENT_DIR%" +:gotHome +if exist "%CATALINA_HOME%\bin\catalina.bat" goto okHome +echo The CATALINA_HOME environment variable is not defined correctly +echo This environment variable is needed to run this program +goto end +:okHome + +set "EXECUTABLE=%CATALINA_HOME%\bin\catalina.bat" + +rem Check that target executable exists +if exist "%EXECUTABLE%" goto okExec +echo Cannot find "%EXECUTABLE%" +echo This file is needed to run this program +goto end +:okExec + +rem Get remaining unshifted command line arguments and save them in the +set CMD_LINE_ARGS= +:setArgs +if ""%1""=="""" goto doneSetArgs +set CMD_LINE_ARGS=%CMD_LINE_ARGS% %1 +shift +goto setArgs +:doneSetArgs + +call "%EXECUTABLE%" start %CMD_LINE_ARGS% + +:end diff --git a/app/opt/tomcat9/bin/startup.sh b/app/opt/tomcat9/bin/startup.sh new file mode 100755 index 0000000..7b10287 --- /dev/null +++ b/app/opt/tomcat9/bin/startup.sh @@ -0,0 +1,60 @@ +#!/bin/sh + +# Licensed to the Apache Software Foundation (ASF) under one or more +# contributor license agreements. See the NOTICE file distributed with +# this work for additional information regarding copyright ownership. +# The ASF licenses this file to You under the Apache License, Version 2.0 +# (the "License"); you may not use this file except in compliance with +# the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +# ----------------------------------------------------------------------------- +# Start Script for the CATALINA Server +# ----------------------------------------------------------------------------- + +# Better OS/400 detection: see Bugzilla 31132 +os400=false +case "`uname`" in +OS400*) os400=true;; +esac + +# resolve links - $0 may be a softlink +PRG="$0" + +while [ -h "$PRG" ] ; do + ls=`ls -ld "$PRG"` + link=`expr "$ls" : '.*-> \(.*\)$'` + if expr "$link" : '/.*' > /dev/null; then + PRG="$link" + else + PRG=`dirname "$PRG"`/"$link" + fi +done + +PRGDIR=`dirname "$PRG"` +EXECUTABLE=catalina.sh + +# Check that target executable exists +if $os400; then + # -x will Only work on the os400 if the files are: + # 1. owned by the user + # 2. owned by the PRIMARY group of the user + # this will not work if the user belongs in secondary groups + eval +else + if [ ! -x "$PRGDIR"/"$EXECUTABLE" ]; then + echo "Cannot find $PRGDIR/$EXECUTABLE" + echo "The file is absent or does not have execute permission" + echo "This file is needed to run this program" + exit 1 + fi +fi + +exec "$PRGDIR"/"$EXECUTABLE" start "$@" diff --git a/app/opt/tomcat9/bin/tomcat-juli.jar b/app/opt/tomcat9/bin/tomcat-juli.jar new file mode 100644 index 0000000..cf6d189 Binary files /dev/null and b/app/opt/tomcat9/bin/tomcat-juli.jar differ diff --git a/app/opt/tomcat9/bin/tomcat-native.tar.gz b/app/opt/tomcat9/bin/tomcat-native.tar.gz new file mode 100644 index 0000000..6dc45f3 Binary files /dev/null and b/app/opt/tomcat9/bin/tomcat-native.tar.gz differ diff --git a/app/opt/tomcat9/bin/tool-wrapper.bat b/app/opt/tomcat9/bin/tool-wrapper.bat new file mode 100644 index 0000000..1bf292a --- /dev/null +++ b/app/opt/tomcat9/bin/tool-wrapper.bat @@ -0,0 +1,110 @@ +@echo off +rem Licensed to the Apache Software Foundation (ASF) under one or more +rem contributor license agreements. See the NOTICE file distributed with +rem this work for additional information regarding copyright ownership. +rem The ASF licenses this file to You under the Apache License, Version 2.0 +rem (the "License"); you may not use this file except in compliance with +rem the License. You may obtain a copy of the License at +rem +rem http://www.apache.org/licenses/LICENSE-2.0 +rem +rem Unless required by applicable law or agreed to in writing, software +rem distributed under the License is distributed on an "AS IS" BASIS, +rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +rem See the License for the specific language governing permissions and +rem limitations under the License. + +rem --------------------------------------------------------------------------- +rem Wrapper script for command line tools +rem +rem Environment Variable Prerequisites +rem +rem CATALINA_HOME May point at your Catalina "build" directory. +rem +rem TOOL_OPTS (Optional) Java runtime options. +rem +rem JAVA_HOME Must point at your Java Development Kit installation. +rem Using JRE_HOME instead works as well. +rem +rem JRE_HOME Must point at your Java Runtime installation. +rem Defaults to JAVA_HOME if empty. If JRE_HOME and JAVA_HOME +rem are both set, JRE_HOME is used. +rem +rem JAVA_OPTS (Optional) Java runtime options. +rem +rem JAVA_ENDORSED_DIRS (Optional) Lists of of semi-colon separated directories +rem containing some jars in order to allow replacement of APIs +rem created outside of the JCP (i.e. DOM and SAX from W3C). +rem It can also be used to update the XML parser implementation. +rem This is only supported for Java <= 8. +rem Defaults to $CATALINA_HOME/endorsed. +rem --------------------------------------------------------------------------- + +setlocal + +rem Guess CATALINA_HOME if not defined +set "CURRENT_DIR=%cd%" +if not "%CATALINA_HOME%" == "" goto gotHome +set "CATALINA_HOME=%CURRENT_DIR%" +if exist "%CATALINA_HOME%\bin\tool-wrapper.bat" goto okHome +cd .. +set "CATALINA_HOME=%cd%" +cd "%CURRENT_DIR%" +:gotHome +if exist "%CATALINA_HOME%\bin\tool-wrapper.bat" goto okHome +echo The CATALINA_HOME environment variable is not defined correctly +echo This environment variable is needed to run this program +goto end +:okHome + +rem Ensure that any user defined CLASSPATH variables are not used on startup, +rem but allow them to be specified in setenv.bat, in rare case when it is needed. +set CLASSPATH= + +rem Get standard environment variables +if exist "%CATALINA_HOME%\bin\setenv.bat" call "%CATALINA_HOME%\bin\setenv.bat" + +rem Get standard Java environment variables +if exist "%CATALINA_HOME%\bin\setclasspath.bat" goto okSetclasspath +echo Cannot find "%CATALINA_HOME%\bin\setclasspath.bat" +echo This file is needed to run this program +goto end +:okSetclasspath +call "%CATALINA_HOME%\bin\setclasspath.bat" %1 +if errorlevel 1 goto end + +rem Add on extra jar files to CLASSPATH +rem Note that there are no quotes as we do not want to introduce random +rem quotes into the CLASSPATH +if "%CLASSPATH%" == "" goto emptyClasspath +set "CLASSPATH=%CLASSPATH%;" +:emptyClasspath +set "CLASSPATH=%CLASSPATH%%CATALINA_HOME%\bin\bootstrap.jar;%CATALINA_HOME%\bin\tomcat-juli.jar;%CATALINA_HOME%\lib\servlet-api.jar;%CATALINA_HOME%\lib\tomcat-util.jar" + +set JAVA_OPTS=%JAVA_OPTS% -Djava.util.logging.manager=org.apache.juli.ClassLoaderLogManager + +rem Java 9 no longer supports the java.endorsed.dirs +rem system property. Only try to use it if +rem JAVA_ENDORSED_DIRS was explicitly set +rem or CATALINA_HOME/endorsed exists. +set ENDORSED_PROP=ignore.endorsed.dirs +if "%JAVA_ENDORSED_DIRS%" == "" goto noEndorsedVar +set ENDORSED_PROP=java.endorsed.dirs +goto doneEndorsed +:noEndorsedVar +if not exist "%CATALINA_HOME%\endorsed" goto doneEndorsed +set ENDORSED_PROP=java.endorsed.dirs +:doneEndorsed + +rem Get remaining unshifted command line arguments and save them in the +set CMD_LINE_ARGS= +:setArgs +if ""%1""=="""" goto doneSetArgs +set CMD_LINE_ARGS=%CMD_LINE_ARGS% %1 +shift +goto setArgs +:doneSetArgs + +"%_RUNJAVA%" %JAVA_OPTS% %TOOL_OPTS% -D%ENDORSED_PROP%="%JAVA_ENDORSED_DIRS%" -classpath "%CLASSPATH%" -Dcatalina.home="%CATALINA_HOME%" org.apache.catalina.startup.Tool %CMD_LINE_ARGS% + +:end diff --git a/app/opt/tomcat9/bin/tool-wrapper.sh b/app/opt/tomcat9/bin/tool-wrapper.sh new file mode 100755 index 0000000..863ca49 --- /dev/null +++ b/app/opt/tomcat9/bin/tool-wrapper.sh @@ -0,0 +1,153 @@ +#!/bin/sh + +# Licensed to the Apache Software Foundation (ASF) under one or more +# contributor license agreements. See the NOTICE file distributed with +# this work for additional information regarding copyright ownership. +# The ASF licenses this file to You under the Apache License, Version 2.0 +# (the "License"); you may not use this file except in compliance with +# the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +# ----------------------------------------------------------------------------- +# Wrapper script for command line tools +# +# Environment Variable Prerequisites +# +# CATALINA_HOME May point at your Catalina "build" directory. +# +# TOOL_OPTS (Optional) Java runtime options. +# +# JAVA_HOME Must point at your Java Development Kit installation. +# Using JRE_HOME instead works as well. +# +# JRE_HOME Must point at your Java Runtime installation. +# Defaults to JAVA_HOME if empty. If JRE_HOME and JAVA_HOME +# are both set, JRE_HOME is used. +# +# JAVA_OPTS (Optional) Java runtime options. +# +# JAVA_ENDORSED_DIRS (Optional) Lists of of colon separated directories +# containing some jars in order to allow replacement of APIs +# created outside of the JCP (i.e. DOM and SAX from W3C). +# It can also be used to update the XML parser implementation. +# This is only supported for Java <= 8. +# Defaults to $CATALINA_HOME/endorsed. +# ----------------------------------------------------------------------------- + +# OS specific support. $var _must_ be set to either true or false. +cygwin=false +darwin=false +os400=false +case "`uname`" in +CYGWIN*) cygwin=true;; +Darwin*) darwin=true;; +OS400*) os400=true;; +esac + +# resolve links - $0 may be a softlink +PRG="$0" + +while [ -h "$PRG" ]; do + ls=`ls -ld "$PRG"` + link=`expr "$ls" : '.*-> \(.*\)$'` + if expr "$link" : '/.*' > /dev/null; then + PRG="$link" + else + PRG=`dirname "$PRG"`/"$link" + fi +done + +# Get standard environment variables +PRGDIR=`dirname "$PRG"` + +# Only set CATALINA_HOME if not already set +[ -z "$CATALINA_HOME" ] && CATALINA_HOME=`cd "$PRGDIR/.." >/dev/null; pwd` + +# Ensure that any user defined CLASSPATH variables are not used on startup, +# but allow them to be specified in setenv.sh, in rare case when it is needed. +CLASSPATH= + +if [ -r "$CATALINA_HOME/bin/setenv.sh" ]; then + . "$CATALINA_HOME/bin/setenv.sh" +fi + +# For Cygwin, ensure paths are in UNIX format before anything is touched +if $cygwin; then + [ -n "$JAVA_HOME" ] && JAVA_HOME=`cygpath --unix "$JAVA_HOME"` + [ -n "$JRE_HOME" ] && JRE_HOME=`cygpath --unix "$JRE_HOME"` + [ -n "$CATALINA_HOME" ] && CATALINA_HOME=`cygpath --unix "$CATALINA_HOME"` + [ -n "$CLASSPATH" ] && CLASSPATH=`cygpath --path --unix "$CLASSPATH"` +fi + +# For OS400 +if $os400; then + # Set job priority to standard for interactive (interactive - 6) by using + # the interactive priority - 6, the helper threads that respond to requests + # will be running at the same priority as interactive jobs. + COMMAND='chgjob job('$JOBNAME') runpty(6)' + system $COMMAND + + # Enable multi threading + export QIBM_MULTI_THREADED=Y +fi + +# Get standard Java environment variables +if $os400; then + # -r will Only work on the os400 if the files are: + # 1. owned by the user + # 2. owned by the PRIMARY group of the user + # this will not work if the user belongs in secondary groups + . "$CATALINA_HOME"/bin/setclasspath.sh +else + if [ -r "$CATALINA_HOME"/bin/setclasspath.sh ]; then + . "$CATALINA_HOME"/bin/setclasspath.sh + else + echo "Cannot find $CATALINA_HOME/bin/setclasspath.sh" + echo "This file is needed to run this program" + exit 1 + fi +fi + +# Add on extra jar files to CLASSPATH +if [ ! -z "$CLASSPATH" ] ; then + CLASSPATH="$CLASSPATH": +fi +CLASSPATH="$CLASSPATH""$CATALINA_HOME"/bin/bootstrap.jar:"$CATALINA_HOME"/bin/tomcat-juli.jar:"$CATALINA_HOME"/lib/servlet-api.jar:"$CATALINA_HOME"/lib/tomcat-util.jar + +# For Cygwin, switch paths to Windows format before running java +if $cygwin; then + JAVA_HOME=`cygpath --absolute --windows "$JAVA_HOME"` + JRE_HOME=`cygpath --absolute --windows "$JRE_HOME"` + CATALINA_HOME=`cygpath --absolute --windows "$CATALINA_HOME"` + CLASSPATH=`cygpath --path --windows "$CLASSPATH"` + [ -n "$JAVA_ENDORSED_DIRS" ] && JAVA_ENDORSED_DIRS=`cygpath --path --windows "$JAVA_ENDORSED_DIRS"` +fi + +# Java 9 no longer supports the java.endorsed.dirs +# system property. Only try to use it if +# JAVA_ENDORSED_DIRS was explicitly set +# or CATALINA_HOME/endorsed exists. +ENDORSED_PROP=ignore.endorsed.dirs +if [ -n "$JAVA_ENDORSED_DIRS" ]; then + ENDORSED_PROP=java.endorsed.dirs +fi +if [ -d "$CATALINA_HOME/endorsed" ]; then + ENDORSED_PROP=java.endorsed.dirs +fi + +JAVA_OPTS="$JAVA_OPTS -Djava.util.logging.manager=org.apache.juli.ClassLoaderLogManager" + +# ----- Execute The Requested Command ----------------------------------------- + +eval exec "\"$_RUNJAVA\"" "$JAVA_OPTS" "$TOOL_OPTS" \ + -D$ENDORSED_PROP="\"$JAVA_ENDORSED_DIRS\"" \ + -classpath "\"$CLASSPATH\"" \ + -Dcatalina.home="\"$CATALINA_HOME\"" \ + org.apache.catalina.startup.Tool "$@" diff --git a/app/opt/tomcat9/bin/version.bat b/app/opt/tomcat9/bin/version.bat new file mode 100644 index 0000000..d294f76 --- /dev/null +++ b/app/opt/tomcat9/bin/version.bat @@ -0,0 +1,58 @@ +@echo off +rem Licensed to the Apache Software Foundation (ASF) under one or more +rem contributor license agreements. See the NOTICE file distributed with +rem this work for additional information regarding copyright ownership. +rem The ASF licenses this file to You under the Apache License, Version 2.0 +rem (the "License"); you may not use this file except in compliance with +rem the License. You may obtain a copy of the License at +rem +rem http://www.apache.org/licenses/LICENSE-2.0 +rem +rem Unless required by applicable law or agreed to in writing, software +rem distributed under the License is distributed on an "AS IS" BASIS, +rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +rem See the License for the specific language governing permissions and +rem limitations under the License. + +rem --------------------------------------------------------------------------- +rem Version script for the CATALINA Server +rem --------------------------------------------------------------------------- + +setlocal + +rem Guess CATALINA_HOME if not defined +set "CURRENT_DIR=%cd%" +if not "%CATALINA_HOME%" == "" goto gotHome +set "CATALINA_HOME=%CURRENT_DIR%" +if exist "%CATALINA_HOME%\bin\catalina.bat" goto okHome +cd .. +set "CATALINA_HOME=%cd%" +cd "%CURRENT_DIR%" +:gotHome +if exist "%CATALINA_HOME%\bin\catalina.bat" goto okHome +echo The CATALINA_HOME environment variable is not defined correctly +echo This environment variable is needed to run this program +goto end +:okHome + +set "EXECUTABLE=%CATALINA_HOME%\bin\catalina.bat" + +rem Check that target executable exists +if exist "%EXECUTABLE%" goto okExec +echo Cannot find "%EXECUTABLE%" +echo This file is needed to run this program +goto end +:okExec + +rem Get remaining unshifted command line arguments and save them in the +set CMD_LINE_ARGS= +:setArgs +if ""%1""=="""" goto doneSetArgs +set CMD_LINE_ARGS=%CMD_LINE_ARGS% %1 +shift +goto setArgs +:doneSetArgs + +call "%EXECUTABLE%" version %CMD_LINE_ARGS% + +:end diff --git a/app/opt/tomcat9/bin/version.sh b/app/opt/tomcat9/bin/version.sh new file mode 100755 index 0000000..1cb19bd --- /dev/null +++ b/app/opt/tomcat9/bin/version.sh @@ -0,0 +1,60 @@ +#!/bin/sh + +# Licensed to the Apache Software Foundation (ASF) under one or more +# contributor license agreements. See the NOTICE file distributed with +# this work for additional information regarding copyright ownership. +# The ASF licenses this file to You under the Apache License, Version 2.0 +# (the "License"); you may not use this file except in compliance with +# the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +# ----------------------------------------------------------------------------- +# Version Script for the CATALINA Server +# ----------------------------------------------------------------------------- + +# Better OS/400 detection: see Bugzilla 31132 +os400=false +case "`uname`" in +OS400*) os400=true;; +esac + +# resolve links - $0 may be a softlink +PRG="$0" + +while [ -h "$PRG" ] ; do + ls=`ls -ld "$PRG"` + link=`expr "$ls" : '.*-> \(.*\)$'` + if expr "$link" : '/.*' > /dev/null; then + PRG="$link" + else + PRG=`dirname "$PRG"`/"$link" + fi +done + +PRGDIR=`dirname "$PRG"` +EXECUTABLE=catalina.sh + +# Check that target executable exists +if $os400; then + # -x will Only work on the os400 if the files are: + # 1. owned by the user + # 2. owned by the PRIMARY group of the user + # this will not work if the user belongs in secondary groups + eval +else + if [ ! -x "$PRGDIR"/"$EXECUTABLE" ]; then + echo "Cannot find $PRGDIR/$EXECUTABLE" + echo "The file is absent or does not have execute permission" + echo "This file is needed to run this program" + exit 1 + fi +fi + +exec "$PRGDIR"/"$EXECUTABLE" version "$@" diff --git a/app/opt/tomcat9/conf/catalina.policy b/app/opt/tomcat9/conf/catalina.policy new file mode 100644 index 0000000..7aab95d --- /dev/null +++ b/app/opt/tomcat9/conf/catalina.policy @@ -0,0 +1,264 @@ +// Licensed to the Apache Software Foundation (ASF) under one or more +// contributor license agreements. See the NOTICE file distributed with +// this work for additional information regarding copyright ownership. +// The ASF licenses this file to You under the Apache License, Version 2.0 +// (the "License"); you may not use this file except in compliance with +// the License. You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +// ============================================================================ +// catalina.policy - Security Policy Permissions for Tomcat +// +// This file contains a default set of security policies to be enforced (by the +// JVM) when Catalina is executed with the "-security" option. In addition +// to the permissions granted here, the following additional permissions are +// granted to each web application: +// +// * Read access to the web application's document root directory +// * Read, write and delete access to the web application's working directory +// ============================================================================ + + +// ========== SYSTEM CODE PERMISSIONS ========================================= + + +// These permissions apply to javac +grant codeBase "file:${java.home}/lib/-" { + permission java.security.AllPermission; +}; + +// These permissions apply to all shared system extensions +grant codeBase "file:${java.home}/jre/lib/ext/-" { + permission java.security.AllPermission; +}; + +// These permissions apply to javac when ${java.home} points at $JAVA_HOME/jre +grant codeBase "file:${java.home}/../lib/-" { + permission java.security.AllPermission; +}; + +// These permissions apply to all shared system extensions when +// ${java.home} points at $JAVA_HOME/jre +grant codeBase "file:${java.home}/lib/ext/-" { + permission java.security.AllPermission; +}; + +// This permission is required when using javac to compile JSPs on Java 9 +// onwards +//grant codeBase "jrt:/jdk.compiler" { +// permission java.security.AllPermission; +//}; + + +// ========== CATALINA CODE PERMISSIONS ======================================= + +// These permissions apply to the daemon code +grant codeBase "file:${catalina.home}/bin/commons-daemon.jar" { + permission java.security.AllPermission; +}; + +// These permissions apply to the logging API +// Note: If tomcat-juli.jar is in ${catalina.base} and not in ${catalina.home}, +// update this section accordingly. +// grant codeBase "file:${catalina.base}/bin/tomcat-juli.jar" {..} +grant codeBase "file:${catalina.home}/bin/tomcat-juli.jar" { + permission java.io.FilePermission + "${java.home}${file.separator}lib${file.separator}logging.properties", "read"; + + permission java.io.FilePermission + "${catalina.base}${file.separator}conf${file.separator}logging.properties", "read"; + permission java.io.FilePermission + "${catalina.base}${file.separator}logs", "read, write"; + permission java.io.FilePermission + "${catalina.base}${file.separator}logs${file.separator}*", "read, write, delete"; + + permission java.lang.RuntimePermission "shutdownHooks"; + permission java.lang.RuntimePermission "getClassLoader"; + permission java.lang.RuntimePermission "setContextClassLoader"; + + permission java.lang.management.ManagementPermission "monitor"; + + permission java.util.logging.LoggingPermission "control"; + + permission java.util.PropertyPermission "java.util.logging.config.class", "read"; + permission java.util.PropertyPermission "java.util.logging.config.file", "read"; + permission java.util.PropertyPermission "org.apache.juli.AsyncMaxRecordCount", "read"; + permission java.util.PropertyPermission "org.apache.juli.AsyncOverflowDropType", "read"; + permission java.util.PropertyPermission "org.apache.juli.ClassLoaderLogManager.debug", "read"; + permission java.util.PropertyPermission "catalina.base", "read"; + + // Note: To enable per context logging configuration, permit read access to + // the appropriate file. Be sure that the logging configuration is + // secure before enabling such access. + // E.g. for the examples web application (uncomment and unwrap + // the following to be on a single line): + // permission java.io.FilePermission "${catalina.base}${file.separator} + // webapps${file.separator}examples${file.separator}WEB-INF + // ${file.separator}classes${file.separator}logging.properties", "read"; +}; + +// These permissions apply to the server startup code +grant codeBase "file:${catalina.home}/bin/bootstrap.jar" { + permission java.security.AllPermission; +}; + +// These permissions apply to the servlet API classes +// and those that are shared across all class loaders +// located in the "lib" directory +grant codeBase "file:${catalina.home}/lib/-" { + permission java.security.AllPermission; +}; + + +// If using a per instance lib directory, i.e. ${catalina.base}/lib, +// then the following permission will need to be uncommented +// grant codeBase "file:${catalina.base}/lib/-" { +// permission java.security.AllPermission; +// }; + + +// ========== WEB APPLICATION PERMISSIONS ===================================== + + +// These permissions are granted by default to all web applications +// In addition, a web application will be given a read FilePermission +// for all files and directories in its document root. +grant { + // Required for JNDI lookup of named JDBC DataSource's and + // javamail named MimePart DataSource used to send mail + permission java.util.PropertyPermission "java.home", "read"; + permission java.util.PropertyPermission "java.naming.*", "read"; + permission java.util.PropertyPermission "javax.sql.*", "read"; + + // OS Specific properties to allow read access + permission java.util.PropertyPermission "os.name", "read"; + permission java.util.PropertyPermission "os.version", "read"; + permission java.util.PropertyPermission "os.arch", "read"; + permission java.util.PropertyPermission "file.separator", "read"; + permission java.util.PropertyPermission "path.separator", "read"; + permission java.util.PropertyPermission "line.separator", "read"; + + // JVM properties to allow read access + permission java.util.PropertyPermission "java.version", "read"; + permission java.util.PropertyPermission "java.vendor", "read"; + permission java.util.PropertyPermission "java.vendor.url", "read"; + permission java.util.PropertyPermission "java.class.version", "read"; + permission java.util.PropertyPermission "java.specification.version", "read"; + permission java.util.PropertyPermission "java.specification.vendor", "read"; + permission java.util.PropertyPermission "java.specification.name", "read"; + + permission java.util.PropertyPermission "java.vm.specification.version", "read"; + permission java.util.PropertyPermission "java.vm.specification.vendor", "read"; + permission java.util.PropertyPermission "java.vm.specification.name", "read"; + permission java.util.PropertyPermission "java.vm.version", "read"; + permission java.util.PropertyPermission "java.vm.vendor", "read"; + permission java.util.PropertyPermission "java.vm.name", "read"; + + // Required for OpenJMX + permission java.lang.RuntimePermission "getAttribute"; + + // Allow read of JAXP compliant XML parser debug + permission java.util.PropertyPermission "jaxp.debug", "read"; + + // All JSPs need to be able to read this package + permission java.lang.RuntimePermission "accessClassInPackage.org.apache.tomcat"; + + // Precompiled JSPs need access to these packages. + permission java.lang.RuntimePermission "accessClassInPackage.org.apache.jasper.el"; + permission java.lang.RuntimePermission "accessClassInPackage.org.apache.jasper.runtime"; + permission java.lang.RuntimePermission + "accessClassInPackage.org.apache.jasper.runtime.*"; + + // Applications using WebSocket need to be able to access these packages + permission java.lang.RuntimePermission "accessClassInPackage.org.apache.tomcat.websocket"; + permission java.lang.RuntimePermission "accessClassInPackage.org.apache.tomcat.websocket.server"; +}; + + +// The Manager application needs access to the following packages to support the +// session display functionality. It also requires the custom Tomcat +// DeployXmlPermission to enable the use of META-INF/context.xml +// These settings support the following configurations: +// - default CATALINA_HOME == CATALINA_BASE +// - CATALINA_HOME != CATALINA_BASE, per instance Manager in CATALINA_BASE +// - CATALINA_HOME != CATALINA_BASE, shared Manager in CATALINA_HOME +grant codeBase "file:${catalina.base}/webapps/manager/-" { + permission java.lang.RuntimePermission "accessClassInPackage.org.apache.catalina"; + permission java.lang.RuntimePermission "accessClassInPackage.org.apache.catalina.ha.session"; + permission java.lang.RuntimePermission "accessClassInPackage.org.apache.catalina.manager"; + permission java.lang.RuntimePermission "accessClassInPackage.org.apache.catalina.manager.util"; + permission java.lang.RuntimePermission "accessClassInPackage.org.apache.catalina.util"; + permission org.apache.catalina.security.DeployXmlPermission "manager"; +}; +grant codeBase "file:${catalina.home}/webapps/manager/-" { + permission java.lang.RuntimePermission "accessClassInPackage.org.apache.catalina"; + permission java.lang.RuntimePermission "accessClassInPackage.org.apache.catalina.ha.session"; + permission java.lang.RuntimePermission "accessClassInPackage.org.apache.catalina.manager"; + permission java.lang.RuntimePermission "accessClassInPackage.org.apache.catalina.manager.util"; + permission java.lang.RuntimePermission "accessClassInPackage.org.apache.catalina.util"; + permission org.apache.catalina.security.DeployXmlPermission "manager"; +}; + +// The Host Manager application needs the custom Tomcat DeployXmlPermission to +// enable the use of META-INF/context.xml +// These settings support the following configurations: +// - default CATALINA_HOME == CATALINA_BASE +// - CATALINA_HOME != CATALINA_BASE, per instance Host Manager in CATALINA_BASE +// - CATALINA_HOME != CATALINA_BASE, shared Host Manager in CATALINA_HOME +grant codeBase "file:${catalina.base}/webapps/host-manager/-" { + permission org.apache.catalina.security.DeployXmlPermission "host-manager"; +}; +grant codeBase "file:${catalina.home}/webapps/host-manager/-" { + permission org.apache.catalina.security.DeployXmlPermission "host-manager"; +}; + + +// You can assign additional permissions to particular web applications by +// adding additional "grant" entries here, based on the code base for that +// application, /WEB-INF/classes/, or /WEB-INF/lib/ jar files. +// +// Different permissions can be granted to JSP pages, classes loaded from +// the /WEB-INF/classes/ directory, all jar files in the /WEB-INF/lib/ +// directory, or even to individual jar files in the /WEB-INF/lib/ directory. +// +// For instance, assume that the standard "examples" application +// included a JDBC driver that needed to establish a network connection to the +// corresponding database and used the scrape taglib to get the weather from +// the NOAA web server. You might create a "grant" entries like this: +// +// The permissions granted to the context root directory apply to JSP pages. +// grant codeBase "file:${catalina.base}/webapps/examples/-" { +// permission java.net.SocketPermission "dbhost.mycompany.com:5432", "connect"; +// permission java.net.SocketPermission "*.noaa.gov:80", "connect"; +// }; +// +// The permissions granted to the context WEB-INF/classes directory +// grant codeBase "file:${catalina.base}/webapps/examples/WEB-INF/classes/-" { +// }; +// +// The permission granted to your JDBC driver +// grant codeBase "jar:file:${catalina.base}/webapps/examples/WEB-INF/lib/driver.jar!/-" { +// permission java.net.SocketPermission "dbhost.mycompany.com:5432", "connect"; +// }; +// The permission granted to the scrape taglib +// grant codeBase "jar:file:${catalina.base}/webapps/examples/WEB-INF/lib/scrape.jar!/-" { +// permission java.net.SocketPermission "*.noaa.gov:80", "connect"; +// }; + +// To grant permissions for web applications using packed WAR files, use the +// Tomcat specific WAR url scheme. +// +// The permissions granted to the entire web application +// grant codeBase "war:file:${catalina.base}/webapps/examples.war*/-" { +// }; +// +// The permissions granted to a specific JAR +// grant codeBase "war:file:${catalina.base}/webapps/examples.war*/WEB-INF/lib/foo.jar" { +// }; \ No newline at end of file diff --git a/app/opt/tomcat9/conf/catalina.properties b/app/opt/tomcat9/conf/catalina.properties new file mode 100644 index 0000000..c094c32 --- /dev/null +++ b/app/opt/tomcat9/conf/catalina.properties @@ -0,0 +1,220 @@ +# Licensed to the Apache Software Foundation (ASF) under one or more +# contributor license agreements. See the NOTICE file distributed with +# this work for additional information regarding copyright ownership. +# The ASF licenses this file to You under the Apache License, Version 2.0 +# (the "License"); you may not use this file except in compliance with +# the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# 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" +# classloader. Prefixes should be used to define what is the repository type. +# Path may be relative to the CATALINA_HOME or CATALINA_BASE path or absolute. +# If left as blank,the JVM system loader will be used as Catalina's "common" +# loader. +# Examples: +# "foo": Add this folder as a class repository +# "foo/*.jar": Add all the JARs of the specified folder as class +# repositories +# "foo/bar.jar": Add bar.jar as a class repository +# +# Note: Values are enclosed in double quotes ("...") in case either the +# ${catalina.base} path or the ${catalina.home} path contains a comma. +# Because double quotes are used for quoting, the double quote character +# may not appear in a path. +common.loader="${catalina.base}/lib","${catalina.base}/lib/*.jar","${catalina.home}/lib","${catalina.home}/lib/*.jar" + +# +# List of comma-separated paths defining the contents of the "server" +# classloader. Prefixes should be used to define what is the repository type. +# Path may be relative to the CATALINA_HOME or CATALINA_BASE path or absolute. +# If left as blank, the "common" loader will be used as Catalina's "server" +# loader. +# Examples: +# "foo": Add this folder as a class repository +# "foo/*.jar": Add all the JARs of the specified folder as class +# repositories +# "foo/bar.jar": Add bar.jar as a class repository +# +# Note: Values may be enclosed in double quotes ("...") in case either the +# ${catalina.base} path or the ${catalina.home} path contains a comma. +# Because double quotes are used for quoting, the double quote character +# may not appear in a path. +server.loader= + +# +# List of comma-separated paths defining the contents of the "shared" +# classloader. Prefixes should be used to define what is the repository type. +# Path may be relative to the CATALINA_BASE path or absolute. If left as blank, +# the "common" loader will be used as Catalina's "shared" loader. +# Examples: +# "foo": Add this folder as a class repository +# "foo/*.jar": Add all the JARs of the specified folder as class +# repositories +# "foo/bar.jar": Add bar.jar as a class repository +# Please note that for single jars, e.g. bar.jar, you need the URL form +# starting with file:. +# +# Note: Values may be enclosed in double quotes ("...") in case either the +# ${catalina.base} path or the ${catalina.home} path contains a comma. +# Because double quotes are used for quoting, the double quote character +# may not appear in a path. +shared.loader= + +# Default list of JAR files that should not be scanned using the JarScanner +# functionality. This is typically used to scan JARs for configuration +# information. JARs that do not contain such information may be excluded from +# the scan to speed up the scanning process. This is the default list. JARs on +# this list are excluded from all scans. The list must be a comma separated list +# of JAR file names. +# The list of JARs to skip may be over-ridden at a Context level for individual +# scan types by configuring a JarScanner with a nested JarScanFilter. +# The JARs listed below include: +# - Tomcat Bootstrap JARs +# - Tomcat API JARs +# - Catalina JARs +# - Jasper JARs +# - Tomcat JARs +# - Common non-Tomcat JARs +# - Test JARs (JUnit, Cobertura and dependencies) +tomcat.util.scan.StandardJarScanFilter.jarsToSkip=\ +annotations-api.jar,\ +ant-junit*.jar,\ +ant-launcher*.jar,\ +ant*.jar,\ +asm-*.jar,\ +aspectj*.jar,\ +bcel*.jar,\ +biz.aQute.bnd*.jar,\ +bootstrap.jar,\ +catalina-ant.jar,\ +catalina-ha.jar,\ +catalina-ssi.jar,\ +catalina-storeconfig.jar,\ +catalina-tribes.jar,\ +catalina.jar,\ +cglib-*.jar,\ +cobertura-*.jar,\ +commons-beanutils*.jar,\ +commons-codec*.jar,\ +commons-collections*.jar,\ +commons-compress*.jar,\ +commons-daemon.jar,\ +commons-dbcp*.jar,\ +commons-digester*.jar,\ +commons-fileupload*.jar,\ +commons-httpclient*.jar,\ +commons-io*.jar,\ +commons-lang*.jar,\ +commons-logging*.jar,\ +commons-math*.jar,\ +commons-pool*.jar,\ +derby-*.jar,\ +dom4j-*.jar,\ +easymock-*.jar,\ +ecj-*.jar,\ +el-api.jar,\ +geronimo-spec-jaxrpc*.jar,\ +h2*.jar,\ +ha-api-*.jar,\ +hamcrest-*.jar,\ +hibernate*.jar,\ +httpclient*.jar,\ +icu4j-*.jar,\ +jasper-el.jar,\ +jasper.jar,\ +jaspic-api.jar,\ +jaxb-*.jar,\ +jaxen-*.jar,\ +jaxws-rt-*.jar,\ +jdom-*.jar,\ +jetty-*.jar,\ +jmx-tools.jar,\ +jmx.jar,\ +jsp-api.jar,\ +jstl.jar,\ +jta*.jar,\ +junit-*.jar,\ +junit.jar,\ +log4j*.jar,\ +mail*.jar,\ +objenesis-*.jar,\ +oraclepki.jar,\ +org.hamcrest.core_*.jar,\ +org.junit_*.jar,\ +oro-*.jar,\ +servlet-api-*.jar,\ +servlet-api.jar,\ +slf4j*.jar,\ +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,\ +tomcat-jni.jar,\ +tomcat-juli-adapters.jar,\ +tomcat-juli.jar,\ +tomcat-util-scan.jar,\ +tomcat-util.jar,\ +tomcat-websocket.jar,\ +tools.jar,\ +unboundid-ldapsdk-*.jar,\ +websocket-api.jar,\ +wsdl4j*.jar,\ +xercesImpl.jar,\ +xml-apis.jar,\ +xmlParserAPIs-*.jar,\ +xmlParserAPIs.jar,\ +xom-*.jar + +# Default list of JAR files that should be scanned that overrides the default +# jarsToSkip list above. This is typically used to include a specific JAR that +# has been excluded by a broad file name pattern in the jarsToSkip list. +# The list of JARs to scan may be over-ridden at a Context level for individual +# scan types by configuring a JarScanner with a nested JarScanFilter. +tomcat.util.scan.StandardJarScanFilter.jarsToScan=\ +log4j-taglib*.jar,\ +log4j-web*.jar,\ +log4javascript*.jar,\ +slf4j-taglib*.jar + +# String cache configuration. +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 diff --git a/app/opt/tomcat9/conf/context.xml b/app/opt/tomcat9/conf/context.xml new file mode 100644 index 0000000..4f6fc0c --- /dev/null +++ b/app/opt/tomcat9/conf/context.xml @@ -0,0 +1,31 @@ + + + + + + + + WEB-INF/web.xml + WEB-INF/tomcat-web.xml + ${catalina.base}/conf/web.xml + + + + diff --git a/app/opt/tomcat9/conf/jaspic-providers.xml b/app/opt/tomcat9/conf/jaspic-providers.xml new file mode 100644 index 0000000..cdebf87 --- /dev/null +++ b/app/opt/tomcat9/conf/jaspic-providers.xml @@ -0,0 +1,23 @@ + + + + + diff --git a/app/opt/tomcat9/conf/jaspic-providers.xsd b/app/opt/tomcat9/conf/jaspic-providers.xsd new file mode 100644 index 0000000..1004a11 --- /dev/null +++ b/app/opt/tomcat9/conf/jaspic-providers.xsd @@ -0,0 +1,53 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/conf/logging.properties b/app/opt/tomcat9/conf/logging.properties similarity index 100% rename from app/conf/logging.properties rename to app/opt/tomcat9/conf/logging.properties diff --git a/app/conf/server.xml b/app/opt/tomcat9/conf/server.xml similarity index 84% rename from app/conf/server.xml rename to app/opt/tomcat9/conf/server.xml index 5edd5d2..10dabf3 100644 --- a/app/conf/server.xml +++ b/app/opt/tomcat9/conf/server.xml @@ -44,7 +44,7 @@ logSlow = "true" logFailed = "true"/> - + @@ -69,19 +69,21 @@ - + - + - + - + diff --git a/app/opt/tomcat9/conf/tomcat-users.xml b/app/opt/tomcat9/conf/tomcat-users.xml new file mode 100644 index 0000000..86b2a4a --- /dev/null +++ b/app/opt/tomcat9/conf/tomcat-users.xml @@ -0,0 +1,56 @@ + + + + + + + + diff --git a/app/opt/tomcat9/conf/tomcat-users.xsd b/app/opt/tomcat9/conf/tomcat-users.xsd new file mode 100644 index 0000000..6a3446c --- /dev/null +++ b/app/opt/tomcat9/conf/tomcat-users.xsd @@ -0,0 +1,59 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/app/opt/tomcat9/conf/web.xml b/app/opt/tomcat9/conf/web.xml new file mode 100644 index 0000000..eff1388 --- /dev/null +++ b/app/opt/tomcat9/conf/web.xml @@ -0,0 +1,4775 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + default + org.apache.catalina.servlets.DefaultServlet + + debug + 0 + + + listings + false + + 1 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + jsp + org.apache.jasper.servlet.JspServlet + + fork + false + + + xpoweredBy + false + + 3 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + default + / + + + + + jsp + *.jsp + *.jspx + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 30 + + + + + + + + + + + + + 123 + application/vnd.lotus-1-2-3 + + + 3dml + text/vnd.in3d.3dml + + + 3ds + image/x-3ds + + + 3g2 + video/3gpp2 + + + 3gp + video/3gpp + + + 7z + application/x-7z-compressed + + + aab + application/x-authorware-bin + + + aac + audio/x-aac + + + aam + application/x-authorware-map + + + aas + application/x-authorware-seg + + + abs + audio/x-mpeg + + + abw + application/x-abiword + + + ac + application/pkix-attr-cert + + + acc + application/vnd.americandynamics.acc + + + ace + application/x-ace-compressed + + + acu + application/vnd.acucobol + + + acutc + application/vnd.acucorp + + + adp + audio/adpcm + + + aep + application/vnd.audiograph + + + afm + application/x-font-type1 + + + afp + application/vnd.ibm.modcap + + + ahead + application/vnd.ahead.space + + + ai + application/postscript + + + aif + audio/x-aiff + + + aifc + audio/x-aiff + + + aiff + audio/x-aiff + + + aim + application/x-aim + + + air + application/vnd.adobe.air-application-installer-package+zip + + + ait + application/vnd.dvb.ait + + + ami + application/vnd.amiga.ami + + + anx + application/annodex + + + apk + application/vnd.android.package-archive + + + appcache + text/cache-manifest + + + application + application/x-ms-application + + + apr + application/vnd.lotus-approach + + + arc + application/x-freearc + + + art + image/x-jg + + + asc + application/pgp-signature + + + asf + video/x-ms-asf + + + asm + text/x-asm + + + aso + application/vnd.accpac.simply.aso + + + asx + video/x-ms-asf + + + atc + application/vnd.acucorp + + + atom + application/atom+xml + + + atomcat + application/atomcat+xml + + + atomsvc + application/atomsvc+xml + + + atx + application/vnd.antix.game-component + + + au + audio/basic + + + avi + video/x-msvideo + + + avif + image/avif + + + avx + video/x-rad-screenplay + + + aw + application/applixware + + + axa + audio/annodex + + + axv + video/annodex + + + azf + application/vnd.airzip.filesecure.azf + + + azs + application/vnd.airzip.filesecure.azs + + + azw + application/vnd.amazon.ebook + + + bat + application/x-msdownload + + + bcpio + application/x-bcpio + + + bdf + application/x-font-bdf + + + bdm + application/vnd.syncml.dm+wbxml + + + bed + application/vnd.realvnc.bed + + + bh2 + application/vnd.fujitsu.oasysprs + + + bin + application/octet-stream + + + blb + application/x-blorb + + + blorb + application/x-blorb + + + bmi + application/vnd.bmi + + + bmp + image/bmp + + + body + text/html + + + book + application/vnd.framemaker + + + box + application/vnd.previewsystems.box + + + boz + application/x-bzip2 + + + bpk + application/octet-stream + + + btif + image/prs.btif + + + bz + application/x-bzip + + + bz2 + application/x-bzip2 + + + c + text/x-c + + + c11amc + application/vnd.cluetrust.cartomobile-config + + + c11amz + application/vnd.cluetrust.cartomobile-config-pkg + + + c4d + application/vnd.clonk.c4group + + + c4f + application/vnd.clonk.c4group + + + c4g + application/vnd.clonk.c4group + + + c4p + application/vnd.clonk.c4group + + + c4u + application/vnd.clonk.c4group + + + cab + application/vnd.ms-cab-compressed + + + caf + audio/x-caf + + + cap + application/vnd.tcpdump.pcap + + + car + application/vnd.curl.car + + + cat + application/vnd.ms-pki.seccat + + + cb7 + application/x-cbr + + + cba + application/x-cbr + + + cbr + application/x-cbr + + + cbt + application/x-cbr + + + cbz + application/x-cbr + + + cc + text/x-c + + + cct + application/x-director + + + ccxml + application/ccxml+xml + + + cdbcmsg + application/vnd.contact.cmsg + + + cdf + application/x-cdf + + + cdkey + application/vnd.mediastation.cdkey + + + cdmia + application/cdmi-capability + + + cdmic + application/cdmi-container + + + cdmid + application/cdmi-domain + + + cdmio + application/cdmi-object + + + cdmiq + application/cdmi-queue + + + cdx + chemical/x-cdx + + + cdxml + application/vnd.chemdraw+xml + + + cdy + application/vnd.cinderella + + + cer + application/pkix-cert + + + cfs + application/x-cfs-compressed + + + cgm + image/cgm + + + chat + application/x-chat + + + chm + application/vnd.ms-htmlhelp + + + chrt + application/vnd.kde.kchart + + + cif + chemical/x-cif + + + cii + application/vnd.anser-web-certificate-issue-initiation + + + cil + application/vnd.ms-artgalry + + + cla + application/vnd.claymore + + + class + application/java + + + clkk + application/vnd.crick.clicker.keyboard + + + clkp + application/vnd.crick.clicker.palette + + + clkt + application/vnd.crick.clicker.template + + + clkw + application/vnd.crick.clicker.wordbank + + + clkx + application/vnd.crick.clicker + + + clp + application/x-msclip + + + cmc + application/vnd.cosmocaller + + + cmdf + chemical/x-cmdf + + + cml + chemical/x-cml + + + cmp + application/vnd.yellowriver-custom-menu + + + cmx + image/x-cmx + + + cod + application/vnd.rim.cod + + + com + application/x-msdownload + + + conf + text/plain + + + cpio + application/x-cpio + + + cpp + text/x-c + + + cpt + application/mac-compactpro + + + crd + application/x-mscardfile + + + crl + application/pkix-crl + + + crt + application/x-x509-ca-cert + + + cryptonote + application/vnd.rig.cryptonote + + + csh + application/x-csh + + + csml + chemical/x-csml + + + csp + application/vnd.commonspace + + + css + text/css + + + cst + application/x-director + + + csv + text/csv + + + cu + application/cu-seeme + + + curl + text/vnd.curl + + + cww + application/prs.cww + + + cxt + application/x-director + + + cxx + text/x-c + + + dae + model/vnd.collada+xml + + + daf + application/vnd.mobius.daf + + + dart + application/vnd.dart + + + dataless + application/vnd.fdsn.seed + + + davmount + application/davmount+xml + + + dbk + application/docbook+xml + + + dcr + application/x-director + + + dcurl + text/vnd.curl.dcurl + + + dd2 + application/vnd.oma.dd2+xml + + + ddd + application/vnd.fujixerox.ddd + + + deb + application/x-debian-package + + + def + text/plain + + + deploy + application/octet-stream + + + der + application/x-x509-ca-cert + + + dfac + application/vnd.dreamfactory + + + dgc + application/x-dgc-compressed + + + dib + image/bmp + + + dic + text/x-c + + + dir + application/x-director + + + dis + application/vnd.mobius.dis + + + dist + application/octet-stream + + + distz + application/octet-stream + + + djv + image/vnd.djvu + + + djvu + image/vnd.djvu + + + dll + application/x-msdownload + + + dmg + application/x-apple-diskimage + + + dmp + application/vnd.tcpdump.pcap + + + dms + application/octet-stream + + + dna + application/vnd.dna + + + doc + application/msword + + + docm + application/vnd.ms-word.document.macroenabled.12 + + + docx + application/vnd.openxmlformats-officedocument.wordprocessingml.document + + + dot + application/msword + + + dotm + application/vnd.ms-word.template.macroenabled.12 + + + dotx + application/vnd.openxmlformats-officedocument.wordprocessingml.template + + + dp + application/vnd.osgi.dp + + + dpg + application/vnd.dpgraph + + + dra + audio/vnd.dra + + + dsc + text/prs.lines.tag + + + dssc + application/dssc+der + + + dtb + application/x-dtbook+xml + + + dtd + application/xml-dtd + + + dts + audio/vnd.dts + + + dtshd + audio/vnd.dts.hd + + + dump + application/octet-stream + + + dv + video/x-dv + + + dvb + video/vnd.dvb.file + + + dvi + application/x-dvi + + + dwf + model/vnd.dwf + + + dwg + image/vnd.dwg + + + dxf + image/vnd.dxf + + + dxp + application/vnd.spotfire.dxp + + + dxr + application/x-director + + + ecelp4800 + audio/vnd.nuera.ecelp4800 + + + ecelp7470 + audio/vnd.nuera.ecelp7470 + + + ecelp9600 + audio/vnd.nuera.ecelp9600 + + + ecma + application/ecmascript + + + edm + application/vnd.novadigm.edm + + + edx + application/vnd.novadigm.edx + + + efif + application/vnd.picsel + + + ei6 + application/vnd.pg.osasli + + + elc + application/octet-stream + + + emf + application/x-msmetafile + + + eml + message/rfc822 + + + emma + application/emma+xml + + + emz + application/x-msmetafile + + + eol + audio/vnd.digital-winds + + + eot + application/vnd.ms-fontobject + + + eps + application/postscript + + + epub + application/epub+zip + + + es3 + application/vnd.eszigno3+xml + + + esa + application/vnd.osgi.subsystem + + + esf + application/vnd.epson.esf + + + et3 + application/vnd.eszigno3+xml + + + etx + text/x-setext + + + eva + application/x-eva + + + evy + application/x-envoy + + + exe + application/octet-stream + + + exi + application/exi + + + ext + application/vnd.novadigm.ext + + + ez + application/andrew-inset + + + ez2 + application/vnd.ezpix-album + + + ez3 + application/vnd.ezpix-package + + + f + text/x-fortran + + + f4v + video/x-f4v + + + f77 + text/x-fortran + + + f90 + text/x-fortran + + + fbs + image/vnd.fastbidsheet + + + fcdt + application/vnd.adobe.formscentral.fcdt + + + fcs + application/vnd.isac.fcs + + + fdf + application/vnd.fdf + + + fe_launch + application/vnd.denovo.fcselayout-link + + + fg5 + application/vnd.fujitsu.oasysgp + + + fgd + application/x-director + + + fh + image/x-freehand + + + fh4 + image/x-freehand + + + fh5 + image/x-freehand + + + fh7 + image/x-freehand + + + fhc + image/x-freehand + + + fig + application/x-xfig + + + flac + audio/flac + + + fli + video/x-fli + + + flo + application/vnd.micrografx.flo + + + flv + video/x-flv + + + flw + application/vnd.kde.kivio + + + flx + text/vnd.fmi.flexstor + + + fly + text/vnd.fly + + + fm + application/vnd.framemaker + + + fnc + application/vnd.frogans.fnc + + + for + text/x-fortran + + + fpx + image/vnd.fpx + + + frame + application/vnd.framemaker + + + fsc + application/vnd.fsc.weblaunch + + + fst + image/vnd.fst + + + ftc + application/vnd.fluxtime.clip + + + fti + application/vnd.anser-web-funds-transfer-initiation + + + fvt + video/vnd.fvt + + + fxp + application/vnd.adobe.fxp + + + fxpl + application/vnd.adobe.fxp + + + fzs + application/vnd.fuzzysheet + + + g2w + application/vnd.geoplan + + + g3 + image/g3fax + + + g3w + application/vnd.geospace + + + gac + application/vnd.groove-account + + + gam + application/x-tads + + + gbr + application/rpki-ghostbusters + + + gca + application/x-gca-compressed + + + gdl + model/vnd.gdl + + + geo + application/vnd.dynageo + + + gex + application/vnd.geometry-explorer + + + ggb + application/vnd.geogebra.file + + + ggs + application/vnd.geogebra.slides + + + ggt + application/vnd.geogebra.tool + + + ghf + application/vnd.groove-help + + + gif + image/gif + + + gim + application/vnd.groove-identity-message + + + gml + application/gml+xml + + + gmx + application/vnd.gmx + + + gnumeric + application/x-gnumeric + + + gph + application/vnd.flographit + + + gpx + application/gpx+xml + + + gqf + application/vnd.grafeq + + + gqs + application/vnd.grafeq + + + gram + application/srgs + + + gramps + application/x-gramps-xml + + + gre + application/vnd.geometry-explorer + + + grv + application/vnd.groove-injector + + + grxml + application/srgs+xml + + + gsf + application/x-font-ghostscript + + + gtar + application/x-gtar + + + gtm + application/vnd.groove-tool-message + + + gtw + model/vnd.gtw + + + gv + text/vnd.graphviz + + + gxf + application/gxf + + + gxt + application/vnd.geonext + + + gz + application/x-gzip + + + h + text/x-c + + + h261 + video/h261 + + + h263 + video/h263 + + + h264 + video/h264 + + + hal + application/vnd.hal+xml + + + hbci + application/vnd.hbci + + + hdf + application/x-hdf + + + hh + text/x-c + + + hlp + application/winhlp + + + hpgl + application/vnd.hp-hpgl + + + hpid + application/vnd.hp-hpid + + + hps + application/vnd.hp-hps + + + hqx + application/mac-binhex40 + + + htc + text/x-component + + + htke + application/vnd.kenameaapp + + + htm + text/html + + + html + text/html + + + hvd + application/vnd.yamaha.hv-dic + + + hvp + application/vnd.yamaha.hv-voice + + + hvs + application/vnd.yamaha.hv-script + + + i2g + application/vnd.intergeo + + + icc + application/vnd.iccprofile + + + ice + x-conference/x-cooltalk + + + icm + application/vnd.iccprofile + + + ico + image/x-icon + + + ics + text/calendar + + + ief + image/ief + + + ifb + text/calendar + + + ifm + application/vnd.shana.informed.formdata + + + iges + model/iges + + + igl + application/vnd.igloader + + + igm + application/vnd.insors.igm + + + igs + model/iges + + + igx + application/vnd.micrografx.igx + + + iif + application/vnd.shana.informed.interchange + + + imp + application/vnd.accpac.simply.imp + + + ims + application/vnd.ms-ims + + + in + text/plain + + + ink + application/inkml+xml + + + inkml + application/inkml+xml + + + install + application/x-install-instructions + + + iota + application/vnd.astraea-software.iota + + + ipfix + application/ipfix + + + ipk + application/vnd.shana.informed.package + + + irm + application/vnd.ibm.rights-management + + + irp + application/vnd.irepository.package+xml + + + iso + application/x-iso9660-image + + + itp + application/vnd.shana.informed.formtemplate + + + ivp + application/vnd.immervision-ivp + + + ivu + application/vnd.immervision-ivu + + + jad + text/vnd.sun.j2me.app-descriptor + + + jam + application/vnd.jam + + + jar + application/java-archive + + + java + text/x-java-source + + + jisp + application/vnd.jisp + + + jlt + application/vnd.hp-jlyt + + + jnlp + application/x-java-jnlp-file + + + joda + application/vnd.joost.joda-archive + + + jpe + image/jpeg + + + jpeg + image/jpeg + + + jpg + image/jpeg + + + jpgm + video/jpm + + + jpgv + video/jpeg + + + jpm + video/jpm + + + js + text/javascript + + + jsf + text/plain + + + json + application/json + + + jsonml + application/jsonml+json + + + jspf + text/plain + + + jxl + image/jxl + + + kar + audio/midi + + + karbon + application/vnd.kde.karbon + + + kfo + application/vnd.kde.kformula + + + kia + application/vnd.kidspiration + + + kml + application/vnd.google-earth.kml+xml + + + kmz + application/vnd.google-earth.kmz + + + kne + application/vnd.kinar + + + knp + application/vnd.kinar + + + kon + application/vnd.kde.kontour + + + kpr + application/vnd.kde.kpresenter + + + kpt + application/vnd.kde.kpresenter + + + kpxx + application/vnd.ds-keypoint + + + ksp + application/vnd.kde.kspread + + + ktr + application/vnd.kahootz + + + ktx + image/ktx + + + ktz + application/vnd.kahootz + + + kwd + application/vnd.kde.kword + + + kwt + application/vnd.kde.kword + + + lasxml + application/vnd.las.las+xml + + + latex + application/x-latex + + + lbd + application/vnd.llamagraphics.life-balance.desktop + + + lbe + application/vnd.llamagraphics.life-balance.exchange+xml + + + les + application/vnd.hhe.lesson-player + + + lha + application/x-lzh-compressed + + + link66 + application/vnd.route66.link66+xml + + + list + text/plain + + + list3820 + application/vnd.ibm.modcap + + + listafp + application/vnd.ibm.modcap + + + lnk + application/x-ms-shortcut + + + log + text/plain + + + lostxml + application/lost+xml + + + lrf + application/octet-stream + + + lrm + application/vnd.ms-lrm + + + ltf + application/vnd.frogans.ltf + + + lvp + audio/vnd.lucent.voice + + + lwp + application/vnd.lotus-wordpro + + + lzh + application/x-lzh-compressed + + + m13 + application/x-msmediaview + + + m14 + application/x-msmediaview + + + m1v + video/mpeg + + + m21 + application/mp21 + + + m2a + audio/mpeg + + + m2t + video/mp2t + + + m2ts + video/mp2t + + + m2v + video/mpeg + + + m3a + audio/mpeg + + + m3u + audio/x-mpegurl + + + m3u8 + application/vnd.apple.mpegurl + + + m4a + audio/mp4 + + + m4b + audio/mp4 + + + m4r + audio/mp4 + + + m4u + video/vnd.mpegurl + + + m4v + video/mp4 + + + ma + application/mathematica + + + mac + image/x-macpaint + + + mads + application/mads+xml + + + mag + application/vnd.ecowin.chart + + + maker + application/vnd.framemaker + + + man + text/troff + + + mar + application/octet-stream + + + mathml + application/mathml+xml + + + mb + application/mathematica + + + mbk + application/vnd.mobius.mbk + + + mbox + application/mbox + + + mc1 + application/vnd.medcalcdata + + + mcd + application/vnd.mcd + + + mcurl + text/vnd.curl.mcurl + + + mdb + application/x-msaccess + + + mdi + image/vnd.ms-modi + + + me + text/troff + + + mesh + model/mesh + + + meta4 + application/metalink4+xml + + + metalink + application/metalink+xml + + + mets + application/mets+xml + + + mfm + application/vnd.mfmp + + + mft + application/rpki-manifest + + + mgp + application/vnd.osgeo.mapguide.package + + + mgz + application/vnd.proteus.magazine + + + mid + audio/midi + + + midi + audio/midi + + + mie + application/x-mie + + + mif + application/x-mif + + + mime + message/rfc822 + + + mj2 + video/mj2 + + + mjp2 + video/mj2 + + + mjs + text/javascript + + + mk3d + video/x-matroska + + + mka + audio/x-matroska + + + mks + video/x-matroska + + + mkv + video/x-matroska + + + mlp + application/vnd.dolby.mlp + + + mmd + application/vnd.chipnuts.karaoke-mmd + + + mmf + application/vnd.smaf + + + mmr + image/vnd.fujixerox.edmics-mmr + + + mng + video/x-mng + + + mny + application/x-msmoney + + + mobi + application/x-mobipocket-ebook + + + mods + application/mods+xml + + + mov + video/quicktime + + + movie + video/x-sgi-movie + + + mp1 + audio/mpeg + + + mp2 + audio/mpeg + + + mp21 + application/mp21 + + + mp2a + audio/mpeg + + + mp3 + audio/mpeg + + + mp4 + video/mp4 + + + mp4a + audio/mp4 + + + mp4s + application/mp4 + + + mp4v + video/mp4 + + + mpa + audio/mpeg + + + mpc + application/vnd.mophun.certificate + + + mpe + video/mpeg + + + mpeg + video/mpeg + + + mpega + audio/x-mpeg + + + mpg + video/mpeg + + + mpg4 + video/mp4 + + + mpga + audio/mpeg + + + mpkg + application/vnd.apple.installer+xml + + + mpm + application/vnd.blueice.multipass + + + mpn + application/vnd.mophun.application + + + mpp + application/vnd.ms-project + + + mpt + application/vnd.ms-project + + + mpv2 + video/mpeg2 + + + mpy + application/vnd.ibm.minipay + + + mqy + application/vnd.mobius.mqy + + + mrc + application/marc + + + mrcx + application/marcxml+xml + + + ms + text/troff + + + mscml + application/mediaservercontrol+xml + + + mseed + application/vnd.fdsn.mseed + + + mseq + application/vnd.mseq + + + msf + application/vnd.epson.msf + + + msh + model/mesh + + + msi + application/x-msdownload + + + msl + application/vnd.mobius.msl + + + msty + application/vnd.muvee.style + + + mts + video/mp2t + + + mus + application/vnd.musician + + + musicxml + application/vnd.recordare.musicxml+xml + + + mvb + application/x-msmediaview + + + mwf + application/vnd.mfer + + + mxf + application/mxf + + + mxl + application/vnd.recordare.musicxml + + + mxml + application/xv+xml + + + mxs + application/vnd.triscape.mxs + + + mxu + video/vnd.mpegurl + + + n-gage + application/vnd.nokia.n-gage.symbian.install + + + n3 + text/n3 + + + nb + application/mathematica + + + nbp + application/vnd.wolfram.player + + + nc + application/x-netcdf + + + ncx + application/x-dtbncx+xml + + + nfo + text/x-nfo + + + ngdat + application/vnd.nokia.n-gage.data + + + nitf + application/vnd.nitf + + + nlu + application/vnd.neurolanguage.nlu + + + nml + application/vnd.enliven + + + nnd + application/vnd.noblenet-directory + + + nns + application/vnd.noblenet-sealer + + + nnw + application/vnd.noblenet-web + + + npx + image/vnd.net-fpx + + + nsc + application/x-conference + + + nsf + application/vnd.lotus-notes + + + ntf + application/vnd.nitf + + + nzb + application/x-nzb + + + oa2 + application/vnd.fujitsu.oasys2 + + + oa3 + application/vnd.fujitsu.oasys3 + + + oas + application/vnd.fujitsu.oasys + + + obd + application/x-msbinder + + + obj + application/x-tgif + + + oda + application/oda + + + + odb + application/vnd.oasis.opendocument.database + + + + odc + application/vnd.oasis.opendocument.chart + + + + odf + application/vnd.oasis.opendocument.formula + + + odft + application/vnd.oasis.opendocument.formula-template + + + + odg + application/vnd.oasis.opendocument.graphics + + + + odi + application/vnd.oasis.opendocument.image + + + + odm + application/vnd.oasis.opendocument.text-master + + + + odp + application/vnd.oasis.opendocument.presentation + + + + ods + application/vnd.oasis.opendocument.spreadsheet + + + + odt + application/vnd.oasis.opendocument.text + + + oga + audio/ogg + + + ogg + audio/ogg + + + ogv + video/ogg + + + + ogx + application/ogg + + + omdoc + application/omdoc+xml + + + onepkg + application/onenote + + + onetmp + application/onenote + + + onetoc + application/onenote + + + onetoc2 + application/onenote + + + opf + application/oebps-package+xml + + + opml + text/x-opml + + + oprc + application/vnd.palm + + + opus + audio/ogg + + + org + application/vnd.lotus-organizer + + + osf + application/vnd.yamaha.openscoreformat + + + osfpvg + application/vnd.yamaha.openscoreformat.osfpvg+xml + + + otc + application/vnd.oasis.opendocument.chart-template + + + otf + font/otf + + + + otg + application/vnd.oasis.opendocument.graphics-template + + + + oth + application/vnd.oasis.opendocument.text-web + + + oti + application/vnd.oasis.opendocument.image-template + + + + otp + application/vnd.oasis.opendocument.presentation-template + + + + ots + application/vnd.oasis.opendocument.spreadsheet-template + + + + ott + application/vnd.oasis.opendocument.text-template + + + oxps + application/oxps + + + oxt + application/vnd.openofficeorg.extension + + + p + text/x-pascal + + + p10 + application/pkcs10 + + + p12 + application/x-pkcs12 + + + p7b + application/x-pkcs7-certificates + + + p7c + application/pkcs7-mime + + + p7m + application/pkcs7-mime + + + p7r + application/x-pkcs7-certreqresp + + + p7s + application/pkcs7-signature + + + p8 + application/pkcs8 + + + pas + text/x-pascal + + + paw + application/vnd.pawaafile + + + pbd + application/vnd.powerbuilder6 + + + pbm + image/x-portable-bitmap + + + pcap + application/vnd.tcpdump.pcap + + + pcf + application/x-font-pcf + + + pcl + application/vnd.hp-pcl + + + pclxl + application/vnd.hp-pclxl + + + pct + image/pict + + + pcurl + application/vnd.curl.pcurl + + + pcx + image/x-pcx + + + pdb + application/vnd.palm + + + pdf + application/pdf + + + pfa + application/x-font-type1 + + + pfb + application/x-font-type1 + + + pfm + application/x-font-type1 + + + pfr + application/font-tdpfr + + + pfx + application/x-pkcs12 + + + pgm + image/x-portable-graymap + + + pgn + application/x-chess-pgn + + + pgp + application/pgp-encrypted + + + pic + image/pict + + + pict + image/pict + + + pkg + application/octet-stream + + + pki + application/pkixcmp + + + pkipath + application/pkix-pkipath + + + plb + application/vnd.3gpp.pic-bw-large + + + plc + application/vnd.mobius.plc + + + plf + application/vnd.pocketlearn + + + pls + audio/x-scpls + + + pml + application/vnd.ctc-posml + + + png + image/png + + + pnm + image/x-portable-anymap + + + pnt + image/x-macpaint + + + portpkg + application/vnd.macports.portpkg + + + pot + application/vnd.ms-powerpoint + + + potm + application/vnd.ms-powerpoint.template.macroenabled.12 + + + potx + application/vnd.openxmlformats-officedocument.presentationml.template + + + ppam + application/vnd.ms-powerpoint.addin.macroenabled.12 + + + ppd + application/vnd.cups-ppd + + + ppm + image/x-portable-pixmap + + + pps + application/vnd.ms-powerpoint + + + ppsm + application/vnd.ms-powerpoint.slideshow.macroenabled.12 + + + ppsx + application/vnd.openxmlformats-officedocument.presentationml.slideshow + + + ppt + application/vnd.ms-powerpoint + + + pptm + application/vnd.ms-powerpoint.presentation.macroenabled.12 + + + pptx + application/vnd.openxmlformats-officedocument.presentationml.presentation + + + pqa + application/vnd.palm + + + prc + application/x-mobipocket-ebook + + + pre + application/vnd.lotus-freelance + + + prf + application/pics-rules + + + ps + application/postscript + + + psb + application/vnd.3gpp.pic-bw-small + + + psd + image/vnd.adobe.photoshop + + + psf + application/x-font-linux-psf + + + pskcxml + application/pskc+xml + + + ptid + application/vnd.pvi.ptid1 + + + pub + application/x-mspublisher + + + pvb + application/vnd.3gpp.pic-bw-var + + + pwn + application/vnd.3m.post-it-notes + + + pya + audio/vnd.ms-playready.media.pya + + + pyv + video/vnd.ms-playready.media.pyv + + + qam + application/vnd.epson.quickanime + + + qbo + application/vnd.intu.qbo + + + qfx + application/vnd.intu.qfx + + + qps + application/vnd.publishare-delta-tree + + + qt + video/quicktime + + + qti + image/x-quicktime + + + qtif + image/x-quicktime + + + qwd + application/vnd.quark.quarkxpress + + + qwt + application/vnd.quark.quarkxpress + + + qxb + application/vnd.quark.quarkxpress + + + qxd + application/vnd.quark.quarkxpress + + + qxl + application/vnd.quark.quarkxpress + + + qxt + application/vnd.quark.quarkxpress + + + ra + audio/x-pn-realaudio + + + ram + audio/x-pn-realaudio + + + rar + application/x-rar-compressed + + + ras + image/x-cmu-raster + + + rcprofile + application/vnd.ipunplugged.rcprofile + + + rdf + application/rdf+xml + + + rdz + application/vnd.data-vision.rdz + + + rep + application/vnd.businessobjects + + + res + application/x-dtbresource+xml + + + rgb + image/x-rgb + + + rif + application/reginfo+xml + + + rip + audio/vnd.rip + + + ris + application/x-research-info-systems + + + rl + application/resource-lists+xml + + + rlc + image/vnd.fujixerox.edmics-rlc + + + rld + application/resource-lists-diff+xml + + + rm + application/vnd.rn-realmedia + + + rmi + audio/midi + + + rmp + audio/x-pn-realaudio-plugin + + + rms + application/vnd.jcp.javame.midlet-rms + + + rmvb + application/vnd.rn-realmedia-vbr + + + rnc + application/relax-ng-compact-syntax + + + roa + application/rpki-roa + + + roff + text/troff + + + rp9 + application/vnd.cloanto.rp9 + + + rpss + application/vnd.nokia.radio-presets + + + rpst + application/vnd.nokia.radio-preset + + + rq + application/sparql-query + + + rs + application/rls-services+xml + + + rsd + application/rsd+xml + + + rss + application/rss+xml + + + rtf + application/rtf + + + rtx + text/richtext + + + s + text/x-asm + + + s3m + audio/s3m + + + saf + application/vnd.yamaha.smaf-audio + + + sbml + application/sbml+xml + + + sc + application/vnd.ibm.secure-container + + + scd + application/x-msschedule + + + scm + application/vnd.lotus-screencam + + + scq + application/scvp-cv-request + + + scs + application/scvp-cv-response + + + scurl + text/vnd.curl.scurl + + + sda + application/vnd.stardivision.draw + + + sdc + application/vnd.stardivision.calc + + + sdd + application/vnd.stardivision.impress + + + sdkd + application/vnd.solent.sdkm+xml + + + sdkm + application/vnd.solent.sdkm+xml + + + sdp + application/sdp + + + sdw + application/vnd.stardivision.writer + + + see + application/vnd.seemail + + + seed + application/vnd.fdsn.seed + + + sema + application/vnd.sema + + + semd + application/vnd.semd + + + semf + application/vnd.semf + + + ser + application/java-serialized-object + + + setpay + application/set-payment-initiation + + + setreg + application/set-registration-initiation + + + sfd-hdstx + application/vnd.hydrostatix.sof-data + + + sfs + application/vnd.spotfire.sfs + + + sfv + text/x-sfv + + + sgi + image/sgi + + + sgl + application/vnd.stardivision.writer-global + + + sgm + text/sgml + + + sgml + text/sgml + + + sh + application/x-sh + + + shar + application/x-shar + + + shf + application/shf+xml + + + + sid + image/x-mrsid-image + + + sig + application/pgp-signature + + + sil + audio/silk + + + silo + model/mesh + + + sis + application/vnd.symbian.install + + + sisx + application/vnd.symbian.install + + + sit + application/x-stuffit + + + sitx + application/x-stuffitx + + + skd + application/vnd.koan + + + skm + application/vnd.koan + + + skp + application/vnd.koan + + + skt + application/vnd.koan + + + sldm + application/vnd.ms-powerpoint.slide.macroenabled.12 + + + sldx + application/vnd.openxmlformats-officedocument.presentationml.slide + + + slt + application/vnd.epson.salt + + + sm + application/vnd.stepmania.stepchart + + + smf + application/vnd.stardivision.math + + + smi + application/smil+xml + + + smil + application/smil+xml + + + smv + video/x-smv + + + smzip + application/vnd.stepmania.package + + + snd + audio/basic + + + snf + application/x-font-snf + + + so + application/octet-stream + + + spc + application/x-pkcs7-certificates + + + spf + application/vnd.yamaha.smaf-phrase + + + spl + application/x-futuresplash + + + spot + text/vnd.in3d.spot + + + spp + application/scvp-vp-response + + + spq + application/scvp-vp-request + + + spx + audio/ogg + + + sql + application/x-sql + + + src + application/x-wais-source + + + srt + application/x-subrip + + + sru + application/sru+xml + + + srx + application/sparql-results+xml + + + ssdl + application/ssdl+xml + + + sse + application/vnd.kodak-descriptor + + + ssf + application/vnd.epson.ssf + + + ssml + application/ssml+xml + + + st + application/vnd.sailingtracker.track + + + stc + application/vnd.sun.xml.calc.template + + + std + application/vnd.sun.xml.draw.template + + + stf + application/vnd.wt.stf + + + sti + application/vnd.sun.xml.impress.template + + + stk + application/hyperstudio + + + stl + application/vnd.ms-pki.stl + + + str + application/vnd.pg.format + + + stw + application/vnd.sun.xml.writer.template + + + sub + text/vnd.dvb.subtitle + + + sus + application/vnd.sus-calendar + + + susp + application/vnd.sus-calendar + + + sv4cpio + application/x-sv4cpio + + + sv4crc + application/x-sv4crc + + + svc + application/vnd.dvb.service + + + svd + application/vnd.svd + + + svg + image/svg+xml + + + svgz + image/svg+xml + + + swa + application/x-director + + + swf + application/x-shockwave-flash + + + swi + application/vnd.aristanetworks.swi + + + sxc + application/vnd.sun.xml.calc + + + sxd + application/vnd.sun.xml.draw + + + sxg + application/vnd.sun.xml.writer.global + + + sxi + application/vnd.sun.xml.impress + + + sxm + application/vnd.sun.xml.math + + + sxw + application/vnd.sun.xml.writer + + + t + text/troff + + + t3 + application/x-t3vm-image + + + taglet + application/vnd.mynfc + + + tao + application/vnd.tao.intent-module-archive + + + tar + application/x-tar + + + tcap + application/vnd.3gpp2.tcap + + + tcl + application/x-tcl + + + teacher + application/vnd.smart.teacher + + + tei + application/tei+xml + + + teicorpus + application/tei+xml + + + tex + application/x-tex + + + texi + application/x-texinfo + + + texinfo + application/x-texinfo + + + text + text/plain + + + tfi + application/thraud+xml + + + tfm + application/x-tex-tfm + + + tga + image/x-tga + + + thmx + application/vnd.ms-officetheme + + + tif + image/tiff + + + tiff + image/tiff + + + tmo + application/vnd.tmobile-livetv + + + torrent + application/x-bittorrent + + + tpl + application/vnd.groove-tool-template + + + tpt + application/vnd.trid.tpt + + + tr + text/troff + + + tra + application/vnd.trueapp + + + trm + application/x-msterminal + + + ts + video/mp2t + + + tsd + application/timestamped-data + + + tsv + text/tab-separated-values + + + ttc + font/collection + + + ttf + font/ttf + + + ttl + text/turtle + + + twd + application/vnd.simtech-mindmapper + + + twds + application/vnd.simtech-mindmapper + + + txd + application/vnd.genomatix.tuxedo + + + txf + application/vnd.mobius.txf + + + txt + text/plain + + + u32 + application/x-authorware-bin + + + udeb + application/x-debian-package + + + ufd + application/vnd.ufdl + + + ufdl + application/vnd.ufdl + + + ulw + audio/basic + + + ulx + application/x-glulx + + + umj + application/vnd.umajin + + + unityweb + application/vnd.unity + + + uoml + application/vnd.uoml+xml + + + uri + text/uri-list + + + uris + text/uri-list + + + urls + text/uri-list + + + ustar + application/x-ustar + + + utz + application/vnd.uiq.theme + + + uu + text/x-uuencode + + + uva + audio/vnd.dece.audio + + + uvd + application/vnd.dece.data + + + uvf + application/vnd.dece.data + + + uvg + image/vnd.dece.graphic + + + uvh + video/vnd.dece.hd + + + uvi + image/vnd.dece.graphic + + + uvm + video/vnd.dece.mobile + + + uvp + video/vnd.dece.pd + + + uvs + video/vnd.dece.sd + + + uvt + application/vnd.dece.ttml+xml + + + uvu + video/vnd.uvvu.mp4 + + + uvv + video/vnd.dece.video + + + uvva + audio/vnd.dece.audio + + + uvvd + application/vnd.dece.data + + + uvvf + application/vnd.dece.data + + + uvvg + image/vnd.dece.graphic + + + uvvh + video/vnd.dece.hd + + + uvvi + image/vnd.dece.graphic + + + uvvm + video/vnd.dece.mobile + + + uvvp + video/vnd.dece.pd + + + uvvs + video/vnd.dece.sd + + + uvvt + application/vnd.dece.ttml+xml + + + uvvu + video/vnd.uvvu.mp4 + + + uvvv + video/vnd.dece.video + + + uvvx + application/vnd.dece.unspecified + + + uvvz + application/vnd.dece.zip + + + uvx + application/vnd.dece.unspecified + + + uvz + application/vnd.dece.zip + + + vcard + text/vcard + + + vcd + application/x-cdlink + + + vcf + text/x-vcard + + + vcg + application/vnd.groove-vcard + + + vcs + text/x-vcalendar + + + vcx + application/vnd.vcx + + + vis + application/vnd.visionary + + + viv + video/vnd.vivo + + + vob + video/x-ms-vob + + + vor + application/vnd.stardivision.writer + + + vox + application/x-authorware-bin + + + vrml + model/vrml + + + vsd + application/vnd.visio + + + vsf + application/vnd.vsf + + + vss + application/vnd.visio + + + vst + application/vnd.visio + + + vsw + application/vnd.visio + + + vtu + model/vnd.vtu + + + vxml + application/voicexml+xml + + + w3d + application/x-director + + + wad + application/x-doom + + + wasm + application/wasm + + + wav + audio/x-wav + + + wax + audio/x-ms-wax + + + + wbmp + image/vnd.wap.wbmp + + + wbs + application/vnd.criticaltools.wbs+xml + + + wbxml + application/vnd.wap.wbxml + + + wcm + application/vnd.ms-works + + + wdb + application/vnd.ms-works + + + wdp + image/vnd.ms-photo + + + weba + audio/webm + + + webm + video/webm + + + webp + image/webp + + + wg + application/vnd.pmi.widget + + + wgt + application/widget + + + wks + application/vnd.ms-works + + + wm + video/x-ms-wm + + + wma + audio/x-ms-wma + + + wmd + application/x-ms-wmd + + + wmf + application/x-msmetafile + + + + wml + text/vnd.wap.wml + + + + wmlc + application/vnd.wap.wmlc + + + + wmls + text/vnd.wap.wmlscript + + + + wmlsc + application/vnd.wap.wmlscriptc + + + wmv + video/x-ms-wmv + + + wmx + video/x-ms-wmx + + + wmz + application/x-msmetafile + + + woff + font/woff + + + woff2 + font/woff2 + + + wpd + application/vnd.wordperfect + + + wpl + application/vnd.ms-wpl + + + wps + application/vnd.ms-works + + + wqd + application/vnd.wqd + + + wri + application/x-mswrite + + + wrl + model/vrml + + + wsdl + application/wsdl+xml + + + wspolicy + application/wspolicy+xml + + + wtb + application/vnd.webturbo + + + wvx + video/x-ms-wvx + + + x32 + application/x-authorware-bin + + + x3d + model/x3d+xml + + + x3db + model/x3d+binary + + + x3dbz + model/x3d+binary + + + x3dv + model/x3d+vrml + + + x3dvz + model/x3d+vrml + + + x3dz + model/x3d+xml + + + xaml + application/xaml+xml + + + xap + application/x-silverlight-app + + + xar + application/vnd.xara + + + xbap + application/x-ms-xbap + + + xbd + application/vnd.fujixerox.docuworks.binder + + + xbm + image/x-xbitmap + + + xdf + application/xcap-diff+xml + + + xdm + application/vnd.syncml.dm+xml + + + xdp + application/vnd.adobe.xdp+xml + + + xdssc + application/dssc+xml + + + xdw + application/vnd.fujixerox.docuworks + + + xenc + application/xenc+xml + + + xer + application/patch-ops-error+xml + + + xfdf + application/vnd.adobe.xfdf + + + xfdl + application/vnd.xfdl + + + xht + application/xhtml+xml + + + xhtml + application/xhtml+xml + + + xhvml + application/xv+xml + + + xif + image/vnd.xiff + + + xla + application/vnd.ms-excel + + + xlam + application/vnd.ms-excel.addin.macroenabled.12 + + + xlc + application/vnd.ms-excel + + + xlf + application/x-xliff+xml + + + xlm + application/vnd.ms-excel + + + xls + application/vnd.ms-excel + + + xlsb + application/vnd.ms-excel.sheet.binary.macroenabled.12 + + + xlsm + application/vnd.ms-excel.sheet.macroenabled.12 + + + xlsx + application/vnd.openxmlformats-officedocument.spreadsheetml.sheet + + + xlt + application/vnd.ms-excel + + + xltm + application/vnd.ms-excel.template.macroenabled.12 + + + xltx + application/vnd.openxmlformats-officedocument.spreadsheetml.template + + + xlw + application/vnd.ms-excel + + + xm + audio/xm + + + xml + application/xml + + + xo + application/vnd.olpc-sugar + + + xop + application/xop+xml + + + xpi + application/x-xpinstall + + + xpl + application/xproc+xml + + + xpm + image/x-xpixmap + + + xpr + application/vnd.is-xpr + + + xps + application/vnd.ms-xpsdocument + + + xpw + application/vnd.intercon.formnet + + + xpx + application/vnd.intercon.formnet + + + xsl + application/xml + + + xslt + application/xslt+xml + + + xsm + application/vnd.syncml+xml + + + xspf + application/xspf+xml + + + xul + application/vnd.mozilla.xul+xml + + + xvm + application/xv+xml + + + xvml + application/xv+xml + + + xwd + image/x-xwindowdump + + + xyz + chemical/x-xyz + + + xz + application/x-xz + + + yang + application/yang + + + yin + application/yin+xml + + + z + application/x-compress + + + z1 + application/x-zmachine + + + z2 + application/x-zmachine + + + z3 + application/x-zmachine + + + z4 + application/x-zmachine + + + z5 + application/x-zmachine + + + z6 + application/x-zmachine + + + z7 + application/x-zmachine + + + z8 + application/x-zmachine + + + zaz + application/vnd.zzazz.deck+xml + + + zip + application/zip + + + zir + application/vnd.zul + + + zirz + application/vnd.zul + + + zmm + application/vnd.handheld-entertainment+xml + + + + + + + + + + + + + + + + + + index.html + index.htm + index.jsp + + + diff --git a/app/opt/tomcat9/lib/annotations-api.jar b/app/opt/tomcat9/lib/annotations-api.jar new file mode 100644 index 0000000..3587676 Binary files /dev/null and b/app/opt/tomcat9/lib/annotations-api.jar differ diff --git a/app/opt/tomcat9/lib/catalina-ant.jar b/app/opt/tomcat9/lib/catalina-ant.jar new file mode 100644 index 0000000..17706fd Binary files /dev/null and b/app/opt/tomcat9/lib/catalina-ant.jar differ diff --git a/app/opt/tomcat9/lib/catalina-ha.jar b/app/opt/tomcat9/lib/catalina-ha.jar new file mode 100644 index 0000000..3001fa3 Binary files /dev/null and b/app/opt/tomcat9/lib/catalina-ha.jar differ diff --git a/app/opt/tomcat9/lib/catalina-ssi.jar b/app/opt/tomcat9/lib/catalina-ssi.jar new file mode 100644 index 0000000..37578f0 Binary files /dev/null and b/app/opt/tomcat9/lib/catalina-ssi.jar differ diff --git a/app/opt/tomcat9/lib/catalina-storeconfig.jar b/app/opt/tomcat9/lib/catalina-storeconfig.jar new file mode 100644 index 0000000..e6e62a5 Binary files /dev/null and b/app/opt/tomcat9/lib/catalina-storeconfig.jar differ diff --git a/app/opt/tomcat9/lib/catalina-tribes.jar b/app/opt/tomcat9/lib/catalina-tribes.jar new file mode 100644 index 0000000..0f1a03e Binary files /dev/null and b/app/opt/tomcat9/lib/catalina-tribes.jar differ diff --git a/app/opt/tomcat9/lib/catalina.jar b/app/opt/tomcat9/lib/catalina.jar new file mode 100644 index 0000000..852999b Binary files /dev/null and b/app/opt/tomcat9/lib/catalina.jar differ diff --git a/app/opt/tomcat9/lib/ecj-4.20.jar b/app/opt/tomcat9/lib/ecj-4.20.jar new file mode 100644 index 0000000..8333636 Binary files /dev/null and b/app/opt/tomcat9/lib/ecj-4.20.jar differ diff --git a/app/opt/tomcat9/lib/el-api.jar b/app/opt/tomcat9/lib/el-api.jar new file mode 100644 index 0000000..7e84a31 Binary files /dev/null and b/app/opt/tomcat9/lib/el-api.jar differ diff --git a/app/lib/jBCrypt-0.4.jar b/app/opt/tomcat9/lib/jBCrypt-0.4.jar similarity index 100% rename from app/lib/jBCrypt-0.4.jar rename to app/opt/tomcat9/lib/jBCrypt-0.4.jar diff --git a/app/opt/tomcat9/lib/jasper-el.jar b/app/opt/tomcat9/lib/jasper-el.jar new file mode 100644 index 0000000..8eb786a Binary files /dev/null and b/app/opt/tomcat9/lib/jasper-el.jar differ diff --git a/app/opt/tomcat9/lib/jasper.jar b/app/opt/tomcat9/lib/jasper.jar new file mode 100644 index 0000000..91ea715 Binary files /dev/null and b/app/opt/tomcat9/lib/jasper.jar differ diff --git a/app/opt/tomcat9/lib/jaspic-api.jar b/app/opt/tomcat9/lib/jaspic-api.jar new file mode 100644 index 0000000..4e64f09 Binary files /dev/null and b/app/opt/tomcat9/lib/jaspic-api.jar differ diff --git a/app/lib/javax.activation-1.2.0.jar b/app/opt/tomcat9/lib/javax.activation-1.2.0.jar similarity index 100% rename from app/lib/javax.activation-1.2.0.jar rename to app/opt/tomcat9/lib/javax.activation-1.2.0.jar diff --git a/app/lib/javax.mail-1.6.2.jar b/app/opt/tomcat9/lib/javax.mail-1.6.2.jar similarity index 100% rename from app/lib/javax.mail-1.6.2.jar rename to app/opt/tomcat9/lib/javax.mail-1.6.2.jar diff --git a/app/opt/tomcat9/lib/jsp-api.jar b/app/opt/tomcat9/lib/jsp-api.jar new file mode 100644 index 0000000..e83f8dd Binary files /dev/null and b/app/opt/tomcat9/lib/jsp-api.jar differ diff --git a/app/opt/tomcat9/lib/libtcnative-2.a b/app/opt/tomcat9/lib/libtcnative-2.a new file mode 100644 index 0000000..b1096bc Binary files /dev/null and b/app/opt/tomcat9/lib/libtcnative-2.a differ diff --git a/app/opt/tomcat9/lib/libtcnative-2.la b/app/opt/tomcat9/lib/libtcnative-2.la new file mode 100755 index 0000000..bcde24d --- /dev/null +++ b/app/opt/tomcat9/lib/libtcnative-2.la @@ -0,0 +1,41 @@ +# libtcnative-2.la - a libtool library file +# Generated by libtool (GNU libtool) 2.4.7 +# +# Please DO NOT delete this file! +# It is necessary for linking the library. + +# The name that we can dlopen(3). +dlname='libtcnative-2.so.0' + +# Names of this library. +library_names='libtcnative-2.so.0.0.9 libtcnative-2.so.0 libtcnative-2.so' + +# The name of the static archive. +old_library='libtcnative-2.a' + +# Linker flags that cannot go in dependency_libs. +inherited_linker_flags='' + +# Libraries that this one depends upon. +dependency_libs=' -R/usr/lib -L/etc/ssl/lib -lssl -lcrypto -L/usr/lib -lapr-1 -luuid -lpthread' + +# Names of additional weak libraries provided by this library +weak_library_names='' + +# Version information for libtcnative-2. +current=0 +age=0 +revision=9 + +# Is this an already installed library? +installed=yes + +# Should we warn about portability when linking against -modules? +shouldnotlink=no + +# Files to dlopen/dlpreopen +dlopen='' +dlpreopen='' + +# Directory that this library needs to be installed in: +libdir='/opt/tomcat9/lib' diff --git a/app/opt/tomcat9/lib/libtcnative-2.so b/app/opt/tomcat9/lib/libtcnative-2.so new file mode 120000 index 0000000..cda125a --- /dev/null +++ b/app/opt/tomcat9/lib/libtcnative-2.so @@ -0,0 +1 @@ +libtcnative-2.so.0.0.9 \ No newline at end of file diff --git a/app/opt/tomcat9/lib/libtcnative-2.so.0 b/app/opt/tomcat9/lib/libtcnative-2.so.0 new file mode 120000 index 0000000..cda125a --- /dev/null +++ b/app/opt/tomcat9/lib/libtcnative-2.so.0 @@ -0,0 +1 @@ +libtcnative-2.so.0.0.9 \ No newline at end of file diff --git a/app/opt/tomcat9/lib/libtcnative-2.so.0.0.9 b/app/opt/tomcat9/lib/libtcnative-2.so.0.0.9 new file mode 100755 index 0000000..81cbc99 Binary files /dev/null and b/app/opt/tomcat9/lib/libtcnative-2.so.0.0.9 differ diff --git a/app/lib/postgresql-42.7.7.jar b/app/opt/tomcat9/lib/postgresql-42.7.7.jar similarity index 100% rename from app/lib/postgresql-42.7.7.jar rename to app/opt/tomcat9/lib/postgresql-42.7.7.jar diff --git a/app/opt/tomcat9/lib/servlet-api.jar b/app/opt/tomcat9/lib/servlet-api.jar new file mode 100644 index 0000000..e86634d Binary files /dev/null and b/app/opt/tomcat9/lib/servlet-api.jar differ diff --git a/app/lib/smart-bcrypt.jar b/app/opt/tomcat9/lib/smart-bcrypt.jar similarity index 100% rename from app/lib/smart-bcrypt.jar rename to app/opt/tomcat9/lib/smart-bcrypt.jar diff --git a/app/opt/tomcat9/lib/tomcat-api.jar b/app/opt/tomcat9/lib/tomcat-api.jar new file mode 100644 index 0000000..a84617d Binary files /dev/null and b/app/opt/tomcat9/lib/tomcat-api.jar differ diff --git a/app/opt/tomcat9/lib/tomcat-coyote-ffm.jar b/app/opt/tomcat9/lib/tomcat-coyote-ffm.jar new file mode 100644 index 0000000..3eb845e Binary files /dev/null and b/app/opt/tomcat9/lib/tomcat-coyote-ffm.jar differ diff --git a/app/opt/tomcat9/lib/tomcat-coyote.jar b/app/opt/tomcat9/lib/tomcat-coyote.jar new file mode 100644 index 0000000..68502cd Binary files /dev/null and b/app/opt/tomcat9/lib/tomcat-coyote.jar differ diff --git a/app/opt/tomcat9/lib/tomcat-dbcp.jar b/app/opt/tomcat9/lib/tomcat-dbcp.jar new file mode 100644 index 0000000..75b6bda Binary files /dev/null and b/app/opt/tomcat9/lib/tomcat-dbcp.jar differ diff --git a/app/opt/tomcat9/lib/tomcat-i18n-cs.jar b/app/opt/tomcat9/lib/tomcat-i18n-cs.jar new file mode 100644 index 0000000..c50b592 Binary files /dev/null and b/app/opt/tomcat9/lib/tomcat-i18n-cs.jar differ diff --git a/app/opt/tomcat9/lib/tomcat-i18n-de.jar b/app/opt/tomcat9/lib/tomcat-i18n-de.jar new file mode 100644 index 0000000..caf2178 Binary files /dev/null and b/app/opt/tomcat9/lib/tomcat-i18n-de.jar differ diff --git a/app/opt/tomcat9/lib/tomcat-i18n-es.jar b/app/opt/tomcat9/lib/tomcat-i18n-es.jar new file mode 100644 index 0000000..85bca5a Binary files /dev/null and b/app/opt/tomcat9/lib/tomcat-i18n-es.jar differ diff --git a/app/opt/tomcat9/lib/tomcat-i18n-fr.jar b/app/opt/tomcat9/lib/tomcat-i18n-fr.jar new file mode 100644 index 0000000..0615671 Binary files /dev/null and b/app/opt/tomcat9/lib/tomcat-i18n-fr.jar differ diff --git a/app/opt/tomcat9/lib/tomcat-i18n-ja.jar b/app/opt/tomcat9/lib/tomcat-i18n-ja.jar new file mode 100644 index 0000000..53f3973 Binary files /dev/null and b/app/opt/tomcat9/lib/tomcat-i18n-ja.jar differ diff --git a/app/opt/tomcat9/lib/tomcat-i18n-ko.jar b/app/opt/tomcat9/lib/tomcat-i18n-ko.jar new file mode 100644 index 0000000..59eb950 Binary files /dev/null and b/app/opt/tomcat9/lib/tomcat-i18n-ko.jar differ diff --git a/app/opt/tomcat9/lib/tomcat-i18n-pt-BR.jar b/app/opt/tomcat9/lib/tomcat-i18n-pt-BR.jar new file mode 100644 index 0000000..c158af7 Binary files /dev/null and b/app/opt/tomcat9/lib/tomcat-i18n-pt-BR.jar differ diff --git a/app/opt/tomcat9/lib/tomcat-i18n-ru.jar b/app/opt/tomcat9/lib/tomcat-i18n-ru.jar new file mode 100644 index 0000000..57df240 Binary files /dev/null and b/app/opt/tomcat9/lib/tomcat-i18n-ru.jar differ diff --git a/app/opt/tomcat9/lib/tomcat-i18n-zh-CN.jar b/app/opt/tomcat9/lib/tomcat-i18n-zh-CN.jar new file mode 100644 index 0000000..d09e03a Binary files /dev/null and b/app/opt/tomcat9/lib/tomcat-i18n-zh-CN.jar differ diff --git a/app/opt/tomcat9/lib/tomcat-jdbc.jar b/app/opt/tomcat9/lib/tomcat-jdbc.jar new file mode 100644 index 0000000..3c77d1d Binary files /dev/null and b/app/opt/tomcat9/lib/tomcat-jdbc.jar differ diff --git a/app/opt/tomcat9/lib/tomcat-jni.jar b/app/opt/tomcat9/lib/tomcat-jni.jar new file mode 100644 index 0000000..b5757a7 Binary files /dev/null and b/app/opt/tomcat9/lib/tomcat-jni.jar differ diff --git a/app/opt/tomcat9/lib/tomcat-util-scan.jar b/app/opt/tomcat9/lib/tomcat-util-scan.jar new file mode 100644 index 0000000..f87f3b7 Binary files /dev/null and b/app/opt/tomcat9/lib/tomcat-util-scan.jar differ diff --git a/app/opt/tomcat9/lib/tomcat-util.jar b/app/opt/tomcat9/lib/tomcat-util.jar new file mode 100644 index 0000000..af96f8f Binary files /dev/null and b/app/opt/tomcat9/lib/tomcat-util.jar differ diff --git a/app/opt/tomcat9/lib/tomcat-websocket.jar b/app/opt/tomcat9/lib/tomcat-websocket.jar new file mode 100644 index 0000000..576bdbb Binary files /dev/null and b/app/opt/tomcat9/lib/tomcat-websocket.jar differ diff --git a/app/opt/tomcat9/lib/websocket-api.jar b/app/opt/tomcat9/lib/websocket-api.jar new file mode 100644 index 0000000..14ef795 Binary files /dev/null and b/app/opt/tomcat9/lib/websocket-api.jar differ diff --git a/app/opt/tomcat9/logs/catalina.2025-07-30.log b/app/opt/tomcat9/logs/catalina.2025-07-30.log new file mode 100644 index 0000000..375aa84 --- /dev/null +++ b/app/opt/tomcat9/logs/catalina.2025-07-30.log @@ -0,0 +1,760 @@ +30-Jul-2025 05:41:56.313 SEVERE [main] org.apache.tomcat.jdbc.pool.ConnectionPool.init Unable to create initial connections of pool. + org.postgresql.util.PSQLException: Connection to pgsql-postgis:5432 refused. Check that the hostname and port are correct and that the postmaster is accepting TCP/IP connections. + at org.postgresql.core.v3.ConnectionFactoryImpl.openConnectionImpl(ConnectionFactoryImpl.java:373) + at org.postgresql.core.ConnectionFactory.openConnection(ConnectionFactory.java:57) + at org.postgresql.jdbc.PgConnection.(PgConnection.java:277) + at org.postgresql.Driver.makeConnection(Driver.java:448) + at org.postgresql.Driver.connect(Driver.java:298) + at org.apache.tomcat.jdbc.pool.PooledConnection.connectUsingDriver(PooledConnection.java:346) + at org.apache.tomcat.jdbc.pool.PooledConnection.connect(PooledConnection.java:227) + at org.apache.tomcat.jdbc.pool.ConnectionPool.createConnection(ConnectionPool.java:772) + at org.apache.tomcat.jdbc.pool.ConnectionPool.borrowConnection(ConnectionPool.java:700) + at org.apache.tomcat.jdbc.pool.ConnectionPool.init(ConnectionPool.java:499) + at org.apache.tomcat.jdbc.pool.ConnectionPool.(ConnectionPool.java:155) + at org.apache.tomcat.jdbc.pool.DataSourceProxy.pCreatePool(DataSourceProxy.java:118) + at org.apache.tomcat.jdbc.pool.DataSourceProxy.createPool(DataSourceProxy.java:107) + at org.apache.tomcat.jdbc.pool.DataSourceFactory.createDataSource(DataSourceFactory.java:560) + at org.apache.tomcat.jdbc.pool.DataSourceFactory.getObjectInstance(DataSourceFactory.java:244) + at org.apache.naming.factory.FactoryBase.getObjectInstance(FactoryBase.java:91) + at java.naming/javax.naming.spi.NamingManager.getObjectInstance(NamingManager.java:341) + at org.apache.naming.NamingContext.lookup(NamingContext.java:510) + at org.apache.naming.NamingContext.lookup(NamingContext.java:153) + at org.apache.catalina.core.NamingContextListener.addResource(NamingContextListener.java:1007) + at org.apache.catalina.core.NamingContextListener.createNamingContext(NamingContextListener.java:542) + at org.apache.catalina.core.NamingContextListener.lifecycleEvent(NamingContextListener.java:238) + at org.apache.catalina.util.LifecycleBase.fireLifecycleEvent(LifecycleBase.java:109) + at org.apache.catalina.core.StandardServer.startInternal(StandardServer.java:861) + at org.apache.catalina.util.LifecycleBase.start(LifecycleBase.java:164) + at org.apache.catalina.startup.Catalina.start(Catalina.java:739) + at java.base/jdk.internal.reflect.NativeMethodAccessorImpl.invoke0(Native Method) + at java.base/jdk.internal.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62) + at java.base/jdk.internal.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43) + at java.base/java.lang.reflect.Method.invoke(Method.java:566) + at org.apache.catalina.startup.Bootstrap.start(Bootstrap.java:345) + at org.apache.catalina.startup.Bootstrap.main(Bootstrap.java:476) + Caused by: java.net.ConnectException: Connection refused (Connection refused) + at java.base/java.net.PlainSocketImpl.socketConnect(Native Method) + at java.base/java.net.AbstractPlainSocketImpl.doConnect(AbstractPlainSocketImpl.java:412) + at java.base/java.net.AbstractPlainSocketImpl.connectToAddress(AbstractPlainSocketImpl.java:255) + at java.base/java.net.AbstractPlainSocketImpl.connect(AbstractPlainSocketImpl.java:237) + at java.base/java.net.SocksSocketImpl.connect(SocksSocketImpl.java:392) + at java.base/java.net.Socket.connect(Socket.java:609) + at org.postgresql.core.PGStream.createSocket(PGStream.java:261) + at org.postgresql.core.PGStream.(PGStream.java:122) + at org.postgresql.core.v3.ConnectionFactoryImpl.tryConnect(ConnectionFactoryImpl.java:146) + at org.postgresql.core.v3.ConnectionFactoryImpl.openConnectionImpl(ConnectionFactoryImpl.java:289) + ... 31 more +30-Jul-2025 05:41:56.343 SEVERE [main] org.apache.tomcat.jdbc.pool.ConnectionPool.init Unable to create initial connections of pool. + org.postgresql.util.PSQLException: Connection to pgsql-postgis:5432 refused. Check that the hostname and port are correct and that the postmaster is accepting TCP/IP connections. + at org.postgresql.core.v3.ConnectionFactoryImpl.openConnectionImpl(ConnectionFactoryImpl.java:373) + at org.postgresql.core.ConnectionFactory.openConnection(ConnectionFactory.java:57) + at org.postgresql.jdbc.PgConnection.(PgConnection.java:277) + at org.postgresql.Driver.makeConnection(Driver.java:448) + at org.postgresql.Driver.connect(Driver.java:298) + at org.apache.tomcat.jdbc.pool.PooledConnection.connectUsingDriver(PooledConnection.java:346) + at org.apache.tomcat.jdbc.pool.PooledConnection.connect(PooledConnection.java:227) + at org.apache.tomcat.jdbc.pool.ConnectionPool.createConnection(ConnectionPool.java:772) + at org.apache.tomcat.jdbc.pool.ConnectionPool.borrowConnection(ConnectionPool.java:700) + at org.apache.tomcat.jdbc.pool.ConnectionPool.init(ConnectionPool.java:499) + at org.apache.tomcat.jdbc.pool.ConnectionPool.(ConnectionPool.java:155) + at org.apache.tomcat.jdbc.pool.DataSourceProxy.pCreatePool(DataSourceProxy.java:118) + at org.apache.tomcat.jdbc.pool.DataSourceProxy.createPool(DataSourceProxy.java:107) + at org.apache.tomcat.jdbc.pool.DataSourceFactory.createDataSource(DataSourceFactory.java:560) + at org.apache.tomcat.jdbc.pool.DataSourceFactory.getObjectInstance(DataSourceFactory.java:244) + at org.apache.naming.factory.FactoryBase.getObjectInstance(FactoryBase.java:91) + at java.naming/javax.naming.spi.NamingManager.getObjectInstance(NamingManager.java:341) + at org.apache.naming.NamingContext.lookup(NamingContext.java:510) + at org.apache.naming.NamingContext.lookup(NamingContext.java:147) + at org.apache.naming.NamingContextBindingsEnumeration.nextElementInternal(NamingContextBindingsEnumeration.java:100) + at org.apache.naming.NamingContextBindingsEnumeration.next(NamingContextBindingsEnumeration.java:63) + at org.apache.naming.NamingContextBindingsEnumeration.next(NamingContextBindingsEnumeration.java:32) + at org.apache.catalina.mbeans.GlobalResourcesLifecycleListener.createMBeans(GlobalResourcesLifecycleListener.java:130) + at org.apache.catalina.mbeans.GlobalResourcesLifecycleListener.createMBeans(GlobalResourcesLifecycleListener.java:106) + at org.apache.catalina.mbeans.GlobalResourcesLifecycleListener.lifecycleEvent(GlobalResourcesLifecycleListener.java:81) + at org.apache.catalina.util.LifecycleBase.fireLifecycleEvent(LifecycleBase.java:109) + at org.apache.catalina.util.LifecycleBase.setStateInternal(LifecycleBase.java:389) + at org.apache.catalina.util.LifecycleBase.setState(LifecycleBase.java:336) + at org.apache.catalina.core.StandardServer.startInternal(StandardServer.java:862) + at org.apache.catalina.util.LifecycleBase.start(LifecycleBase.java:164) + at org.apache.catalina.startup.Catalina.start(Catalina.java:739) + at java.base/jdk.internal.reflect.NativeMethodAccessorImpl.invoke0(Native Method) + at java.base/jdk.internal.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62) + at java.base/jdk.internal.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43) + at java.base/java.lang.reflect.Method.invoke(Method.java:566) + at org.apache.catalina.startup.Bootstrap.start(Bootstrap.java:345) + at org.apache.catalina.startup.Bootstrap.main(Bootstrap.java:476) + Caused by: java.net.ConnectException: Connection refused (Connection refused) + at java.base/java.net.PlainSocketImpl.socketConnect(Native Method) + at java.base/java.net.AbstractPlainSocketImpl.doConnect(AbstractPlainSocketImpl.java:412) + at java.base/java.net.AbstractPlainSocketImpl.connectToAddress(AbstractPlainSocketImpl.java:255) + at java.base/java.net.AbstractPlainSocketImpl.connect(AbstractPlainSocketImpl.java:237) + at java.base/java.net.SocksSocketImpl.connect(SocksSocketImpl.java:392) + at java.base/java.net.Socket.connect(Socket.java:609) + at org.postgresql.core.PGStream.createSocket(PGStream.java:261) + at org.postgresql.core.PGStream.(PGStream.java:122) + at org.postgresql.core.v3.ConnectionFactoryImpl.tryConnect(ConnectionFactoryImpl.java:146) + at org.postgresql.core.v3.ConnectionFactoryImpl.openConnectionImpl(ConnectionFactoryImpl.java:289) + ... 36 more +30-Jul-2025 05:41:56.344 SEVERE [main] org.apache.catalina.mbeans.GlobalResourcesLifecycleListener.createMBeans Exception processing global JNDI Resources + javax.naming.NamingException: Unexpected exception resolving reference with name [org.wcs.smart.connect.datasource.postgresql] [Root exception is org.postgresql.util.PSQLException: Connection to pgsql-postgis:5432 refused. Check that the hostname and port are correct and that the postmaster is accepting TCP/IP connections.] + at org.apache.naming.NamingContext.lookup(NamingContext.java:540) + at org.apache.naming.NamingContext.lookup(NamingContext.java:147) + at org.apache.naming.NamingContextBindingsEnumeration.nextElementInternal(NamingContextBindingsEnumeration.java:100) + at org.apache.naming.NamingContextBindingsEnumeration.next(NamingContextBindingsEnumeration.java:63) + at org.apache.naming.NamingContextBindingsEnumeration.next(NamingContextBindingsEnumeration.java:32) + at org.apache.catalina.mbeans.GlobalResourcesLifecycleListener.createMBeans(GlobalResourcesLifecycleListener.java:130) + at org.apache.catalina.mbeans.GlobalResourcesLifecycleListener.createMBeans(GlobalResourcesLifecycleListener.java:106) + at org.apache.catalina.mbeans.GlobalResourcesLifecycleListener.lifecycleEvent(GlobalResourcesLifecycleListener.java:81) + at org.apache.catalina.util.LifecycleBase.fireLifecycleEvent(LifecycleBase.java:109) + at org.apache.catalina.util.LifecycleBase.setStateInternal(LifecycleBase.java:389) + at org.apache.catalina.util.LifecycleBase.setState(LifecycleBase.java:336) + at org.apache.catalina.core.StandardServer.startInternal(StandardServer.java:862) + at org.apache.catalina.util.LifecycleBase.start(LifecycleBase.java:164) + at org.apache.catalina.startup.Catalina.start(Catalina.java:739) + at java.base/jdk.internal.reflect.NativeMethodAccessorImpl.invoke0(Native Method) + at java.base/jdk.internal.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62) + at java.base/jdk.internal.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43) + at java.base/java.lang.reflect.Method.invoke(Method.java:566) + at org.apache.catalina.startup.Bootstrap.start(Bootstrap.java:345) + at org.apache.catalina.startup.Bootstrap.main(Bootstrap.java:476) + Caused by: org.postgresql.util.PSQLException: Connection to pgsql-postgis:5432 refused. Check that the hostname and port are correct and that the postmaster is accepting TCP/IP connections. + at org.postgresql.core.v3.ConnectionFactoryImpl.openConnectionImpl(ConnectionFactoryImpl.java:373) + at org.postgresql.core.ConnectionFactory.openConnection(ConnectionFactory.java:57) + at org.postgresql.jdbc.PgConnection.(PgConnection.java:277) + at org.postgresql.Driver.makeConnection(Driver.java:448) + at org.postgresql.Driver.connect(Driver.java:298) + at org.apache.tomcat.jdbc.pool.PooledConnection.connectUsingDriver(PooledConnection.java:346) + at org.apache.tomcat.jdbc.pool.PooledConnection.connect(PooledConnection.java:227) + at org.apache.tomcat.jdbc.pool.ConnectionPool.createConnection(ConnectionPool.java:772) + at org.apache.tomcat.jdbc.pool.ConnectionPool.borrowConnection(ConnectionPool.java:700) + at org.apache.tomcat.jdbc.pool.ConnectionPool.init(ConnectionPool.java:499) + at org.apache.tomcat.jdbc.pool.ConnectionPool.(ConnectionPool.java:155) + at org.apache.tomcat.jdbc.pool.DataSourceProxy.pCreatePool(DataSourceProxy.java:118) + at org.apache.tomcat.jdbc.pool.DataSourceProxy.createPool(DataSourceProxy.java:107) + at org.apache.tomcat.jdbc.pool.DataSourceFactory.createDataSource(DataSourceFactory.java:560) + at org.apache.tomcat.jdbc.pool.DataSourceFactory.getObjectInstance(DataSourceFactory.java:244) + at org.apache.naming.factory.FactoryBase.getObjectInstance(FactoryBase.java:91) + at java.naming/javax.naming.spi.NamingManager.getObjectInstance(NamingManager.java:341) + at org.apache.naming.NamingContext.lookup(NamingContext.java:510) + ... 19 more + Caused by: java.net.ConnectException: Connection refused (Connection refused) + at java.base/java.net.PlainSocketImpl.socketConnect(Native Method) + at java.base/java.net.AbstractPlainSocketImpl.doConnect(AbstractPlainSocketImpl.java:412) + at java.base/java.net.AbstractPlainSocketImpl.connectToAddress(AbstractPlainSocketImpl.java:255) + at java.base/java.net.AbstractPlainSocketImpl.connect(AbstractPlainSocketImpl.java:237) + at java.base/java.net.SocksSocketImpl.connect(SocksSocketImpl.java:392) + at java.base/java.net.Socket.connect(Socket.java:609) + at org.postgresql.core.PGStream.createSocket(PGStream.java:261) + at org.postgresql.core.PGStream.(PGStream.java:122) + at org.postgresql.core.v3.ConnectionFactoryImpl.tryConnect(ConnectionFactoryImpl.java:146) + at org.postgresql.core.v3.ConnectionFactoryImpl.openConnectionImpl(ConnectionFactoryImpl.java:289) + ... 36 more +30-Jul-2025 05:42:02.602 SEVERE [main] org.apache.tomcat.jdbc.pool.ConnectionPool.init Unable to create initial connections of pool. + org.postgresql.util.PSQLException: Connection to pgsql-postgis:5432 refused. Check that the hostname and port are correct and that the postmaster is accepting TCP/IP connections. + at org.postgresql.core.v3.ConnectionFactoryImpl.openConnectionImpl(ConnectionFactoryImpl.java:373) + at org.postgresql.core.ConnectionFactory.openConnection(ConnectionFactory.java:57) + at org.postgresql.jdbc.PgConnection.(PgConnection.java:277) + at org.postgresql.Driver.makeConnection(Driver.java:448) + at org.postgresql.Driver.connect(Driver.java:298) + at org.apache.tomcat.jdbc.pool.PooledConnection.connectUsingDriver(PooledConnection.java:346) + at org.apache.tomcat.jdbc.pool.PooledConnection.connect(PooledConnection.java:227) + at org.apache.tomcat.jdbc.pool.ConnectionPool.createConnection(ConnectionPool.java:772) + at org.apache.tomcat.jdbc.pool.ConnectionPool.borrowConnection(ConnectionPool.java:700) + at org.apache.tomcat.jdbc.pool.ConnectionPool.init(ConnectionPool.java:499) + at org.apache.tomcat.jdbc.pool.ConnectionPool.(ConnectionPool.java:155) + at org.apache.tomcat.jdbc.pool.DataSourceProxy.pCreatePool(DataSourceProxy.java:118) + at org.apache.tomcat.jdbc.pool.DataSourceProxy.createPool(DataSourceProxy.java:107) + at org.apache.tomcat.jdbc.pool.DataSourceFactory.createDataSource(DataSourceFactory.java:560) + at org.apache.tomcat.jdbc.pool.DataSourceFactory.getObjectInstance(DataSourceFactory.java:244) + at org.apache.naming.factory.FactoryBase.getObjectInstance(FactoryBase.java:91) + at java.naming/javax.naming.spi.NamingManager.getObjectInstance(NamingManager.java:341) + at org.apache.naming.NamingContext.lookup(NamingContext.java:510) + at org.apache.naming.NamingContext.lookup(NamingContext.java:153) + at org.apache.naming.factory.ResourceLinkFactory.getObjectInstance(ResourceLinkFactory.java:149) + at java.naming/javax.naming.spi.NamingManager.getObjectInstance(NamingManager.java:341) + at org.apache.naming.NamingContext.lookup(NamingContext.java:510) + at org.apache.naming.NamingContext.lookup(NamingContext.java:147) + at org.apache.naming.NamingContext.lookup(NamingContext.java:496) + at org.apache.naming.NamingContext.lookup(NamingContext.java:147) + at org.apache.naming.NamingContext.lookup(NamingContext.java:496) + at org.apache.naming.NamingContext.lookup(NamingContext.java:147) + at org.apache.naming.NamingContext.lookup(NamingContext.java:496) + at org.apache.naming.NamingContext.lookup(NamingContext.java:147) + at org.apache.naming.SelectorContext.lookup(SelectorContext.java:126) + at java.naming/javax.naming.InitialContext.lookup(InitialContext.java:413) + at org.hibernate.engine.jndi.internal.JndiServiceImpl.locate(JndiServiceImpl.java:97) + at org.hibernate.engine.jdbc.connections.internal.DatasourceConnectionProviderImpl.configure(DatasourceConnectionProviderImpl.java:98) + at org.hibernate.boot.registry.internal.StandardServiceRegistryImpl.configureService(StandardServiceRegistryImpl.java:107) + at org.hibernate.service.internal.AbstractServiceRegistryImpl.initializeService(AbstractServiceRegistryImpl.java:246) + at org.hibernate.service.internal.AbstractServiceRegistryImpl.getService(AbstractServiceRegistryImpl.java:214) + at org.hibernate.engine.jdbc.env.internal.JdbcEnvironmentInitiator.buildJdbcConnectionAccess(JdbcEnvironmentInitiator.java:145) + at org.hibernate.engine.jdbc.env.internal.JdbcEnvironmentInitiator.initiateService(JdbcEnvironmentInitiator.java:66) + at org.hibernate.engine.jdbc.env.internal.JdbcEnvironmentInitiator.initiateService(JdbcEnvironmentInitiator.java:35) + at org.hibernate.boot.registry.internal.StandardServiceRegistryImpl.initiateService(StandardServiceRegistryImpl.java:101) + at org.hibernate.service.internal.AbstractServiceRegistryImpl.createService(AbstractServiceRegistryImpl.java:263) + at org.hibernate.service.internal.AbstractServiceRegistryImpl.initializeService(AbstractServiceRegistryImpl.java:237) + at org.hibernate.service.internal.AbstractServiceRegistryImpl.getService(AbstractServiceRegistryImpl.java:214) + at org.hibernate.id.factory.internal.DefaultIdentifierGeneratorFactory.injectServices(DefaultIdentifierGeneratorFactory.java:152) + at org.hibernate.service.internal.AbstractServiceRegistryImpl.injectDependencies(AbstractServiceRegistryImpl.java:286) + at org.hibernate.service.internal.AbstractServiceRegistryImpl.initializeService(AbstractServiceRegistryImpl.java:243) + at org.hibernate.service.internal.AbstractServiceRegistryImpl.getService(AbstractServiceRegistryImpl.java:214) + at org.hibernate.boot.internal.InFlightMetadataCollectorImpl.(InFlightMetadataCollectorImpl.java:175) + at org.hibernate.boot.model.process.spi.MetadataBuildingProcess.complete(MetadataBuildingProcess.java:118) + at org.hibernate.boot.model.process.spi.MetadataBuildingProcess.build(MetadataBuildingProcess.java:83) + at org.hibernate.boot.internal.MetadataBuilderImpl.build(MetadataBuilderImpl.java:473) + at org.hibernate.boot.internal.MetadataBuilderImpl.build(MetadataBuilderImpl.java:84) + at org.hibernate.cfg.Configuration.buildSessionFactory(Configuration.java:689) + at org.wcs.smart.connect.hibernate.ConnectStartupContextListener.contextInitialized(ConnectStartupContextListener.java:461) + at org.apache.catalina.core.StandardContext.listenerStart(StandardContext.java:4059) + at org.apache.catalina.core.StandardContext.startInternal(StandardContext.java:4501) + at org.apache.catalina.util.LifecycleBase.start(LifecycleBase.java:164) + at org.apache.catalina.core.ContainerBase.addChildInternal(ContainerBase.java:599) + at org.apache.catalina.core.ContainerBase.addChild(ContainerBase.java:571) + at org.apache.catalina.core.StandardHost.addChild(StandardHost.java:603) + at org.apache.catalina.startup.HostConfig.deployDirectory(HostConfig.java:1174) + at org.apache.catalina.startup.HostConfig$DeployDirectory.run(HostConfig.java:1883) + at java.base/java.util.concurrent.Executors$RunnableAdapter.call(Executors.java:515) + at java.base/java.util.concurrent.FutureTask.run(FutureTask.java:264) + at org.apache.tomcat.util.threads.InlineExecutorService.execute(InlineExecutorService.java:76) + at java.base/java.util.concurrent.AbstractExecutorService.submit(AbstractExecutorService.java:118) + at org.apache.catalina.startup.HostConfig.deployDirectories(HostConfig.java:1085) + at org.apache.catalina.startup.HostConfig.deployApps(HostConfig.java:470) + at org.apache.catalina.startup.HostConfig.start(HostConfig.java:1579) + at org.apache.catalina.startup.HostConfig.lifecycleEvent(HostConfig.java:312) + at org.apache.catalina.util.LifecycleBase.fireLifecycleEvent(LifecycleBase.java:109) + at org.apache.catalina.util.LifecycleBase.setStateInternal(LifecycleBase.java:389) + at org.apache.catalina.util.LifecycleBase.setState(LifecycleBase.java:336) + at org.apache.catalina.core.ContainerBase.startInternal(ContainerBase.java:776) + at org.apache.catalina.core.StandardHost.startInternal(StandardHost.java:721) + at org.apache.catalina.util.LifecycleBase.start(LifecycleBase.java:164) + at org.apache.catalina.core.ContainerBase$StartChild.call(ContainerBase.java:1203) + at org.apache.catalina.core.ContainerBase$StartChild.call(ContainerBase.java:1193) + at java.base/java.util.concurrent.FutureTask.run(FutureTask.java:264) + at org.apache.tomcat.util.threads.InlineExecutorService.execute(InlineExecutorService.java:76) + at java.base/java.util.concurrent.AbstractExecutorService.submit(AbstractExecutorService.java:140) + at org.apache.catalina.core.ContainerBase.startInternal(ContainerBase.java:749) + at org.apache.catalina.core.StandardEngine.startInternal(StandardEngine.java:211) + at org.apache.catalina.util.LifecycleBase.start(LifecycleBase.java:164) + at org.apache.catalina.core.StandardService.startInternal(StandardService.java:412) + at org.apache.catalina.util.LifecycleBase.start(LifecycleBase.java:164) + at org.apache.catalina.core.StandardServer.startInternal(StandardServer.java:874) + at org.apache.catalina.util.LifecycleBase.start(LifecycleBase.java:164) + at org.apache.catalina.startup.Catalina.start(Catalina.java:739) + at java.base/jdk.internal.reflect.NativeMethodAccessorImpl.invoke0(Native Method) + at java.base/jdk.internal.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62) + at java.base/jdk.internal.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43) + at java.base/java.lang.reflect.Method.invoke(Method.java:566) + at org.apache.catalina.startup.Bootstrap.start(Bootstrap.java:345) + at org.apache.catalina.startup.Bootstrap.main(Bootstrap.java:476) + Caused by: java.net.ConnectException: Connection refused (Connection refused) + at java.base/java.net.PlainSocketImpl.socketConnect(Native Method) + at java.base/java.net.AbstractPlainSocketImpl.doConnect(AbstractPlainSocketImpl.java:412) + at java.base/java.net.AbstractPlainSocketImpl.connectToAddress(AbstractPlainSocketImpl.java:255) + at java.base/java.net.AbstractPlainSocketImpl.connect(AbstractPlainSocketImpl.java:237) + at java.base/java.net.SocksSocketImpl.connect(SocksSocketImpl.java:392) + at java.base/java.net.Socket.connect(Socket.java:609) + at org.postgresql.core.PGStream.createSocket(PGStream.java:261) + at org.postgresql.core.PGStream.(PGStream.java:122) + at org.postgresql.core.v3.ConnectionFactoryImpl.tryConnect(ConnectionFactoryImpl.java:146) + at org.postgresql.core.v3.ConnectionFactoryImpl.openConnectionImpl(ConnectionFactoryImpl.java:289) + ... 94 more +30-Jul-2025 05:42:02.604 SEVERE [main] org.apache.catalina.core.StandardContext.listenerStart Exception sending context initialized event to listener instance of class [org.wcs.smart.connect.hibernate.ConnectStartupContextListener] + org.hibernate.service.spi.ServiceException: Unable to create requested service [org.hibernate.engine.jdbc.env.spi.JdbcEnvironment] + at org.hibernate.service.internal.AbstractServiceRegistryImpl.createService(AbstractServiceRegistryImpl.java:275) + at org.hibernate.service.internal.AbstractServiceRegistryImpl.initializeService(AbstractServiceRegistryImpl.java:237) + at org.hibernate.service.internal.AbstractServiceRegistryImpl.getService(AbstractServiceRegistryImpl.java:214) + at org.hibernate.id.factory.internal.DefaultIdentifierGeneratorFactory.injectServices(DefaultIdentifierGeneratorFactory.java:152) + at org.hibernate.service.internal.AbstractServiceRegistryImpl.injectDependencies(AbstractServiceRegistryImpl.java:286) + at org.hibernate.service.internal.AbstractServiceRegistryImpl.initializeService(AbstractServiceRegistryImpl.java:243) + at org.hibernate.service.internal.AbstractServiceRegistryImpl.getService(AbstractServiceRegistryImpl.java:214) + at org.hibernate.boot.internal.InFlightMetadataCollectorImpl.(InFlightMetadataCollectorImpl.java:175) + at org.hibernate.boot.model.process.spi.MetadataBuildingProcess.complete(MetadataBuildingProcess.java:118) + at org.hibernate.boot.model.process.spi.MetadataBuildingProcess.build(MetadataBuildingProcess.java:83) + at org.hibernate.boot.internal.MetadataBuilderImpl.build(MetadataBuilderImpl.java:473) + at org.hibernate.boot.internal.MetadataBuilderImpl.build(MetadataBuilderImpl.java:84) + at org.hibernate.cfg.Configuration.buildSessionFactory(Configuration.java:689) + at org.wcs.smart.connect.hibernate.ConnectStartupContextListener.contextInitialized(ConnectStartupContextListener.java:461) + at org.apache.catalina.core.StandardContext.listenerStart(StandardContext.java:4059) + at org.apache.catalina.core.StandardContext.startInternal(StandardContext.java:4501) + at org.apache.catalina.util.LifecycleBase.start(LifecycleBase.java:164) + at org.apache.catalina.core.ContainerBase.addChildInternal(ContainerBase.java:599) + at org.apache.catalina.core.ContainerBase.addChild(ContainerBase.java:571) + at org.apache.catalina.core.StandardHost.addChild(StandardHost.java:603) + at org.apache.catalina.startup.HostConfig.deployDirectory(HostConfig.java:1174) + at org.apache.catalina.startup.HostConfig$DeployDirectory.run(HostConfig.java:1883) + at java.base/java.util.concurrent.Executors$RunnableAdapter.call(Executors.java:515) + at java.base/java.util.concurrent.FutureTask.run(FutureTask.java:264) + at org.apache.tomcat.util.threads.InlineExecutorService.execute(InlineExecutorService.java:76) + at java.base/java.util.concurrent.AbstractExecutorService.submit(AbstractExecutorService.java:118) + at org.apache.catalina.startup.HostConfig.deployDirectories(HostConfig.java:1085) + at org.apache.catalina.startup.HostConfig.deployApps(HostConfig.java:470) + at org.apache.catalina.startup.HostConfig.start(HostConfig.java:1579) + at org.apache.catalina.startup.HostConfig.lifecycleEvent(HostConfig.java:312) + at org.apache.catalina.util.LifecycleBase.fireLifecycleEvent(LifecycleBase.java:109) + at org.apache.catalina.util.LifecycleBase.setStateInternal(LifecycleBase.java:389) + at org.apache.catalina.util.LifecycleBase.setState(LifecycleBase.java:336) + at org.apache.catalina.core.ContainerBase.startInternal(ContainerBase.java:776) + at org.apache.catalina.core.StandardHost.startInternal(StandardHost.java:721) + at org.apache.catalina.util.LifecycleBase.start(LifecycleBase.java:164) + at org.apache.catalina.core.ContainerBase$StartChild.call(ContainerBase.java:1203) + at org.apache.catalina.core.ContainerBase$StartChild.call(ContainerBase.java:1193) + at java.base/java.util.concurrent.FutureTask.run(FutureTask.java:264) + at org.apache.tomcat.util.threads.InlineExecutorService.execute(InlineExecutorService.java:76) + at java.base/java.util.concurrent.AbstractExecutorService.submit(AbstractExecutorService.java:140) + at org.apache.catalina.core.ContainerBase.startInternal(ContainerBase.java:749) + at org.apache.catalina.core.StandardEngine.startInternal(StandardEngine.java:211) + at org.apache.catalina.util.LifecycleBase.start(LifecycleBase.java:164) + at org.apache.catalina.core.StandardService.startInternal(StandardService.java:412) + at org.apache.catalina.util.LifecycleBase.start(LifecycleBase.java:164) + at org.apache.catalina.core.StandardServer.startInternal(StandardServer.java:874) + at org.apache.catalina.util.LifecycleBase.start(LifecycleBase.java:164) + at org.apache.catalina.startup.Catalina.start(Catalina.java:739) + at java.base/jdk.internal.reflect.NativeMethodAccessorImpl.invoke0(Native Method) + at java.base/jdk.internal.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62) + at java.base/jdk.internal.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43) + at java.base/java.lang.reflect.Method.invoke(Method.java:566) + at org.apache.catalina.startup.Bootstrap.start(Bootstrap.java:345) + at org.apache.catalina.startup.Bootstrap.main(Bootstrap.java:476) + Caused by: org.hibernate.engine.jndi.JndiException: Unable to lookup JNDI name [java:comp/env/jdbc/smart] + at org.hibernate.engine.jndi.internal.JndiServiceImpl.locate(JndiServiceImpl.java:100) + at org.hibernate.engine.jdbc.connections.internal.DatasourceConnectionProviderImpl.configure(DatasourceConnectionProviderImpl.java:98) + at org.hibernate.boot.registry.internal.StandardServiceRegistryImpl.configureService(StandardServiceRegistryImpl.java:107) + at org.hibernate.service.internal.AbstractServiceRegistryImpl.initializeService(AbstractServiceRegistryImpl.java:246) + at org.hibernate.service.internal.AbstractServiceRegistryImpl.getService(AbstractServiceRegistryImpl.java:214) + at org.hibernate.engine.jdbc.env.internal.JdbcEnvironmentInitiator.buildJdbcConnectionAccess(JdbcEnvironmentInitiator.java:145) + at org.hibernate.engine.jdbc.env.internal.JdbcEnvironmentInitiator.initiateService(JdbcEnvironmentInitiator.java:66) + at org.hibernate.engine.jdbc.env.internal.JdbcEnvironmentInitiator.initiateService(JdbcEnvironmentInitiator.java:35) + at org.hibernate.boot.registry.internal.StandardServiceRegistryImpl.initiateService(StandardServiceRegistryImpl.java:101) + at org.hibernate.service.internal.AbstractServiceRegistryImpl.createService(AbstractServiceRegistryImpl.java:263) + ... 54 more + Caused by: javax.naming.NamingException: Unexpected exception resolving reference with name [org.wcs.smart.connect.datasource.postgresql] [Root exception is org.postgresql.util.PSQLException: Connection to pgsql-postgis:5432 refused. Check that the hostname and port are correct and that the postmaster is accepting TCP/IP connections.] + at org.apache.naming.NamingContext.lookup(NamingContext.java:540) + at org.apache.naming.NamingContext.lookup(NamingContext.java:153) + at org.apache.naming.factory.ResourceLinkFactory.getObjectInstance(ResourceLinkFactory.java:149) + at java.naming/javax.naming.spi.NamingManager.getObjectInstance(NamingManager.java:341) + at org.apache.naming.NamingContext.lookup(NamingContext.java:510) + at org.apache.naming.NamingContext.lookup(NamingContext.java:147) + at org.apache.naming.NamingContext.lookup(NamingContext.java:496) + at org.apache.naming.NamingContext.lookup(NamingContext.java:147) + at org.apache.naming.NamingContext.lookup(NamingContext.java:496) + at org.apache.naming.NamingContext.lookup(NamingContext.java:147) + at org.apache.naming.NamingContext.lookup(NamingContext.java:496) + at org.apache.naming.NamingContext.lookup(NamingContext.java:147) + at org.apache.naming.SelectorContext.lookup(SelectorContext.java:126) + at java.naming/javax.naming.InitialContext.lookup(InitialContext.java:413) + at org.hibernate.engine.jndi.internal.JndiServiceImpl.locate(JndiServiceImpl.java:97) + ... 63 more + Caused by: org.postgresql.util.PSQLException: Connection to pgsql-postgis:5432 refused. Check that the hostname and port are correct and that the postmaster is accepting TCP/IP connections. + at org.postgresql.core.v3.ConnectionFactoryImpl.openConnectionImpl(ConnectionFactoryImpl.java:373) + at org.postgresql.core.ConnectionFactory.openConnection(ConnectionFactory.java:57) + at org.postgresql.jdbc.PgConnection.(PgConnection.java:277) + at org.postgresql.Driver.makeConnection(Driver.java:448) + at org.postgresql.Driver.connect(Driver.java:298) + at org.apache.tomcat.jdbc.pool.PooledConnection.connectUsingDriver(PooledConnection.java:346) + at org.apache.tomcat.jdbc.pool.PooledConnection.connect(PooledConnection.java:227) + at org.apache.tomcat.jdbc.pool.ConnectionPool.createConnection(ConnectionPool.java:772) + at org.apache.tomcat.jdbc.pool.ConnectionPool.borrowConnection(ConnectionPool.java:700) + at org.apache.tomcat.jdbc.pool.ConnectionPool.init(ConnectionPool.java:499) + at org.apache.tomcat.jdbc.pool.ConnectionPool.(ConnectionPool.java:155) + at org.apache.tomcat.jdbc.pool.DataSourceProxy.pCreatePool(DataSourceProxy.java:118) + at org.apache.tomcat.jdbc.pool.DataSourceProxy.createPool(DataSourceProxy.java:107) + at org.apache.tomcat.jdbc.pool.DataSourceFactory.createDataSource(DataSourceFactory.java:560) + at org.apache.tomcat.jdbc.pool.DataSourceFactory.getObjectInstance(DataSourceFactory.java:244) + at org.apache.naming.factory.FactoryBase.getObjectInstance(FactoryBase.java:91) + at java.naming/javax.naming.spi.NamingManager.getObjectInstance(NamingManager.java:341) + at org.apache.naming.NamingContext.lookup(NamingContext.java:510) + ... 77 more + Caused by: java.net.ConnectException: Connection refused (Connection refused) + at java.base/java.net.PlainSocketImpl.socketConnect(Native Method) + at java.base/java.net.AbstractPlainSocketImpl.doConnect(AbstractPlainSocketImpl.java:412) + at java.base/java.net.AbstractPlainSocketImpl.connectToAddress(AbstractPlainSocketImpl.java:255) + at java.base/java.net.AbstractPlainSocketImpl.connect(AbstractPlainSocketImpl.java:237) + at java.base/java.net.SocksSocketImpl.connect(SocksSocketImpl.java:392) + at java.base/java.net.Socket.connect(Socket.java:609) + at org.postgresql.core.PGStream.createSocket(PGStream.java:261) + at org.postgresql.core.PGStream.(PGStream.java:122) + at org.postgresql.core.v3.ConnectionFactoryImpl.tryConnect(ConnectionFactoryImpl.java:146) + at org.postgresql.core.v3.ConnectionFactoryImpl.openConnectionImpl(ConnectionFactoryImpl.java:289) + ... 94 more +30-Jul-2025 05:42:02.605 SEVERE [main] org.apache.catalina.core.StandardContext.startInternal One or more listeners failed to start. Full details will be found in the appropriate container log file +30-Jul-2025 05:42:02.607 SEVERE [main] org.apache.catalina.core.StandardContext.startInternal Context [] startup failed due to previous errors +30-Jul-2025 05:48:21.099 SEVERE [main] org.apache.tomcat.jdbc.pool.ConnectionPool.init Unable to create initial connections of pool. + org.postgresql.util.PSQLException: Connection to pgsql-postgis:5432 refused. Check that the hostname and port are correct and that the postmaster is accepting TCP/IP connections. + at org.postgresql.core.v3.ConnectionFactoryImpl.openConnectionImpl(ConnectionFactoryImpl.java:373) + at org.postgresql.core.ConnectionFactory.openConnection(ConnectionFactory.java:57) + at org.postgresql.jdbc.PgConnection.(PgConnection.java:277) + at org.postgresql.Driver.makeConnection(Driver.java:448) + at org.postgresql.Driver.connect(Driver.java:298) + at org.apache.tomcat.jdbc.pool.PooledConnection.connectUsingDriver(PooledConnection.java:346) + at org.apache.tomcat.jdbc.pool.PooledConnection.connect(PooledConnection.java:227) + at org.apache.tomcat.jdbc.pool.ConnectionPool.createConnection(ConnectionPool.java:772) + at org.apache.tomcat.jdbc.pool.ConnectionPool.borrowConnection(ConnectionPool.java:700) + at org.apache.tomcat.jdbc.pool.ConnectionPool.init(ConnectionPool.java:499) + at org.apache.tomcat.jdbc.pool.ConnectionPool.(ConnectionPool.java:155) + at org.apache.tomcat.jdbc.pool.DataSourceProxy.pCreatePool(DataSourceProxy.java:118) + at org.apache.tomcat.jdbc.pool.DataSourceProxy.createPool(DataSourceProxy.java:107) + at org.apache.tomcat.jdbc.pool.DataSourceFactory.createDataSource(DataSourceFactory.java:560) + at org.apache.tomcat.jdbc.pool.DataSourceFactory.getObjectInstance(DataSourceFactory.java:244) + at org.apache.naming.factory.FactoryBase.getObjectInstance(FactoryBase.java:91) + at java.naming/javax.naming.spi.NamingManager.getObjectInstance(NamingManager.java:341) + at org.apache.naming.NamingContext.lookup(NamingContext.java:510) + at org.apache.naming.NamingContext.lookup(NamingContext.java:153) + at org.apache.catalina.core.NamingContextListener.addResource(NamingContextListener.java:1007) + at org.apache.catalina.core.NamingContextListener.createNamingContext(NamingContextListener.java:542) + at org.apache.catalina.core.NamingContextListener.lifecycleEvent(NamingContextListener.java:238) + at org.apache.catalina.util.LifecycleBase.fireLifecycleEvent(LifecycleBase.java:109) + at org.apache.catalina.core.StandardServer.startInternal(StandardServer.java:861) + at org.apache.catalina.util.LifecycleBase.start(LifecycleBase.java:164) + at org.apache.catalina.startup.Catalina.start(Catalina.java:739) + at java.base/jdk.internal.reflect.NativeMethodAccessorImpl.invoke0(Native Method) + at java.base/jdk.internal.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62) + at java.base/jdk.internal.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43) + at java.base/java.lang.reflect.Method.invoke(Method.java:566) + at org.apache.catalina.startup.Bootstrap.start(Bootstrap.java:345) + at org.apache.catalina.startup.Bootstrap.main(Bootstrap.java:476) + Caused by: java.net.ConnectException: Connection refused (Connection refused) + at java.base/java.net.PlainSocketImpl.socketConnect(Native Method) + at java.base/java.net.AbstractPlainSocketImpl.doConnect(AbstractPlainSocketImpl.java:412) + at java.base/java.net.AbstractPlainSocketImpl.connectToAddress(AbstractPlainSocketImpl.java:255) + at java.base/java.net.AbstractPlainSocketImpl.connect(AbstractPlainSocketImpl.java:237) + at java.base/java.net.SocksSocketImpl.connect(SocksSocketImpl.java:392) + at java.base/java.net.Socket.connect(Socket.java:609) + at org.postgresql.core.PGStream.createSocket(PGStream.java:261) + at org.postgresql.core.PGStream.(PGStream.java:122) + at org.postgresql.core.v3.ConnectionFactoryImpl.tryConnect(ConnectionFactoryImpl.java:146) + at org.postgresql.core.v3.ConnectionFactoryImpl.openConnectionImpl(ConnectionFactoryImpl.java:289) + ... 31 more +30-Jul-2025 05:48:21.131 SEVERE [main] org.apache.tomcat.jdbc.pool.ConnectionPool.init Unable to create initial connections of pool. + org.postgresql.util.PSQLException: Connection to pgsql-postgis:5432 refused. Check that the hostname and port are correct and that the postmaster is accepting TCP/IP connections. + at org.postgresql.core.v3.ConnectionFactoryImpl.openConnectionImpl(ConnectionFactoryImpl.java:373) + at org.postgresql.core.ConnectionFactory.openConnection(ConnectionFactory.java:57) + at org.postgresql.jdbc.PgConnection.(PgConnection.java:277) + at org.postgresql.Driver.makeConnection(Driver.java:448) + at org.postgresql.Driver.connect(Driver.java:298) + at org.apache.tomcat.jdbc.pool.PooledConnection.connectUsingDriver(PooledConnection.java:346) + at org.apache.tomcat.jdbc.pool.PooledConnection.connect(PooledConnection.java:227) + at org.apache.tomcat.jdbc.pool.ConnectionPool.createConnection(ConnectionPool.java:772) + at org.apache.tomcat.jdbc.pool.ConnectionPool.borrowConnection(ConnectionPool.java:700) + at org.apache.tomcat.jdbc.pool.ConnectionPool.init(ConnectionPool.java:499) + at org.apache.tomcat.jdbc.pool.ConnectionPool.(ConnectionPool.java:155) + at org.apache.tomcat.jdbc.pool.DataSourceProxy.pCreatePool(DataSourceProxy.java:118) + at org.apache.tomcat.jdbc.pool.DataSourceProxy.createPool(DataSourceProxy.java:107) + at org.apache.tomcat.jdbc.pool.DataSourceFactory.createDataSource(DataSourceFactory.java:560) + at org.apache.tomcat.jdbc.pool.DataSourceFactory.getObjectInstance(DataSourceFactory.java:244) + at org.apache.naming.factory.FactoryBase.getObjectInstance(FactoryBase.java:91) + at java.naming/javax.naming.spi.NamingManager.getObjectInstance(NamingManager.java:341) + at org.apache.naming.NamingContext.lookup(NamingContext.java:510) + at org.apache.naming.NamingContext.lookup(NamingContext.java:147) + at org.apache.naming.NamingContextBindingsEnumeration.nextElementInternal(NamingContextBindingsEnumeration.java:100) + at org.apache.naming.NamingContextBindingsEnumeration.next(NamingContextBindingsEnumeration.java:63) + at org.apache.naming.NamingContextBindingsEnumeration.next(NamingContextBindingsEnumeration.java:32) + at org.apache.catalina.mbeans.GlobalResourcesLifecycleListener.createMBeans(GlobalResourcesLifecycleListener.java:130) + at org.apache.catalina.mbeans.GlobalResourcesLifecycleListener.createMBeans(GlobalResourcesLifecycleListener.java:106) + at org.apache.catalina.mbeans.GlobalResourcesLifecycleListener.lifecycleEvent(GlobalResourcesLifecycleListener.java:81) + at org.apache.catalina.util.LifecycleBase.fireLifecycleEvent(LifecycleBase.java:109) + at org.apache.catalina.util.LifecycleBase.setStateInternal(LifecycleBase.java:389) + at org.apache.catalina.util.LifecycleBase.setState(LifecycleBase.java:336) + at org.apache.catalina.core.StandardServer.startInternal(StandardServer.java:862) + at org.apache.catalina.util.LifecycleBase.start(LifecycleBase.java:164) + at org.apache.catalina.startup.Catalina.start(Catalina.java:739) + at java.base/jdk.internal.reflect.NativeMethodAccessorImpl.invoke0(Native Method) + at java.base/jdk.internal.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62) + at java.base/jdk.internal.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43) + at java.base/java.lang.reflect.Method.invoke(Method.java:566) + at org.apache.catalina.startup.Bootstrap.start(Bootstrap.java:345) + at org.apache.catalina.startup.Bootstrap.main(Bootstrap.java:476) + Caused by: java.net.ConnectException: Connection refused (Connection refused) + at java.base/java.net.PlainSocketImpl.socketConnect(Native Method) + at java.base/java.net.AbstractPlainSocketImpl.doConnect(AbstractPlainSocketImpl.java:412) + at java.base/java.net.AbstractPlainSocketImpl.connectToAddress(AbstractPlainSocketImpl.java:255) + at java.base/java.net.AbstractPlainSocketImpl.connect(AbstractPlainSocketImpl.java:237) + at java.base/java.net.SocksSocketImpl.connect(SocksSocketImpl.java:392) + at java.base/java.net.Socket.connect(Socket.java:609) + at org.postgresql.core.PGStream.createSocket(PGStream.java:261) + at org.postgresql.core.PGStream.(PGStream.java:122) + at org.postgresql.core.v3.ConnectionFactoryImpl.tryConnect(ConnectionFactoryImpl.java:146) + at org.postgresql.core.v3.ConnectionFactoryImpl.openConnectionImpl(ConnectionFactoryImpl.java:289) + ... 36 more +30-Jul-2025 05:48:21.133 SEVERE [main] org.apache.catalina.mbeans.GlobalResourcesLifecycleListener.createMBeans Exception processing global JNDI Resources + javax.naming.NamingException: Unexpected exception resolving reference with name [org.wcs.smart.connect.datasource.postgresql] [Root exception is org.postgresql.util.PSQLException: Connection to pgsql-postgis:5432 refused. Check that the hostname and port are correct and that the postmaster is accepting TCP/IP connections.] + at org.apache.naming.NamingContext.lookup(NamingContext.java:540) + at org.apache.naming.NamingContext.lookup(NamingContext.java:147) + at org.apache.naming.NamingContextBindingsEnumeration.nextElementInternal(NamingContextBindingsEnumeration.java:100) + at org.apache.naming.NamingContextBindingsEnumeration.next(NamingContextBindingsEnumeration.java:63) + at org.apache.naming.NamingContextBindingsEnumeration.next(NamingContextBindingsEnumeration.java:32) + at org.apache.catalina.mbeans.GlobalResourcesLifecycleListener.createMBeans(GlobalResourcesLifecycleListener.java:130) + at org.apache.catalina.mbeans.GlobalResourcesLifecycleListener.createMBeans(GlobalResourcesLifecycleListener.java:106) + at org.apache.catalina.mbeans.GlobalResourcesLifecycleListener.lifecycleEvent(GlobalResourcesLifecycleListener.java:81) + at org.apache.catalina.util.LifecycleBase.fireLifecycleEvent(LifecycleBase.java:109) + at org.apache.catalina.util.LifecycleBase.setStateInternal(LifecycleBase.java:389) + at org.apache.catalina.util.LifecycleBase.setState(LifecycleBase.java:336) + at org.apache.catalina.core.StandardServer.startInternal(StandardServer.java:862) + at org.apache.catalina.util.LifecycleBase.start(LifecycleBase.java:164) + at org.apache.catalina.startup.Catalina.start(Catalina.java:739) + at java.base/jdk.internal.reflect.NativeMethodAccessorImpl.invoke0(Native Method) + at java.base/jdk.internal.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62) + at java.base/jdk.internal.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43) + at java.base/java.lang.reflect.Method.invoke(Method.java:566) + at org.apache.catalina.startup.Bootstrap.start(Bootstrap.java:345) + at org.apache.catalina.startup.Bootstrap.main(Bootstrap.java:476) + Caused by: org.postgresql.util.PSQLException: Connection to pgsql-postgis:5432 refused. Check that the hostname and port are correct and that the postmaster is accepting TCP/IP connections. + at org.postgresql.core.v3.ConnectionFactoryImpl.openConnectionImpl(ConnectionFactoryImpl.java:373) + at org.postgresql.core.ConnectionFactory.openConnection(ConnectionFactory.java:57) + at org.postgresql.jdbc.PgConnection.(PgConnection.java:277) + at org.postgresql.Driver.makeConnection(Driver.java:448) + at org.postgresql.Driver.connect(Driver.java:298) + at org.apache.tomcat.jdbc.pool.PooledConnection.connectUsingDriver(PooledConnection.java:346) + at org.apache.tomcat.jdbc.pool.PooledConnection.connect(PooledConnection.java:227) + at org.apache.tomcat.jdbc.pool.ConnectionPool.createConnection(ConnectionPool.java:772) + at org.apache.tomcat.jdbc.pool.ConnectionPool.borrowConnection(ConnectionPool.java:700) + at org.apache.tomcat.jdbc.pool.ConnectionPool.init(ConnectionPool.java:499) + at org.apache.tomcat.jdbc.pool.ConnectionPool.(ConnectionPool.java:155) + at org.apache.tomcat.jdbc.pool.DataSourceProxy.pCreatePool(DataSourceProxy.java:118) + at org.apache.tomcat.jdbc.pool.DataSourceProxy.createPool(DataSourceProxy.java:107) + at org.apache.tomcat.jdbc.pool.DataSourceFactory.createDataSource(DataSourceFactory.java:560) + at org.apache.tomcat.jdbc.pool.DataSourceFactory.getObjectInstance(DataSourceFactory.java:244) + at org.apache.naming.factory.FactoryBase.getObjectInstance(FactoryBase.java:91) + at java.naming/javax.naming.spi.NamingManager.getObjectInstance(NamingManager.java:341) + at org.apache.naming.NamingContext.lookup(NamingContext.java:510) + ... 19 more + Caused by: java.net.ConnectException: Connection refused (Connection refused) + at java.base/java.net.PlainSocketImpl.socketConnect(Native Method) + at java.base/java.net.AbstractPlainSocketImpl.doConnect(AbstractPlainSocketImpl.java:412) + at java.base/java.net.AbstractPlainSocketImpl.connectToAddress(AbstractPlainSocketImpl.java:255) + at java.base/java.net.AbstractPlainSocketImpl.connect(AbstractPlainSocketImpl.java:237) + at java.base/java.net.SocksSocketImpl.connect(SocksSocketImpl.java:392) + at java.base/java.net.Socket.connect(Socket.java:609) + at org.postgresql.core.PGStream.createSocket(PGStream.java:261) + at org.postgresql.core.PGStream.(PGStream.java:122) + at org.postgresql.core.v3.ConnectionFactoryImpl.tryConnect(ConnectionFactoryImpl.java:146) + at org.postgresql.core.v3.ConnectionFactoryImpl.openConnectionImpl(ConnectionFactoryImpl.java:289) + ... 36 more +30-Jul-2025 05:48:27.924 SEVERE [main] org.apache.tomcat.jdbc.pool.ConnectionPool.init Unable to create initial connections of pool. + org.postgresql.util.PSQLException: Connection to pgsql-postgis:5432 refused. Check that the hostname and port are correct and that the postmaster is accepting TCP/IP connections. + at org.postgresql.core.v3.ConnectionFactoryImpl.openConnectionImpl(ConnectionFactoryImpl.java:373) + at org.postgresql.core.ConnectionFactory.openConnection(ConnectionFactory.java:57) + at org.postgresql.jdbc.PgConnection.(PgConnection.java:277) + at org.postgresql.Driver.makeConnection(Driver.java:448) + at org.postgresql.Driver.connect(Driver.java:298) + at org.apache.tomcat.jdbc.pool.PooledConnection.connectUsingDriver(PooledConnection.java:346) + at org.apache.tomcat.jdbc.pool.PooledConnection.connect(PooledConnection.java:227) + at org.apache.tomcat.jdbc.pool.ConnectionPool.createConnection(ConnectionPool.java:772) + at org.apache.tomcat.jdbc.pool.ConnectionPool.borrowConnection(ConnectionPool.java:700) + at org.apache.tomcat.jdbc.pool.ConnectionPool.init(ConnectionPool.java:499) + at org.apache.tomcat.jdbc.pool.ConnectionPool.(ConnectionPool.java:155) + at org.apache.tomcat.jdbc.pool.DataSourceProxy.pCreatePool(DataSourceProxy.java:118) + at org.apache.tomcat.jdbc.pool.DataSourceProxy.createPool(DataSourceProxy.java:107) + at org.apache.tomcat.jdbc.pool.DataSourceFactory.createDataSource(DataSourceFactory.java:560) + at org.apache.tomcat.jdbc.pool.DataSourceFactory.getObjectInstance(DataSourceFactory.java:244) + at org.apache.naming.factory.FactoryBase.getObjectInstance(FactoryBase.java:91) + at java.naming/javax.naming.spi.NamingManager.getObjectInstance(NamingManager.java:341) + at org.apache.naming.NamingContext.lookup(NamingContext.java:510) + at org.apache.naming.NamingContext.lookup(NamingContext.java:153) + at org.apache.naming.factory.ResourceLinkFactory.getObjectInstance(ResourceLinkFactory.java:149) + at java.naming/javax.naming.spi.NamingManager.getObjectInstance(NamingManager.java:341) + at org.apache.naming.NamingContext.lookup(NamingContext.java:510) + at org.apache.naming.NamingContext.lookup(NamingContext.java:147) + at org.apache.naming.NamingContext.lookup(NamingContext.java:496) + at org.apache.naming.NamingContext.lookup(NamingContext.java:147) + at org.apache.naming.NamingContext.lookup(NamingContext.java:496) + at org.apache.naming.NamingContext.lookup(NamingContext.java:147) + at org.apache.naming.NamingContext.lookup(NamingContext.java:496) + at org.apache.naming.NamingContext.lookup(NamingContext.java:147) + at org.apache.naming.SelectorContext.lookup(SelectorContext.java:126) + at java.naming/javax.naming.InitialContext.lookup(InitialContext.java:413) + at org.hibernate.engine.jndi.internal.JndiServiceImpl.locate(JndiServiceImpl.java:97) + at org.hibernate.engine.jdbc.connections.internal.DatasourceConnectionProviderImpl.configure(DatasourceConnectionProviderImpl.java:98) + at org.hibernate.boot.registry.internal.StandardServiceRegistryImpl.configureService(StandardServiceRegistryImpl.java:107) + at org.hibernate.service.internal.AbstractServiceRegistryImpl.initializeService(AbstractServiceRegistryImpl.java:246) + at org.hibernate.service.internal.AbstractServiceRegistryImpl.getService(AbstractServiceRegistryImpl.java:214) + at org.hibernate.engine.jdbc.env.internal.JdbcEnvironmentInitiator.buildJdbcConnectionAccess(JdbcEnvironmentInitiator.java:145) + at org.hibernate.engine.jdbc.env.internal.JdbcEnvironmentInitiator.initiateService(JdbcEnvironmentInitiator.java:66) + at org.hibernate.engine.jdbc.env.internal.JdbcEnvironmentInitiator.initiateService(JdbcEnvironmentInitiator.java:35) + at org.hibernate.boot.registry.internal.StandardServiceRegistryImpl.initiateService(StandardServiceRegistryImpl.java:101) + at org.hibernate.service.internal.AbstractServiceRegistryImpl.createService(AbstractServiceRegistryImpl.java:263) + at org.hibernate.service.internal.AbstractServiceRegistryImpl.initializeService(AbstractServiceRegistryImpl.java:237) + at org.hibernate.service.internal.AbstractServiceRegistryImpl.getService(AbstractServiceRegistryImpl.java:214) + at org.hibernate.id.factory.internal.DefaultIdentifierGeneratorFactory.injectServices(DefaultIdentifierGeneratorFactory.java:152) + at org.hibernate.service.internal.AbstractServiceRegistryImpl.injectDependencies(AbstractServiceRegistryImpl.java:286) + at org.hibernate.service.internal.AbstractServiceRegistryImpl.initializeService(AbstractServiceRegistryImpl.java:243) + at org.hibernate.service.internal.AbstractServiceRegistryImpl.getService(AbstractServiceRegistryImpl.java:214) + at org.hibernate.boot.internal.InFlightMetadataCollectorImpl.(InFlightMetadataCollectorImpl.java:175) + at org.hibernate.boot.model.process.spi.MetadataBuildingProcess.complete(MetadataBuildingProcess.java:118) + at org.hibernate.boot.model.process.spi.MetadataBuildingProcess.build(MetadataBuildingProcess.java:83) + at org.hibernate.boot.internal.MetadataBuilderImpl.build(MetadataBuilderImpl.java:473) + at org.hibernate.boot.internal.MetadataBuilderImpl.build(MetadataBuilderImpl.java:84) + at org.hibernate.cfg.Configuration.buildSessionFactory(Configuration.java:689) + at org.wcs.smart.connect.hibernate.ConnectStartupContextListener.contextInitialized(ConnectStartupContextListener.java:461) + at org.apache.catalina.core.StandardContext.listenerStart(StandardContext.java:4059) + at org.apache.catalina.core.StandardContext.startInternal(StandardContext.java:4501) + at org.apache.catalina.util.LifecycleBase.start(LifecycleBase.java:164) + at org.apache.catalina.core.ContainerBase.addChildInternal(ContainerBase.java:599) + at org.apache.catalina.core.ContainerBase.addChild(ContainerBase.java:571) + at org.apache.catalina.core.StandardHost.addChild(StandardHost.java:603) + at org.apache.catalina.startup.HostConfig.deployDirectory(HostConfig.java:1174) + at org.apache.catalina.startup.HostConfig$DeployDirectory.run(HostConfig.java:1883) + at java.base/java.util.concurrent.Executors$RunnableAdapter.call(Executors.java:515) + at java.base/java.util.concurrent.FutureTask.run(FutureTask.java:264) + at org.apache.tomcat.util.threads.InlineExecutorService.execute(InlineExecutorService.java:76) + at java.base/java.util.concurrent.AbstractExecutorService.submit(AbstractExecutorService.java:118) + at org.apache.catalina.startup.HostConfig.deployDirectories(HostConfig.java:1085) + at org.apache.catalina.startup.HostConfig.deployApps(HostConfig.java:470) + at org.apache.catalina.startup.HostConfig.start(HostConfig.java:1579) + at org.apache.catalina.startup.HostConfig.lifecycleEvent(HostConfig.java:312) + at org.apache.catalina.util.LifecycleBase.fireLifecycleEvent(LifecycleBase.java:109) + at org.apache.catalina.util.LifecycleBase.setStateInternal(LifecycleBase.java:389) + at org.apache.catalina.util.LifecycleBase.setState(LifecycleBase.java:336) + at org.apache.catalina.core.ContainerBase.startInternal(ContainerBase.java:776) + at org.apache.catalina.core.StandardHost.startInternal(StandardHost.java:721) + at org.apache.catalina.util.LifecycleBase.start(LifecycleBase.java:164) + at org.apache.catalina.core.ContainerBase$StartChild.call(ContainerBase.java:1203) + at org.apache.catalina.core.ContainerBase$StartChild.call(ContainerBase.java:1193) + at java.base/java.util.concurrent.FutureTask.run(FutureTask.java:264) + at org.apache.tomcat.util.threads.InlineExecutorService.execute(InlineExecutorService.java:76) + at java.base/java.util.concurrent.AbstractExecutorService.submit(AbstractExecutorService.java:140) + at org.apache.catalina.core.ContainerBase.startInternal(ContainerBase.java:749) + at org.apache.catalina.core.StandardEngine.startInternal(StandardEngine.java:211) + at org.apache.catalina.util.LifecycleBase.start(LifecycleBase.java:164) + at org.apache.catalina.core.StandardService.startInternal(StandardService.java:412) + at org.apache.catalina.util.LifecycleBase.start(LifecycleBase.java:164) + at org.apache.catalina.core.StandardServer.startInternal(StandardServer.java:874) + at org.apache.catalina.util.LifecycleBase.start(LifecycleBase.java:164) + at org.apache.catalina.startup.Catalina.start(Catalina.java:739) + at java.base/jdk.internal.reflect.NativeMethodAccessorImpl.invoke0(Native Method) + at java.base/jdk.internal.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62) + at java.base/jdk.internal.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43) + at java.base/java.lang.reflect.Method.invoke(Method.java:566) + at org.apache.catalina.startup.Bootstrap.start(Bootstrap.java:345) + at org.apache.catalina.startup.Bootstrap.main(Bootstrap.java:476) + Caused by: java.net.ConnectException: Connection refused (Connection refused) + at java.base/java.net.PlainSocketImpl.socketConnect(Native Method) + at java.base/java.net.AbstractPlainSocketImpl.doConnect(AbstractPlainSocketImpl.java:412) + at java.base/java.net.AbstractPlainSocketImpl.connectToAddress(AbstractPlainSocketImpl.java:255) + at java.base/java.net.AbstractPlainSocketImpl.connect(AbstractPlainSocketImpl.java:237) + at java.base/java.net.SocksSocketImpl.connect(SocksSocketImpl.java:392) + at java.base/java.net.Socket.connect(Socket.java:609) + at org.postgresql.core.PGStream.createSocket(PGStream.java:261) + at org.postgresql.core.PGStream.(PGStream.java:122) + at org.postgresql.core.v3.ConnectionFactoryImpl.tryConnect(ConnectionFactoryImpl.java:146) + at org.postgresql.core.v3.ConnectionFactoryImpl.openConnectionImpl(ConnectionFactoryImpl.java:289) + ... 94 more +30-Jul-2025 05:48:27.925 SEVERE [main] org.apache.catalina.core.StandardContext.listenerStart Exception sending context initialized event to listener instance of class [org.wcs.smart.connect.hibernate.ConnectStartupContextListener] + org.hibernate.service.spi.ServiceException: Unable to create requested service [org.hibernate.engine.jdbc.env.spi.JdbcEnvironment] + at org.hibernate.service.internal.AbstractServiceRegistryImpl.createService(AbstractServiceRegistryImpl.java:275) + at org.hibernate.service.internal.AbstractServiceRegistryImpl.initializeService(AbstractServiceRegistryImpl.java:237) + at org.hibernate.service.internal.AbstractServiceRegistryImpl.getService(AbstractServiceRegistryImpl.java:214) + at org.hibernate.id.factory.internal.DefaultIdentifierGeneratorFactory.injectServices(DefaultIdentifierGeneratorFactory.java:152) + at org.hibernate.service.internal.AbstractServiceRegistryImpl.injectDependencies(AbstractServiceRegistryImpl.java:286) + at org.hibernate.service.internal.AbstractServiceRegistryImpl.initializeService(AbstractServiceRegistryImpl.java:243) + at org.hibernate.service.internal.AbstractServiceRegistryImpl.getService(AbstractServiceRegistryImpl.java:214) + at org.hibernate.boot.internal.InFlightMetadataCollectorImpl.(InFlightMetadataCollectorImpl.java:175) + at org.hibernate.boot.model.process.spi.MetadataBuildingProcess.complete(MetadataBuildingProcess.java:118) + at org.hibernate.boot.model.process.spi.MetadataBuildingProcess.build(MetadataBuildingProcess.java:83) + at org.hibernate.boot.internal.MetadataBuilderImpl.build(MetadataBuilderImpl.java:473) + at org.hibernate.boot.internal.MetadataBuilderImpl.build(MetadataBuilderImpl.java:84) + at org.hibernate.cfg.Configuration.buildSessionFactory(Configuration.java:689) + at org.wcs.smart.connect.hibernate.ConnectStartupContextListener.contextInitialized(ConnectStartupContextListener.java:461) + at org.apache.catalina.core.StandardContext.listenerStart(StandardContext.java:4059) + at org.apache.catalina.core.StandardContext.startInternal(StandardContext.java:4501) + at org.apache.catalina.util.LifecycleBase.start(LifecycleBase.java:164) + at org.apache.catalina.core.ContainerBase.addChildInternal(ContainerBase.java:599) + at org.apache.catalina.core.ContainerBase.addChild(ContainerBase.java:571) + at org.apache.catalina.core.StandardHost.addChild(StandardHost.java:603) + at org.apache.catalina.startup.HostConfig.deployDirectory(HostConfig.java:1174) + at org.apache.catalina.startup.HostConfig$DeployDirectory.run(HostConfig.java:1883) + at java.base/java.util.concurrent.Executors$RunnableAdapter.call(Executors.java:515) + at java.base/java.util.concurrent.FutureTask.run(FutureTask.java:264) + at org.apache.tomcat.util.threads.InlineExecutorService.execute(InlineExecutorService.java:76) + at java.base/java.util.concurrent.AbstractExecutorService.submit(AbstractExecutorService.java:118) + at org.apache.catalina.startup.HostConfig.deployDirectories(HostConfig.java:1085) + at org.apache.catalina.startup.HostConfig.deployApps(HostConfig.java:470) + at org.apache.catalina.startup.HostConfig.start(HostConfig.java:1579) + at org.apache.catalina.startup.HostConfig.lifecycleEvent(HostConfig.java:312) + at org.apache.catalina.util.LifecycleBase.fireLifecycleEvent(LifecycleBase.java:109) + at org.apache.catalina.util.LifecycleBase.setStateInternal(LifecycleBase.java:389) + at org.apache.catalina.util.LifecycleBase.setState(LifecycleBase.java:336) + at org.apache.catalina.core.ContainerBase.startInternal(ContainerBase.java:776) + at org.apache.catalina.core.StandardHost.startInternal(StandardHost.java:721) + at org.apache.catalina.util.LifecycleBase.start(LifecycleBase.java:164) + at org.apache.catalina.core.ContainerBase$StartChild.call(ContainerBase.java:1203) + at org.apache.catalina.core.ContainerBase$StartChild.call(ContainerBase.java:1193) + at java.base/java.util.concurrent.FutureTask.run(FutureTask.java:264) + at org.apache.tomcat.util.threads.InlineExecutorService.execute(InlineExecutorService.java:76) + at java.base/java.util.concurrent.AbstractExecutorService.submit(AbstractExecutorService.java:140) + at org.apache.catalina.core.ContainerBase.startInternal(ContainerBase.java:749) + at org.apache.catalina.core.StandardEngine.startInternal(StandardEngine.java:211) + at org.apache.catalina.util.LifecycleBase.start(LifecycleBase.java:164) + at org.apache.catalina.core.StandardService.startInternal(StandardService.java:412) + at org.apache.catalina.util.LifecycleBase.start(LifecycleBase.java:164) + at org.apache.catalina.core.StandardServer.startInternal(StandardServer.java:874) + at org.apache.catalina.util.LifecycleBase.start(LifecycleBase.java:164) + at org.apache.catalina.startup.Catalina.start(Catalina.java:739) + at java.base/jdk.internal.reflect.NativeMethodAccessorImpl.invoke0(Native Method) + at java.base/jdk.internal.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62) + at java.base/jdk.internal.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43) + at java.base/java.lang.reflect.Method.invoke(Method.java:566) + at org.apache.catalina.startup.Bootstrap.start(Bootstrap.java:345) + at org.apache.catalina.startup.Bootstrap.main(Bootstrap.java:476) + Caused by: org.hibernate.engine.jndi.JndiException: Unable to lookup JNDI name [java:comp/env/jdbc/smart] + at org.hibernate.engine.jndi.internal.JndiServiceImpl.locate(JndiServiceImpl.java:100) + at org.hibernate.engine.jdbc.connections.internal.DatasourceConnectionProviderImpl.configure(DatasourceConnectionProviderImpl.java:98) + at org.hibernate.boot.registry.internal.StandardServiceRegistryImpl.configureService(StandardServiceRegistryImpl.java:107) + at org.hibernate.service.internal.AbstractServiceRegistryImpl.initializeService(AbstractServiceRegistryImpl.java:246) + at org.hibernate.service.internal.AbstractServiceRegistryImpl.getService(AbstractServiceRegistryImpl.java:214) + at org.hibernate.engine.jdbc.env.internal.JdbcEnvironmentInitiator.buildJdbcConnectionAccess(JdbcEnvironmentInitiator.java:145) + at org.hibernate.engine.jdbc.env.internal.JdbcEnvironmentInitiator.initiateService(JdbcEnvironmentInitiator.java:66) + at org.hibernate.engine.jdbc.env.internal.JdbcEnvironmentInitiator.initiateService(JdbcEnvironmentInitiator.java:35) + at org.hibernate.boot.registry.internal.StandardServiceRegistryImpl.initiateService(StandardServiceRegistryImpl.java:101) + at org.hibernate.service.internal.AbstractServiceRegistryImpl.createService(AbstractServiceRegistryImpl.java:263) + ... 54 more + Caused by: javax.naming.NamingException: Unexpected exception resolving reference with name [org.wcs.smart.connect.datasource.postgresql] [Root exception is org.postgresql.util.PSQLException: Connection to pgsql-postgis:5432 refused. Check that the hostname and port are correct and that the postmaster is accepting TCP/IP connections.] + at org.apache.naming.NamingContext.lookup(NamingContext.java:540) + at org.apache.naming.NamingContext.lookup(NamingContext.java:153) + at org.apache.naming.factory.ResourceLinkFactory.getObjectInstance(ResourceLinkFactory.java:149) + at java.naming/javax.naming.spi.NamingManager.getObjectInstance(NamingManager.java:341) + at org.apache.naming.NamingContext.lookup(NamingContext.java:510) + at org.apache.naming.NamingContext.lookup(NamingContext.java:147) + at org.apache.naming.NamingContext.lookup(NamingContext.java:496) + at org.apache.naming.NamingContext.lookup(NamingContext.java:147) + at org.apache.naming.NamingContext.lookup(NamingContext.java:496) + at org.apache.naming.NamingContext.lookup(NamingContext.java:147) + at org.apache.naming.NamingContext.lookup(NamingContext.java:496) + at org.apache.naming.NamingContext.lookup(NamingContext.java:147) + at org.apache.naming.SelectorContext.lookup(SelectorContext.java:126) + at java.naming/javax.naming.InitialContext.lookup(InitialContext.java:413) + at org.hibernate.engine.jndi.internal.JndiServiceImpl.locate(JndiServiceImpl.java:97) + ... 63 more + Caused by: org.postgresql.util.PSQLException: Connection to pgsql-postgis:5432 refused. Check that the hostname and port are correct and that the postmaster is accepting TCP/IP connections. + at org.postgresql.core.v3.ConnectionFactoryImpl.openConnectionImpl(ConnectionFactoryImpl.java:373) + at org.postgresql.core.ConnectionFactory.openConnection(ConnectionFactory.java:57) + at org.postgresql.jdbc.PgConnection.(PgConnection.java:277) + at org.postgresql.Driver.makeConnection(Driver.java:448) + at org.postgresql.Driver.connect(Driver.java:298) + at org.apache.tomcat.jdbc.pool.PooledConnection.connectUsingDriver(PooledConnection.java:346) + at org.apache.tomcat.jdbc.pool.PooledConnection.connect(PooledConnection.java:227) + at org.apache.tomcat.jdbc.pool.ConnectionPool.createConnection(ConnectionPool.java:772) + at org.apache.tomcat.jdbc.pool.ConnectionPool.borrowConnection(ConnectionPool.java:700) + at org.apache.tomcat.jdbc.pool.ConnectionPool.init(ConnectionPool.java:499) + at org.apache.tomcat.jdbc.pool.ConnectionPool.(ConnectionPool.java:155) + at org.apache.tomcat.jdbc.pool.DataSourceProxy.pCreatePool(DataSourceProxy.java:118) + at org.apache.tomcat.jdbc.pool.DataSourceProxy.createPool(DataSourceProxy.java:107) + at org.apache.tomcat.jdbc.pool.DataSourceFactory.createDataSource(DataSourceFactory.java:560) + at org.apache.tomcat.jdbc.pool.DataSourceFactory.getObjectInstance(DataSourceFactory.java:244) + at org.apache.naming.factory.FactoryBase.getObjectInstance(FactoryBase.java:91) + at java.naming/javax.naming.spi.NamingManager.getObjectInstance(NamingManager.java:341) + at org.apache.naming.NamingContext.lookup(NamingContext.java:510) + ... 77 more + Caused by: java.net.ConnectException: Connection refused (Connection refused) + at java.base/java.net.PlainSocketImpl.socketConnect(Native Method) + at java.base/java.net.AbstractPlainSocketImpl.doConnect(AbstractPlainSocketImpl.java:412) + at java.base/java.net.AbstractPlainSocketImpl.connectToAddress(AbstractPlainSocketImpl.java:255) + at java.base/java.net.AbstractPlainSocketImpl.connect(AbstractPlainSocketImpl.java:237) + at java.base/java.net.SocksSocketImpl.connect(SocksSocketImpl.java:392) + at java.base/java.net.Socket.connect(Socket.java:609) + at org.postgresql.core.PGStream.createSocket(PGStream.java:261) + at org.postgresql.core.PGStream.(PGStream.java:122) + at org.postgresql.core.v3.ConnectionFactoryImpl.tryConnect(ConnectionFactoryImpl.java:146) + at org.postgresql.core.v3.ConnectionFactoryImpl.openConnectionImpl(ConnectionFactoryImpl.java:289) + ... 94 more +30-Jul-2025 05:48:27.927 SEVERE [main] org.apache.catalina.core.StandardContext.startInternal One or more listeners failed to start. Full details will be found in the appropriate container log file +30-Jul-2025 05:48:27.928 SEVERE [main] org.apache.catalina.core.StandardContext.startInternal Context [] startup failed due to previous errors diff --git a/app/webapps/ROOT/META-INF/war-tracker b/app/opt/tomcat9/logs/sc_access.2025-07-30.log similarity index 100% rename from app/webapps/ROOT/META-INF/war-tracker rename to app/opt/tomcat9/logs/sc_access.2025-07-30.log diff --git a/app/opt/tomcat9/temp/GeoTools/Databases/HSQL/v9.6.0/EPSG.data b/app/opt/tomcat9/temp/GeoTools/Databases/HSQL/v9.6.0/EPSG.data new file mode 100644 index 0000000..be0d7ae Binary files /dev/null and b/app/opt/tomcat9/temp/GeoTools/Databases/HSQL/v9.6.0/EPSG.data differ diff --git a/app/opt/tomcat9/temp/GeoTools/Databases/HSQL/v9.6.0/EPSG.properties b/app/opt/tomcat9/temp/GeoTools/Databases/HSQL/v9.6.0/EPSG.properties new file mode 100644 index 0000000..252a159 --- /dev/null +++ b/app/opt/tomcat9/temp/GeoTools/Databases/HSQL/v9.6.0/EPSG.properties @@ -0,0 +1,7 @@ +#EPSG database on HSQL +#Mon Jul 08 11:57:11 CEST 2019 +version=2.4.1 +readonly=true +epsg.version=9.6.0 +tx_timestamp=0 +modified=no diff --git a/app/opt/tomcat9/temp/GeoTools/Databases/HSQL/v9.6.0/EPSG.script b/app/opt/tomcat9/temp/GeoTools/Databases/HSQL/v9.6.0/EPSG.script new file mode 100644 index 0000000..c1cc3f6 --- /dev/null +++ b/app/opt/tomcat9/temp/GeoTools/Databases/HSQL/v9.6.0/EPSG.script @@ -0,0 +1,128 @@ +SET DATABASE UNIQUE NAME HSQLDB6BD103EBD8 +SET DATABASE GC 0 +SET DATABASE DEFAULT RESULT MEMORY ROWS 0 +SET DATABASE EVENT LOG LEVEL 0 +SET DATABASE TRANSACTION CONTROL LOCKS +SET DATABASE DEFAULT ISOLATION LEVEL READ COMMITTED +SET DATABASE TRANSACTION ROLLBACK ON CONFLICT TRUE +SET DATABASE TEXT TABLE DEFAULTS '' +SET DATABASE SQL NAMES FALSE +SET DATABASE SQL REFERENCES FALSE +SET DATABASE SQL SIZE TRUE +SET DATABASE SQL TYPES FALSE +SET DATABASE SQL TDC DELETE TRUE +SET DATABASE SQL TDC UPDATE TRUE +SET DATABASE SQL CONCAT NULLS TRUE +SET DATABASE SQL UNIQUE NULLS TRUE +SET DATABASE SQL CONVERT TRUNCATE TRUE +SET DATABASE SQL AVG SCALE 0 +SET DATABASE SQL DOUBLE NAN TRUE +SET FILES WRITE DELAY 500 MILLIS +SET FILES BACKUP INCREMENT TRUE +SET FILES CACHE SIZE 10000 +SET FILES CACHE ROWS 50000 +SET FILES SCALE 32 +SET FILES LOB SCALE 32 +SET FILES DEFRAG 0 +SET FILES NIO TRUE +SET FILES NIO SIZE 256 +SET FILES LOG TRUE +SET FILES LOG SIZE 50 +CREATE USER SA PASSWORD DIGEST 'd41d8cd98f00b204e9800998ecf8427e' +ALTER USER SA SET LOCAL TRUE +CREATE SCHEMA PUBLIC AUTHORIZATION DBA +SET SCHEMA PUBLIC +CREATE CACHED TABLE PUBLIC.EPSG_ALIAS(ALIAS_CODE INTEGER NOT NULL,OBJECT_TABLE_NAME VARCHAR(80) NOT NULL,OBJECT_CODE INTEGER NOT NULL,NAMING_SYSTEM_CODE INTEGER NOT NULL,ALIAS VARCHAR(80) NOT NULL,REMARKS VARCHAR(254),CONSTRAINT PK_ALIAS PRIMARY KEY(ALIAS_CODE)) +CREATE INDEX ALIAS_OBJECT_CODE ON PUBLIC.EPSG_ALIAS(OBJECT_CODE) +CREATE CACHED TABLE PUBLIC.EPSG_AREA(AREA_CODE INTEGER NOT NULL,AREA_NAME VARCHAR(80) NOT NULL,AREA_OF_USE VARCHAR(4000) NOT NULL,AREA_SOUTH_BOUND_LAT DOUBLE,AREA_NORTH_BOUND_LAT DOUBLE,AREA_WEST_BOUND_LON DOUBLE,AREA_EAST_BOUND_LON DOUBLE,AREA_POLYGON_FILE_REF VARCHAR(254),ISO_A2_CODE VARCHAR(2),ISO_A3_CODE VARCHAR(3),ISO_N_CODE INTEGER,REMARKS VARCHAR(254),INFORMATION_SOURCE VARCHAR(254),DATA_SOURCE VARCHAR(40) NOT NULL,REVISION_DATE DATE NOT NULL,CHANGE_ID VARCHAR(255),DEPRECATED SMALLINT NOT NULL,CONSTRAINT PK_AREA PRIMARY KEY(AREA_CODE)) +CREATE CACHED TABLE PUBLIC.EPSG_CHANGE(CHANGE_ID DOUBLE NOT NULL,REPORT_DATE DATE NOT NULL,DATE_CLOSED DATE,REPORTER VARCHAR(254) NOT NULL,REQUEST VARCHAR(254) NOT NULL,TABLES_AFFECTED VARCHAR(254),CODES_AFFECTED VARCHAR(254),CHANGE_COMMENT VARCHAR(254),ACTION VARCHAR(4000),UNIQUE(CHANGE_ID)) +CREATE CACHED TABLE PUBLIC.EPSG_COORDINATEAXIS(COORD_AXIS_CODE INTEGER,COORD_SYS_CODE INTEGER NOT NULL,COORD_AXIS_NAME_CODE INTEGER NOT NULL,COORD_AXIS_ORIENTATION VARCHAR(48) NOT NULL,COORD_AXIS_ABBREVIATION VARCHAR(24) NOT NULL,UOM_CODE INTEGER NOT NULL,COORD_AXIS_ORDER SMALLINT NOT NULL,CONSTRAINT PK_COORDINATEAXIS PRIMARY KEY(COORD_SYS_CODE,COORD_AXIS_NAME_CODE),UNIQUE(COORD_AXIS_CODE)) +CREATE INDEX COORDINATE_AXIS_CODE ON PUBLIC.EPSG_COORDINATEAXIS(COORD_AXIS_CODE) +CREATE INDEX COORDINATE_AXIS_SYS_CODE ON PUBLIC.EPSG_COORDINATEAXIS(COORD_SYS_CODE) +CREATE INDEX COORDINATE_AXIS_ORDER ON PUBLIC.EPSG_COORDINATEAXIS(COORD_AXIS_ORDER) +CREATE CACHED TABLE PUBLIC.EPSG_COORDINATEAXISNAME(COORD_AXIS_NAME_CODE INTEGER NOT NULL,COORD_AXIS_NAME VARCHAR(80) NOT NULL,DESCRIPTION VARCHAR(254),REMARKS VARCHAR(254),INFORMATION_SOURCE VARCHAR(254),DATA_SOURCE VARCHAR(40) NOT NULL,REVISION_DATE DATE NOT NULL,CHANGE_ID VARCHAR(255),DEPRECATED SMALLINT NOT NULL,CONSTRAINT PK_COORDINATEAXISNAME PRIMARY KEY(COORD_AXIS_NAME_CODE)) +CREATE INDEX NAME_AXIS ON PUBLIC.EPSG_COORDINATEAXISNAME(COORD_AXIS_NAME) +CREATE CACHED TABLE PUBLIC.EPSG_COORDINATEREFERENCESYSTEM(COORD_REF_SYS_CODE INTEGER NOT NULL,COORD_REF_SYS_NAME VARCHAR(80) NOT NULL,AREA_OF_USE_CODE INTEGER NOT NULL,COORD_REF_SYS_KIND VARCHAR(24) NOT NULL,COORD_SYS_CODE INTEGER,DATUM_CODE INTEGER,SOURCE_GEOGCRS_CODE INTEGER,PROJECTION_CONV_CODE INTEGER,CMPD_HORIZCRS_CODE INTEGER,CMPD_VERTCRS_CODE INTEGER,CRS_SCOPE VARCHAR(254) NOT NULL,REMARKS VARCHAR(512),INFORMATION_SOURCE VARCHAR(254),DATA_SOURCE VARCHAR(40) NOT NULL,REVISION_DATE DATE NOT NULL,CHANGE_ID VARCHAR(255),SHOW_CRS SMALLINT NOT NULL,DEPRECATED SMALLINT NOT NULL,CONSTRAINT PK_COORDINATEREFERENCESYSTEM PRIMARY KEY(COORD_REF_SYS_CODE),CONSTRAINT FK_CMPD_HORIZCRS_CODE FOREIGN KEY(CMPD_HORIZCRS_CODE) REFERENCES PUBLIC.EPSG_COORDINATEREFERENCESYSTEM(COORD_REF_SYS_CODE),CONSTRAINT FK_AREA_OF_USE_CODE FOREIGN KEY(AREA_OF_USE_CODE) REFERENCES PUBLIC.EPSG_AREA(AREA_CODE),CONSTRAINT FK_CMPD_VERTCRS_CODE FOREIGN KEY(CMPD_VERTCRS_CODE) REFERENCES PUBLIC.EPSG_COORDINATEREFERENCESYSTEM(COORD_REF_SYS_CODE),CONSTRAINT FK_SOURCE_GEOGCRS_CODE FOREIGN KEY(SOURCE_GEOGCRS_CODE) REFERENCES PUBLIC.EPSG_COORDINATEREFERENCESYSTEM(COORD_REF_SYS_CODE)) +CREATE INDEX CRS_DATUM_CODE ON PUBLIC.EPSG_COORDINATEREFERENCESYSTEM(DATUM_CODE) +CREATE INDEX CRS_PROJECTION_CODE ON PUBLIC.EPSG_COORDINATEREFERENCESYSTEM(PROJECTION_CONV_CODE) +CREATE INDEX NAME_CRS ON PUBLIC.EPSG_COORDINATEREFERENCESYSTEM(COORD_REF_SYS_NAME) +CREATE CACHED TABLE PUBLIC.EPSG_COORDINATESYSTEM(COORD_SYS_CODE INTEGER NOT NULL,COORD_SYS_NAME VARCHAR(254) NOT NULL,COORD_SYS_TYPE VARCHAR(24) NOT NULL,DIMENSION SMALLINT NOT NULL,REMARKS VARCHAR(254),INFORMATION_SOURCE VARCHAR(254),DATA_SOURCE VARCHAR(50) NOT NULL,REVISION_DATE DATE NOT NULL,CHANGE_ID VARCHAR(255),DEPRECATED SMALLINT NOT NULL,CONSTRAINT PK_COORDINATESYSTEM PRIMARY KEY(COORD_SYS_CODE)) +CREATE INDEX NAME_CS ON PUBLIC.EPSG_COORDINATESYSTEM(COORD_SYS_NAME) +CREATE CACHED TABLE PUBLIC.EPSG_COORDOPERATION(COORD_OP_CODE INTEGER NOT NULL,COORD_OP_NAME VARCHAR(80) NOT NULL,COORD_OP_TYPE VARCHAR(24) NOT NULL,SOURCE_CRS_CODE INTEGER,TARGET_CRS_CODE INTEGER,COORD_TFM_VERSION VARCHAR(24),COORD_OP_VARIANT SMALLINT,AREA_OF_USE_CODE INTEGER NOT NULL,COORD_OP_SCOPE VARCHAR(254) NOT NULL,COORD_OP_ACCURACY DOUBLE,COORD_OP_METHOD_CODE INTEGER,UOM_CODE_SOURCE_COORD_DIFF INTEGER,UOM_CODE_TARGET_COORD_DIFF INTEGER,REMARKS VARCHAR(512),INFORMATION_SOURCE VARCHAR(512),DATA_SOURCE VARCHAR(40) NOT NULL,REVISION_DATE DATE NOT NULL,CHANGE_ID VARCHAR(255),SHOW_OPERATION SMALLINT NOT NULL,DEPRECATED SMALLINT NOT NULL,CONSTRAINT PK_COORDINATE_OPERATION PRIMARY KEY(COORD_OP_CODE),CONSTRAINT FK_SOURCE_CRS_CODE FOREIGN KEY(SOURCE_CRS_CODE) REFERENCES PUBLIC.EPSG_COORDINATEREFERENCESYSTEM(COORD_REF_SYS_CODE),CONSTRAINT FK_TARGET_CRS_CODE FOREIGN KEY(TARGET_CRS_CODE) REFERENCES PUBLIC.EPSG_COORDINATEREFERENCESYSTEM(COORD_REF_SYS_CODE),CONSTRAINT FK_AREA_OF_USE_CODE3 FOREIGN KEY(AREA_OF_USE_CODE) REFERENCES PUBLIC.EPSG_AREA(AREA_CODE)) +CREATE INDEX COORDINATE_OPERATION_CRS ON PUBLIC.EPSG_COORDOPERATION(SOURCE_CRS_CODE,TARGET_CRS_CODE) +CREATE INDEX COORDINATE_OPERATION_METHOD_CODE ON PUBLIC.EPSG_COORDOPERATION(COORD_OP_METHOD_CODE) +CREATE INDEX COORDINATE_OPERATION_ACCURACY ON PUBLIC.EPSG_COORDOPERATION(COORD_OP_ACCURACY) +CREATE INDEX NAME_COORD_OP ON PUBLIC.EPSG_COORDOPERATION(COORD_OP_NAME) +CREATE CACHED TABLE PUBLIC.EPSG_COORDOPERATIONMETHOD(COORD_OP_METHOD_CODE INTEGER NOT NULL,COORD_OP_METHOD_NAME VARCHAR(50) NOT NULL,REVERSE_OP SMALLINT NOT NULL,FORMULA VARCHAR(4000),EXAMPLE VARCHAR(4000),REMARKS VARCHAR(254),INFORMATION_SOURCE VARCHAR(254),DATA_SOURCE VARCHAR(40) NOT NULL,REVISION_DATE DATE NOT NULL,CHANGE_ID VARCHAR(255),DEPRECATED SMALLINT NOT NULL,CONSTRAINT PK_COORDINATE_OPERATIONMETHOD PRIMARY KEY(COORD_OP_METHOD_CODE)) +CREATE INDEX NAME_METHOD ON PUBLIC.EPSG_COORDOPERATIONMETHOD(COORD_OP_METHOD_NAME) +CREATE CACHED TABLE PUBLIC.EPSG_COORDOPERATIONPARAM(PARAMETER_CODE INTEGER NOT NULL,PARAMETER_NAME VARCHAR(80) NOT NULL,DESCRIPTION VARCHAR(4000),INFORMATION_SOURCE VARCHAR(254),DATA_SOURCE VARCHAR(40) NOT NULL,REVISION_DATE DATE NOT NULL,CHANGE_ID VARCHAR(255),DEPRECATED SMALLINT NOT NULL,CONSTRAINT PK_COORDINATE_OPERATIONPARAMET PRIMARY KEY(PARAMETER_CODE)) +CREATE INDEX NAME_PARAMETER ON PUBLIC.EPSG_COORDOPERATIONPARAM(PARAMETER_NAME) +CREATE CACHED TABLE PUBLIC.EPSG_COORDOPERATIONPARAMUSAGE(COORD_OP_METHOD_CODE INTEGER NOT NULL,PARAMETER_CODE INTEGER NOT NULL,SORT_ORDER SMALLINT NOT NULL,PARAM_SIGN_REVERSAL VARCHAR(3),CONSTRAINT PK_COORDINATE_OPERATIONPARAME2 PRIMARY KEY(PARAMETER_CODE,COORD_OP_METHOD_CODE),CONSTRAINT FK_PARAMETER_CODE FOREIGN KEY(PARAMETER_CODE) REFERENCES PUBLIC.EPSG_COORDOPERATIONPARAM(PARAMETER_CODE),CONSTRAINT FK_COORD_OP_METHOD_CODE2 FOREIGN KEY(COORD_OP_METHOD_CODE) REFERENCES PUBLIC.EPSG_COORDOPERATIONMETHOD(COORD_OP_METHOD_CODE)) +CREATE INDEX PARAMETER_USAGE_METHOD_CODE ON PUBLIC.EPSG_COORDOPERATIONPARAMUSAGE(COORD_OP_METHOD_CODE) +CREATE INDEX PARAMETER_ORDER ON PUBLIC.EPSG_COORDOPERATIONPARAMUSAGE(SORT_ORDER) +CREATE CACHED TABLE PUBLIC.EPSG_COORDOPERATIONPARAMVALUE(COORD_OP_CODE INTEGER NOT NULL,COORD_OP_METHOD_CODE INTEGER NOT NULL,PARAMETER_CODE INTEGER NOT NULL,PARAMETER_VALUE DOUBLE,PARAM_VALUE_FILE_REF VARCHAR(254),UOM_CODE INTEGER,CONSTRAINT PK_COORDINATE_OPERATIONPARAME3 PRIMARY KEY(COORD_OP_CODE,PARAMETER_CODE,COORD_OP_METHOD_CODE),CONSTRAINT FK_PARAMETER_CODECOORD_OP_METH FOREIGN KEY(PARAMETER_CODE,COORD_OP_METHOD_CODE) REFERENCES PUBLIC.EPSG_COORDOPERATIONPARAMUSAGE(PARAMETER_CODE,COORD_OP_METHOD_CODE),CONSTRAINT FK_COORD_OP_CODE FOREIGN KEY(COORD_OP_CODE) REFERENCES PUBLIC.EPSG_COORDOPERATION(COORD_OP_CODE)) +CREATE INDEX PARAMETER_VALUES ON PUBLIC.EPSG_COORDOPERATIONPARAMVALUE(COORD_OP_CODE,COORD_OP_METHOD_CODE) +CREATE INDEX PARAMETER_VALUE_CODE ON PUBLIC.EPSG_COORDOPERATIONPARAMVALUE(PARAMETER_CODE) +CREATE CACHED TABLE PUBLIC.EPSG_COORDOPERATIONPATH(CONCAT_OPERATION_CODE INTEGER NOT NULL,SINGLE_OPERATION_CODE INTEGER NOT NULL,OP_PATH_STEP SMALLINT NOT NULL,CONSTRAINT PK_COORDINATE_OPERATIONPATH PRIMARY KEY(CONCAT_OPERATION_CODE,SINGLE_OPERATION_CODE),CONSTRAINT FK_CONCAT_OPERATION_CODE FOREIGN KEY(CONCAT_OPERATION_CODE) REFERENCES PUBLIC.EPSG_COORDOPERATION(COORD_OP_CODE),CONSTRAINT FK_SINGLE_OPERATION_CODE FOREIGN KEY(SINGLE_OPERATION_CODE) REFERENCES PUBLIC.EPSG_COORDOPERATION(COORD_OP_CODE)) +CREATE INDEX PATH_CONCAT_OPERATION_CODE ON PUBLIC.EPSG_COORDOPERATIONPATH(CONCAT_OPERATION_CODE) +CREATE INDEX PATH_CONCAT_OPERATION_STEP ON PUBLIC.EPSG_COORDOPERATIONPATH(OP_PATH_STEP) +CREATE CACHED TABLE PUBLIC.EPSG_DATUM(DATUM_CODE INTEGER NOT NULL,DATUM_NAME VARCHAR(80) NOT NULL,DATUM_TYPE VARCHAR(24) NOT NULL,ORIGIN_DESCRIPTION VARCHAR(512),REALIZATION_EPOCH DATE,ELLIPSOID_CODE INTEGER,PRIME_MERIDIAN_CODE INTEGER,AREA_OF_USE_CODE INTEGER NOT NULL,DATUM_SCOPE VARCHAR(254) NOT NULL,REMARKS VARCHAR(512),INFORMATION_SOURCE VARCHAR(254),DATA_SOURCE VARCHAR(40) NOT NULL,REVISION_DATE DATE NOT NULL,CHANGE_ID VARCHAR(255),DEPRECATED SMALLINT NOT NULL,CONSTRAINT PK_DATUM PRIMARY KEY(DATUM_CODE),CONSTRAINT FK_AREA_OF_USE_CODE2 FOREIGN KEY(AREA_OF_USE_CODE) REFERENCES PUBLIC.EPSG_AREA(AREA_CODE)) +CREATE INDEX NAME_DATUM ON PUBLIC.EPSG_DATUM(DATUM_NAME) +CREATE CACHED TABLE PUBLIC.EPSG_DEPRECATION(DEPRECATION_ID INTEGER,DEPRECATION_DATE DATE,CHANGE_ID DOUBLE NOT NULL,OBJECT_TABLE_NAME VARCHAR(80),OBJECT_CODE INTEGER,REPLACED_BY INTEGER,DEPRECATION_REASON VARCHAR(254),CONSTRAINT PK_DEPRECATION PRIMARY KEY(DEPRECATION_ID),CONSTRAINT FK_CHANGE_ID FOREIGN KEY(CHANGE_ID) REFERENCES PUBLIC.EPSG_CHANGE(CHANGE_ID)) +CREATE CACHED TABLE PUBLIC.EPSG_ELLIPSOID(ELLIPSOID_CODE INTEGER NOT NULL,ELLIPSOID_NAME VARCHAR(80) NOT NULL,SEMI_MAJOR_AXIS DOUBLE NOT NULL,UOM_CODE INTEGER NOT NULL,INV_FLATTENING DOUBLE,SEMI_MINOR_AXIS DOUBLE,ELLIPSOID_SHAPE SMALLINT NOT NULL,REMARKS VARCHAR(512),INFORMATION_SOURCE VARCHAR(254),DATA_SOURCE VARCHAR(40) NOT NULL,REVISION_DATE DATE NOT NULL,CHANGE_ID VARCHAR(255),DEPRECATED SMALLINT NOT NULL,CONSTRAINT PK_ELLIPSOID PRIMARY KEY(ELLIPSOID_CODE)) +CREATE INDEX NAME_ELLIPSOID ON PUBLIC.EPSG_ELLIPSOID(ELLIPSOID_NAME) +CREATE CACHED TABLE PUBLIC.EPSG_NAMINGSYSTEM(NAMING_SYSTEM_CODE INTEGER NOT NULL,NAMING_SYSTEM_NAME VARCHAR(80) NOT NULL,REMARKS VARCHAR(254),INFORMATION_SOURCE VARCHAR(254),DATA_SOURCE VARCHAR(40) NOT NULL,REVISION_DATE DATE NOT NULL,CHANGE_ID VARCHAR(255),DEPRECATED SMALLINT NOT NULL,CONSTRAINT PK_NAMINGSYSTEM PRIMARY KEY(NAMING_SYSTEM_CODE)) +CREATE CACHED TABLE PUBLIC.EPSG_PRIMEMERIDIAN(PRIME_MERIDIAN_CODE INTEGER NOT NULL,PRIME_MERIDIAN_NAME VARCHAR(80) NOT NULL,GREENWICH_LONGITUDE DOUBLE NOT NULL,UOM_CODE INTEGER NOT NULL,REMARKS VARCHAR(254),INFORMATION_SOURCE VARCHAR(254),DATA_SOURCE VARCHAR(40) NOT NULL,REVISION_DATE DATE NOT NULL,CHANGE_ID VARCHAR(255),DEPRECATED SMALLINT NOT NULL,CONSTRAINT PK_PRIMEMERIDIAN PRIMARY KEY(PRIME_MERIDIAN_CODE)) +CREATE INDEX NAME_PRIME_MERIDIAN ON PUBLIC.EPSG_PRIMEMERIDIAN(PRIME_MERIDIAN_NAME) +CREATE CACHED TABLE PUBLIC.EPSG_SUPERSESSION(SUPERSESSION_ID INTEGER,OBJECT_TABLE_NAME VARCHAR(80) NOT NULL,OBJECT_CODE INTEGER NOT NULL,SUPERSEDED_BY INTEGER,SUPERSESSION_TYPE VARCHAR(50),SUPERSESSION_YEAR SMALLINT,REMARKS VARCHAR(254),CONSTRAINT PK_SUPERSESSION PRIMARY KEY(SUPERSESSION_ID)) +CREATE INDEX SUPERSESSION_OBJECT_CODE ON PUBLIC.EPSG_SUPERSESSION(OBJECT_CODE) +CREATE INDEX SUPERSESSION_OBJECT_YEAR ON PUBLIC.EPSG_SUPERSESSION(SUPERSESSION_YEAR) +CREATE CACHED TABLE PUBLIC.EPSG_UNITOFMEASURE(UOM_CODE INTEGER NOT NULL,UNIT_OF_MEAS_NAME VARCHAR(80) NOT NULL,UNIT_OF_MEAS_TYPE VARCHAR(50),TARGET_UOM_CODE INTEGER NOT NULL,FACTOR_B DOUBLE,FACTOR_C DOUBLE,REMARKS VARCHAR(512),INFORMATION_SOURCE VARCHAR(254),DATA_SOURCE VARCHAR(40) NOT NULL,REVISION_DATE DATE NOT NULL,CHANGE_ID VARCHAR(255),DEPRECATED SMALLINT NOT NULL,CONSTRAINT PK_UNITOFMEASURE PRIMARY KEY(UOM_CODE),CONSTRAINT FK_TARGET_UOM_CODE FOREIGN KEY(TARGET_UOM_CODE) REFERENCES PUBLIC.EPSG_UNITOFMEASURE(UOM_CODE)) +CREATE INDEX NAME_UNIT ON PUBLIC.EPSG_UNITOFMEASURE(UNIT_OF_MEAS_NAME) +CREATE CACHED TABLE PUBLIC.EPSG_VERSIONHISTORY(VERSION_HISTORY_CODE INTEGER NOT NULL,VERSION_DATE DATE,VERSION_NUMBER VARCHAR(10) NOT NULL,VERSION_REMARKS VARCHAR(254) NOT NULL,SUPERCEDED_BY VARCHAR(10),SUPERCEDES VARCHAR(10),CONSTRAINT PK_VERSIONHISTORY PRIMARY KEY(VERSION_HISTORY_CODE),UNIQUE(VERSION_NUMBER)) +CREATE INDEX VERSION_HISTORY_DATE ON PUBLIC.EPSG_VERSIONHISTORY(VERSION_DATE) +ALTER TABLE PUBLIC.EPSG_ALIAS ADD CONSTRAINT FK_NAMING_SYSTEM_CODE FOREIGN KEY(NAMING_SYSTEM_CODE) REFERENCES PUBLIC.EPSG_NAMINGSYSTEM(NAMING_SYSTEM_CODE) +ALTER TABLE PUBLIC.EPSG_COORDINATEAXIS ADD CONSTRAINT FK_UOM_CODE2 FOREIGN KEY(UOM_CODE) REFERENCES PUBLIC.EPSG_UNITOFMEASURE(UOM_CODE) +ALTER TABLE PUBLIC.EPSG_COORDINATEAXIS ADD CONSTRAINT FK_COORD_AXIS_NAME_CODE FOREIGN KEY(COORD_AXIS_NAME_CODE) REFERENCES PUBLIC.EPSG_COORDINATEAXISNAME(COORD_AXIS_NAME_CODE) +ALTER TABLE PUBLIC.EPSG_COORDINATEAXIS ADD CONSTRAINT FK_COORD_SYS_CODE FOREIGN KEY(COORD_SYS_CODE) REFERENCES PUBLIC.EPSG_COORDINATESYSTEM(COORD_SYS_CODE) +ALTER TABLE PUBLIC.EPSG_COORDINATEREFERENCESYSTEM ADD CONSTRAINT FK_DATUM_CODE FOREIGN KEY(DATUM_CODE) REFERENCES PUBLIC.EPSG_DATUM(DATUM_CODE) +ALTER TABLE PUBLIC.EPSG_COORDINATEREFERENCESYSTEM ADD CONSTRAINT FK_COORD_SYS_CODE2 FOREIGN KEY(COORD_SYS_CODE) REFERENCES PUBLIC.EPSG_COORDINATESYSTEM(COORD_SYS_CODE) +ALTER TABLE PUBLIC.EPSG_COORDOPERATION ADD CONSTRAINT FK_UOM_CODE_TARGET_COORD_DIFF FOREIGN KEY(UOM_CODE_TARGET_COORD_DIFF) REFERENCES PUBLIC.EPSG_UNITOFMEASURE(UOM_CODE) +ALTER TABLE PUBLIC.EPSG_COORDOPERATION ADD CONSTRAINT FK_COORD_OP_METHOD_CODE FOREIGN KEY(COORD_OP_METHOD_CODE) REFERENCES PUBLIC.EPSG_COORDOPERATIONMETHOD(COORD_OP_METHOD_CODE) +ALTER TABLE PUBLIC.EPSG_COORDOPERATION ADD CONSTRAINT FK_UOM_CODE_SOURCE_COORD_DIFF FOREIGN KEY(UOM_CODE_SOURCE_COORD_DIFF) REFERENCES PUBLIC.EPSG_UNITOFMEASURE(UOM_CODE) +ALTER TABLE PUBLIC.EPSG_COORDOPERATIONPARAMVALUE ADD CONSTRAINT FK_UOM_CODE3 FOREIGN KEY(UOM_CODE) REFERENCES PUBLIC.EPSG_UNITOFMEASURE(UOM_CODE) +ALTER TABLE PUBLIC.EPSG_DATUM ADD CONSTRAINT FK_ELLIPSOID_CODE FOREIGN KEY(ELLIPSOID_CODE) REFERENCES PUBLIC.EPSG_ELLIPSOID(ELLIPSOID_CODE) +ALTER TABLE PUBLIC.EPSG_DATUM ADD CONSTRAINT FK_PRIME_MERIDIAN_CODE FOREIGN KEY(PRIME_MERIDIAN_CODE) REFERENCES PUBLIC.EPSG_PRIMEMERIDIAN(PRIME_MERIDIAN_CODE) +ALTER TABLE PUBLIC.EPSG_ELLIPSOID ADD CONSTRAINT FK_UOM_CODE4 FOREIGN KEY(UOM_CODE) REFERENCES PUBLIC.EPSG_UNITOFMEASURE(UOM_CODE) +ALTER TABLE PUBLIC.EPSG_PRIMEMERIDIAN ADD CONSTRAINT FK_UOM_CODE FOREIGN KEY(UOM_CODE) REFERENCES PUBLIC.EPSG_UNITOFMEASURE(UOM_CODE) +ALTER SEQUENCE SYSTEM_LOBS.LOB_ID RESTART WITH 1 +SET DATABASE DEFAULT INITIAL SCHEMA PUBLIC +SET TABLE PUBLIC.EPSG_ALIAS INDEX '19960 217 711 0 0 0 10073' +SET TABLE PUBLIC.EPSG_AREA INDEX '70743 0 3506' +SET TABLE PUBLIC.EPSG_CHANGE INDEX '95394 95394 0 0 2067' +SET TABLE PUBLIC.EPSG_COORDINATEAXIS INDEX '108775 108457 108457 108775 108019 108079 108019 108775 0 0 0 0 0 0 0 0 283' +SET TABLE PUBLIC.EPSG_COORDINATEAXISNAME INDEX '109862 109777 0 0 38' +SET TABLE PUBLIC.EPSG_COORDINATEREFERENCESYSTEM INDEX '172023 162093 112797 162341 111233 139036 113571 122019 139036 115592 0 0 0 0 0 0 0 0 0 0 6739' +SET TABLE PUBLIC.EPSG_COORDINATESYSTEM INDEX '210295 209945 0 0 134' +SET TABLE PUBLIC.EPSG_COORDOPERATION INDEX '244770 211720 212441 211159 211720 211084 211292 211143 262360 211084 262360 0 0 0 0 0 0 0 0 0 0 0 4963' +SET TABLE PUBLIC.EPSG_COORDOPERATIONMETHOD INDEX '297102 292093 0 0 160' +SET TABLE PUBLIC.EPSG_COORDOPERATIONPARAM INDEX '304748 303796 0 0 213' +SET TABLE PUBLIC.EPSG_COORDOPERATIONPARAMUSAGE INDEX '307501 307501 306509 306509 305601 0 0 0 0 0 1075' +SET TABLE PUBLIC.EPSG_COORDOPERATIONPARAMVALUE INDEX '350694 309782 350694 350694 329862 309772 0 0 0 0 0 0 22146' +SET TABLE PUBLIC.EPSG_COORDOPERATIONPATH INDEX '421575 421575 420579 421575 420555 0 0 0 0 0 437' +SET TABLE PUBLIC.EPSG_DATUM INDEX '426333 422417 422396 422340 427216 0 0 0 0 0 755' +SET TABLE PUBLIC.EPSG_DEPRECATION INDEX '438312 435871 0 0 1760' +SET TABLE PUBLIC.EPSG_ELLIPSOID INDEX '442438 442254 442391 0 0 0 55' +SET TABLE PUBLIC.EPSG_NAMINGSYSTEM INDEX '442771 0 40' +SET TABLE PUBLIC.EPSG_PRIMEMERIDIAN INDEX '442957 442917 442957 0 0 0 14' +SET TABLE PUBLIC.EPSG_SUPERSESSION INDEX '443748 443255 443528 0 0 0 212' +SET TABLE PUBLIC.EPSG_UNITOFMEASURE INDEX '444483 444772 444697 0 0 0 95' +SET TABLE PUBLIC.EPSG_VERSIONHISTORY INDEX '445900 445561 445900 0 0 0 195' +GRANT USAGE ON DOMAIN INFORMATION_SCHEMA.SQL_IDENTIFIER TO PUBLIC +GRANT USAGE ON DOMAIN INFORMATION_SCHEMA.YES_OR_NO TO PUBLIC +GRANT USAGE ON DOMAIN INFORMATION_SCHEMA.TIME_STAMP TO PUBLIC +GRANT USAGE ON DOMAIN INFORMATION_SCHEMA.CARDINAL_NUMBER TO PUBLIC +GRANT USAGE ON DOMAIN INFORMATION_SCHEMA.CHARACTER_DATA TO PUBLIC +GRANT DBA TO SA +SET SCHEMA SYSTEM_LOBS +INSERT INTO BLOCKS VALUES(0,2147483647,0) diff --git a/app/opt/tomcat9/temp/GeoTools/Databases/HSQL/v9.6.0/EPSG_creation_marker.txt b/app/opt/tomcat9/temp/GeoTools/Databases/HSQL/v9.6.0/EPSG_creation_marker.txt new file mode 100644 index 0000000..e69de29 diff --git a/app/opt/tomcat9/temp/safeToDelete.tmp b/app/opt/tomcat9/temp/safeToDelete.tmp new file mode 100644 index 0000000..e69de29 diff --git a/app/webapps/ROOT/META-INF/MANIFEST.MF b/app/opt/tomcat9/webapps/ROOT/META-INF/MANIFEST.MF similarity index 100% rename from app/webapps/ROOT/META-INF/MANIFEST.MF rename to app/opt/tomcat9/webapps/ROOT/META-INF/MANIFEST.MF diff --git a/app/webapps/ROOT/META-INF/context.xml b/app/opt/tomcat9/webapps/ROOT/META-INF/context.xml similarity index 100% rename from app/webapps/ROOT/META-INF/context.xml rename to app/opt/tomcat9/webapps/ROOT/META-INF/context.xml diff --git a/app/webapps/ROOT/META-INF/maven/org.wcs.smart.connect.server/org.wcs.smart.connect.server/pom.properties b/app/opt/tomcat9/webapps/ROOT/META-INF/maven/org.wcs.smart.connect.server/org.wcs.smart.connect.server/pom.properties similarity index 81% rename from app/webapps/ROOT/META-INF/maven/org.wcs.smart.connect.server/org.wcs.smart.connect.server/pom.properties rename to app/opt/tomcat9/webapps/ROOT/META-INF/maven/org.wcs.smart.connect.server/org.wcs.smart.connect.server/pom.properties index f35285b..7c03191 100644 --- a/app/webapps/ROOT/META-INF/maven/org.wcs.smart.connect.server/org.wcs.smart.connect.server/pom.properties +++ b/app/opt/tomcat9/webapps/ROOT/META-INF/maven/org.wcs.smart.connect.server/org.wcs.smart.connect.server/pom.properties @@ -1,3 +1,3 @@ groupId=org.wcs.smart.connect.server artifactId=org.wcs.smart.connect.server -version=7.5.3 +version=7.5.8 diff --git a/app/webapps/ROOT/META-INF/maven/org.wcs.smart.connect.server/org.wcs.smart.connect.server/pom.xml b/app/opt/tomcat9/webapps/ROOT/META-INF/maven/org.wcs.smart.connect.server/org.wcs.smart.connect.server/pom.xml similarity index 96% rename from app/webapps/ROOT/META-INF/maven/org.wcs.smart.connect.server/org.wcs.smart.connect.server/pom.xml rename to app/opt/tomcat9/webapps/ROOT/META-INF/maven/org.wcs.smart.connect.server/org.wcs.smart.connect.server/pom.xml index 4a996fe..fe3d847 100644 --- a/app/webapps/ROOT/META-INF/maven/org.wcs.smart.connect.server/org.wcs.smart.connect.server/pom.xml +++ b/app/opt/tomcat9/webapps/ROOT/META-INF/maven/org.wcs.smart.connect.server/org.wcs.smart.connect.server/pom.xml @@ -8,7 +8,7 @@ org.wcs.smart.connect org.wcs.smart.connect - 7.5.3 + 7.5.8 org.wcs.smart.connect.server @@ -291,7 +291,7 @@ org.wcs.smart.core org.wcs.smart.core.er - ${smart.version} + ${smart.version.758} org.wcs.smart.core @@ -661,9 +661,17 @@ org.eclipse.platform org.eclipse.equinox.common + + org.eclipse.platform + org.eclipse.core.commands + - + + org.eclipse.platform + org.eclipse.core.commands + 3.10.400 + org.eclipse.platform org.eclipse.equinox.common diff --git a/app/webapps/ROOT/WEB-INF/alert.jsp b/app/opt/tomcat9/webapps/ROOT/WEB-INF/alert.jsp similarity index 100% rename from app/webapps/ROOT/WEB-INF/alert.jsp rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/alert.jsp diff --git a/app/webapps/ROOT/WEB-INF/ca.jsp b/app/opt/tomcat9/webapps/ROOT/WEB-INF/ca.jsp similarity index 100% rename from app/webapps/ROOT/WEB-INF/ca.jsp rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/ca.jsp diff --git a/app/webapps/ROOT/WEB-INF/causers.jsp b/app/opt/tomcat9/webapps/ROOT/WEB-INF/causers.jsp similarity index 100% rename from app/webapps/ROOT/WEB-INF/causers.jsp rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/causers.jsp diff --git a/app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/SmartUtils.class b/app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/SmartUtils.class similarity index 100% rename from app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/SmartUtils.class rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/SmartUtils.class diff --git a/app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/ZipUtil.class b/app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/ZipUtil.class similarity index 100% rename from app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/ZipUtil.class rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/ZipUtil.class diff --git a/app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/apache/BcryptCredentialHandler.class b/app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/apache/BcryptCredentialHandler.class similarity index 100% rename from app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/apache/BcryptCredentialHandler.class rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/apache/BcryptCredentialHandler.class diff --git a/app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/apache/CleanUpJob.class b/app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/apache/CleanUpJob.class similarity index 100% rename from app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/apache/CleanUpJob.class rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/apache/CleanUpJob.class diff --git a/app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/apache/EnvironmentVariables$Variable.class b/app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/apache/EnvironmentVariables$Variable.class similarity index 100% rename from app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/apache/EnvironmentVariables$Variable.class rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/apache/EnvironmentVariables$Variable.class diff --git a/app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/apache/EnvironmentVariables.class b/app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/apache/EnvironmentVariables.class similarity index 100% rename from app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/apache/EnvironmentVariables.class rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/apache/EnvironmentVariables.class diff --git a/app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/api/BasemapTileServer$1.class b/app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/api/BasemapTileServer$1.class similarity index 100% rename from app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/api/BasemapTileServer$1.class rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/api/BasemapTileServer$1.class diff --git a/app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/api/BasemapTileServer$2.class b/app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/api/BasemapTileServer$2.class similarity index 100% rename from app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/api/BasemapTileServer$2.class rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/api/BasemapTileServer$2.class diff --git a/app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/api/BasemapTileServer$TileJobItem.class b/app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/api/BasemapTileServer$TileJobItem.class similarity index 100% rename from app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/api/BasemapTileServer$TileJobItem.class rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/api/BasemapTileServer$TileJobItem.class diff --git a/app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/api/BasemapTileServer$TileMaker.class b/app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/api/BasemapTileServer$TileMaker.class similarity index 100% rename from app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/api/BasemapTileServer$TileMaker.class rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/api/BasemapTileServer$TileMaker.class diff --git a/app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/api/BasemapTileServer.class b/app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/api/BasemapTileServer.class similarity index 100% rename from app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/api/BasemapTileServer.class rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/api/BasemapTileServer.class diff --git a/app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/api/ConnectAlert.class b/app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/api/ConnectAlert.class similarity index 100% rename from app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/api/ConnectAlert.class rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/api/ConnectAlert.class diff --git a/app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/api/ConnectAlertFilterDefault.class b/app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/api/ConnectAlertFilterDefault.class similarity index 100% rename from app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/api/ConnectAlertFilterDefault.class rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/api/ConnectAlertFilterDefault.class diff --git a/app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/api/ConnectMapLayers.class b/app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/api/ConnectMapLayers.class similarity index 100% rename from app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/api/ConnectMapLayers.class rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/api/ConnectMapLayers.class diff --git a/app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/api/ConnectRESTApplication.class b/app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/api/ConnectRESTApplication.class similarity index 100% rename from app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/api/ConnectRESTApplication.class rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/api/ConnectRESTApplication.class diff --git a/app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/api/ConnectStyleConfiguration.class b/app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/api/ConnectStyleConfiguration.class similarity index 100% rename from app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/api/ConnectStyleConfiguration.class rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/api/ConnectStyleConfiguration.class diff --git a/app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/api/ConnectUser.class b/app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/api/ConnectUser.class similarity index 100% rename from app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/api/ConnectUser.class rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/api/ConnectUser.class diff --git a/app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/api/ConnectUserAction.class b/app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/api/ConnectUserAction.class similarity index 100% rename from app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/api/ConnectUserAction.class rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/api/ConnectUserAction.class diff --git a/app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/api/ConservationAreas$1.class b/app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/api/ConservationAreas$1.class similarity index 100% rename from app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/api/ConservationAreas$1.class rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/api/ConservationAreas$1.class diff --git a/app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/api/ConservationAreas$2.class b/app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/api/ConservationAreas$2.class similarity index 100% rename from app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/api/ConservationAreas$2.class rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/api/ConservationAreas$2.class diff --git a/app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/api/ConservationAreas$3.class b/app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/api/ConservationAreas$3.class similarity index 100% rename from app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/api/ConservationAreas$3.class rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/api/ConservationAreas$3.class diff --git a/app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/api/ConservationAreas.class b/app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/api/ConservationAreas.class similarity index 100% rename from app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/api/ConservationAreas.class rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/api/ConservationAreas.class diff --git a/app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/api/CorsFeature.class b/app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/api/CorsFeature.class similarity index 100% rename from app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/api/CorsFeature.class rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/api/CorsFeature.class diff --git a/app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/api/CustomQueryApi.class b/app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/api/CustomQueryApi.class new file mode 100644 index 0000000..3bc58f1 Binary files /dev/null and b/app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/api/CustomQueryApi.class differ diff --git a/app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/api/CyberTracker$1.class b/app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/api/CyberTracker$1.class similarity index 100% rename from app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/api/CyberTracker$1.class rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/api/CyberTracker$1.class diff --git a/app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/api/CyberTracker$2.class b/app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/api/CyberTracker$2.class similarity index 100% rename from app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/api/CyberTracker$2.class rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/api/CyberTracker$2.class diff --git a/app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/api/CyberTracker.class b/app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/api/CyberTracker.class similarity index 100% rename from app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/api/CyberTracker.class rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/api/CyberTracker.class diff --git a/app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/api/DashboardBetaApi.class b/app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/api/DashboardBetaApi.class similarity index 100% rename from app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/api/DashboardBetaApi.class rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/api/DashboardBetaApi.class diff --git a/app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/api/DataApi$PatrolMetadata.class b/app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/api/DataApi$PatrolMetadata.class similarity index 82% rename from app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/api/DataApi$PatrolMetadata.class rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/api/DataApi$PatrolMetadata.class index c242fa2..8e5c7b3 100644 Binary files a/app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/api/DataApi$PatrolMetadata.class and b/app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/api/DataApi$PatrolMetadata.class differ diff --git a/app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/api/DataApi$ProcessingResult.class b/app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/api/DataApi$ProcessingResult.class similarity index 85% rename from app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/api/DataApi$ProcessingResult.class rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/api/DataApi$ProcessingResult.class index c3b6d97..782a219 100644 Binary files a/app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/api/DataApi$ProcessingResult.class and b/app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/api/DataApi$ProcessingResult.class differ diff --git a/app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/api/DataApi.class b/app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/api/DataApi.class new file mode 100644 index 0000000..b925f0a Binary files /dev/null and b/app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/api/DataApi.class differ diff --git a/app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/api/DataModelApi$1.class b/app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/api/DataModelApi$1.class similarity index 90% rename from app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/api/DataModelApi$1.class rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/api/DataModelApi$1.class index 379cf2d..eed1f34 100644 Binary files a/app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/api/DataModelApi$1.class and b/app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/api/DataModelApi$1.class differ diff --git a/app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/api/DataModelApi$2.class b/app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/api/DataModelApi$2.class similarity index 61% rename from app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/api/DataModelApi$2.class rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/api/DataModelApi$2.class index 7d26ec6..81f90b8 100644 Binary files a/app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/api/DataModelApi$2.class and b/app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/api/DataModelApi$2.class differ diff --git a/app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/api/DataModelApi$3.class b/app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/api/DataModelApi$3.class new file mode 100644 index 0000000..04de8bf Binary files /dev/null and b/app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/api/DataModelApi$3.class differ diff --git a/app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/api/DataModelApi$ConfigurableModelProxy$Translation.class b/app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/api/DataModelApi$ConfigurableModelProxy$Translation.class new file mode 100644 index 0000000..2279a05 Binary files /dev/null and b/app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/api/DataModelApi$ConfigurableModelProxy$Translation.class differ diff --git a/app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/api/DataModelApi$ConfigurableModelProxy.class b/app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/api/DataModelApi$ConfigurableModelProxy.class new file mode 100644 index 0000000..90f929d Binary files /dev/null and b/app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/api/DataModelApi$ConfigurableModelProxy.class differ diff --git a/app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/api/DataModelApi.class b/app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/api/DataModelApi.class new file mode 100644 index 0000000..8603a1b Binary files /dev/null and b/app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/api/DataModelApi.class differ diff --git a/app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/api/DataQueue$1.class b/app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/api/DataQueue$1.class similarity index 100% rename from app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/api/DataQueue$1.class rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/api/DataQueue$1.class diff --git a/app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/api/DataQueue$2.class b/app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/api/DataQueue$2.class similarity index 100% rename from app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/api/DataQueue$2.class rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/api/DataQueue$2.class diff --git a/app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/api/DataQueue.class b/app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/api/DataQueue.class similarity index 100% rename from app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/api/DataQueue.class rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/api/DataQueue.class diff --git a/app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/api/DeleteCaJob.class b/app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/api/DeleteCaJob.class similarity index 100% rename from app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/api/DeleteCaJob.class rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/api/DeleteCaJob.class diff --git a/app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/api/DesktopUser.class b/app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/api/DesktopUser.class similarity index 100% rename from app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/api/DesktopUser.class rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/api/DesktopUser.class diff --git a/app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/api/QueryApi$Direction.class b/app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/api/QueryApi$Direction.class similarity index 100% rename from app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/api/QueryApi$Direction.class rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/api/QueryApi$Direction.class diff --git a/app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/api/QueryApi$QueryResult.class b/app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/api/QueryApi$QueryResult.class similarity index 100% rename from app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/api/QueryApi$QueryResult.class rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/api/QueryApi$QueryResult.class diff --git a/app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/api/QueryApi.class b/app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/api/QueryApi.class similarity index 100% rename from app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/api/QueryApi.class rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/api/QueryApi.class diff --git a/app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/api/QueryTypeApi.class b/app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/api/QueryTypeApi.class similarity index 100% rename from app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/api/QueryTypeApi.class rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/api/QueryTypeApi.class diff --git a/app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/api/QuicklinkApi.class b/app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/api/QuicklinkApi.class similarity index 100% rename from app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/api/QuicklinkApi.class rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/api/QuicklinkApi.class diff --git a/app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/api/ReportApi$1.class b/app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/api/ReportApi$1.class similarity index 100% rename from app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/api/ReportApi$1.class rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/api/ReportApi$1.class diff --git a/app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/api/ReportApi$2.class b/app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/api/ReportApi$2.class similarity index 100% rename from app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/api/ReportApi$2.class rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/api/ReportApi$2.class diff --git a/app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/api/ReportApi$3.class b/app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/api/ReportApi$3.class similarity index 100% rename from app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/api/ReportApi$3.class rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/api/ReportApi$3.class diff --git a/app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/api/ReportApi.class b/app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/api/ReportApi.class similarity index 100% rename from app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/api/ReportApi.class rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/api/ReportApi.class diff --git a/app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/api/SharedLinkApi.class b/app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/api/SharedLinkApi.class similarity index 100% rename from app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/api/SharedLinkApi.class rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/api/SharedLinkApi.class diff --git a/app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/api/SmartCollectApi.class b/app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/api/SmartCollectApi.class similarity index 100% rename from app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/api/SmartCollectApi.class rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/api/SmartCollectApi.class diff --git a/app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/api/SmartInfo.class b/app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/api/SmartInfo.class new file mode 100644 index 0000000..83c8a42 Binary files /dev/null and b/app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/api/SmartInfo.class differ diff --git a/app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/api/Uploader.class b/app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/api/Uploader.class similarity index 100% rename from app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/api/Uploader.class rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/api/Uploader.class diff --git a/app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/api/noa/ConnectNoaRESTApplication.class b/app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/api/noa/ConnectNoaRESTApplication.class similarity index 100% rename from app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/api/noa/ConnectNoaRESTApplication.class rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/api/noa/ConnectNoaRESTApplication.class diff --git a/app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/api/noa/CyberTrackerNoa$1.class b/app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/api/noa/CyberTrackerNoa$1.class similarity index 100% rename from app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/api/noa/CyberTrackerNoa$1.class rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/api/noa/CyberTrackerNoa$1.class diff --git a/app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/api/noa/CyberTrackerNoa$2.class b/app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/api/noa/CyberTrackerNoa$2.class similarity index 100% rename from app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/api/noa/CyberTrackerNoa$2.class rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/api/noa/CyberTrackerNoa$2.class diff --git a/app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/api/noa/CyberTrackerNoa.class b/app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/api/noa/CyberTrackerNoa.class similarity index 100% rename from app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/api/noa/CyberTrackerNoa.class rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/api/noa/CyberTrackerNoa.class diff --git a/app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/api/noa/SmartCollectNoa$1.class b/app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/api/noa/SmartCollectNoa$1.class similarity index 100% rename from app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/api/noa/SmartCollectNoa$1.class rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/api/noa/SmartCollectNoa$1.class diff --git a/app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/api/noa/SmartCollectNoa.class b/app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/api/noa/SmartCollectNoa.class similarity index 100% rename from app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/api/noa/SmartCollectNoa.class rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/api/noa/SmartCollectNoa.class diff --git a/app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/cybertracker/CyberTrackerNavigationProcessor.class b/app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/cybertracker/CyberTrackerNavigationProcessor.class similarity index 100% rename from app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/cybertracker/CyberTrackerNavigationProcessor.class rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/cybertracker/CyberTrackerNavigationProcessor.class diff --git a/app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/cybertracker/CyberTrackerProcessor.class b/app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/cybertracker/CyberTrackerProcessor.class similarity index 100% rename from app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/cybertracker/CyberTrackerProcessor.class rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/cybertracker/CyberTrackerProcessor.class diff --git a/app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/database/FastDataModelLoader.class b/app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/database/FastDataModelLoader.class new file mode 100644 index 0000000..c3bfcf1 Binary files /dev/null and b/app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/database/FastDataModelLoader.class differ diff --git a/app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/database/LockManager.class b/app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/database/LockManager.class similarity index 100% rename from app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/database/LockManager.class rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/database/LockManager.class diff --git a/app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/dataqueue/DataQueueAction.class b/app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/dataqueue/DataQueueAction.class similarity index 100% rename from app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/dataqueue/DataQueueAction.class rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/dataqueue/DataQueueAction.class diff --git a/app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/dataqueue/DataQueueManager.class b/app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/dataqueue/DataQueueManager.class similarity index 100% rename from app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/dataqueue/DataQueueManager.class rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/dataqueue/DataQueueManager.class diff --git a/app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/dataqueue/DataQueueProcessor.class b/app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/dataqueue/DataQueueProcessor.class similarity index 100% rename from app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/dataqueue/DataQueueProcessor.class rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/dataqueue/DataQueueProcessor.class diff --git a/app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/dataqueue/ServerDataQueueItem$Status.class b/app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/dataqueue/ServerDataQueueItem$Status.class similarity index 100% rename from app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/dataqueue/ServerDataQueueItem$Status.class rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/dataqueue/ServerDataQueueItem$Status.class diff --git a/app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/dataqueue/ServerDataQueueItem.class b/app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/dataqueue/ServerDataQueueItem.class similarity index 100% rename from app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/dataqueue/ServerDataQueueItem.class rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/dataqueue/ServerDataQueueItem.class diff --git a/app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/dataqueue/ServerDataQueueItemProxy.class b/app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/dataqueue/ServerDataQueueItemProxy.class similarity index 100% rename from app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/dataqueue/ServerDataQueueItemProxy.class rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/dataqueue/ServerDataQueueItemProxy.class diff --git a/app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/datastore/DataStoreManager.class b/app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/datastore/DataStoreManager.class similarity index 100% rename from app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/datastore/DataStoreManager.class rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/datastore/DataStoreManager.class diff --git a/app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/datastore/FileStoreWatcher$1.class b/app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/datastore/FileStoreWatcher$1.class similarity index 100% rename from app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/datastore/FileStoreWatcher$1.class rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/datastore/FileStoreWatcher$1.class diff --git a/app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/datastore/FileStoreWatcher.class b/app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/datastore/FileStoreWatcher.class similarity index 100% rename from app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/datastore/FileStoreWatcher.class rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/datastore/FileStoreWatcher.class diff --git a/app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/downloader/ca/CaExporterJob.class b/app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/downloader/ca/CaExporterJob.class similarity index 100% rename from app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/downloader/ca/CaExporterJob.class rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/downloader/ca/CaExporterJob.class diff --git a/app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/downloader/ca/PostgresqlCaDataExportEngine$1.class b/app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/downloader/ca/PostgresqlCaDataExportEngine$1.class similarity index 100% rename from app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/downloader/ca/PostgresqlCaDataExportEngine$1.class rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/downloader/ca/PostgresqlCaDataExportEngine$1.class diff --git a/app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/downloader/ca/PostgresqlCaDataExportEngine.class b/app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/downloader/ca/PostgresqlCaDataExportEngine.class similarity index 100% rename from app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/downloader/ca/PostgresqlCaDataExportEngine.class rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/downloader/ca/PostgresqlCaDataExportEngine.class diff --git a/app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/downloader/ca/PostgresqlExporters.class b/app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/downloader/ca/PostgresqlExporters.class similarity index 100% rename from app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/downloader/ca/PostgresqlExporters.class rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/downloader/ca/PostgresqlExporters.class diff --git a/app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/downloader/ca/PostgresqlTableInfo.class b/app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/downloader/ca/PostgresqlTableInfo.class similarity index 100% rename from app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/downloader/ca/PostgresqlTableInfo.class rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/downloader/ca/PostgresqlTableInfo.class diff --git a/app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/downloader/sync/CaChangeLogPackageJob.class b/app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/downloader/sync/CaChangeLogPackageJob.class similarity index 100% rename from app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/downloader/sync/CaChangeLogPackageJob.class rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/downloader/sync/CaChangeLogPackageJob.class diff --git a/app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/downloader/sync/ChangeLogPackager$1$1.class b/app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/downloader/sync/ChangeLogPackager$1$1.class similarity index 100% rename from app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/downloader/sync/ChangeLogPackager$1$1.class rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/downloader/sync/ChangeLogPackager$1$1.class diff --git a/app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/downloader/sync/ChangeLogPackager$1.class b/app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/downloader/sync/ChangeLogPackager$1.class similarity index 100% rename from app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/downloader/sync/ChangeLogPackager$1.class rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/downloader/sync/ChangeLogPackager$1.class diff --git a/app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/downloader/sync/ChangeLogPackager.class b/app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/downloader/sync/ChangeLogPackager.class similarity index 100% rename from app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/downloader/sync/ChangeLogPackager.class rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/downloader/sync/ChangeLogPackager.class diff --git a/app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/exceptions/GeneralExceptionMapper.class b/app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/exceptions/GeneralExceptionMapper.class similarity index 100% rename from app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/exceptions/GeneralExceptionMapper.class rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/exceptions/GeneralExceptionMapper.class diff --git a/app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/exceptions/SmartConnectException.class b/app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/exceptions/SmartConnectException.class similarity index 100% rename from app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/exceptions/SmartConnectException.class rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/exceptions/SmartConnectException.class diff --git a/app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/exceptions/SmartConnectExceptionMapper.class b/app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/exceptions/SmartConnectExceptionMapper.class similarity index 100% rename from app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/exceptions/SmartConnectExceptionMapper.class rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/exceptions/SmartConnectExceptionMapper.class diff --git a/app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/filter/AlertFilter.class b/app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/filter/AlertFilter.class similarity index 100% rename from app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/filter/AlertFilter.class rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/filter/AlertFilter.class diff --git a/app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/filter/ApiAuthorizationFilter.class b/app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/filter/ApiAuthorizationFilter.class similarity index 100% rename from app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/filter/ApiAuthorizationFilter.class rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/filter/ApiAuthorizationFilter.class diff --git a/app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/filter/MenuItemsFilter$Page.class b/app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/filter/MenuItemsFilter$Page.class similarity index 100% rename from app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/filter/MenuItemsFilter$Page.class rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/filter/MenuItemsFilter$Page.class diff --git a/app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/filter/MenuItemsFilter.class b/app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/filter/MenuItemsFilter.class similarity index 100% rename from app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/filter/MenuItemsFilter.class rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/filter/MenuItemsFilter.class diff --git a/app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/filter/NoCacheFilter.class b/app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/filter/NoCacheFilter.class similarity index 100% rename from app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/filter/NoCacheFilter.class rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/filter/NoCacheFilter.class diff --git a/app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/filter/QueryFilter.class b/app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/filter/QueryFilter.class similarity index 100% rename from app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/filter/QueryFilter.class rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/filter/QueryFilter.class diff --git a/app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/filter/StyleFilter.class b/app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/filter/StyleFilter.class similarity index 100% rename from app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/filter/StyleFilter.class rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/filter/StyleFilter.class diff --git a/app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/hibernate/AttachmentInterceptor.class b/app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/hibernate/AttachmentInterceptor.class similarity index 100% rename from app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/hibernate/AttachmentInterceptor.class rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/hibernate/AttachmentInterceptor.class diff --git a/app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/hibernate/ConnectStartupContextListener$1.class b/app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/hibernate/ConnectStartupContextListener$1.class similarity index 100% rename from app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/hibernate/ConnectStartupContextListener$1.class rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/hibernate/ConnectStartupContextListener$1.class diff --git a/app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/hibernate/ConnectStartupContextListener.class b/app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/hibernate/ConnectStartupContextListener.class similarity index 100% rename from app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/hibernate/ConnectStartupContextListener.class rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/hibernate/ConnectStartupContextListener.class diff --git a/app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/hibernate/HibernateManager.class b/app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/hibernate/HibernateManager.class similarity index 99% rename from app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/hibernate/HibernateManager.class rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/hibernate/HibernateManager.class index 7930c09..8254be3 100644 Binary files a/app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/hibernate/HibernateManager.class and b/app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/hibernate/HibernateManager.class differ diff --git a/app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/hibernate/PlatformUrlHandler$1.class b/app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/hibernate/PlatformUrlHandler$1.class similarity index 100% rename from app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/hibernate/PlatformUrlHandler$1.class rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/hibernate/PlatformUrlHandler$1.class diff --git a/app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/hibernate/PlatformUrlHandler.class b/app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/hibernate/PlatformUrlHandler.class similarity index 100% rename from app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/hibernate/PlatformUrlHandler.class rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/hibernate/PlatformUrlHandler.class diff --git a/app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/hibernate/SMARTURLStreamHandlerProvider.class b/app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/hibernate/SMARTURLStreamHandlerProvider.class similarity index 100% rename from app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/hibernate/SMARTURLStreamHandlerProvider.class rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/hibernate/SMARTURLStreamHandlerProvider.class diff --git a/app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/hibernate/SmartHibernateConfiguration.class b/app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/hibernate/SmartHibernateConfiguration.class similarity index 100% rename from app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/hibernate/SmartHibernateConfiguration.class rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/hibernate/SmartHibernateConfiguration.class diff --git a/app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/hibernate/SmartHibernateIntegrator.class b/app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/hibernate/SmartHibernateIntegrator.class similarity index 100% rename from app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/hibernate/SmartHibernateIntegrator.class rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/hibernate/SmartHibernateIntegrator.class diff --git a/app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/hibernate/SmartPostgresDialect.class b/app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/hibernate/SmartPostgresDialect.class similarity index 100% rename from app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/hibernate/SmartPostgresDialect.class rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/hibernate/SmartPostgresDialect.class diff --git a/app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/hibernate/SmartTable.class b/app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/hibernate/SmartTable.class new file mode 100644 index 0000000..9db2e3e Binary files /dev/null and b/app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/hibernate/SmartTable.class differ diff --git a/app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/hibernate/WaypointHibernateListener.class b/app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/hibernate/WaypointHibernateListener.class similarity index 100% rename from app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/hibernate/WaypointHibernateListener.class rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/hibernate/WaypointHibernateListener.class diff --git a/app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/hibernate/hibernate.cfg.xml b/app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/hibernate/hibernate.cfg.xml similarity index 100% rename from app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/hibernate/hibernate.cfg.xml rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/hibernate/hibernate.cfg.xml diff --git a/app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/i18n/Messages.class b/app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/i18n/Messages.class similarity index 100% rename from app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/i18n/Messages.class rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/i18n/Messages.class diff --git a/app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/i18n/labels/AdvancedLabelProviderImpl$1.class b/app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/i18n/labels/AdvancedLabelProviderImpl$1.class similarity index 100% rename from app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/i18n/labels/AdvancedLabelProviderImpl$1.class rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/i18n/labels/AdvancedLabelProviderImpl$1.class diff --git a/app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/i18n/labels/AdvancedLabelProviderImpl.class b/app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/i18n/labels/AdvancedLabelProviderImpl.class similarity index 100% rename from app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/i18n/labels/AdvancedLabelProviderImpl.class rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/i18n/labels/AdvancedLabelProviderImpl.class diff --git a/app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/i18n/labels/AssetLabelProvider$1.class b/app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/i18n/labels/AssetLabelProvider$1.class similarity index 100% rename from app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/i18n/labels/AssetLabelProvider$1.class rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/i18n/labels/AssetLabelProvider$1.class diff --git a/app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/i18n/labels/AssetLabelProvider.class b/app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/i18n/labels/AssetLabelProvider.class similarity index 100% rename from app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/i18n/labels/AssetLabelProvider.class rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/i18n/labels/AssetLabelProvider.class diff --git a/app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/i18n/labels/AssetQueryLabelProvider$1.class b/app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/i18n/labels/AssetQueryLabelProvider$1.class similarity index 100% rename from app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/i18n/labels/AssetQueryLabelProvider$1.class rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/i18n/labels/AssetQueryLabelProvider$1.class diff --git a/app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/i18n/labels/AssetQueryLabelProvider.class b/app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/i18n/labels/AssetQueryLabelProvider.class similarity index 100% rename from app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/i18n/labels/AssetQueryLabelProvider.class rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/i18n/labels/AssetQueryLabelProvider.class diff --git a/app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/i18n/labels/EntityLabelProvider.class b/app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/i18n/labels/EntityLabelProvider.class similarity index 100% rename from app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/i18n/labels/EntityLabelProvider.class rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/i18n/labels/EntityLabelProvider.class diff --git a/app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/i18n/labels/EntityQueryLabelProvider.class b/app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/i18n/labels/EntityQueryLabelProvider.class similarity index 100% rename from app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/i18n/labels/EntityQueryLabelProvider.class rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/i18n/labels/EntityQueryLabelProvider.class diff --git a/app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/i18n/labels/ErLabelProvider$1.class b/app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/i18n/labels/ErLabelProvider$1.class similarity index 100% rename from app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/i18n/labels/ErLabelProvider$1.class rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/i18n/labels/ErLabelProvider$1.class diff --git a/app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/i18n/labels/ErLabelProvider.class b/app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/i18n/labels/ErLabelProvider.class similarity index 100% rename from app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/i18n/labels/ErLabelProvider.class rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/i18n/labels/ErLabelProvider.class diff --git a/app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/i18n/labels/GridQueryColumnLabelProvider$1.class b/app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/i18n/labels/GridQueryColumnLabelProvider$1.class similarity index 100% rename from app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/i18n/labels/GridQueryColumnLabelProvider$1.class rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/i18n/labels/GridQueryColumnLabelProvider$1.class diff --git a/app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/i18n/labels/GridQueryColumnLabelProvider.class b/app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/i18n/labels/GridQueryColumnLabelProvider.class similarity index 100% rename from app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/i18n/labels/GridQueryColumnLabelProvider.class rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/i18n/labels/GridQueryColumnLabelProvider.class diff --git a/app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/i18n/labels/IncidentLabelProvider.class b/app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/i18n/labels/IncidentLabelProvider.class new file mode 100644 index 0000000..3630134 Binary files /dev/null and b/app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/i18n/labels/IncidentLabelProvider.class differ diff --git a/app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/i18n/labels/ObservationLabelProvider$1.class b/app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/i18n/labels/ObservationLabelProvider$1.class new file mode 100644 index 0000000..962743c Binary files /dev/null and b/app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/i18n/labels/ObservationLabelProvider$1.class differ diff --git a/app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/i18n/labels/ObservationLabelProvider.class b/app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/i18n/labels/ObservationLabelProvider.class new file mode 100644 index 0000000..688774f Binary files /dev/null and b/app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/i18n/labels/ObservationLabelProvider.class differ diff --git a/app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/i18n/labels/ObservationQueryLabelProvider$1.class b/app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/i18n/labels/ObservationQueryLabelProvider$1.class similarity index 100% rename from app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/i18n/labels/ObservationQueryLabelProvider$1.class rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/i18n/labels/ObservationQueryLabelProvider$1.class diff --git a/app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/i18n/labels/ObservationQueryLabelProvider.class b/app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/i18n/labels/ObservationQueryLabelProvider.class similarity index 100% rename from app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/i18n/labels/ObservationQueryLabelProvider.class rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/i18n/labels/ObservationQueryLabelProvider.class diff --git a/app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/i18n/labels/PatrolLabelProvider$1.class b/app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/i18n/labels/PatrolLabelProvider$1.class similarity index 100% rename from app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/i18n/labels/PatrolLabelProvider$1.class rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/i18n/labels/PatrolLabelProvider$1.class diff --git a/app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/i18n/labels/PatrolLabelProvider.class b/app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/i18n/labels/PatrolLabelProvider.class similarity index 100% rename from app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/i18n/labels/PatrolLabelProvider.class rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/i18n/labels/PatrolLabelProvider.class diff --git a/app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/i18n/labels/PatrolQueryLabelProvider$1.class b/app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/i18n/labels/PatrolQueryLabelProvider$1.class new file mode 100644 index 0000000..46d2816 Binary files /dev/null and b/app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/i18n/labels/PatrolQueryLabelProvider$1.class differ diff --git a/app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/i18n/labels/PatrolQueryLabelProvider.class b/app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/i18n/labels/PatrolQueryLabelProvider.class new file mode 100644 index 0000000..68fa82c Binary files /dev/null and b/app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/i18n/labels/PatrolQueryLabelProvider.class differ diff --git a/app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/i18n/labels/PlanLabelProvider.class b/app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/i18n/labels/PlanLabelProvider.class similarity index 100% rename from app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/i18n/labels/PlanLabelProvider.class rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/i18n/labels/PlanLabelProvider.class diff --git a/app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/i18n/labels/QueryDateLabelProvider.class b/app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/i18n/labels/QueryDateLabelProvider.class similarity index 100% rename from app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/i18n/labels/QueryDateLabelProvider.class rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/i18n/labels/QueryDateLabelProvider.class diff --git a/app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/i18n/labels/SmartLabelProvider$1.class b/app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/i18n/labels/SmartLabelProvider$1.class similarity index 95% rename from app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/i18n/labels/SmartLabelProvider$1.class rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/i18n/labels/SmartLabelProvider$1.class index 157b545..09e4e59 100644 Binary files a/app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/i18n/labels/SmartLabelProvider$1.class and b/app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/i18n/labels/SmartLabelProvider$1.class differ diff --git a/app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/i18n/labels/SmartLabelProvider.class b/app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/i18n/labels/SmartLabelProvider.class new file mode 100644 index 0000000..c0bcdf4 Binary files /dev/null and b/app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/i18n/labels/SmartLabelProvider.class differ diff --git a/app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/i18n/labels/SurveyQueryLabelProvider.class b/app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/i18n/labels/SurveyQueryLabelProvider.class similarity index 100% rename from app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/i18n/labels/SurveyQueryLabelProvider.class rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/i18n/labels/SurveyQueryLabelProvider.class diff --git a/app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/i18n/messages.properties b/app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/i18n/messages.properties similarity index 97% rename from app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/i18n/messages.properties rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/i18n/messages.properties index 0b1f9fc..4fde28a 100644 --- a/app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/i18n/messages.properties +++ b/app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/i18n/messages.properties @@ -501,6 +501,8 @@ GridQueryColumnLabelProvider.YId=Tile Y ID HtmlExporter.HtmlName=HTML(.html) IncidentLabelProvider.createIncidentMsg=Created or updated {0} Independent Incidents ({1}) IncidentLabelProvider.IncidentLabel=Independent Incident +IncidentLabelProvider.IntegrateLinkToPatrolIncident=SMART Integrate Link To Patrol Incident +IncidentLabelProvider.IntegrateMoveToPatrolIncident=SMART Integrate Move To Patrol Incident IncidentLabelProvider.invalidSmartDataTypeJson=The smartDataType of ''{0}'' is not valid for this processor. This processor only supports the smartDataType of ''{1}'' IncidentLabelProvider.invalidSmartFeatureTypeJson=The smartFeatureType value of ''{0}'' is not valid for this processor. Only ''{1}'' is supported for the incident data type. IncidentLabelProvider.MissionProperty=Invalid JSON Object: Missing property {0}. @@ -562,6 +564,8 @@ ObservationLabelProvider_missingproperties=GeoJSON feature does not contain a 'p ObservationLabelProvider_missingproperty1=GeoJSON feature does not contain a {0} property. This property is required to identify the type of data being loaded. ObservationLabelProvider_missingproperty2=GeoJSON feature does not contain a {0} property. This property is required to process the feature. ObservationLabelProvider_processornotfound=No data processor found for data type: {0}. +ObservationLabelProvider.CmNotFound=No Configurable Model found with identifier {0}. Configurable model for patrol will not be set. +ObservationLabelProvider.InvalidCmUuid=Invalid Configurable Model UUID: {0}. ObservationLabelProvider.SignatureTypeNotFound=A signature type with the key {0} not found. Attachment will be imported without signature information. ObservationQueryLabelProvider.CANameLabel=Conservation Area Name ObservationQueryLabelProvider.CommentLabel=Comment @@ -656,6 +660,7 @@ PatrolQueryLabelProvider.ArmedOp=Armed PatrolQueryLabelProvider.CaId=Conservation Area ID PatrolQueryLabelProvider.CaName=Conservation Area Name PatrolQueryLabelProvider.CaOp=Conservation Area +PatrolQueryLabelProvider.CmOp=Configurable Model PatrolQueryLabelProvider.DistanceOp=Distance (km) PatrolQueryLabelProvider.EmployeeOp=Employee PatrolQueryLabelProvider.InvalidBufferValue=Invalid buffer value - buffer must be > 0 @@ -905,6 +910,7 @@ SmartLabelProvider.MergeDmProgress=Processing data models SmartLabelProvider.MergeDmTypeDifference=The attribute ''{0}'' with type ({1}), has a different type ({2}) in the target data model. These attributes cannot be merged. SmartLabelProvider.MgtAreaName=Management Sectors SmartLabelProvider.MultiListAttType=MULTI LIST +SmartLabelProvider.NoneOp=(None) SmartLabelProvider.NumericAttType=NUMERIC SmartLabelProvider.PatrolAreaName=Patrol Sectors SmartLabelProvider.RankName=Rank diff --git a/app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/i18n/messages_ar.properties b/app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/i18n/messages_ar.properties similarity index 100% rename from app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/i18n/messages_ar.properties rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/i18n/messages_ar.properties diff --git a/app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/i18n/messages_es.properties b/app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/i18n/messages_es.properties similarity index 100% rename from app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/i18n/messages_es.properties rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/i18n/messages_es.properties diff --git a/app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/i18n/messages_ka.properties b/app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/i18n/messages_ka.properties similarity index 100% rename from app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/i18n/messages_ka.properties rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/i18n/messages_ka.properties diff --git a/app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/i18n/messages_pt.properties b/app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/i18n/messages_pt.properties similarity index 100% rename from app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/i18n/messages_pt.properties rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/i18n/messages_pt.properties diff --git a/app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/i18n/messages_th.properties b/app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/i18n/messages_th.properties similarity index 100% rename from app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/i18n/messages_th.properties rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/i18n/messages_th.properties diff --git a/app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/i18n/web_messages_ar.properties b/app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/i18n/web_messages_ar.properties similarity index 100% rename from app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/i18n/web_messages_ar.properties rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/i18n/web_messages_ar.properties diff --git a/app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/i18n/web_messages_en.properties b/app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/i18n/web_messages_en.properties similarity index 100% rename from app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/i18n/web_messages_en.properties rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/i18n/web_messages_en.properties diff --git a/app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/i18n/web_messages_es.properties b/app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/i18n/web_messages_es.properties similarity index 100% rename from app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/i18n/web_messages_es.properties rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/i18n/web_messages_es.properties diff --git a/app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/i18n/web_messages_ka.properties b/app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/i18n/web_messages_ka.properties similarity index 100% rename from app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/i18n/web_messages_ka.properties rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/i18n/web_messages_ka.properties diff --git a/app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/i18n/web_messages_pt.properties b/app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/i18n/web_messages_pt.properties similarity index 100% rename from app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/i18n/web_messages_pt.properties rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/i18n/web_messages_pt.properties diff --git a/app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/i18n/web_messages_th.properties b/app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/i18n/web_messages_th.properties similarity index 100% rename from app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/i18n/web_messages_th.properties rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/i18n/web_messages_th.properties diff --git a/app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/model/AbstractSmartAction.class b/app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/model/AbstractSmartAction.class similarity index 100% rename from app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/model/AbstractSmartAction.class rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/model/AbstractSmartAction.class diff --git a/app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/model/Alert$AlertStatusEnum.class b/app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/model/Alert$AlertStatusEnum.class similarity index 100% rename from app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/model/Alert$AlertStatusEnum.class rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/model/Alert$AlertStatusEnum.class diff --git a/app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/model/Alert$Source.class b/app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/model/Alert$Source.class similarity index 100% rename from app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/model/Alert$Source.class rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/model/Alert$Source.class diff --git a/app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/model/Alert.class b/app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/model/Alert.class similarity index 100% rename from app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/model/Alert.class rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/model/Alert.class diff --git a/app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/model/AlertFilterDefault.class b/app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/model/AlertFilterDefault.class similarity index 100% rename from app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/model/AlertFilterDefault.class rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/model/AlertFilterDefault.class diff --git a/app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/model/AlertStatusType.class b/app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/model/AlertStatusType.class similarity index 100% rename from app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/model/AlertStatusType.class rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/model/AlertStatusType.class diff --git a/app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/model/AlertType.class b/app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/model/AlertType.class similarity index 100% rename from app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/model/AlertType.class rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/model/AlertType.class diff --git a/app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/model/BasemapBounds.class b/app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/model/BasemapBounds.class similarity index 100% rename from app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/model/BasemapBounds.class rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/model/BasemapBounds.class diff --git a/app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/model/BasemapTile.class b/app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/model/BasemapTile.class similarity index 100% rename from app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/model/BasemapTile.class rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/model/BasemapTile.class diff --git a/app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/model/CaPluginVersion$CaPluginVersionPk.class b/app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/model/CaPluginVersion$CaPluginVersionPk.class similarity index 100% rename from app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/model/CaPluginVersion$CaPluginVersionPk.class rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/model/CaPluginVersion$CaPluginVersionPk.class diff --git a/app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/model/CaPluginVersion.class b/app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/model/CaPluginVersion.class similarity index 100% rename from app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/model/CaPluginVersion.class rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/model/CaPluginVersion.class diff --git a/app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/model/CcaaDataModelConnect.class b/app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/model/CcaaDataModelConnect.class similarity index 100% rename from app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/model/CcaaDataModelConnect.class rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/model/CcaaDataModelConnect.class diff --git a/app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/model/ConnectPluginVersion.class b/app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/model/ConnectPluginVersion.class similarity index 100% rename from app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/model/ConnectPluginVersion.class rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/model/ConnectPluginVersion.class diff --git a/app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/model/ConnectUuidItem.class b/app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/model/ConnectUuidItem.class similarity index 100% rename from app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/model/ConnectUuidItem.class rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/model/ConnectUuidItem.class diff --git a/app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/model/ConservationAreaInfo$Status.class b/app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/model/ConservationAreaInfo$Status.class similarity index 100% rename from app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/model/ConservationAreaInfo$Status.class rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/model/ConservationAreaInfo$Status.class diff --git a/app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/model/ConservationAreaInfo.class b/app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/model/ConservationAreaInfo.class similarity index 100% rename from app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/model/ConservationAreaInfo.class rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/model/ConservationAreaInfo.class diff --git a/app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/model/ConservationAreaProxy.class b/app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/model/ConservationAreaProxy.class similarity index 100% rename from app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/model/ConservationAreaProxy.class rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/model/ConservationAreaProxy.class diff --git a/app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/model/CyberTrackerApiKey$CyberTrackerApiKeyPk.class b/app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/model/CyberTrackerApiKey$CyberTrackerApiKeyPk.class similarity index 100% rename from app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/model/CyberTrackerApiKey$CyberTrackerApiKeyPk.class rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/model/CyberTrackerApiKey$CyberTrackerApiKeyPk.class diff --git a/app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/model/CyberTrackerApiKey$Type.class b/app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/model/CyberTrackerApiKey$Type.class similarity index 100% rename from app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/model/CyberTrackerApiKey$Type.class rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/model/CyberTrackerApiKey$Type.class diff --git a/app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/model/CyberTrackerApiKey.class b/app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/model/CyberTrackerApiKey.class similarity index 100% rename from app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/model/CyberTrackerApiKey.class rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/model/CyberTrackerApiKey.class diff --git a/app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/model/CyberTrackerNavigationLayer$Status.class b/app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/model/CyberTrackerNavigationLayer$Status.class similarity index 100% rename from app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/model/CyberTrackerNavigationLayer$Status.class rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/model/CyberTrackerNavigationLayer$Status.class diff --git a/app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/model/CyberTrackerNavigationLayer.class b/app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/model/CyberTrackerNavigationLayer.class similarity index 100% rename from app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/model/CyberTrackerNavigationLayer.class rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/model/CyberTrackerNavigationLayer.class diff --git a/app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/model/CyberTrackerPackage$Status.class b/app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/model/CyberTrackerPackage$Status.class similarity index 100% rename from app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/model/CyberTrackerPackage$Status.class rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/model/CyberTrackerPackage$Status.class diff --git a/app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/model/CyberTrackerPackage.class b/app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/model/CyberTrackerPackage.class similarity index 100% rename from app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/model/CyberTrackerPackage.class rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/model/CyberTrackerPackage.class diff --git a/app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/model/Dashboard.class b/app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/model/Dashboard.class similarity index 100% rename from app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/model/Dashboard.class rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/model/Dashboard.class diff --git a/app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/model/EmployeeInfo.class b/app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/model/EmployeeInfo.class similarity index 100% rename from app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/model/EmployeeInfo.class rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/model/EmployeeInfo.class diff --git a/app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/model/GenericEnumType.class b/app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/model/GenericEnumType.class similarity index 100% rename from app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/model/GenericEnumType.class rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/model/GenericEnumType.class diff --git a/app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/model/GeoJsonAlert.class b/app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/model/GeoJsonAlert.class similarity index 100% rename from app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/model/GeoJsonAlert.class rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/model/GeoJsonAlert.class diff --git a/app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/model/GeoJsonFeature.class b/app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/model/GeoJsonFeature.class similarity index 100% rename from app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/model/GeoJsonFeature.class rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/model/GeoJsonFeature.class diff --git a/app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/model/GeoJsonGeometry.class b/app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/model/GeoJsonGeometry.class similarity index 100% rename from app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/model/GeoJsonGeometry.class rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/model/GeoJsonGeometry.class diff --git a/app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/model/GeoJsonProperties.class b/app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/model/GeoJsonProperties.class similarity index 100% rename from app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/model/GeoJsonProperties.class rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/model/GeoJsonProperties.class diff --git a/app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/model/GeoJsonSighting.class b/app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/model/GeoJsonSighting.class similarity index 100% rename from app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/model/GeoJsonSighting.class rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/model/GeoJsonSighting.class diff --git a/app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/model/MapLayer$MapLayerType.class b/app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/model/MapLayer$MapLayerType.class similarity index 100% rename from app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/model/MapLayer$MapLayerType.class rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/model/MapLayer$MapLayerType.class diff --git a/app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/model/MapLayer.class b/app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/model/MapLayer.class similarity index 100% rename from app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/model/MapLayer.class rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/model/MapLayer.class diff --git a/app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/model/Quicklink.class b/app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/model/Quicklink.class similarity index 100% rename from app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/model/Quicklink.class rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/model/Quicklink.class diff --git a/app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/model/QuicklinkWrapper.class b/app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/model/QuicklinkWrapper.class similarity index 100% rename from app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/model/QuicklinkWrapper.class rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/model/QuicklinkWrapper.class diff --git a/app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/model/ReportParameter$Type.class b/app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/model/ReportParameter$Type.class similarity index 100% rename from app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/model/ReportParameter$Type.class rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/model/ReportParameter$Type.class diff --git a/app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/model/ReportParameter.class b/app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/model/ReportParameter.class similarity index 100% rename from app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/model/ReportParameter.class rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/model/ReportParameter.class diff --git a/app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/model/SharedLink.class b/app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/model/SharedLink.class similarity index 100% rename from app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/model/SharedLink.class rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/model/SharedLink.class diff --git a/app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/model/SimpleConservationAreaList.class b/app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/model/SimpleConservationAreaList.class similarity index 100% rename from app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/model/SimpleConservationAreaList.class rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/model/SimpleConservationAreaList.class diff --git a/app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/model/SmartActionsProxy$ActionResource.class b/app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/model/SmartActionsProxy$ActionResource.class similarity index 100% rename from app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/model/SmartActionsProxy$ActionResource.class rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/model/SmartActionsProxy$ActionResource.class diff --git a/app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/model/SmartActionsProxy.class b/app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/model/SmartActionsProxy.class similarity index 100% rename from app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/model/SmartActionsProxy.class rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/model/SmartActionsProxy.class diff --git a/app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/model/SmartCollectConnectUser.class b/app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/model/SmartCollectConnectUser.class similarity index 100% rename from app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/model/SmartCollectConnectUser.class rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/model/SmartCollectConnectUser.class diff --git a/app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/model/SmartRole.class b/app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/model/SmartRole.class similarity index 100% rename from app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/model/SmartRole.class rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/model/SmartRole.class diff --git a/app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/model/SmartRoleAction.class b/app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/model/SmartRoleAction.class similarity index 100% rename from app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/model/SmartRoleAction.class rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/model/SmartRoleAction.class diff --git a/app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/model/SmartUser.class b/app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/model/SmartUser.class similarity index 100% rename from app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/model/SmartUser.class rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/model/SmartUser.class diff --git a/app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/model/SmartUserAction.class b/app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/model/SmartUserAction.class similarity index 100% rename from app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/model/SmartUserAction.class rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/model/SmartUserAction.class diff --git a/app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/model/SmartUserPermissionProxy$Type.class b/app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/model/SmartUserPermissionProxy$Type.class similarity index 100% rename from app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/model/SmartUserPermissionProxy$Type.class rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/model/SmartUserPermissionProxy$Type.class diff --git a/app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/model/SmartUserPermissionProxy.class b/app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/model/SmartUserPermissionProxy.class similarity index 100% rename from app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/model/SmartUserPermissionProxy.class rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/model/SmartUserPermissionProxy.class diff --git a/app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/model/SmartUserRole$SmartUserRolePk.class b/app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/model/SmartUserRole$SmartUserRolePk.class similarity index 100% rename from app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/model/SmartUserRole$SmartUserRolePk.class rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/model/SmartUserRole$SmartUserRolePk.class diff --git a/app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/model/SmartUserRole.class b/app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/model/SmartUserRole.class similarity index 100% rename from app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/model/SmartUserRole.class rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/model/SmartUserRole.class diff --git a/app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/model/StyleConfiguration.class b/app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/model/StyleConfiguration.class similarity index 100% rename from app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/model/StyleConfiguration.class rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/model/StyleConfiguration.class diff --git a/app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/model/UploadStatus.class b/app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/model/UploadStatus.class similarity index 100% rename from app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/model/UploadStatus.class rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/model/UploadStatus.class diff --git a/app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/model/UserQuicklink.class b/app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/model/UserQuicklink.class similarity index 100% rename from app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/model/UserQuicklink.class rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/model/UserQuicklink.class diff --git a/app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/model/UsersDefaultDashboard.class b/app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/model/UsersDefaultDashboard.class similarity index 100% rename from app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/model/UsersDefaultDashboard.class rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/model/UsersDefaultDashboard.class diff --git a/app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/model/WorkItem$Status.class b/app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/model/WorkItem$Status.class similarity index 100% rename from app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/model/WorkItem$Status.class rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/model/WorkItem$Status.class diff --git a/app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/model/WorkItem$Type.class b/app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/model/WorkItem$Type.class similarity index 100% rename from app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/model/WorkItem$Type.class rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/model/WorkItem$Type.class diff --git a/app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/model/WorkItem.class b/app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/model/WorkItem.class similarity index 100% rename from app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/model/WorkItem.class rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/model/WorkItem.class diff --git a/app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/qa/QaErLabelProvider$1.class b/app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/qa/QaErLabelProvider$1.class similarity index 100% rename from app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/qa/QaErLabelProvider$1.class rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/qa/QaErLabelProvider$1.class diff --git a/app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/qa/QaErLabelProvider.class b/app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/qa/QaErLabelProvider.class similarity index 100% rename from app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/qa/QaErLabelProvider.class rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/qa/QaErLabelProvider.class diff --git a/app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/qa/QaIncidentLabelProvider$1.class b/app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/qa/QaIncidentLabelProvider$1.class similarity index 100% rename from app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/qa/QaIncidentLabelProvider$1.class rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/qa/QaIncidentLabelProvider$1.class diff --git a/app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/qa/QaIncidentLabelProvider.class b/app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/qa/QaIncidentLabelProvider.class similarity index 100% rename from app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/qa/QaIncidentLabelProvider.class rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/qa/QaIncidentLabelProvider.class diff --git a/app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/qa/QaLabelProvider$1.class b/app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/qa/QaLabelProvider$1.class similarity index 100% rename from app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/qa/QaLabelProvider$1.class rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/qa/QaLabelProvider$1.class diff --git a/app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/qa/QaLabelProvider.class b/app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/qa/QaLabelProvider.class similarity index 100% rename from app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/qa/QaLabelProvider.class rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/qa/QaLabelProvider.class diff --git a/app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/qa/QaPatrolLabelProvider$1.class b/app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/qa/QaPatrolLabelProvider$1.class similarity index 100% rename from app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/qa/QaPatrolLabelProvider$1.class rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/qa/QaPatrolLabelProvider$1.class diff --git a/app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/qa/QaPatrolLabelProvider.class b/app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/qa/QaPatrolLabelProvider.class similarity index 100% rename from app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/qa/QaPatrolLabelProvider.class rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/qa/QaPatrolLabelProvider.class diff --git a/app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/FolderProxy.class b/app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/FolderProxy.class similarity index 100% rename from app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/FolderProxy.class rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/FolderProxy.class diff --git a/app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/PatrolContributionFinder.class b/app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/PatrolContributionFinder.class similarity index 100% rename from app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/PatrolContributionFinder.class rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/PatrolContributionFinder.class diff --git a/app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/QueryManager.class b/app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/QueryManager.class similarity index 100% rename from app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/QueryManager.class rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/QueryManager.class diff --git a/app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/QueryProxy.class b/app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/QueryProxy.class similarity index 100% rename from app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/QueryProxy.class rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/QueryProxy.class diff --git a/app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/RecordDateDateField.class b/app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/RecordDateDateField.class similarity index 100% rename from app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/RecordDateDateField.class rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/RecordDateDateField.class diff --git a/app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/WaypointSourceEngine.class b/app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/WaypointSourceEngine.class similarity index 100% rename from app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/WaypointSourceEngine.class rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/WaypointSourceEngine.class diff --git a/app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/columns/AssetQueryColumnProvider.class b/app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/columns/AssetQueryColumnProvider.class similarity index 100% rename from app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/columns/AssetQueryColumnProvider.class rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/columns/AssetQueryColumnProvider.class diff --git a/app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/columns/EntityQueryColumnProvider$1.class b/app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/columns/EntityQueryColumnProvider$1.class similarity index 100% rename from app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/columns/EntityQueryColumnProvider$1.class rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/columns/EntityQueryColumnProvider$1.class diff --git a/app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/columns/EntityQueryColumnProvider.class b/app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/columns/EntityQueryColumnProvider.class similarity index 100% rename from app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/columns/EntityQueryColumnProvider.class rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/columns/EntityQueryColumnProvider.class diff --git a/app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/columns/ObservationQueryColumnProvider.class b/app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/columns/ObservationQueryColumnProvider.class similarity index 100% rename from app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/columns/ObservationQueryColumnProvider.class rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/columns/ObservationQueryColumnProvider.class diff --git a/app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/columns/PatrolQueryColumnProvider.class b/app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/columns/PatrolQueryColumnProvider.class similarity index 100% rename from app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/columns/PatrolQueryColumnProvider.class rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/columns/PatrolQueryColumnProvider.class diff --git a/app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/columns/QueryColumnUtils$1.class b/app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/columns/QueryColumnUtils$1.class similarity index 100% rename from app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/columns/QueryColumnUtils$1.class rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/columns/QueryColumnUtils$1.class diff --git a/app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/columns/QueryColumnUtils$2.class b/app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/columns/QueryColumnUtils$2.class similarity index 100% rename from app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/columns/QueryColumnUtils$2.class rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/columns/QueryColumnUtils$2.class diff --git a/app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/columns/QueryColumnUtils$3.class b/app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/columns/QueryColumnUtils$3.class similarity index 100% rename from app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/columns/QueryColumnUtils$3.class rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/columns/QueryColumnUtils$3.class diff --git a/app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/columns/QueryColumnUtils.class b/app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/columns/QueryColumnUtils.class similarity index 100% rename from app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/columns/QueryColumnUtils.class rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/columns/QueryColumnUtils.class diff --git a/app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/columns/SurveyQueryColumnProvider.class b/app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/columns/SurveyQueryColumnProvider.class similarity index 100% rename from app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/columns/SurveyQueryColumnProvider.class rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/columns/SurveyQueryColumnProvider.class diff --git a/app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/custom/CustomIncidentQueryEngine.class b/app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/custom/CustomIncidentQueryEngine.class new file mode 100644 index 0000000..e3591aa Binary files /dev/null and b/app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/custom/CustomIncidentQueryEngine.class differ diff --git a/app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/custom/CustomPatrolQueryEngine$1.class b/app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/custom/CustomPatrolQueryEngine$1.class similarity index 94% rename from app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/custom/CustomPatrolQueryEngine$1.class rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/custom/CustomPatrolQueryEngine$1.class index 6fe263e..ce0aeef 100644 Binary files a/app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/custom/CustomPatrolQueryEngine$1.class and b/app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/custom/CustomPatrolQueryEngine$1.class differ diff --git a/app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/custom/CustomPatrolQueryEngine.class b/app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/custom/CustomPatrolQueryEngine.class new file mode 100644 index 0000000..b2d7f8e Binary files /dev/null and b/app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/custom/CustomPatrolQueryEngine.class differ diff --git a/app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/custom/CustomQueryEngine$1.class b/app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/custom/CustomQueryEngine$1.class similarity index 100% rename from app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/custom/CustomQueryEngine$1.class rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/custom/CustomQueryEngine$1.class diff --git a/app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/custom/CustomQueryEngine.class b/app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/custom/CustomQueryEngine.class new file mode 100644 index 0000000..2fb3304 Binary files /dev/null and b/app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/custom/CustomQueryEngine.class differ diff --git a/app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/custom/CustomWaypointQueryEngine.class b/app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/custom/CustomWaypointQueryEngine.class new file mode 100644 index 0000000..e297798 Binary files /dev/null and b/app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/custom/CustomWaypointQueryEngine.class differ diff --git a/app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/AbstractDbFeatureResultSet$1.class b/app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/AbstractDbFeatureResultSet$1.class similarity index 94% rename from app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/AbstractDbFeatureResultSet$1.class rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/AbstractDbFeatureResultSet$1.class index a035639..5c0c3c4 100644 Binary files a/app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/AbstractDbFeatureResultSet$1.class and b/app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/AbstractDbFeatureResultSet$1.class differ diff --git a/app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/AbstractDbFeatureResultSet.class b/app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/AbstractDbFeatureResultSet.class new file mode 100644 index 0000000..de1846d Binary files /dev/null and b/app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/AbstractDbFeatureResultSet.class differ diff --git a/app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/AbstractQueryEngine$1.class b/app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/AbstractQueryEngine$1.class similarity index 100% rename from app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/AbstractQueryEngine$1.class rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/AbstractQueryEngine$1.class diff --git a/app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/AbstractQueryEngine$2.class b/app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/AbstractQueryEngine$2.class similarity index 100% rename from app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/AbstractQueryEngine$2.class rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/AbstractQueryEngine$2.class diff --git a/app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/AbstractQueryEngine$FilterTable.class b/app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/AbstractQueryEngine$FilterTable.class similarity index 100% rename from app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/AbstractQueryEngine$FilterTable.class rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/AbstractQueryEngine$FilterTable.class diff --git a/app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/AbstractQueryEngine.class b/app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/AbstractQueryEngine.class similarity index 99% rename from app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/AbstractQueryEngine.class rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/AbstractQueryEngine.class index a38dd43..765c194 100644 Binary files a/app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/AbstractQueryEngine.class and b/app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/AbstractQueryEngine.class differ diff --git a/app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/GridQueryResults.class b/app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/GridQueryResults.class similarity index 100% rename from app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/GridQueryResults.class rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/GridQueryResults.class diff --git a/app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/IFilterProcessor.class b/app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/IFilterProcessor.class similarity index 100% rename from app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/IFilterProcessor.class rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/IFilterProcessor.class diff --git a/app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/IMemoryTableResultSet.class b/app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/IMemoryTableResultSet.class similarity index 100% rename from app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/IMemoryTableResultSet.class rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/IMemoryTableResultSet.class diff --git a/app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/ISummaryEngine.class b/app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/ISummaryEngine.class similarity index 100% rename from app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/ISummaryEngine.class rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/ISummaryEngine.class diff --git a/app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/IWOEngine.class b/app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/IWOEngine.class similarity index 100% rename from app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/IWOEngine.class rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/IWOEngine.class diff --git a/app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/ListItem.class b/app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/ListItem.class similarity index 100% rename from app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/ListItem.class rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/ListItem.class diff --git a/app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/ObservationFilterUtils$1.class b/app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/ObservationFilterUtils$1.class similarity index 100% rename from app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/ObservationFilterUtils$1.class rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/ObservationFilterUtils$1.class diff --git a/app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/ObservationFilterUtils$IDateFilterProcessor.class b/app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/ObservationFilterUtils$IDateFilterProcessor.class similarity index 100% rename from app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/ObservationFilterUtils$IDateFilterProcessor.class rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/ObservationFilterUtils$IDateFilterProcessor.class diff --git a/app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/ObservationFilterUtils.class b/app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/ObservationFilterUtils.class similarity index 100% rename from app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/ObservationFilterUtils.class rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/ObservationFilterUtils.class diff --git a/app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/ObservationQueryResult$1.class b/app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/ObservationQueryResult$1.class similarity index 100% rename from app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/ObservationQueryResult$1.class rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/ObservationQueryResult$1.class diff --git a/app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/ObservationQueryResult$2.class b/app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/ObservationQueryResult$2.class similarity index 100% rename from app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/ObservationQueryResult$2.class rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/ObservationQueryResult$2.class diff --git a/app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/ObservationQueryResult$3.class b/app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/ObservationQueryResult$3.class similarity index 100% rename from app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/ObservationQueryResult$3.class rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/ObservationQueryResult$3.class diff --git a/app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/ObservationQueryResult.class b/app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/ObservationQueryResult.class similarity index 100% rename from app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/ObservationQueryResult.class rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/ObservationQueryResult.class diff --git a/app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/PsqlFilterToSqlGenerator.class b/app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/PsqlFilterToSqlGenerator.class new file mode 100644 index 0000000..fa9d591 Binary files /dev/null and b/app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/PsqlFilterToSqlGenerator.class differ diff --git a/app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/PsqlNamedPreparedStatement.class b/app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/PsqlNamedPreparedStatement.class similarity index 100% rename from app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/PsqlNamedPreparedStatement.class rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/PsqlNamedPreparedStatement.class diff --git a/app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/QueryResultSetIterator.class b/app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/QueryResultSetIterator.class similarity index 82% rename from app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/QueryResultSetIterator.class rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/QueryResultSetIterator.class index 08af97b..70c347c 100644 Binary files a/app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/QueryResultSetIterator.class and b/app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/QueryResultSetIterator.class differ diff --git a/app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/RasterBuilder.class b/app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/RasterBuilder.class similarity index 100% rename from app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/RasterBuilder.class rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/RasterBuilder.class diff --git a/app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/SummaryItemLabelProvider$1.class b/app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/SummaryItemLabelProvider$1.class similarity index 87% rename from app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/SummaryItemLabelProvider$1.class rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/SummaryItemLabelProvider$1.class index 3c5f763..e19a6f7 100644 Binary files a/app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/SummaryItemLabelProvider$1.class and b/app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/SummaryItemLabelProvider$1.class differ diff --git a/app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/SummaryItemLabelProvider.class b/app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/SummaryItemLabelProvider.class new file mode 100644 index 0000000..def82de Binary files /dev/null and b/app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/SummaryItemLabelProvider.class differ diff --git a/app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/WaypointQueryResult$1.class b/app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/WaypointQueryResult$1.class similarity index 87% rename from app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/WaypointQueryResult$1.class rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/WaypointQueryResult$1.class index 7fad9e6..1404486 100644 Binary files a/app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/WaypointQueryResult$1.class and b/app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/WaypointQueryResult$1.class differ diff --git a/app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/WaypointQueryResult$2.class b/app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/WaypointQueryResult$2.class new file mode 100644 index 0000000..ddacf8e Binary files /dev/null and b/app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/WaypointQueryResult$2.class differ diff --git a/app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/WaypointQueryResult.class b/app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/WaypointQueryResult.class new file mode 100644 index 0000000..dc2c71f Binary files /dev/null and b/app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/WaypointQueryResult.class differ diff --git a/app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/asset/AssetDeploymentFilterProcessor$1.class b/app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/asset/AssetDeploymentFilterProcessor$1.class similarity index 100% rename from app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/asset/AssetDeploymentFilterProcessor$1.class rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/asset/AssetDeploymentFilterProcessor$1.class diff --git a/app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/asset/AssetDeploymentFilterProcessor.class b/app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/asset/AssetDeploymentFilterProcessor.class similarity index 100% rename from app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/asset/AssetDeploymentFilterProcessor.class rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/asset/AssetDeploymentFilterProcessor.class diff --git a/app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/asset/AssetDeploymentSummaryEngine$1.class b/app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/asset/AssetDeploymentSummaryEngine$1.class similarity index 100% rename from app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/asset/AssetDeploymentSummaryEngine$1.class rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/asset/AssetDeploymentSummaryEngine$1.class diff --git a/app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/asset/AssetDeploymentSummaryEngine$2.class b/app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/asset/AssetDeploymentSummaryEngine$2.class similarity index 100% rename from app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/asset/AssetDeploymentSummaryEngine$2.class rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/asset/AssetDeploymentSummaryEngine$2.class diff --git a/app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/asset/AssetDeploymentSummaryEngine.class b/app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/asset/AssetDeploymentSummaryEngine.class similarity index 100% rename from app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/asset/AssetDeploymentSummaryEngine.class rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/asset/AssetDeploymentSummaryEngine.class diff --git a/app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/asset/AssetFilterProcessor.class b/app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/asset/AssetFilterProcessor.class similarity index 100% rename from app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/asset/AssetFilterProcessor.class rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/asset/AssetFilterProcessor.class diff --git a/app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/asset/AssetObservationEngine$1.class b/app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/asset/AssetObservationEngine$1.class similarity index 100% rename from app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/asset/AssetObservationEngine$1.class rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/asset/AssetObservationEngine$1.class diff --git a/app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/asset/AssetObservationEngine.class b/app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/asset/AssetObservationEngine.class similarity index 100% rename from app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/asset/AssetObservationEngine.class rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/asset/AssetObservationEngine.class diff --git a/app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/asset/AssetObservationResult.class b/app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/asset/AssetObservationResult.class similarity index 100% rename from app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/asset/AssetObservationResult.class rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/asset/AssetObservationResult.class diff --git a/app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/asset/AssetQueryEngine.class b/app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/asset/AssetQueryEngine.class similarity index 100% rename from app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/asset/AssetQueryEngine.class rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/asset/AssetQueryEngine.class diff --git a/app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/asset/AssetSummaryEngine$1.class b/app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/asset/AssetSummaryEngine$1.class similarity index 100% rename from app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/asset/AssetSummaryEngine$1.class rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/asset/AssetSummaryEngine$1.class diff --git a/app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/asset/AssetSummaryEngine$2.class b/app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/asset/AssetSummaryEngine$2.class similarity index 100% rename from app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/asset/AssetSummaryEngine$2.class rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/asset/AssetSummaryEngine$2.class diff --git a/app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/asset/AssetSummaryEngine.class b/app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/asset/AssetSummaryEngine.class similarity index 100% rename from app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/asset/AssetSummaryEngine.class rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/asset/AssetSummaryEngine.class diff --git a/app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/asset/AssetWaypointEngine$1.class b/app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/asset/AssetWaypointEngine$1.class similarity index 100% rename from app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/asset/AssetWaypointEngine$1.class rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/asset/AssetWaypointEngine$1.class diff --git a/app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/asset/AssetWaypointEngine.class b/app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/asset/AssetWaypointEngine.class similarity index 100% rename from app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/asset/AssetWaypointEngine.class rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/asset/AssetWaypointEngine.class diff --git a/app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/asset/AssetWaypointFilterProcessor$1.class b/app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/asset/AssetWaypointFilterProcessor$1.class similarity index 100% rename from app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/asset/AssetWaypointFilterProcessor$1.class rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/asset/AssetWaypointFilterProcessor$1.class diff --git a/app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/asset/AssetWaypointFilterProcessor.class b/app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/asset/AssetWaypointFilterProcessor.class similarity index 100% rename from app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/asset/AssetWaypointFilterProcessor.class rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/asset/AssetWaypointFilterProcessor.class diff --git a/app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/asset/AssetWaypointGroupFilterProcessor$1.class b/app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/asset/AssetWaypointGroupFilterProcessor$1.class similarity index 100% rename from app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/asset/AssetWaypointGroupFilterProcessor$1.class rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/asset/AssetWaypointGroupFilterProcessor$1.class diff --git a/app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/asset/AssetWaypointGroupFilterProcessor.class b/app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/asset/AssetWaypointGroupFilterProcessor.class similarity index 100% rename from app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/asset/AssetWaypointGroupFilterProcessor.class rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/asset/AssetWaypointGroupFilterProcessor.class diff --git a/app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/asset/AssetWaypointResult.class b/app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/asset/AssetWaypointResult.class similarity index 100% rename from app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/asset/AssetWaypointResult.class rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/asset/AssetWaypointResult.class diff --git a/app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/entity/EntityAttributeFilterCollectorVisitor.class b/app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/entity/EntityAttributeFilterCollectorVisitor.class similarity index 100% rename from app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/entity/EntityAttributeFilterCollectorVisitor.class rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/entity/EntityAttributeFilterCollectorVisitor.class diff --git a/app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/entity/EntityAttributeFilterVisitor$1.class b/app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/entity/EntityAttributeFilterVisitor$1.class similarity index 100% rename from app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/entity/EntityAttributeFilterVisitor$1.class rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/entity/EntityAttributeFilterVisitor$1.class diff --git a/app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/entity/EntityAttributeFilterVisitor.class b/app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/entity/EntityAttributeFilterVisitor.class similarity index 100% rename from app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/entity/EntityAttributeFilterVisitor.class rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/entity/EntityAttributeFilterVisitor.class diff --git a/app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/entity/EntityObservationQueryResult.class b/app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/entity/EntityObservationQueryResult.class similarity index 100% rename from app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/entity/EntityObservationQueryResult.class rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/entity/EntityObservationQueryResult.class diff --git a/app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/entity/EntityWaypointQueryResult.class b/app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/entity/EntityWaypointQueryResult.class similarity index 100% rename from app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/entity/EntityWaypointQueryResult.class rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/entity/EntityWaypointQueryResult.class diff --git a/app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/entity/PsqlEntityFilterProcessor.class b/app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/entity/PsqlEntityFilterProcessor.class similarity index 100% rename from app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/entity/PsqlEntityFilterProcessor.class rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/entity/PsqlEntityFilterProcessor.class diff --git a/app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/entity/PsqlEntityGridEngine$1.class b/app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/entity/PsqlEntityGridEngine$1.class similarity index 100% rename from app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/entity/PsqlEntityGridEngine$1.class rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/entity/PsqlEntityGridEngine$1.class diff --git a/app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/entity/PsqlEntityGridEngine.class b/app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/entity/PsqlEntityGridEngine.class similarity index 100% rename from app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/entity/PsqlEntityGridEngine.class rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/entity/PsqlEntityGridEngine.class diff --git a/app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/entity/PsqlEntityObservationEngine$1$1.class b/app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/entity/PsqlEntityObservationEngine$1$1.class similarity index 100% rename from app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/entity/PsqlEntityObservationEngine$1$1.class rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/entity/PsqlEntityObservationEngine$1$1.class diff --git a/app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/entity/PsqlEntityObservationEngine$1.class b/app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/entity/PsqlEntityObservationEngine$1.class similarity index 100% rename from app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/entity/PsqlEntityObservationEngine$1.class rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/entity/PsqlEntityObservationEngine$1.class diff --git a/app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/entity/PsqlEntityObservationEngine.class b/app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/entity/PsqlEntityObservationEngine.class similarity index 100% rename from app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/entity/PsqlEntityObservationEngine.class rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/entity/PsqlEntityObservationEngine.class diff --git a/app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/entity/PsqlEntitySummaryEngine$1.class b/app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/entity/PsqlEntitySummaryEngine$1.class similarity index 100% rename from app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/entity/PsqlEntitySummaryEngine$1.class rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/entity/PsqlEntitySummaryEngine$1.class diff --git a/app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/entity/PsqlEntitySummaryEngine$2.class b/app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/entity/PsqlEntitySummaryEngine$2.class similarity index 100% rename from app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/entity/PsqlEntitySummaryEngine$2.class rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/entity/PsqlEntitySummaryEngine$2.class diff --git a/app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/entity/PsqlEntitySummaryEngine.class b/app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/entity/PsqlEntitySummaryEngine.class similarity index 100% rename from app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/entity/PsqlEntitySummaryEngine.class rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/entity/PsqlEntitySummaryEngine.class diff --git a/app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/entity/PsqlEntityWaypointEngine$1.class b/app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/entity/PsqlEntityWaypointEngine$1.class similarity index 100% rename from app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/entity/PsqlEntityWaypointEngine$1.class rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/entity/PsqlEntityWaypointEngine$1.class diff --git a/app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/entity/PsqlEntityWaypointEngine.class b/app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/entity/PsqlEntityWaypointEngine.class similarity index 100% rename from app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/entity/PsqlEntityWaypointEngine.class rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/entity/PsqlEntityWaypointEngine.class diff --git a/app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/entity/PsqlEntityWaypointFilterProcessor$1.class b/app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/entity/PsqlEntityWaypointFilterProcessor$1.class similarity index 100% rename from app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/entity/PsqlEntityWaypointFilterProcessor$1.class rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/entity/PsqlEntityWaypointFilterProcessor$1.class diff --git a/app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/entity/PsqlEntityWaypointFilterProcessor.class b/app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/entity/PsqlEntityWaypointFilterProcessor.class similarity index 100% rename from app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/entity/PsqlEntityWaypointFilterProcessor.class rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/entity/PsqlEntityWaypointFilterProcessor.class diff --git a/app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/entity/PsqlEntityWaypointGroupFilterProcessor$1.class b/app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/entity/PsqlEntityWaypointGroupFilterProcessor$1.class similarity index 100% rename from app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/entity/PsqlEntityWaypointGroupFilterProcessor$1.class rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/entity/PsqlEntityWaypointGroupFilterProcessor$1.class diff --git a/app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/entity/PsqlEntityWaypointGroupFilterProcessor.class b/app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/entity/PsqlEntityWaypointGroupFilterProcessor.class similarity index 100% rename from app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/entity/PsqlEntityWaypointGroupFilterProcessor.class rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/entity/PsqlEntityWaypointGroupFilterProcessor.class diff --git a/app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/er/ErFilterProcessor$1.class b/app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/er/ErFilterProcessor$1.class similarity index 100% rename from app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/er/ErFilterProcessor$1.class rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/er/ErFilterProcessor$1.class diff --git a/app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/er/ErFilterProcessor.class b/app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/er/ErFilterProcessor.class similarity index 100% rename from app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/er/ErFilterProcessor.class rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/er/ErFilterProcessor.class diff --git a/app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/er/ErFilterProcessorMission.class b/app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/er/ErFilterProcessorMission.class similarity index 100% rename from app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/er/ErFilterProcessorMission.class rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/er/ErFilterProcessorMission.class diff --git a/app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/er/ErMissionQueryResult$1.class b/app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/er/ErMissionQueryResult$1.class similarity index 87% rename from app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/er/ErMissionQueryResult$1.class rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/er/ErMissionQueryResult$1.class index 2bd3703..d398029 100644 Binary files a/app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/er/ErMissionQueryResult$1.class and b/app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/er/ErMissionQueryResult$1.class differ diff --git a/app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/er/ErMissionQueryResult$2.class b/app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/er/ErMissionQueryResult$2.class similarity index 87% rename from app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/er/ErMissionQueryResult$2.class rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/er/ErMissionQueryResult$2.class index 363135e..ec34ff3 100644 Binary files a/app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/er/ErMissionQueryResult$2.class and b/app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/er/ErMissionQueryResult$2.class differ diff --git a/app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/er/ErMissionQueryResult$3.class b/app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/er/ErMissionQueryResult$3.class similarity index 90% rename from app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/er/ErMissionQueryResult$3.class rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/er/ErMissionQueryResult$3.class index eb8ee88..6209916 100644 Binary files a/app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/er/ErMissionQueryResult$3.class and b/app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/er/ErMissionQueryResult$3.class differ diff --git a/app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/er/ErMissionQueryResult$4.class b/app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/er/ErMissionQueryResult$4.class new file mode 100644 index 0000000..4c9cc04 Binary files /dev/null and b/app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/er/ErMissionQueryResult$4.class differ diff --git a/app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/er/ErMissionQueryResult.class b/app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/er/ErMissionQueryResult.class new file mode 100644 index 0000000..f3860bd Binary files /dev/null and b/app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/er/ErMissionQueryResult.class differ diff --git a/app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/er/ErMissionTrackQueryResult$1.class b/app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/er/ErMissionTrackQueryResult$1.class similarity index 87% rename from app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/er/ErMissionTrackQueryResult$1.class rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/er/ErMissionTrackQueryResult$1.class index a331723..d08b1c3 100644 Binary files a/app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/er/ErMissionTrackQueryResult$1.class and b/app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/er/ErMissionTrackQueryResult$1.class differ diff --git a/app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/er/ErMissionTrackQueryResult$2.class b/app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/er/ErMissionTrackQueryResult$2.class similarity index 87% rename from app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/er/ErMissionTrackQueryResult$2.class rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/er/ErMissionTrackQueryResult$2.class index def7b96..f3cdc14 100644 Binary files a/app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/er/ErMissionTrackQueryResult$2.class and b/app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/er/ErMissionTrackQueryResult$2.class differ diff --git a/app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/er/ErMissionTrackQueryResult$3.class b/app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/er/ErMissionTrackQueryResult$3.class similarity index 87% rename from app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/er/ErMissionTrackQueryResult$3.class rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/er/ErMissionTrackQueryResult$3.class index 3159288..c0e2209 100644 Binary files a/app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/er/ErMissionTrackQueryResult$3.class and b/app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/er/ErMissionTrackQueryResult$3.class differ diff --git a/app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/er/ErMissionTrackQueryResult$4.class b/app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/er/ErMissionTrackQueryResult$4.class similarity index 90% rename from app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/er/ErMissionTrackQueryResult$4.class rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/er/ErMissionTrackQueryResult$4.class index 88a1f1f..8688883 100644 Binary files a/app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/er/ErMissionTrackQueryResult$4.class and b/app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/er/ErMissionTrackQueryResult$4.class differ diff --git a/app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/er/ErMissionTrackQueryResult$5.class b/app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/er/ErMissionTrackQueryResult$5.class new file mode 100644 index 0000000..c70d08d Binary files /dev/null and b/app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/er/ErMissionTrackQueryResult$5.class differ diff --git a/app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/er/ErMissionTrackQueryResult.class b/app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/er/ErMissionTrackQueryResult.class new file mode 100644 index 0000000..b9ea61c Binary files /dev/null and b/app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/er/ErMissionTrackQueryResult.class differ diff --git a/app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/er/ErObservationQueryResult$1.class b/app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/er/ErObservationQueryResult$1.class similarity index 100% rename from app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/er/ErObservationQueryResult$1.class rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/er/ErObservationQueryResult$1.class diff --git a/app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/er/ErObservationQueryResult.class b/app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/er/ErObservationQueryResult.class similarity index 100% rename from app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/er/ErObservationQueryResult.class rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/er/ErObservationQueryResult.class diff --git a/app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/er/ErSurveyQueryResultSet.class b/app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/er/ErSurveyQueryResultSet.class similarity index 100% rename from app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/er/ErSurveyQueryResultSet.class rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/er/ErSurveyQueryResultSet.class diff --git a/app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/er/ErWaypointFilterProcessor$1.class b/app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/er/ErWaypointFilterProcessor$1.class similarity index 100% rename from app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/er/ErWaypointFilterProcessor$1.class rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/er/ErWaypointFilterProcessor$1.class diff --git a/app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/er/ErWaypointFilterProcessor.class b/app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/er/ErWaypointFilterProcessor.class similarity index 100% rename from app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/er/ErWaypointFilterProcessor.class rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/er/ErWaypointFilterProcessor.class diff --git a/app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/er/ErWaypointGroupFilterProcessor$1.class b/app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/er/ErWaypointGroupFilterProcessor$1.class similarity index 100% rename from app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/er/ErWaypointGroupFilterProcessor$1.class rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/er/ErWaypointGroupFilterProcessor$1.class diff --git a/app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/er/ErWaypointGroupFilterProcessor.class b/app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/er/ErWaypointGroupFilterProcessor.class similarity index 100% rename from app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/er/ErWaypointGroupFilterProcessor.class rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/er/ErWaypointGroupFilterProcessor.class diff --git a/app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/er/ErWaypointQueryResult$1.class b/app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/er/ErWaypointQueryResult$1.class similarity index 100% rename from app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/er/ErWaypointQueryResult$1.class rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/er/ErWaypointQueryResult$1.class diff --git a/app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/er/ErWaypointQueryResult.class b/app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/er/ErWaypointQueryResult.class similarity index 100% rename from app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/er/ErWaypointQueryResult.class rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/er/ErWaypointQueryResult.class diff --git a/app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/er/GeomSurveyQueryResultItem.class b/app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/er/GeomSurveyQueryResultItem.class similarity index 100% rename from app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/er/GeomSurveyQueryResultItem.class rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/er/GeomSurveyQueryResultItem.class diff --git a/app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/er/PsqlErEngine.class b/app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/er/PsqlErEngine.class similarity index 100% rename from app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/er/PsqlErEngine.class rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/er/PsqlErEngine.class diff --git a/app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/er/PsqlErGridEngine$1.class b/app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/er/PsqlErGridEngine$1.class similarity index 100% rename from app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/er/PsqlErGridEngine$1.class rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/er/PsqlErGridEngine$1.class diff --git a/app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/er/PsqlErGridEngine$2.class b/app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/er/PsqlErGridEngine$2.class similarity index 100% rename from app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/er/PsqlErGridEngine$2.class rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/er/PsqlErGridEngine$2.class diff --git a/app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/er/PsqlErGridEngine.class b/app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/er/PsqlErGridEngine.class similarity index 100% rename from app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/er/PsqlErGridEngine.class rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/er/PsqlErGridEngine.class diff --git a/app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/er/PsqlErMissionEngine$1.class b/app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/er/PsqlErMissionEngine$1.class similarity index 100% rename from app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/er/PsqlErMissionEngine$1.class rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/er/PsqlErMissionEngine$1.class diff --git a/app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/er/PsqlErMissionEngine.class b/app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/er/PsqlErMissionEngine.class similarity index 100% rename from app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/er/PsqlErMissionEngine.class rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/er/PsqlErMissionEngine.class diff --git a/app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/er/PsqlErMissionTrackEngine$1.class b/app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/er/PsqlErMissionTrackEngine$1.class similarity index 100% rename from app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/er/PsqlErMissionTrackEngine$1.class rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/er/PsqlErMissionTrackEngine$1.class diff --git a/app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/er/PsqlErMissionTrackEngine.class b/app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/er/PsqlErMissionTrackEngine.class similarity index 100% rename from app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/er/PsqlErMissionTrackEngine.class rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/er/PsqlErMissionTrackEngine.class diff --git a/app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/er/PsqlErObservationEngine$1.class b/app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/er/PsqlErObservationEngine$1.class similarity index 100% rename from app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/er/PsqlErObservationEngine$1.class rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/er/PsqlErObservationEngine$1.class diff --git a/app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/er/PsqlErObservationEngine.class b/app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/er/PsqlErObservationEngine.class similarity index 100% rename from app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/er/PsqlErObservationEngine.class rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/er/PsqlErObservationEngine.class diff --git a/app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/er/PsqlErSummaryEngine$1.class b/app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/er/PsqlErSummaryEngine$1.class similarity index 100% rename from app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/er/PsqlErSummaryEngine$1.class rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/er/PsqlErSummaryEngine$1.class diff --git a/app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/er/PsqlErSummaryEngine$2.class b/app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/er/PsqlErSummaryEngine$2.class similarity index 100% rename from app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/er/PsqlErSummaryEngine$2.class rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/er/PsqlErSummaryEngine$2.class diff --git a/app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/er/PsqlErSummaryEngine.class b/app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/er/PsqlErSummaryEngine.class similarity index 100% rename from app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/er/PsqlErSummaryEngine.class rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/er/PsqlErSummaryEngine.class diff --git a/app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/er/PsqlErWaypointEngine$1.class b/app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/er/PsqlErWaypointEngine$1.class similarity index 100% rename from app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/er/PsqlErWaypointEngine$1.class rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/er/PsqlErWaypointEngine$1.class diff --git a/app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/er/PsqlErWaypointEngine.class b/app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/er/PsqlErWaypointEngine.class similarity index 100% rename from app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/er/PsqlErWaypointEngine.class rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/er/PsqlErWaypointEngine.class diff --git a/app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/export/AbstractQueryExporter.class b/app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/export/AbstractQueryExporter.class similarity index 100% rename from app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/export/AbstractQueryExporter.class rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/export/AbstractQueryExporter.class diff --git a/app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/export/CsvExporter.class b/app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/export/CsvExporter.class similarity index 100% rename from app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/export/CsvExporter.class rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/export/CsvExporter.class diff --git a/app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/export/GeoJsonStreamingExporter.class b/app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/export/GeoJsonStreamingExporter.class similarity index 100% rename from app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/export/GeoJsonStreamingExporter.class rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/export/GeoJsonStreamingExporter.class diff --git a/app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/export/HtmlStreamingExporter.class b/app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/export/HtmlStreamingExporter.class similarity index 100% rename from app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/export/HtmlStreamingExporter.class rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/export/HtmlStreamingExporter.class diff --git a/app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/export/HtmlStreamingGridQueryExporter.class b/app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/export/HtmlStreamingGridQueryExporter.class similarity index 100% rename from app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/export/HtmlStreamingGridQueryExporter.class rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/export/HtmlStreamingGridQueryExporter.class diff --git a/app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/export/HtmlStreamingSummaryQueryExporter.class b/app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/export/HtmlStreamingSummaryQueryExporter.class similarity index 100% rename from app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/export/HtmlStreamingSummaryQueryExporter.class rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/export/HtmlStreamingSummaryQueryExporter.class diff --git a/app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/export/ShpExporter.class b/app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/export/ShpExporter.class similarity index 100% rename from app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/export/ShpExporter.class rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/export/ShpExporter.class diff --git a/app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/export/TiffRasterExporter.class b/app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/export/TiffRasterExporter.class similarity index 100% rename from app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/export/TiffRasterExporter.class rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/export/TiffRasterExporter.class diff --git a/app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/i2/CaUuidColumn.class b/app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/i2/CaUuidColumn.class similarity index 100% rename from app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/i2/CaUuidColumn.class rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/i2/CaUuidColumn.class diff --git a/app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/i2/CaUuidGroupByItem.class b/app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/i2/CaUuidGroupByItem.class similarity index 100% rename from app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/i2/CaUuidGroupByItem.class rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/i2/CaUuidGroupByItem.class diff --git a/app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/i2/ConnectIntelObservationResultItem.class b/app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/i2/ConnectIntelObservationResultItem.class similarity index 100% rename from app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/i2/ConnectIntelObservationResultItem.class rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/i2/ConnectIntelObservationResultItem.class diff --git a/app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/i2/ConnectPagedResultSetIterator$1.class b/app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/i2/ConnectPagedResultSetIterator$1.class similarity index 100% rename from app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/i2/ConnectPagedResultSetIterator$1.class rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/i2/ConnectPagedResultSetIterator$1.class diff --git a/app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/i2/ConnectPagedResultSetIterator.class b/app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/i2/ConnectPagedResultSetIterator.class similarity index 100% rename from app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/i2/ConnectPagedResultSetIterator.class rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/i2/ConnectPagedResultSetIterator.class diff --git a/app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/i2/EntityRecordObservationFilterProcessor$1.class b/app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/i2/EntityRecordObservationFilterProcessor$1.class similarity index 100% rename from app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/i2/EntityRecordObservationFilterProcessor$1.class rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/i2/EntityRecordObservationFilterProcessor$1.class diff --git a/app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/i2/EntityRecordObservationFilterProcessor$2.class b/app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/i2/EntityRecordObservationFilterProcessor$2.class similarity index 100% rename from app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/i2/EntityRecordObservationFilterProcessor$2.class rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/i2/EntityRecordObservationFilterProcessor$2.class diff --git a/app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/i2/EntityRecordObservationFilterProcessor$3.class b/app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/i2/EntityRecordObservationFilterProcessor$3.class similarity index 100% rename from app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/i2/EntityRecordObservationFilterProcessor$3.class rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/i2/EntityRecordObservationFilterProcessor$3.class diff --git a/app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/i2/EntityRecordObservationFilterProcessor.class b/app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/i2/EntityRecordObservationFilterProcessor.class similarity index 100% rename from app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/i2/EntityRecordObservationFilterProcessor.class rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/i2/EntityRecordObservationFilterProcessor.class diff --git a/app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/i2/EntityRecordWaypointFilterProcessor$1.class b/app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/i2/EntityRecordWaypointFilterProcessor$1.class similarity index 100% rename from app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/i2/EntityRecordWaypointFilterProcessor$1.class rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/i2/EntityRecordWaypointFilterProcessor$1.class diff --git a/app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/i2/EntityRecordWaypointFilterProcessor$2.class b/app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/i2/EntityRecordWaypointFilterProcessor$2.class similarity index 100% rename from app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/i2/EntityRecordWaypointFilterProcessor$2.class rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/i2/EntityRecordWaypointFilterProcessor$2.class diff --git a/app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/i2/EntityRecordWaypointFilterProcessor$3.class b/app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/i2/EntityRecordWaypointFilterProcessor$3.class similarity index 100% rename from app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/i2/EntityRecordWaypointFilterProcessor$3.class rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/i2/EntityRecordWaypointFilterProcessor$3.class diff --git a/app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/i2/EntityRecordWaypointFilterProcessor.class b/app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/i2/EntityRecordWaypointFilterProcessor.class similarity index 100% rename from app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/i2/EntityRecordWaypointFilterProcessor.class rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/i2/EntityRecordWaypointFilterProcessor.class diff --git a/app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/i2/IConnectPagedQueryResultSet.class b/app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/i2/IConnectPagedQueryResultSet.class similarity index 100% rename from app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/i2/IConnectPagedQueryResultSet.class rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/i2/IConnectPagedQueryResultSet.class diff --git a/app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/i2/IntelConnection.class b/app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/i2/IntelConnection.class similarity index 100% rename from app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/i2/IntelConnection.class rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/i2/IntelConnection.class diff --git a/app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/i2/IntelConnectionFactory.class b/app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/i2/IntelConnectionFactory.class similarity index 100% rename from app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/i2/IntelConnectionFactory.class rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/i2/IntelConnectionFactory.class diff --git a/app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/i2/IntelEntityRecordQueryEngine$1.class b/app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/i2/IntelEntityRecordQueryEngine$1.class similarity index 100% rename from app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/i2/IntelEntityRecordQueryEngine$1.class rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/i2/IntelEntityRecordQueryEngine$1.class diff --git a/app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/i2/IntelEntityRecordQueryEngine$2.class b/app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/i2/IntelEntityRecordQueryEngine$2.class similarity index 100% rename from app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/i2/IntelEntityRecordQueryEngine$2.class rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/i2/IntelEntityRecordQueryEngine$2.class diff --git a/app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/i2/IntelEntityRecordQueryEngine$3.class b/app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/i2/IntelEntityRecordQueryEngine$3.class similarity index 100% rename from app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/i2/IntelEntityRecordQueryEngine$3.class rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/i2/IntelEntityRecordQueryEngine$3.class diff --git a/app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/i2/IntelEntityRecordQueryEngine.class b/app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/i2/IntelEntityRecordQueryEngine.class similarity index 100% rename from app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/i2/IntelEntityRecordQueryEngine.class rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/i2/IntelEntityRecordQueryEngine.class diff --git a/app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/i2/IntelEntityRecordQueryResults$1.class b/app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/i2/IntelEntityRecordQueryResults$1.class similarity index 100% rename from app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/i2/IntelEntityRecordQueryResults$1.class rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/i2/IntelEntityRecordQueryResults$1.class diff --git a/app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/i2/IntelEntityRecordQueryResults.class b/app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/i2/IntelEntityRecordQueryResults.class similarity index 100% rename from app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/i2/IntelEntityRecordQueryResults.class rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/i2/IntelEntityRecordQueryResults.class diff --git a/app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/i2/IntelEntitySummaryQueryEngine$1.class b/app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/i2/IntelEntitySummaryQueryEngine$1.class similarity index 100% rename from app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/i2/IntelEntitySummaryQueryEngine$1.class rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/i2/IntelEntitySummaryQueryEngine$1.class diff --git a/app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/i2/IntelEntitySummaryQueryEngine$2.class b/app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/i2/IntelEntitySummaryQueryEngine$2.class similarity index 100% rename from app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/i2/IntelEntitySummaryQueryEngine$2.class rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/i2/IntelEntitySummaryQueryEngine$2.class diff --git a/app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/i2/IntelEntitySummaryQueryEngine$3.class b/app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/i2/IntelEntitySummaryQueryEngine$3.class similarity index 100% rename from app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/i2/IntelEntitySummaryQueryEngine$3.class rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/i2/IntelEntitySummaryQueryEngine$3.class diff --git a/app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/i2/IntelEntitySummaryQueryEngine$DataTable.class b/app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/i2/IntelEntitySummaryQueryEngine$DataTable.class similarity index 100% rename from app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/i2/IntelEntitySummaryQueryEngine$DataTable.class rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/i2/IntelEntitySummaryQueryEngine$DataTable.class diff --git a/app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/i2/IntelEntitySummaryQueryEngine.class b/app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/i2/IntelEntitySummaryQueryEngine.class similarity index 100% rename from app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/i2/IntelEntitySummaryQueryEngine.class rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/i2/IntelEntitySummaryQueryEngine.class diff --git a/app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/i2/IntelObservationQueryEngine$1.class b/app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/i2/IntelObservationQueryEngine$1.class similarity index 100% rename from app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/i2/IntelObservationQueryEngine$1.class rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/i2/IntelObservationQueryEngine$1.class diff --git a/app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/i2/IntelObservationQueryEngine$2.class b/app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/i2/IntelObservationQueryEngine$2.class similarity index 100% rename from app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/i2/IntelObservationQueryEngine$2.class rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/i2/IntelObservationQueryEngine$2.class diff --git a/app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/i2/IntelObservationQueryEngine.class b/app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/i2/IntelObservationQueryEngine.class similarity index 100% rename from app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/i2/IntelObservationQueryEngine.class rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/i2/IntelObservationQueryEngine.class diff --git a/app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/i2/IntelObservationQueryResults$1.class b/app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/i2/IntelObservationQueryResults$1.class similarity index 100% rename from app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/i2/IntelObservationQueryResults$1.class rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/i2/IntelObservationQueryResults$1.class diff --git a/app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/i2/IntelObservationQueryResults.class b/app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/i2/IntelObservationQueryResults.class similarity index 100% rename from app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/i2/IntelObservationQueryResults.class rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/i2/IntelObservationQueryResults.class diff --git a/app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/i2/IntelRecordQueryEngine.class b/app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/i2/IntelRecordQueryEngine.class similarity index 100% rename from app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/i2/IntelRecordQueryEngine.class rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/i2/IntelRecordQueryEngine.class diff --git a/app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/i2/IntelRecordQueryResults$1.class b/app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/i2/IntelRecordQueryResults$1.class similarity index 100% rename from app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/i2/IntelRecordQueryResults$1.class rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/i2/IntelRecordQueryResults$1.class diff --git a/app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/i2/IntelRecordQueryResults.class b/app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/i2/IntelRecordQueryResults.class similarity index 100% rename from app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/i2/IntelRecordQueryResults.class rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/i2/IntelRecordQueryResults.class diff --git a/app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/i2/IntelRecordSummaryQueryEngine$1.class b/app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/i2/IntelRecordSummaryQueryEngine$1.class similarity index 100% rename from app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/i2/IntelRecordSummaryQueryEngine$1.class rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/i2/IntelRecordSummaryQueryEngine$1.class diff --git a/app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/i2/IntelRecordSummaryQueryEngine$DataTable.class b/app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/i2/IntelRecordSummaryQueryEngine$DataTable.class similarity index 100% rename from app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/i2/IntelRecordSummaryQueryEngine$DataTable.class rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/i2/IntelRecordSummaryQueryEngine$DataTable.class diff --git a/app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/i2/IntelRecordSummaryQueryEngine.class b/app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/i2/IntelRecordSummaryQueryEngine.class similarity index 100% rename from app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/i2/IntelRecordSummaryQueryEngine.class rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/i2/IntelRecordSummaryQueryEngine.class diff --git a/app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/i2/ObservationFilterProcessor$1.class b/app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/i2/ObservationFilterProcessor$1.class similarity index 100% rename from app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/i2/ObservationFilterProcessor$1.class rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/i2/ObservationFilterProcessor$1.class diff --git a/app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/i2/ObservationFilterProcessor$2.class b/app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/i2/ObservationFilterProcessor$2.class similarity index 100% rename from app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/i2/ObservationFilterProcessor$2.class rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/i2/ObservationFilterProcessor$2.class diff --git a/app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/i2/ObservationFilterProcessor$3.class b/app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/i2/ObservationFilterProcessor$3.class similarity index 100% rename from app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/i2/ObservationFilterProcessor$3.class rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/i2/ObservationFilterProcessor$3.class diff --git a/app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/i2/ObservationFilterProcessor.class b/app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/i2/ObservationFilterProcessor.class similarity index 100% rename from app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/i2/ObservationFilterProcessor.class rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/i2/ObservationFilterProcessor.class diff --git a/app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/i2/QueryEngineFactory.class b/app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/i2/QueryEngineFactory.class similarity index 100% rename from app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/i2/QueryEngineFactory.class rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/i2/QueryEngineFactory.class diff --git a/app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/i2/RecordFilterProcessor$1.class b/app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/i2/RecordFilterProcessor$1.class similarity index 100% rename from app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/i2/RecordFilterProcessor$1.class rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/i2/RecordFilterProcessor$1.class diff --git a/app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/i2/RecordFilterProcessor.class b/app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/i2/RecordFilterProcessor.class similarity index 100% rename from app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/i2/RecordFilterProcessor.class rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/i2/RecordFilterProcessor.class diff --git a/app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/i2/RecordUuidColumn.class b/app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/i2/RecordUuidColumn.class similarity index 100% rename from app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/i2/RecordUuidColumn.class rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/i2/RecordUuidColumn.class diff --git a/app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/i2/SqlGenerator$1.class b/app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/i2/SqlGenerator$1.class similarity index 100% rename from app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/i2/SqlGenerator$1.class rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/i2/SqlGenerator$1.class diff --git a/app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/i2/SqlGenerator.class b/app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/i2/SqlGenerator.class similarity index 100% rename from app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/i2/SqlGenerator.class rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/i2/SqlGenerator.class diff --git a/app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/i2/WaypointFilterProcessor$1.class b/app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/i2/WaypointFilterProcessor$1.class similarity index 100% rename from app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/i2/WaypointFilterProcessor$1.class rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/i2/WaypointFilterProcessor$1.class diff --git a/app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/i2/WaypointFilterProcessor$2.class b/app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/i2/WaypointFilterProcessor$2.class similarity index 100% rename from app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/i2/WaypointFilterProcessor$2.class rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/i2/WaypointFilterProcessor$2.class diff --git a/app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/i2/WaypointFilterProcessor$3.class b/app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/i2/WaypointFilterProcessor$3.class similarity index 100% rename from app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/i2/WaypointFilterProcessor$3.class rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/i2/WaypointFilterProcessor$3.class diff --git a/app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/i2/WaypointFilterProcessor.class b/app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/i2/WaypointFilterProcessor.class similarity index 100% rename from app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/i2/WaypointFilterProcessor.class rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/i2/WaypointFilterProcessor.class diff --git a/app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/observation/ObsFilterProcessor.class b/app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/observation/ObsFilterProcessor.class similarity index 100% rename from app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/observation/ObsFilterProcessor.class rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/observation/ObsFilterProcessor.class diff --git a/app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/observation/ObsObservationQueryResult.class b/app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/observation/ObsObservationQueryResult.class similarity index 100% rename from app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/observation/ObsObservationQueryResult.class rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/observation/ObsObservationQueryResult.class diff --git a/app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/observation/ObsWaypointFilterProcessor$1.class b/app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/observation/ObsWaypointFilterProcessor$1.class similarity index 100% rename from app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/observation/ObsWaypointFilterProcessor$1.class rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/observation/ObsWaypointFilterProcessor$1.class diff --git a/app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/observation/ObsWaypointFilterProcessor.class b/app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/observation/ObsWaypointFilterProcessor.class similarity index 100% rename from app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/observation/ObsWaypointFilterProcessor.class rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/observation/ObsWaypointFilterProcessor.class diff --git a/app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/observation/ObsWaypointGroupFilterProcessor$1.class b/app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/observation/ObsWaypointGroupFilterProcessor$1.class similarity index 100% rename from app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/observation/ObsWaypointGroupFilterProcessor$1.class rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/observation/ObsWaypointGroupFilterProcessor$1.class diff --git a/app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/observation/ObsWaypointGroupFilterProcessor.class b/app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/observation/ObsWaypointGroupFilterProcessor.class similarity index 100% rename from app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/observation/ObsWaypointGroupFilterProcessor.class rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/observation/ObsWaypointGroupFilterProcessor.class diff --git a/app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/observation/ObsWaypointQueryResult.class b/app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/observation/ObsWaypointQueryResult.class similarity index 100% rename from app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/observation/ObsWaypointQueryResult.class rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/observation/ObsWaypointQueryResult.class diff --git a/app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/observation/PsqlObsGridEngine$1.class b/app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/observation/PsqlObsGridEngine$1.class similarity index 100% rename from app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/observation/PsqlObsGridEngine$1.class rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/observation/PsqlObsGridEngine$1.class diff --git a/app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/observation/PsqlObsGridEngine.class b/app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/observation/PsqlObsGridEngine.class similarity index 100% rename from app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/observation/PsqlObsGridEngine.class rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/observation/PsqlObsGridEngine.class diff --git a/app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/observation/PsqlObsObservationEngine$1.class b/app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/observation/PsqlObsObservationEngine$1.class similarity index 100% rename from app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/observation/PsqlObsObservationEngine$1.class rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/observation/PsqlObsObservationEngine$1.class diff --git a/app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/observation/PsqlObsObservationEngine.class b/app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/observation/PsqlObsObservationEngine.class similarity index 100% rename from app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/observation/PsqlObsObservationEngine.class rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/observation/PsqlObsObservationEngine.class diff --git a/app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/observation/PsqlObsSummaryEngine$1.class b/app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/observation/PsqlObsSummaryEngine$1.class similarity index 95% rename from app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/observation/PsqlObsSummaryEngine$1.class rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/observation/PsqlObsSummaryEngine$1.class index 381ecd4..96c8f2f 100644 Binary files a/app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/observation/PsqlObsSummaryEngine$1.class and b/app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/observation/PsqlObsSummaryEngine$1.class differ diff --git a/app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/observation/PsqlObsSummaryEngine$2.class b/app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/observation/PsqlObsSummaryEngine$2.class similarity index 94% rename from app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/observation/PsqlObsSummaryEngine$2.class rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/observation/PsqlObsSummaryEngine$2.class index c43e999..5b844c5 100644 Binary files a/app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/observation/PsqlObsSummaryEngine$2.class and b/app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/observation/PsqlObsSummaryEngine$2.class differ diff --git a/app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/observation/PsqlObsSummaryEngine.class b/app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/observation/PsqlObsSummaryEngine.class new file mode 100644 index 0000000..eb6beb9 Binary files /dev/null and b/app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/observation/PsqlObsSummaryEngine.class differ diff --git a/app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/observation/PsqlObsWaypointEngine$1.class b/app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/observation/PsqlObsWaypointEngine$1.class similarity index 100% rename from app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/observation/PsqlObsWaypointEngine$1.class rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/observation/PsqlObsWaypointEngine$1.class diff --git a/app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/observation/PsqlObsWaypointEngine.class b/app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/observation/PsqlObsWaypointEngine.class similarity index 100% rename from app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/observation/PsqlObsWaypointEngine.class rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/observation/PsqlObsWaypointEngine.class diff --git a/app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/patrol/PatrolFilterProcessor.class b/app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/patrol/PatrolFilterProcessor.class similarity index 100% rename from app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/patrol/PatrolFilterProcessor.class rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/patrol/PatrolFilterProcessor.class diff --git a/app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/patrol/PatrolObservationQueryResult.class b/app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/patrol/PatrolObservationQueryResult.class similarity index 100% rename from app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/patrol/PatrolObservationQueryResult.class rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/patrol/PatrolObservationQueryResult.class diff --git a/app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/patrol/PatrolQueryResult$1.class b/app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/patrol/PatrolQueryResult$1.class new file mode 100644 index 0000000..8ab9d9e Binary files /dev/null and b/app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/patrol/PatrolQueryResult$1.class differ diff --git a/app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/patrol/PatrolQueryResult$2.class b/app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/patrol/PatrolQueryResult$2.class similarity index 87% rename from app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/patrol/PatrolQueryResult$2.class rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/patrol/PatrolQueryResult$2.class index 5e8ae94..5cdedc1 100644 Binary files a/app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/patrol/PatrolQueryResult$2.class and b/app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/patrol/PatrolQueryResult$2.class differ diff --git a/app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/patrol/PatrolQueryResult.class b/app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/patrol/PatrolQueryResult.class new file mode 100644 index 0000000..5a18b4a Binary files /dev/null and b/app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/patrol/PatrolQueryResult.class differ diff --git a/app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/patrol/PatrolQueryUtils.class b/app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/patrol/PatrolQueryUtils.class similarity index 100% rename from app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/patrol/PatrolQueryUtils.class rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/patrol/PatrolQueryUtils.class diff --git a/app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/patrol/PatrolWaypointFilterProcessor$1.class b/app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/patrol/PatrolWaypointFilterProcessor$1.class similarity index 100% rename from app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/patrol/PatrolWaypointFilterProcessor$1.class rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/patrol/PatrolWaypointFilterProcessor$1.class diff --git a/app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/patrol/PatrolWaypointFilterProcessor.class b/app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/patrol/PatrolWaypointFilterProcessor.class similarity index 100% rename from app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/patrol/PatrolWaypointFilterProcessor.class rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/patrol/PatrolWaypointFilterProcessor.class diff --git a/app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/patrol/PatrolWaypointGroupFilterProcessor$1.class b/app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/patrol/PatrolWaypointGroupFilterProcessor$1.class similarity index 100% rename from app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/patrol/PatrolWaypointGroupFilterProcessor$1.class rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/patrol/PatrolWaypointGroupFilterProcessor$1.class diff --git a/app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/patrol/PatrolWaypointGroupFilterProcessor.class b/app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/patrol/PatrolWaypointGroupFilterProcessor.class similarity index 100% rename from app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/patrol/PatrolWaypointGroupFilterProcessor.class rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/patrol/PatrolWaypointGroupFilterProcessor.class diff --git a/app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/patrol/PatrolWaypointQueryResult.class b/app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/patrol/PatrolWaypointQueryResult.class similarity index 100% rename from app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/patrol/PatrolWaypointQueryResult.class rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/patrol/PatrolWaypointQueryResult.class diff --git a/app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/patrol/PsqlPatrolEngine$1.class b/app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/patrol/PsqlPatrolEngine$1.class similarity index 100% rename from app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/patrol/PsqlPatrolEngine$1.class rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/patrol/PsqlPatrolEngine$1.class diff --git a/app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/patrol/PsqlPatrolEngine.class b/app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/patrol/PsqlPatrolEngine.class similarity index 100% rename from app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/patrol/PsqlPatrolEngine.class rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/patrol/PsqlPatrolEngine.class diff --git a/app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/patrol/PsqlPatrolGridEngine$1.class b/app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/patrol/PsqlPatrolGridEngine$1.class similarity index 100% rename from app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/patrol/PsqlPatrolGridEngine$1.class rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/patrol/PsqlPatrolGridEngine$1.class diff --git a/app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/patrol/PsqlPatrolGridEngine.class b/app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/patrol/PsqlPatrolGridEngine.class similarity index 100% rename from app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/patrol/PsqlPatrolGridEngine.class rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/patrol/PsqlPatrolGridEngine.class diff --git a/app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/patrol/PsqlPatrolObservationEngine$1.class b/app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/patrol/PsqlPatrolObservationEngine$1.class similarity index 100% rename from app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/patrol/PsqlPatrolObservationEngine$1.class rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/patrol/PsqlPatrolObservationEngine$1.class diff --git a/app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/patrol/PsqlPatrolObservationEngine.class b/app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/patrol/PsqlPatrolObservationEngine.class similarity index 100% rename from app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/patrol/PsqlPatrolObservationEngine.class rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/patrol/PsqlPatrolObservationEngine.class diff --git a/app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/patrol/PsqlPatrolSummaryEngine$1$1.class b/app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/patrol/PsqlPatrolSummaryEngine$1$1.class new file mode 100644 index 0000000..0a91736 Binary files /dev/null and b/app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/patrol/PsqlPatrolSummaryEngine$1$1.class differ diff --git a/app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/patrol/PsqlPatrolSummaryEngine$1.class b/app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/patrol/PsqlPatrolSummaryEngine$1.class new file mode 100644 index 0000000..cf1525b Binary files /dev/null and b/app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/patrol/PsqlPatrolSummaryEngine$1.class differ diff --git a/app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/patrol/PsqlPatrolSummaryEngine$2.class b/app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/patrol/PsqlPatrolSummaryEngine$2.class new file mode 100644 index 0000000..78c18e6 Binary files /dev/null and b/app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/patrol/PsqlPatrolSummaryEngine$2.class differ diff --git a/app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/patrol/PsqlPatrolSummaryEngine.class b/app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/patrol/PsqlPatrolSummaryEngine.class new file mode 100644 index 0000000..6a77ac5 Binary files /dev/null and b/app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/patrol/PsqlPatrolSummaryEngine.class differ diff --git a/app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/patrol/PsqlPatrolWaypointEngine$1.class b/app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/patrol/PsqlPatrolWaypointEngine$1.class similarity index 100% rename from app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/patrol/PsqlPatrolWaypointEngine$1.class rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/patrol/PsqlPatrolWaypointEngine$1.class diff --git a/app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/patrol/PsqlPatrolWaypointEngine.class b/app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/patrol/PsqlPatrolWaypointEngine.class similarity index 100% rename from app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/patrol/PsqlPatrolWaypointEngine.class rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/patrol/PsqlPatrolWaypointEngine.class diff --git a/app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/report/BirtEngine$1.class b/app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/report/BirtEngine$1.class similarity index 100% rename from app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/report/BirtEngine$1.class rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/report/BirtEngine$1.class diff --git a/app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/report/BirtEngine$2.class b/app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/report/BirtEngine$2.class similarity index 100% rename from app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/report/BirtEngine$2.class rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/report/BirtEngine$2.class diff --git a/app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/report/BirtEngine$3.class b/app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/report/BirtEngine$3.class similarity index 100% rename from app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/report/BirtEngine$3.class rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/report/BirtEngine$3.class diff --git a/app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/report/BirtEngine.class b/app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/report/BirtEngine.class similarity index 100% rename from app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/report/BirtEngine.class rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/report/BirtEngine.class diff --git a/app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/report/ConnectConnectionProvider.class b/app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/report/ConnectConnectionProvider.class similarity index 100% rename from app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/report/ConnectConnectionProvider.class rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/report/ConnectConnectionProvider.class diff --git a/app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/report/ConnectionFactory.class b/app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/report/ConnectionFactory.class similarity index 100% rename from app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/report/ConnectionFactory.class rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/report/ConnectionFactory.class diff --git a/app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/report/ReportFormat.class b/app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/report/ReportFormat.class similarity index 100% rename from app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/report/ReportFormat.class rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/report/ReportFormat.class diff --git a/app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/report/ReportProxy.class b/app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/report/ReportProxy.class similarity index 100% rename from app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/report/ReportProxy.class rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/report/ReportProxy.class diff --git a/app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/report/SmartServiceLabelProvider.class b/app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/report/SmartServiceLabelProvider.class similarity index 100% rename from app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/report/SmartServiceLabelProvider.class rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/report/SmartServiceLabelProvider.class diff --git a/app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/report/query/QueryDatasetExtensionManager.class b/app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/report/query/QueryDatasetExtensionManager.class similarity index 100% rename from app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/report/query/QueryDatasetExtensionManager.class rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/report/query/QueryDatasetExtensionManager.class diff --git a/app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/report/query/ServerQueryMetadataProvider.class b/app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/report/query/ServerQueryMetadataProvider.class similarity index 100% rename from app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/report/query/ServerQueryMetadataProvider.class rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/report/query/ServerQueryMetadataProvider.class diff --git a/app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/report/query/ServerSmartConnection.class b/app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/report/query/ServerSmartConnection.class similarity index 100% rename from app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/report/query/ServerSmartConnection.class rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/report/query/ServerSmartConnection.class diff --git a/app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/report/query/SmartBirtTableUtils.class b/app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/report/query/SmartBirtTableUtils.class similarity index 100% rename from app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/report/query/SmartBirtTableUtils.class rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/report/query/SmartBirtTableUtils.class diff --git a/app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/report/query/SmartQuery.class b/app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/report/query/SmartQuery.class similarity index 100% rename from app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/report/query/SmartQuery.class rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/report/query/SmartQuery.class diff --git a/app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/report/udig/CatalogPluginWrapper$1.class b/app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/report/udig/CatalogPluginWrapper$1.class similarity index 100% rename from app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/report/udig/CatalogPluginWrapper$1.class rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/report/udig/CatalogPluginWrapper$1.class diff --git a/app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/report/udig/CatalogPluginWrapper$2.class b/app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/report/udig/CatalogPluginWrapper$2.class similarity index 100% rename from app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/report/udig/CatalogPluginWrapper$2.class rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/report/udig/CatalogPluginWrapper$2.class diff --git a/app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/report/udig/CatalogPluginWrapper.class b/app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/report/udig/CatalogPluginWrapper.class similarity index 100% rename from app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/report/udig/CatalogPluginWrapper.class rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/report/udig/CatalogPluginWrapper.class diff --git a/app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/report/udig/ProjectPluginWrapper.class b/app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/report/udig/ProjectPluginWrapper.class similarity index 100% rename from app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/report/udig/ProjectPluginWrapper.class rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/report/udig/ProjectPluginWrapper.class diff --git a/app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/report/udig/ShpPluginWrapper.class b/app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/report/udig/ShpPluginWrapper.class similarity index 100% rename from app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/report/udig/ShpPluginWrapper.class rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/report/udig/ShpPluginWrapper.class diff --git a/app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/report/udig/UdigPreferenceStore.class b/app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/report/udig/UdigPreferenceStore.class similarity index 100% rename from app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/report/udig/UdigPreferenceStore.class rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/report/udig/UdigPreferenceStore.class diff --git a/app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/report/udig/UiPluginWrapper.class b/app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/report/udig/UiPluginWrapper.class similarity index 100% rename from app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/report/udig/UiPluginWrapper.class rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/report/udig/UiPluginWrapper.class diff --git a/app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/security/ActionManager.class b/app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/security/ActionManager.class similarity index 100% rename from app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/security/ActionManager.class rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/security/ActionManager.class diff --git a/app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/security/AdminAccountAction.class b/app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/security/AdminAccountAction.class similarity index 100% rename from app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/security/AdminAccountAction.class rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/security/AdminAccountAction.class diff --git a/app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/security/AdvIntelAction.class b/app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/security/AdvIntelAction.class similarity index 100% rename from app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/security/AdvIntelAction.class rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/security/AdvIntelAction.class diff --git a/app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/security/AlertAction.class b/app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/security/AlertAction.class similarity index 100% rename from app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/security/AlertAction.class rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/security/AlertAction.class diff --git a/app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/security/CaAction.class b/app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/security/CaAction.class similarity index 100% rename from app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/security/CaAction.class rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/security/CaAction.class diff --git a/app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/security/CaAdminAccountAction.class b/app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/security/CaAdminAccountAction.class similarity index 100% rename from app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/security/CaAdminAccountAction.class rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/security/CaAdminAccountAction.class diff --git a/app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/security/CustomQueryAccountAction.class b/app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/security/CustomQueryAccountAction.class similarity index 100% rename from app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/security/CustomQueryAccountAction.class rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/security/CustomQueryAccountAction.class diff --git a/app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/security/CyberTrackerAction.class b/app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/security/CyberTrackerAction.class similarity index 100% rename from app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/security/CyberTrackerAction.class rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/security/CyberTrackerAction.class diff --git a/app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/security/ISmartConnectAction.class b/app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/security/ISmartConnectAction.class similarity index 100% rename from app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/security/ISmartConnectAction.class rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/security/ISmartConnectAction.class diff --git a/app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/security/QueryAction.class b/app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/security/QueryAction.class similarity index 100% rename from app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/security/QueryAction.class rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/security/QueryAction.class diff --git a/app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/security/ReportAction.class b/app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/security/ReportAction.class similarity index 100% rename from app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/security/ReportAction.class rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/security/ReportAction.class diff --git a/app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/security/ResourceOption.class b/app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/security/ResourceOption.class similarity index 100% rename from app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/security/ResourceOption.class rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/security/ResourceOption.class diff --git a/app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/security/SecurityManager.class b/app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/security/SecurityManager.class similarity index 100% rename from app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/security/SecurityManager.class rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/security/SecurityManager.class diff --git a/app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/servlet/AccountServlet.class b/app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/servlet/AccountServlet.class similarity index 100% rename from app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/servlet/AccountServlet.class rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/servlet/AccountServlet.class diff --git a/app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/servlet/AlertServlet.class b/app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/servlet/AlertServlet.class similarity index 100% rename from app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/servlet/AlertServlet.class rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/servlet/AlertServlet.class diff --git a/app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/servlet/CaServlet.class b/app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/servlet/CaServlet.class similarity index 100% rename from app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/servlet/CaServlet.class rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/servlet/CaServlet.class diff --git a/app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/servlet/CaUsersServlet.class b/app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/servlet/CaUsersServlet.class similarity index 100% rename from app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/servlet/CaUsersServlet.class rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/servlet/CaUsersServlet.class diff --git a/app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/servlet/CybertrackerServlet.class b/app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/servlet/CybertrackerServlet.class similarity index 100% rename from app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/servlet/CybertrackerServlet.class rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/servlet/CybertrackerServlet.class diff --git a/app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/servlet/DataQueueServlet.class b/app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/servlet/DataQueueServlet.class similarity index 100% rename from app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/servlet/DataQueueServlet.class rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/servlet/DataQueueServlet.class diff --git a/app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/servlet/GetImage.class b/app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/servlet/GetImage.class similarity index 100% rename from app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/servlet/GetImage.class rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/servlet/GetImage.class diff --git a/app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/servlet/LoginServlet.class b/app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/servlet/LoginServlet.class similarity index 99% rename from app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/servlet/LoginServlet.class rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/servlet/LoginServlet.class index 9151886..cc3a6e6 100644 Binary files a/app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/servlet/LoginServlet.class and b/app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/servlet/LoginServlet.class differ diff --git a/app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/servlet/LogoutServlet.class b/app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/servlet/LogoutServlet.class similarity index 100% rename from app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/servlet/LogoutServlet.class rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/servlet/LogoutServlet.class diff --git a/app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/servlet/QueryServlet.class b/app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/servlet/QueryServlet.class similarity index 100% rename from app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/servlet/QueryServlet.class rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/servlet/QueryServlet.class diff --git a/app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/servlet/ReportServlet.class b/app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/servlet/ReportServlet.class similarity index 100% rename from app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/servlet/ReportServlet.class rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/servlet/ReportServlet.class diff --git a/app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/servlet/ResetPasswordServlet.class b/app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/servlet/ResetPasswordServlet.class similarity index 100% rename from app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/servlet/ResetPasswordServlet.class rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/servlet/ResetPasswordServlet.class diff --git a/app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/servlet/RunQueryServlet.class b/app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/servlet/RunQueryServlet.class similarity index 100% rename from app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/servlet/RunQueryServlet.class rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/servlet/RunQueryServlet.class diff --git a/app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/servlet/RunReportServlet.class b/app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/servlet/RunReportServlet.class similarity index 100% rename from app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/servlet/RunReportServlet.class rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/servlet/RunReportServlet.class diff --git a/app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/servlet/SettingsServlet.class b/app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/servlet/SettingsServlet.class similarity index 100% rename from app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/servlet/SettingsServlet.class rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/servlet/SettingsServlet.class diff --git a/app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/servlet/SharedLinkServlet.class b/app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/servlet/SharedLinkServlet.class similarity index 100% rename from app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/servlet/SharedLinkServlet.class rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/servlet/SharedLinkServlet.class diff --git a/app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/servlet/SharedLinksAdminServlet.class b/app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/servlet/SharedLinksAdminServlet.class similarity index 100% rename from app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/servlet/SharedLinksAdminServlet.class rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/servlet/SharedLinksAdminServlet.class diff --git a/app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/servlet/UpgradeServlet$1.class b/app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/servlet/UpgradeServlet$1.class similarity index 90% rename from app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/servlet/UpgradeServlet$1.class rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/servlet/UpgradeServlet$1.class index ed88c9f..fe65c96 100644 Binary files a/app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/servlet/UpgradeServlet$1.class and b/app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/servlet/UpgradeServlet$1.class differ diff --git a/app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/servlet/UpgradeServlet$2.class b/app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/servlet/UpgradeServlet$2.class similarity index 90% rename from app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/servlet/UpgradeServlet$2.class rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/servlet/UpgradeServlet$2.class index 7fbf051..dad28bf 100644 Binary files a/app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/servlet/UpgradeServlet$2.class and b/app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/servlet/UpgradeServlet$2.class differ diff --git a/app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/servlet/UpgradeServlet$3.class b/app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/servlet/UpgradeServlet$3.class similarity index 91% rename from app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/servlet/UpgradeServlet$3.class rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/servlet/UpgradeServlet$3.class index 67eff5c..a6f46a8 100644 Binary files a/app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/servlet/UpgradeServlet$3.class and b/app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/servlet/UpgradeServlet$3.class differ diff --git a/app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/servlet/UpgradeServlet$4.class b/app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/servlet/UpgradeServlet$4.class similarity index 88% rename from app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/servlet/UpgradeServlet$4.class rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/servlet/UpgradeServlet$4.class index 83dae20..11de23b 100644 Binary files a/app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/servlet/UpgradeServlet$4.class and b/app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/servlet/UpgradeServlet$4.class differ diff --git a/app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/servlet/UpgradeServlet$5.class b/app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/servlet/UpgradeServlet$5.class similarity index 93% rename from app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/servlet/UpgradeServlet$5.class rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/servlet/UpgradeServlet$5.class index 5348e78..ec2d989 100644 Binary files a/app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/servlet/UpgradeServlet$5.class and b/app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/servlet/UpgradeServlet$5.class differ diff --git a/app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/servlet/UpgradeServlet$6.class b/app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/servlet/UpgradeServlet$6.class new file mode 100644 index 0000000..d19d998 Binary files /dev/null and b/app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/servlet/UpgradeServlet$6.class differ diff --git a/app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/servlet/UpgradeServlet.class b/app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/servlet/UpgradeServlet.class new file mode 100644 index 0000000..5688b06 Binary files /dev/null and b/app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/servlet/UpgradeServlet.class differ diff --git a/app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/servlet/UserRoleRequestWrapper$1.class b/app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/servlet/UserRoleRequestWrapper$1.class similarity index 100% rename from app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/servlet/UserRoleRequestWrapper$1.class rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/servlet/UserRoleRequestWrapper$1.class diff --git a/app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/servlet/UserRoleRequestWrapper.class b/app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/servlet/UserRoleRequestWrapper.class similarity index 100% rename from app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/servlet/UserRoleRequestWrapper.class rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/servlet/UserRoleRequestWrapper.class diff --git a/app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/servlet/UsersServlet.class b/app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/servlet/UsersServlet.class similarity index 100% rename from app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/servlet/UsersServlet.class rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/servlet/UsersServlet.class diff --git a/app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/servlet/VersionInfo.class b/app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/servlet/VersionInfo.class new file mode 100644 index 0000000..4c4d69a Binary files /dev/null and b/app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/servlet/VersionInfo.class differ diff --git a/app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/uploader/IUploadItemProcessor.class b/app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/uploader/IUploadItemProcessor.class similarity index 100% rename from app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/uploader/IUploadItemProcessor.class rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/uploader/IUploadItemProcessor.class diff --git a/app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/uploader/ItemProcessManager.class b/app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/uploader/ItemProcessManager.class similarity index 100% rename from app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/uploader/ItemProcessManager.class rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/uploader/ItemProcessManager.class diff --git a/app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/uploader/PostgresqlMetadataCreator.class b/app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/uploader/PostgresqlMetadataCreator.class similarity index 100% rename from app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/uploader/PostgresqlMetadataCreator.class rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/uploader/PostgresqlMetadataCreator.class diff --git a/app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/uploader/UploaderProcessor.class b/app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/uploader/UploaderProcessor.class similarity index 100% rename from app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/uploader/UploaderProcessor.class rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/uploader/UploaderProcessor.class diff --git a/app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/uploader/ca/CaProcessorUtils.class b/app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/uploader/ca/CaProcessorUtils.class similarity index 100% rename from app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/uploader/ca/CaProcessorUtils.class rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/uploader/ca/CaProcessorUtils.class diff --git a/app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/uploader/ca/LoadCaProcessor.class b/app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/uploader/ca/LoadCaProcessor.class similarity index 100% rename from app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/uploader/ca/LoadCaProcessor.class rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/uploader/ca/LoadCaProcessor.class diff --git a/app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/uploader/ca/PostgresqlCaLoader$1.class b/app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/uploader/ca/PostgresqlCaLoader$1.class similarity index 100% rename from app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/uploader/ca/PostgresqlCaLoader$1.class rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/uploader/ca/PostgresqlCaLoader$1.class diff --git a/app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/uploader/ca/PostgresqlCaLoader$TableInfo.class b/app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/uploader/ca/PostgresqlCaLoader$TableInfo.class similarity index 100% rename from app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/uploader/ca/PostgresqlCaLoader$TableInfo.class rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/uploader/ca/PostgresqlCaLoader$TableInfo.class diff --git a/app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/uploader/ca/PostgresqlCaLoader.class b/app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/uploader/ca/PostgresqlCaLoader.class similarity index 100% rename from app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/uploader/ca/PostgresqlCaLoader.class rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/uploader/ca/PostgresqlCaLoader.class diff --git a/app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/uploader/sync/ChangeLogManager.class b/app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/uploader/sync/ChangeLogManager.class similarity index 100% rename from app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/uploader/sync/ChangeLogManager.class rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/uploader/sync/ChangeLogManager.class diff --git a/app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/uploader/sync/PostgresqlChangeLogDeserializer.class b/app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/uploader/sync/PostgresqlChangeLogDeserializer.class similarity index 100% rename from app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/uploader/sync/PostgresqlChangeLogDeserializer.class rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/uploader/sync/PostgresqlChangeLogDeserializer.class diff --git a/app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/uploader/sync/PostgresqlSyncProcessor.class b/app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/uploader/sync/PostgresqlSyncProcessor.class similarity index 100% rename from app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/uploader/sync/PostgresqlSyncProcessor.class rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/uploader/sync/PostgresqlSyncProcessor.class diff --git a/app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/uploader/sync/SyncUploadCaProcessor.class b/app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/uploader/sync/SyncUploadCaProcessor.class similarity index 81% rename from app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/uploader/sync/SyncUploadCaProcessor.class rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/uploader/sync/SyncUploadCaProcessor.class index 1172cda..ca79959 100644 Binary files a/app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/uploader/sync/SyncUploadCaProcessor.class and b/app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/uploader/sync/SyncUploadCaProcessor.class differ diff --git a/app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/version.txt b/app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/version.txt new file mode 100644 index 0000000..3e21172 --- /dev/null +++ b/app/opt/tomcat9/webapps/ROOT/WEB-INF/classes/version.txt @@ -0,0 +1,2 @@ +version=7.5.8 +build.date=202401181715 \ No newline at end of file diff --git a/app/webapps/ROOT/WEB-INF/cybertracker.jsp b/app/opt/tomcat9/webapps/ROOT/WEB-INF/cybertracker.jsp similarity index 100% rename from app/webapps/ROOT/WEB-INF/cybertracker.jsp rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/cybertracker.jsp diff --git a/app/webapps/ROOT/WEB-INF/dashboardbeta.jsp b/app/opt/tomcat9/webapps/ROOT/WEB-INF/dashboardbeta.jsp similarity index 100% rename from app/webapps/ROOT/WEB-INF/dashboardbeta.jsp rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/dashboardbeta.jsp diff --git a/app/webapps/ROOT/WEB-INF/dashboardbetaadmin.jsp b/app/opt/tomcat9/webapps/ROOT/WEB-INF/dashboardbetaadmin.jsp similarity index 100% rename from app/webapps/ROOT/WEB-INF/dashboardbetaadmin.jsp rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/dashboardbetaadmin.jsp diff --git a/app/webapps/ROOT/WEB-INF/dataqueue.jsp b/app/opt/tomcat9/webapps/ROOT/WEB-INF/dataqueue.jsp similarity index 100% rename from app/webapps/ROOT/WEB-INF/dataqueue.jsp rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/dataqueue.jsp diff --git a/app/webapps/ROOT/WEB-INF/errorpages/401.jsp b/app/opt/tomcat9/webapps/ROOT/WEB-INF/errorpages/401.jsp similarity index 100% rename from app/webapps/ROOT/WEB-INF/errorpages/401.jsp rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/errorpages/401.jsp diff --git a/app/webapps/ROOT/WEB-INF/errorpages/403.jsp b/app/opt/tomcat9/webapps/ROOT/WEB-INF/errorpages/403.jsp similarity index 100% rename from app/webapps/ROOT/WEB-INF/errorpages/403.jsp rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/errorpages/403.jsp diff --git a/app/webapps/ROOT/WEB-INF/errorpages/404.jsp b/app/opt/tomcat9/webapps/ROOT/WEB-INF/errorpages/404.jsp similarity index 100% rename from app/webapps/ROOT/WEB-INF/errorpages/404.jsp rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/errorpages/404.jsp diff --git a/app/webapps/ROOT/WEB-INF/errorpages/unknown.jsp b/app/opt/tomcat9/webapps/ROOT/WEB-INF/errorpages/unknown.jsp similarity index 100% rename from app/webapps/ROOT/WEB-INF/errorpages/unknown.jsp rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/errorpages/unknown.jsp diff --git a/app/webapps/ROOT/WEB-INF/footer.jsp b/app/opt/tomcat9/webapps/ROOT/WEB-INF/footer.jsp similarity index 100% rename from app/webapps/ROOT/WEB-INF/footer.jsp rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/footer.jsp diff --git a/app/webapps/ROOT/WEB-INF/forgotpassword.jsp b/app/opt/tomcat9/webapps/ROOT/WEB-INF/forgotpassword.jsp similarity index 100% rename from app/webapps/ROOT/WEB-INF/forgotpassword.jsp rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/forgotpassword.jsp diff --git a/app/webapps/ROOT/WEB-INF/header.jsp b/app/opt/tomcat9/webapps/ROOT/WEB-INF/header.jsp similarity index 100% rename from app/webapps/ROOT/WEB-INF/header.jsp rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/header.jsp diff --git a/app/webapps/ROOT/WEB-INF/home.jsp b/app/opt/tomcat9/webapps/ROOT/WEB-INF/home.jsp similarity index 100% rename from app/webapps/ROOT/WEB-INF/home.jsp rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/home.jsp diff --git a/app/webapps/ROOT/WEB-INF/includes.jsp b/app/opt/tomcat9/webapps/ROOT/WEB-INF/includes.jsp similarity index 94% rename from app/webapps/ROOT/WEB-INF/includes.jsp rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/includes.jsp index 8674785..d792532 100644 --- a/app/webapps/ROOT/WEB-INF/includes.jsp +++ b/app/opt/tomcat9/webapps/ROOT/WEB-INF/includes.jsp @@ -5,9 +5,9 @@ - - - + + + diff --git a/app/webapps/ROOT/WEB-INF/info.jsp b/app/opt/tomcat9/webapps/ROOT/WEB-INF/info.jsp similarity index 100% rename from app/webapps/ROOT/WEB-INF/info.jsp rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/info.jsp diff --git a/app/webapps/ROOT/WEB-INF/lib/FastInfoset-1.2.15.jar b/app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/FastInfoset-1.2.15.jar similarity index 100% rename from app/webapps/ROOT/WEB-INF/lib/FastInfoset-1.2.15.jar rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/FastInfoset-1.2.15.jar diff --git a/app/webapps/ROOT/WEB-INF/lib/GeographicLib-Java-1.49.jar b/app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/GeographicLib-Java-1.49.jar similarity index 100% rename from app/webapps/ROOT/WEB-INF/lib/GeographicLib-Java-1.49.jar rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/GeographicLib-Java-1.49.jar diff --git a/app/webapps/ROOT/WEB-INF/lib/animal-sniffer-annotations-1.17.jar b/app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/animal-sniffer-annotations-1.17.jar similarity index 100% rename from app/webapps/ROOT/WEB-INF/lib/animal-sniffer-annotations-1.17.jar rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/animal-sniffer-annotations-1.17.jar diff --git a/app/webapps/ROOT/WEB-INF/lib/antlr-2.7.7.jar b/app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/antlr-2.7.7.jar similarity index 100% rename from app/webapps/ROOT/WEB-INF/lib/antlr-2.7.7.jar rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/antlr-2.7.7.jar diff --git a/app/webapps/ROOT/WEB-INF/lib/apache-mime4j-core-0.8.3.jar b/app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/apache-mime4j-core-0.8.3.jar similarity index 100% rename from app/webapps/ROOT/WEB-INF/lib/apache-mime4j-core-0.8.3.jar rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/apache-mime4j-core-0.8.3.jar diff --git a/app/webapps/ROOT/WEB-INF/lib/apache-mime4j-dom-0.8.3.jar b/app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/apache-mime4j-dom-0.8.3.jar similarity index 100% rename from app/webapps/ROOT/WEB-INF/lib/apache-mime4j-dom-0.8.3.jar rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/apache-mime4j-dom-0.8.3.jar diff --git a/app/webapps/ROOT/WEB-INF/lib/apache-mime4j-storage-0.8.3.jar b/app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/apache-mime4j-storage-0.8.3.jar similarity index 100% rename from app/webapps/ROOT/WEB-INF/lib/apache-mime4j-storage-0.8.3.jar rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/apache-mime4j-storage-0.8.3.jar diff --git a/app/webapps/ROOT/WEB-INF/lib/asyncutil-0.1.0.jar b/app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/asyncutil-0.1.0.jar similarity index 100% rename from app/webapps/ROOT/WEB-INF/lib/asyncutil-0.1.0.jar rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/asyncutil-0.1.0.jar diff --git a/app/webapps/ROOT/WEB-INF/lib/barcodes-7.1.14.jar b/app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/barcodes-7.1.14.jar similarity index 100% rename from app/webapps/ROOT/WEB-INF/lib/barcodes-7.1.14.jar rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/barcodes-7.1.14.jar diff --git a/app/webapps/ROOT/WEB-INF/lib/batik-anim-1.10.jar b/app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/batik-anim-1.10.jar similarity index 100% rename from app/webapps/ROOT/WEB-INF/lib/batik-anim-1.10.jar rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/batik-anim-1.10.jar diff --git a/app/webapps/ROOT/WEB-INF/lib/batik-awt-util-1.10.jar b/app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/batik-awt-util-1.10.jar similarity index 100% rename from app/webapps/ROOT/WEB-INF/lib/batik-awt-util-1.10.jar rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/batik-awt-util-1.10.jar diff --git a/app/webapps/ROOT/WEB-INF/lib/batik-bridge-1.10.jar b/app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/batik-bridge-1.10.jar similarity index 100% rename from app/webapps/ROOT/WEB-INF/lib/batik-bridge-1.10.jar rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/batik-bridge-1.10.jar diff --git a/app/webapps/ROOT/WEB-INF/lib/batik-constants-1.10.jar b/app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/batik-constants-1.10.jar similarity index 100% rename from app/webapps/ROOT/WEB-INF/lib/batik-constants-1.10.jar rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/batik-constants-1.10.jar diff --git a/app/webapps/ROOT/WEB-INF/lib/batik-css-1.10.jar b/app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/batik-css-1.10.jar similarity index 100% rename from app/webapps/ROOT/WEB-INF/lib/batik-css-1.10.jar rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/batik-css-1.10.jar diff --git a/app/webapps/ROOT/WEB-INF/lib/batik-dom-1.10.jar b/app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/batik-dom-1.10.jar similarity index 100% rename from app/webapps/ROOT/WEB-INF/lib/batik-dom-1.10.jar rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/batik-dom-1.10.jar diff --git a/app/webapps/ROOT/WEB-INF/lib/batik-ext-1.10.jar b/app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/batik-ext-1.10.jar similarity index 100% rename from app/webapps/ROOT/WEB-INF/lib/batik-ext-1.10.jar rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/batik-ext-1.10.jar diff --git a/app/webapps/ROOT/WEB-INF/lib/batik-gvt-1.10.jar b/app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/batik-gvt-1.10.jar similarity index 100% rename from app/webapps/ROOT/WEB-INF/lib/batik-gvt-1.10.jar rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/batik-gvt-1.10.jar diff --git a/app/webapps/ROOT/WEB-INF/lib/batik-i18n-1.10.jar b/app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/batik-i18n-1.10.jar similarity index 100% rename from app/webapps/ROOT/WEB-INF/lib/batik-i18n-1.10.jar rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/batik-i18n-1.10.jar diff --git a/app/webapps/ROOT/WEB-INF/lib/batik-parser-1.10.jar b/app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/batik-parser-1.10.jar similarity index 100% rename from app/webapps/ROOT/WEB-INF/lib/batik-parser-1.10.jar rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/batik-parser-1.10.jar diff --git a/app/webapps/ROOT/WEB-INF/lib/batik-script-1.10.jar b/app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/batik-script-1.10.jar similarity index 100% rename from app/webapps/ROOT/WEB-INF/lib/batik-script-1.10.jar rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/batik-script-1.10.jar diff --git a/app/webapps/ROOT/WEB-INF/lib/batik-svg-dom-1.10.jar b/app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/batik-svg-dom-1.10.jar similarity index 100% rename from app/webapps/ROOT/WEB-INF/lib/batik-svg-dom-1.10.jar rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/batik-svg-dom-1.10.jar diff --git a/app/webapps/ROOT/WEB-INF/lib/batik-svggen-1.10.jar b/app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/batik-svggen-1.10.jar similarity index 100% rename from app/webapps/ROOT/WEB-INF/lib/batik-svggen-1.10.jar rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/batik-svggen-1.10.jar diff --git a/app/webapps/ROOT/WEB-INF/lib/batik-transcoder-1.10.jar b/app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/batik-transcoder-1.10.jar similarity index 100% rename from app/webapps/ROOT/WEB-INF/lib/batik-transcoder-1.10.jar rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/batik-transcoder-1.10.jar diff --git a/app/webapps/ROOT/WEB-INF/lib/batik-util-1.10.jar b/app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/batik-util-1.10.jar similarity index 100% rename from app/webapps/ROOT/WEB-INF/lib/batik-util-1.10.jar rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/batik-util-1.10.jar diff --git a/app/webapps/ROOT/WEB-INF/lib/batik-xml-1.10.jar b/app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/batik-xml-1.10.jar similarity index 100% rename from app/webapps/ROOT/WEB-INF/lib/batik-xml-1.10.jar rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/batik-xml-1.10.jar diff --git a/app/webapps/ROOT/WEB-INF/lib/bcpkix-jdk15on-1.67.jar b/app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/bcpkix-jdk15on-1.67.jar similarity index 100% rename from app/webapps/ROOT/WEB-INF/lib/bcpkix-jdk15on-1.67.jar rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/bcpkix-jdk15on-1.67.jar diff --git a/app/webapps/ROOT/WEB-INF/lib/bcprov-jdk15on-1.67.jar b/app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/bcprov-jdk15on-1.67.jar similarity index 100% rename from app/webapps/ROOT/WEB-INF/lib/bcprov-jdk15on-1.67.jar rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/bcprov-jdk15on-1.67.jar diff --git a/app/webapps/ROOT/WEB-INF/lib/bigint-0.7.1.jar b/app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/bigint-0.7.1.jar similarity index 100% rename from app/webapps/ROOT/WEB-INF/lib/bigint-0.7.1.jar rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/bigint-0.7.1.jar diff --git a/app/webapps/ROOT/WEB-INF/lib/btf-1.3.jar b/app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/btf-1.3.jar similarity index 100% rename from app/webapps/ROOT/WEB-INF/lib/btf-1.3.jar rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/btf-1.3.jar diff --git a/app/webapps/ROOT/WEB-INF/lib/byte-buddy-1.9.10.jar b/app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/byte-buddy-1.9.10.jar similarity index 100% rename from app/webapps/ROOT/WEB-INF/lib/byte-buddy-1.9.10.jar rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/byte-buddy-1.9.10.jar diff --git a/app/webapps/ROOT/WEB-INF/lib/checker-qual-2.5.2.jar b/app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/checker-qual-2.5.2.jar similarity index 100% rename from app/webapps/ROOT/WEB-INF/lib/checker-qual-2.5.2.jar rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/checker-qual-2.5.2.jar diff --git a/app/webapps/ROOT/WEB-INF/lib/classmate-1.3.4.jar b/app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/classmate-1.3.4.jar similarity index 100% rename from app/webapps/ROOT/WEB-INF/lib/classmate-1.3.4.jar rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/classmate-1.3.4.jar diff --git a/app/webapps/ROOT/WEB-INF/lib/commons-codec-1.9.jar b/app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/commons-codec-1.9.jar similarity index 100% rename from app/webapps/ROOT/WEB-INF/lib/commons-codec-1.9.jar rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/commons-codec-1.9.jar diff --git a/app/webapps/ROOT/WEB-INF/lib/commons-collections-3.2.2.jar b/app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/commons-collections-3.2.2.jar similarity index 100% rename from app/webapps/ROOT/WEB-INF/lib/commons-collections-3.2.2.jar rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/commons-collections-3.2.2.jar diff --git a/app/webapps/ROOT/WEB-INF/lib/commons-compress-1.16.jar b/app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/commons-compress-1.16.jar similarity index 100% rename from app/webapps/ROOT/WEB-INF/lib/commons-compress-1.16.jar rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/commons-compress-1.16.jar diff --git a/app/webapps/ROOT/WEB-INF/lib/commons-httpclient-3.1.jar b/app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/commons-httpclient-3.1.jar similarity index 100% rename from app/webapps/ROOT/WEB-INF/lib/commons-httpclient-3.1.jar rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/commons-httpclient-3.1.jar diff --git a/app/webapps/ROOT/WEB-INF/lib/commons-io-2.6.jar b/app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/commons-io-2.6.jar similarity index 100% rename from app/webapps/ROOT/WEB-INF/lib/commons-io-2.6.jar rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/commons-io-2.6.jar diff --git a/app/webapps/ROOT/WEB-INF/lib/commons-jxpath-1.3.jar b/app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/commons-jxpath-1.3.jar similarity index 100% rename from app/webapps/ROOT/WEB-INF/lib/commons-jxpath-1.3.jar rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/commons-jxpath-1.3.jar diff --git a/app/webapps/ROOT/WEB-INF/lib/commons-lang3-3.8.1.jar b/app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/commons-lang3-3.8.1.jar similarity index 100% rename from app/webapps/ROOT/WEB-INF/lib/commons-lang3-3.8.1.jar rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/commons-lang3-3.8.1.jar diff --git a/app/webapps/ROOT/WEB-INF/lib/commons-logging-1.0.4.jar b/app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/commons-logging-1.0.4.jar similarity index 100% rename from app/webapps/ROOT/WEB-INF/lib/commons-logging-1.0.4.jar rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/commons-logging-1.0.4.jar diff --git a/app/webapps/ROOT/WEB-INF/lib/commons-pool-1.5.4.jar b/app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/commons-pool-1.5.4.jar similarity index 100% rename from app/webapps/ROOT/WEB-INF/lib/commons-pool-1.5.4.jar rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/commons-pool-1.5.4.jar diff --git a/app/webapps/ROOT/WEB-INF/lib/commons-text-1.6.jar b/app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/commons-text-1.6.jar similarity index 100% rename from app/webapps/ROOT/WEB-INF/lib/commons-text-1.6.jar rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/commons-text-1.6.jar diff --git a/app/webapps/ROOT/WEB-INF/lib/disruptor-1.2.13.jar b/app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/disruptor-1.2.13.jar similarity index 100% rename from app/webapps/ROOT/WEB-INF/lib/disruptor-1.2.13.jar rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/disruptor-1.2.13.jar diff --git a/app/webapps/ROOT/WEB-INF/lib/dom4j-2.1.1.jar b/app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/dom4j-2.1.1.jar similarity index 100% rename from app/webapps/ROOT/WEB-INF/lib/dom4j-2.1.1.jar rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/dom4j-2.1.1.jar diff --git a/app/webapps/ROOT/WEB-INF/lib/ehcache-2.10.6.jar b/app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/ehcache-2.10.6.jar similarity index 100% rename from app/webapps/ROOT/WEB-INF/lib/ehcache-2.10.6.jar rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/ehcache-2.10.6.jar diff --git a/app/webapps/ROOT/WEB-INF/lib/ejml-core-0.34.jar b/app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/ejml-core-0.34.jar similarity index 100% rename from app/webapps/ROOT/WEB-INF/lib/ejml-core-0.34.jar rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/ejml-core-0.34.jar diff --git a/app/webapps/ROOT/WEB-INF/lib/ejml-ddense-0.34.jar b/app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/ejml-ddense-0.34.jar similarity index 100% rename from app/webapps/ROOT/WEB-INF/lib/ejml-ddense-0.34.jar rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/ejml-ddense-0.34.jar diff --git a/app/webapps/ROOT/WEB-INF/lib/error_prone_annotations-2.2.0.jar b/app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/error_prone_annotations-2.2.0.jar similarity index 100% rename from app/webapps/ROOT/WEB-INF/lib/error_prone_annotations-2.2.0.jar rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/error_prone_annotations-2.2.0.jar diff --git a/app/webapps/ROOT/WEB-INF/lib/failureaccess-1.0.jar b/app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/failureaccess-1.0.jar similarity index 100% rename from app/webapps/ROOT/WEB-INF/lib/failureaccess-1.0.jar rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/failureaccess-1.0.jar diff --git a/app/webapps/ROOT/WEB-INF/lib/font-asian-7.1.14.jar b/app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/font-asian-7.1.14.jar similarity index 100% rename from app/webapps/ROOT/WEB-INF/lib/font-asian-7.1.14.jar rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/font-asian-7.1.14.jar diff --git a/app/webapps/ROOT/WEB-INF/lib/forms-7.1.14.jar b/app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/forms-7.1.14.jar similarity index 100% rename from app/webapps/ROOT/WEB-INF/lib/forms-7.1.14.jar rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/forms-7.1.14.jar diff --git a/app/webapps/ROOT/WEB-INF/lib/gson-2.8.1.jar b/app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/gson-2.8.1.jar similarity index 100% rename from app/webapps/ROOT/WEB-INF/lib/gson-2.8.1.jar rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/gson-2.8.1.jar diff --git a/app/webapps/ROOT/WEB-INF/lib/gt-brewer-23.0.jar b/app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/gt-brewer-23.0.jar similarity index 100% rename from app/webapps/ROOT/WEB-INF/lib/gt-brewer-23.0.jar rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/gt-brewer-23.0.jar diff --git a/app/webapps/ROOT/WEB-INF/lib/gt-coverage-23.0.jar b/app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/gt-coverage-23.0.jar similarity index 100% rename from app/webapps/ROOT/WEB-INF/lib/gt-coverage-23.0.jar rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/gt-coverage-23.0.jar diff --git a/app/webapps/ROOT/WEB-INF/lib/gt-cql-23.0.jar b/app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/gt-cql-23.0.jar similarity index 100% rename from app/webapps/ROOT/WEB-INF/lib/gt-cql-23.0.jar rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/gt-cql-23.0.jar diff --git a/app/webapps/ROOT/WEB-INF/lib/gt-epsg-hsql-23.0.jar b/app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/gt-epsg-hsql-23.0.jar similarity index 100% rename from app/webapps/ROOT/WEB-INF/lib/gt-epsg-hsql-23.0.jar rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/gt-epsg-hsql-23.0.jar diff --git a/app/webapps/ROOT/WEB-INF/lib/gt-geojson-23.0.jar b/app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/gt-geojson-23.0.jar similarity index 100% rename from app/webapps/ROOT/WEB-INF/lib/gt-geojson-23.0.jar rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/gt-geojson-23.0.jar diff --git a/app/webapps/ROOT/WEB-INF/lib/gt-geotiff-23.0.jar b/app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/gt-geotiff-23.0.jar similarity index 100% rename from app/webapps/ROOT/WEB-INF/lib/gt-geotiff-23.0.jar rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/gt-geotiff-23.0.jar diff --git a/app/webapps/ROOT/WEB-INF/lib/gt-grid-23.0.jar b/app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/gt-grid-23.0.jar similarity index 100% rename from app/webapps/ROOT/WEB-INF/lib/gt-grid-23.0.jar rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/gt-grid-23.0.jar diff --git a/app/webapps/ROOT/WEB-INF/lib/gt-image-23.0.jar b/app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/gt-image-23.0.jar similarity index 100% rename from app/webapps/ROOT/WEB-INF/lib/gt-image-23.0.jar rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/gt-image-23.0.jar diff --git a/app/webapps/ROOT/WEB-INF/lib/gt-main-23.0.jar b/app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/gt-main-23.0.jar similarity index 100% rename from app/webapps/ROOT/WEB-INF/lib/gt-main-23.0.jar rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/gt-main-23.0.jar diff --git a/app/webapps/ROOT/WEB-INF/lib/gt-metadata-23.0.jar b/app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/gt-metadata-23.0.jar similarity index 100% rename from app/webapps/ROOT/WEB-INF/lib/gt-metadata-23.0.jar rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/gt-metadata-23.0.jar diff --git a/app/webapps/ROOT/WEB-INF/lib/gt-opengis-23.0.jar b/app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/gt-opengis-23.0.jar similarity index 100% rename from app/webapps/ROOT/WEB-INF/lib/gt-opengis-23.0.jar rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/gt-opengis-23.0.jar diff --git a/app/webapps/ROOT/WEB-INF/lib/gt-referencing-23.0.jar b/app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/gt-referencing-23.0.jar similarity index 100% rename from app/webapps/ROOT/WEB-INF/lib/gt-referencing-23.0.jar rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/gt-referencing-23.0.jar diff --git a/app/webapps/ROOT/WEB-INF/lib/gt-render-23.0.jar b/app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/gt-render-23.0.jar similarity index 100% rename from app/webapps/ROOT/WEB-INF/lib/gt-render-23.0.jar rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/gt-render-23.0.jar diff --git a/app/webapps/ROOT/WEB-INF/lib/gt-shapefile-23.0.jar b/app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/gt-shapefile-23.0.jar similarity index 100% rename from app/webapps/ROOT/WEB-INF/lib/gt-shapefile-23.0.jar rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/gt-shapefile-23.0.jar diff --git a/app/webapps/ROOT/WEB-INF/lib/gt-svg-23.0.jar b/app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/gt-svg-23.0.jar similarity index 100% rename from app/webapps/ROOT/WEB-INF/lib/gt-svg-23.0.jar rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/gt-svg-23.0.jar diff --git a/app/webapps/ROOT/WEB-INF/lib/gt-wms-23.0.jar b/app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/gt-wms-23.0.jar similarity index 100% rename from app/webapps/ROOT/WEB-INF/lib/gt-wms-23.0.jar rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/gt-wms-23.0.jar diff --git a/app/webapps/ROOT/WEB-INF/lib/gt-xml-23.0.jar b/app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/gt-xml-23.0.jar similarity index 100% rename from app/webapps/ROOT/WEB-INF/lib/gt-xml-23.0.jar rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/gt-xml-23.0.jar diff --git a/app/webapps/ROOT/WEB-INF/lib/gt-xsd-core-23.0.jar b/app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/gt-xsd-core-23.0.jar similarity index 100% rename from app/webapps/ROOT/WEB-INF/lib/gt-xsd-core-23.0.jar rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/gt-xsd-core-23.0.jar diff --git a/app/webapps/ROOT/WEB-INF/lib/gt-xsd-filter-23.0.jar b/app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/gt-xsd-filter-23.0.jar similarity index 100% rename from app/webapps/ROOT/WEB-INF/lib/gt-xsd-filter-23.0.jar rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/gt-xsd-filter-23.0.jar diff --git a/app/webapps/ROOT/WEB-INF/lib/gt-xsd-gml2-23.0.jar b/app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/gt-xsd-gml2-23.0.jar similarity index 100% rename from app/webapps/ROOT/WEB-INF/lib/gt-xsd-gml2-23.0.jar rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/gt-xsd-gml2-23.0.jar diff --git a/app/webapps/ROOT/WEB-INF/lib/gt-xsd-gml3-23.0.jar b/app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/gt-xsd-gml3-23.0.jar similarity index 100% rename from app/webapps/ROOT/WEB-INF/lib/gt-xsd-gml3-23.0.jar rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/gt-xsd-gml3-23.0.jar diff --git a/app/webapps/ROOT/WEB-INF/lib/gt-xsd-sld-23.0.jar b/app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/gt-xsd-sld-23.0.jar similarity index 100% rename from app/webapps/ROOT/WEB-INF/lib/gt-xsd-sld-23.0.jar rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/gt-xsd-sld-23.0.jar diff --git a/app/webapps/ROOT/WEB-INF/lib/guava-27.0-jre.jar b/app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/guava-27.0-jre.jar similarity index 100% rename from app/webapps/ROOT/WEB-INF/lib/guava-27.0-jre.jar rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/guava-27.0-jre.jar diff --git a/app/webapps/ROOT/WEB-INF/lib/hibernate-commons-annotations-5.1.0.Final.jar b/app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/hibernate-commons-annotations-5.1.0.Final.jar similarity index 100% rename from app/webapps/ROOT/WEB-INF/lib/hibernate-commons-annotations-5.1.0.Final.jar rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/hibernate-commons-annotations-5.1.0.Final.jar diff --git a/app/webapps/ROOT/WEB-INF/lib/hibernate-core-5.4.3.Final.jar b/app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/hibernate-core-5.4.3.Final.jar similarity index 100% rename from app/webapps/ROOT/WEB-INF/lib/hibernate-core-5.4.3.Final.jar rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/hibernate-core-5.4.3.Final.jar diff --git a/app/webapps/ROOT/WEB-INF/lib/hibernate-ehcache-5.4.3.Final.jar b/app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/hibernate-ehcache-5.4.3.Final.jar similarity index 100% rename from app/webapps/ROOT/WEB-INF/lib/hibernate-ehcache-5.4.3.Final.jar rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/hibernate-ehcache-5.4.3.Final.jar diff --git a/app/webapps/ROOT/WEB-INF/lib/hsqldb-2.4.1.jar b/app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/hsqldb-2.4.1.jar similarity index 100% rename from app/webapps/ROOT/WEB-INF/lib/hsqldb-2.4.1.jar rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/hsqldb-2.4.1.jar diff --git a/app/webapps/ROOT/WEB-INF/lib/httpclient-4.5.12.jar b/app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/httpclient-4.5.12.jar similarity index 100% rename from app/webapps/ROOT/WEB-INF/lib/httpclient-4.5.12.jar rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/httpclient-4.5.12.jar diff --git a/app/webapps/ROOT/WEB-INF/lib/httpcore-4.4.13.jar b/app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/httpcore-4.4.13.jar similarity index 100% rename from app/webapps/ROOT/WEB-INF/lib/httpcore-4.4.13.jar rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/httpcore-4.4.13.jar diff --git a/app/webapps/ROOT/WEB-INF/lib/hyph-7.1.14.jar b/app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/hyph-7.1.14.jar similarity index 100% rename from app/webapps/ROOT/WEB-INF/lib/hyph-7.1.14.jar rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/hyph-7.1.14.jar diff --git a/app/webapps/ROOT/WEB-INF/lib/icu4j-67.1.jar b/app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/icu4j-67.1.jar similarity index 100% rename from app/webapps/ROOT/WEB-INF/lib/icu4j-67.1.jar rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/icu4j-67.1.jar diff --git a/app/webapps/ROOT/WEB-INF/lib/imageio-ext-geocore-1.3.2.jar b/app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/imageio-ext-geocore-1.3.2.jar similarity index 100% rename from app/webapps/ROOT/WEB-INF/lib/imageio-ext-geocore-1.3.2.jar rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/imageio-ext-geocore-1.3.2.jar diff --git a/app/webapps/ROOT/WEB-INF/lib/imageio-ext-streams-1.3.2.jar b/app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/imageio-ext-streams-1.3.2.jar similarity index 100% rename from app/webapps/ROOT/WEB-INF/lib/imageio-ext-streams-1.3.2.jar rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/imageio-ext-streams-1.3.2.jar diff --git a/app/webapps/ROOT/WEB-INF/lib/imageio-ext-tiff-1.3.2.jar b/app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/imageio-ext-tiff-1.3.2.jar similarity index 100% rename from app/webapps/ROOT/WEB-INF/lib/imageio-ext-tiff-1.3.2.jar rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/imageio-ext-tiff-1.3.2.jar diff --git a/app/webapps/ROOT/WEB-INF/lib/imageio-ext-utilities-1.3.2.jar b/app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/imageio-ext-utilities-1.3.2.jar similarity index 100% rename from app/webapps/ROOT/WEB-INF/lib/imageio-ext-utilities-1.3.2.jar rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/imageio-ext-utilities-1.3.2.jar diff --git a/app/webapps/ROOT/WEB-INF/lib/io-7.1.14.jar b/app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/io-7.1.14.jar similarity index 100% rename from app/webapps/ROOT/WEB-INF/lib/io-7.1.14.jar rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/io-7.1.14.jar diff --git a/app/webapps/ROOT/WEB-INF/lib/istack-commons-runtime-3.0.7.jar b/app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/istack-commons-runtime-3.0.7.jar similarity index 100% rename from app/webapps/ROOT/WEB-INF/lib/istack-commons-runtime-3.0.7.jar rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/istack-commons-runtime-3.0.7.jar diff --git a/app/webapps/ROOT/WEB-INF/lib/j2objc-annotations-1.1.jar b/app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/j2objc-annotations-1.1.jar similarity index 100% rename from app/webapps/ROOT/WEB-INF/lib/j2objc-annotations-1.1.jar rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/j2objc-annotations-1.1.jar diff --git a/app/webapps/ROOT/WEB-INF/lib/jackson-annotations-2.11.1.jar b/app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/jackson-annotations-2.11.1.jar similarity index 100% rename from app/webapps/ROOT/WEB-INF/lib/jackson-annotations-2.11.1.jar rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/jackson-annotations-2.11.1.jar diff --git a/app/webapps/ROOT/WEB-INF/lib/jackson-core-2.11.1.jar b/app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/jackson-core-2.11.1.jar similarity index 100% rename from app/webapps/ROOT/WEB-INF/lib/jackson-core-2.11.1.jar rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/jackson-core-2.11.1.jar diff --git a/app/webapps/ROOT/WEB-INF/lib/jackson-coreutils-2.0.jar b/app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/jackson-coreutils-2.0.jar similarity index 100% rename from app/webapps/ROOT/WEB-INF/lib/jackson-coreutils-2.0.jar rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/jackson-coreutils-2.0.jar diff --git a/app/webapps/ROOT/WEB-INF/lib/jackson-databind-2.11.1.jar b/app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/jackson-databind-2.11.1.jar similarity index 100% rename from app/webapps/ROOT/WEB-INF/lib/jackson-databind-2.11.1.jar rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/jackson-databind-2.11.1.jar diff --git a/app/webapps/ROOT/WEB-INF/lib/jackson-jaxrs-base-2.11.1.jar b/app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/jackson-jaxrs-base-2.11.1.jar similarity index 100% rename from app/webapps/ROOT/WEB-INF/lib/jackson-jaxrs-base-2.11.1.jar rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/jackson-jaxrs-base-2.11.1.jar diff --git a/app/webapps/ROOT/WEB-INF/lib/jackson-jaxrs-json-provider-2.11.1.jar b/app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/jackson-jaxrs-json-provider-2.11.1.jar similarity index 100% rename from app/webapps/ROOT/WEB-INF/lib/jackson-jaxrs-json-provider-2.11.1.jar rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/jackson-jaxrs-json-provider-2.11.1.jar diff --git a/app/webapps/ROOT/WEB-INF/lib/jackson-module-jaxb-annotations-2.11.1.jar b/app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/jackson-module-jaxb-annotations-2.11.1.jar similarity index 100% rename from app/webapps/ROOT/WEB-INF/lib/jackson-module-jaxb-annotations-2.11.1.jar rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/jackson-module-jaxb-annotations-2.11.1.jar diff --git a/app/webapps/ROOT/WEB-INF/lib/jai_codec-1.1.3.jar b/app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/jai_codec-1.1.3.jar similarity index 100% rename from app/webapps/ROOT/WEB-INF/lib/jai_codec-1.1.3.jar rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/jai_codec-1.1.3.jar diff --git a/app/webapps/ROOT/WEB-INF/lib/jai_core-1.1.3.jar b/app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/jai_core-1.1.3.jar similarity index 100% rename from app/webapps/ROOT/WEB-INF/lib/jai_core-1.1.3.jar rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/jai_core-1.1.3.jar diff --git a/app/webapps/ROOT/WEB-INF/lib/jai_imageio-1.1.jar b/app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/jai_imageio-1.1.jar similarity index 100% rename from app/webapps/ROOT/WEB-INF/lib/jai_imageio-1.1.jar rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/jai_imageio-1.1.jar diff --git a/app/webapps/ROOT/WEB-INF/lib/jakarta.activation-1.2.1.jar b/app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/jakarta.activation-1.2.1.jar similarity index 100% rename from app/webapps/ROOT/WEB-INF/lib/jakarta.activation-1.2.1.jar rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/jakarta.activation-1.2.1.jar diff --git a/app/webapps/ROOT/WEB-INF/lib/jakarta.activation-api-1.2.1.jar b/app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/jakarta.activation-api-1.2.1.jar similarity index 100% rename from app/webapps/ROOT/WEB-INF/lib/jakarta.activation-api-1.2.1.jar rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/jakarta.activation-api-1.2.1.jar diff --git a/app/webapps/ROOT/WEB-INF/lib/jakarta.validation-api-2.0.2.jar b/app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/jakarta.validation-api-2.0.2.jar similarity index 100% rename from app/webapps/ROOT/WEB-INF/lib/jakarta.validation-api-2.0.2.jar rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/jakarta.validation-api-2.0.2.jar diff --git a/app/webapps/ROOT/WEB-INF/lib/jandex-2.0.5.Final.jar b/app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/jandex-2.0.5.Final.jar similarity index 100% rename from app/webapps/ROOT/WEB-INF/lib/jandex-2.0.5.Final.jar rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/jandex-2.0.5.Final.jar diff --git a/app/webapps/ROOT/WEB-INF/lib/java-string-similarity-0.24.jar b/app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/java-string-similarity-0.24.jar similarity index 100% rename from app/webapps/ROOT/WEB-INF/lib/java-string-similarity-0.24.jar rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/java-string-similarity-0.24.jar diff --git a/app/webapps/ROOT/WEB-INF/lib/javassist-3.24.0-GA.jar b/app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/javassist-3.24.0-GA.jar similarity index 100% rename from app/webapps/ROOT/WEB-INF/lib/javassist-3.24.0-GA.jar rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/javassist-3.24.0-GA.jar diff --git a/app/webapps/ROOT/WEB-INF/lib/javax.activation-api-1.2.0.jar b/app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/javax.activation-api-1.2.0.jar similarity index 100% rename from app/webapps/ROOT/WEB-INF/lib/javax.activation-api-1.2.0.jar rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/javax.activation-api-1.2.0.jar diff --git a/app/webapps/ROOT/WEB-INF/lib/javax.persistence-api-2.2.jar b/app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/javax.persistence-api-2.2.jar similarity index 100% rename from app/webapps/ROOT/WEB-INF/lib/javax.persistence-api-2.2.jar rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/javax.persistence-api-2.2.jar diff --git a/app/webapps/ROOT/WEB-INF/lib/jaxb-api-2.3.1.jar b/app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/jaxb-api-2.3.1.jar similarity index 100% rename from app/webapps/ROOT/WEB-INF/lib/jaxb-api-2.3.1.jar rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/jaxb-api-2.3.1.jar diff --git a/app/webapps/ROOT/WEB-INF/lib/jaxb-runtime-2.3.1.jar b/app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/jaxb-runtime-2.3.1.jar similarity index 100% rename from app/webapps/ROOT/WEB-INF/lib/jaxb-runtime-2.3.1.jar rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/jaxb-runtime-2.3.1.jar diff --git a/app/webapps/ROOT/WEB-INF/lib/jboss-annotations-api_1.3_spec-2.0.1.Final.jar b/app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/jboss-annotations-api_1.3_spec-2.0.1.Final.jar similarity index 100% rename from app/webapps/ROOT/WEB-INF/lib/jboss-annotations-api_1.3_spec-2.0.1.Final.jar rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/jboss-annotations-api_1.3_spec-2.0.1.Final.jar diff --git a/app/webapps/ROOT/WEB-INF/lib/jboss-jaxb-api_2.3_spec-1.0.1.Final.jar b/app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/jboss-jaxb-api_2.3_spec-1.0.1.Final.jar similarity index 100% rename from app/webapps/ROOT/WEB-INF/lib/jboss-jaxb-api_2.3_spec-1.0.1.Final.jar rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/jboss-jaxb-api_2.3_spec-1.0.1.Final.jar diff --git a/app/webapps/ROOT/WEB-INF/lib/jboss-jaxrs-api_2.1_spec-2.0.1.Final.jar b/app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/jboss-jaxrs-api_2.1_spec-2.0.1.Final.jar similarity index 100% rename from app/webapps/ROOT/WEB-INF/lib/jboss-jaxrs-api_2.1_spec-2.0.1.Final.jar rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/jboss-jaxrs-api_2.1_spec-2.0.1.Final.jar diff --git a/app/webapps/ROOT/WEB-INF/lib/jboss-logging-3.3.2.Final.jar b/app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/jboss-logging-3.3.2.Final.jar similarity index 100% rename from app/webapps/ROOT/WEB-INF/lib/jboss-logging-3.3.2.Final.jar rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/jboss-logging-3.3.2.Final.jar diff --git a/app/webapps/ROOT/WEB-INF/lib/jboss-transaction-api_1.2_spec-1.1.1.Final.jar b/app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/jboss-transaction-api_1.2_spec-1.1.1.Final.jar similarity index 100% rename from app/webapps/ROOT/WEB-INF/lib/jboss-transaction-api_1.2_spec-1.1.1.Final.jar rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/jboss-transaction-api_1.2_spec-1.1.1.Final.jar diff --git a/app/webapps/ROOT/WEB-INF/lib/jcip-annotations-1.0.jar b/app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/jcip-annotations-1.0.jar similarity index 100% rename from app/webapps/ROOT/WEB-INF/lib/jcip-annotations-1.0.jar rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/jcip-annotations-1.0.jar diff --git a/app/webapps/ROOT/WEB-INF/lib/jgridshift-core-1.2.jar b/app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/jgridshift-core-1.2.jar similarity index 100% rename from app/webapps/ROOT/WEB-INF/lib/jgridshift-core-1.2.jar rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/jgridshift-core-1.2.jar diff --git a/app/webapps/ROOT/WEB-INF/lib/joda-time-2.9.3.jar b/app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/joda-time-2.9.3.jar similarity index 100% rename from app/webapps/ROOT/WEB-INF/lib/joda-time-2.9.3.jar rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/joda-time-2.9.3.jar diff --git a/app/webapps/ROOT/WEB-INF/lib/json-20170516.jar b/app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/json-20170516.jar similarity index 100% rename from app/webapps/ROOT/WEB-INF/lib/json-20170516.jar rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/json-20170516.jar diff --git a/app/webapps/ROOT/WEB-INF/lib/json-patch-1.13.jar b/app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/json-patch-1.13.jar similarity index 100% rename from app/webapps/ROOT/WEB-INF/lib/json-patch-1.13.jar rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/json-patch-1.13.jar diff --git a/app/webapps/ROOT/WEB-INF/lib/json-simple-1.1.1.jar b/app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/json-simple-1.1.1.jar similarity index 100% rename from app/webapps/ROOT/WEB-INF/lib/json-simple-1.1.1.jar rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/json-simple-1.1.1.jar diff --git a/app/webapps/ROOT/WEB-INF/lib/jsr305-3.0.2.jar b/app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/jsr305-3.0.2.jar similarity index 100% rename from app/webapps/ROOT/WEB-INF/lib/jsr305-3.0.2.jar rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/jsr305-3.0.2.jar diff --git a/app/webapps/ROOT/WEB-INF/lib/jstl-1.2.jar b/app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/jstl-1.2.jar similarity index 100% rename from app/webapps/ROOT/WEB-INF/lib/jstl-1.2.jar rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/jstl-1.2.jar diff --git a/app/webapps/ROOT/WEB-INF/lib/jt-affine-1.1.14.jar b/app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/jt-affine-1.1.14.jar similarity index 100% rename from app/webapps/ROOT/WEB-INF/lib/jt-affine-1.1.14.jar rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/jt-affine-1.1.14.jar diff --git a/app/webapps/ROOT/WEB-INF/lib/jt-algebra-1.1.14.jar b/app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/jt-algebra-1.1.14.jar similarity index 100% rename from app/webapps/ROOT/WEB-INF/lib/jt-algebra-1.1.14.jar rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/jt-algebra-1.1.14.jar diff --git a/app/webapps/ROOT/WEB-INF/lib/jt-bandcombine-1.1.14.jar b/app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/jt-bandcombine-1.1.14.jar similarity index 100% rename from app/webapps/ROOT/WEB-INF/lib/jt-bandcombine-1.1.14.jar rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/jt-bandcombine-1.1.14.jar diff --git a/app/webapps/ROOT/WEB-INF/lib/jt-bandmerge-1.1.14.jar b/app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/jt-bandmerge-1.1.14.jar similarity index 100% rename from app/webapps/ROOT/WEB-INF/lib/jt-bandmerge-1.1.14.jar rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/jt-bandmerge-1.1.14.jar diff --git a/app/webapps/ROOT/WEB-INF/lib/jt-bandselect-1.1.14.jar b/app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/jt-bandselect-1.1.14.jar similarity index 100% rename from app/webapps/ROOT/WEB-INF/lib/jt-bandselect-1.1.14.jar rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/jt-bandselect-1.1.14.jar diff --git a/app/webapps/ROOT/WEB-INF/lib/jt-binarize-1.1.14.jar b/app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/jt-binarize-1.1.14.jar similarity index 100% rename from app/webapps/ROOT/WEB-INF/lib/jt-binarize-1.1.14.jar rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/jt-binarize-1.1.14.jar diff --git a/app/webapps/ROOT/WEB-INF/lib/jt-border-1.1.14.jar b/app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/jt-border-1.1.14.jar similarity index 100% rename from app/webapps/ROOT/WEB-INF/lib/jt-border-1.1.14.jar rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/jt-border-1.1.14.jar diff --git a/app/webapps/ROOT/WEB-INF/lib/jt-buffer-1.1.14.jar b/app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/jt-buffer-1.1.14.jar similarity index 100% rename from app/webapps/ROOT/WEB-INF/lib/jt-buffer-1.1.14.jar rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/jt-buffer-1.1.14.jar diff --git a/app/webapps/ROOT/WEB-INF/lib/jt-classifier-1.1.14.jar b/app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/jt-classifier-1.1.14.jar similarity index 100% rename from app/webapps/ROOT/WEB-INF/lib/jt-classifier-1.1.14.jar rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/jt-classifier-1.1.14.jar diff --git a/app/webapps/ROOT/WEB-INF/lib/jt-colorconvert-1.1.14.jar b/app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/jt-colorconvert-1.1.14.jar similarity index 100% rename from app/webapps/ROOT/WEB-INF/lib/jt-colorconvert-1.1.14.jar rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/jt-colorconvert-1.1.14.jar diff --git a/app/webapps/ROOT/WEB-INF/lib/jt-colorindexer-1.1.14.jar b/app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/jt-colorindexer-1.1.14.jar similarity index 100% rename from app/webapps/ROOT/WEB-INF/lib/jt-colorindexer-1.1.14.jar rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/jt-colorindexer-1.1.14.jar diff --git a/app/webapps/ROOT/WEB-INF/lib/jt-crop-1.1.14.jar b/app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/jt-crop-1.1.14.jar similarity index 100% rename from app/webapps/ROOT/WEB-INF/lib/jt-crop-1.1.14.jar rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/jt-crop-1.1.14.jar diff --git a/app/webapps/ROOT/WEB-INF/lib/jt-errordiffusion-1.1.14.jar b/app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/jt-errordiffusion-1.1.14.jar similarity index 100% rename from app/webapps/ROOT/WEB-INF/lib/jt-errordiffusion-1.1.14.jar rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/jt-errordiffusion-1.1.14.jar diff --git a/app/webapps/ROOT/WEB-INF/lib/jt-format-1.1.14.jar b/app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/jt-format-1.1.14.jar similarity index 100% rename from app/webapps/ROOT/WEB-INF/lib/jt-format-1.1.14.jar rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/jt-format-1.1.14.jar diff --git a/app/webapps/ROOT/WEB-INF/lib/jt-imagefunction-1.1.14.jar b/app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/jt-imagefunction-1.1.14.jar similarity index 100% rename from app/webapps/ROOT/WEB-INF/lib/jt-imagefunction-1.1.14.jar rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/jt-imagefunction-1.1.14.jar diff --git a/app/webapps/ROOT/WEB-INF/lib/jt-iterators-1.1.14.jar b/app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/jt-iterators-1.1.14.jar similarity index 100% rename from app/webapps/ROOT/WEB-INF/lib/jt-iterators-1.1.14.jar rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/jt-iterators-1.1.14.jar diff --git a/app/webapps/ROOT/WEB-INF/lib/jt-lookup-1.1.14.jar b/app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/jt-lookup-1.1.14.jar similarity index 100% rename from app/webapps/ROOT/WEB-INF/lib/jt-lookup-1.1.14.jar rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/jt-lookup-1.1.14.jar diff --git a/app/webapps/ROOT/WEB-INF/lib/jt-mosaic-1.1.14.jar b/app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/jt-mosaic-1.1.14.jar similarity index 100% rename from app/webapps/ROOT/WEB-INF/lib/jt-mosaic-1.1.14.jar rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/jt-mosaic-1.1.14.jar diff --git a/app/webapps/ROOT/WEB-INF/lib/jt-nullop-1.1.14.jar b/app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/jt-nullop-1.1.14.jar similarity index 100% rename from app/webapps/ROOT/WEB-INF/lib/jt-nullop-1.1.14.jar rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/jt-nullop-1.1.14.jar diff --git a/app/webapps/ROOT/WEB-INF/lib/jt-orderdither-1.1.14.jar b/app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/jt-orderdither-1.1.14.jar similarity index 100% rename from app/webapps/ROOT/WEB-INF/lib/jt-orderdither-1.1.14.jar rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/jt-orderdither-1.1.14.jar diff --git a/app/webapps/ROOT/WEB-INF/lib/jt-piecewise-1.1.14.jar b/app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/jt-piecewise-1.1.14.jar similarity index 100% rename from app/webapps/ROOT/WEB-INF/lib/jt-piecewise-1.1.14.jar rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/jt-piecewise-1.1.14.jar diff --git a/app/webapps/ROOT/WEB-INF/lib/jt-rescale-1.1.14.jar b/app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/jt-rescale-1.1.14.jar similarity index 100% rename from app/webapps/ROOT/WEB-INF/lib/jt-rescale-1.1.14.jar rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/jt-rescale-1.1.14.jar diff --git a/app/webapps/ROOT/WEB-INF/lib/jt-rlookup-1.1.14.jar b/app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/jt-rlookup-1.1.14.jar similarity index 100% rename from app/webapps/ROOT/WEB-INF/lib/jt-rlookup-1.1.14.jar rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/jt-rlookup-1.1.14.jar diff --git a/app/webapps/ROOT/WEB-INF/lib/jt-scale-1.1.14.jar b/app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/jt-scale-1.1.14.jar similarity index 100% rename from app/webapps/ROOT/WEB-INF/lib/jt-scale-1.1.14.jar rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/jt-scale-1.1.14.jar diff --git a/app/webapps/ROOT/WEB-INF/lib/jt-scale2-1.1.14.jar b/app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/jt-scale2-1.1.14.jar similarity index 100% rename from app/webapps/ROOT/WEB-INF/lib/jt-scale2-1.1.14.jar rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/jt-scale2-1.1.14.jar diff --git a/app/webapps/ROOT/WEB-INF/lib/jt-shadedrelief-1.1.14.jar b/app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/jt-shadedrelief-1.1.14.jar similarity index 100% rename from app/webapps/ROOT/WEB-INF/lib/jt-shadedrelief-1.1.14.jar rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/jt-shadedrelief-1.1.14.jar diff --git a/app/webapps/ROOT/WEB-INF/lib/jt-stats-1.1.14.jar b/app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/jt-stats-1.1.14.jar similarity index 100% rename from app/webapps/ROOT/WEB-INF/lib/jt-stats-1.1.14.jar rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/jt-stats-1.1.14.jar diff --git a/app/webapps/ROOT/WEB-INF/lib/jt-translate-1.1.14.jar b/app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/jt-translate-1.1.14.jar similarity index 100% rename from app/webapps/ROOT/WEB-INF/lib/jt-translate-1.1.14.jar rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/jt-translate-1.1.14.jar diff --git a/app/webapps/ROOT/WEB-INF/lib/jt-utilities-1.1.14.jar b/app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/jt-utilities-1.1.14.jar similarity index 100% rename from app/webapps/ROOT/WEB-INF/lib/jt-utilities-1.1.14.jar rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/jt-utilities-1.1.14.jar diff --git a/app/webapps/ROOT/WEB-INF/lib/jt-utils-1.5.0.jar b/app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/jt-utils-1.5.0.jar similarity index 100% rename from app/webapps/ROOT/WEB-INF/lib/jt-utils-1.5.0.jar rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/jt-utils-1.5.0.jar diff --git a/app/webapps/ROOT/WEB-INF/lib/jt-vectorbin-1.1.14.jar b/app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/jt-vectorbin-1.1.14.jar similarity index 100% rename from app/webapps/ROOT/WEB-INF/lib/jt-vectorbin-1.1.14.jar rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/jt-vectorbin-1.1.14.jar diff --git a/app/webapps/ROOT/WEB-INF/lib/jt-warp-1.1.14.jar b/app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/jt-warp-1.1.14.jar similarity index 100% rename from app/webapps/ROOT/WEB-INF/lib/jt-warp-1.1.14.jar rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/jt-warp-1.1.14.jar diff --git a/app/webapps/ROOT/WEB-INF/lib/jt-zonal-1.1.14.jar b/app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/jt-zonal-1.1.14.jar similarity index 100% rename from app/webapps/ROOT/WEB-INF/lib/jt-zonal-1.1.14.jar rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/jt-zonal-1.1.14.jar diff --git a/app/webapps/ROOT/WEB-INF/lib/jt-zonalstats-1.5.0.jar b/app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/jt-zonalstats-1.5.0.jar similarity index 100% rename from app/webapps/ROOT/WEB-INF/lib/jt-zonalstats-1.5.0.jar rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/jt-zonalstats-1.5.0.jar diff --git a/app/webapps/ROOT/WEB-INF/lib/jtidy-r938.jar b/app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/jtidy-r938.jar similarity index 100% rename from app/webapps/ROOT/WEB-INF/lib/jtidy-r938.jar rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/jtidy-r938.jar diff --git a/app/webapps/ROOT/WEB-INF/lib/jts-core-1.16.1.jar b/app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/jts-core-1.16.1.jar similarity index 100% rename from app/webapps/ROOT/WEB-INF/lib/jts-core-1.16.1.jar rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/jts-core-1.16.1.jar diff --git a/app/webapps/ROOT/WEB-INF/lib/kernel-7.1.14.jar b/app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/kernel-7.1.14.jar similarity index 100% rename from app/webapps/ROOT/WEB-INF/lib/kernel-7.1.14.jar rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/kernel-7.1.14.jar diff --git a/app/webapps/ROOT/WEB-INF/lib/layout-7.1.14.jar b/app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/layout-7.1.14.jar similarity index 100% rename from app/webapps/ROOT/WEB-INF/lib/layout-7.1.14.jar rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/layout-7.1.14.jar diff --git a/app/webapps/ROOT/WEB-INF/lib/listenablefuture-9999.0-empty-to-avoid-conflict-with-guava.jar b/app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/listenablefuture-9999.0-empty-to-avoid-conflict-with-guava.jar similarity index 100% rename from app/webapps/ROOT/WEB-INF/lib/listenablefuture-9999.0-empty-to-avoid-conflict-with-guava.jar rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/listenablefuture-9999.0-empty-to-avoid-conflict-with-guava.jar diff --git a/app/webapps/ROOT/WEB-INF/lib/metadata-extractor-2.11.0.jar b/app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/metadata-extractor-2.11.0.jar similarity index 100% rename from app/webapps/ROOT/WEB-INF/lib/metadata-extractor-2.11.0.jar rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/metadata-extractor-2.11.0.jar diff --git a/app/webapps/ROOT/WEB-INF/lib/microprofile-config-api-1.4.jar b/app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/microprofile-config-api-1.4.jar similarity index 100% rename from app/webapps/ROOT/WEB-INF/lib/microprofile-config-api-1.4.jar rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/microprofile-config-api-1.4.jar diff --git a/app/webapps/ROOT/WEB-INF/lib/msg-simple-1.2.jar b/app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/msg-simple-1.2.jar similarity index 100% rename from app/webapps/ROOT/WEB-INF/lib/msg-simple-1.2.jar rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/msg-simple-1.2.jar diff --git a/app/webapps/ROOT/WEB-INF/lib/net.opengis.ows-23.0.jar b/app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/net.opengis.ows-23.0.jar similarity index 100% rename from app/webapps/ROOT/WEB-INF/lib/net.opengis.ows-23.0.jar rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/net.opengis.ows-23.0.jar diff --git a/app/webapps/ROOT/WEB-INF/lib/objenesis-2.6.jar b/app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/objenesis-2.6.jar similarity index 100% rename from app/webapps/ROOT/WEB-INF/lib/objenesis-2.6.jar rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/objenesis-2.6.jar diff --git a/app/webapps/ROOT/WEB-INF/lib/opencsv-2.3.jar b/app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/opencsv-2.3.jar similarity index 100% rename from app/webapps/ROOT/WEB-INF/lib/opencsv-2.3.jar rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/opencsv-2.3.jar diff --git a/app/webapps/ROOT/WEB-INF/lib/org.eclipse.birt-4.18.0-SNAPSHOT.jar b/app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/org.eclipse.birt-4.18.0-SNAPSHOT.jar similarity index 100% rename from app/webapps/ROOT/WEB-INF/lib/org.eclipse.birt-4.18.0-SNAPSHOT.jar rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/org.eclipse.birt-4.18.0-SNAPSHOT.jar diff --git a/app/webapps/ROOT/WEB-INF/lib/org.eclipse.birt.chart.device.extension-4.18.0-SNAPSHOT.jar b/app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/org.eclipse.birt.chart.device.extension-4.18.0-SNAPSHOT.jar similarity index 100% rename from app/webapps/ROOT/WEB-INF/lib/org.eclipse.birt.chart.device.extension-4.18.0-SNAPSHOT.jar rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/org.eclipse.birt.chart.device.extension-4.18.0-SNAPSHOT.jar diff --git a/app/webapps/ROOT/WEB-INF/lib/org.eclipse.birt.chart.device.pdf-4.18.0-SNAPSHOT.jar b/app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/org.eclipse.birt.chart.device.pdf-4.18.0-SNAPSHOT.jar similarity index 100% rename from app/webapps/ROOT/WEB-INF/lib/org.eclipse.birt.chart.device.pdf-4.18.0-SNAPSHOT.jar rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/org.eclipse.birt.chart.device.pdf-4.18.0-SNAPSHOT.jar diff --git a/app/webapps/ROOT/WEB-INF/lib/org.eclipse.birt.chart.device.svg-4.18.0-SNAPSHOT.jar b/app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/org.eclipse.birt.chart.device.svg-4.18.0-SNAPSHOT.jar similarity index 100% rename from app/webapps/ROOT/WEB-INF/lib/org.eclipse.birt.chart.device.svg-4.18.0-SNAPSHOT.jar rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/org.eclipse.birt.chart.device.svg-4.18.0-SNAPSHOT.jar diff --git a/app/webapps/ROOT/WEB-INF/lib/org.eclipse.birt.chart.engine-4.18.0-SNAPSHOT.jar b/app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/org.eclipse.birt.chart.engine-4.18.0-SNAPSHOT.jar similarity index 100% rename from app/webapps/ROOT/WEB-INF/lib/org.eclipse.birt.chart.engine-4.18.0-SNAPSHOT.jar rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/org.eclipse.birt.chart.engine-4.18.0-SNAPSHOT.jar diff --git a/app/webapps/ROOT/WEB-INF/lib/org.eclipse.birt.chart.engine.extension-4.18.0-SNAPSHOT.jar b/app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/org.eclipse.birt.chart.engine.extension-4.18.0-SNAPSHOT.jar similarity index 100% rename from app/webapps/ROOT/WEB-INF/lib/org.eclipse.birt.chart.engine.extension-4.18.0-SNAPSHOT.jar rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/org.eclipse.birt.chart.engine.extension-4.18.0-SNAPSHOT.jar diff --git a/app/webapps/ROOT/WEB-INF/lib/org.eclipse.birt.chart.reportitem-4.18.0-SNAPSHOT.jar b/app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/org.eclipse.birt.chart.reportitem-4.18.0-SNAPSHOT.jar similarity index 100% rename from app/webapps/ROOT/WEB-INF/lib/org.eclipse.birt.chart.reportitem-4.18.0-SNAPSHOT.jar rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/org.eclipse.birt.chart.reportitem-4.18.0-SNAPSHOT.jar diff --git a/app/webapps/ROOT/WEB-INF/lib/org.eclipse.birt.chart.reportitem.ui-4.18.0-SNAPSHOT.jar b/app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/org.eclipse.birt.chart.reportitem.ui-4.18.0-SNAPSHOT.jar similarity index 100% rename from app/webapps/ROOT/WEB-INF/lib/org.eclipse.birt.chart.reportitem.ui-4.18.0-SNAPSHOT.jar rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/org.eclipse.birt.chart.reportitem.ui-4.18.0-SNAPSHOT.jar diff --git a/app/webapps/ROOT/WEB-INF/lib/org.eclipse.birt.core-4.18.0-SNAPSHOT.jar b/app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/org.eclipse.birt.core-4.18.0-SNAPSHOT.jar similarity index 100% rename from app/webapps/ROOT/WEB-INF/lib/org.eclipse.birt.core-4.18.0-SNAPSHOT.jar rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/org.eclipse.birt.core-4.18.0-SNAPSHOT.jar diff --git a/app/webapps/ROOT/WEB-INF/lib/org.eclipse.birt.data-4.18.0-SNAPSHOT.jar b/app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/org.eclipse.birt.data-4.18.0-SNAPSHOT.jar similarity index 100% rename from app/webapps/ROOT/WEB-INF/lib/org.eclipse.birt.data-4.18.0-SNAPSHOT.jar rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/org.eclipse.birt.data-4.18.0-SNAPSHOT.jar diff --git a/app/webapps/ROOT/WEB-INF/lib/org.eclipse.birt.data.aggregation-4.18.0-SNAPSHOT.jar b/app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/org.eclipse.birt.data.aggregation-4.18.0-SNAPSHOT.jar similarity index 100% rename from app/webapps/ROOT/WEB-INF/lib/org.eclipse.birt.data.aggregation-4.18.0-SNAPSHOT.jar rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/org.eclipse.birt.data.aggregation-4.18.0-SNAPSHOT.jar diff --git a/app/webapps/ROOT/WEB-INF/lib/org.eclipse.birt.data.oda.pojo-4.18.0-SNAPSHOT.jar b/app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/org.eclipse.birt.data.oda.pojo-4.18.0-SNAPSHOT.jar similarity index 100% rename from app/webapps/ROOT/WEB-INF/lib/org.eclipse.birt.data.oda.pojo-4.18.0-SNAPSHOT.jar rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/org.eclipse.birt.data.oda.pojo-4.18.0-SNAPSHOT.jar diff --git a/app/webapps/ROOT/WEB-INF/lib/org.eclipse.birt.report.data.adapter-4.18.0-SNAPSHOT.jar b/app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/org.eclipse.birt.report.data.adapter-4.18.0-SNAPSHOT.jar similarity index 100% rename from app/webapps/ROOT/WEB-INF/lib/org.eclipse.birt.report.data.adapter-4.18.0-SNAPSHOT.jar rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/org.eclipse.birt.report.data.adapter-4.18.0-SNAPSHOT.jar diff --git a/app/webapps/ROOT/WEB-INF/lib/org.eclipse.birt.report.data.oda.jdbc-4.18.0-SNAPSHOT.jar b/app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/org.eclipse.birt.report.data.oda.jdbc-4.18.0-SNAPSHOT.jar similarity index 100% rename from app/webapps/ROOT/WEB-INF/lib/org.eclipse.birt.report.data.oda.jdbc-4.18.0-SNAPSHOT.jar rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/org.eclipse.birt.report.data.oda.jdbc-4.18.0-SNAPSHOT.jar diff --git a/app/webapps/ROOT/WEB-INF/lib/org.eclipse.birt.report.engine-4.18.0-SNAPSHOT.jar b/app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/org.eclipse.birt.report.engine-4.18.0-SNAPSHOT.jar similarity index 100% rename from app/webapps/ROOT/WEB-INF/lib/org.eclipse.birt.report.engine-4.18.0-SNAPSHOT.jar rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/org.eclipse.birt.report.engine-4.18.0-SNAPSHOT.jar diff --git a/app/webapps/ROOT/WEB-INF/lib/org.eclipse.birt.report.engine.dataextraction-4.18.0-SNAPSHOT.jar b/app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/org.eclipse.birt.report.engine.dataextraction-4.18.0-SNAPSHOT.jar similarity index 100% rename from app/webapps/ROOT/WEB-INF/lib/org.eclipse.birt.report.engine.dataextraction-4.18.0-SNAPSHOT.jar rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/org.eclipse.birt.report.engine.dataextraction-4.18.0-SNAPSHOT.jar diff --git a/app/webapps/ROOT/WEB-INF/lib/org.eclipse.birt.report.engine.dataextraction.csv-4.18.0-SNAPSHOT.jar b/app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/org.eclipse.birt.report.engine.dataextraction.csv-4.18.0-SNAPSHOT.jar similarity index 100% rename from app/webapps/ROOT/WEB-INF/lib/org.eclipse.birt.report.engine.dataextraction.csv-4.18.0-SNAPSHOT.jar rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/org.eclipse.birt.report.engine.dataextraction.csv-4.18.0-SNAPSHOT.jar diff --git a/app/webapps/ROOT/WEB-INF/lib/org.eclipse.birt.report.engine.emitter.config.wpml-4.18.0-SNAPSHOT.jar b/app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/org.eclipse.birt.report.engine.emitter.config.wpml-4.18.0-SNAPSHOT.jar similarity index 100% rename from app/webapps/ROOT/WEB-INF/lib/org.eclipse.birt.report.engine.emitter.config.wpml-4.18.0-SNAPSHOT.jar rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/org.eclipse.birt.report.engine.emitter.config.wpml-4.18.0-SNAPSHOT.jar diff --git a/app/webapps/ROOT/WEB-INF/lib/org.eclipse.birt.report.engine.emitter.docx-4.18.0-SNAPSHOT.jar b/app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/org.eclipse.birt.report.engine.emitter.docx-4.18.0-SNAPSHOT.jar similarity index 100% rename from app/webapps/ROOT/WEB-INF/lib/org.eclipse.birt.report.engine.emitter.docx-4.18.0-SNAPSHOT.jar rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/org.eclipse.birt.report.engine.emitter.docx-4.18.0-SNAPSHOT.jar diff --git a/app/webapps/ROOT/WEB-INF/lib/org.eclipse.birt.report.engine.emitter.html-4.18.0-SNAPSHOT.jar b/app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/org.eclipse.birt.report.engine.emitter.html-4.18.0-SNAPSHOT.jar similarity index 100% rename from app/webapps/ROOT/WEB-INF/lib/org.eclipse.birt.report.engine.emitter.html-4.18.0-SNAPSHOT.jar rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/org.eclipse.birt.report.engine.emitter.html-4.18.0-SNAPSHOT.jar diff --git a/app/webapps/ROOT/WEB-INF/lib/org.eclipse.birt.report.engine.emitter.odt-4.18.0-SNAPSHOT.jar b/app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/org.eclipse.birt.report.engine.emitter.odt-4.18.0-SNAPSHOT.jar similarity index 100% rename from app/webapps/ROOT/WEB-INF/lib/org.eclipse.birt.report.engine.emitter.odt-4.18.0-SNAPSHOT.jar rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/org.eclipse.birt.report.engine.emitter.odt-4.18.0-SNAPSHOT.jar diff --git a/app/webapps/ROOT/WEB-INF/lib/org.eclipse.birt.report.engine.emitter.pdf-4.18.0-SNAPSHOT.jar b/app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/org.eclipse.birt.report.engine.emitter.pdf-4.18.0-SNAPSHOT.jar similarity index 100% rename from app/webapps/ROOT/WEB-INF/lib/org.eclipse.birt.report.engine.emitter.pdf-4.18.0-SNAPSHOT.jar rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/org.eclipse.birt.report.engine.emitter.pdf-4.18.0-SNAPSHOT.jar diff --git a/app/webapps/ROOT/WEB-INF/lib/org.eclipse.birt.report.engine.emitter.wpml-4.18.0-SNAPSHOT.jar b/app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/org.eclipse.birt.report.engine.emitter.wpml-4.18.0-SNAPSHOT.jar similarity index 100% rename from app/webapps/ROOT/WEB-INF/lib/org.eclipse.birt.report.engine.emitter.wpml-4.18.0-SNAPSHOT.jar rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/org.eclipse.birt.report.engine.emitter.wpml-4.18.0-SNAPSHOT.jar diff --git a/app/webapps/ROOT/WEB-INF/lib/org.eclipse.birt.report.engine.fonts-4.18.0-SNAPSHOT.jar b/app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/org.eclipse.birt.report.engine.fonts-4.18.0-SNAPSHOT.jar similarity index 100% rename from app/webapps/ROOT/WEB-INF/lib/org.eclipse.birt.report.engine.fonts-4.18.0-SNAPSHOT.jar rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/org.eclipse.birt.report.engine.fonts-4.18.0-SNAPSHOT.jar diff --git a/app/webapps/ROOT/WEB-INF/lib/org.eclipse.birt.report.engine.odf-4.18.0-SNAPSHOT.jar b/app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/org.eclipse.birt.report.engine.odf-4.18.0-SNAPSHOT.jar similarity index 100% rename from app/webapps/ROOT/WEB-INF/lib/org.eclipse.birt.report.engine.odf-4.18.0-SNAPSHOT.jar rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/org.eclipse.birt.report.engine.odf-4.18.0-SNAPSHOT.jar diff --git a/app/webapps/ROOT/WEB-INF/lib/org.eclipse.birt.report.engine.ooxml-4.18.0-SNAPSHOT.jar b/app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/org.eclipse.birt.report.engine.ooxml-4.18.0-SNAPSHOT.jar similarity index 100% rename from app/webapps/ROOT/WEB-INF/lib/org.eclipse.birt.report.engine.ooxml-4.18.0-SNAPSHOT.jar rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/org.eclipse.birt.report.engine.ooxml-4.18.0-SNAPSHOT.jar diff --git a/app/webapps/ROOT/WEB-INF/lib/org.eclipse.birt.report.engine.script.javascript-4.18.0-SNAPSHOT.jar b/app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/org.eclipse.birt.report.engine.script.javascript-4.18.0-SNAPSHOT.jar similarity index 100% rename from app/webapps/ROOT/WEB-INF/lib/org.eclipse.birt.report.engine.script.javascript-4.18.0-SNAPSHOT.jar rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/org.eclipse.birt.report.engine.script.javascript-4.18.0-SNAPSHOT.jar diff --git a/app/webapps/ROOT/WEB-INF/lib/org.eclipse.birt.report.item.crosstab.core-4.18.0-SNAPSHOT.jar b/app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/org.eclipse.birt.report.item.crosstab.core-4.18.0-SNAPSHOT.jar similarity index 100% rename from app/webapps/ROOT/WEB-INF/lib/org.eclipse.birt.report.item.crosstab.core-4.18.0-SNAPSHOT.jar rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/org.eclipse.birt.report.item.crosstab.core-4.18.0-SNAPSHOT.jar diff --git a/app/webapps/ROOT/WEB-INF/lib/org.eclipse.birt.report.model-4.18.0-SNAPSHOT.jar b/app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/org.eclipse.birt.report.model-4.18.0-SNAPSHOT.jar similarity index 100% rename from app/webapps/ROOT/WEB-INF/lib/org.eclipse.birt.report.model-4.18.0-SNAPSHOT.jar rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/org.eclipse.birt.report.model-4.18.0-SNAPSHOT.jar diff --git a/app/webapps/ROOT/WEB-INF/lib/org.eclipse.birt.report.model.adapter.oda-4.18.0-SNAPSHOT.jar b/app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/org.eclipse.birt.report.model.adapter.oda-4.18.0-SNAPSHOT.jar similarity index 100% rename from app/webapps/ROOT/WEB-INF/lib/org.eclipse.birt.report.model.adapter.oda-4.18.0-SNAPSHOT.jar rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/org.eclipse.birt.report.model.adapter.oda-4.18.0-SNAPSHOT.jar diff --git a/app/webapps/ROOT/WEB-INF/lib/org.eclipse.core.commands-3.10.200.jar b/app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/org.eclipse.core.commands-3.10.400.jar similarity index 58% rename from app/webapps/ROOT/WEB-INF/lib/org.eclipse.core.commands-3.10.200.jar rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/org.eclipse.core.commands-3.10.400.jar index 6b92a25..b096cbb 100644 Binary files a/app/webapps/ROOT/WEB-INF/lib/org.eclipse.core.commands-3.10.200.jar and b/app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/org.eclipse.core.commands-3.10.400.jar differ diff --git a/app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/org.eclipse.core.contenttype-3.9.200.jar b/app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/org.eclipse.core.contenttype-3.9.200.jar new file mode 100644 index 0000000..e76f80d Binary files /dev/null and b/app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/org.eclipse.core.contenttype-3.9.200.jar differ diff --git a/app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/org.eclipse.core.jobs-3.15.100.jar b/app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/org.eclipse.core.jobs-3.15.100.jar new file mode 100644 index 0000000..0d5b832 Binary files /dev/null and b/app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/org.eclipse.core.jobs-3.15.100.jar differ diff --git a/app/webapps/ROOT/WEB-INF/lib/org.eclipse.core.runtime-3.20.0.jar b/app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/org.eclipse.core.runtime-3.20.0.jar similarity index 100% rename from app/webapps/ROOT/WEB-INF/lib/org.eclipse.core.runtime-3.20.0.jar rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/org.eclipse.core.runtime-3.20.0.jar diff --git a/app/webapps/ROOT/WEB-INF/lib/org.eclipse.datatools.connectivity-1.14.102-SNAPSHOT.jar b/app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/org.eclipse.datatools.connectivity-1.14.102-SNAPSHOT.jar similarity index 100% rename from app/webapps/ROOT/WEB-INF/lib/org.eclipse.datatools.connectivity-1.14.102-SNAPSHOT.jar rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/org.eclipse.datatools.connectivity-1.14.102-SNAPSHOT.jar diff --git a/app/webapps/ROOT/WEB-INF/lib/org.eclipse.datatools.connectivity.oda-3.6.101-SNAPSHOT.jar b/app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/org.eclipse.datatools.connectivity.oda-3.6.101-SNAPSHOT.jar similarity index 100% rename from app/webapps/ROOT/WEB-INF/lib/org.eclipse.datatools.connectivity.oda-3.6.101-SNAPSHOT.jar rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/org.eclipse.datatools.connectivity.oda-3.6.101-SNAPSHOT.jar diff --git a/app/webapps/ROOT/WEB-INF/lib/org.eclipse.datatools.connectivity.oda.consumer-3.4.101-SNAPSHOT.jar b/app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/org.eclipse.datatools.connectivity.oda.consumer-3.4.101-SNAPSHOT.jar similarity index 100% rename from app/webapps/ROOT/WEB-INF/lib/org.eclipse.datatools.connectivity.oda.consumer-3.4.101-SNAPSHOT.jar rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/org.eclipse.datatools.connectivity.oda.consumer-3.4.101-SNAPSHOT.jar diff --git a/app/webapps/ROOT/WEB-INF/lib/org.eclipse.datatools.connectivity.oda.design-3.5.101-SNAPSHOT.jar b/app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/org.eclipse.datatools.connectivity.oda.design-3.5.101-SNAPSHOT.jar similarity index 100% rename from app/webapps/ROOT/WEB-INF/lib/org.eclipse.datatools.connectivity.oda.design-3.5.101-SNAPSHOT.jar rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/org.eclipse.datatools.connectivity.oda.design-3.5.101-SNAPSHOT.jar diff --git a/app/webapps/ROOT/WEB-INF/lib/org.eclipse.datatools.connectivity.oda.profile-3.4.101-SNAPSHOT.jar b/app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/org.eclipse.datatools.connectivity.oda.profile-3.4.101-SNAPSHOT.jar similarity index 100% rename from app/webapps/ROOT/WEB-INF/lib/org.eclipse.datatools.connectivity.oda.profile-3.4.101-SNAPSHOT.jar rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/org.eclipse.datatools.connectivity.oda.profile-3.4.101-SNAPSHOT.jar diff --git a/app/webapps/ROOT/WEB-INF/lib/org.eclipse.datatools.modelbase.dbdefinition-1.1.0.201603142002.jar b/app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/org.eclipse.datatools.modelbase.dbdefinition-1.1.0.201603142002.jar similarity index 100% rename from app/webapps/ROOT/WEB-INF/lib/org.eclipse.datatools.modelbase.dbdefinition-1.1.0.201603142002.jar rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/org.eclipse.datatools.modelbase.dbdefinition-1.1.0.201603142002.jar diff --git a/app/webapps/ROOT/WEB-INF/lib/org.eclipse.emf.common-2.15.0.jar b/app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/org.eclipse.emf.common-2.15.0.jar similarity index 100% rename from app/webapps/ROOT/WEB-INF/lib/org.eclipse.emf.common-2.15.0.jar rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/org.eclipse.emf.common-2.15.0.jar diff --git a/app/webapps/ROOT/WEB-INF/lib/org.eclipse.emf.ecore-2.15.0.jar b/app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/org.eclipse.emf.ecore-2.15.0.jar similarity index 100% rename from app/webapps/ROOT/WEB-INF/lib/org.eclipse.emf.ecore-2.15.0.jar rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/org.eclipse.emf.ecore-2.15.0.jar diff --git a/app/webapps/ROOT/WEB-INF/lib/org.eclipse.emf.ecore.xmi-2.15.0.jar b/app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/org.eclipse.emf.ecore.xmi-2.15.0.jar similarity index 100% rename from app/webapps/ROOT/WEB-INF/lib/org.eclipse.emf.ecore.xmi-2.15.0.jar rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/org.eclipse.emf.ecore.xmi-2.15.0.jar diff --git a/app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/org.eclipse.equinox.app-1.6.400.jar b/app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/org.eclipse.equinox.app-1.6.400.jar new file mode 100644 index 0000000..7fcc690 Binary files /dev/null and b/app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/org.eclipse.equinox.app-1.6.400.jar differ diff --git a/app/webapps/ROOT/WEB-INF/lib/org.eclipse.equinox.common-3.14.100.jar b/app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/org.eclipse.equinox.common-3.14.100.jar similarity index 100% rename from app/webapps/ROOT/WEB-INF/lib/org.eclipse.equinox.common-3.14.100.jar rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/org.eclipse.equinox.common-3.14.100.jar diff --git a/app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/org.eclipse.equinox.preferences-3.10.400.jar b/app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/org.eclipse.equinox.preferences-3.10.400.jar new file mode 100644 index 0000000..ad987d3 Binary files /dev/null and b/app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/org.eclipse.equinox.preferences-3.10.400.jar differ diff --git a/app/webapps/ROOT/WEB-INF/lib/org.eclipse.equinox.registry-3.10.0.jar b/app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/org.eclipse.equinox.registry-3.10.0.jar similarity index 100% rename from app/webapps/ROOT/WEB-INF/lib/org.eclipse.equinox.registry-3.10.0.jar rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/org.eclipse.equinox.registry-3.10.0.jar diff --git a/app/webapps/ROOT/WEB-INF/lib/org.eclipse.jface-3.22.0.jar b/app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/org.eclipse.jface-3.22.0.jar similarity index 100% rename from app/webapps/ROOT/WEB-INF/lib/org.eclipse.jface-3.22.0.jar rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/org.eclipse.jface-3.22.0.jar diff --git a/app/webapps/ROOT/WEB-INF/lib/org.eclipse.osgi-3.18.100.jar b/app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/org.eclipse.osgi-3.18.600.jar similarity index 68% rename from app/webapps/ROOT/WEB-INF/lib/org.eclipse.osgi-3.18.100.jar rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/org.eclipse.osgi-3.18.600.jar index 65cbb75..8aeebe5 100644 Binary files a/app/webapps/ROOT/WEB-INF/lib/org.eclipse.osgi-3.18.100.jar and b/app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/org.eclipse.osgi-3.18.600.jar differ diff --git a/app/webapps/ROOT/WEB-INF/lib/org.eclipse.swt-3.121.0.jar b/app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/org.eclipse.swt-3.124.200.jar similarity index 50% rename from app/webapps/ROOT/WEB-INF/lib/org.eclipse.swt-3.121.0.jar rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/org.eclipse.swt-3.124.200.jar index 724f06c..c1b6cf6 100644 Binary files a/app/webapps/ROOT/WEB-INF/lib/org.eclipse.swt-3.121.0.jar and b/app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/org.eclipse.swt-3.124.200.jar differ diff --git a/app/webapps/ROOT/WEB-INF/lib/org.eclipse.ui.workbench-3.122.0.jar b/app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/org.eclipse.ui.workbench-3.122.0.jar similarity index 100% rename from app/webapps/ROOT/WEB-INF/lib/org.eclipse.ui.workbench-3.122.0.jar rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/org.eclipse.ui.workbench-3.122.0.jar diff --git a/app/webapps/ROOT/WEB-INF/lib/org.eclipse.xsd-2.12.0.jar b/app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/org.eclipse.xsd-2.12.0.jar similarity index 100% rename from app/webapps/ROOT/WEB-INF/lib/org.eclipse.xsd-2.12.0.jar rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/org.eclipse.xsd-2.12.0.jar diff --git a/app/webapps/ROOT/WEB-INF/lib/org.locationtech.udig.catalog-3.0.0-SNAPSHOT.jar b/app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/org.locationtech.udig.catalog-3.0.0-SNAPSHOT.jar similarity index 100% rename from app/webapps/ROOT/WEB-INF/lib/org.locationtech.udig.catalog-3.0.0-SNAPSHOT.jar rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/org.locationtech.udig.catalog-3.0.0-SNAPSHOT.jar diff --git a/app/webapps/ROOT/WEB-INF/lib/org.locationtech.udig.catalog.geotiff-3.0.0-SNAPSHOT.jar b/app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/org.locationtech.udig.catalog.geotiff-3.0.0-SNAPSHOT.jar similarity index 100% rename from app/webapps/ROOT/WEB-INF/lib/org.locationtech.udig.catalog.geotiff-3.0.0-SNAPSHOT.jar rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/org.locationtech.udig.catalog.geotiff-3.0.0-SNAPSHOT.jar diff --git a/app/webapps/ROOT/WEB-INF/lib/org.locationtech.udig.catalog.rasterings-3.0.0-SNAPSHOT.jar b/app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/org.locationtech.udig.catalog.rasterings-3.0.0-SNAPSHOT.jar similarity index 100% rename from app/webapps/ROOT/WEB-INF/lib/org.locationtech.udig.catalog.rasterings-3.0.0-SNAPSHOT.jar rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/org.locationtech.udig.catalog.rasterings-3.0.0-SNAPSHOT.jar diff --git a/app/webapps/ROOT/WEB-INF/lib/org.locationtech.udig.catalog.shp-3.0.0-SNAPSHOT.jar b/app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/org.locationtech.udig.catalog.shp-3.0.0-SNAPSHOT.jar similarity index 100% rename from app/webapps/ROOT/WEB-INF/lib/org.locationtech.udig.catalog.shp-3.0.0-SNAPSHOT.jar rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/org.locationtech.udig.catalog.shp-3.0.0-SNAPSHOT.jar diff --git a/app/webapps/ROOT/WEB-INF/lib/org.locationtech.udig.catalog.wms-3.0.0-SNAPSHOT.jar b/app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/org.locationtech.udig.catalog.wms-3.0.0-SNAPSHOT.jar similarity index 100% rename from app/webapps/ROOT/WEB-INF/lib/org.locationtech.udig.catalog.wms-3.0.0-SNAPSHOT.jar rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/org.locationtech.udig.catalog.wms-3.0.0-SNAPSHOT.jar diff --git a/app/webapps/ROOT/WEB-INF/lib/org.locationtech.udig.catalog.worldimage-3.0.0-SNAPSHOT.jar b/app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/org.locationtech.udig.catalog.worldimage-3.0.0-SNAPSHOT.jar similarity index 100% rename from app/webapps/ROOT/WEB-INF/lib/org.locationtech.udig.catalog.worldimage-3.0.0-SNAPSHOT.jar rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/org.locationtech.udig.catalog.worldimage-3.0.0-SNAPSHOT.jar diff --git a/app/webapps/ROOT/WEB-INF/lib/org.locationtech.udig.core-3.0.0-SNAPSHOT.jar b/app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/org.locationtech.udig.core-3.0.0-SNAPSHOT.jar similarity index 100% rename from app/webapps/ROOT/WEB-INF/lib/org.locationtech.udig.core-3.0.0-SNAPSHOT.jar rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/org.locationtech.udig.core-3.0.0-SNAPSHOT.jar diff --git a/app/webapps/ROOT/WEB-INF/lib/org.locationtech.udig.legend-3.0.0-SNAPSHOT.jar b/app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/org.locationtech.udig.legend-3.0.0-SNAPSHOT.jar similarity index 100% rename from app/webapps/ROOT/WEB-INF/lib/org.locationtech.udig.legend-3.0.0-SNAPSHOT.jar rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/org.locationtech.udig.legend-3.0.0-SNAPSHOT.jar diff --git a/app/webapps/ROOT/WEB-INF/lib/org.locationtech.udig.mapgraphic-3.0.0-SNAPSHOT.jar b/app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/org.locationtech.udig.mapgraphic-3.0.0-SNAPSHOT.jar similarity index 100% rename from app/webapps/ROOT/WEB-INF/lib/org.locationtech.udig.mapgraphic-3.0.0-SNAPSHOT.jar rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/org.locationtech.udig.mapgraphic-3.0.0-SNAPSHOT.jar diff --git a/app/webapps/ROOT/WEB-INF/lib/org.locationtech.udig.project-3.0.0-SNAPSHOT.jar b/app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/org.locationtech.udig.project-3.0.0-SNAPSHOT.jar similarity index 100% rename from app/webapps/ROOT/WEB-INF/lib/org.locationtech.udig.project-3.0.0-SNAPSHOT.jar rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/org.locationtech.udig.project-3.0.0-SNAPSHOT.jar diff --git a/app/webapps/ROOT/WEB-INF/lib/org.locationtech.udig.project.ui-3.0.0-SNAPSHOT.jar b/app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/org.locationtech.udig.project.ui-3.0.0-SNAPSHOT.jar similarity index 100% rename from app/webapps/ROOT/WEB-INF/lib/org.locationtech.udig.project.ui-3.0.0-SNAPSHOT.jar rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/org.locationtech.udig.project.ui-3.0.0-SNAPSHOT.jar diff --git a/app/webapps/ROOT/WEB-INF/lib/org.locationtech.udig.render.feature.basic-3.0.0-SNAPSHOT.jar b/app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/org.locationtech.udig.render.feature.basic-3.0.0-SNAPSHOT.jar similarity index 100% rename from app/webapps/ROOT/WEB-INF/lib/org.locationtech.udig.render.feature.basic-3.0.0-SNAPSHOT.jar rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/org.locationtech.udig.render.feature.basic-3.0.0-SNAPSHOT.jar diff --git a/app/webapps/ROOT/WEB-INF/lib/org.locationtech.udig.render.feature.shapefile-3.0.0-SNAPSHOT.jar b/app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/org.locationtech.udig.render.feature.shapefile-3.0.0-SNAPSHOT.jar similarity index 100% rename from app/webapps/ROOT/WEB-INF/lib/org.locationtech.udig.render.feature.shapefile-3.0.0-SNAPSHOT.jar rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/org.locationtech.udig.render.feature.shapefile-3.0.0-SNAPSHOT.jar diff --git a/app/webapps/ROOT/WEB-INF/lib/org.locationtech.udig.render.gridcoverage.basic-3.0.0-SNAPSHOT.jar b/app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/org.locationtech.udig.render.gridcoverage.basic-3.0.0-SNAPSHOT.jar similarity index 100% rename from app/webapps/ROOT/WEB-INF/lib/org.locationtech.udig.render.gridcoverage.basic-3.0.0-SNAPSHOT.jar rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/org.locationtech.udig.render.gridcoverage.basic-3.0.0-SNAPSHOT.jar diff --git a/app/webapps/ROOT/WEB-INF/lib/org.locationtech.udig.render.wms.basic-3.0.0-SNAPSHOT.jar b/app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/org.locationtech.udig.render.wms.basic-3.0.0-SNAPSHOT.jar similarity index 100% rename from app/webapps/ROOT/WEB-INF/lib/org.locationtech.udig.render.wms.basic-3.0.0-SNAPSHOT.jar rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/org.locationtech.udig.render.wms.basic-3.0.0-SNAPSHOT.jar diff --git a/app/webapps/ROOT/WEB-INF/lib/org.locationtech.udig.style-3.0.0-SNAPSHOT.jar b/app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/org.locationtech.udig.style-3.0.0-SNAPSHOT.jar similarity index 100% rename from app/webapps/ROOT/WEB-INF/lib/org.locationtech.udig.style-3.0.0-SNAPSHOT.jar rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/org.locationtech.udig.style-3.0.0-SNAPSHOT.jar diff --git a/app/webapps/ROOT/WEB-INF/lib/org.locationtech.udig.style.sld-3.0.0-SNAPSHOT.jar b/app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/org.locationtech.udig.style.sld-3.0.0-SNAPSHOT.jar similarity index 100% rename from app/webapps/ROOT/WEB-INF/lib/org.locationtech.udig.style.sld-3.0.0-SNAPSHOT.jar rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/org.locationtech.udig.style.sld-3.0.0-SNAPSHOT.jar diff --git a/app/webapps/ROOT/WEB-INF/lib/org.locationtech.udig.style.wms-3.0.0-SNAPSHOT.jar b/app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/org.locationtech.udig.style.wms-3.0.0-SNAPSHOT.jar similarity index 100% rename from app/webapps/ROOT/WEB-INF/lib/org.locationtech.udig.style.wms-3.0.0-SNAPSHOT.jar rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/org.locationtech.udig.style.wms-3.0.0-SNAPSHOT.jar diff --git a/app/webapps/ROOT/WEB-INF/lib/org.locationtech.udig.ui-3.0.0-SNAPSHOT.jar b/app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/org.locationtech.udig.ui-3.0.0-SNAPSHOT.jar similarity index 100% rename from app/webapps/ROOT/WEB-INF/lib/org.locationtech.udig.ui-3.0.0-SNAPSHOT.jar rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/org.locationtech.udig.ui-3.0.0-SNAPSHOT.jar diff --git a/app/webapps/ROOT/WEB-INF/lib/org.osgi.service.prefs-1.1.2.jar b/app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/org.osgi.service.prefs-1.1.2.jar similarity index 100% rename from app/webapps/ROOT/WEB-INF/lib/org.osgi.service.prefs-1.1.2.jar rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/org.osgi.service.prefs-1.1.2.jar diff --git a/app/webapps/ROOT/WEB-INF/lib/org.w3.xlink-23.0.jar b/app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/org.w3.xlink-23.0.jar similarity index 100% rename from app/webapps/ROOT/WEB-INF/lib/org.w3.xlink-23.0.jar rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/org.w3.xlink-23.0.jar diff --git a/app/webapps/ROOT/WEB-INF/lib/org.wcs.smart.core.asset-7.5.3.jar b/app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/org.wcs.smart.core.asset-7.5.7.jar similarity index 85% rename from app/webapps/ROOT/WEB-INF/lib/org.wcs.smart.core.asset-7.5.3.jar rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/org.wcs.smart.core.asset-7.5.7.jar index 5a14551..07bae4d 100644 Binary files a/app/webapps/ROOT/WEB-INF/lib/org.wcs.smart.core.asset-7.5.3.jar and b/app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/org.wcs.smart.core.asset-7.5.7.jar differ diff --git a/app/webapps/ROOT/WEB-INF/lib/org.wcs.smart.core.asset.query-7.5.3.jar b/app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/org.wcs.smart.core.asset.query-7.5.7.jar similarity index 90% rename from app/webapps/ROOT/WEB-INF/lib/org.wcs.smart.core.asset.query-7.5.3.jar rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/org.wcs.smart.core.asset.query-7.5.7.jar index 8d092ea..70b458f 100644 Binary files a/app/webapps/ROOT/WEB-INF/lib/org.wcs.smart.core.asset.query-7.5.3.jar and b/app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/org.wcs.smart.core.asset.query-7.5.7.jar differ diff --git a/app/webapps/ROOT/WEB-INF/lib/org.wcs.smart.core.asset.query.report-7.5.3.jar b/app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/org.wcs.smart.core.asset.query.report-7.5.7.jar similarity index 79% rename from app/webapps/ROOT/WEB-INF/lib/org.wcs.smart.core.asset.query.report-7.5.3.jar rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/org.wcs.smart.core.asset.query.report-7.5.7.jar index 3437d1b..cdb31b5 100644 Binary files a/app/webapps/ROOT/WEB-INF/lib/org.wcs.smart.core.asset.query.report-7.5.3.jar and b/app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/org.wcs.smart.core.asset.query.report-7.5.7.jar differ diff --git a/app/webapps/ROOT/WEB-INF/lib/org.wcs.smart.core.birt-7.5.3.jar b/app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/org.wcs.smart.core.birt-7.5.7.jar similarity index 68% rename from app/webapps/ROOT/WEB-INF/lib/org.wcs.smart.core.birt-7.5.3.jar rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/org.wcs.smart.core.birt-7.5.7.jar index 345bf2f..2c92e28 100644 Binary files a/app/webapps/ROOT/WEB-INF/lib/org.wcs.smart.core.birt-7.5.3.jar and b/app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/org.wcs.smart.core.birt-7.5.7.jar differ diff --git a/app/webapps/ROOT/WEB-INF/lib/org.wcs.smart.core.birt.map-7.5.3.jar b/app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/org.wcs.smart.core.birt.map-7.5.7.jar similarity index 77% rename from app/webapps/ROOT/WEB-INF/lib/org.wcs.smart.core.birt.map-7.5.3.jar rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/org.wcs.smart.core.birt.map-7.5.7.jar index 42897f3..468b351 100644 Binary files a/app/webapps/ROOT/WEB-INF/lib/org.wcs.smart.core.birt.map-7.5.3.jar and b/app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/org.wcs.smart.core.birt.map-7.5.7.jar differ diff --git a/app/webapps/ROOT/WEB-INF/lib/org.wcs.smart.core.connect-7.5.3.jar b/app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/org.wcs.smart.core.connect-7.5.7.jar similarity index 84% rename from app/webapps/ROOT/WEB-INF/lib/org.wcs.smart.core.connect-7.5.3.jar rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/org.wcs.smart.core.connect-7.5.7.jar index 8d50bb9..01d904b 100644 Binary files a/app/webapps/ROOT/WEB-INF/lib/org.wcs.smart.core.connect-7.5.3.jar and b/app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/org.wcs.smart.core.connect-7.5.7.jar differ diff --git a/app/webapps/ROOT/WEB-INF/lib/org.wcs.smart.core.connect.cybertracker-7.5.3.jar b/app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/org.wcs.smart.core.connect.cybertracker-7.5.7.jar similarity index 74% rename from app/webapps/ROOT/WEB-INF/lib/org.wcs.smart.core.connect.cybertracker-7.5.3.jar rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/org.wcs.smart.core.connect.cybertracker-7.5.7.jar index d76560e..635beab 100644 Binary files a/app/webapps/ROOT/WEB-INF/lib/org.wcs.smart.core.connect.cybertracker-7.5.3.jar and b/app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/org.wcs.smart.core.connect.cybertracker-7.5.7.jar differ diff --git a/app/webapps/ROOT/WEB-INF/lib/org.wcs.smart.core.connect.dataqueue-7.5.3.jar b/app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/org.wcs.smart.core.connect.dataqueue-7.5.7.jar similarity index 52% rename from app/webapps/ROOT/WEB-INF/lib/org.wcs.smart.core.connect.dataqueue-7.5.3.jar rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/org.wcs.smart.core.connect.dataqueue-7.5.7.jar index 245365e..4b8689d 100644 Binary files a/app/webapps/ROOT/WEB-INF/lib/org.wcs.smart.core.connect.dataqueue-7.5.3.jar and b/app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/org.wcs.smart.core.connect.dataqueue-7.5.7.jar differ diff --git a/app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/org.wcs.smart.core.connect.dataqueue.cybertracker-7.5.7.jar b/app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/org.wcs.smart.core.connect.dataqueue.cybertracker-7.5.7.jar new file mode 100644 index 0000000..8bb43c7 Binary files /dev/null and b/app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/org.wcs.smart.core.connect.dataqueue.cybertracker-7.5.7.jar differ diff --git a/app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/org.wcs.smart.core.connect.dataqueue.er-7.5.7.jar b/app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/org.wcs.smart.core.connect.dataqueue.er-7.5.7.jar new file mode 100644 index 0000000..51fc421 Binary files /dev/null and b/app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/org.wcs.smart.core.connect.dataqueue.er-7.5.7.jar differ diff --git a/app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/org.wcs.smart.core.connect.dataqueue.i2-7.5.7.jar b/app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/org.wcs.smart.core.connect.dataqueue.i2-7.5.7.jar new file mode 100644 index 0000000..58a4b0f Binary files /dev/null and b/app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/org.wcs.smart.core.connect.dataqueue.i2-7.5.7.jar differ diff --git a/app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/org.wcs.smart.core.connect.dataqueue.independentincident-7.5.7.jar b/app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/org.wcs.smart.core.connect.dataqueue.independentincident-7.5.7.jar new file mode 100644 index 0000000..64ea8df Binary files /dev/null and b/app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/org.wcs.smart.core.connect.dataqueue.independentincident-7.5.7.jar differ diff --git a/app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/org.wcs.smart.core.connect.dataqueue.patrol-7.5.7.jar b/app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/org.wcs.smart.core.connect.dataqueue.patrol-7.5.7.jar new file mode 100644 index 0000000..be9817d Binary files /dev/null and b/app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/org.wcs.smart.core.connect.dataqueue.patrol-7.5.7.jar differ diff --git a/app/webapps/ROOT/WEB-INF/lib/org.wcs.smart.core.core-7.5.3.jar b/app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/org.wcs.smart.core.core-7.5.7.jar similarity index 98% rename from app/webapps/ROOT/WEB-INF/lib/org.wcs.smart.core.core-7.5.3.jar rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/org.wcs.smart.core.core-7.5.7.jar index be5d529..a7adbaf 100644 Binary files a/app/webapps/ROOT/WEB-INF/lib/org.wcs.smart.core.core-7.5.3.jar and b/app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/org.wcs.smart.core.core-7.5.7.jar differ diff --git a/app/webapps/ROOT/WEB-INF/lib/org.wcs.smart.core.cybertracker-7.5.3.jar b/app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/org.wcs.smart.core.cybertracker-7.5.7.jar similarity index 66% rename from app/webapps/ROOT/WEB-INF/lib/org.wcs.smart.core.cybertracker-7.5.3.jar rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/org.wcs.smart.core.cybertracker-7.5.7.jar index 6e45f1e..cd4e1fa 100644 Binary files a/app/webapps/ROOT/WEB-INF/lib/org.wcs.smart.core.cybertracker-7.5.3.jar and b/app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/org.wcs.smart.core.cybertracker-7.5.7.jar differ diff --git a/app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/org.wcs.smart.core.cybertracker.incident-7.5.7.jar b/app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/org.wcs.smart.core.cybertracker.incident-7.5.7.jar new file mode 100644 index 0000000..5caeb56 Binary files /dev/null and b/app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/org.wcs.smart.core.cybertracker.incident-7.5.7.jar differ diff --git a/app/webapps/ROOT/WEB-INF/lib/org.wcs.smart.core.cybertracker.patrol-7.5.3.jar b/app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/org.wcs.smart.core.cybertracker.patrol-7.5.7.jar similarity index 59% rename from app/webapps/ROOT/WEB-INF/lib/org.wcs.smart.core.cybertracker.patrol-7.5.3.jar rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/org.wcs.smart.core.cybertracker.patrol-7.5.7.jar index e743cdc..00d111f 100644 Binary files a/app/webapps/ROOT/WEB-INF/lib/org.wcs.smart.core.cybertracker.patrol-7.5.3.jar and b/app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/org.wcs.smart.core.cybertracker.patrol-7.5.7.jar differ diff --git a/app/webapps/ROOT/WEB-INF/lib/org.wcs.smart.core.cybertracker.survey-7.5.3.jar b/app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/org.wcs.smart.core.cybertracker.survey-7.5.7.jar similarity index 62% rename from app/webapps/ROOT/WEB-INF/lib/org.wcs.smart.core.cybertracker.survey-7.5.3.jar rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/org.wcs.smart.core.cybertracker.survey-7.5.7.jar index 071cb70..c02fb37 100644 Binary files a/app/webapps/ROOT/WEB-INF/lib/org.wcs.smart.core.cybertracker.survey-7.5.3.jar and b/app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/org.wcs.smart.core.cybertracker.survey-7.5.7.jar differ diff --git a/app/webapps/ROOT/WEB-INF/lib/org.wcs.smart.core.dataentry-7.5.3.jar b/app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/org.wcs.smart.core.dataentry-7.5.7.jar similarity index 66% rename from app/webapps/ROOT/WEB-INF/lib/org.wcs.smart.core.dataentry-7.5.3.jar rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/org.wcs.smart.core.dataentry-7.5.7.jar index 23f2fa7..8262a45 100644 Binary files a/app/webapps/ROOT/WEB-INF/lib/org.wcs.smart.core.dataentry-7.5.3.jar and b/app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/org.wcs.smart.core.dataentry-7.5.7.jar differ diff --git a/app/webapps/ROOT/WEB-INF/lib/org.wcs.smart.core.entity-7.5.3.jar b/app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/org.wcs.smart.core.entity-7.5.7.jar similarity index 80% rename from app/webapps/ROOT/WEB-INF/lib/org.wcs.smart.core.entity-7.5.3.jar rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/org.wcs.smart.core.entity-7.5.7.jar index a310498..040addb 100644 Binary files a/app/webapps/ROOT/WEB-INF/lib/org.wcs.smart.core.entity-7.5.3.jar and b/app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/org.wcs.smart.core.entity-7.5.7.jar differ diff --git a/app/webapps/ROOT/WEB-INF/lib/org.wcs.smart.core.entity.query-7.5.3.jar b/app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/org.wcs.smart.core.entity.query-7.5.7.jar similarity index 84% rename from app/webapps/ROOT/WEB-INF/lib/org.wcs.smart.core.entity.query-7.5.3.jar rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/org.wcs.smart.core.entity.query-7.5.7.jar index 816dfb2..c7fe6b5 100644 Binary files a/app/webapps/ROOT/WEB-INF/lib/org.wcs.smart.core.entity.query-7.5.3.jar and b/app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/org.wcs.smart.core.entity.query-7.5.7.jar differ diff --git a/app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/org.wcs.smart.core.entity.query.report-7.5.7.jar b/app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/org.wcs.smart.core.entity.query.report-7.5.7.jar new file mode 100644 index 0000000..08eb2bb Binary files /dev/null and b/app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/org.wcs.smart.core.entity.query.report-7.5.7.jar differ diff --git a/app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/org.wcs.smart.core.er-7.5.8.jar b/app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/org.wcs.smart.core.er-7.5.8.jar new file mode 100644 index 0000000..14bfa6c Binary files /dev/null and b/app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/org.wcs.smart.core.er-7.5.8.jar differ diff --git a/app/webapps/ROOT/WEB-INF/lib/org.wcs.smart.core.er.query-7.5.3.jar b/app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/org.wcs.smart.core.er.query-7.5.7.jar similarity index 80% rename from app/webapps/ROOT/WEB-INF/lib/org.wcs.smart.core.er.query-7.5.3.jar rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/org.wcs.smart.core.er.query-7.5.7.jar index dc7a422..5491389 100644 Binary files a/app/webapps/ROOT/WEB-INF/lib/org.wcs.smart.core.er.query-7.5.3.jar and b/app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/org.wcs.smart.core.er.query-7.5.7.jar differ diff --git a/app/webapps/ROOT/WEB-INF/lib/org.wcs.smart.core.er.query.report-7.5.3.jar b/app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/org.wcs.smart.core.er.query.report-7.5.7.jar similarity index 74% rename from app/webapps/ROOT/WEB-INF/lib/org.wcs.smart.core.er.query.report-7.5.3.jar rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/org.wcs.smart.core.er.query.report-7.5.7.jar index d1588ab..9f007f6 100644 Binary files a/app/webapps/ROOT/WEB-INF/lib/org.wcs.smart.core.er.query.report-7.5.3.jar and b/app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/org.wcs.smart.core.er.query.report-7.5.7.jar differ diff --git a/app/webapps/ROOT/WEB-INF/lib/org.wcs.smart.core.event-7.5.3.jar b/app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/org.wcs.smart.core.event-7.5.7.jar similarity index 87% rename from app/webapps/ROOT/WEB-INF/lib/org.wcs.smart.core.event-7.5.3.jar rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/org.wcs.smart.core.event-7.5.7.jar index 70a140c..cc6219f 100644 Binary files a/app/webapps/ROOT/WEB-INF/lib/org.wcs.smart.core.event-7.5.3.jar and b/app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/org.wcs.smart.core.event-7.5.7.jar differ diff --git a/app/webapps/ROOT/WEB-INF/lib/org.wcs.smart.core.hibernate-7.5.3.jar b/app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/org.wcs.smart.core.hibernate-7.5.7.jar similarity index 56% rename from app/webapps/ROOT/WEB-INF/lib/org.wcs.smart.core.hibernate-7.5.3.jar rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/org.wcs.smart.core.hibernate-7.5.7.jar index df2db81..768d875 100644 Binary files a/app/webapps/ROOT/WEB-INF/lib/org.wcs.smart.core.hibernate-7.5.3.jar and b/app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/org.wcs.smart.core.hibernate-7.5.7.jar differ diff --git a/app/webapps/ROOT/WEB-INF/lib/org.wcs.smart.core.i2-7.5.3.jar b/app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/org.wcs.smart.core.i2-7.5.7.jar similarity index 89% rename from app/webapps/ROOT/WEB-INF/lib/org.wcs.smart.core.i2-7.5.3.jar rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/org.wcs.smart.core.i2-7.5.7.jar index f25507b..c706e5f 100644 Binary files a/app/webapps/ROOT/WEB-INF/lib/org.wcs.smart.core.i2-7.5.3.jar and b/app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/org.wcs.smart.core.i2-7.5.7.jar differ diff --git a/app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/org.wcs.smart.core.i2.patrol-7.5.7.jar b/app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/org.wcs.smart.core.i2.patrol-7.5.7.jar new file mode 100644 index 0000000..f319973 Binary files /dev/null and b/app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/org.wcs.smart.core.i2.patrol-7.5.7.jar differ diff --git a/app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/org.wcs.smart.core.incident-7.5.7.jar b/app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/org.wcs.smart.core.incident-7.5.7.jar new file mode 100644 index 0000000..2978a6f Binary files /dev/null and b/app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/org.wcs.smart.core.incident-7.5.7.jar differ diff --git a/app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/org.wcs.smart.core.observation-7.5.7.jar b/app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/org.wcs.smart.core.observation-7.5.7.jar new file mode 100644 index 0000000..9cc7815 Binary files /dev/null and b/app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/org.wcs.smart.core.observation-7.5.7.jar differ diff --git a/app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/org.wcs.smart.core.observation.query-7.5.7.jar b/app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/org.wcs.smart.core.observation.query-7.5.7.jar new file mode 100644 index 0000000..5b0114a Binary files /dev/null and b/app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/org.wcs.smart.core.observation.query-7.5.7.jar differ diff --git a/app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/org.wcs.smart.core.observation.query.report-7.5.7.jar b/app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/org.wcs.smart.core.observation.query.report-7.5.7.jar new file mode 100644 index 0000000..a96f045 Binary files /dev/null and b/app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/org.wcs.smart.core.observation.query.report-7.5.7.jar differ diff --git a/app/webapps/ROOT/WEB-INF/lib/org.wcs.smart.core.patrol-7.5.3.jar b/app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/org.wcs.smart.core.patrol-7.5.7.jar similarity index 50% rename from app/webapps/ROOT/WEB-INF/lib/org.wcs.smart.core.patrol-7.5.3.jar rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/org.wcs.smart.core.patrol-7.5.7.jar index a80e4bc..7c36290 100644 Binary files a/app/webapps/ROOT/WEB-INF/lib/org.wcs.smart.core.patrol-7.5.3.jar and b/app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/org.wcs.smart.core.patrol-7.5.7.jar differ diff --git a/app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/org.wcs.smart.core.patrol.query-7.5.7.jar b/app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/org.wcs.smart.core.patrol.query-7.5.7.jar new file mode 100644 index 0000000..4003029 Binary files /dev/null and b/app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/org.wcs.smart.core.patrol.query-7.5.7.jar differ diff --git a/app/webapps/ROOT/WEB-INF/lib/org.wcs.smart.core.patrol.query.report-7.5.3.jar b/app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/org.wcs.smart.core.patrol.query.report-7.5.7.jar similarity index 58% rename from app/webapps/ROOT/WEB-INF/lib/org.wcs.smart.core.patrol.query.report-7.5.3.jar rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/org.wcs.smart.core.patrol.query.report-7.5.7.jar index fc16499..547d5e2 100644 Binary files a/app/webapps/ROOT/WEB-INF/lib/org.wcs.smart.core.patrol.query.report-7.5.3.jar and b/app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/org.wcs.smart.core.patrol.query.report-7.5.7.jar differ diff --git a/app/webapps/ROOT/WEB-INF/lib/org.wcs.smart.core.paws-7.5.3.jar b/app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/org.wcs.smart.core.paws-7.5.7.jar similarity index 83% rename from app/webapps/ROOT/WEB-INF/lib/org.wcs.smart.core.paws-7.5.3.jar rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/org.wcs.smart.core.paws-7.5.7.jar index b479f7f..b9349d7 100644 Binary files a/app/webapps/ROOT/WEB-INF/lib/org.wcs.smart.core.paws-7.5.3.jar and b/app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/org.wcs.smart.core.paws-7.5.7.jar differ diff --git a/app/webapps/ROOT/WEB-INF/lib/org.wcs.smart.core.plan-7.5.3.jar b/app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/org.wcs.smart.core.plan-7.5.7.jar similarity index 71% rename from app/webapps/ROOT/WEB-INF/lib/org.wcs.smart.core.plan-7.5.3.jar rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/org.wcs.smart.core.plan-7.5.7.jar index 11d1b2f..1227800 100644 Binary files a/app/webapps/ROOT/WEB-INF/lib/org.wcs.smart.core.plan-7.5.3.jar and b/app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/org.wcs.smart.core.plan-7.5.7.jar differ diff --git a/app/webapps/ROOT/WEB-INF/lib/org.wcs.smart.core.qa-7.5.3.jar b/app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/org.wcs.smart.core.qa-7.5.7.jar similarity index 67% rename from app/webapps/ROOT/WEB-INF/lib/org.wcs.smart.core.qa-7.5.3.jar rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/org.wcs.smart.core.qa-7.5.7.jar index 0651af1..2527618 100644 Binary files a/app/webapps/ROOT/WEB-INF/lib/org.wcs.smart.core.qa-7.5.3.jar and b/app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/org.wcs.smart.core.qa-7.5.7.jar differ diff --git a/app/webapps/ROOT/WEB-INF/lib/org.wcs.smart.core.qa.er-7.5.3.jar b/app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/org.wcs.smart.core.qa.er-7.5.7.jar similarity index 61% rename from app/webapps/ROOT/WEB-INF/lib/org.wcs.smart.core.qa.er-7.5.3.jar rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/org.wcs.smart.core.qa.er-7.5.7.jar index d22eba3..0e6ee4b 100644 Binary files a/app/webapps/ROOT/WEB-INF/lib/org.wcs.smart.core.qa.er-7.5.3.jar and b/app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/org.wcs.smart.core.qa.er-7.5.7.jar differ diff --git a/app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/org.wcs.smart.core.qa.incident-7.5.7.jar b/app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/org.wcs.smart.core.qa.incident-7.5.7.jar new file mode 100644 index 0000000..a4248ec Binary files /dev/null and b/app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/org.wcs.smart.core.qa.incident-7.5.7.jar differ diff --git a/app/webapps/ROOT/WEB-INF/lib/org.wcs.smart.core.qa.patrol-7.5.3.jar b/app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/org.wcs.smart.core.qa.patrol-7.5.7.jar similarity index 73% rename from app/webapps/ROOT/WEB-INF/lib/org.wcs.smart.core.qa.patrol-7.5.3.jar rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/org.wcs.smart.core.qa.patrol-7.5.7.jar index e9bf2d5..b1f356d 100644 Binary files a/app/webapps/ROOT/WEB-INF/lib/org.wcs.smart.core.qa.patrol-7.5.3.jar and b/app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/org.wcs.smart.core.qa.patrol-7.5.7.jar differ diff --git a/app/webapps/ROOT/WEB-INF/lib/org.wcs.smart.core.query-7.5.3.jar b/app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/org.wcs.smart.core.query-7.5.7.jar similarity index 81% rename from app/webapps/ROOT/WEB-INF/lib/org.wcs.smart.core.query-7.5.3.jar rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/org.wcs.smart.core.query-7.5.7.jar index 71d54c4..f414200 100644 Binary files a/app/webapps/ROOT/WEB-INF/lib/org.wcs.smart.core.query-7.5.3.jar and b/app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/org.wcs.smart.core.query-7.5.7.jar differ diff --git a/app/webapps/ROOT/WEB-INF/lib/org.wcs.smart.core.r-7.5.3.jar b/app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/org.wcs.smart.core.r-7.5.7.jar similarity index 51% rename from app/webapps/ROOT/WEB-INF/lib/org.wcs.smart.core.r-7.5.3.jar rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/org.wcs.smart.core.r-7.5.7.jar index 1fd272d..be893e4 100644 Binary files a/app/webapps/ROOT/WEB-INF/lib/org.wcs.smart.core.r-7.5.3.jar and b/app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/org.wcs.smart.core.r-7.5.7.jar differ diff --git a/app/webapps/ROOT/WEB-INF/lib/org.wcs.smart.core.report-7.5.3.jar b/app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/org.wcs.smart.core.report-7.5.7.jar similarity index 75% rename from app/webapps/ROOT/WEB-INF/lib/org.wcs.smart.core.report-7.5.3.jar rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/org.wcs.smart.core.report-7.5.7.jar index e4ed532..7ad5d94 100644 Binary files a/app/webapps/ROOT/WEB-INF/lib/org.wcs.smart.core.report-7.5.3.jar and b/app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/org.wcs.smart.core.report-7.5.7.jar differ diff --git a/app/webapps/ROOT/WEB-INF/lib/org.wcs.smart.core.report.birt.query-7.5.3.jar b/app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/org.wcs.smart.core.report.birt.query-7.5.7.jar similarity index 84% rename from app/webapps/ROOT/WEB-INF/lib/org.wcs.smart.core.report.birt.query-7.5.3.jar rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/org.wcs.smart.core.report.birt.query-7.5.7.jar index a2f316b..1168246 100644 Binary files a/app/webapps/ROOT/WEB-INF/lib/org.wcs.smart.core.report.birt.query-7.5.3.jar and b/app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/org.wcs.smart.core.report.birt.query-7.5.7.jar differ diff --git a/app/webapps/ROOT/WEB-INF/lib/org.wcs.smart.core.reporttable-7.5.3.jar b/app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/org.wcs.smart.core.reporttable-7.5.7.jar similarity index 81% rename from app/webapps/ROOT/WEB-INF/lib/org.wcs.smart.core.reporttable-7.5.3.jar rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/org.wcs.smart.core.reporttable-7.5.7.jar index 5d6bee9..314867f 100644 Binary files a/app/webapps/ROOT/WEB-INF/lib/org.wcs.smart.core.reporttable-7.5.3.jar and b/app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/org.wcs.smart.core.reporttable-7.5.7.jar differ diff --git a/app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/org.wcs.smart.core.smartcollect-7.5.7.jar b/app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/org.wcs.smart.core.smartcollect-7.5.7.jar new file mode 100644 index 0000000..6445661 Binary files /dev/null and b/app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/org.wcs.smart.core.smartcollect-7.5.7.jar differ diff --git a/app/webapps/ROOT/WEB-INF/lib/osgi.annotation-8.0.1.jar b/app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/osgi.annotation-8.0.1.jar similarity index 100% rename from app/webapps/ROOT/WEB-INF/lib/osgi.annotation-8.0.1.jar rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/osgi.annotation-8.0.1.jar diff --git a/app/webapps/ROOT/WEB-INF/lib/pdfa-7.1.14.jar b/app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/pdfa-7.1.14.jar similarity index 100% rename from app/webapps/ROOT/WEB-INF/lib/pdfa-7.1.14.jar rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/pdfa-7.1.14.jar diff --git a/app/webapps/ROOT/WEB-INF/lib/picocontainer-1.2.jar b/app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/picocontainer-1.2.jar similarity index 100% rename from app/webapps/ROOT/WEB-INF/lib/picocontainer-1.2.jar rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/picocontainer-1.2.jar diff --git a/app/webapps/ROOT/WEB-INF/lib/reactive-streams-1.0.3.jar b/app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/reactive-streams-1.0.3.jar similarity index 100% rename from app/webapps/ROOT/WEB-INF/lib/reactive-streams-1.0.3.jar rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/reactive-streams-1.0.3.jar diff --git a/app/webapps/ROOT/WEB-INF/lib/resteasy-client-4.5.8.Final.jar b/app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/resteasy-client-4.5.8.Final.jar similarity index 100% rename from app/webapps/ROOT/WEB-INF/lib/resteasy-client-4.5.8.Final.jar rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/resteasy-client-4.5.8.Final.jar diff --git a/app/webapps/ROOT/WEB-INF/lib/resteasy-client-api-4.5.8.Final.jar b/app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/resteasy-client-api-4.5.8.Final.jar similarity index 100% rename from app/webapps/ROOT/WEB-INF/lib/resteasy-client-api-4.5.8.Final.jar rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/resteasy-client-api-4.5.8.Final.jar diff --git a/app/webapps/ROOT/WEB-INF/lib/resteasy-core-4.5.8.Final.jar b/app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/resteasy-core-4.5.8.Final.jar similarity index 100% rename from app/webapps/ROOT/WEB-INF/lib/resteasy-core-4.5.8.Final.jar rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/resteasy-core-4.5.8.Final.jar diff --git a/app/webapps/ROOT/WEB-INF/lib/resteasy-core-spi-4.5.8.Final.jar b/app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/resteasy-core-spi-4.5.8.Final.jar similarity index 100% rename from app/webapps/ROOT/WEB-INF/lib/resteasy-core-spi-4.5.8.Final.jar rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/resteasy-core-spi-4.5.8.Final.jar diff --git a/app/webapps/ROOT/WEB-INF/lib/resteasy-jackson2-provider-4.5.8.Final.jar b/app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/resteasy-jackson2-provider-4.5.8.Final.jar similarity index 100% rename from app/webapps/ROOT/WEB-INF/lib/resteasy-jackson2-provider-4.5.8.Final.jar rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/resteasy-jackson2-provider-4.5.8.Final.jar diff --git a/app/webapps/ROOT/WEB-INF/lib/resteasy-jaxb-provider-4.5.8.Final.jar b/app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/resteasy-jaxb-provider-4.5.8.Final.jar similarity index 100% rename from app/webapps/ROOT/WEB-INF/lib/resteasy-jaxb-provider-4.5.8.Final.jar rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/resteasy-jaxb-provider-4.5.8.Final.jar diff --git a/app/webapps/ROOT/WEB-INF/lib/resteasy-multipart-provider-4.5.8.Final.jar b/app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/resteasy-multipart-provider-4.5.8.Final.jar similarity index 100% rename from app/webapps/ROOT/WEB-INF/lib/resteasy-multipart-provider-4.5.8.Final.jar rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/resteasy-multipart-provider-4.5.8.Final.jar diff --git a/app/webapps/ROOT/WEB-INF/lib/resteasy-servlet-initializer-4.5.8.Final.jar b/app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/resteasy-servlet-initializer-4.5.8.Final.jar similarity index 100% rename from app/webapps/ROOT/WEB-INF/lib/resteasy-servlet-initializer-4.5.8.Final.jar rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/resteasy-servlet-initializer-4.5.8.Final.jar diff --git a/app/webapps/ROOT/WEB-INF/lib/rhino-1.7.13.jar b/app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/rhino-1.7.13.jar similarity index 100% rename from app/webapps/ROOT/WEB-INF/lib/rhino-1.7.13.jar rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/rhino-1.7.13.jar diff --git a/app/webapps/ROOT/WEB-INF/lib/serializer-2.7.2.jar b/app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/serializer-2.7.2.jar similarity index 100% rename from app/webapps/ROOT/WEB-INF/lib/serializer-2.7.2.jar rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/serializer-2.7.2.jar diff --git a/app/webapps/ROOT/WEB-INF/lib/si-quantity-0.7.1.jar b/app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/si-quantity-0.7.1.jar similarity index 100% rename from app/webapps/ROOT/WEB-INF/lib/si-quantity-0.7.1.jar rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/si-quantity-0.7.1.jar diff --git a/app/webapps/ROOT/WEB-INF/lib/si-units-java8-0.7.1.jar b/app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/si-units-java8-0.7.1.jar similarity index 100% rename from app/webapps/ROOT/WEB-INF/lib/si-units-java8-0.7.1.jar rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/si-units-java8-0.7.1.jar diff --git a/app/webapps/ROOT/WEB-INF/lib/sign-7.1.14.jar b/app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/sign-7.1.14.jar similarity index 100% rename from app/webapps/ROOT/WEB-INF/lib/sign-7.1.14.jar rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/sign-7.1.14.jar diff --git a/app/webapps/ROOT/WEB-INF/lib/slf4j-api-1.7.25.jar b/app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/slf4j-api-1.7.25.jar similarity index 100% rename from app/webapps/ROOT/WEB-INF/lib/slf4j-api-1.7.25.jar rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/slf4j-api-1.7.25.jar diff --git a/app/webapps/ROOT/WEB-INF/lib/smallrye-config-1.6.1.jar b/app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/smallrye-config-1.6.1.jar similarity index 100% rename from app/webapps/ROOT/WEB-INF/lib/smallrye-config-1.6.1.jar rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/smallrye-config-1.6.1.jar diff --git a/app/webapps/ROOT/WEB-INF/lib/smallrye-config-common-1.6.1.jar b/app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/smallrye-config-common-1.6.1.jar similarity index 100% rename from app/webapps/ROOT/WEB-INF/lib/smallrye-config-common-1.6.1.jar rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/smallrye-config-common-1.6.1.jar diff --git a/app/webapps/ROOT/WEB-INF/lib/stax-ex-1.8.jar b/app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/stax-ex-1.8.jar similarity index 100% rename from app/webapps/ROOT/WEB-INF/lib/stax-ex-1.8.jar rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/stax-ex-1.8.jar diff --git a/app/webapps/ROOT/WEB-INF/lib/styled-xml-parser-7.1.14.jar b/app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/styled-xml-parser-7.1.14.jar similarity index 100% rename from app/webapps/ROOT/WEB-INF/lib/styled-xml-parser-7.1.14.jar rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/styled-xml-parser-7.1.14.jar diff --git a/app/webapps/ROOT/WEB-INF/lib/svg-7.1.14.jar b/app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/svg-7.1.14.jar similarity index 100% rename from app/webapps/ROOT/WEB-INF/lib/svg-7.1.14.jar rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/svg-7.1.14.jar diff --git a/app/webapps/ROOT/WEB-INF/lib/swagger-annotations-2.0.8.jar b/app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/swagger-annotations-2.0.8.jar similarity index 100% rename from app/webapps/ROOT/WEB-INF/lib/swagger-annotations-2.0.8.jar rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/swagger-annotations-2.0.8.jar diff --git a/app/webapps/ROOT/WEB-INF/lib/swt-win32-2.1.0.jar b/app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/swt-win32-2.1.0.jar similarity index 100% rename from app/webapps/ROOT/WEB-INF/lib/swt-win32-2.1.0.jar rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/swt-win32-2.1.0.jar diff --git a/app/webapps/ROOT/WEB-INF/lib/systems-common-java8-0.7.2.jar b/app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/systems-common-java8-0.7.2.jar similarity index 100% rename from app/webapps/ROOT/WEB-INF/lib/systems-common-java8-0.7.2.jar rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/systems-common-java8-0.7.2.jar diff --git a/app/webapps/ROOT/WEB-INF/lib/txw2-2.3.1.jar b/app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/txw2-2.3.1.jar similarity index 100% rename from app/webapps/ROOT/WEB-INF/lib/txw2-2.3.1.jar rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/txw2-2.3.1.jar diff --git a/app/webapps/ROOT/WEB-INF/lib/unit-api-1.0.jar b/app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/unit-api-1.0.jar similarity index 100% rename from app/webapps/ROOT/WEB-INF/lib/unit-api-1.0.jar rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/unit-api-1.0.jar diff --git a/app/webapps/ROOT/WEB-INF/lib/uom-lib-common-1.0.2.jar b/app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/uom-lib-common-1.0.2.jar similarity index 100% rename from app/webapps/ROOT/WEB-INF/lib/uom-lib-common-1.0.2.jar rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/uom-lib-common-1.0.2.jar diff --git a/app/webapps/ROOT/WEB-INF/lib/uom-se-1.0.8.jar b/app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/uom-se-1.0.8.jar similarity index 100% rename from app/webapps/ROOT/WEB-INF/lib/uom-se-1.0.8.jar rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/uom-se-1.0.8.jar diff --git a/app/webapps/ROOT/WEB-INF/lib/xalan-2.7.2.jar b/app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/xalan-2.7.2.jar similarity index 100% rename from app/webapps/ROOT/WEB-INF/lib/xalan-2.7.2.jar rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/xalan-2.7.2.jar diff --git a/app/webapps/ROOT/WEB-INF/lib/xml-apis-1.3.04.jar b/app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/xml-apis-1.3.04.jar similarity index 100% rename from app/webapps/ROOT/WEB-INF/lib/xml-apis-1.3.04.jar rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/xml-apis-1.3.04.jar diff --git a/app/webapps/ROOT/WEB-INF/lib/xml-apis-ext-1.3.04.jar b/app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/xml-apis-ext-1.3.04.jar similarity index 100% rename from app/webapps/ROOT/WEB-INF/lib/xml-apis-ext-1.3.04.jar rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/xml-apis-ext-1.3.04.jar diff --git a/app/webapps/ROOT/WEB-INF/lib/xml-commons-resolver-1.2.jar b/app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/xml-commons-resolver-1.2.jar similarity index 100% rename from app/webapps/ROOT/WEB-INF/lib/xml-commons-resolver-1.2.jar rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/xml-commons-resolver-1.2.jar diff --git a/app/webapps/ROOT/WEB-INF/lib/xmlgraphics-commons-2.2.jar b/app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/xmlgraphics-commons-2.2.jar similarity index 100% rename from app/webapps/ROOT/WEB-INF/lib/xmlgraphics-commons-2.2.jar rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/xmlgraphics-commons-2.2.jar diff --git a/app/webapps/ROOT/WEB-INF/lib/xmpcore-5.1.3.jar b/app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/xmpcore-5.1.3.jar similarity index 100% rename from app/webapps/ROOT/WEB-INF/lib/xmpcore-5.1.3.jar rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/lib/xmpcore-5.1.3.jar diff --git a/app/webapps/ROOT/WEB-INF/login.jsp b/app/opt/tomcat9/webapps/ROOT/WEB-INF/login.jsp similarity index 100% rename from app/webapps/ROOT/WEB-INF/login.jsp rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/login.jsp diff --git a/app/webapps/ROOT/WEB-INF/menu.jsp b/app/opt/tomcat9/webapps/ROOT/WEB-INF/menu.jsp similarity index 100% rename from app/webapps/ROOT/WEB-INF/menu.jsp rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/menu.jsp diff --git a/app/webapps/ROOT/WEB-INF/myaccount.jsp b/app/opt/tomcat9/webapps/ROOT/WEB-INF/myaccount.jsp similarity index 100% rename from app/webapps/ROOT/WEB-INF/myaccount.jsp rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/myaccount.jsp diff --git a/app/webapps/ROOT/WEB-INF/query.jsp b/app/opt/tomcat9/webapps/ROOT/WEB-INF/query.jsp similarity index 100% rename from app/webapps/ROOT/WEB-INF/query.jsp rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/query.jsp diff --git a/app/webapps/ROOT/WEB-INF/report.jsp b/app/opt/tomcat9/webapps/ROOT/WEB-INF/report.jsp similarity index 100% rename from app/webapps/ROOT/WEB-INF/report.jsp rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/report.jsp diff --git a/app/webapps/ROOT/WEB-INF/resetpassword.jsp b/app/opt/tomcat9/webapps/ROOT/WEB-INF/resetpassword.jsp similarity index 100% rename from app/webapps/ROOT/WEB-INF/resetpassword.jsp rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/resetpassword.jsp diff --git a/app/webapps/ROOT/WEB-INF/settings.jsp b/app/opt/tomcat9/webapps/ROOT/WEB-INF/settings.jsp similarity index 100% rename from app/webapps/ROOT/WEB-INF/settings.jsp rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/settings.jsp diff --git a/app/webapps/ROOT/WEB-INF/setup.jsp b/app/opt/tomcat9/webapps/ROOT/WEB-INF/setup.jsp similarity index 100% rename from app/webapps/ROOT/WEB-INF/setup.jsp rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/setup.jsp diff --git a/app/webapps/ROOT/WEB-INF/sharedlinks.jsp b/app/opt/tomcat9/webapps/ROOT/WEB-INF/sharedlinks.jsp similarity index 100% rename from app/webapps/ROOT/WEB-INF/sharedlinks.jsp rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/sharedlinks.jsp diff --git a/app/webapps/ROOT/WEB-INF/upgrade.jsp b/app/opt/tomcat9/webapps/ROOT/WEB-INF/upgrade.jsp similarity index 100% rename from app/webapps/ROOT/WEB-INF/upgrade.jsp rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/upgrade.jsp diff --git a/app/webapps/ROOT/WEB-INF/users.jsp b/app/opt/tomcat9/webapps/ROOT/WEB-INF/users.jsp similarity index 100% rename from app/webapps/ROOT/WEB-INF/users.jsp rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/users.jsp diff --git a/app/webapps/ROOT/WEB-INF/web.xml b/app/opt/tomcat9/webapps/ROOT/WEB-INF/web.xml similarity index 100% rename from app/webapps/ROOT/WEB-INF/web.xml rename to app/opt/tomcat9/webapps/ROOT/WEB-INF/web.xml diff --git a/app/webapps/ROOT/css/images/alert.png b/app/opt/tomcat9/webapps/ROOT/css/images/alert.png similarity index 100% rename from app/webapps/ROOT/css/images/alert.png rename to app/opt/tomcat9/webapps/ROOT/css/images/alert.png diff --git a/app/webapps/ROOT/css/images/blacklist_user.png b/app/opt/tomcat9/webapps/ROOT/css/images/blacklist_user.png similarity index 100% rename from app/webapps/ROOT/css/images/blacklist_user.png rename to app/opt/tomcat9/webapps/ROOT/css/images/blacklist_user.png diff --git a/app/webapps/ROOT/css/images/calist.png b/app/opt/tomcat9/webapps/ROOT/css/images/calist.png similarity index 100% rename from app/webapps/ROOT/css/images/calist.png rename to app/opt/tomcat9/webapps/ROOT/css/images/calist.png diff --git a/app/webapps/ROOT/css/images/cybertracker.png b/app/opt/tomcat9/webapps/ROOT/css/images/cybertracker.png similarity index 100% rename from app/webapps/ROOT/css/images/cybertracker.png rename to app/opt/tomcat9/webapps/ROOT/css/images/cybertracker.png diff --git a/app/webapps/ROOT/css/images/dashboard.png b/app/opt/tomcat9/webapps/ROOT/css/images/dashboard.png similarity index 100% rename from app/webapps/ROOT/css/images/dashboard.png rename to app/opt/tomcat9/webapps/ROOT/css/images/dashboard.png diff --git a/app/webapps/ROOT/css/images/dataq.png b/app/opt/tomcat9/webapps/ROOT/css/images/dataq.png similarity index 100% rename from app/webapps/ROOT/css/images/dataq.png rename to app/opt/tomcat9/webapps/ROOT/css/images/dataq.png diff --git a/app/webapps/ROOT/css/images/delete.png b/app/opt/tomcat9/webapps/ROOT/css/images/delete.png similarity index 100% rename from app/webapps/ROOT/css/images/delete.png rename to app/opt/tomcat9/webapps/ROOT/css/images/delete.png diff --git a/app/webapps/ROOT/css/images/downarrow.png b/app/opt/tomcat9/webapps/ROOT/css/images/downarrow.png similarity index 100% rename from app/webapps/ROOT/css/images/downarrow.png rename to app/opt/tomcat9/webapps/ROOT/css/images/downarrow.png diff --git a/app/webapps/ROOT/css/images/download.png b/app/opt/tomcat9/webapps/ROOT/css/images/download.png similarity index 100% rename from app/webapps/ROOT/css/images/download.png rename to app/opt/tomcat9/webapps/ROOT/css/images/download.png diff --git a/app/webapps/ROOT/css/images/edit.png b/app/opt/tomcat9/webapps/ROOT/css/images/edit.png similarity index 100% rename from app/webapps/ROOT/css/images/edit.png rename to app/opt/tomcat9/webapps/ROOT/css/images/edit.png diff --git a/app/webapps/ROOT/css/images/emptyimage.png b/app/opt/tomcat9/webapps/ROOT/css/images/emptyimage.png similarity index 100% rename from app/webapps/ROOT/css/images/emptyimage.png rename to app/opt/tomcat9/webapps/ROOT/css/images/emptyimage.png diff --git a/app/webapps/ROOT/css/images/hamburger.png b/app/opt/tomcat9/webapps/ROOT/css/images/hamburger.png similarity index 100% rename from app/webapps/ROOT/css/images/hamburger.png rename to app/opt/tomcat9/webapps/ROOT/css/images/hamburger.png diff --git a/app/webapps/ROOT/css/images/hourglass.png b/app/opt/tomcat9/webapps/ROOT/css/images/hourglass.png similarity index 100% rename from app/webapps/ROOT/css/images/hourglass.png rename to app/opt/tomcat9/webapps/ROOT/css/images/hourglass.png diff --git a/app/webapps/ROOT/css/images/house.png b/app/opt/tomcat9/webapps/ROOT/css/images/house.png similarity index 100% rename from app/webapps/ROOT/css/images/house.png rename to app/opt/tomcat9/webapps/ROOT/css/images/house.png diff --git a/app/webapps/ROOT/css/images/iconsfilter.png b/app/opt/tomcat9/webapps/ROOT/css/images/iconsfilter.png similarity index 100% rename from app/webapps/ROOT/css/images/iconsfilter.png rename to app/opt/tomcat9/webapps/ROOT/css/images/iconsfilter.png diff --git a/app/webapps/ROOT/css/images/information.png b/app/opt/tomcat9/webapps/ROOT/css/images/information.png similarity index 100% rename from app/webapps/ROOT/css/images/information.png rename to app/opt/tomcat9/webapps/ROOT/css/images/information.png diff --git a/app/webapps/ROOT/css/images/loading.svg b/app/opt/tomcat9/webapps/ROOT/css/images/loading.svg similarity index 100% rename from app/webapps/ROOT/css/images/loading.svg rename to app/opt/tomcat9/webapps/ROOT/css/images/loading.svg diff --git a/app/webapps/ROOT/css/images/myaccount.png b/app/opt/tomcat9/webapps/ROOT/css/images/myaccount.png similarity index 100% rename from app/webapps/ROOT/css/images/myaccount.png rename to app/opt/tomcat9/webapps/ROOT/css/images/myaccount.png diff --git a/app/webapps/ROOT/css/images/query.png b/app/opt/tomcat9/webapps/ROOT/css/images/query.png similarity index 100% rename from app/webapps/ROOT/css/images/query.png rename to app/opt/tomcat9/webapps/ROOT/css/images/query.png diff --git a/app/webapps/ROOT/css/images/query_icons/assetdeploymentsummary.png b/app/opt/tomcat9/webapps/ROOT/css/images/query_icons/assetdeploymentsummary.png similarity index 100% rename from app/webapps/ROOT/css/images/query_icons/assetdeploymentsummary.png rename to app/opt/tomcat9/webapps/ROOT/css/images/query_icons/assetdeploymentsummary.png diff --git a/app/webapps/ROOT/css/images/query_icons/assetobservation.png b/app/opt/tomcat9/webapps/ROOT/css/images/query_icons/assetobservation.png similarity index 100% rename from app/webapps/ROOT/css/images/query_icons/assetobservation.png rename to app/opt/tomcat9/webapps/ROOT/css/images/query_icons/assetobservation.png diff --git a/app/webapps/ROOT/css/images/query_icons/assetsummary.png b/app/opt/tomcat9/webapps/ROOT/css/images/query_icons/assetsummary.png similarity index 100% rename from app/webapps/ROOT/css/images/query_icons/assetsummary.png rename to app/opt/tomcat9/webapps/ROOT/css/images/query_icons/assetsummary.png diff --git a/app/webapps/ROOT/css/images/query_icons/assetwaypoint.png b/app/opt/tomcat9/webapps/ROOT/css/images/query_icons/assetwaypoint.png similarity index 100% rename from app/webapps/ROOT/css/images/query_icons/assetwaypoint.png rename to app/opt/tomcat9/webapps/ROOT/css/images/query_icons/assetwaypoint.png diff --git a/app/webapps/ROOT/css/images/query_icons/compound.png b/app/opt/tomcat9/webapps/ROOT/css/images/query_icons/compound.png similarity index 100% rename from app/webapps/ROOT/css/images/query_icons/compound.png rename to app/opt/tomcat9/webapps/ROOT/css/images/query_icons/compound.png diff --git a/app/webapps/ROOT/css/images/query_icons/entitygrid.png b/app/opt/tomcat9/webapps/ROOT/css/images/query_icons/entitygrid.png similarity index 100% rename from app/webapps/ROOT/css/images/query_icons/entitygrid.png rename to app/opt/tomcat9/webapps/ROOT/css/images/query_icons/entitygrid.png diff --git a/app/webapps/ROOT/css/images/query_icons/entityobservation.png b/app/opt/tomcat9/webapps/ROOT/css/images/query_icons/entityobservation.png similarity index 100% rename from app/webapps/ROOT/css/images/query_icons/entityobservation.png rename to app/opt/tomcat9/webapps/ROOT/css/images/query_icons/entityobservation.png diff --git a/app/webapps/ROOT/css/images/query_icons/entitysummary.png b/app/opt/tomcat9/webapps/ROOT/css/images/query_icons/entitysummary.png similarity index 100% rename from app/webapps/ROOT/css/images/query_icons/entitysummary.png rename to app/opt/tomcat9/webapps/ROOT/css/images/query_icons/entitysummary.png diff --git a/app/webapps/ROOT/css/images/query_icons/entitywaypoint.png b/app/opt/tomcat9/webapps/ROOT/css/images/query_icons/entitywaypoint.png similarity index 100% rename from app/webapps/ROOT/css/images/query_icons/entitywaypoint.png rename to app/opt/tomcat9/webapps/ROOT/css/images/query_icons/entitywaypoint.png diff --git a/app/webapps/ROOT/css/images/query_icons/i2_entity_record_query.png b/app/opt/tomcat9/webapps/ROOT/css/images/query_icons/i2_entity_record_query.png similarity index 100% rename from app/webapps/ROOT/css/images/query_icons/i2_entity_record_query.png rename to app/opt/tomcat9/webapps/ROOT/css/images/query_icons/i2_entity_record_query.png diff --git a/app/webapps/ROOT/css/images/query_icons/i2_entity_summ_query.png b/app/opt/tomcat9/webapps/ROOT/css/images/query_icons/i2_entity_summ_query.png similarity index 100% rename from app/webapps/ROOT/css/images/query_icons/i2_entity_summ_query.png rename to app/opt/tomcat9/webapps/ROOT/css/images/query_icons/i2_entity_summ_query.png diff --git a/app/webapps/ROOT/css/images/query_icons/i2_obs_query.png b/app/opt/tomcat9/webapps/ROOT/css/images/query_icons/i2_obs_query.png similarity index 100% rename from app/webapps/ROOT/css/images/query_icons/i2_obs_query.png rename to app/opt/tomcat9/webapps/ROOT/css/images/query_icons/i2_obs_query.png diff --git a/app/webapps/ROOT/css/images/query_icons/i2_record_query.png b/app/opt/tomcat9/webapps/ROOT/css/images/query_icons/i2_record_query.png similarity index 100% rename from app/webapps/ROOT/css/images/query_icons/i2_record_query.png rename to app/opt/tomcat9/webapps/ROOT/css/images/query_icons/i2_record_query.png diff --git a/app/webapps/ROOT/css/images/query_icons/i2_record_summ_query.png b/app/opt/tomcat9/webapps/ROOT/css/images/query_icons/i2_record_summ_query.png similarity index 100% rename from app/webapps/ROOT/css/images/query_icons/i2_record_summ_query.png rename to app/opt/tomcat9/webapps/ROOT/css/images/query_icons/i2_record_summ_query.png diff --git a/app/webapps/ROOT/css/images/query_icons/intelligence.png b/app/opt/tomcat9/webapps/ROOT/css/images/query_icons/intelligence.png similarity index 100% rename from app/webapps/ROOT/css/images/query_icons/intelligence.png rename to app/opt/tomcat9/webapps/ROOT/css/images/query_icons/intelligence.png diff --git a/app/webapps/ROOT/css/images/query_icons/intelligencerecord.png b/app/opt/tomcat9/webapps/ROOT/css/images/query_icons/intelligencerecord.png similarity index 100% rename from app/webapps/ROOT/css/images/query_icons/intelligencerecord.png rename to app/opt/tomcat9/webapps/ROOT/css/images/query_icons/intelligencerecord.png diff --git a/app/webapps/ROOT/css/images/query_icons/intelligencesummary.png b/app/opt/tomcat9/webapps/ROOT/css/images/query_icons/intelligencesummary.png similarity index 100% rename from app/webapps/ROOT/css/images/query_icons/intelligencesummary.png rename to app/opt/tomcat9/webapps/ROOT/css/images/query_icons/intelligencesummary.png diff --git a/app/webapps/ROOT/css/images/query_icons/observation_query.png b/app/opt/tomcat9/webapps/ROOT/css/images/query_icons/observation_query.png similarity index 100% rename from app/webapps/ROOT/css/images/query_icons/observation_query.png rename to app/opt/tomcat9/webapps/ROOT/css/images/query_icons/observation_query.png diff --git a/app/webapps/ROOT/css/images/query_icons/observationgrid.png b/app/opt/tomcat9/webapps/ROOT/css/images/query_icons/observationgrid.png similarity index 100% rename from app/webapps/ROOT/css/images/query_icons/observationgrid.png rename to app/opt/tomcat9/webapps/ROOT/css/images/query_icons/observationgrid.png diff --git a/app/webapps/ROOT/css/images/query_icons/observationobservation.png b/app/opt/tomcat9/webapps/ROOT/css/images/query_icons/observationobservation.png similarity index 100% rename from app/webapps/ROOT/css/images/query_icons/observationobservation.png rename to app/opt/tomcat9/webapps/ROOT/css/images/query_icons/observationobservation.png diff --git a/app/webapps/ROOT/css/images/query_icons/observationsummary.png b/app/opt/tomcat9/webapps/ROOT/css/images/query_icons/observationsummary.png similarity index 100% rename from app/webapps/ROOT/css/images/query_icons/observationsummary.png rename to app/opt/tomcat9/webapps/ROOT/css/images/query_icons/observationsummary.png diff --git a/app/webapps/ROOT/css/images/query_icons/observationwaypoint.png b/app/opt/tomcat9/webapps/ROOT/css/images/query_icons/observationwaypoint.png similarity index 100% rename from app/webapps/ROOT/css/images/query_icons/observationwaypoint.png rename to app/opt/tomcat9/webapps/ROOT/css/images/query_icons/observationwaypoint.png diff --git a/app/webapps/ROOT/css/images/query_icons/patrolgrid.png b/app/opt/tomcat9/webapps/ROOT/css/images/query_icons/patrolgrid.png similarity index 100% rename from app/webapps/ROOT/css/images/query_icons/patrolgrid.png rename to app/opt/tomcat9/webapps/ROOT/css/images/query_icons/patrolgrid.png diff --git a/app/webapps/ROOT/css/images/query_icons/patrolobservation.png b/app/opt/tomcat9/webapps/ROOT/css/images/query_icons/patrolobservation.png similarity index 100% rename from app/webapps/ROOT/css/images/query_icons/patrolobservation.png rename to app/opt/tomcat9/webapps/ROOT/css/images/query_icons/patrolobservation.png diff --git a/app/webapps/ROOT/css/images/query_icons/patrolquery.png b/app/opt/tomcat9/webapps/ROOT/css/images/query_icons/patrolquery.png similarity index 100% rename from app/webapps/ROOT/css/images/query_icons/patrolquery.png rename to app/opt/tomcat9/webapps/ROOT/css/images/query_icons/patrolquery.png diff --git a/app/webapps/ROOT/css/images/query_icons/patrolsummary.png b/app/opt/tomcat9/webapps/ROOT/css/images/query_icons/patrolsummary.png similarity index 100% rename from app/webapps/ROOT/css/images/query_icons/patrolsummary.png rename to app/opt/tomcat9/webapps/ROOT/css/images/query_icons/patrolsummary.png diff --git a/app/webapps/ROOT/css/images/query_icons/patrolwaypoint.png b/app/opt/tomcat9/webapps/ROOT/css/images/query_icons/patrolwaypoint.png similarity index 100% rename from app/webapps/ROOT/css/images/query_icons/patrolwaypoint.png rename to app/opt/tomcat9/webapps/ROOT/css/images/query_icons/patrolwaypoint.png diff --git a/app/webapps/ROOT/css/images/query_icons/summary_table.png b/app/opt/tomcat9/webapps/ROOT/css/images/query_icons/summary_table.png similarity index 100% rename from app/webapps/ROOT/css/images/query_icons/summary_table.png rename to app/opt/tomcat9/webapps/ROOT/css/images/query_icons/summary_table.png diff --git a/app/webapps/ROOT/css/images/query_icons/surveygrid.png b/app/opt/tomcat9/webapps/ROOT/css/images/query_icons/surveygrid.png similarity index 100% rename from app/webapps/ROOT/css/images/query_icons/surveygrid.png rename to app/opt/tomcat9/webapps/ROOT/css/images/query_icons/surveygrid.png diff --git a/app/webapps/ROOT/css/images/query_icons/surveymission.png b/app/opt/tomcat9/webapps/ROOT/css/images/query_icons/surveymission.png similarity index 100% rename from app/webapps/ROOT/css/images/query_icons/surveymission.png rename to app/opt/tomcat9/webapps/ROOT/css/images/query_icons/surveymission.png diff --git a/app/webapps/ROOT/css/images/query_icons/surveymissiontrack.png b/app/opt/tomcat9/webapps/ROOT/css/images/query_icons/surveymissiontrack.png similarity index 100% rename from app/webapps/ROOT/css/images/query_icons/surveymissiontrack.png rename to app/opt/tomcat9/webapps/ROOT/css/images/query_icons/surveymissiontrack.png diff --git a/app/webapps/ROOT/css/images/query_icons/surveyobservation.png b/app/opt/tomcat9/webapps/ROOT/css/images/query_icons/surveyobservation.png similarity index 100% rename from app/webapps/ROOT/css/images/query_icons/surveyobservation.png rename to app/opt/tomcat9/webapps/ROOT/css/images/query_icons/surveyobservation.png diff --git a/app/webapps/ROOT/css/images/query_icons/surveysummary.png b/app/opt/tomcat9/webapps/ROOT/css/images/query_icons/surveysummary.png similarity index 100% rename from app/webapps/ROOT/css/images/query_icons/surveysummary.png rename to app/opt/tomcat9/webapps/ROOT/css/images/query_icons/surveysummary.png diff --git a/app/webapps/ROOT/css/images/query_icons/surveywaypoint.png b/app/opt/tomcat9/webapps/ROOT/css/images/query_icons/surveywaypoint.png similarity index 100% rename from app/webapps/ROOT/css/images/query_icons/surveywaypoint.png rename to app/opt/tomcat9/webapps/ROOT/css/images/query_icons/surveywaypoint.png diff --git a/app/webapps/ROOT/css/images/reports.png b/app/opt/tomcat9/webapps/ROOT/css/images/reports.png similarity index 100% rename from app/webapps/ROOT/css/images/reports.png rename to app/opt/tomcat9/webapps/ROOT/css/images/reports.png diff --git a/app/webapps/ROOT/css/images/run.png b/app/opt/tomcat9/webapps/ROOT/css/images/run.png similarity index 100% rename from app/webapps/ROOT/css/images/run.png rename to app/opt/tomcat9/webapps/ROOT/css/images/run.png diff --git a/app/webapps/ROOT/css/images/settings.png b/app/opt/tomcat9/webapps/ROOT/css/images/settings.png similarity index 100% rename from app/webapps/ROOT/css/images/settings.png rename to app/opt/tomcat9/webapps/ROOT/css/images/settings.png diff --git a/app/webapps/ROOT/css/images/smart_fav_icon.png b/app/opt/tomcat9/webapps/ROOT/css/images/smart_fav_icon.png similarity index 100% rename from app/webapps/ROOT/css/images/smart_fav_icon.png rename to app/opt/tomcat9/webapps/ROOT/css/images/smart_fav_icon.png diff --git a/app/webapps/ROOT/css/images/smart_logo.png b/app/opt/tomcat9/webapps/ROOT/css/images/smart_logo.png similarity index 100% rename from app/webapps/ROOT/css/images/smart_logo.png rename to app/opt/tomcat9/webapps/ROOT/css/images/smart_logo.png diff --git a/app/webapps/ROOT/css/images/smarttoken.png b/app/opt/tomcat9/webapps/ROOT/css/images/smarttoken.png similarity index 100% rename from app/webapps/ROOT/css/images/smarttoken.png rename to app/opt/tomcat9/webapps/ROOT/css/images/smarttoken.png diff --git a/app/webapps/ROOT/css/images/uparrow.png b/app/opt/tomcat9/webapps/ROOT/css/images/uparrow.png similarity index 100% rename from app/webapps/ROOT/css/images/uparrow.png rename to app/opt/tomcat9/webapps/ROOT/css/images/uparrow.png diff --git a/app/webapps/ROOT/css/images/users.png b/app/opt/tomcat9/webapps/ROOT/css/images/users.png similarity index 100% rename from app/webapps/ROOT/css/images/users.png rename to app/opt/tomcat9/webapps/ROOT/css/images/users.png diff --git a/app/webapps/ROOT/css/images/validate_email.png b/app/opt/tomcat9/webapps/ROOT/css/images/validate_email.png similarity index 100% rename from app/webapps/ROOT/css/images/validate_email.png rename to app/opt/tomcat9/webapps/ROOT/css/images/validate_email.png diff --git a/app/webapps/ROOT/css/images/validate_user.png b/app/opt/tomcat9/webapps/ROOT/css/images/validate_user.png similarity index 100% rename from app/webapps/ROOT/css/images/validate_user.png rename to app/opt/tomcat9/webapps/ROOT/css/images/validate_user.png diff --git a/app/webapps/ROOT/css/images/warn.png b/app/opt/tomcat9/webapps/ROOT/css/images/warn.png similarity index 100% rename from app/webapps/ROOT/css/images/warn.png rename to app/opt/tomcat9/webapps/ROOT/css/images/warn.png diff --git a/app/webapps/ROOT/css/leaflet/images/layers-2x.png b/app/opt/tomcat9/webapps/ROOT/css/leaflet/images/layers-2x.png similarity index 100% rename from app/webapps/ROOT/css/leaflet/images/layers-2x.png rename to app/opt/tomcat9/webapps/ROOT/css/leaflet/images/layers-2x.png diff --git a/app/webapps/ROOT/css/leaflet/images/layers.png b/app/opt/tomcat9/webapps/ROOT/css/leaflet/images/layers.png similarity index 100% rename from app/webapps/ROOT/css/leaflet/images/layers.png rename to app/opt/tomcat9/webapps/ROOT/css/leaflet/images/layers.png diff --git a/app/webapps/ROOT/css/leaflet/images/markers-matte.png b/app/opt/tomcat9/webapps/ROOT/css/leaflet/images/markers-matte.png similarity index 100% rename from app/webapps/ROOT/css/leaflet/images/markers-matte.png rename to app/opt/tomcat9/webapps/ROOT/css/leaflet/images/markers-matte.png diff --git a/app/webapps/ROOT/css/leaflet/images/markers-matte@2x.png b/app/opt/tomcat9/webapps/ROOT/css/leaflet/images/markers-matte@2x.png similarity index 100% rename from app/webapps/ROOT/css/leaflet/images/markers-matte@2x.png rename to app/opt/tomcat9/webapps/ROOT/css/leaflet/images/markers-matte@2x.png diff --git a/app/webapps/ROOT/css/leaflet/images/markers-plain.png b/app/opt/tomcat9/webapps/ROOT/css/leaflet/images/markers-plain.png similarity index 100% rename from app/webapps/ROOT/css/leaflet/images/markers-plain.png rename to app/opt/tomcat9/webapps/ROOT/css/leaflet/images/markers-plain.png diff --git a/app/webapps/ROOT/css/leaflet/images/markers-shadow.png b/app/opt/tomcat9/webapps/ROOT/css/leaflet/images/markers-shadow.png similarity index 100% rename from app/webapps/ROOT/css/leaflet/images/markers-shadow.png rename to app/opt/tomcat9/webapps/ROOT/css/leaflet/images/markers-shadow.png diff --git a/app/webapps/ROOT/css/leaflet/images/markers-shadow@2x.png b/app/opt/tomcat9/webapps/ROOT/css/leaflet/images/markers-shadow@2x.png similarity index 100% rename from app/webapps/ROOT/css/leaflet/images/markers-shadow@2x.png rename to app/opt/tomcat9/webapps/ROOT/css/leaflet/images/markers-shadow@2x.png diff --git a/app/webapps/ROOT/css/leaflet/images/markers-soft.png b/app/opt/tomcat9/webapps/ROOT/css/leaflet/images/markers-soft.png similarity index 100% rename from app/webapps/ROOT/css/leaflet/images/markers-soft.png rename to app/opt/tomcat9/webapps/ROOT/css/leaflet/images/markers-soft.png diff --git a/app/webapps/ROOT/css/leaflet/images/markers-soft@2x.png b/app/opt/tomcat9/webapps/ROOT/css/leaflet/images/markers-soft@2x.png similarity index 100% rename from app/webapps/ROOT/css/leaflet/images/markers-soft@2x.png rename to app/opt/tomcat9/webapps/ROOT/css/leaflet/images/markers-soft@2x.png diff --git a/app/webapps/ROOT/css/leaflet/leaflet.awesome-markers.css b/app/opt/tomcat9/webapps/ROOT/css/leaflet/leaflet.awesome-markers.css similarity index 100% rename from app/webapps/ROOT/css/leaflet/leaflet.awesome-markers.css rename to app/opt/tomcat9/webapps/ROOT/css/leaflet/leaflet.awesome-markers.css diff --git a/app/webapps/ROOT/css/leaflet/leaflet.css b/app/opt/tomcat9/webapps/ROOT/css/leaflet/leaflet.css similarity index 100% rename from app/webapps/ROOT/css/leaflet/leaflet.css rename to app/opt/tomcat9/webapps/ROOT/css/leaflet/leaflet.css diff --git a/app/webapps/ROOT/css/leaflet/marker-icon-2x.png b/app/opt/tomcat9/webapps/ROOT/css/leaflet/marker-icon-2x.png similarity index 100% rename from app/webapps/ROOT/css/leaflet/marker-icon-2x.png rename to app/opt/tomcat9/webapps/ROOT/css/leaflet/marker-icon-2x.png diff --git a/app/webapps/ROOT/css/leaflet/marker-icon.png b/app/opt/tomcat9/webapps/ROOT/css/leaflet/marker-icon.png similarity index 100% rename from app/webapps/ROOT/css/leaflet/marker-icon.png rename to app/opt/tomcat9/webapps/ROOT/css/leaflet/marker-icon.png diff --git a/app/webapps/ROOT/css/leaflet/marker-shadow.png b/app/opt/tomcat9/webapps/ROOT/css/leaflet/marker-shadow.png similarity index 100% rename from app/webapps/ROOT/css/leaflet/marker-shadow.png rename to app/opt/tomcat9/webapps/ROOT/css/leaflet/marker-shadow.png diff --git a/app/webapps/ROOT/css/pikaday.css b/app/opt/tomcat9/webapps/ROOT/css/pikaday.css similarity index 100% rename from app/webapps/ROOT/css/pikaday.css rename to app/opt/tomcat9/webapps/ROOT/css/pikaday.css diff --git a/app/webapps/ROOT/css/smart.css b/app/opt/tomcat9/webapps/ROOT/css/smart.css similarity index 81% rename from app/webapps/ROOT/css/smart.css rename to app/opt/tomcat9/webapps/ROOT/css/smart.css index f7193f6..f31c3e8 100644 --- a/app/webapps/ROOT/css/smart.css +++ b/app/opt/tomcat9/webapps/ROOT/css/smart.css @@ -1,7 +1,8 @@ html { height: 100vh; width: 100vw; - font-family: "Work Sans", -apple-system,system-ui,BlinkMacSystemFont,"Segoe UI",Roboto,"Helvetica Neue",Arial,sans-serif; + font-family: -apple-system,system-ui,BlinkMacSystemFont,"Segoe UI",Roboto,"Helvetica Neue",Arial,sans-serif; +/* font-family: "Open Sans", Helvetica, Arial, sans-serif; */ font-size: 0.8em; overflow: hidden; } @@ -36,22 +37,15 @@ th { overflow: hidden; } -#root-container button, -#root-container input[type=submit], -#root-container input[type=button] -{ - cursor: pointer; -} - #mainheader { flex: none; - padding: 5px; + border: 0px solid black; + padding: 10px 5px 10px 5px; text-align: center; - color: #33446b; - font-weight: 600; - font-size: 32px; - background-color: #d4e1e9; - text-shadow: #d4e1e9 1px 1px 0px, #9C9C9C 3px 3px 0px, 2px 2px 2px rgba(206,89,55,0); + color: black; +/* font-family: 'Allerta', Helvetica, Arial, sans-serif; */ + font-weight: 500; + font-size: 40px; } #core { @@ -62,18 +56,8 @@ th { align-items: stretch; } -#core div:first-child { - width: 100%; -} - #footerid { - flex: none; - padding: 5px; - font-size: 1em; - font-weight: 600; - text-align: center; - color: #000; - background: #d4e1e9; + flex: none; } .run-title{ @@ -124,12 +108,12 @@ th { } .linkButton { - background: none; - border: none; - color: #0066ff; - text-decoration: underline; - cursor: pointer; - padding: 2px; + background: none; + border: none; + color: #0066ff; + text-decoration: underline; + cursor: pointer; + padding: 2px; } .button:focus{ border: 1px solid #72A6C8 !important; @@ -141,7 +125,6 @@ th { padding: 4px; color: #3A4469; text-decoration:none; - cursor: pointer; } .button:hover{ @@ -158,10 +141,8 @@ th { .pageheader{ border-bottom: 1px solid black; - padding: 5px 0px; - font-size: 1.75em; - font-weight: 600; - margin-bottom: 10px; + padding: 0px 0px 0px 0px; + font-size: 1.2em; } .uielement{ @@ -211,11 +192,9 @@ th { } .label-header{ - font-weight: 600; + font-weight: bold; margin-top: 5px; - margin-bottom: 10px; color: #3A4469; - font-size: 1.2em; } .smart-table-header{ /* background-color: #E6E9F0; */ @@ -288,7 +267,9 @@ th { .verticalmenu { padding: 10px 10px; - background: #d4e1e9; + border-radius: 3px; + background: rgb(255, 255, 255); /* the fallback without opacity*/ + background: rgba(255, 255, 255, 0.5); vertical-align:top; } @@ -298,7 +279,6 @@ th { flex-direction: column; flex-wrap: nowrap; align-items: center; - justify-content: center; } #login-wrapper { display: flex; @@ -306,10 +286,6 @@ th { flex-wrap: nowrap; justify-content: center; align-items: flex-start; - padding: 30px; - border: 1px solid transparent; - background: #d4e1e9; - font-size: 1.5em; } #login-left { width: 200px; @@ -352,11 +328,6 @@ th { .infomessage{ font-style:italic; - font-weight: 300; - text-align: right; - margin-bottom: 10px; - color: green; - font-size: 1.2em; } .dialog{ border-radius: 3px; @@ -367,8 +338,6 @@ th { overflow: auto; max-height: 100%; z-index: 2000; - left: 50% !important; - transform: translateX(-50%) !important; } @@ -391,12 +360,11 @@ th { padding: 5px; font-weight: bold; color: white; - font-size: 1.4em; } .overlay-widget{ - background: rgba(0,0,0,.8) !important; - backdrop-filter: blur(10px) !important; + background: #333333; + opacity: 0.9; z-index:1999; position: fixed; top: 0px; @@ -548,11 +516,11 @@ th { flex: 1 1 auto; display: flex; flex-flow: column nowrap; - padding: 15px 30px; - background-color: rgba(212, 225, 233,.75); - background-image: radial-gradient(#999999 0.5px, rgba(212, 225, 233,.75) 0.5px); - background-size: 10px 10px; - height: 100%; + border: 0px; + border-radius: 3px; + background: rgb(255, 255, 255); /* The Fallback */ + background: rgba(255, 255, 255, 0.5); + padding: 0px 5px 15px 5px; } .control-menu { @@ -573,7 +541,7 @@ th { flex-flow: column nowrap; margin: 10px; border: 1px solid #999; - background: rgba(255,255,255,.75); + background: #fff; border-radius: 4px; flex: none; overflow: hidden; @@ -676,13 +644,6 @@ th { overflow: auto; } -#settings-scroller > div > p { - text-align: right; - font-weight: 300; - font-size: 1.2em; - color: green; -} - /*Mozilla specific*/ #filter-button:before{ display: block; @@ -736,16 +697,15 @@ div.caSelector { } .settings-header{ - font-size: 1.2em; + padding: 0px 0px 5px 0px; + font-size: 1em; font-weight: bold; } .settingsTable{ border: 1px solid #4F5F88; margin: 10px 5px 0px 0px; - padding: 15px; - background-color: #ffffff; - border-radius: 5px; + padding: 5px 5px; } .defaultLabel{ @@ -868,8 +828,4 @@ fieldset{ } .extrareport2dates{ display:none; -} - -textarea#previewarea { - width: 99% !important; } \ No newline at end of file diff --git a/app/webapps/ROOT/index.jsp b/app/opt/tomcat9/webapps/ROOT/index.jsp similarity index 100% rename from app/webapps/ROOT/index.jsp rename to app/opt/tomcat9/webapps/ROOT/index.jsp diff --git a/app/webapps/ROOT/javascript/alert.js b/app/opt/tomcat9/webapps/ROOT/javascript/alert.js similarity index 96% rename from app/webapps/ROOT/javascript/alert.js rename to app/opt/tomcat9/webapps/ROOT/javascript/alert.js index 3de5406..30f9c4c 100644 --- a/app/webapps/ROOT/javascript/alert.js +++ b/app/opt/tomcat9/webapps/ROOT/javascript/alert.js @@ -338,8 +338,12 @@ function getQueryColor(id) { } function addQueryLayer(id) { + //console.log("add query: " + id); var color = getQueryColor(id); var oReq = new XMLHttpRequest(); + + queryLayers[id] = "loading"; + oReq.onload = function() { data = this.response; @@ -368,11 +372,14 @@ function addQueryLayer(id) { c += ""; return c; }, {maxWidth: 325}); - if(queryLayers[id]) { - removeQueryLayer(id); - } - map.addLayer(layer); - queryLayers[id] = layer; + + if (queryLayers[id] == "loading"){ + if(queryLayers[id]) { + removeQueryLayer(id); + } + map.addLayer(layer); + queryLayers[id] = layer; + } }; var dateFilter = ""; if(document.getElementById('queryDatePickerFrom').value != ""){ @@ -394,7 +401,8 @@ function addQueryLayer(id) { } function removeQueryLayer(id) { - map.removeLayer(queryLayers[id]); + //console.log("remove query: " + id); + if (queryLayers[id] != "loading") map.removeLayer(queryLayers[id]); queryLayers[id] = null; } @@ -414,7 +422,7 @@ function queryDateRangeUpdate() { function refreshQueries() { // update query layers to use new date range for(id in queryLayers) { - addQueryLayer(id); + if (queryLayers[id] != null) addQueryLayer(id); } } diff --git a/app/webapps/ROOT/javascript/ca.js b/app/opt/tomcat9/webapps/ROOT/javascript/ca.js similarity index 100% rename from app/webapps/ROOT/javascript/ca.js rename to app/opt/tomcat9/webapps/ROOT/javascript/ca.js diff --git a/app/webapps/ROOT/javascript/causers.js b/app/opt/tomcat9/webapps/ROOT/javascript/causers.js similarity index 100% rename from app/webapps/ROOT/javascript/causers.js rename to app/opt/tomcat9/webapps/ROOT/javascript/causers.js diff --git a/app/webapps/ROOT/javascript/cybertracker.js b/app/opt/tomcat9/webapps/ROOT/javascript/cybertracker.js similarity index 100% rename from app/webapps/ROOT/javascript/cybertracker.js rename to app/opt/tomcat9/webapps/ROOT/javascript/cybertracker.js diff --git a/app/webapps/ROOT/javascript/dashboardbeta.js b/app/opt/tomcat9/webapps/ROOT/javascript/dashboardbeta.js similarity index 100% rename from app/webapps/ROOT/javascript/dashboardbeta.js rename to app/opt/tomcat9/webapps/ROOT/javascript/dashboardbeta.js diff --git a/app/webapps/ROOT/javascript/dashboardbetaadmin.js b/app/opt/tomcat9/webapps/ROOT/javascript/dashboardbetaadmin.js similarity index 100% rename from app/webapps/ROOT/javascript/dashboardbetaadmin.js rename to app/opt/tomcat9/webapps/ROOT/javascript/dashboardbetaadmin.js diff --git a/app/webapps/ROOT/javascript/dashboardsharedfunctions.js b/app/opt/tomcat9/webapps/ROOT/javascript/dashboardsharedfunctions.js similarity index 100% rename from app/webapps/ROOT/javascript/dashboardsharedfunctions.js rename to app/opt/tomcat9/webapps/ROOT/javascript/dashboardsharedfunctions.js diff --git a/app/webapps/ROOT/javascript/dataqueue.js b/app/opt/tomcat9/webapps/ROOT/javascript/dataqueue.js similarity index 100% rename from app/webapps/ROOT/javascript/dataqueue.js rename to app/opt/tomcat9/webapps/ROOT/javascript/dataqueue.js diff --git a/app/webapps/ROOT/javascript/dialog.js b/app/opt/tomcat9/webapps/ROOT/javascript/dialog.js similarity index 100% rename from app/webapps/ROOT/javascript/dialog.js rename to app/opt/tomcat9/webapps/ROOT/javascript/dialog.js diff --git a/app/webapps/ROOT/javascript/home.js b/app/opt/tomcat9/webapps/ROOT/javascript/home.js similarity index 100% rename from app/webapps/ROOT/javascript/home.js rename to app/opt/tomcat9/webapps/ROOT/javascript/home.js diff --git a/app/webapps/ROOT/javascript/html2canvas.js b/app/opt/tomcat9/webapps/ROOT/javascript/html2canvas.js similarity index 100% rename from app/webapps/ROOT/javascript/html2canvas.js rename to app/opt/tomcat9/webapps/ROOT/javascript/html2canvas.js diff --git a/app/webapps/ROOT/javascript/i18n.js b/app/opt/tomcat9/webapps/ROOT/javascript/i18n.js similarity index 100% rename from app/webapps/ROOT/javascript/i18n.js rename to app/opt/tomcat9/webapps/ROOT/javascript/i18n.js diff --git a/app/webapps/ROOT/javascript/i18n/labels_ar.js b/app/opt/tomcat9/webapps/ROOT/javascript/i18n/labels_ar.js similarity index 100% rename from app/webapps/ROOT/javascript/i18n/labels_ar.js rename to app/opt/tomcat9/webapps/ROOT/javascript/i18n/labels_ar.js diff --git a/app/webapps/ROOT/javascript/i18n/labels_en.js b/app/opt/tomcat9/webapps/ROOT/javascript/i18n/labels_en.js similarity index 100% rename from app/webapps/ROOT/javascript/i18n/labels_en.js rename to app/opt/tomcat9/webapps/ROOT/javascript/i18n/labels_en.js diff --git a/app/webapps/ROOT/javascript/i18n/labels_es.js b/app/opt/tomcat9/webapps/ROOT/javascript/i18n/labels_es.js similarity index 100% rename from app/webapps/ROOT/javascript/i18n/labels_es.js rename to app/opt/tomcat9/webapps/ROOT/javascript/i18n/labels_es.js diff --git a/app/webapps/ROOT/javascript/i18n/labels_fr.js b/app/opt/tomcat9/webapps/ROOT/javascript/i18n/labels_fr.js similarity index 100% rename from app/webapps/ROOT/javascript/i18n/labels_fr.js rename to app/opt/tomcat9/webapps/ROOT/javascript/i18n/labels_fr.js diff --git a/app/webapps/ROOT/javascript/i18n/labels_hi.js b/app/opt/tomcat9/webapps/ROOT/javascript/i18n/labels_hi.js similarity index 100% rename from app/webapps/ROOT/javascript/i18n/labels_hi.js rename to app/opt/tomcat9/webapps/ROOT/javascript/i18n/labels_hi.js diff --git a/app/webapps/ROOT/javascript/i18n/labels_in.js b/app/opt/tomcat9/webapps/ROOT/javascript/i18n/labels_in.js similarity index 100% rename from app/webapps/ROOT/javascript/i18n/labels_in.js rename to app/opt/tomcat9/webapps/ROOT/javascript/i18n/labels_in.js diff --git a/app/webapps/ROOT/javascript/i18n/labels_ka.js b/app/opt/tomcat9/webapps/ROOT/javascript/i18n/labels_ka.js similarity index 100% rename from app/webapps/ROOT/javascript/i18n/labels_ka.js rename to app/opt/tomcat9/webapps/ROOT/javascript/i18n/labels_ka.js diff --git a/app/webapps/ROOT/javascript/i18n/labels_km.js b/app/opt/tomcat9/webapps/ROOT/javascript/i18n/labels_km.js similarity index 100% rename from app/webapps/ROOT/javascript/i18n/labels_km.js rename to app/opt/tomcat9/webapps/ROOT/javascript/i18n/labels_km.js diff --git a/app/webapps/ROOT/javascript/i18n/labels_lo.js b/app/opt/tomcat9/webapps/ROOT/javascript/i18n/labels_lo.js similarity index 100% rename from app/webapps/ROOT/javascript/i18n/labels_lo.js rename to app/opt/tomcat9/webapps/ROOT/javascript/i18n/labels_lo.js diff --git a/app/webapps/ROOT/javascript/i18n/labels_ms.js b/app/opt/tomcat9/webapps/ROOT/javascript/i18n/labels_ms.js similarity index 100% rename from app/webapps/ROOT/javascript/i18n/labels_ms.js rename to app/opt/tomcat9/webapps/ROOT/javascript/i18n/labels_ms.js diff --git a/app/webapps/ROOT/javascript/i18n/labels_ru.js b/app/opt/tomcat9/webapps/ROOT/javascript/i18n/labels_ru.js similarity index 100% rename from app/webapps/ROOT/javascript/i18n/labels_ru.js rename to app/opt/tomcat9/webapps/ROOT/javascript/i18n/labels_ru.js diff --git a/app/webapps/ROOT/javascript/i18n/labels_th.js b/app/opt/tomcat9/webapps/ROOT/javascript/i18n/labels_th.js similarity index 100% rename from app/webapps/ROOT/javascript/i18n/labels_th.js rename to app/opt/tomcat9/webapps/ROOT/javascript/i18n/labels_th.js diff --git a/app/webapps/ROOT/javascript/i18n/labels_vi.js b/app/opt/tomcat9/webapps/ROOT/javascript/i18n/labels_vi.js similarity index 100% rename from app/webapps/ROOT/javascript/i18n/labels_vi.js rename to app/opt/tomcat9/webapps/ROOT/javascript/i18n/labels_vi.js diff --git a/app/webapps/ROOT/javascript/i18n/labels_zh.js b/app/opt/tomcat9/webapps/ROOT/javascript/i18n/labels_zh.js similarity index 100% rename from app/webapps/ROOT/javascript/i18n/labels_zh.js rename to app/opt/tomcat9/webapps/ROOT/javascript/i18n/labels_zh.js diff --git a/app/webapps/ROOT/javascript/infoerror.js b/app/opt/tomcat9/webapps/ROOT/javascript/infoerror.js similarity index 100% rename from app/webapps/ROOT/javascript/infoerror.js rename to app/opt/tomcat9/webapps/ROOT/javascript/infoerror.js diff --git a/app/webapps/ROOT/javascript/jscolor.min.js b/app/opt/tomcat9/webapps/ROOT/javascript/jscolor.min.js similarity index 100% rename from app/webapps/ROOT/javascript/jscolor.min.js rename to app/opt/tomcat9/webapps/ROOT/javascript/jscolor.min.js diff --git a/app/webapps/ROOT/javascript/leaflet-google.js b/app/opt/tomcat9/webapps/ROOT/javascript/leaflet-google.js similarity index 100% rename from app/webapps/ROOT/javascript/leaflet-google.js rename to app/opt/tomcat9/webapps/ROOT/javascript/leaflet-google.js diff --git a/app/webapps/ROOT/javascript/leaflet-realtime.js b/app/opt/tomcat9/webapps/ROOT/javascript/leaflet-realtime.js similarity index 100% rename from app/webapps/ROOT/javascript/leaflet-realtime.js rename to app/opt/tomcat9/webapps/ROOT/javascript/leaflet-realtime.js diff --git a/app/webapps/ROOT/javascript/leaflet-src.js b/app/opt/tomcat9/webapps/ROOT/javascript/leaflet-src.js similarity index 100% rename from app/webapps/ROOT/javascript/leaflet-src.js rename to app/opt/tomcat9/webapps/ROOT/javascript/leaflet-src.js diff --git a/app/webapps/ROOT/javascript/leaflet.awesome-markers.js b/app/opt/tomcat9/webapps/ROOT/javascript/leaflet.awesome-markers.js similarity index 100% rename from app/webapps/ROOT/javascript/leaflet.awesome-markers.js rename to app/opt/tomcat9/webapps/ROOT/javascript/leaflet.awesome-markers.js diff --git a/app/webapps/ROOT/javascript/leaflet.awesome-markers.min.js b/app/opt/tomcat9/webapps/ROOT/javascript/leaflet.awesome-markers.min.js similarity index 100% rename from app/webapps/ROOT/javascript/leaflet.awesome-markers.min.js rename to app/opt/tomcat9/webapps/ROOT/javascript/leaflet.awesome-markers.min.js diff --git a/app/webapps/ROOT/javascript/leaflet.js b/app/opt/tomcat9/webapps/ROOT/javascript/leaflet.js similarity index 100% rename from app/webapps/ROOT/javascript/leaflet.js rename to app/opt/tomcat9/webapps/ROOT/javascript/leaflet.js diff --git a/app/webapps/ROOT/javascript/leaflet_export.js b/app/opt/tomcat9/webapps/ROOT/javascript/leaflet_export.js similarity index 100% rename from app/webapps/ROOT/javascript/leaflet_export.js rename to app/opt/tomcat9/webapps/ROOT/javascript/leaflet_export.js diff --git a/app/webapps/ROOT/javascript/myaccount.js b/app/opt/tomcat9/webapps/ROOT/javascript/myaccount.js similarity index 100% rename from app/webapps/ROOT/javascript/myaccount.js rename to app/opt/tomcat9/webapps/ROOT/javascript/myaccount.js diff --git a/app/webapps/ROOT/javascript/pickaday.js b/app/opt/tomcat9/webapps/ROOT/javascript/pickaday.js similarity index 100% rename from app/webapps/ROOT/javascript/pickaday.js rename to app/opt/tomcat9/webapps/ROOT/javascript/pickaday.js diff --git a/app/webapps/ROOT/javascript/query.js b/app/opt/tomcat9/webapps/ROOT/javascript/query.js similarity index 100% rename from app/webapps/ROOT/javascript/query.js rename to app/opt/tomcat9/webapps/ROOT/javascript/query.js diff --git a/app/webapps/ROOT/javascript/report.js b/app/opt/tomcat9/webapps/ROOT/javascript/report.js similarity index 100% rename from app/webapps/ROOT/javascript/report.js rename to app/opt/tomcat9/webapps/ROOT/javascript/report.js diff --git a/app/webapps/ROOT/javascript/settings.js b/app/opt/tomcat9/webapps/ROOT/javascript/settings.js similarity index 100% rename from app/webapps/ROOT/javascript/settings.js rename to app/opt/tomcat9/webapps/ROOT/javascript/settings.js diff --git a/app/webapps/ROOT/javascript/sharedlinkfunctions.js b/app/opt/tomcat9/webapps/ROOT/javascript/sharedlinkfunctions.js similarity index 100% rename from app/webapps/ROOT/javascript/sharedlinkfunctions.js rename to app/opt/tomcat9/webapps/ROOT/javascript/sharedlinkfunctions.js diff --git a/app/webapps/ROOT/javascript/sharedlinks.js b/app/opt/tomcat9/webapps/ROOT/javascript/sharedlinks.js similarity index 100% rename from app/webapps/ROOT/javascript/sharedlinks.js rename to app/opt/tomcat9/webapps/ROOT/javascript/sharedlinks.js diff --git a/app/webapps/ROOT/javascript/table.js b/app/opt/tomcat9/webapps/ROOT/javascript/table.js similarity index 100% rename from app/webapps/ROOT/javascript/table.js rename to app/opt/tomcat9/webapps/ROOT/javascript/table.js diff --git a/app/webapps/ROOT/javascript/users.js b/app/opt/tomcat9/webapps/ROOT/javascript/users.js similarity index 100% rename from app/webapps/ROOT/javascript/users.js rename to app/opt/tomcat9/webapps/ROOT/javascript/users.js diff --git a/app/webapps/ROOT/javascript/userssharedfunctions.js b/app/opt/tomcat9/webapps/ROOT/javascript/userssharedfunctions.js similarity index 100% rename from app/webapps/ROOT/javascript/userssharedfunctions.js rename to app/opt/tomcat9/webapps/ROOT/javascript/userssharedfunctions.js diff --git a/app/webapps/ROOT/loginfail.html b/app/opt/tomcat9/webapps/ROOT/loginfail.html similarity index 100% rename from app/webapps/ROOT/loginfail.html rename to app/opt/tomcat9/webapps/ROOT/loginfail.html diff --git a/app/opt/tomcat9/work/Catalina/smartconnect.internal.yel.or.id/ROOT/org/apache/jsp/WEB_002dINF/dashboardbeta_jsp.class b/app/opt/tomcat9/work/Catalina/smartconnect.internal.yel.or.id/ROOT/org/apache/jsp/WEB_002dINF/dashboardbeta_jsp.class new file mode 100644 index 0000000..9e1de15 Binary files /dev/null and b/app/opt/tomcat9/work/Catalina/smartconnect.internal.yel.or.id/ROOT/org/apache/jsp/WEB_002dINF/dashboardbeta_jsp.class differ diff --git a/app/opt/tomcat9/work/Catalina/smartconnect.internal.yel.or.id/ROOT/org/apache/jsp/WEB_002dINF/dashboardbeta_jsp.java b/app/opt/tomcat9/work/Catalina/smartconnect.internal.yel.or.id/ROOT/org/apache/jsp/WEB_002dINF/dashboardbeta_jsp.java new file mode 100644 index 0000000..730d43c --- /dev/null +++ b/app/opt/tomcat9/work/Catalina/smartconnect.internal.yel.or.id/ROOT/org/apache/jsp/WEB_002dINF/dashboardbeta_jsp.java @@ -0,0 +1,1908 @@ +/* + * Generated by the Jasper component of Apache Tomcat + * Version: Apache Tomcat/9.0.107 + * Generated at: 2025-07-30 05:27:26 UTC + * Note: The last modified time of this file was set to + * the last modified time of the source file after + * generation to assist with modification tracking. + */ +package org.apache.jsp.WEB_002dINF; + +import javax.servlet.*; +import javax.servlet.http.*; +import javax.servlet.jsp.*; +import java.time.LocalDate; +import java.time.format.DateTimeFormatter; + +public final class dashboardbeta_jsp extends org.apache.jasper.runtime.HttpJspBase + implements org.apache.jasper.runtime.JspSourceDependent, + org.apache.jasper.runtime.JspSourceImports { + + private static final javax.servlet.jsp.JspFactory _jspxFactory = + javax.servlet.jsp.JspFactory.getDefaultFactory(); + + private static java.util.Map _jspx_dependants; + + static { + _jspx_dependants = new java.util.HashMap(7); + _jspx_dependants.put("jar:file:/opt/tomcat9/webapps/ROOT/WEB-INF/lib/jstl-1.2.jar!/META-INF/c.tld", Long.valueOf(1153385082000L)); + _jspx_dependants.put("/WEB-INF/header.jsp", Long.valueOf(1753790711298L)); + _jspx_dependants.put("jar:file:/opt/tomcat9/webapps/ROOT/WEB-INF/lib/jstl-1.2.jar!/META-INF/fmt.tld", Long.valueOf(1153385082000L)); + _jspx_dependants.put("/WEB-INF/menu.jsp", Long.valueOf(1753790711454L)); + _jspx_dependants.put("/WEB-INF/includes.jsp", Long.valueOf(1753790711298L)); + _jspx_dependants.put("/WEB-INF/lib/jstl-1.2.jar", Long.valueOf(1753790711326L)); + _jspx_dependants.put("/WEB-INF/footer.jsp", Long.valueOf(1753790711298L)); + } + + private static final java.util.Set _jspx_imports_packages; + + private static final java.util.Set _jspx_imports_classes; + + static { + _jspx_imports_packages = new java.util.LinkedHashSet<>(4); + _jspx_imports_packages.add("javax.servlet"); + _jspx_imports_packages.add("javax.servlet.http"); + _jspx_imports_packages.add("javax.servlet.jsp"); + _jspx_imports_classes = new java.util.LinkedHashSet<>(3); + _jspx_imports_classes.add("java.time.LocalDate"); + _jspx_imports_classes.add("java.time.format.DateTimeFormatter"); + } + + private org.apache.jasper.runtime.TagHandlerPool _005fjspx_005ftagPool_005ffmt_005fsetBundle_0026_005fbasename_005fnobody; + private org.apache.jasper.runtime.TagHandlerPool _005fjspx_005ftagPool_005fc_005fset_0026_005fvar_005fvalue_005fnobody; + private org.apache.jasper.runtime.TagHandlerPool _005fjspx_005ftagPool_005fc_005fforEach_0026_005fvar_005fitems; + private org.apache.jasper.runtime.TagHandlerPool _005fjspx_005ftagPool_005fc_005fif_0026_005ftest; + private org.apache.jasper.runtime.TagHandlerPool _005fjspx_005ftagPool_005ffmt_005fmessage_0026_005fkey_005fnobody; + private org.apache.jasper.runtime.TagHandlerPool _005fjspx_005ftagPool_005fc_005fchoose; + private org.apache.jasper.runtime.TagHandlerPool _005fjspx_005ftagPool_005fc_005fwhen_0026_005ftest; + private org.apache.jasper.runtime.TagHandlerPool _005fjspx_005ftagPool_005fc_005fotherwise; + + private volatile javax.el.ExpressionFactory _el_expressionfactory; + private volatile org.apache.tomcat.InstanceManager _jsp_instancemanager; + + public java.util.Map getDependants() { + return _jspx_dependants; + } + + public java.util.Set getPackageImports() { + return _jspx_imports_packages; + } + + public java.util.Set getClassImports() { + return _jspx_imports_classes; + } + + public javax.el.ExpressionFactory _jsp_getExpressionFactory() { + if (_el_expressionfactory == null) { + synchronized (this) { + if (_el_expressionfactory == null) { + _el_expressionfactory = _jspxFactory.getJspApplicationContext(getServletConfig().getServletContext()).getExpressionFactory(); + } + } + } + return _el_expressionfactory; + } + + public org.apache.tomcat.InstanceManager _jsp_getInstanceManager() { + if (_jsp_instancemanager == null) { + synchronized (this) { + if (_jsp_instancemanager == null) { + _jsp_instancemanager = org.apache.jasper.runtime.InstanceManagerFactory.getInstanceManager(getServletConfig()); + } + } + } + return _jsp_instancemanager; + } + + public void _jspInit() { + _005fjspx_005ftagPool_005ffmt_005fsetBundle_0026_005fbasename_005fnobody = org.apache.jasper.runtime.TagHandlerPool.getTagHandlerPool(getServletConfig()); + _005fjspx_005ftagPool_005fc_005fset_0026_005fvar_005fvalue_005fnobody = org.apache.jasper.runtime.TagHandlerPool.getTagHandlerPool(getServletConfig()); + _005fjspx_005ftagPool_005fc_005fforEach_0026_005fvar_005fitems = org.apache.jasper.runtime.TagHandlerPool.getTagHandlerPool(getServletConfig()); + _005fjspx_005ftagPool_005fc_005fif_0026_005ftest = org.apache.jasper.runtime.TagHandlerPool.getTagHandlerPool(getServletConfig()); + _005fjspx_005ftagPool_005ffmt_005fmessage_0026_005fkey_005fnobody = org.apache.jasper.runtime.TagHandlerPool.getTagHandlerPool(getServletConfig()); + _005fjspx_005ftagPool_005fc_005fchoose = org.apache.jasper.runtime.TagHandlerPool.getTagHandlerPool(getServletConfig()); + _005fjspx_005ftagPool_005fc_005fwhen_0026_005ftest = org.apache.jasper.runtime.TagHandlerPool.getTagHandlerPool(getServletConfig()); + _005fjspx_005ftagPool_005fc_005fotherwise = org.apache.jasper.runtime.TagHandlerPool.getTagHandlerPool(getServletConfig()); + } + + public void _jspDestroy() { + _005fjspx_005ftagPool_005ffmt_005fsetBundle_0026_005fbasename_005fnobody.release(); + _005fjspx_005ftagPool_005fc_005fset_0026_005fvar_005fvalue_005fnobody.release(); + _005fjspx_005ftagPool_005fc_005fforEach_0026_005fvar_005fitems.release(); + _005fjspx_005ftagPool_005fc_005fif_0026_005ftest.release(); + _005fjspx_005ftagPool_005ffmt_005fmessage_0026_005fkey_005fnobody.release(); + _005fjspx_005ftagPool_005fc_005fchoose.release(); + _005fjspx_005ftagPool_005fc_005fwhen_0026_005ftest.release(); + _005fjspx_005ftagPool_005fc_005fotherwise.release(); + } + + public void _jspService(final javax.servlet.http.HttpServletRequest request, final javax.servlet.http.HttpServletResponse response) + throws java.io.IOException, javax.servlet.ServletException { + + if (!javax.servlet.DispatcherType.ERROR.equals(request.getDispatcherType())) { + final java.lang.String _jspx_method = request.getMethod(); + if ("OPTIONS".equals(_jspx_method)) { + response.setHeader("Allow","GET, HEAD, POST, OPTIONS"); + return; + } + if (!"GET".equals(_jspx_method) && !"POST".equals(_jspx_method) && !"HEAD".equals(_jspx_method)) { + response.setHeader("Allow","GET, HEAD, POST, OPTIONS"); + response.sendError(HttpServletResponse.SC_METHOD_NOT_ALLOWED, "JSPs only permit GET, POST or HEAD. Jasper also permits OPTIONS"); + return; + } + } + + final javax.servlet.jsp.PageContext pageContext; + javax.servlet.http.HttpSession session = null; + final javax.servlet.ServletContext application; + final javax.servlet.ServletConfig config; + javax.servlet.jsp.JspWriter out = null; + final java.lang.Object page = this; + javax.servlet.jsp.JspWriter _jspx_out = null; + javax.servlet.jsp.PageContext _jspx_page_context = null; + + + try { + response.setContentType("text/html; charset=UTF-8"); + pageContext = _jspxFactory.getPageContext(this, request, response, + null, true, 8192, true); + _jspx_page_context = pageContext; + application = pageContext.getServletContext(); + config = pageContext.getServletConfig(); + session = pageContext.getSession(); + out = pageContext.getOut(); + _jspx_out = out; + + out.write("\r\n"); + out.write("\r\n"); + out.write(" "); + out.write("\r\n"); + out.write("\r\n"); + out.write("\r\n"); + if (_jspx_meth_fmt_005fsetBundle_005f0(_jspx_page_context)) + return; + out.write("\r\n"); + out.write("\r\n"); + out.write("\r\n"); + out.write("\r\n"); + out.write("\r\n"); + out.write("\r\n"); + out.write("\r\n"); + out.write(" \r\n"); + out.write("\r\n"); + out.write("\r\n"); + out.write("\r\n"); + out.write("\r\n"); + out.write("\r\n"); + if (_jspx_meth_c_005fset_005f0(_jspx_page_context)) + return; + out.write('\r'); + out.write('\n'); + if (_jspx_meth_c_005fforEach_005f0(_jspx_page_context)) + return; + out.write("\r\n"); + out.write("\r\n"); + out.write("\r\n"); + out.write("\r\n"); + out.write("\r\n"); + out.write("\r\n"); + out.write("\r\n"); + out.write(" \r\n"); + out.write(" \r\n"); + out.write(" \r\n"); + out.write(" \r\n"); + out.write(" \r\n"); + out.write(" \r\n"); + out.write(" \r\n"); + out.write(" "); + if (_jspx_meth_fmt_005fmessage_005f0(_jspx_page_context)) + return; + out.write("\r\n"); + out.write(" \r\n"); + out.write("\r\n"); + out.write("\r\n"); + out.write("\r\n"); + out.write(" "); + out.write("\r\n"); + out.write("
\r\n"); + if (_jspx_meth_c_005fif_005f1(_jspx_page_context)) + return; + out.write("\r\n"); + out.write("
\r\n"); + if (_jspx_meth_c_005fchoose_005f0(_jspx_page_context)) + return; + out.write(" \r\n"); + out.write("\r\n"); + out.write("
\r\n"); + out.write("\r\n"); + out.write("
\r\n"); + out.write("\r\n"); + out.write('\r'); + out.write('\n'); + out.write(' '); + out.write("\r\n"); + out.write("\r\n"); + out.write("\r\n"); + out.write("
\r\n"); + out.write("
\r\n"); + out.write("\r\n"); + out.write("\r\n"); + out.write("\r\n"); + out.write("\r\n"); + out.write("
\r\n"); + out.write("
\r\n"); + out.write("\r\n"); + if (_jspx_meth_c_005fforEach_005f1(_jspx_page_context)) + return; + out.write("\r\n"); + out.write("\r\n"); + out.write("
\r\n"); + out.write("
\r\n"); + out.write("\r\n"); + out.write("
"); + if (_jspx_meth_fmt_005fmessage_005f2(_jspx_page_context)) + return; + out.write("\r\n"); + out.write("
\r\n"); + out.write(" \r\n"); + out.write("
\r\n"); + out.write(" \r\n"); + out.write(" \r\n"); + out.write("\r\n"); + out.write(" \r\n"); + out.write("
\r\n"); + out.write("
\r\n"); + out.write("
\r\n"); + out.write("
\r\n"); + out.write("
\r\n"); + out.write("
\r\n"); + out.write("
\r\n"); + out.write(" \r\n"); + out.write("
\r\n"); + out.write("
\r\n"); + out.write("
\r\n"); + out.write(" \r\n"); + out.write("
\r\n"); + out.write("
\r\n"); + out.write(" \r\n"); + out.write("
\r\n"); + out.write("
\r\n"); + out.write("
\r\n"); + out.write("
\r\n"); + out.write("
\r\n"); + out.write("
\r\n"); + out.write("
\r\n"); + out.write("
\r\n"); + out.write(" \r\n"); + out.write(" \r\n"); + out.write(" \r\n"); + out.write(" - \r\n"); + out.write(" \r\n"); + out.write("\r\n"); + out.write("
\r\n"); + out.write("
\r\n"); + out.write("
\r\n"); + out.write(" \r\n"); + out.write("
\r\n"); + out.write("
\r\n"); + out.write("
\r\n"); + out.write(" \r\n"); + out.write(" \r\n"); + out.write(" \r\n"); + out.write(" \r\n"); + out.write(" - \r\n"); + out.write(" \r\n"); + out.write(" \r\n"); + out.write("
\r\n"); + out.write("
\r\n"); + out.write("
\r\n"); + out.write("
\r\n"); + out.write("
\r\n"); + out.write("
\r\n"); + out.write(" \r\n"); + out.write("
\r\n"); + out.write("\r\n"); + out.write("\r\n"); + out.write("\r\n"); + out.write("\r\n"); + out.write("\r\n"); + out.write("
\r\n"); + String year = DateTimeFormatter.ofPattern("YYYY").format(LocalDate.now()); + out.write("\r\n"); + out.write("\r\n"); + out.write("
\r\n"); + out.write(" "); + // c:if + org.apache.taglibs.standard.tag.rt.core.IfTag _jspx_th_c_005fif_005f2 = (org.apache.taglibs.standard.tag.rt.core.IfTag) _005fjspx_005ftagPool_005fc_005fif_0026_005ftest.get(org.apache.taglibs.standard.tag.rt.core.IfTag.class); + _jspx_th_c_005fif_005f2.setPageContext(_jspx_page_context); + _jspx_th_c_005fif_005f2.setParent(null); + // /WEB-INF/footer.jsp(11,1) name = test type = boolean reqTime = true required = true fragment = false deferredValue = false expectedTypeName = null deferredMethod = false methodSignature = null + _jspx_th_c_005fif_005f2.setTest(((java.lang.Boolean) org.apache.jasper.runtime.PageContextImpl.proprietaryEvaluate("${empty style_footername }", boolean.class, (javax.servlet.jsp.PageContext)_jspx_page_context, null)).booleanValue()); + int _jspx_eval_c_005fif_005f2 = _jspx_th_c_005fif_005f2.doStartTag(); + if (_jspx_eval_c_005fif_005f2 != javax.servlet.jsp.tagext.Tag.SKIP_BODY) { + do { + out.write("\r\n"); + out.write(" \r\n"); + out.write("

Copyright 2015-"); + out.print(year); + out.write("

\r\n"); + out.write(" "); + int evalDoAfterBody = _jspx_th_c_005fif_005f2.doAfterBody(); + if (evalDoAfterBody != javax.servlet.jsp.tagext.BodyTag.EVAL_BODY_AGAIN) + break; + } while (true); + } + if (_jspx_th_c_005fif_005f2.doEndTag() == javax.servlet.jsp.tagext.Tag.SKIP_PAGE) { + return; + } + _005fjspx_005ftagPool_005fc_005fif_0026_005ftest.reuse(_jspx_th_c_005fif_005f2); + out.write('\r'); + out.write('\n'); + out.write(' '); + if (_jspx_meth_c_005fif_005f3(_jspx_page_context)) + return; + out.write("\r\n"); + out.write("
\r\n"); + out.write("
\r\n"); + out.write("\r\n"); + out.write("\r\n"); + out.write("\r\n"); + out.write("
\r\n"); + out.write("
\r\n"); + out.write("
\r\n"); + out.write(" \r\n"); + out.write("
\r\n"); + out.write("
\r\n"); + out.write("\r\n"); + out.write("\r\n"); + out.write("\r\n"); + out.write(""); + } catch (java.lang.Throwable t) { + if (!(t instanceof javax.servlet.jsp.SkipPageException)){ + out = _jspx_out; + if (out != null && out.getBufferSize() != 0) + try { + if (response.isCommitted()) { + out.flush(); + } else { + out.clearBuffer(); + } + } catch (java.io.IOException e) {} + if (_jspx_page_context != null) _jspx_page_context.handlePageException(t); + else throw new ServletException(t); + } + } finally { + _jspxFactory.releasePageContext(_jspx_page_context); + } + } + + private boolean _jspx_meth_fmt_005fsetBundle_005f0(javax.servlet.jsp.PageContext _jspx_page_context) + throws java.lang.Throwable { + javax.servlet.jsp.PageContext pageContext = _jspx_page_context; + javax.servlet.jsp.JspWriter out = _jspx_page_context.getOut(); + // fmt:setBundle + org.apache.taglibs.standard.tag.rt.fmt.SetBundleTag _jspx_th_fmt_005fsetBundle_005f0 = (org.apache.taglibs.standard.tag.rt.fmt.SetBundleTag) _005fjspx_005ftagPool_005ffmt_005fsetBundle_0026_005fbasename_005fnobody.get(org.apache.taglibs.standard.tag.rt.fmt.SetBundleTag.class); + _jspx_th_fmt_005fsetBundle_005f0.setPageContext(_jspx_page_context); + _jspx_th_fmt_005fsetBundle_005f0.setParent(null); + // /WEB-INF/includes.jsp(5,0) name = basename type = null reqTime = true required = true fragment = false deferredValue = false expectedTypeName = null deferredMethod = false methodSignature = null + _jspx_th_fmt_005fsetBundle_005f0.setBasename("org.wcs.smart.connect.i18n.web_messages"); + int _jspx_eval_fmt_005fsetBundle_005f0 = _jspx_th_fmt_005fsetBundle_005f0.doStartTag(); + if (_jspx_th_fmt_005fsetBundle_005f0.doEndTag() == javax.servlet.jsp.tagext.Tag.SKIP_PAGE) { + return true; + } + _005fjspx_005ftagPool_005ffmt_005fsetBundle_0026_005fbasename_005fnobody.reuse(_jspx_th_fmt_005fsetBundle_005f0); + return false; + } + + private boolean _jspx_meth_c_005fset_005f0(javax.servlet.jsp.PageContext _jspx_page_context) + throws java.lang.Throwable { + javax.servlet.jsp.PageContext pageContext = _jspx_page_context; + javax.servlet.jsp.JspWriter out = _jspx_page_context.getOut(); + // c:set + org.apache.taglibs.standard.tag.rt.core.SetTag _jspx_th_c_005fset_005f0 = (org.apache.taglibs.standard.tag.rt.core.SetTag) _005fjspx_005ftagPool_005fc_005fset_0026_005fvar_005fvalue_005fnobody.get(org.apache.taglibs.standard.tag.rt.core.SetTag.class); + _jspx_th_c_005fset_005f0.setPageContext(_jspx_page_context); + _jspx_th_c_005fset_005f0.setParent(null); + // /WEB-INF/includes.jsp(18,0) name = var type = java.lang.String reqTime = false required = false fragment = false deferredValue = false expectedTypeName = null deferredMethod = false methodSignature = null + _jspx_th_c_005fset_005f0.setVar("supportedLang"); + // /WEB-INF/includes.jsp(18,0) name = value type = javax.el.ValueExpression reqTime = true required = false fragment = false deferredValue = true expectedTypeName = java.lang.Object deferredMethod = false methodSignature = null + _jspx_th_c_005fset_005f0.setValue(new org.apache.jasper.el.JspValueExpression("/WEB-INF/includes.jsp(18,0) 'es,fr,hi,in,km,lo,ms,ru,th,vi,zh'",_jsp_getExpressionFactory().createValueExpression("es,fr,hi,in,km,lo,ms,ru,th,vi,zh",java.lang.Object.class)).getValue(_jspx_page_context.getELContext())); + int _jspx_eval_c_005fset_005f0 = _jspx_th_c_005fset_005f0.doStartTag(); + if (_jspx_th_c_005fset_005f0.doEndTag() == javax.servlet.jsp.tagext.Tag.SKIP_PAGE) { + return true; + } + _005fjspx_005ftagPool_005fc_005fset_0026_005fvar_005fvalue_005fnobody.reuse(_jspx_th_c_005fset_005f0); + return false; + } + + private boolean _jspx_meth_c_005fforEach_005f0(javax.servlet.jsp.PageContext _jspx_page_context) + throws java.lang.Throwable { + javax.servlet.jsp.PageContext pageContext = _jspx_page_context; + javax.servlet.jsp.JspWriter out = _jspx_page_context.getOut(); + // c:forEach + org.apache.taglibs.standard.tag.rt.core.ForEachTag _jspx_th_c_005fforEach_005f0 = (org.apache.taglibs.standard.tag.rt.core.ForEachTag) _005fjspx_005ftagPool_005fc_005fforEach_0026_005fvar_005fitems.get(org.apache.taglibs.standard.tag.rt.core.ForEachTag.class); + _jspx_th_c_005fforEach_005f0.setPageContext(_jspx_page_context); + _jspx_th_c_005fforEach_005f0.setParent(null); + // /WEB-INF/includes.jsp(19,0) name = var type = java.lang.String reqTime = false required = false fragment = false deferredValue = false expectedTypeName = null deferredMethod = false methodSignature = null + _jspx_th_c_005fforEach_005f0.setVar("item"); + // /WEB-INF/includes.jsp(19,0) name = items type = javax.el.ValueExpression reqTime = true required = false fragment = false deferredValue = true expectedTypeName = java.lang.Object deferredMethod = false methodSignature = null + _jspx_th_c_005fforEach_005f0.setItems(new org.apache.jasper.el.JspValueExpression("/WEB-INF/includes.jsp(19,0) '${supportedLang}'",_jsp_getExpressionFactory().createValueExpression(_jspx_page_context.getELContext(),"${supportedLang}",java.lang.Object.class)).getValue(_jspx_page_context.getELContext())); + int[] _jspx_push_body_count_c_005fforEach_005f0 = new int[] { 0 }; + try { + int _jspx_eval_c_005fforEach_005f0 = _jspx_th_c_005fforEach_005f0.doStartTag(); + if (_jspx_eval_c_005fforEach_005f0 != javax.servlet.jsp.tagext.Tag.SKIP_BODY) { + do { + out.write("\r\n"); + out.write(" "); + if (_jspx_meth_c_005fif_005f0(_jspx_th_c_005fforEach_005f0, _jspx_page_context, _jspx_push_body_count_c_005fforEach_005f0)) + return true; + out.write('\r'); + out.write('\n'); + int evalDoAfterBody = _jspx_th_c_005fforEach_005f0.doAfterBody(); + if (evalDoAfterBody != javax.servlet.jsp.tagext.BodyTag.EVAL_BODY_AGAIN) + break; + } while (true); + } + if (_jspx_th_c_005fforEach_005f0.doEndTag() == javax.servlet.jsp.tagext.Tag.SKIP_PAGE) { + return true; + } + } catch (java.lang.Throwable _jspx_exception) { + while (_jspx_push_body_count_c_005fforEach_005f0[0]-- > 0) + out = _jspx_page_context.popBody(); + _jspx_th_c_005fforEach_005f0.doCatch(_jspx_exception); + } finally { + _jspx_th_c_005fforEach_005f0.doFinally(); + } + _005fjspx_005ftagPool_005fc_005fforEach_0026_005fvar_005fitems.reuse(_jspx_th_c_005fforEach_005f0); + return false; + } + + private boolean _jspx_meth_c_005fif_005f0(javax.servlet.jsp.tagext.JspTag _jspx_th_c_005fforEach_005f0, javax.servlet.jsp.PageContext _jspx_page_context, int[] _jspx_push_body_count_c_005fforEach_005f0) + throws java.lang.Throwable { + javax.servlet.jsp.PageContext pageContext = _jspx_page_context; + javax.servlet.jsp.JspWriter out = _jspx_page_context.getOut(); + // c:if + org.apache.taglibs.standard.tag.rt.core.IfTag _jspx_th_c_005fif_005f0 = (org.apache.taglibs.standard.tag.rt.core.IfTag) _005fjspx_005ftagPool_005fc_005fif_0026_005ftest.get(org.apache.taglibs.standard.tag.rt.core.IfTag.class); + _jspx_th_c_005fif_005f0.setPageContext(_jspx_page_context); + _jspx_th_c_005fif_005f0.setParent((javax.servlet.jsp.tagext.Tag) _jspx_th_c_005fforEach_005f0); + // /WEB-INF/includes.jsp(20,2) name = test type = boolean reqTime = true required = true fragment = false deferredValue = false expectedTypeName = null deferredMethod = false methodSignature = null + _jspx_th_c_005fif_005f0.setTest(((java.lang.Boolean) org.apache.jasper.runtime.PageContextImpl.proprietaryEvaluate("${item eq pageContext.request.locale.language}", boolean.class, (javax.servlet.jsp.PageContext)_jspx_page_context, null)).booleanValue()); + int _jspx_eval_c_005fif_005f0 = _jspx_th_c_005fif_005f0.doStartTag(); + if (_jspx_eval_c_005fif_005f0 != javax.servlet.jsp.tagext.Tag.SKIP_BODY) { + do { + out.write("\r\n"); + out.write(" \r\n"); + out.write(" "); + int evalDoAfterBody = _jspx_th_c_005fif_005f0.doAfterBody(); + if (evalDoAfterBody != javax.servlet.jsp.tagext.BodyTag.EVAL_BODY_AGAIN) + break; + } while (true); + } + if (_jspx_th_c_005fif_005f0.doEndTag() == javax.servlet.jsp.tagext.Tag.SKIP_PAGE) { + return true; + } + _005fjspx_005ftagPool_005fc_005fif_0026_005ftest.reuse(_jspx_th_c_005fif_005f0); + return false; + } + + private boolean _jspx_meth_fmt_005fmessage_005f0(javax.servlet.jsp.PageContext _jspx_page_context) + throws java.lang.Throwable { + javax.servlet.jsp.PageContext pageContext = _jspx_page_context; + javax.servlet.jsp.JspWriter out = _jspx_page_context.getOut(); + // fmt:message + org.apache.taglibs.standard.tag.rt.fmt.MessageTag _jspx_th_fmt_005fmessage_005f0 = (org.apache.taglibs.standard.tag.rt.fmt.MessageTag) _005fjspx_005ftagPool_005ffmt_005fmessage_0026_005fkey_005fnobody.get(org.apache.taglibs.standard.tag.rt.fmt.MessageTag.class); + _jspx_th_fmt_005fmessage_005f0.setPageContext(_jspx_page_context); + _jspx_th_fmt_005fmessage_005f0.setParent(null); + // /WEB-INF/dashboardbeta.jsp(11,8) name = key type = null reqTime = true required = false fragment = false deferredValue = false expectedTypeName = null deferredMethod = false methodSignature = null + _jspx_th_fmt_005fmessage_005f0.setKey("home.pagetitle"); + int _jspx_eval_fmt_005fmessage_005f0 = _jspx_th_fmt_005fmessage_005f0.doStartTag(); + if (_jspx_th_fmt_005fmessage_005f0.doEndTag() == javax.servlet.jsp.tagext.Tag.SKIP_PAGE) { + return true; + } + _005fjspx_005ftagPool_005ffmt_005fmessage_0026_005fkey_005fnobody.reuse(_jspx_th_fmt_005fmessage_005f0); + return false; + } + + private boolean _jspx_meth_c_005fif_005f1(javax.servlet.jsp.PageContext _jspx_page_context) + throws java.lang.Throwable { + javax.servlet.jsp.PageContext pageContext = _jspx_page_context; + javax.servlet.jsp.JspWriter out = _jspx_page_context.getOut(); + // c:if + org.apache.taglibs.standard.tag.rt.core.IfTag _jspx_th_c_005fif_005f1 = (org.apache.taglibs.standard.tag.rt.core.IfTag) _005fjspx_005ftagPool_005fc_005fif_0026_005ftest.get(org.apache.taglibs.standard.tag.rt.core.IfTag.class); + _jspx_th_c_005fif_005f1.setPageContext(_jspx_page_context); + _jspx_th_c_005fif_005f1.setParent(null); + // /WEB-INF/header.jsp(3,0) name = test type = boolean reqTime = true required = true fragment = false deferredValue = false expectedTypeName = null deferredMethod = false methodSignature = null + _jspx_th_c_005fif_005f1.setTest(((java.lang.Boolean) org.apache.jasper.runtime.PageContextImpl.proprietaryEvaluate("${not empty pageContext.request.userPrincipal}", boolean.class, (javax.servlet.jsp.PageContext)_jspx_page_context, null)).booleanValue()); + int _jspx_eval_c_005fif_005f1 = _jspx_th_c_005fif_005f1.doStartTag(); + if (_jspx_eval_c_005fif_005f1 != javax.servlet.jsp.tagext.Tag.SKIP_BODY) { + do { + out.write("\r\n"); + out.write("
\r\n"); + out.write("
\r\n"); + out.write(" \r\n"); + out.write(" "); + out.write((java.lang.String) org.apache.jasper.runtime.PageContextImpl.proprietaryEvaluate("${pageContext.request.userPrincipal.name}", java.lang.String.class, (javax.servlet.jsp.PageContext)_jspx_page_context, null)); + out.write("\r\n"); + out.write(" |\r\n"); + out.write(" \r\n"); + out.write("
\r\n"); + out.write("
\r\n"); + int evalDoAfterBody = _jspx_th_c_005fif_005f1.doAfterBody(); + if (evalDoAfterBody != javax.servlet.jsp.tagext.BodyTag.EVAL_BODY_AGAIN) + break; + } while (true); + } + if (_jspx_th_c_005fif_005f1.doEndTag() == javax.servlet.jsp.tagext.Tag.SKIP_PAGE) { + return true; + } + _005fjspx_005ftagPool_005fc_005fif_0026_005ftest.reuse(_jspx_th_c_005fif_005f1); + return false; + } + + private boolean _jspx_meth_fmt_005fmessage_005f1(javax.servlet.jsp.tagext.JspTag _jspx_th_c_005fif_005f1, javax.servlet.jsp.PageContext _jspx_page_context) + throws java.lang.Throwable { + javax.servlet.jsp.PageContext pageContext = _jspx_page_context; + javax.servlet.jsp.JspWriter out = _jspx_page_context.getOut(); + // fmt:message + org.apache.taglibs.standard.tag.rt.fmt.MessageTag _jspx_th_fmt_005fmessage_005f1 = (org.apache.taglibs.standard.tag.rt.fmt.MessageTag) _005fjspx_005ftagPool_005ffmt_005fmessage_0026_005fkey_005fnobody.get(org.apache.taglibs.standard.tag.rt.fmt.MessageTag.class); + _jspx_th_fmt_005fmessage_005f1.setPageContext(_jspx_page_context); + _jspx_th_fmt_005fmessage_005f1.setParent((javax.servlet.jsp.tagext.Tag) _jspx_th_c_005fif_005f1); + // /WEB-INF/header.jsp(9,30) name = key type = null reqTime = true required = false fragment = false deferredValue = false expectedTypeName = null deferredMethod = false methodSignature = null + _jspx_th_fmt_005fmessage_005f1.setKey("header.logout"); + int _jspx_eval_fmt_005fmessage_005f1 = _jspx_th_fmt_005fmessage_005f1.doStartTag(); + if (_jspx_th_fmt_005fmessage_005f1.doEndTag() == javax.servlet.jsp.tagext.Tag.SKIP_PAGE) { + return true; + } + _005fjspx_005ftagPool_005ffmt_005fmessage_0026_005fkey_005fnobody.reuse(_jspx_th_fmt_005fmessage_005f1); + return false; + } + + private boolean _jspx_meth_c_005fchoose_005f0(javax.servlet.jsp.PageContext _jspx_page_context) + throws java.lang.Throwable { + javax.servlet.jsp.PageContext pageContext = _jspx_page_context; + javax.servlet.jsp.JspWriter out = _jspx_page_context.getOut(); + // c:choose + org.apache.taglibs.standard.tag.common.core.ChooseTag _jspx_th_c_005fchoose_005f0 = (org.apache.taglibs.standard.tag.common.core.ChooseTag) _005fjspx_005ftagPool_005fc_005fchoose.get(org.apache.taglibs.standard.tag.common.core.ChooseTag.class); + _jspx_th_c_005fchoose_005f0.setPageContext(_jspx_page_context); + _jspx_th_c_005fchoose_005f0.setParent(null); + int _jspx_eval_c_005fchoose_005f0 = _jspx_th_c_005fchoose_005f0.doStartTag(); + if (_jspx_eval_c_005fchoose_005f0 != javax.servlet.jsp.tagext.Tag.SKIP_BODY) { + do { + out.write('\r'); + out.write('\n'); + out.write(' '); + if (_jspx_meth_c_005fwhen_005f0(_jspx_th_c_005fchoose_005f0, _jspx_page_context)) + return true; + out.write('\r'); + out.write('\n'); + out.write(' '); + if (_jspx_meth_c_005fotherwise_005f0(_jspx_th_c_005fchoose_005f0, _jspx_page_context)) + return true; + out.write('\r'); + out.write('\n'); + int evalDoAfterBody = _jspx_th_c_005fchoose_005f0.doAfterBody(); + if (evalDoAfterBody != javax.servlet.jsp.tagext.BodyTag.EVAL_BODY_AGAIN) + break; + } while (true); + } + if (_jspx_th_c_005fchoose_005f0.doEndTag() == javax.servlet.jsp.tagext.Tag.SKIP_PAGE) { + return true; + } + _005fjspx_005ftagPool_005fc_005fchoose.reuse(_jspx_th_c_005fchoose_005f0); + return false; + } + + private boolean _jspx_meth_c_005fwhen_005f0(javax.servlet.jsp.tagext.JspTag _jspx_th_c_005fchoose_005f0, javax.servlet.jsp.PageContext _jspx_page_context) + throws java.lang.Throwable { + javax.servlet.jsp.PageContext pageContext = _jspx_page_context; + javax.servlet.jsp.JspWriter out = _jspx_page_context.getOut(); + // c:when + org.apache.taglibs.standard.tag.rt.core.WhenTag _jspx_th_c_005fwhen_005f0 = (org.apache.taglibs.standard.tag.rt.core.WhenTag) _005fjspx_005ftagPool_005fc_005fwhen_0026_005ftest.get(org.apache.taglibs.standard.tag.rt.core.WhenTag.class); + _jspx_th_c_005fwhen_005f0.setPageContext(_jspx_page_context); + _jspx_th_c_005fwhen_005f0.setParent((javax.servlet.jsp.tagext.Tag) _jspx_th_c_005fchoose_005f0); + // /WEB-INF/header.jsp(15,1) name = test type = boolean reqTime = true required = true fragment = false deferredValue = false expectedTypeName = null deferredMethod = false methodSignature = null + _jspx_th_c_005fwhen_005f0.setTest(((java.lang.Boolean) org.apache.jasper.runtime.PageContextImpl.proprietaryEvaluate("${empty style_headername}", boolean.class, (javax.servlet.jsp.PageContext)_jspx_page_context, null)).booleanValue()); + int _jspx_eval_c_005fwhen_005f0 = _jspx_th_c_005fwhen_005f0.doStartTag(); + if (_jspx_eval_c_005fwhen_005f0 != javax.servlet.jsp.tagext.Tag.SKIP_BODY) { + do { + out.write(" \r\n"); + out.write(" SMART Connect\r\n"); + out.write(" "); + int evalDoAfterBody = _jspx_th_c_005fwhen_005f0.doAfterBody(); + if (evalDoAfterBody != javax.servlet.jsp.tagext.BodyTag.EVAL_BODY_AGAIN) + break; + } while (true); + } + if (_jspx_th_c_005fwhen_005f0.doEndTag() == javax.servlet.jsp.tagext.Tag.SKIP_PAGE) { + return true; + } + _005fjspx_005ftagPool_005fc_005fwhen_0026_005ftest.reuse(_jspx_th_c_005fwhen_005f0); + return false; + } + + private boolean _jspx_meth_c_005fotherwise_005f0(javax.servlet.jsp.tagext.JspTag _jspx_th_c_005fchoose_005f0, javax.servlet.jsp.PageContext _jspx_page_context) + throws java.lang.Throwable { + javax.servlet.jsp.PageContext pageContext = _jspx_page_context; + javax.servlet.jsp.JspWriter out = _jspx_page_context.getOut(); + // c:otherwise + org.apache.taglibs.standard.tag.common.core.OtherwiseTag _jspx_th_c_005fotherwise_005f0 = (org.apache.taglibs.standard.tag.common.core.OtherwiseTag) _005fjspx_005ftagPool_005fc_005fotherwise.get(org.apache.taglibs.standard.tag.common.core.OtherwiseTag.class); + _jspx_th_c_005fotherwise_005f0.setPageContext(_jspx_page_context); + _jspx_th_c_005fotherwise_005f0.setParent((javax.servlet.jsp.tagext.Tag) _jspx_th_c_005fchoose_005f0); + int _jspx_eval_c_005fotherwise_005f0 = _jspx_th_c_005fotherwise_005f0.doStartTag(); + if (_jspx_eval_c_005fotherwise_005f0 != javax.servlet.jsp.tagext.Tag.SKIP_BODY) { + do { + out.write('\r'); + out.write('\n'); + out.write(' '); + out.write((java.lang.String) org.apache.jasper.runtime.PageContextImpl.proprietaryEvaluate("${style_headername}", java.lang.String.class, (javax.servlet.jsp.PageContext)_jspx_page_context, null)); + out.write('\r'); + out.write('\n'); + out.write(' '); + int evalDoAfterBody = _jspx_th_c_005fotherwise_005f0.doAfterBody(); + if (evalDoAfterBody != javax.servlet.jsp.tagext.BodyTag.EVAL_BODY_AGAIN) + break; + } while (true); + } + if (_jspx_th_c_005fotherwise_005f0.doEndTag() == javax.servlet.jsp.tagext.Tag.SKIP_PAGE) { + return true; + } + _005fjspx_005ftagPool_005fc_005fotherwise.reuse(_jspx_th_c_005fotherwise_005f0); + return false; + } + + private boolean _jspx_meth_c_005fforEach_005f1(javax.servlet.jsp.PageContext _jspx_page_context) + throws java.lang.Throwable { + javax.servlet.jsp.PageContext pageContext = _jspx_page_context; + javax.servlet.jsp.JspWriter out = _jspx_page_context.getOut(); + // c:forEach + org.apache.taglibs.standard.tag.rt.core.ForEachTag _jspx_th_c_005fforEach_005f1 = (org.apache.taglibs.standard.tag.rt.core.ForEachTag) _005fjspx_005ftagPool_005fc_005fforEach_0026_005fvar_005fitems.get(org.apache.taglibs.standard.tag.rt.core.ForEachTag.class); + _jspx_th_c_005fforEach_005f1.setPageContext(_jspx_page_context); + _jspx_th_c_005fforEach_005f1.setParent(null); + // /WEB-INF/menu.jsp(16,0) name = var type = java.lang.String reqTime = false required = false fragment = false deferredValue = false expectedTypeName = null deferredMethod = false methodSignature = null + _jspx_th_c_005fforEach_005f1.setVar("item"); + // /WEB-INF/menu.jsp(16,0) name = items type = javax.el.ValueExpression reqTime = true required = false fragment = false deferredValue = true expectedTypeName = java.lang.Object deferredMethod = false methodSignature = null + _jspx_th_c_005fforEach_005f1.setItems(new org.apache.jasper.el.JspValueExpression("/WEB-INF/menu.jsp(16,0) '${menuitems}'",_jsp_getExpressionFactory().createValueExpression(_jspx_page_context.getELContext(),"${menuitems}",java.lang.Object.class)).getValue(_jspx_page_context.getELContext())); + int[] _jspx_push_body_count_c_005fforEach_005f1 = new int[] { 0 }; + try { + int _jspx_eval_c_005fforEach_005f1 = _jspx_th_c_005fforEach_005f1.doStartTag(); + if (_jspx_eval_c_005fforEach_005f1 != javax.servlet.jsp.tagext.Tag.SKIP_BODY) { + do { + out.write("\r\n"); + out.write("
\r\n"); + out.write(" \r\n"); + out.write("
"); + out.write((java.lang.String) org.apache.jasper.runtime.PageContextImpl.proprietaryEvaluate("${item[0]}", java.lang.String.class, (javax.servlet.jsp.PageContext)_jspx_page_context, null)); + out.write("
\r\n"); + out.write("
\r\n"); + out.write(" "); + int evalDoAfterBody = _jspx_th_c_005fforEach_005f1.doAfterBody(); + if (evalDoAfterBody != javax.servlet.jsp.tagext.BodyTag.EVAL_BODY_AGAIN) + break; + } while (true); + } + if (_jspx_th_c_005fforEach_005f1.doEndTag() == javax.servlet.jsp.tagext.Tag.SKIP_PAGE) { + return true; + } + } catch (java.lang.Throwable _jspx_exception) { + while (_jspx_push_body_count_c_005fforEach_005f1[0]-- > 0) + out = _jspx_page_context.popBody(); + _jspx_th_c_005fforEach_005f1.doCatch(_jspx_exception); + } finally { + _jspx_th_c_005fforEach_005f1.doFinally(); + } + _005fjspx_005ftagPool_005fc_005fforEach_0026_005fvar_005fitems.reuse(_jspx_th_c_005fforEach_005f1); + return false; + } + + private boolean _jspx_meth_fmt_005fmessage_005f2(javax.servlet.jsp.PageContext _jspx_page_context) + throws java.lang.Throwable { + javax.servlet.jsp.PageContext pageContext = _jspx_page_context; + javax.servlet.jsp.JspWriter out = _jspx_page_context.getOut(); + // fmt:message + org.apache.taglibs.standard.tag.rt.fmt.MessageTag _jspx_th_fmt_005fmessage_005f2 = (org.apache.taglibs.standard.tag.rt.fmt.MessageTag) _005fjspx_005ftagPool_005ffmt_005fmessage_0026_005fkey_005fnobody.get(org.apache.taglibs.standard.tag.rt.fmt.MessageTag.class); + _jspx_th_fmt_005fmessage_005f2.setPageContext(_jspx_page_context); + _jspx_th_fmt_005fmessage_005f2.setParent(null); + // /WEB-INF/dashboardbeta.jsp(18,78) name = key type = null reqTime = true required = false fragment = false deferredValue = false expectedTypeName = null deferredMethod = false methodSignature = null + _jspx_th_fmt_005fmessage_005f2.setKey("dashboardbeta.title"); + int _jspx_eval_fmt_005fmessage_005f2 = _jspx_th_fmt_005fmessage_005f2.doStartTag(); + if (_jspx_th_fmt_005fmessage_005f2.doEndTag() == javax.servlet.jsp.tagext.Tag.SKIP_PAGE) { + return true; + } + _005fjspx_005ftagPool_005ffmt_005fmessage_0026_005fkey_005fnobody.reuse(_jspx_th_fmt_005fmessage_005f2); + return false; + } + + private boolean _jspx_meth_fmt_005fmessage_005f3(javax.servlet.jsp.PageContext _jspx_page_context) + throws java.lang.Throwable { + javax.servlet.jsp.PageContext pageContext = _jspx_page_context; + javax.servlet.jsp.JspWriter out = _jspx_page_context.getOut(); + // fmt:message + org.apache.taglibs.standard.tag.rt.fmt.MessageTag _jspx_th_fmt_005fmessage_005f3 = (org.apache.taglibs.standard.tag.rt.fmt.MessageTag) _005fjspx_005ftagPool_005ffmt_005fmessage_0026_005fkey_005fnobody.get(org.apache.taglibs.standard.tag.rt.fmt.MessageTag.class); + _jspx_th_fmt_005fmessage_005f3.setPageContext(_jspx_page_context); + _jspx_th_fmt_005fmessage_005f3.setParent(null); + // /WEB-INF/dashboardbeta.jsp(23,88) name = key type = null reqTime = true required = false fragment = false deferredValue = false expectedTypeName = null deferredMethod = false methodSignature = null + _jspx_th_fmt_005fmessage_005f3.setKey("dashboardbeta.refreshreports"); + int _jspx_eval_fmt_005fmessage_005f3 = _jspx_th_fmt_005fmessage_005f3.doStartTag(); + if (_jspx_th_fmt_005fmessage_005f3.doEndTag() == javax.servlet.jsp.tagext.Tag.SKIP_PAGE) { + return true; + } + _005fjspx_005ftagPool_005ffmt_005fmessage_0026_005fkey_005fnobody.reuse(_jspx_th_fmt_005fmessage_005f3); + return false; + } + + private boolean _jspx_meth_fmt_005fmessage_005f4(javax.servlet.jsp.PageContext _jspx_page_context) + throws java.lang.Throwable { + javax.servlet.jsp.PageContext pageContext = _jspx_page_context; + javax.servlet.jsp.JspWriter out = _jspx_page_context.getOut(); + // fmt:message + org.apache.taglibs.standard.tag.rt.fmt.MessageTag _jspx_th_fmt_005fmessage_005f4 = (org.apache.taglibs.standard.tag.rt.fmt.MessageTag) _005fjspx_005ftagPool_005ffmt_005fmessage_0026_005fkey_005fnobody.get(org.apache.taglibs.standard.tag.rt.fmt.MessageTag.class); + _jspx_th_fmt_005fmessage_005f4.setPageContext(_jspx_page_context); + _jspx_th_fmt_005fmessage_005f4.setParent(null); + // /WEB-INF/dashboardbeta.jsp(52,21) name = key type = null reqTime = true required = false fragment = false deferredValue = false expectedTypeName = null deferredMethod = false methodSignature = null + _jspx_th_fmt_005fmessage_005f4.setKey("dashboardbeta.oneday"); + int _jspx_eval_fmt_005fmessage_005f4 = _jspx_th_fmt_005fmessage_005f4.doStartTag(); + if (_jspx_th_fmt_005fmessage_005f4.doEndTag() == javax.servlet.jsp.tagext.Tag.SKIP_PAGE) { + return true; + } + _005fjspx_005ftagPool_005ffmt_005fmessage_0026_005fkey_005fnobody.reuse(_jspx_th_fmt_005fmessage_005f4); + return false; + } + + private boolean _jspx_meth_fmt_005fmessage_005f5(javax.servlet.jsp.PageContext _jspx_page_context) + throws java.lang.Throwable { + javax.servlet.jsp.PageContext pageContext = _jspx_page_context; + javax.servlet.jsp.JspWriter out = _jspx_page_context.getOut(); + // fmt:message + org.apache.taglibs.standard.tag.rt.fmt.MessageTag _jspx_th_fmt_005fmessage_005f5 = (org.apache.taglibs.standard.tag.rt.fmt.MessageTag) _005fjspx_005ftagPool_005ffmt_005fmessage_0026_005fkey_005fnobody.get(org.apache.taglibs.standard.tag.rt.fmt.MessageTag.class); + _jspx_th_fmt_005fmessage_005f5.setPageContext(_jspx_page_context); + _jspx_th_fmt_005fmessage_005f5.setParent(null); + // /WEB-INF/dashboardbeta.jsp(53,21) name = key type = null reqTime = true required = false fragment = false deferredValue = false expectedTypeName = null deferredMethod = false methodSignature = null + _jspx_th_fmt_005fmessage_005f5.setKey("dashboardbeta.oneweek"); + int _jspx_eval_fmt_005fmessage_005f5 = _jspx_th_fmt_005fmessage_005f5.doStartTag(); + if (_jspx_th_fmt_005fmessage_005f5.doEndTag() == javax.servlet.jsp.tagext.Tag.SKIP_PAGE) { + return true; + } + _005fjspx_005ftagPool_005ffmt_005fmessage_0026_005fkey_005fnobody.reuse(_jspx_th_fmt_005fmessage_005f5); + return false; + } + + private boolean _jspx_meth_fmt_005fmessage_005f6(javax.servlet.jsp.PageContext _jspx_page_context) + throws java.lang.Throwable { + javax.servlet.jsp.PageContext pageContext = _jspx_page_context; + javax.servlet.jsp.JspWriter out = _jspx_page_context.getOut(); + // fmt:message + org.apache.taglibs.standard.tag.rt.fmt.MessageTag _jspx_th_fmt_005fmessage_005f6 = (org.apache.taglibs.standard.tag.rt.fmt.MessageTag) _005fjspx_005ftagPool_005ffmt_005fmessage_0026_005fkey_005fnobody.get(org.apache.taglibs.standard.tag.rt.fmt.MessageTag.class); + _jspx_th_fmt_005fmessage_005f6.setPageContext(_jspx_page_context); + _jspx_th_fmt_005fmessage_005f6.setParent(null); + // /WEB-INF/dashboardbeta.jsp(54,22) name = key type = null reqTime = true required = false fragment = false deferredValue = false expectedTypeName = null deferredMethod = false methodSignature = null + _jspx_th_fmt_005fmessage_005f6.setKey("dashboardbeta.onemonth"); + int _jspx_eval_fmt_005fmessage_005f6 = _jspx_th_fmt_005fmessage_005f6.doStartTag(); + if (_jspx_th_fmt_005fmessage_005f6.doEndTag() == javax.servlet.jsp.tagext.Tag.SKIP_PAGE) { + return true; + } + _005fjspx_005ftagPool_005ffmt_005fmessage_0026_005fkey_005fnobody.reuse(_jspx_th_fmt_005fmessage_005f6); + return false; + } + + private boolean _jspx_meth_fmt_005fmessage_005f7(javax.servlet.jsp.PageContext _jspx_page_context) + throws java.lang.Throwable { + javax.servlet.jsp.PageContext pageContext = _jspx_page_context; + javax.servlet.jsp.JspWriter out = _jspx_page_context.getOut(); + // fmt:message + org.apache.taglibs.standard.tag.rt.fmt.MessageTag _jspx_th_fmt_005fmessage_005f7 = (org.apache.taglibs.standard.tag.rt.fmt.MessageTag) _005fjspx_005ftagPool_005ffmt_005fmessage_0026_005fkey_005fnobody.get(org.apache.taglibs.standard.tag.rt.fmt.MessageTag.class); + _jspx_th_fmt_005fmessage_005f7.setPageContext(_jspx_page_context); + _jspx_th_fmt_005fmessage_005f7.setParent(null); + // /WEB-INF/dashboardbeta.jsp(55,23) name = key type = null reqTime = true required = false fragment = false deferredValue = false expectedTypeName = null deferredMethod = false methodSignature = null + _jspx_th_fmt_005fmessage_005f7.setKey("dashboardbeta.sixmonths"); + int _jspx_eval_fmt_005fmessage_005f7 = _jspx_th_fmt_005fmessage_005f7.doStartTag(); + if (_jspx_th_fmt_005fmessage_005f7.doEndTag() == javax.servlet.jsp.tagext.Tag.SKIP_PAGE) { + return true; + } + _005fjspx_005ftagPool_005ffmt_005fmessage_0026_005fkey_005fnobody.reuse(_jspx_th_fmt_005fmessage_005f7); + return false; + } + + private boolean _jspx_meth_fmt_005fmessage_005f8(javax.servlet.jsp.PageContext _jspx_page_context) + throws java.lang.Throwable { + javax.servlet.jsp.PageContext pageContext = _jspx_page_context; + javax.servlet.jsp.JspWriter out = _jspx_page_context.getOut(); + // fmt:message + org.apache.taglibs.standard.tag.rt.fmt.MessageTag _jspx_th_fmt_005fmessage_005f8 = (org.apache.taglibs.standard.tag.rt.fmt.MessageTag) _005fjspx_005ftagPool_005ffmt_005fmessage_0026_005fkey_005fnobody.get(org.apache.taglibs.standard.tag.rt.fmt.MessageTag.class); + _jspx_th_fmt_005fmessage_005f8.setPageContext(_jspx_page_context); + _jspx_th_fmt_005fmessage_005f8.setParent(null); + // /WEB-INF/dashboardbeta.jsp(56,23) name = key type = null reqTime = true required = false fragment = false deferredValue = false expectedTypeName = null deferredMethod = false methodSignature = null + _jspx_th_fmt_005fmessage_005f8.setKey("dashboardbeta.oneyear"); + int _jspx_eval_fmt_005fmessage_005f8 = _jspx_th_fmt_005fmessage_005f8.doStartTag(); + if (_jspx_th_fmt_005fmessage_005f8.doEndTag() == javax.servlet.jsp.tagext.Tag.SKIP_PAGE) { + return true; + } + _005fjspx_005ftagPool_005ffmt_005fmessage_0026_005fkey_005fnobody.reuse(_jspx_th_fmt_005fmessage_005f8); + return false; + } + + private boolean _jspx_meth_fmt_005fmessage_005f9(javax.servlet.jsp.PageContext _jspx_page_context) + throws java.lang.Throwable { + javax.servlet.jsp.PageContext pageContext = _jspx_page_context; + javax.servlet.jsp.JspWriter out = _jspx_page_context.getOut(); + // fmt:message + org.apache.taglibs.standard.tag.rt.fmt.MessageTag _jspx_th_fmt_005fmessage_005f9 = (org.apache.taglibs.standard.tag.rt.fmt.MessageTag) _005fjspx_005ftagPool_005ffmt_005fmessage_0026_005fkey_005fnobody.get(org.apache.taglibs.standard.tag.rt.fmt.MessageTag.class); + _jspx_th_fmt_005fmessage_005f9.setPageContext(_jspx_page_context); + _jspx_th_fmt_005fmessage_005f9.setParent(null); + // /WEB-INF/dashboardbeta.jsp(57,23) name = key type = null reqTime = true required = false fragment = false deferredValue = false expectedTypeName = null deferredMethod = false methodSignature = null + _jspx_th_fmt_005fmessage_005f9.setKey("dashboardbeta.monthtodate"); + int _jspx_eval_fmt_005fmessage_005f9 = _jspx_th_fmt_005fmessage_005f9.doStartTag(); + if (_jspx_th_fmt_005fmessage_005f9.doEndTag() == javax.servlet.jsp.tagext.Tag.SKIP_PAGE) { + return true; + } + _005fjspx_005ftagPool_005ffmt_005fmessage_0026_005fkey_005fnobody.reuse(_jspx_th_fmt_005fmessage_005f9); + return false; + } + + private boolean _jspx_meth_fmt_005fmessage_005f10(javax.servlet.jsp.PageContext _jspx_page_context) + throws java.lang.Throwable { + javax.servlet.jsp.PageContext pageContext = _jspx_page_context; + javax.servlet.jsp.JspWriter out = _jspx_page_context.getOut(); + // fmt:message + org.apache.taglibs.standard.tag.rt.fmt.MessageTag _jspx_th_fmt_005fmessage_005f10 = (org.apache.taglibs.standard.tag.rt.fmt.MessageTag) _005fjspx_005ftagPool_005ffmt_005fmessage_0026_005fkey_005fnobody.get(org.apache.taglibs.standard.tag.rt.fmt.MessageTag.class); + _jspx_th_fmt_005fmessage_005f10.setPageContext(_jspx_page_context); + _jspx_th_fmt_005fmessage_005f10.setParent(null); + // /WEB-INF/dashboardbeta.jsp(58,24) name = key type = null reqTime = true required = false fragment = false deferredValue = false expectedTypeName = null deferredMethod = false methodSignature = null + _jspx_th_fmt_005fmessage_005f10.setKey("dashboardbeta.yeartodate"); + int _jspx_eval_fmt_005fmessage_005f10 = _jspx_th_fmt_005fmessage_005f10.doStartTag(); + if (_jspx_th_fmt_005fmessage_005f10.doEndTag() == javax.servlet.jsp.tagext.Tag.SKIP_PAGE) { + return true; + } + _005fjspx_005ftagPool_005ffmt_005fmessage_0026_005fkey_005fnobody.reuse(_jspx_th_fmt_005fmessage_005f10); + return false; + } + + private boolean _jspx_meth_fmt_005fmessage_005f11(javax.servlet.jsp.PageContext _jspx_page_context) + throws java.lang.Throwable { + javax.servlet.jsp.PageContext pageContext = _jspx_page_context; + javax.servlet.jsp.JspWriter out = _jspx_page_context.getOut(); + // fmt:message + org.apache.taglibs.standard.tag.rt.fmt.MessageTag _jspx_th_fmt_005fmessage_005f11 = (org.apache.taglibs.standard.tag.rt.fmt.MessageTag) _005fjspx_005ftagPool_005ffmt_005fmessage_0026_005fkey_005fnobody.get(org.apache.taglibs.standard.tag.rt.fmt.MessageTag.class); + _jspx_th_fmt_005fmessage_005f11.setPageContext(_jspx_page_context); + _jspx_th_fmt_005fmessage_005f11.setParent(null); + // /WEB-INF/dashboardbeta.jsp(59,25) name = key type = null reqTime = true required = false fragment = false deferredValue = false expectedTypeName = null deferredMethod = false methodSignature = null + _jspx_th_fmt_005fmessage_005f11.setKey("dashboardbeta.custom"); + int _jspx_eval_fmt_005fmessage_005f11 = _jspx_th_fmt_005fmessage_005f11.doStartTag(); + if (_jspx_th_fmt_005fmessage_005f11.doEndTag() == javax.servlet.jsp.tagext.Tag.SKIP_PAGE) { + return true; + } + _005fjspx_005ftagPool_005ffmt_005fmessage_0026_005fkey_005fnobody.reuse(_jspx_th_fmt_005fmessage_005f11); + return false; + } + + private boolean _jspx_meth_fmt_005fmessage_005f12(javax.servlet.jsp.PageContext _jspx_page_context) + throws java.lang.Throwable { + javax.servlet.jsp.PageContext pageContext = _jspx_page_context; + javax.servlet.jsp.JspWriter out = _jspx_page_context.getOut(); + // fmt:message + org.apache.taglibs.standard.tag.rt.fmt.MessageTag _jspx_th_fmt_005fmessage_005f12 = (org.apache.taglibs.standard.tag.rt.fmt.MessageTag) _005fjspx_005ftagPool_005ffmt_005fmessage_0026_005fkey_005fnobody.get(org.apache.taglibs.standard.tag.rt.fmt.MessageTag.class); + _jspx_th_fmt_005fmessage_005f12.setPageContext(_jspx_page_context); + _jspx_th_fmt_005fmessage_005f12.setParent(null); + // /WEB-INF/dashboardbeta.jsp(62,93) name = key type = null reqTime = true required = false fragment = false deferredValue = false expectedTypeName = null deferredMethod = false methodSignature = null + _jspx_th_fmt_005fmessage_005f12.setKey("dashboardbeta.runreport"); + int _jspx_eval_fmt_005fmessage_005f12 = _jspx_th_fmt_005fmessage_005f12.doStartTag(); + if (_jspx_th_fmt_005fmessage_005f12.doEndTag() == javax.servlet.jsp.tagext.Tag.SKIP_PAGE) { + return true; + } + _005fjspx_005ftagPool_005ffmt_005fmessage_0026_005fkey_005fnobody.reuse(_jspx_th_fmt_005fmessage_005f12); + return false; + } + + private boolean _jspx_meth_fmt_005fmessage_005f13(javax.servlet.jsp.PageContext _jspx_page_context) + throws java.lang.Throwable { + javax.servlet.jsp.PageContext pageContext = _jspx_page_context; + javax.servlet.jsp.JspWriter out = _jspx_page_context.getOut(); + // fmt:message + org.apache.taglibs.standard.tag.rt.fmt.MessageTag _jspx_th_fmt_005fmessage_005f13 = (org.apache.taglibs.standard.tag.rt.fmt.MessageTag) _005fjspx_005ftagPool_005ffmt_005fmessage_0026_005fkey_005fnobody.get(org.apache.taglibs.standard.tag.rt.fmt.MessageTag.class); + _jspx_th_fmt_005fmessage_005f13.setPageContext(_jspx_page_context); + _jspx_th_fmt_005fmessage_005f13.setParent(null); + // /WEB-INF/dashboardbeta.jsp(75,21) name = key type = null reqTime = true required = false fragment = false deferredValue = false expectedTypeName = null deferredMethod = false methodSignature = null + _jspx_th_fmt_005fmessage_005f13.setKey("dashboardbeta.oneday"); + int _jspx_eval_fmt_005fmessage_005f13 = _jspx_th_fmt_005fmessage_005f13.doStartTag(); + if (_jspx_th_fmt_005fmessage_005f13.doEndTag() == javax.servlet.jsp.tagext.Tag.SKIP_PAGE) { + return true; + } + _005fjspx_005ftagPool_005ffmt_005fmessage_0026_005fkey_005fnobody.reuse(_jspx_th_fmt_005fmessage_005f13); + return false; + } + + private boolean _jspx_meth_fmt_005fmessage_005f14(javax.servlet.jsp.PageContext _jspx_page_context) + throws java.lang.Throwable { + javax.servlet.jsp.PageContext pageContext = _jspx_page_context; + javax.servlet.jsp.JspWriter out = _jspx_page_context.getOut(); + // fmt:message + org.apache.taglibs.standard.tag.rt.fmt.MessageTag _jspx_th_fmt_005fmessage_005f14 = (org.apache.taglibs.standard.tag.rt.fmt.MessageTag) _005fjspx_005ftagPool_005ffmt_005fmessage_0026_005fkey_005fnobody.get(org.apache.taglibs.standard.tag.rt.fmt.MessageTag.class); + _jspx_th_fmt_005fmessage_005f14.setPageContext(_jspx_page_context); + _jspx_th_fmt_005fmessage_005f14.setParent(null); + // /WEB-INF/dashboardbeta.jsp(76,21) name = key type = null reqTime = true required = false fragment = false deferredValue = false expectedTypeName = null deferredMethod = false methodSignature = null + _jspx_th_fmt_005fmessage_005f14.setKey("dashboardbeta.oneweek"); + int _jspx_eval_fmt_005fmessage_005f14 = _jspx_th_fmt_005fmessage_005f14.doStartTag(); + if (_jspx_th_fmt_005fmessage_005f14.doEndTag() == javax.servlet.jsp.tagext.Tag.SKIP_PAGE) { + return true; + } + _005fjspx_005ftagPool_005ffmt_005fmessage_0026_005fkey_005fnobody.reuse(_jspx_th_fmt_005fmessage_005f14); + return false; + } + + private boolean _jspx_meth_fmt_005fmessage_005f15(javax.servlet.jsp.PageContext _jspx_page_context) + throws java.lang.Throwable { + javax.servlet.jsp.PageContext pageContext = _jspx_page_context; + javax.servlet.jsp.JspWriter out = _jspx_page_context.getOut(); + // fmt:message + org.apache.taglibs.standard.tag.rt.fmt.MessageTag _jspx_th_fmt_005fmessage_005f15 = (org.apache.taglibs.standard.tag.rt.fmt.MessageTag) _005fjspx_005ftagPool_005ffmt_005fmessage_0026_005fkey_005fnobody.get(org.apache.taglibs.standard.tag.rt.fmt.MessageTag.class); + _jspx_th_fmt_005fmessage_005f15.setPageContext(_jspx_page_context); + _jspx_th_fmt_005fmessage_005f15.setParent(null); + // /WEB-INF/dashboardbeta.jsp(77,22) name = key type = null reqTime = true required = false fragment = false deferredValue = false expectedTypeName = null deferredMethod = false methodSignature = null + _jspx_th_fmt_005fmessage_005f15.setKey("dashboardbeta.onemonth"); + int _jspx_eval_fmt_005fmessage_005f15 = _jspx_th_fmt_005fmessage_005f15.doStartTag(); + if (_jspx_th_fmt_005fmessage_005f15.doEndTag() == javax.servlet.jsp.tagext.Tag.SKIP_PAGE) { + return true; + } + _005fjspx_005ftagPool_005ffmt_005fmessage_0026_005fkey_005fnobody.reuse(_jspx_th_fmt_005fmessage_005f15); + return false; + } + + private boolean _jspx_meth_fmt_005fmessage_005f16(javax.servlet.jsp.PageContext _jspx_page_context) + throws java.lang.Throwable { + javax.servlet.jsp.PageContext pageContext = _jspx_page_context; + javax.servlet.jsp.JspWriter out = _jspx_page_context.getOut(); + // fmt:message + org.apache.taglibs.standard.tag.rt.fmt.MessageTag _jspx_th_fmt_005fmessage_005f16 = (org.apache.taglibs.standard.tag.rt.fmt.MessageTag) _005fjspx_005ftagPool_005ffmt_005fmessage_0026_005fkey_005fnobody.get(org.apache.taglibs.standard.tag.rt.fmt.MessageTag.class); + _jspx_th_fmt_005fmessage_005f16.setPageContext(_jspx_page_context); + _jspx_th_fmt_005fmessage_005f16.setParent(null); + // /WEB-INF/dashboardbeta.jsp(78,23) name = key type = null reqTime = true required = false fragment = false deferredValue = false expectedTypeName = null deferredMethod = false methodSignature = null + _jspx_th_fmt_005fmessage_005f16.setKey("dashboardbeta.sixmonths"); + int _jspx_eval_fmt_005fmessage_005f16 = _jspx_th_fmt_005fmessage_005f16.doStartTag(); + if (_jspx_th_fmt_005fmessage_005f16.doEndTag() == javax.servlet.jsp.tagext.Tag.SKIP_PAGE) { + return true; + } + _005fjspx_005ftagPool_005ffmt_005fmessage_0026_005fkey_005fnobody.reuse(_jspx_th_fmt_005fmessage_005f16); + return false; + } + + private boolean _jspx_meth_fmt_005fmessage_005f17(javax.servlet.jsp.PageContext _jspx_page_context) + throws java.lang.Throwable { + javax.servlet.jsp.PageContext pageContext = _jspx_page_context; + javax.servlet.jsp.JspWriter out = _jspx_page_context.getOut(); + // fmt:message + org.apache.taglibs.standard.tag.rt.fmt.MessageTag _jspx_th_fmt_005fmessage_005f17 = (org.apache.taglibs.standard.tag.rt.fmt.MessageTag) _005fjspx_005ftagPool_005ffmt_005fmessage_0026_005fkey_005fnobody.get(org.apache.taglibs.standard.tag.rt.fmt.MessageTag.class); + _jspx_th_fmt_005fmessage_005f17.setPageContext(_jspx_page_context); + _jspx_th_fmt_005fmessage_005f17.setParent(null); + // /WEB-INF/dashboardbeta.jsp(79,23) name = key type = null reqTime = true required = false fragment = false deferredValue = false expectedTypeName = null deferredMethod = false methodSignature = null + _jspx_th_fmt_005fmessage_005f17.setKey("dashboardbeta.oneyear"); + int _jspx_eval_fmt_005fmessage_005f17 = _jspx_th_fmt_005fmessage_005f17.doStartTag(); + if (_jspx_th_fmt_005fmessage_005f17.doEndTag() == javax.servlet.jsp.tagext.Tag.SKIP_PAGE) { + return true; + } + _005fjspx_005ftagPool_005ffmt_005fmessage_0026_005fkey_005fnobody.reuse(_jspx_th_fmt_005fmessage_005f17); + return false; + } + + private boolean _jspx_meth_fmt_005fmessage_005f18(javax.servlet.jsp.PageContext _jspx_page_context) + throws java.lang.Throwable { + javax.servlet.jsp.PageContext pageContext = _jspx_page_context; + javax.servlet.jsp.JspWriter out = _jspx_page_context.getOut(); + // fmt:message + org.apache.taglibs.standard.tag.rt.fmt.MessageTag _jspx_th_fmt_005fmessage_005f18 = (org.apache.taglibs.standard.tag.rt.fmt.MessageTag) _005fjspx_005ftagPool_005ffmt_005fmessage_0026_005fkey_005fnobody.get(org.apache.taglibs.standard.tag.rt.fmt.MessageTag.class); + _jspx_th_fmt_005fmessage_005f18.setPageContext(_jspx_page_context); + _jspx_th_fmt_005fmessage_005f18.setParent(null); + // /WEB-INF/dashboardbeta.jsp(80,23) name = key type = null reqTime = true required = false fragment = false deferredValue = false expectedTypeName = null deferredMethod = false methodSignature = null + _jspx_th_fmt_005fmessage_005f18.setKey("dashboardbeta.monthtodate"); + int _jspx_eval_fmt_005fmessage_005f18 = _jspx_th_fmt_005fmessage_005f18.doStartTag(); + if (_jspx_th_fmt_005fmessage_005f18.doEndTag() == javax.servlet.jsp.tagext.Tag.SKIP_PAGE) { + return true; + } + _005fjspx_005ftagPool_005ffmt_005fmessage_0026_005fkey_005fnobody.reuse(_jspx_th_fmt_005fmessage_005f18); + return false; + } + + private boolean _jspx_meth_fmt_005fmessage_005f19(javax.servlet.jsp.PageContext _jspx_page_context) + throws java.lang.Throwable { + javax.servlet.jsp.PageContext pageContext = _jspx_page_context; + javax.servlet.jsp.JspWriter out = _jspx_page_context.getOut(); + // fmt:message + org.apache.taglibs.standard.tag.rt.fmt.MessageTag _jspx_th_fmt_005fmessage_005f19 = (org.apache.taglibs.standard.tag.rt.fmt.MessageTag) _005fjspx_005ftagPool_005ffmt_005fmessage_0026_005fkey_005fnobody.get(org.apache.taglibs.standard.tag.rt.fmt.MessageTag.class); + _jspx_th_fmt_005fmessage_005f19.setPageContext(_jspx_page_context); + _jspx_th_fmt_005fmessage_005f19.setParent(null); + // /WEB-INF/dashboardbeta.jsp(81,24) name = key type = null reqTime = true required = false fragment = false deferredValue = false expectedTypeName = null deferredMethod = false methodSignature = null + _jspx_th_fmt_005fmessage_005f19.setKey("dashboardbeta.yeartodate"); + int _jspx_eval_fmt_005fmessage_005f19 = _jspx_th_fmt_005fmessage_005f19.doStartTag(); + if (_jspx_th_fmt_005fmessage_005f19.doEndTag() == javax.servlet.jsp.tagext.Tag.SKIP_PAGE) { + return true; + } + _005fjspx_005ftagPool_005ffmt_005fmessage_0026_005fkey_005fnobody.reuse(_jspx_th_fmt_005fmessage_005f19); + return false; + } + + private boolean _jspx_meth_fmt_005fmessage_005f20(javax.servlet.jsp.PageContext _jspx_page_context) + throws java.lang.Throwable { + javax.servlet.jsp.PageContext pageContext = _jspx_page_context; + javax.servlet.jsp.JspWriter out = _jspx_page_context.getOut(); + // fmt:message + org.apache.taglibs.standard.tag.rt.fmt.MessageTag _jspx_th_fmt_005fmessage_005f20 = (org.apache.taglibs.standard.tag.rt.fmt.MessageTag) _005fjspx_005ftagPool_005ffmt_005fmessage_0026_005fkey_005fnobody.get(org.apache.taglibs.standard.tag.rt.fmt.MessageTag.class); + _jspx_th_fmt_005fmessage_005f20.setPageContext(_jspx_page_context); + _jspx_th_fmt_005fmessage_005f20.setParent(null); + // /WEB-INF/dashboardbeta.jsp(82,25) name = key type = null reqTime = true required = false fragment = false deferredValue = false expectedTypeName = null deferredMethod = false methodSignature = null + _jspx_th_fmt_005fmessage_005f20.setKey("dashboardbeta.custom"); + int _jspx_eval_fmt_005fmessage_005f20 = _jspx_th_fmt_005fmessage_005f20.doStartTag(); + if (_jspx_th_fmt_005fmessage_005f20.doEndTag() == javax.servlet.jsp.tagext.Tag.SKIP_PAGE) { + return true; + } + _005fjspx_005ftagPool_005ffmt_005fmessage_0026_005fkey_005fnobody.reuse(_jspx_th_fmt_005fmessage_005f20); + return false; + } + + private boolean _jspx_meth_fmt_005fmessage_005f21(javax.servlet.jsp.PageContext _jspx_page_context) + throws java.lang.Throwable { + javax.servlet.jsp.PageContext pageContext = _jspx_page_context; + javax.servlet.jsp.JspWriter out = _jspx_page_context.getOut(); + // fmt:message + org.apache.taglibs.standard.tag.rt.fmt.MessageTag _jspx_th_fmt_005fmessage_005f21 = (org.apache.taglibs.standard.tag.rt.fmt.MessageTag) _005fjspx_005ftagPool_005ffmt_005fmessage_0026_005fkey_005fnobody.get(org.apache.taglibs.standard.tag.rt.fmt.MessageTag.class); + _jspx_th_fmt_005fmessage_005f21.setPageContext(_jspx_page_context); + _jspx_th_fmt_005fmessage_005f21.setParent(null); + // /WEB-INF/dashboardbeta.jsp(83,25) name = key type = null reqTime = true required = false fragment = false deferredValue = false expectedTypeName = null deferredMethod = false methodSignature = null + _jspx_th_fmt_005fmessage_005f21.setKey("dashboardbeta.sameasreport1"); + int _jspx_eval_fmt_005fmessage_005f21 = _jspx_th_fmt_005fmessage_005f21.doStartTag(); + if (_jspx_th_fmt_005fmessage_005f21.doEndTag() == javax.servlet.jsp.tagext.Tag.SKIP_PAGE) { + return true; + } + _005fjspx_005ftagPool_005ffmt_005fmessage_0026_005fkey_005fnobody.reuse(_jspx_th_fmt_005fmessage_005f21); + return false; + } + + private boolean _jspx_meth_fmt_005fmessage_005f22(javax.servlet.jsp.PageContext _jspx_page_context) + throws java.lang.Throwable { + javax.servlet.jsp.PageContext pageContext = _jspx_page_context; + javax.servlet.jsp.JspWriter out = _jspx_page_context.getOut(); + // fmt:message + org.apache.taglibs.standard.tag.rt.fmt.MessageTag _jspx_th_fmt_005fmessage_005f22 = (org.apache.taglibs.standard.tag.rt.fmt.MessageTag) _005fjspx_005ftagPool_005ffmt_005fmessage_0026_005fkey_005fnobody.get(org.apache.taglibs.standard.tag.rt.fmt.MessageTag.class); + _jspx_th_fmt_005fmessage_005f22.setPageContext(_jspx_page_context); + _jspx_th_fmt_005fmessage_005f22.setParent(null); + // /WEB-INF/dashboardbeta.jsp(84,68) name = key type = null reqTime = true required = false fragment = false deferredValue = false expectedTypeName = null deferredMethod = false methodSignature = null + _jspx_th_fmt_005fmessage_005f22.setKey("dashboardbeta.previousday"); + int _jspx_eval_fmt_005fmessage_005f22 = _jspx_th_fmt_005fmessage_005f22.doStartTag(); + if (_jspx_th_fmt_005fmessage_005f22.doEndTag() == javax.servlet.jsp.tagext.Tag.SKIP_PAGE) { + return true; + } + _005fjspx_005ftagPool_005ffmt_005fmessage_0026_005fkey_005fnobody.reuse(_jspx_th_fmt_005fmessage_005f22); + return false; + } + + private boolean _jspx_meth_fmt_005fmessage_005f23(javax.servlet.jsp.PageContext _jspx_page_context) + throws java.lang.Throwable { + javax.servlet.jsp.PageContext pageContext = _jspx_page_context; + javax.servlet.jsp.JspWriter out = _jspx_page_context.getOut(); + // fmt:message + org.apache.taglibs.standard.tag.rt.fmt.MessageTag _jspx_th_fmt_005fmessage_005f23 = (org.apache.taglibs.standard.tag.rt.fmt.MessageTag) _005fjspx_005ftagPool_005ffmt_005fmessage_0026_005fkey_005fnobody.get(org.apache.taglibs.standard.tag.rt.fmt.MessageTag.class); + _jspx_th_fmt_005fmessage_005f23.setPageContext(_jspx_page_context); + _jspx_th_fmt_005fmessage_005f23.setParent(null); + // /WEB-INF/dashboardbeta.jsp(85,72) name = key type = null reqTime = true required = false fragment = false deferredValue = false expectedTypeName = null deferredMethod = false methodSignature = null + _jspx_th_fmt_005fmessage_005f23.setKey("dashboardbeta.samedaylastweek"); + int _jspx_eval_fmt_005fmessage_005f23 = _jspx_th_fmt_005fmessage_005f23.doStartTag(); + if (_jspx_th_fmt_005fmessage_005f23.doEndTag() == javax.servlet.jsp.tagext.Tag.SKIP_PAGE) { + return true; + } + _005fjspx_005ftagPool_005ffmt_005fmessage_0026_005fkey_005fnobody.reuse(_jspx_th_fmt_005fmessage_005f23); + return false; + } + + private boolean _jspx_meth_fmt_005fmessage_005f24(javax.servlet.jsp.PageContext _jspx_page_context) + throws java.lang.Throwable { + javax.servlet.jsp.PageContext pageContext = _jspx_page_context; + javax.servlet.jsp.JspWriter out = _jspx_page_context.getOut(); + // fmt:message + org.apache.taglibs.standard.tag.rt.fmt.MessageTag _jspx_th_fmt_005fmessage_005f24 = (org.apache.taglibs.standard.tag.rt.fmt.MessageTag) _005fjspx_005ftagPool_005ffmt_005fmessage_0026_005fkey_005fnobody.get(org.apache.taglibs.standard.tag.rt.fmt.MessageTag.class); + _jspx_th_fmt_005fmessage_005f24.setPageContext(_jspx_page_context); + _jspx_th_fmt_005fmessage_005f24.setParent(null); + // /WEB-INF/dashboardbeta.jsp(86,74) name = key type = null reqTime = true required = false fragment = false deferredValue = false expectedTypeName = null deferredMethod = false methodSignature = null + _jspx_th_fmt_005fmessage_005f24.setKey("dashboardbeta.samedaylastmonth"); + int _jspx_eval_fmt_005fmessage_005f24 = _jspx_th_fmt_005fmessage_005f24.doStartTag(); + if (_jspx_th_fmt_005fmessage_005f24.doEndTag() == javax.servlet.jsp.tagext.Tag.SKIP_PAGE) { + return true; + } + _005fjspx_005ftagPool_005ffmt_005fmessage_0026_005fkey_005fnobody.reuse(_jspx_th_fmt_005fmessage_005f24); + return false; + } + + private boolean _jspx_meth_fmt_005fmessage_005f25(javax.servlet.jsp.PageContext _jspx_page_context) + throws java.lang.Throwable { + javax.servlet.jsp.PageContext pageContext = _jspx_page_context; + javax.servlet.jsp.JspWriter out = _jspx_page_context.getOut(); + // fmt:message + org.apache.taglibs.standard.tag.rt.fmt.MessageTag _jspx_th_fmt_005fmessage_005f25 = (org.apache.taglibs.standard.tag.rt.fmt.MessageTag) _005fjspx_005ftagPool_005ffmt_005fmessage_0026_005fkey_005fnobody.get(org.apache.taglibs.standard.tag.rt.fmt.MessageTag.class); + _jspx_th_fmt_005fmessage_005f25.setPageContext(_jspx_page_context); + _jspx_th_fmt_005fmessage_005f25.setParent(null); + // /WEB-INF/dashboardbeta.jsp(87,74) name = key type = null reqTime = true required = false fragment = false deferredValue = false expectedTypeName = null deferredMethod = false methodSignature = null + _jspx_th_fmt_005fmessage_005f25.setKey("dashboardbeta.samedaylastyear"); + int _jspx_eval_fmt_005fmessage_005f25 = _jspx_th_fmt_005fmessage_005f25.doStartTag(); + if (_jspx_th_fmt_005fmessage_005f25.doEndTag() == javax.servlet.jsp.tagext.Tag.SKIP_PAGE) { + return true; + } + _005fjspx_005ftagPool_005ffmt_005fmessage_0026_005fkey_005fnobody.reuse(_jspx_th_fmt_005fmessage_005f25); + return false; + } + + private boolean _jspx_meth_fmt_005fmessage_005f26(javax.servlet.jsp.PageContext _jspx_page_context) + throws java.lang.Throwable { + javax.servlet.jsp.PageContext pageContext = _jspx_page_context; + javax.servlet.jsp.JspWriter out = _jspx_page_context.getOut(); + // fmt:message + org.apache.taglibs.standard.tag.rt.fmt.MessageTag _jspx_th_fmt_005fmessage_005f26 = (org.apache.taglibs.standard.tag.rt.fmt.MessageTag) _005fjspx_005ftagPool_005ffmt_005fmessage_0026_005fkey_005fnobody.get(org.apache.taglibs.standard.tag.rt.fmt.MessageTag.class); + _jspx_th_fmt_005fmessage_005f26.setPageContext(_jspx_page_context); + _jspx_th_fmt_005fmessage_005f26.setParent(null); + // /WEB-INF/dashboardbeta.jsp(88,69) name = key type = null reqTime = true required = false fragment = false deferredValue = false expectedTypeName = null deferredMethod = false methodSignature = null + _jspx_th_fmt_005fmessage_005f26.setKey("dashboardbeta.previousweek"); + int _jspx_eval_fmt_005fmessage_005f26 = _jspx_th_fmt_005fmessage_005f26.doStartTag(); + if (_jspx_th_fmt_005fmessage_005f26.doEndTag() == javax.servlet.jsp.tagext.Tag.SKIP_PAGE) { + return true; + } + _005fjspx_005ftagPool_005ffmt_005fmessage_0026_005fkey_005fnobody.reuse(_jspx_th_fmt_005fmessage_005f26); + return false; + } + + private boolean _jspx_meth_fmt_005fmessage_005f27(javax.servlet.jsp.PageContext _jspx_page_context) + throws java.lang.Throwable { + javax.servlet.jsp.PageContext pageContext = _jspx_page_context; + javax.servlet.jsp.JspWriter out = _jspx_page_context.getOut(); + // fmt:message + org.apache.taglibs.standard.tag.rt.fmt.MessageTag _jspx_th_fmt_005fmessage_005f27 = (org.apache.taglibs.standard.tag.rt.fmt.MessageTag) _005fjspx_005ftagPool_005ffmt_005fmessage_0026_005fkey_005fnobody.get(org.apache.taglibs.standard.tag.rt.fmt.MessageTag.class); + _jspx_th_fmt_005fmessage_005f27.setPageContext(_jspx_page_context); + _jspx_th_fmt_005fmessage_005f27.setParent(null); + // /WEB-INF/dashboardbeta.jsp(89,72) name = key type = null reqTime = true required = false fragment = false deferredValue = false expectedTypeName = null deferredMethod = false methodSignature = null + _jspx_th_fmt_005fmessage_005f27.setKey("dashboardbeta.4weeksprevious"); + int _jspx_eval_fmt_005fmessage_005f27 = _jspx_th_fmt_005fmessage_005f27.doStartTag(); + if (_jspx_th_fmt_005fmessage_005f27.doEndTag() == javax.servlet.jsp.tagext.Tag.SKIP_PAGE) { + return true; + } + _005fjspx_005ftagPool_005ffmt_005fmessage_0026_005fkey_005fnobody.reuse(_jspx_th_fmt_005fmessage_005f27); + return false; + } + + private boolean _jspx_meth_fmt_005fmessage_005f28(javax.servlet.jsp.PageContext _jspx_page_context) + throws java.lang.Throwable { + javax.servlet.jsp.PageContext pageContext = _jspx_page_context; + javax.servlet.jsp.JspWriter out = _jspx_page_context.getOut(); + // fmt:message + org.apache.taglibs.standard.tag.rt.fmt.MessageTag _jspx_th_fmt_005fmessage_005f28 = (org.apache.taglibs.standard.tag.rt.fmt.MessageTag) _005fjspx_005ftagPool_005ffmt_005fmessage_0026_005fkey_005fnobody.get(org.apache.taglibs.standard.tag.rt.fmt.MessageTag.class); + _jspx_th_fmt_005fmessage_005f28.setPageContext(_jspx_page_context); + _jspx_th_fmt_005fmessage_005f28.setParent(null); + // /WEB-INF/dashboardbeta.jsp(90,75) name = key type = null reqTime = true required = false fragment = false deferredValue = false expectedTypeName = null deferredMethod = false methodSignature = null + _jspx_th_fmt_005fmessage_005f28.setKey("dashboardbeta.sameweeklastyear"); + int _jspx_eval_fmt_005fmessage_005f28 = _jspx_th_fmt_005fmessage_005f28.doStartTag(); + if (_jspx_th_fmt_005fmessage_005f28.doEndTag() == javax.servlet.jsp.tagext.Tag.SKIP_PAGE) { + return true; + } + _005fjspx_005ftagPool_005ffmt_005fmessage_0026_005fkey_005fnobody.reuse(_jspx_th_fmt_005fmessage_005f28); + return false; + } + + private boolean _jspx_meth_fmt_005fmessage_005f29(javax.servlet.jsp.PageContext _jspx_page_context) + throws java.lang.Throwable { + javax.servlet.jsp.PageContext pageContext = _jspx_page_context; + javax.servlet.jsp.JspWriter out = _jspx_page_context.getOut(); + // fmt:message + org.apache.taglibs.standard.tag.rt.fmt.MessageTag _jspx_th_fmt_005fmessage_005f29 = (org.apache.taglibs.standard.tag.rt.fmt.MessageTag) _005fjspx_005ftagPool_005ffmt_005fmessage_0026_005fkey_005fnobody.get(org.apache.taglibs.standard.tag.rt.fmt.MessageTag.class); + _jspx_th_fmt_005fmessage_005f29.setPageContext(_jspx_page_context); + _jspx_th_fmt_005fmessage_005f29.setParent(null); + // /WEB-INF/dashboardbeta.jsp(91,71) name = key type = null reqTime = true required = false fragment = false deferredValue = false expectedTypeName = null deferredMethod = false methodSignature = null + _jspx_th_fmt_005fmessage_005f29.setKey("dashboardbeta.previousmonth"); + int _jspx_eval_fmt_005fmessage_005f29 = _jspx_th_fmt_005fmessage_005f29.doStartTag(); + if (_jspx_th_fmt_005fmessage_005f29.doEndTag() == javax.servlet.jsp.tagext.Tag.SKIP_PAGE) { + return true; + } + _005fjspx_005ftagPool_005ffmt_005fmessage_0026_005fkey_005fnobody.reuse(_jspx_th_fmt_005fmessage_005f29); + return false; + } + + private boolean _jspx_meth_fmt_005fmessage_005f30(javax.servlet.jsp.PageContext _jspx_page_context) + throws java.lang.Throwable { + javax.servlet.jsp.PageContext pageContext = _jspx_page_context; + javax.servlet.jsp.JspWriter out = _jspx_page_context.getOut(); + // fmt:message + org.apache.taglibs.standard.tag.rt.fmt.MessageTag _jspx_th_fmt_005fmessage_005f30 = (org.apache.taglibs.standard.tag.rt.fmt.MessageTag) _005fjspx_005ftagPool_005ffmt_005fmessage_0026_005fkey_005fnobody.get(org.apache.taglibs.standard.tag.rt.fmt.MessageTag.class); + _jspx_th_fmt_005fmessage_005f30.setPageContext(_jspx_page_context); + _jspx_th_fmt_005fmessage_005f30.setParent(null); + // /WEB-INF/dashboardbeta.jsp(92,76) name = key type = null reqTime = true required = false fragment = false deferredValue = false expectedTypeName = null deferredMethod = false methodSignature = null + _jspx_th_fmt_005fmessage_005f30.setKey("dashboardbeta.samemonthlastyear"); + int _jspx_eval_fmt_005fmessage_005f30 = _jspx_th_fmt_005fmessage_005f30.doStartTag(); + if (_jspx_th_fmt_005fmessage_005f30.doEndTag() == javax.servlet.jsp.tagext.Tag.SKIP_PAGE) { + return true; + } + _005fjspx_005ftagPool_005ffmt_005fmessage_0026_005fkey_005fnobody.reuse(_jspx_th_fmt_005fmessage_005f30); + return false; + } + + private boolean _jspx_meth_fmt_005fmessage_005f31(javax.servlet.jsp.PageContext _jspx_page_context) + throws java.lang.Throwable { + javax.servlet.jsp.PageContext pageContext = _jspx_page_context; + javax.servlet.jsp.JspWriter out = _jspx_page_context.getOut(); + // fmt:message + org.apache.taglibs.standard.tag.rt.fmt.MessageTag _jspx_th_fmt_005fmessage_005f31 = (org.apache.taglibs.standard.tag.rt.fmt.MessageTag) _005fjspx_005ftagPool_005ffmt_005fmessage_0026_005fkey_005fnobody.get(org.apache.taglibs.standard.tag.rt.fmt.MessageTag.class); + _jspx_th_fmt_005fmessage_005f31.setPageContext(_jspx_page_context); + _jspx_th_fmt_005fmessage_005f31.setParent(null); + // /WEB-INF/dashboardbeta.jsp(93,73) name = key type = null reqTime = true required = false fragment = false deferredValue = false expectedTypeName = null deferredMethod = false methodSignature = null + _jspx_th_fmt_005fmessage_005f31.setKey("dashboardbeta.previous6month"); + int _jspx_eval_fmt_005fmessage_005f31 = _jspx_th_fmt_005fmessage_005f31.doStartTag(); + if (_jspx_th_fmt_005fmessage_005f31.doEndTag() == javax.servlet.jsp.tagext.Tag.SKIP_PAGE) { + return true; + } + _005fjspx_005ftagPool_005ffmt_005fmessage_0026_005fkey_005fnobody.reuse(_jspx_th_fmt_005fmessage_005f31); + return false; + } + + private boolean _jspx_meth_fmt_005fmessage_005f32(javax.servlet.jsp.PageContext _jspx_page_context) + throws java.lang.Throwable { + javax.servlet.jsp.PageContext pageContext = _jspx_page_context; + javax.servlet.jsp.JspWriter out = _jspx_page_context.getOut(); + // fmt:message + org.apache.taglibs.standard.tag.rt.fmt.MessageTag _jspx_th_fmt_005fmessage_005f32 = (org.apache.taglibs.standard.tag.rt.fmt.MessageTag) _005fjspx_005ftagPool_005ffmt_005fmessage_0026_005fkey_005fnobody.get(org.apache.taglibs.standard.tag.rt.fmt.MessageTag.class); + _jspx_th_fmt_005fmessage_005f32.setPageContext(_jspx_page_context); + _jspx_th_fmt_005fmessage_005f32.setParent(null); + // /WEB-INF/dashboardbeta.jsp(94,78) name = key type = null reqTime = true required = false fragment = false deferredValue = false expectedTypeName = null deferredMethod = false methodSignature = null + _jspx_th_fmt_005fmessage_005f32.setKey("dashboardbeta.same6monthslastyear"); + int _jspx_eval_fmt_005fmessage_005f32 = _jspx_th_fmt_005fmessage_005f32.doStartTag(); + if (_jspx_th_fmt_005fmessage_005f32.doEndTag() == javax.servlet.jsp.tagext.Tag.SKIP_PAGE) { + return true; + } + _005fjspx_005ftagPool_005ffmt_005fmessage_0026_005fkey_005fnobody.reuse(_jspx_th_fmt_005fmessage_005f32); + return false; + } + + private boolean _jspx_meth_fmt_005fmessage_005f33(javax.servlet.jsp.PageContext _jspx_page_context) + throws java.lang.Throwable { + javax.servlet.jsp.PageContext pageContext = _jspx_page_context; + javax.servlet.jsp.JspWriter out = _jspx_page_context.getOut(); + // fmt:message + org.apache.taglibs.standard.tag.rt.fmt.MessageTag _jspx_th_fmt_005fmessage_005f33 = (org.apache.taglibs.standard.tag.rt.fmt.MessageTag) _005fjspx_005ftagPool_005ffmt_005fmessage_0026_005fkey_005fnobody.get(org.apache.taglibs.standard.tag.rt.fmt.MessageTag.class); + _jspx_th_fmt_005fmessage_005f33.setPageContext(_jspx_page_context); + _jspx_th_fmt_005fmessage_005f33.setParent(null); + // /WEB-INF/dashboardbeta.jsp(95,71) name = key type = null reqTime = true required = false fragment = false deferredValue = false expectedTypeName = null deferredMethod = false methodSignature = null + _jspx_th_fmt_005fmessage_005f33.setKey("dashboardbeta.previousyear"); + int _jspx_eval_fmt_005fmessage_005f33 = _jspx_th_fmt_005fmessage_005f33.doStartTag(); + if (_jspx_th_fmt_005fmessage_005f33.doEndTag() == javax.servlet.jsp.tagext.Tag.SKIP_PAGE) { + return true; + } + _005fjspx_005ftagPool_005ffmt_005fmessage_0026_005fkey_005fnobody.reuse(_jspx_th_fmt_005fmessage_005f33); + return false; + } + + private boolean _jspx_meth_fmt_005fmessage_005f34(javax.servlet.jsp.PageContext _jspx_page_context) + throws java.lang.Throwable { + javax.servlet.jsp.PageContext pageContext = _jspx_page_context; + javax.servlet.jsp.JspWriter out = _jspx_page_context.getOut(); + // fmt:message + org.apache.taglibs.standard.tag.rt.fmt.MessageTag _jspx_th_fmt_005fmessage_005f34 = (org.apache.taglibs.standard.tag.rt.fmt.MessageTag) _005fjspx_005ftagPool_005ffmt_005fmessage_0026_005fkey_005fnobody.get(org.apache.taglibs.standard.tag.rt.fmt.MessageTag.class); + _jspx_th_fmt_005fmessage_005f34.setPageContext(_jspx_page_context); + _jspx_th_fmt_005fmessage_005f34.setParent(null); + // /WEB-INF/dashboardbeta.jsp(98,93) name = key type = null reqTime = true required = false fragment = false deferredValue = false expectedTypeName = null deferredMethod = false methodSignature = null + _jspx_th_fmt_005fmessage_005f34.setKey("dashboardbeta.runreport"); + int _jspx_eval_fmt_005fmessage_005f34 = _jspx_th_fmt_005fmessage_005f34.doStartTag(); + if (_jspx_th_fmt_005fmessage_005f34.doEndTag() == javax.servlet.jsp.tagext.Tag.SKIP_PAGE) { + return true; + } + _005fjspx_005ftagPool_005ffmt_005fmessage_0026_005fkey_005fnobody.reuse(_jspx_th_fmt_005fmessage_005f34); + return false; + } + + private boolean _jspx_meth_fmt_005fmessage_005f35(javax.servlet.jsp.PageContext _jspx_page_context) + throws java.lang.Throwable { + javax.servlet.jsp.PageContext pageContext = _jspx_page_context; + javax.servlet.jsp.JspWriter out = _jspx_page_context.getOut(); + // fmt:message + org.apache.taglibs.standard.tag.rt.fmt.MessageTag _jspx_th_fmt_005fmessage_005f35 = (org.apache.taglibs.standard.tag.rt.fmt.MessageTag) _005fjspx_005ftagPool_005ffmt_005fmessage_0026_005fkey_005fnobody.get(org.apache.taglibs.standard.tag.rt.fmt.MessageTag.class); + _jspx_th_fmt_005fmessage_005f35.setPageContext(_jspx_page_context); + _jspx_th_fmt_005fmessage_005f35.setParent(null); + // /WEB-INF/dashboardbeta.jsp(110,116) name = key type = null reqTime = true required = false fragment = false deferredValue = false expectedTypeName = null deferredMethod = false methodSignature = null + _jspx_th_fmt_005fmessage_005f35.setKey("dashboardbeta.saveasdefaultdashboard"); + int _jspx_eval_fmt_005fmessage_005f35 = _jspx_th_fmt_005fmessage_005f35.doStartTag(); + if (_jspx_th_fmt_005fmessage_005f35.doEndTag() == javax.servlet.jsp.tagext.Tag.SKIP_PAGE) { + return true; + } + _005fjspx_005ftagPool_005ffmt_005fmessage_0026_005fkey_005fnobody.reuse(_jspx_th_fmt_005fmessage_005f35); + return false; + } + + private boolean _jspx_meth_fmt_005fmessage_005f36(javax.servlet.jsp.PageContext _jspx_page_context) + throws java.lang.Throwable { + javax.servlet.jsp.PageContext pageContext = _jspx_page_context; + javax.servlet.jsp.JspWriter out = _jspx_page_context.getOut(); + // fmt:message + org.apache.taglibs.standard.tag.rt.fmt.MessageTag _jspx_th_fmt_005fmessage_005f36 = (org.apache.taglibs.standard.tag.rt.fmt.MessageTag) _005fjspx_005ftagPool_005ffmt_005fmessage_0026_005fkey_005fnobody.get(org.apache.taglibs.standard.tag.rt.fmt.MessageTag.class); + _jspx_th_fmt_005fmessage_005f36.setPageContext(_jspx_page_context); + _jspx_th_fmt_005fmessage_005f36.setParent(null); + // /WEB-INF/dashboardbeta.jsp(111,93) name = key type = null reqTime = true required = false fragment = false deferredValue = false expectedTypeName = null deferredMethod = false methodSignature = null + _jspx_th_fmt_005fmessage_005f36.setKey("dashboardbeta.editdashboard"); + int _jspx_eval_fmt_005fmessage_005f36 = _jspx_th_fmt_005fmessage_005f36.doStartTag(); + if (_jspx_th_fmt_005fmessage_005f36.doEndTag() == javax.servlet.jsp.tagext.Tag.SKIP_PAGE) { + return true; + } + _005fjspx_005ftagPool_005ffmt_005fmessage_0026_005fkey_005fnobody.reuse(_jspx_th_fmt_005fmessage_005f36); + return false; + } + + private boolean _jspx_meth_fmt_005fmessage_005f37(javax.servlet.jsp.PageContext _jspx_page_context) + throws java.lang.Throwable { + javax.servlet.jsp.PageContext pageContext = _jspx_page_context; + javax.servlet.jsp.JspWriter out = _jspx_page_context.getOut(); + // fmt:message + org.apache.taglibs.standard.tag.rt.fmt.MessageTag _jspx_th_fmt_005fmessage_005f37 = (org.apache.taglibs.standard.tag.rt.fmt.MessageTag) _005fjspx_005ftagPool_005ffmt_005fmessage_0026_005fkey_005fnobody.get(org.apache.taglibs.standard.tag.rt.fmt.MessageTag.class); + _jspx_th_fmt_005fmessage_005f37.setPageContext(_jspx_page_context); + _jspx_th_fmt_005fmessage_005f37.setParent(null); + // /WEB-INF/dashboardbeta.jsp(112,96) name = key type = null reqTime = true required = false fragment = false deferredValue = false expectedTypeName = null deferredMethod = false methodSignature = null + _jspx_th_fmt_005fmessage_005f37.setKey("dashboardbeta.deletedashboard"); + int _jspx_eval_fmt_005fmessage_005f37 = _jspx_th_fmt_005fmessage_005f37.doStartTag(); + if (_jspx_th_fmt_005fmessage_005f37.doEndTag() == javax.servlet.jsp.tagext.Tag.SKIP_PAGE) { + return true; + } + _005fjspx_005ftagPool_005ffmt_005fmessage_0026_005fkey_005fnobody.reuse(_jspx_th_fmt_005fmessage_005f37); + return false; + } + + private boolean _jspx_meth_fmt_005fmessage_005f38(javax.servlet.jsp.PageContext _jspx_page_context) + throws java.lang.Throwable { + javax.servlet.jsp.PageContext pageContext = _jspx_page_context; + javax.servlet.jsp.JspWriter out = _jspx_page_context.getOut(); + // fmt:message + org.apache.taglibs.standard.tag.rt.fmt.MessageTag _jspx_th_fmt_005fmessage_005f38 = (org.apache.taglibs.standard.tag.rt.fmt.MessageTag) _005fjspx_005ftagPool_005ffmt_005fmessage_0026_005fkey_005fnobody.get(org.apache.taglibs.standard.tag.rt.fmt.MessageTag.class); + _jspx_th_fmt_005fmessage_005f38.setPageContext(_jspx_page_context); + _jspx_th_fmt_005fmessage_005f38.setParent(null); + // /WEB-INF/dashboardbeta.jsp(113,99) name = key type = null reqTime = true required = false fragment = false deferredValue = false expectedTypeName = null deferredMethod = false methodSignature = null + _jspx_th_fmt_005fmessage_005f38.setKey("dashboardbeta.createdashboard"); + int _jspx_eval_fmt_005fmessage_005f38 = _jspx_th_fmt_005fmessage_005f38.doStartTag(); + if (_jspx_th_fmt_005fmessage_005f38.doEndTag() == javax.servlet.jsp.tagext.Tag.SKIP_PAGE) { + return true; + } + _005fjspx_005ftagPool_005ffmt_005fmessage_0026_005fkey_005fnobody.reuse(_jspx_th_fmt_005fmessage_005f38); + return false; + } + + private boolean _jspx_meth_c_005fif_005f3(javax.servlet.jsp.PageContext _jspx_page_context) + throws java.lang.Throwable { + javax.servlet.jsp.PageContext pageContext = _jspx_page_context; + javax.servlet.jsp.JspWriter out = _jspx_page_context.getOut(); + // c:if + org.apache.taglibs.standard.tag.rt.core.IfTag _jspx_th_c_005fif_005f3 = (org.apache.taglibs.standard.tag.rt.core.IfTag) _005fjspx_005ftagPool_005fc_005fif_0026_005ftest.get(org.apache.taglibs.standard.tag.rt.core.IfTag.class); + _jspx_th_c_005fif_005f3.setPageContext(_jspx_page_context); + _jspx_th_c_005fif_005f3.setParent(null); + // /WEB-INF/footer.jsp(15,1) name = test type = boolean reqTime = true required = true fragment = false deferredValue = false expectedTypeName = null deferredMethod = false methodSignature = null + _jspx_th_c_005fif_005f3.setTest(((java.lang.Boolean) org.apache.jasper.runtime.PageContextImpl.proprietaryEvaluate("${not empty style_footername }", boolean.class, (javax.servlet.jsp.PageContext)_jspx_page_context, null)).booleanValue()); + int _jspx_eval_c_005fif_005f3 = _jspx_th_c_005fif_005f3.doStartTag(); + if (_jspx_eval_c_005fif_005f3 != javax.servlet.jsp.tagext.Tag.SKIP_BODY) { + do { + out.write("\r\n"); + out.write(" "); + out.write((java.lang.String) org.apache.jasper.runtime.PageContextImpl.proprietaryEvaluate("${style_footername}", java.lang.String.class, (javax.servlet.jsp.PageContext)_jspx_page_context, null)); + out.write('\r'); + out.write('\n'); + out.write(' '); + int evalDoAfterBody = _jspx_th_c_005fif_005f3.doAfterBody(); + if (evalDoAfterBody != javax.servlet.jsp.tagext.BodyTag.EVAL_BODY_AGAIN) + break; + } while (true); + } + if (_jspx_th_c_005fif_005f3.doEndTag() == javax.servlet.jsp.tagext.Tag.SKIP_PAGE) { + return true; + } + _005fjspx_005ftagPool_005fc_005fif_0026_005ftest.reuse(_jspx_th_c_005fif_005f3); + return false; + } + + private boolean _jspx_meth_fmt_005fmessage_005f39(javax.servlet.jsp.PageContext _jspx_page_context) + throws java.lang.Throwable { + javax.servlet.jsp.PageContext pageContext = _jspx_page_context; + javax.servlet.jsp.JspWriter out = _jspx_page_context.getOut(); + // fmt:message + org.apache.taglibs.standard.tag.rt.fmt.MessageTag _jspx_th_fmt_005fmessage_005f39 = (org.apache.taglibs.standard.tag.rt.fmt.MessageTag) _005fjspx_005ftagPool_005ffmt_005fmessage_0026_005fkey_005fnobody.get(org.apache.taglibs.standard.tag.rt.fmt.MessageTag.class); + _jspx_th_fmt_005fmessage_005f39.setPageContext(_jspx_page_context); + _jspx_th_fmt_005fmessage_005f39.setParent(null); + // /WEB-INF/dashboardbeta.jsp(123,82) name = key type = null reqTime = true required = false fragment = false deferredValue = false expectedTypeName = null deferredMethod = false methodSignature = null + _jspx_th_fmt_005fmessage_005f39.setKey("dashboardbeta.ok"); + int _jspx_eval_fmt_005fmessage_005f39 = _jspx_th_fmt_005fmessage_005f39.doStartTag(); + if (_jspx_th_fmt_005fmessage_005f39.doEndTag() == javax.servlet.jsp.tagext.Tag.SKIP_PAGE) { + return true; + } + _005fjspx_005ftagPool_005ffmt_005fmessage_0026_005fkey_005fnobody.reuse(_jspx_th_fmt_005fmessage_005f39); + return false; + } +} diff --git a/app/opt/tomcat9/work/Catalina/smartconnect.internal.yel.or.id/ROOT/org/apache/jsp/WEB_002dINF/dashboardbetaadmin_jsp.class b/app/opt/tomcat9/work/Catalina/smartconnect.internal.yel.or.id/ROOT/org/apache/jsp/WEB_002dINF/dashboardbetaadmin_jsp.class new file mode 100644 index 0000000..8105d35 Binary files /dev/null and b/app/opt/tomcat9/work/Catalina/smartconnect.internal.yel.or.id/ROOT/org/apache/jsp/WEB_002dINF/dashboardbetaadmin_jsp.class differ diff --git a/app/opt/tomcat9/work/Catalina/smartconnect.internal.yel.or.id/ROOT/org/apache/jsp/WEB_002dINF/dashboardbetaadmin_jsp.java b/app/opt/tomcat9/work/Catalina/smartconnect.internal.yel.or.id/ROOT/org/apache/jsp/WEB_002dINF/dashboardbetaadmin_jsp.java new file mode 100644 index 0000000..1fb46c1 --- /dev/null +++ b/app/opt/tomcat9/work/Catalina/smartconnect.internal.yel.or.id/ROOT/org/apache/jsp/WEB_002dINF/dashboardbetaadmin_jsp.java @@ -0,0 +1,2068 @@ +/* + * Generated by the Jasper component of Apache Tomcat + * Version: Apache Tomcat/9.0.107 + * Generated at: 2025-07-30 05:27:26 UTC + * Note: The last modified time of this file was set to + * the last modified time of the source file after + * generation to assist with modification tracking. + */ +package org.apache.jsp.WEB_002dINF; + +import javax.servlet.*; +import javax.servlet.http.*; +import javax.servlet.jsp.*; +import java.time.LocalDate; +import java.time.format.DateTimeFormatter; + +public final class dashboardbetaadmin_jsp extends org.apache.jasper.runtime.HttpJspBase + implements org.apache.jasper.runtime.JspSourceDependent, + org.apache.jasper.runtime.JspSourceImports { + + private static final javax.servlet.jsp.JspFactory _jspxFactory = + javax.servlet.jsp.JspFactory.getDefaultFactory(); + + private static java.util.Map _jspx_dependants; + + static { + _jspx_dependants = new java.util.HashMap(7); + _jspx_dependants.put("jar:file:/opt/tomcat9/webapps/ROOT/WEB-INF/lib/jstl-1.2.jar!/META-INF/c.tld", Long.valueOf(1153385082000L)); + _jspx_dependants.put("/WEB-INF/header.jsp", Long.valueOf(1753790711298L)); + _jspx_dependants.put("jar:file:/opt/tomcat9/webapps/ROOT/WEB-INF/lib/jstl-1.2.jar!/META-INF/fmt.tld", Long.valueOf(1153385082000L)); + _jspx_dependants.put("/WEB-INF/menu.jsp", Long.valueOf(1753790711454L)); + _jspx_dependants.put("/WEB-INF/includes.jsp", Long.valueOf(1753790711298L)); + _jspx_dependants.put("/WEB-INF/lib/jstl-1.2.jar", Long.valueOf(1753790711326L)); + _jspx_dependants.put("/WEB-INF/footer.jsp", Long.valueOf(1753790711298L)); + } + + private static final java.util.Set _jspx_imports_packages; + + private static final java.util.Set _jspx_imports_classes; + + static { + _jspx_imports_packages = new java.util.LinkedHashSet<>(4); + _jspx_imports_packages.add("javax.servlet"); + _jspx_imports_packages.add("javax.servlet.http"); + _jspx_imports_packages.add("javax.servlet.jsp"); + _jspx_imports_classes = new java.util.LinkedHashSet<>(3); + _jspx_imports_classes.add("java.time.LocalDate"); + _jspx_imports_classes.add("java.time.format.DateTimeFormatter"); + } + + private org.apache.jasper.runtime.TagHandlerPool _005fjspx_005ftagPool_005ffmt_005fsetBundle_0026_005fbasename_005fnobody; + private org.apache.jasper.runtime.TagHandlerPool _005fjspx_005ftagPool_005fc_005fset_0026_005fvar_005fvalue_005fnobody; + private org.apache.jasper.runtime.TagHandlerPool _005fjspx_005ftagPool_005fc_005fforEach_0026_005fvar_005fitems; + private org.apache.jasper.runtime.TagHandlerPool _005fjspx_005ftagPool_005fc_005fif_0026_005ftest; + private org.apache.jasper.runtime.TagHandlerPool _005fjspx_005ftagPool_005ffmt_005fmessage_0026_005fkey_005fnobody; + private org.apache.jasper.runtime.TagHandlerPool _005fjspx_005ftagPool_005fc_005fchoose; + private org.apache.jasper.runtime.TagHandlerPool _005fjspx_005ftagPool_005fc_005fwhen_0026_005ftest; + private org.apache.jasper.runtime.TagHandlerPool _005fjspx_005ftagPool_005fc_005fotherwise; + + private volatile javax.el.ExpressionFactory _el_expressionfactory; + private volatile org.apache.tomcat.InstanceManager _jsp_instancemanager; + + public java.util.Map getDependants() { + return _jspx_dependants; + } + + public java.util.Set getPackageImports() { + return _jspx_imports_packages; + } + + public java.util.Set getClassImports() { + return _jspx_imports_classes; + } + + public javax.el.ExpressionFactory _jsp_getExpressionFactory() { + if (_el_expressionfactory == null) { + synchronized (this) { + if (_el_expressionfactory == null) { + _el_expressionfactory = _jspxFactory.getJspApplicationContext(getServletConfig().getServletContext()).getExpressionFactory(); + } + } + } + return _el_expressionfactory; + } + + public org.apache.tomcat.InstanceManager _jsp_getInstanceManager() { + if (_jsp_instancemanager == null) { + synchronized (this) { + if (_jsp_instancemanager == null) { + _jsp_instancemanager = org.apache.jasper.runtime.InstanceManagerFactory.getInstanceManager(getServletConfig()); + } + } + } + return _jsp_instancemanager; + } + + public void _jspInit() { + _005fjspx_005ftagPool_005ffmt_005fsetBundle_0026_005fbasename_005fnobody = org.apache.jasper.runtime.TagHandlerPool.getTagHandlerPool(getServletConfig()); + _005fjspx_005ftagPool_005fc_005fset_0026_005fvar_005fvalue_005fnobody = org.apache.jasper.runtime.TagHandlerPool.getTagHandlerPool(getServletConfig()); + _005fjspx_005ftagPool_005fc_005fforEach_0026_005fvar_005fitems = org.apache.jasper.runtime.TagHandlerPool.getTagHandlerPool(getServletConfig()); + _005fjspx_005ftagPool_005fc_005fif_0026_005ftest = org.apache.jasper.runtime.TagHandlerPool.getTagHandlerPool(getServletConfig()); + _005fjspx_005ftagPool_005ffmt_005fmessage_0026_005fkey_005fnobody = org.apache.jasper.runtime.TagHandlerPool.getTagHandlerPool(getServletConfig()); + _005fjspx_005ftagPool_005fc_005fchoose = org.apache.jasper.runtime.TagHandlerPool.getTagHandlerPool(getServletConfig()); + _005fjspx_005ftagPool_005fc_005fwhen_0026_005ftest = org.apache.jasper.runtime.TagHandlerPool.getTagHandlerPool(getServletConfig()); + _005fjspx_005ftagPool_005fc_005fotherwise = org.apache.jasper.runtime.TagHandlerPool.getTagHandlerPool(getServletConfig()); + } + + public void _jspDestroy() { + _005fjspx_005ftagPool_005ffmt_005fsetBundle_0026_005fbasename_005fnobody.release(); + _005fjspx_005ftagPool_005fc_005fset_0026_005fvar_005fvalue_005fnobody.release(); + _005fjspx_005ftagPool_005fc_005fforEach_0026_005fvar_005fitems.release(); + _005fjspx_005ftagPool_005fc_005fif_0026_005ftest.release(); + _005fjspx_005ftagPool_005ffmt_005fmessage_0026_005fkey_005fnobody.release(); + _005fjspx_005ftagPool_005fc_005fchoose.release(); + _005fjspx_005ftagPool_005fc_005fwhen_0026_005ftest.release(); + _005fjspx_005ftagPool_005fc_005fotherwise.release(); + } + + public void _jspService(final javax.servlet.http.HttpServletRequest request, final javax.servlet.http.HttpServletResponse response) + throws java.io.IOException, javax.servlet.ServletException { + + if (!javax.servlet.DispatcherType.ERROR.equals(request.getDispatcherType())) { + final java.lang.String _jspx_method = request.getMethod(); + if ("OPTIONS".equals(_jspx_method)) { + response.setHeader("Allow","GET, HEAD, POST, OPTIONS"); + return; + } + if (!"GET".equals(_jspx_method) && !"POST".equals(_jspx_method) && !"HEAD".equals(_jspx_method)) { + response.setHeader("Allow","GET, HEAD, POST, OPTIONS"); + response.sendError(HttpServletResponse.SC_METHOD_NOT_ALLOWED, "JSPs only permit GET, POST or HEAD. Jasper also permits OPTIONS"); + return; + } + } + + final javax.servlet.jsp.PageContext pageContext; + javax.servlet.http.HttpSession session = null; + final javax.servlet.ServletContext application; + final javax.servlet.ServletConfig config; + javax.servlet.jsp.JspWriter out = null; + final java.lang.Object page = this; + javax.servlet.jsp.JspWriter _jspx_out = null; + javax.servlet.jsp.PageContext _jspx_page_context = null; + + + try { + response.setContentType("text/html; charset=UTF-8"); + pageContext = _jspxFactory.getPageContext(this, request, response, + null, true, 8192, true); + _jspx_page_context = pageContext; + application = pageContext.getServletContext(); + config = pageContext.getServletConfig(); + session = pageContext.getSession(); + out = pageContext.getOut(); + _jspx_out = out; + + out.write("\r\n"); + out.write("\r\n"); + out.write(" "); + out.write("\r\n"); + out.write("\r\n"); + out.write("\r\n"); + if (_jspx_meth_fmt_005fsetBundle_005f0(_jspx_page_context)) + return; + out.write("\r\n"); + out.write("\r\n"); + out.write("\r\n"); + out.write("\r\n"); + out.write("\r\n"); + out.write("\r\n"); + out.write("\r\n"); + out.write(" \r\n"); + out.write("\r\n"); + out.write("\r\n"); + out.write("\r\n"); + out.write("\r\n"); + out.write("\r\n"); + if (_jspx_meth_c_005fset_005f0(_jspx_page_context)) + return; + out.write('\r'); + out.write('\n'); + if (_jspx_meth_c_005fforEach_005f0(_jspx_page_context)) + return; + out.write("\r\n"); + out.write("\r\n"); + out.write("\r\n"); + out.write("\r\n"); + out.write("\r\n"); + out.write("\r\n"); + out.write("\r\n"); + out.write(" \r\n"); + out.write(" \r\n"); + out.write(" \r\n"); + out.write(" \r\n"); + out.write(" \r\n"); + out.write(" \r\n"); + out.write(" \r\n"); + out.write(" "); + if (_jspx_meth_fmt_005fmessage_005f0(_jspx_page_context)) + return; + out.write("\r\n"); + out.write(" \r\n"); + out.write("\r\n"); + out.write("\r\n"); + out.write("\r\n"); + out.write(" "); + out.write("\r\n"); + out.write("
\r\n"); + if (_jspx_meth_c_005fif_005f1(_jspx_page_context)) + return; + out.write("\r\n"); + out.write("
\r\n"); + if (_jspx_meth_c_005fchoose_005f0(_jspx_page_context)) + return; + out.write(" \r\n"); + out.write("\r\n"); + out.write("
\r\n"); + out.write("\r\n"); + out.write("
\r\n"); + out.write("\r\n"); + out.write('\r'); + out.write('\n'); + out.write(' '); + out.write("\r\n"); + out.write("\r\n"); + out.write("\r\n"); + out.write("
\r\n"); + out.write("
\r\n"); + out.write("\r\n"); + out.write("\r\n"); + out.write("\r\n"); + out.write("\r\n"); + out.write("
\r\n"); + out.write("
\r\n"); + out.write("\r\n"); + if (_jspx_meth_c_005fforEach_005f1(_jspx_page_context)) + return; + out.write("\r\n"); + out.write("\r\n"); + out.write("
\r\n"); + out.write("
\r\n"); + out.write("\r\n"); + out.write("
\r\n"); + out.write("
"); + if (_jspx_meth_fmt_005fmessage_005f2(_jspx_page_context)) + return; + out.write("
\r\n"); + out.write("
\r\n"); + out.write(" \r\n"); + out.write("
"); + if (_jspx_meth_fmt_005fmessage_005f3(_jspx_page_context)) + return; + out.write("\r\n"); + out.write(" \r\n"); + out.write("
\r\n"); + out.write("
\r\n"); + out.write("
\r\n"); + out.write("
\r\n"); + out.write(" \r\n"); + out.write(" \r\n"); + out.write(" \r\n"); + out.write("
Report: \r\n"); + out.write("
\r\n"); + out.write("
Date Range:\r\n"); + out.write(" \r\n"); + out.write(" -\r\n"); + out.write(" \r\n"); + out.write("
\r\n"); + out.write(" \r\n"); + out.write("
\r\n"); + out.write(" \r\n"); + out.write(" \r\n"); + out.write("
\r\n"); + out.write(" \r\n"); + out.write("
\r\n"); + out.write("
\r\n"); + out.write("
\r\n"); + out.write("
\r\n"); + out.write(" \r\n"); + out.write(" \r\n"); + out.write(" \r\n"); + out.write(" \r\n"); + out.write("
Report: \r\n"); + out.write("
\r\n"); + out.write("
Date Range:\r\n"); + out.write(" \r\n"); + out.write(" - \r\n"); + out.write(" \r\n"); + out.write("
\r\n"); + out.write(" \r\n"); + out.write(" \r\n"); + out.write(" \r\n"); + out.write("
\r\n"); + out.write("
\r\n"); + out.write(" \r\n"); + out.write("
\r\n"); + out.write("\r\n"); + out.write("
\r\n"); + out.write("
\r\n"); + out.write("
\r\n"); + out.write("
\r\n"); + out.write("

\r\n"); + out.write("
\r\n"); + out.write("
\r\n"); + out.write("
\r\n"); + out.write("\r\n"); + out.write("\r\n"); + out.write("\r\n"); + out.write("\r\n"); + out.write("\r\n"); + out.write("
\r\n"); + String year = DateTimeFormatter.ofPattern("YYYY").format(LocalDate.now()); + out.write("\r\n"); + out.write("\r\n"); + out.write("
\r\n"); + out.write(" "); + // c:if + org.apache.taglibs.standard.tag.rt.core.IfTag _jspx_th_c_005fif_005f2 = (org.apache.taglibs.standard.tag.rt.core.IfTag) _005fjspx_005ftagPool_005fc_005fif_0026_005ftest.get(org.apache.taglibs.standard.tag.rt.core.IfTag.class); + _jspx_th_c_005fif_005f2.setPageContext(_jspx_page_context); + _jspx_th_c_005fif_005f2.setParent(null); + // /WEB-INF/footer.jsp(11,1) name = test type = boolean reqTime = true required = true fragment = false deferredValue = false expectedTypeName = null deferredMethod = false methodSignature = null + _jspx_th_c_005fif_005f2.setTest(((java.lang.Boolean) org.apache.jasper.runtime.PageContextImpl.proprietaryEvaluate("${empty style_footername }", boolean.class, (javax.servlet.jsp.PageContext)_jspx_page_context, null)).booleanValue()); + int _jspx_eval_c_005fif_005f2 = _jspx_th_c_005fif_005f2.doStartTag(); + if (_jspx_eval_c_005fif_005f2 != javax.servlet.jsp.tagext.Tag.SKIP_BODY) { + do { + out.write("\r\n"); + out.write(" \r\n"); + out.write("

Copyright 2015-"); + out.print(year); + out.write("

\r\n"); + out.write(" "); + int evalDoAfterBody = _jspx_th_c_005fif_005f2.doAfterBody(); + if (evalDoAfterBody != javax.servlet.jsp.tagext.BodyTag.EVAL_BODY_AGAIN) + break; + } while (true); + } + if (_jspx_th_c_005fif_005f2.doEndTag() == javax.servlet.jsp.tagext.Tag.SKIP_PAGE) { + return; + } + _005fjspx_005ftagPool_005fc_005fif_0026_005ftest.reuse(_jspx_th_c_005fif_005f2); + out.write('\r'); + out.write('\n'); + out.write(' '); + if (_jspx_meth_c_005fif_005f3(_jspx_page_context)) + return; + out.write("\r\n"); + out.write("
\r\n"); + out.write("
\r\n"); + out.write("\r\n"); + out.write("\r\n"); + out.write("\r\n"); + out.write("
\r\n"); + out.write("
\r\n"); + out.write("
\r\n"); + out.write(" \r\n"); + out.write("
\r\n"); + out.write("
\r\n"); + out.write("\r\n"); + out.write("
\r\n"); + out.write("
"); + if (_jspx_meth_fmt_005fmessage_005f39(_jspx_page_context)) + return; + out.write("
\r\n"); + out.write("

"); + if (_jspx_meth_fmt_005fmessage_005f40(_jspx_page_context)) + return; + out.write("\r\n"); + out.write(" "); + if (_jspx_meth_fmt_005fmessage_005f41(_jspx_page_context)) + return; + out.write("\r\n"); + out.write("

\r\n"); + out.write("
\r\n"); + out.write("
\r\n"); + out.write(" \r\n"); + out.write("
\r\n"); + out.write("
\r\n"); + out.write("\r\n"); + out.write("
\r\n"); + out.write("
"); + if (_jspx_meth_fmt_005fmessage_005f43(_jspx_page_context)) + return; + out.write("
\r\n"); + out.write("

"); + if (_jspx_meth_fmt_005fmessage_005f44(_jspx_page_context)) + return; + out.write("\r\n"); + out.write(" "); + if (_jspx_meth_fmt_005fmessage_005f45(_jspx_page_context)) + return; + out.write("\r\n"); + out.write("

\r\n"); + out.write("
\r\n"); + out.write("
\r\n"); + out.write(" \r\n"); + out.write("
\r\n"); + out.write("
\r\n"); + out.write("\r\n"); + out.write("\r\n"); + out.write(""); + } catch (java.lang.Throwable t) { + if (!(t instanceof javax.servlet.jsp.SkipPageException)){ + out = _jspx_out; + if (out != null && out.getBufferSize() != 0) + try { + if (response.isCommitted()) { + out.flush(); + } else { + out.clearBuffer(); + } + } catch (java.io.IOException e) {} + if (_jspx_page_context != null) _jspx_page_context.handlePageException(t); + else throw new ServletException(t); + } + } finally { + _jspxFactory.releasePageContext(_jspx_page_context); + } + } + + private boolean _jspx_meth_fmt_005fsetBundle_005f0(javax.servlet.jsp.PageContext _jspx_page_context) + throws java.lang.Throwable { + javax.servlet.jsp.PageContext pageContext = _jspx_page_context; + javax.servlet.jsp.JspWriter out = _jspx_page_context.getOut(); + // fmt:setBundle + org.apache.taglibs.standard.tag.rt.fmt.SetBundleTag _jspx_th_fmt_005fsetBundle_005f0 = (org.apache.taglibs.standard.tag.rt.fmt.SetBundleTag) _005fjspx_005ftagPool_005ffmt_005fsetBundle_0026_005fbasename_005fnobody.get(org.apache.taglibs.standard.tag.rt.fmt.SetBundleTag.class); + _jspx_th_fmt_005fsetBundle_005f0.setPageContext(_jspx_page_context); + _jspx_th_fmt_005fsetBundle_005f0.setParent(null); + // /WEB-INF/includes.jsp(5,0) name = basename type = null reqTime = true required = true fragment = false deferredValue = false expectedTypeName = null deferredMethod = false methodSignature = null + _jspx_th_fmt_005fsetBundle_005f0.setBasename("org.wcs.smart.connect.i18n.web_messages"); + int _jspx_eval_fmt_005fsetBundle_005f0 = _jspx_th_fmt_005fsetBundle_005f0.doStartTag(); + if (_jspx_th_fmt_005fsetBundle_005f0.doEndTag() == javax.servlet.jsp.tagext.Tag.SKIP_PAGE) { + return true; + } + _005fjspx_005ftagPool_005ffmt_005fsetBundle_0026_005fbasename_005fnobody.reuse(_jspx_th_fmt_005fsetBundle_005f0); + return false; + } + + private boolean _jspx_meth_c_005fset_005f0(javax.servlet.jsp.PageContext _jspx_page_context) + throws java.lang.Throwable { + javax.servlet.jsp.PageContext pageContext = _jspx_page_context; + javax.servlet.jsp.JspWriter out = _jspx_page_context.getOut(); + // c:set + org.apache.taglibs.standard.tag.rt.core.SetTag _jspx_th_c_005fset_005f0 = (org.apache.taglibs.standard.tag.rt.core.SetTag) _005fjspx_005ftagPool_005fc_005fset_0026_005fvar_005fvalue_005fnobody.get(org.apache.taglibs.standard.tag.rt.core.SetTag.class); + _jspx_th_c_005fset_005f0.setPageContext(_jspx_page_context); + _jspx_th_c_005fset_005f0.setParent(null); + // /WEB-INF/includes.jsp(18,0) name = var type = java.lang.String reqTime = false required = false fragment = false deferredValue = false expectedTypeName = null deferredMethod = false methodSignature = null + _jspx_th_c_005fset_005f0.setVar("supportedLang"); + // /WEB-INF/includes.jsp(18,0) name = value type = javax.el.ValueExpression reqTime = true required = false fragment = false deferredValue = true expectedTypeName = java.lang.Object deferredMethod = false methodSignature = null + _jspx_th_c_005fset_005f0.setValue(new org.apache.jasper.el.JspValueExpression("/WEB-INF/includes.jsp(18,0) 'es,fr,hi,in,km,lo,ms,ru,th,vi,zh'",_jsp_getExpressionFactory().createValueExpression("es,fr,hi,in,km,lo,ms,ru,th,vi,zh",java.lang.Object.class)).getValue(_jspx_page_context.getELContext())); + int _jspx_eval_c_005fset_005f0 = _jspx_th_c_005fset_005f0.doStartTag(); + if (_jspx_th_c_005fset_005f0.doEndTag() == javax.servlet.jsp.tagext.Tag.SKIP_PAGE) { + return true; + } + _005fjspx_005ftagPool_005fc_005fset_0026_005fvar_005fvalue_005fnobody.reuse(_jspx_th_c_005fset_005f0); + return false; + } + + private boolean _jspx_meth_c_005fforEach_005f0(javax.servlet.jsp.PageContext _jspx_page_context) + throws java.lang.Throwable { + javax.servlet.jsp.PageContext pageContext = _jspx_page_context; + javax.servlet.jsp.JspWriter out = _jspx_page_context.getOut(); + // c:forEach + org.apache.taglibs.standard.tag.rt.core.ForEachTag _jspx_th_c_005fforEach_005f0 = (org.apache.taglibs.standard.tag.rt.core.ForEachTag) _005fjspx_005ftagPool_005fc_005fforEach_0026_005fvar_005fitems.get(org.apache.taglibs.standard.tag.rt.core.ForEachTag.class); + _jspx_th_c_005fforEach_005f0.setPageContext(_jspx_page_context); + _jspx_th_c_005fforEach_005f0.setParent(null); + // /WEB-INF/includes.jsp(19,0) name = var type = java.lang.String reqTime = false required = false fragment = false deferredValue = false expectedTypeName = null deferredMethod = false methodSignature = null + _jspx_th_c_005fforEach_005f0.setVar("item"); + // /WEB-INF/includes.jsp(19,0) name = items type = javax.el.ValueExpression reqTime = true required = false fragment = false deferredValue = true expectedTypeName = java.lang.Object deferredMethod = false methodSignature = null + _jspx_th_c_005fforEach_005f0.setItems(new org.apache.jasper.el.JspValueExpression("/WEB-INF/includes.jsp(19,0) '${supportedLang}'",_jsp_getExpressionFactory().createValueExpression(_jspx_page_context.getELContext(),"${supportedLang}",java.lang.Object.class)).getValue(_jspx_page_context.getELContext())); + int[] _jspx_push_body_count_c_005fforEach_005f0 = new int[] { 0 }; + try { + int _jspx_eval_c_005fforEach_005f0 = _jspx_th_c_005fforEach_005f0.doStartTag(); + if (_jspx_eval_c_005fforEach_005f0 != javax.servlet.jsp.tagext.Tag.SKIP_BODY) { + do { + out.write("\r\n"); + out.write(" "); + if (_jspx_meth_c_005fif_005f0(_jspx_th_c_005fforEach_005f0, _jspx_page_context, _jspx_push_body_count_c_005fforEach_005f0)) + return true; + out.write('\r'); + out.write('\n'); + int evalDoAfterBody = _jspx_th_c_005fforEach_005f0.doAfterBody(); + if (evalDoAfterBody != javax.servlet.jsp.tagext.BodyTag.EVAL_BODY_AGAIN) + break; + } while (true); + } + if (_jspx_th_c_005fforEach_005f0.doEndTag() == javax.servlet.jsp.tagext.Tag.SKIP_PAGE) { + return true; + } + } catch (java.lang.Throwable _jspx_exception) { + while (_jspx_push_body_count_c_005fforEach_005f0[0]-- > 0) + out = _jspx_page_context.popBody(); + _jspx_th_c_005fforEach_005f0.doCatch(_jspx_exception); + } finally { + _jspx_th_c_005fforEach_005f0.doFinally(); + } + _005fjspx_005ftagPool_005fc_005fforEach_0026_005fvar_005fitems.reuse(_jspx_th_c_005fforEach_005f0); + return false; + } + + private boolean _jspx_meth_c_005fif_005f0(javax.servlet.jsp.tagext.JspTag _jspx_th_c_005fforEach_005f0, javax.servlet.jsp.PageContext _jspx_page_context, int[] _jspx_push_body_count_c_005fforEach_005f0) + throws java.lang.Throwable { + javax.servlet.jsp.PageContext pageContext = _jspx_page_context; + javax.servlet.jsp.JspWriter out = _jspx_page_context.getOut(); + // c:if + org.apache.taglibs.standard.tag.rt.core.IfTag _jspx_th_c_005fif_005f0 = (org.apache.taglibs.standard.tag.rt.core.IfTag) _005fjspx_005ftagPool_005fc_005fif_0026_005ftest.get(org.apache.taglibs.standard.tag.rt.core.IfTag.class); + _jspx_th_c_005fif_005f0.setPageContext(_jspx_page_context); + _jspx_th_c_005fif_005f0.setParent((javax.servlet.jsp.tagext.Tag) _jspx_th_c_005fforEach_005f0); + // /WEB-INF/includes.jsp(20,2) name = test type = boolean reqTime = true required = true fragment = false deferredValue = false expectedTypeName = null deferredMethod = false methodSignature = null + _jspx_th_c_005fif_005f0.setTest(((java.lang.Boolean) org.apache.jasper.runtime.PageContextImpl.proprietaryEvaluate("${item eq pageContext.request.locale.language}", boolean.class, (javax.servlet.jsp.PageContext)_jspx_page_context, null)).booleanValue()); + int _jspx_eval_c_005fif_005f0 = _jspx_th_c_005fif_005f0.doStartTag(); + if (_jspx_eval_c_005fif_005f0 != javax.servlet.jsp.tagext.Tag.SKIP_BODY) { + do { + out.write("\r\n"); + out.write(" \r\n"); + out.write(" "); + int evalDoAfterBody = _jspx_th_c_005fif_005f0.doAfterBody(); + if (evalDoAfterBody != javax.servlet.jsp.tagext.BodyTag.EVAL_BODY_AGAIN) + break; + } while (true); + } + if (_jspx_th_c_005fif_005f0.doEndTag() == javax.servlet.jsp.tagext.Tag.SKIP_PAGE) { + return true; + } + _005fjspx_005ftagPool_005fc_005fif_0026_005ftest.reuse(_jspx_th_c_005fif_005f0); + return false; + } + + private boolean _jspx_meth_fmt_005fmessage_005f0(javax.servlet.jsp.PageContext _jspx_page_context) + throws java.lang.Throwable { + javax.servlet.jsp.PageContext pageContext = _jspx_page_context; + javax.servlet.jsp.JspWriter out = _jspx_page_context.getOut(); + // fmt:message + org.apache.taglibs.standard.tag.rt.fmt.MessageTag _jspx_th_fmt_005fmessage_005f0 = (org.apache.taglibs.standard.tag.rt.fmt.MessageTag) _005fjspx_005ftagPool_005ffmt_005fmessage_0026_005fkey_005fnobody.get(org.apache.taglibs.standard.tag.rt.fmt.MessageTag.class); + _jspx_th_fmt_005fmessage_005f0.setPageContext(_jspx_page_context); + _jspx_th_fmt_005fmessage_005f0.setParent(null); + // /WEB-INF/dashboardbetaadmin.jsp(11,8) name = key type = null reqTime = true required = false fragment = false deferredValue = false expectedTypeName = null deferredMethod = false methodSignature = null + _jspx_th_fmt_005fmessage_005f0.setKey("home.pagetitle"); + int _jspx_eval_fmt_005fmessage_005f0 = _jspx_th_fmt_005fmessage_005f0.doStartTag(); + if (_jspx_th_fmt_005fmessage_005f0.doEndTag() == javax.servlet.jsp.tagext.Tag.SKIP_PAGE) { + return true; + } + _005fjspx_005ftagPool_005ffmt_005fmessage_0026_005fkey_005fnobody.reuse(_jspx_th_fmt_005fmessage_005f0); + return false; + } + + private boolean _jspx_meth_c_005fif_005f1(javax.servlet.jsp.PageContext _jspx_page_context) + throws java.lang.Throwable { + javax.servlet.jsp.PageContext pageContext = _jspx_page_context; + javax.servlet.jsp.JspWriter out = _jspx_page_context.getOut(); + // c:if + org.apache.taglibs.standard.tag.rt.core.IfTag _jspx_th_c_005fif_005f1 = (org.apache.taglibs.standard.tag.rt.core.IfTag) _005fjspx_005ftagPool_005fc_005fif_0026_005ftest.get(org.apache.taglibs.standard.tag.rt.core.IfTag.class); + _jspx_th_c_005fif_005f1.setPageContext(_jspx_page_context); + _jspx_th_c_005fif_005f1.setParent(null); + // /WEB-INF/header.jsp(3,0) name = test type = boolean reqTime = true required = true fragment = false deferredValue = false expectedTypeName = null deferredMethod = false methodSignature = null + _jspx_th_c_005fif_005f1.setTest(((java.lang.Boolean) org.apache.jasper.runtime.PageContextImpl.proprietaryEvaluate("${not empty pageContext.request.userPrincipal}", boolean.class, (javax.servlet.jsp.PageContext)_jspx_page_context, null)).booleanValue()); + int _jspx_eval_c_005fif_005f1 = _jspx_th_c_005fif_005f1.doStartTag(); + if (_jspx_eval_c_005fif_005f1 != javax.servlet.jsp.tagext.Tag.SKIP_BODY) { + do { + out.write("\r\n"); + out.write("
\r\n"); + out.write("
\r\n"); + out.write(" \r\n"); + out.write(" "); + out.write((java.lang.String) org.apache.jasper.runtime.PageContextImpl.proprietaryEvaluate("${pageContext.request.userPrincipal.name}", java.lang.String.class, (javax.servlet.jsp.PageContext)_jspx_page_context, null)); + out.write("\r\n"); + out.write(" |\r\n"); + out.write(" \r\n"); + out.write("
\r\n"); + out.write("
\r\n"); + int evalDoAfterBody = _jspx_th_c_005fif_005f1.doAfterBody(); + if (evalDoAfterBody != javax.servlet.jsp.tagext.BodyTag.EVAL_BODY_AGAIN) + break; + } while (true); + } + if (_jspx_th_c_005fif_005f1.doEndTag() == javax.servlet.jsp.tagext.Tag.SKIP_PAGE) { + return true; + } + _005fjspx_005ftagPool_005fc_005fif_0026_005ftest.reuse(_jspx_th_c_005fif_005f1); + return false; + } + + private boolean _jspx_meth_fmt_005fmessage_005f1(javax.servlet.jsp.tagext.JspTag _jspx_th_c_005fif_005f1, javax.servlet.jsp.PageContext _jspx_page_context) + throws java.lang.Throwable { + javax.servlet.jsp.PageContext pageContext = _jspx_page_context; + javax.servlet.jsp.JspWriter out = _jspx_page_context.getOut(); + // fmt:message + org.apache.taglibs.standard.tag.rt.fmt.MessageTag _jspx_th_fmt_005fmessage_005f1 = (org.apache.taglibs.standard.tag.rt.fmt.MessageTag) _005fjspx_005ftagPool_005ffmt_005fmessage_0026_005fkey_005fnobody.get(org.apache.taglibs.standard.tag.rt.fmt.MessageTag.class); + _jspx_th_fmt_005fmessage_005f1.setPageContext(_jspx_page_context); + _jspx_th_fmt_005fmessage_005f1.setParent((javax.servlet.jsp.tagext.Tag) _jspx_th_c_005fif_005f1); + // /WEB-INF/header.jsp(9,30) name = key type = null reqTime = true required = false fragment = false deferredValue = false expectedTypeName = null deferredMethod = false methodSignature = null + _jspx_th_fmt_005fmessage_005f1.setKey("header.logout"); + int _jspx_eval_fmt_005fmessage_005f1 = _jspx_th_fmt_005fmessage_005f1.doStartTag(); + if (_jspx_th_fmt_005fmessage_005f1.doEndTag() == javax.servlet.jsp.tagext.Tag.SKIP_PAGE) { + return true; + } + _005fjspx_005ftagPool_005ffmt_005fmessage_0026_005fkey_005fnobody.reuse(_jspx_th_fmt_005fmessage_005f1); + return false; + } + + private boolean _jspx_meth_c_005fchoose_005f0(javax.servlet.jsp.PageContext _jspx_page_context) + throws java.lang.Throwable { + javax.servlet.jsp.PageContext pageContext = _jspx_page_context; + javax.servlet.jsp.JspWriter out = _jspx_page_context.getOut(); + // c:choose + org.apache.taglibs.standard.tag.common.core.ChooseTag _jspx_th_c_005fchoose_005f0 = (org.apache.taglibs.standard.tag.common.core.ChooseTag) _005fjspx_005ftagPool_005fc_005fchoose.get(org.apache.taglibs.standard.tag.common.core.ChooseTag.class); + _jspx_th_c_005fchoose_005f0.setPageContext(_jspx_page_context); + _jspx_th_c_005fchoose_005f0.setParent(null); + int _jspx_eval_c_005fchoose_005f0 = _jspx_th_c_005fchoose_005f0.doStartTag(); + if (_jspx_eval_c_005fchoose_005f0 != javax.servlet.jsp.tagext.Tag.SKIP_BODY) { + do { + out.write('\r'); + out.write('\n'); + out.write(' '); + if (_jspx_meth_c_005fwhen_005f0(_jspx_th_c_005fchoose_005f0, _jspx_page_context)) + return true; + out.write('\r'); + out.write('\n'); + out.write(' '); + if (_jspx_meth_c_005fotherwise_005f0(_jspx_th_c_005fchoose_005f0, _jspx_page_context)) + return true; + out.write('\r'); + out.write('\n'); + int evalDoAfterBody = _jspx_th_c_005fchoose_005f0.doAfterBody(); + if (evalDoAfterBody != javax.servlet.jsp.tagext.BodyTag.EVAL_BODY_AGAIN) + break; + } while (true); + } + if (_jspx_th_c_005fchoose_005f0.doEndTag() == javax.servlet.jsp.tagext.Tag.SKIP_PAGE) { + return true; + } + _005fjspx_005ftagPool_005fc_005fchoose.reuse(_jspx_th_c_005fchoose_005f0); + return false; + } + + private boolean _jspx_meth_c_005fwhen_005f0(javax.servlet.jsp.tagext.JspTag _jspx_th_c_005fchoose_005f0, javax.servlet.jsp.PageContext _jspx_page_context) + throws java.lang.Throwable { + javax.servlet.jsp.PageContext pageContext = _jspx_page_context; + javax.servlet.jsp.JspWriter out = _jspx_page_context.getOut(); + // c:when + org.apache.taglibs.standard.tag.rt.core.WhenTag _jspx_th_c_005fwhen_005f0 = (org.apache.taglibs.standard.tag.rt.core.WhenTag) _005fjspx_005ftagPool_005fc_005fwhen_0026_005ftest.get(org.apache.taglibs.standard.tag.rt.core.WhenTag.class); + _jspx_th_c_005fwhen_005f0.setPageContext(_jspx_page_context); + _jspx_th_c_005fwhen_005f0.setParent((javax.servlet.jsp.tagext.Tag) _jspx_th_c_005fchoose_005f0); + // /WEB-INF/header.jsp(15,1) name = test type = boolean reqTime = true required = true fragment = false deferredValue = false expectedTypeName = null deferredMethod = false methodSignature = null + _jspx_th_c_005fwhen_005f0.setTest(((java.lang.Boolean) org.apache.jasper.runtime.PageContextImpl.proprietaryEvaluate("${empty style_headername}", boolean.class, (javax.servlet.jsp.PageContext)_jspx_page_context, null)).booleanValue()); + int _jspx_eval_c_005fwhen_005f0 = _jspx_th_c_005fwhen_005f0.doStartTag(); + if (_jspx_eval_c_005fwhen_005f0 != javax.servlet.jsp.tagext.Tag.SKIP_BODY) { + do { + out.write(" \r\n"); + out.write(" SMART Connect\r\n"); + out.write(" "); + int evalDoAfterBody = _jspx_th_c_005fwhen_005f0.doAfterBody(); + if (evalDoAfterBody != javax.servlet.jsp.tagext.BodyTag.EVAL_BODY_AGAIN) + break; + } while (true); + } + if (_jspx_th_c_005fwhen_005f0.doEndTag() == javax.servlet.jsp.tagext.Tag.SKIP_PAGE) { + return true; + } + _005fjspx_005ftagPool_005fc_005fwhen_0026_005ftest.reuse(_jspx_th_c_005fwhen_005f0); + return false; + } + + private boolean _jspx_meth_c_005fotherwise_005f0(javax.servlet.jsp.tagext.JspTag _jspx_th_c_005fchoose_005f0, javax.servlet.jsp.PageContext _jspx_page_context) + throws java.lang.Throwable { + javax.servlet.jsp.PageContext pageContext = _jspx_page_context; + javax.servlet.jsp.JspWriter out = _jspx_page_context.getOut(); + // c:otherwise + org.apache.taglibs.standard.tag.common.core.OtherwiseTag _jspx_th_c_005fotherwise_005f0 = (org.apache.taglibs.standard.tag.common.core.OtherwiseTag) _005fjspx_005ftagPool_005fc_005fotherwise.get(org.apache.taglibs.standard.tag.common.core.OtherwiseTag.class); + _jspx_th_c_005fotherwise_005f0.setPageContext(_jspx_page_context); + _jspx_th_c_005fotherwise_005f0.setParent((javax.servlet.jsp.tagext.Tag) _jspx_th_c_005fchoose_005f0); + int _jspx_eval_c_005fotherwise_005f0 = _jspx_th_c_005fotherwise_005f0.doStartTag(); + if (_jspx_eval_c_005fotherwise_005f0 != javax.servlet.jsp.tagext.Tag.SKIP_BODY) { + do { + out.write('\r'); + out.write('\n'); + out.write(' '); + out.write((java.lang.String) org.apache.jasper.runtime.PageContextImpl.proprietaryEvaluate("${style_headername}", java.lang.String.class, (javax.servlet.jsp.PageContext)_jspx_page_context, null)); + out.write('\r'); + out.write('\n'); + out.write(' '); + int evalDoAfterBody = _jspx_th_c_005fotherwise_005f0.doAfterBody(); + if (evalDoAfterBody != javax.servlet.jsp.tagext.BodyTag.EVAL_BODY_AGAIN) + break; + } while (true); + } + if (_jspx_th_c_005fotherwise_005f0.doEndTag() == javax.servlet.jsp.tagext.Tag.SKIP_PAGE) { + return true; + } + _005fjspx_005ftagPool_005fc_005fotherwise.reuse(_jspx_th_c_005fotherwise_005f0); + return false; + } + + private boolean _jspx_meth_c_005fforEach_005f1(javax.servlet.jsp.PageContext _jspx_page_context) + throws java.lang.Throwable { + javax.servlet.jsp.PageContext pageContext = _jspx_page_context; + javax.servlet.jsp.JspWriter out = _jspx_page_context.getOut(); + // c:forEach + org.apache.taglibs.standard.tag.rt.core.ForEachTag _jspx_th_c_005fforEach_005f1 = (org.apache.taglibs.standard.tag.rt.core.ForEachTag) _005fjspx_005ftagPool_005fc_005fforEach_0026_005fvar_005fitems.get(org.apache.taglibs.standard.tag.rt.core.ForEachTag.class); + _jspx_th_c_005fforEach_005f1.setPageContext(_jspx_page_context); + _jspx_th_c_005fforEach_005f1.setParent(null); + // /WEB-INF/menu.jsp(16,0) name = var type = java.lang.String reqTime = false required = false fragment = false deferredValue = false expectedTypeName = null deferredMethod = false methodSignature = null + _jspx_th_c_005fforEach_005f1.setVar("item"); + // /WEB-INF/menu.jsp(16,0) name = items type = javax.el.ValueExpression reqTime = true required = false fragment = false deferredValue = true expectedTypeName = java.lang.Object deferredMethod = false methodSignature = null + _jspx_th_c_005fforEach_005f1.setItems(new org.apache.jasper.el.JspValueExpression("/WEB-INF/menu.jsp(16,0) '${menuitems}'",_jsp_getExpressionFactory().createValueExpression(_jspx_page_context.getELContext(),"${menuitems}",java.lang.Object.class)).getValue(_jspx_page_context.getELContext())); + int[] _jspx_push_body_count_c_005fforEach_005f1 = new int[] { 0 }; + try { + int _jspx_eval_c_005fforEach_005f1 = _jspx_th_c_005fforEach_005f1.doStartTag(); + if (_jspx_eval_c_005fforEach_005f1 != javax.servlet.jsp.tagext.Tag.SKIP_BODY) { + do { + out.write("\r\n"); + out.write("
\r\n"); + out.write(" \r\n"); + out.write("
"); + out.write((java.lang.String) org.apache.jasper.runtime.PageContextImpl.proprietaryEvaluate("${item[0]}", java.lang.String.class, (javax.servlet.jsp.PageContext)_jspx_page_context, null)); + out.write("
\r\n"); + out.write("
\r\n"); + out.write(" "); + int evalDoAfterBody = _jspx_th_c_005fforEach_005f1.doAfterBody(); + if (evalDoAfterBody != javax.servlet.jsp.tagext.BodyTag.EVAL_BODY_AGAIN) + break; + } while (true); + } + if (_jspx_th_c_005fforEach_005f1.doEndTag() == javax.servlet.jsp.tagext.Tag.SKIP_PAGE) { + return true; + } + } catch (java.lang.Throwable _jspx_exception) { + while (_jspx_push_body_count_c_005fforEach_005f1[0]-- > 0) + out = _jspx_page_context.popBody(); + _jspx_th_c_005fforEach_005f1.doCatch(_jspx_exception); + } finally { + _jspx_th_c_005fforEach_005f1.doFinally(); + } + _005fjspx_005ftagPool_005fc_005fforEach_0026_005fvar_005fitems.reuse(_jspx_th_c_005fforEach_005f1); + return false; + } + + private boolean _jspx_meth_fmt_005fmessage_005f2(javax.servlet.jsp.PageContext _jspx_page_context) + throws java.lang.Throwable { + javax.servlet.jsp.PageContext pageContext = _jspx_page_context; + javax.servlet.jsp.JspWriter out = _jspx_page_context.getOut(); + // fmt:message + org.apache.taglibs.standard.tag.rt.fmt.MessageTag _jspx_th_fmt_005fmessage_005f2 = (org.apache.taglibs.standard.tag.rt.fmt.MessageTag) _005fjspx_005ftagPool_005ffmt_005fmessage_0026_005fkey_005fnobody.get(org.apache.taglibs.standard.tag.rt.fmt.MessageTag.class); + _jspx_th_fmt_005fmessage_005f2.setPageContext(_jspx_page_context); + _jspx_th_fmt_005fmessage_005f2.setParent(null); + // /WEB-INF/dashboardbetaadmin.jsp(19,41) name = key type = null reqTime = true required = false fragment = false deferredValue = false expectedTypeName = null deferredMethod = false methodSignature = null + _jspx_th_fmt_005fmessage_005f2.setKey("dashboardbeta.title"); + int _jspx_eval_fmt_005fmessage_005f2 = _jspx_th_fmt_005fmessage_005f2.doStartTag(); + if (_jspx_th_fmt_005fmessage_005f2.doEndTag() == javax.servlet.jsp.tagext.Tag.SKIP_PAGE) { + return true; + } + _005fjspx_005ftagPool_005ffmt_005fmessage_0026_005fkey_005fnobody.reuse(_jspx_th_fmt_005fmessage_005f2); + return false; + } + + private boolean _jspx_meth_fmt_005fmessage_005f3(javax.servlet.jsp.PageContext _jspx_page_context) + throws java.lang.Throwable { + javax.servlet.jsp.PageContext pageContext = _jspx_page_context; + javax.servlet.jsp.JspWriter out = _jspx_page_context.getOut(); + // fmt:message + org.apache.taglibs.standard.tag.rt.fmt.MessageTag _jspx_th_fmt_005fmessage_005f3 = (org.apache.taglibs.standard.tag.rt.fmt.MessageTag) _005fjspx_005ftagPool_005ffmt_005fmessage_0026_005fkey_005fnobody.get(org.apache.taglibs.standard.tag.rt.fmt.MessageTag.class); + _jspx_th_fmt_005fmessage_005f3.setPageContext(_jspx_page_context); + _jspx_th_fmt_005fmessage_005f3.setParent(null); + // /WEB-INF/dashboardbetaadmin.jsp(22,73) name = key type = null reqTime = true required = false fragment = false deferredValue = false expectedTypeName = null deferredMethod = false methodSignature = null + _jspx_th_fmt_005fmessage_005f3.setKey("dashboardbeta.dashbaordname"); + int _jspx_eval_fmt_005fmessage_005f3 = _jspx_th_fmt_005fmessage_005f3.doStartTag(); + if (_jspx_th_fmt_005fmessage_005f3.doEndTag() == javax.servlet.jsp.tagext.Tag.SKIP_PAGE) { + return true; + } + _005fjspx_005ftagPool_005ffmt_005fmessage_0026_005fkey_005fnobody.reuse(_jspx_th_fmt_005fmessage_005f3); + return false; + } + + private boolean _jspx_meth_fmt_005fmessage_005f4(javax.servlet.jsp.PageContext _jspx_page_context) + throws java.lang.Throwable { + javax.servlet.jsp.PageContext pageContext = _jspx_page_context; + javax.servlet.jsp.JspWriter out = _jspx_page_context.getOut(); + // fmt:message + org.apache.taglibs.standard.tag.rt.fmt.MessageTag _jspx_th_fmt_005fmessage_005f4 = (org.apache.taglibs.standard.tag.rt.fmt.MessageTag) _005fjspx_005ftagPool_005ffmt_005fmessage_0026_005fkey_005fnobody.get(org.apache.taglibs.standard.tag.rt.fmt.MessageTag.class); + _jspx_th_fmt_005fmessage_005f4.setPageContext(_jspx_page_context); + _jspx_th_fmt_005fmessage_005f4.setParent(null); + // /WEB-INF/dashboardbetaadmin.jsp(37,20) name = key type = null reqTime = true required = false fragment = false deferredValue = false expectedTypeName = null deferredMethod = false methodSignature = null + _jspx_th_fmt_005fmessage_005f4.setKey("dashboardbeta.oneday"); + int _jspx_eval_fmt_005fmessage_005f4 = _jspx_th_fmt_005fmessage_005f4.doStartTag(); + if (_jspx_th_fmt_005fmessage_005f4.doEndTag() == javax.servlet.jsp.tagext.Tag.SKIP_PAGE) { + return true; + } + _005fjspx_005ftagPool_005ffmt_005fmessage_0026_005fkey_005fnobody.reuse(_jspx_th_fmt_005fmessage_005f4); + return false; + } + + private boolean _jspx_meth_fmt_005fmessage_005f5(javax.servlet.jsp.PageContext _jspx_page_context) + throws java.lang.Throwable { + javax.servlet.jsp.PageContext pageContext = _jspx_page_context; + javax.servlet.jsp.JspWriter out = _jspx_page_context.getOut(); + // fmt:message + org.apache.taglibs.standard.tag.rt.fmt.MessageTag _jspx_th_fmt_005fmessage_005f5 = (org.apache.taglibs.standard.tag.rt.fmt.MessageTag) _005fjspx_005ftagPool_005ffmt_005fmessage_0026_005fkey_005fnobody.get(org.apache.taglibs.standard.tag.rt.fmt.MessageTag.class); + _jspx_th_fmt_005fmessage_005f5.setPageContext(_jspx_page_context); + _jspx_th_fmt_005fmessage_005f5.setParent(null); + // /WEB-INF/dashboardbetaadmin.jsp(38,20) name = key type = null reqTime = true required = false fragment = false deferredValue = false expectedTypeName = null deferredMethod = false methodSignature = null + _jspx_th_fmt_005fmessage_005f5.setKey("dashboardbeta.oneweek"); + int _jspx_eval_fmt_005fmessage_005f5 = _jspx_th_fmt_005fmessage_005f5.doStartTag(); + if (_jspx_th_fmt_005fmessage_005f5.doEndTag() == javax.servlet.jsp.tagext.Tag.SKIP_PAGE) { + return true; + } + _005fjspx_005ftagPool_005ffmt_005fmessage_0026_005fkey_005fnobody.reuse(_jspx_th_fmt_005fmessage_005f5); + return false; + } + + private boolean _jspx_meth_fmt_005fmessage_005f6(javax.servlet.jsp.PageContext _jspx_page_context) + throws java.lang.Throwable { + javax.servlet.jsp.PageContext pageContext = _jspx_page_context; + javax.servlet.jsp.JspWriter out = _jspx_page_context.getOut(); + // fmt:message + org.apache.taglibs.standard.tag.rt.fmt.MessageTag _jspx_th_fmt_005fmessage_005f6 = (org.apache.taglibs.standard.tag.rt.fmt.MessageTag) _005fjspx_005ftagPool_005ffmt_005fmessage_0026_005fkey_005fnobody.get(org.apache.taglibs.standard.tag.rt.fmt.MessageTag.class); + _jspx_th_fmt_005fmessage_005f6.setPageContext(_jspx_page_context); + _jspx_th_fmt_005fmessage_005f6.setParent(null); + // /WEB-INF/dashboardbetaadmin.jsp(39,21) name = key type = null reqTime = true required = false fragment = false deferredValue = false expectedTypeName = null deferredMethod = false methodSignature = null + _jspx_th_fmt_005fmessage_005f6.setKey("dashboardbeta.onemonth"); + int _jspx_eval_fmt_005fmessage_005f6 = _jspx_th_fmt_005fmessage_005f6.doStartTag(); + if (_jspx_th_fmt_005fmessage_005f6.doEndTag() == javax.servlet.jsp.tagext.Tag.SKIP_PAGE) { + return true; + } + _005fjspx_005ftagPool_005ffmt_005fmessage_0026_005fkey_005fnobody.reuse(_jspx_th_fmt_005fmessage_005f6); + return false; + } + + private boolean _jspx_meth_fmt_005fmessage_005f7(javax.servlet.jsp.PageContext _jspx_page_context) + throws java.lang.Throwable { + javax.servlet.jsp.PageContext pageContext = _jspx_page_context; + javax.servlet.jsp.JspWriter out = _jspx_page_context.getOut(); + // fmt:message + org.apache.taglibs.standard.tag.rt.fmt.MessageTag _jspx_th_fmt_005fmessage_005f7 = (org.apache.taglibs.standard.tag.rt.fmt.MessageTag) _005fjspx_005ftagPool_005ffmt_005fmessage_0026_005fkey_005fnobody.get(org.apache.taglibs.standard.tag.rt.fmt.MessageTag.class); + _jspx_th_fmt_005fmessage_005f7.setPageContext(_jspx_page_context); + _jspx_th_fmt_005fmessage_005f7.setParent(null); + // /WEB-INF/dashboardbetaadmin.jsp(40,22) name = key type = null reqTime = true required = false fragment = false deferredValue = false expectedTypeName = null deferredMethod = false methodSignature = null + _jspx_th_fmt_005fmessage_005f7.setKey("dashboardbeta.sixmonths"); + int _jspx_eval_fmt_005fmessage_005f7 = _jspx_th_fmt_005fmessage_005f7.doStartTag(); + if (_jspx_th_fmt_005fmessage_005f7.doEndTag() == javax.servlet.jsp.tagext.Tag.SKIP_PAGE) { + return true; + } + _005fjspx_005ftagPool_005ffmt_005fmessage_0026_005fkey_005fnobody.reuse(_jspx_th_fmt_005fmessage_005f7); + return false; + } + + private boolean _jspx_meth_fmt_005fmessage_005f8(javax.servlet.jsp.PageContext _jspx_page_context) + throws java.lang.Throwable { + javax.servlet.jsp.PageContext pageContext = _jspx_page_context; + javax.servlet.jsp.JspWriter out = _jspx_page_context.getOut(); + // fmt:message + org.apache.taglibs.standard.tag.rt.fmt.MessageTag _jspx_th_fmt_005fmessage_005f8 = (org.apache.taglibs.standard.tag.rt.fmt.MessageTag) _005fjspx_005ftagPool_005ffmt_005fmessage_0026_005fkey_005fnobody.get(org.apache.taglibs.standard.tag.rt.fmt.MessageTag.class); + _jspx_th_fmt_005fmessage_005f8.setPageContext(_jspx_page_context); + _jspx_th_fmt_005fmessage_005f8.setParent(null); + // /WEB-INF/dashboardbetaadmin.jsp(41,22) name = key type = null reqTime = true required = false fragment = false deferredValue = false expectedTypeName = null deferredMethod = false methodSignature = null + _jspx_th_fmt_005fmessage_005f8.setKey("dashboardbeta.oneyear"); + int _jspx_eval_fmt_005fmessage_005f8 = _jspx_th_fmt_005fmessage_005f8.doStartTag(); + if (_jspx_th_fmt_005fmessage_005f8.doEndTag() == javax.servlet.jsp.tagext.Tag.SKIP_PAGE) { + return true; + } + _005fjspx_005ftagPool_005ffmt_005fmessage_0026_005fkey_005fnobody.reuse(_jspx_th_fmt_005fmessage_005f8); + return false; + } + + private boolean _jspx_meth_fmt_005fmessage_005f9(javax.servlet.jsp.PageContext _jspx_page_context) + throws java.lang.Throwable { + javax.servlet.jsp.PageContext pageContext = _jspx_page_context; + javax.servlet.jsp.JspWriter out = _jspx_page_context.getOut(); + // fmt:message + org.apache.taglibs.standard.tag.rt.fmt.MessageTag _jspx_th_fmt_005fmessage_005f9 = (org.apache.taglibs.standard.tag.rt.fmt.MessageTag) _005fjspx_005ftagPool_005ffmt_005fmessage_0026_005fkey_005fnobody.get(org.apache.taglibs.standard.tag.rt.fmt.MessageTag.class); + _jspx_th_fmt_005fmessage_005f9.setPageContext(_jspx_page_context); + _jspx_th_fmt_005fmessage_005f9.setParent(null); + // /WEB-INF/dashboardbetaadmin.jsp(42,22) name = key type = null reqTime = true required = false fragment = false deferredValue = false expectedTypeName = null deferredMethod = false methodSignature = null + _jspx_th_fmt_005fmessage_005f9.setKey("dashboardbeta.monthtodate"); + int _jspx_eval_fmt_005fmessage_005f9 = _jspx_th_fmt_005fmessage_005f9.doStartTag(); + if (_jspx_th_fmt_005fmessage_005f9.doEndTag() == javax.servlet.jsp.tagext.Tag.SKIP_PAGE) { + return true; + } + _005fjspx_005ftagPool_005ffmt_005fmessage_0026_005fkey_005fnobody.reuse(_jspx_th_fmt_005fmessage_005f9); + return false; + } + + private boolean _jspx_meth_fmt_005fmessage_005f10(javax.servlet.jsp.PageContext _jspx_page_context) + throws java.lang.Throwable { + javax.servlet.jsp.PageContext pageContext = _jspx_page_context; + javax.servlet.jsp.JspWriter out = _jspx_page_context.getOut(); + // fmt:message + org.apache.taglibs.standard.tag.rt.fmt.MessageTag _jspx_th_fmt_005fmessage_005f10 = (org.apache.taglibs.standard.tag.rt.fmt.MessageTag) _005fjspx_005ftagPool_005ffmt_005fmessage_0026_005fkey_005fnobody.get(org.apache.taglibs.standard.tag.rt.fmt.MessageTag.class); + _jspx_th_fmt_005fmessage_005f10.setPageContext(_jspx_page_context); + _jspx_th_fmt_005fmessage_005f10.setParent(null); + // /WEB-INF/dashboardbetaadmin.jsp(43,23) name = key type = null reqTime = true required = false fragment = false deferredValue = false expectedTypeName = null deferredMethod = false methodSignature = null + _jspx_th_fmt_005fmessage_005f10.setKey("dashboardbeta.yeartodate"); + int _jspx_eval_fmt_005fmessage_005f10 = _jspx_th_fmt_005fmessage_005f10.doStartTag(); + if (_jspx_th_fmt_005fmessage_005f10.doEndTag() == javax.servlet.jsp.tagext.Tag.SKIP_PAGE) { + return true; + } + _005fjspx_005ftagPool_005ffmt_005fmessage_0026_005fkey_005fnobody.reuse(_jspx_th_fmt_005fmessage_005f10); + return false; + } + + private boolean _jspx_meth_fmt_005fmessage_005f11(javax.servlet.jsp.PageContext _jspx_page_context) + throws java.lang.Throwable { + javax.servlet.jsp.PageContext pageContext = _jspx_page_context; + javax.servlet.jsp.JspWriter out = _jspx_page_context.getOut(); + // fmt:message + org.apache.taglibs.standard.tag.rt.fmt.MessageTag _jspx_th_fmt_005fmessage_005f11 = (org.apache.taglibs.standard.tag.rt.fmt.MessageTag) _005fjspx_005ftagPool_005ffmt_005fmessage_0026_005fkey_005fnobody.get(org.apache.taglibs.standard.tag.rt.fmt.MessageTag.class); + _jspx_th_fmt_005fmessage_005f11.setPageContext(_jspx_page_context); + _jspx_th_fmt_005fmessage_005f11.setParent(null); + // /WEB-INF/dashboardbetaadmin.jsp(44,24) name = key type = null reqTime = true required = false fragment = false deferredValue = false expectedTypeName = null deferredMethod = false methodSignature = null + _jspx_th_fmt_005fmessage_005f11.setKey("dashboardbeta.custom"); + int _jspx_eval_fmt_005fmessage_005f11 = _jspx_th_fmt_005fmessage_005f11.doStartTag(); + if (_jspx_th_fmt_005fmessage_005f11.doEndTag() == javax.servlet.jsp.tagext.Tag.SKIP_PAGE) { + return true; + } + _005fjspx_005ftagPool_005ffmt_005fmessage_0026_005fkey_005fnobody.reuse(_jspx_th_fmt_005fmessage_005f11); + return false; + } + + private boolean _jspx_meth_fmt_005fmessage_005f12(javax.servlet.jsp.PageContext _jspx_page_context) + throws java.lang.Throwable { + javax.servlet.jsp.PageContext pageContext = _jspx_page_context; + javax.servlet.jsp.JspWriter out = _jspx_page_context.getOut(); + // fmt:message + org.apache.taglibs.standard.tag.rt.fmt.MessageTag _jspx_th_fmt_005fmessage_005f12 = (org.apache.taglibs.standard.tag.rt.fmt.MessageTag) _005fjspx_005ftagPool_005ffmt_005fmessage_0026_005fkey_005fnobody.get(org.apache.taglibs.standard.tag.rt.fmt.MessageTag.class); + _jspx_th_fmt_005fmessage_005f12.setPageContext(_jspx_page_context); + _jspx_th_fmt_005fmessage_005f12.setParent(null); + // /WEB-INF/dashboardbetaadmin.jsp(51,69) name = key type = null reqTime = true required = false fragment = false deferredValue = false expectedTypeName = null deferredMethod = false methodSignature = null + _jspx_th_fmt_005fmessage_005f12.setKey("dashboardbeta.runreport"); + int _jspx_eval_fmt_005fmessage_005f12 = _jspx_th_fmt_005fmessage_005f12.doStartTag(); + if (_jspx_th_fmt_005fmessage_005f12.doEndTag() == javax.servlet.jsp.tagext.Tag.SKIP_PAGE) { + return true; + } + _005fjspx_005ftagPool_005ffmt_005fmessage_0026_005fkey_005fnobody.reuse(_jspx_th_fmt_005fmessage_005f12); + return false; + } + + private boolean _jspx_meth_fmt_005fmessage_005f13(javax.servlet.jsp.PageContext _jspx_page_context) + throws java.lang.Throwable { + javax.servlet.jsp.PageContext pageContext = _jspx_page_context; + javax.servlet.jsp.JspWriter out = _jspx_page_context.getOut(); + // fmt:message + org.apache.taglibs.standard.tag.rt.fmt.MessageTag _jspx_th_fmt_005fmessage_005f13 = (org.apache.taglibs.standard.tag.rt.fmt.MessageTag) _005fjspx_005ftagPool_005ffmt_005fmessage_0026_005fkey_005fnobody.get(org.apache.taglibs.standard.tag.rt.fmt.MessageTag.class); + _jspx_th_fmt_005fmessage_005f13.setPageContext(_jspx_page_context); + _jspx_th_fmt_005fmessage_005f13.setParent(null); + // /WEB-INF/dashboardbetaadmin.jsp(52,102) name = key type = null reqTime = true required = false fragment = false deferredValue = false expectedTypeName = null deferredMethod = false methodSignature = null + _jspx_th_fmt_005fmessage_005f13.setKey("dashboardbeta.editcas"); + int _jspx_eval_fmt_005fmessage_005f13 = _jspx_th_fmt_005fmessage_005f13.doStartTag(); + if (_jspx_th_fmt_005fmessage_005f13.doEndTag() == javax.servlet.jsp.tagext.Tag.SKIP_PAGE) { + return true; + } + _005fjspx_005ftagPool_005ffmt_005fmessage_0026_005fkey_005fnobody.reuse(_jspx_th_fmt_005fmessage_005f13); + return false; + } + + private boolean _jspx_meth_fmt_005fmessage_005f14(javax.servlet.jsp.PageContext _jspx_page_context) + throws java.lang.Throwable { + javax.servlet.jsp.PageContext pageContext = _jspx_page_context; + javax.servlet.jsp.JspWriter out = _jspx_page_context.getOut(); + // fmt:message + org.apache.taglibs.standard.tag.rt.fmt.MessageTag _jspx_th_fmt_005fmessage_005f14 = (org.apache.taglibs.standard.tag.rt.fmt.MessageTag) _005fjspx_005ftagPool_005ffmt_005fmessage_0026_005fkey_005fnobody.get(org.apache.taglibs.standard.tag.rt.fmt.MessageTag.class); + _jspx_th_fmt_005fmessage_005f14.setPageContext(_jspx_page_context); + _jspx_th_fmt_005fmessage_005f14.setParent(null); + // /WEB-INF/dashboardbetaadmin.jsp(69,20) name = key type = null reqTime = true required = false fragment = false deferredValue = false expectedTypeName = null deferredMethod = false methodSignature = null + _jspx_th_fmt_005fmessage_005f14.setKey("dashboardbeta.oneday"); + int _jspx_eval_fmt_005fmessage_005f14 = _jspx_th_fmt_005fmessage_005f14.doStartTag(); + if (_jspx_th_fmt_005fmessage_005f14.doEndTag() == javax.servlet.jsp.tagext.Tag.SKIP_PAGE) { + return true; + } + _005fjspx_005ftagPool_005ffmt_005fmessage_0026_005fkey_005fnobody.reuse(_jspx_th_fmt_005fmessage_005f14); + return false; + } + + private boolean _jspx_meth_fmt_005fmessage_005f15(javax.servlet.jsp.PageContext _jspx_page_context) + throws java.lang.Throwable { + javax.servlet.jsp.PageContext pageContext = _jspx_page_context; + javax.servlet.jsp.JspWriter out = _jspx_page_context.getOut(); + // fmt:message + org.apache.taglibs.standard.tag.rt.fmt.MessageTag _jspx_th_fmt_005fmessage_005f15 = (org.apache.taglibs.standard.tag.rt.fmt.MessageTag) _005fjspx_005ftagPool_005ffmt_005fmessage_0026_005fkey_005fnobody.get(org.apache.taglibs.standard.tag.rt.fmt.MessageTag.class); + _jspx_th_fmt_005fmessage_005f15.setPageContext(_jspx_page_context); + _jspx_th_fmt_005fmessage_005f15.setParent(null); + // /WEB-INF/dashboardbetaadmin.jsp(70,20) name = key type = null reqTime = true required = false fragment = false deferredValue = false expectedTypeName = null deferredMethod = false methodSignature = null + _jspx_th_fmt_005fmessage_005f15.setKey("dashboardbeta.oneweek"); + int _jspx_eval_fmt_005fmessage_005f15 = _jspx_th_fmt_005fmessage_005f15.doStartTag(); + if (_jspx_th_fmt_005fmessage_005f15.doEndTag() == javax.servlet.jsp.tagext.Tag.SKIP_PAGE) { + return true; + } + _005fjspx_005ftagPool_005ffmt_005fmessage_0026_005fkey_005fnobody.reuse(_jspx_th_fmt_005fmessage_005f15); + return false; + } + + private boolean _jspx_meth_fmt_005fmessage_005f16(javax.servlet.jsp.PageContext _jspx_page_context) + throws java.lang.Throwable { + javax.servlet.jsp.PageContext pageContext = _jspx_page_context; + javax.servlet.jsp.JspWriter out = _jspx_page_context.getOut(); + // fmt:message + org.apache.taglibs.standard.tag.rt.fmt.MessageTag _jspx_th_fmt_005fmessage_005f16 = (org.apache.taglibs.standard.tag.rt.fmt.MessageTag) _005fjspx_005ftagPool_005ffmt_005fmessage_0026_005fkey_005fnobody.get(org.apache.taglibs.standard.tag.rt.fmt.MessageTag.class); + _jspx_th_fmt_005fmessage_005f16.setPageContext(_jspx_page_context); + _jspx_th_fmt_005fmessage_005f16.setParent(null); + // /WEB-INF/dashboardbetaadmin.jsp(71,21) name = key type = null reqTime = true required = false fragment = false deferredValue = false expectedTypeName = null deferredMethod = false methodSignature = null + _jspx_th_fmt_005fmessage_005f16.setKey("dashboardbeta.onemonth"); + int _jspx_eval_fmt_005fmessage_005f16 = _jspx_th_fmt_005fmessage_005f16.doStartTag(); + if (_jspx_th_fmt_005fmessage_005f16.doEndTag() == javax.servlet.jsp.tagext.Tag.SKIP_PAGE) { + return true; + } + _005fjspx_005ftagPool_005ffmt_005fmessage_0026_005fkey_005fnobody.reuse(_jspx_th_fmt_005fmessage_005f16); + return false; + } + + private boolean _jspx_meth_fmt_005fmessage_005f17(javax.servlet.jsp.PageContext _jspx_page_context) + throws java.lang.Throwable { + javax.servlet.jsp.PageContext pageContext = _jspx_page_context; + javax.servlet.jsp.JspWriter out = _jspx_page_context.getOut(); + // fmt:message + org.apache.taglibs.standard.tag.rt.fmt.MessageTag _jspx_th_fmt_005fmessage_005f17 = (org.apache.taglibs.standard.tag.rt.fmt.MessageTag) _005fjspx_005ftagPool_005ffmt_005fmessage_0026_005fkey_005fnobody.get(org.apache.taglibs.standard.tag.rt.fmt.MessageTag.class); + _jspx_th_fmt_005fmessage_005f17.setPageContext(_jspx_page_context); + _jspx_th_fmt_005fmessage_005f17.setParent(null); + // /WEB-INF/dashboardbetaadmin.jsp(72,22) name = key type = null reqTime = true required = false fragment = false deferredValue = false expectedTypeName = null deferredMethod = false methodSignature = null + _jspx_th_fmt_005fmessage_005f17.setKey("dashboardbeta.sixmonths"); + int _jspx_eval_fmt_005fmessage_005f17 = _jspx_th_fmt_005fmessage_005f17.doStartTag(); + if (_jspx_th_fmt_005fmessage_005f17.doEndTag() == javax.servlet.jsp.tagext.Tag.SKIP_PAGE) { + return true; + } + _005fjspx_005ftagPool_005ffmt_005fmessage_0026_005fkey_005fnobody.reuse(_jspx_th_fmt_005fmessage_005f17); + return false; + } + + private boolean _jspx_meth_fmt_005fmessage_005f18(javax.servlet.jsp.PageContext _jspx_page_context) + throws java.lang.Throwable { + javax.servlet.jsp.PageContext pageContext = _jspx_page_context; + javax.servlet.jsp.JspWriter out = _jspx_page_context.getOut(); + // fmt:message + org.apache.taglibs.standard.tag.rt.fmt.MessageTag _jspx_th_fmt_005fmessage_005f18 = (org.apache.taglibs.standard.tag.rt.fmt.MessageTag) _005fjspx_005ftagPool_005ffmt_005fmessage_0026_005fkey_005fnobody.get(org.apache.taglibs.standard.tag.rt.fmt.MessageTag.class); + _jspx_th_fmt_005fmessage_005f18.setPageContext(_jspx_page_context); + _jspx_th_fmt_005fmessage_005f18.setParent(null); + // /WEB-INF/dashboardbetaadmin.jsp(73,22) name = key type = null reqTime = true required = false fragment = false deferredValue = false expectedTypeName = null deferredMethod = false methodSignature = null + _jspx_th_fmt_005fmessage_005f18.setKey("dashboardbeta.oneyear"); + int _jspx_eval_fmt_005fmessage_005f18 = _jspx_th_fmt_005fmessage_005f18.doStartTag(); + if (_jspx_th_fmt_005fmessage_005f18.doEndTag() == javax.servlet.jsp.tagext.Tag.SKIP_PAGE) { + return true; + } + _005fjspx_005ftagPool_005ffmt_005fmessage_0026_005fkey_005fnobody.reuse(_jspx_th_fmt_005fmessage_005f18); + return false; + } + + private boolean _jspx_meth_fmt_005fmessage_005f19(javax.servlet.jsp.PageContext _jspx_page_context) + throws java.lang.Throwable { + javax.servlet.jsp.PageContext pageContext = _jspx_page_context; + javax.servlet.jsp.JspWriter out = _jspx_page_context.getOut(); + // fmt:message + org.apache.taglibs.standard.tag.rt.fmt.MessageTag _jspx_th_fmt_005fmessage_005f19 = (org.apache.taglibs.standard.tag.rt.fmt.MessageTag) _005fjspx_005ftagPool_005ffmt_005fmessage_0026_005fkey_005fnobody.get(org.apache.taglibs.standard.tag.rt.fmt.MessageTag.class); + _jspx_th_fmt_005fmessage_005f19.setPageContext(_jspx_page_context); + _jspx_th_fmt_005fmessage_005f19.setParent(null); + // /WEB-INF/dashboardbetaadmin.jsp(74,22) name = key type = null reqTime = true required = false fragment = false deferredValue = false expectedTypeName = null deferredMethod = false methodSignature = null + _jspx_th_fmt_005fmessage_005f19.setKey("dashboardbeta.monthtodate"); + int _jspx_eval_fmt_005fmessage_005f19 = _jspx_th_fmt_005fmessage_005f19.doStartTag(); + if (_jspx_th_fmt_005fmessage_005f19.doEndTag() == javax.servlet.jsp.tagext.Tag.SKIP_PAGE) { + return true; + } + _005fjspx_005ftagPool_005ffmt_005fmessage_0026_005fkey_005fnobody.reuse(_jspx_th_fmt_005fmessage_005f19); + return false; + } + + private boolean _jspx_meth_fmt_005fmessage_005f20(javax.servlet.jsp.PageContext _jspx_page_context) + throws java.lang.Throwable { + javax.servlet.jsp.PageContext pageContext = _jspx_page_context; + javax.servlet.jsp.JspWriter out = _jspx_page_context.getOut(); + // fmt:message + org.apache.taglibs.standard.tag.rt.fmt.MessageTag _jspx_th_fmt_005fmessage_005f20 = (org.apache.taglibs.standard.tag.rt.fmt.MessageTag) _005fjspx_005ftagPool_005ffmt_005fmessage_0026_005fkey_005fnobody.get(org.apache.taglibs.standard.tag.rt.fmt.MessageTag.class); + _jspx_th_fmt_005fmessage_005f20.setPageContext(_jspx_page_context); + _jspx_th_fmt_005fmessage_005f20.setParent(null); + // /WEB-INF/dashboardbetaadmin.jsp(75,23) name = key type = null reqTime = true required = false fragment = false deferredValue = false expectedTypeName = null deferredMethod = false methodSignature = null + _jspx_th_fmt_005fmessage_005f20.setKey("dashboardbeta.yeartodate"); + int _jspx_eval_fmt_005fmessage_005f20 = _jspx_th_fmt_005fmessage_005f20.doStartTag(); + if (_jspx_th_fmt_005fmessage_005f20.doEndTag() == javax.servlet.jsp.tagext.Tag.SKIP_PAGE) { + return true; + } + _005fjspx_005ftagPool_005ffmt_005fmessage_0026_005fkey_005fnobody.reuse(_jspx_th_fmt_005fmessage_005f20); + return false; + } + + private boolean _jspx_meth_fmt_005fmessage_005f21(javax.servlet.jsp.PageContext _jspx_page_context) + throws java.lang.Throwable { + javax.servlet.jsp.PageContext pageContext = _jspx_page_context; + javax.servlet.jsp.JspWriter out = _jspx_page_context.getOut(); + // fmt:message + org.apache.taglibs.standard.tag.rt.fmt.MessageTag _jspx_th_fmt_005fmessage_005f21 = (org.apache.taglibs.standard.tag.rt.fmt.MessageTag) _005fjspx_005ftagPool_005ffmt_005fmessage_0026_005fkey_005fnobody.get(org.apache.taglibs.standard.tag.rt.fmt.MessageTag.class); + _jspx_th_fmt_005fmessage_005f21.setPageContext(_jspx_page_context); + _jspx_th_fmt_005fmessage_005f21.setParent(null); + // /WEB-INF/dashboardbetaadmin.jsp(76,24) name = key type = null reqTime = true required = false fragment = false deferredValue = false expectedTypeName = null deferredMethod = false methodSignature = null + _jspx_th_fmt_005fmessage_005f21.setKey("dashboardbeta.custom"); + int _jspx_eval_fmt_005fmessage_005f21 = _jspx_th_fmt_005fmessage_005f21.doStartTag(); + if (_jspx_th_fmt_005fmessage_005f21.doEndTag() == javax.servlet.jsp.tagext.Tag.SKIP_PAGE) { + return true; + } + _005fjspx_005ftagPool_005ffmt_005fmessage_0026_005fkey_005fnobody.reuse(_jspx_th_fmt_005fmessage_005f21); + return false; + } + + private boolean _jspx_meth_fmt_005fmessage_005f22(javax.servlet.jsp.PageContext _jspx_page_context) + throws java.lang.Throwable { + javax.servlet.jsp.PageContext pageContext = _jspx_page_context; + javax.servlet.jsp.JspWriter out = _jspx_page_context.getOut(); + // fmt:message + org.apache.taglibs.standard.tag.rt.fmt.MessageTag _jspx_th_fmt_005fmessage_005f22 = (org.apache.taglibs.standard.tag.rt.fmt.MessageTag) _005fjspx_005ftagPool_005ffmt_005fmessage_0026_005fkey_005fnobody.get(org.apache.taglibs.standard.tag.rt.fmt.MessageTag.class); + _jspx_th_fmt_005fmessage_005f22.setPageContext(_jspx_page_context); + _jspx_th_fmt_005fmessage_005f22.setParent(null); + // /WEB-INF/dashboardbetaadmin.jsp(77,24) name = key type = null reqTime = true required = false fragment = false deferredValue = false expectedTypeName = null deferredMethod = false methodSignature = null + _jspx_th_fmt_005fmessage_005f22.setKey("dashboardbeta.sameasreport1"); + int _jspx_eval_fmt_005fmessage_005f22 = _jspx_th_fmt_005fmessage_005f22.doStartTag(); + if (_jspx_th_fmt_005fmessage_005f22.doEndTag() == javax.servlet.jsp.tagext.Tag.SKIP_PAGE) { + return true; + } + _005fjspx_005ftagPool_005ffmt_005fmessage_0026_005fkey_005fnobody.reuse(_jspx_th_fmt_005fmessage_005f22); + return false; + } + + private boolean _jspx_meth_fmt_005fmessage_005f23(javax.servlet.jsp.PageContext _jspx_page_context) + throws java.lang.Throwable { + javax.servlet.jsp.PageContext pageContext = _jspx_page_context; + javax.servlet.jsp.JspWriter out = _jspx_page_context.getOut(); + // fmt:message + org.apache.taglibs.standard.tag.rt.fmt.MessageTag _jspx_th_fmt_005fmessage_005f23 = (org.apache.taglibs.standard.tag.rt.fmt.MessageTag) _005fjspx_005ftagPool_005ffmt_005fmessage_0026_005fkey_005fnobody.get(org.apache.taglibs.standard.tag.rt.fmt.MessageTag.class); + _jspx_th_fmt_005fmessage_005f23.setPageContext(_jspx_page_context); + _jspx_th_fmt_005fmessage_005f23.setParent(null); + // /WEB-INF/dashboardbetaadmin.jsp(78,67) name = key type = null reqTime = true required = false fragment = false deferredValue = false expectedTypeName = null deferredMethod = false methodSignature = null + _jspx_th_fmt_005fmessage_005f23.setKey("dashboardbeta.previousday"); + int _jspx_eval_fmt_005fmessage_005f23 = _jspx_th_fmt_005fmessage_005f23.doStartTag(); + if (_jspx_th_fmt_005fmessage_005f23.doEndTag() == javax.servlet.jsp.tagext.Tag.SKIP_PAGE) { + return true; + } + _005fjspx_005ftagPool_005ffmt_005fmessage_0026_005fkey_005fnobody.reuse(_jspx_th_fmt_005fmessage_005f23); + return false; + } + + private boolean _jspx_meth_fmt_005fmessage_005f24(javax.servlet.jsp.PageContext _jspx_page_context) + throws java.lang.Throwable { + javax.servlet.jsp.PageContext pageContext = _jspx_page_context; + javax.servlet.jsp.JspWriter out = _jspx_page_context.getOut(); + // fmt:message + org.apache.taglibs.standard.tag.rt.fmt.MessageTag _jspx_th_fmt_005fmessage_005f24 = (org.apache.taglibs.standard.tag.rt.fmt.MessageTag) _005fjspx_005ftagPool_005ffmt_005fmessage_0026_005fkey_005fnobody.get(org.apache.taglibs.standard.tag.rt.fmt.MessageTag.class); + _jspx_th_fmt_005fmessage_005f24.setPageContext(_jspx_page_context); + _jspx_th_fmt_005fmessage_005f24.setParent(null); + // /WEB-INF/dashboardbetaadmin.jsp(79,71) name = key type = null reqTime = true required = false fragment = false deferredValue = false expectedTypeName = null deferredMethod = false methodSignature = null + _jspx_th_fmt_005fmessage_005f24.setKey("dashboardbeta.samedaylastweek"); + int _jspx_eval_fmt_005fmessage_005f24 = _jspx_th_fmt_005fmessage_005f24.doStartTag(); + if (_jspx_th_fmt_005fmessage_005f24.doEndTag() == javax.servlet.jsp.tagext.Tag.SKIP_PAGE) { + return true; + } + _005fjspx_005ftagPool_005ffmt_005fmessage_0026_005fkey_005fnobody.reuse(_jspx_th_fmt_005fmessage_005f24); + return false; + } + + private boolean _jspx_meth_fmt_005fmessage_005f25(javax.servlet.jsp.PageContext _jspx_page_context) + throws java.lang.Throwable { + javax.servlet.jsp.PageContext pageContext = _jspx_page_context; + javax.servlet.jsp.JspWriter out = _jspx_page_context.getOut(); + // fmt:message + org.apache.taglibs.standard.tag.rt.fmt.MessageTag _jspx_th_fmt_005fmessage_005f25 = (org.apache.taglibs.standard.tag.rt.fmt.MessageTag) _005fjspx_005ftagPool_005ffmt_005fmessage_0026_005fkey_005fnobody.get(org.apache.taglibs.standard.tag.rt.fmt.MessageTag.class); + _jspx_th_fmt_005fmessage_005f25.setPageContext(_jspx_page_context); + _jspx_th_fmt_005fmessage_005f25.setParent(null); + // /WEB-INF/dashboardbetaadmin.jsp(80,73) name = key type = null reqTime = true required = false fragment = false deferredValue = false expectedTypeName = null deferredMethod = false methodSignature = null + _jspx_th_fmt_005fmessage_005f25.setKey("dashboardbeta.samedaylastmonth"); + int _jspx_eval_fmt_005fmessage_005f25 = _jspx_th_fmt_005fmessage_005f25.doStartTag(); + if (_jspx_th_fmt_005fmessage_005f25.doEndTag() == javax.servlet.jsp.tagext.Tag.SKIP_PAGE) { + return true; + } + _005fjspx_005ftagPool_005ffmt_005fmessage_0026_005fkey_005fnobody.reuse(_jspx_th_fmt_005fmessage_005f25); + return false; + } + + private boolean _jspx_meth_fmt_005fmessage_005f26(javax.servlet.jsp.PageContext _jspx_page_context) + throws java.lang.Throwable { + javax.servlet.jsp.PageContext pageContext = _jspx_page_context; + javax.servlet.jsp.JspWriter out = _jspx_page_context.getOut(); + // fmt:message + org.apache.taglibs.standard.tag.rt.fmt.MessageTag _jspx_th_fmt_005fmessage_005f26 = (org.apache.taglibs.standard.tag.rt.fmt.MessageTag) _005fjspx_005ftagPool_005ffmt_005fmessage_0026_005fkey_005fnobody.get(org.apache.taglibs.standard.tag.rt.fmt.MessageTag.class); + _jspx_th_fmt_005fmessage_005f26.setPageContext(_jspx_page_context); + _jspx_th_fmt_005fmessage_005f26.setParent(null); + // /WEB-INF/dashboardbetaadmin.jsp(81,73) name = key type = null reqTime = true required = false fragment = false deferredValue = false expectedTypeName = null deferredMethod = false methodSignature = null + _jspx_th_fmt_005fmessage_005f26.setKey("dashboardbeta.samedaylastyear"); + int _jspx_eval_fmt_005fmessage_005f26 = _jspx_th_fmt_005fmessage_005f26.doStartTag(); + if (_jspx_th_fmt_005fmessage_005f26.doEndTag() == javax.servlet.jsp.tagext.Tag.SKIP_PAGE) { + return true; + } + _005fjspx_005ftagPool_005ffmt_005fmessage_0026_005fkey_005fnobody.reuse(_jspx_th_fmt_005fmessage_005f26); + return false; + } + + private boolean _jspx_meth_fmt_005fmessage_005f27(javax.servlet.jsp.PageContext _jspx_page_context) + throws java.lang.Throwable { + javax.servlet.jsp.PageContext pageContext = _jspx_page_context; + javax.servlet.jsp.JspWriter out = _jspx_page_context.getOut(); + // fmt:message + org.apache.taglibs.standard.tag.rt.fmt.MessageTag _jspx_th_fmt_005fmessage_005f27 = (org.apache.taglibs.standard.tag.rt.fmt.MessageTag) _005fjspx_005ftagPool_005ffmt_005fmessage_0026_005fkey_005fnobody.get(org.apache.taglibs.standard.tag.rt.fmt.MessageTag.class); + _jspx_th_fmt_005fmessage_005f27.setPageContext(_jspx_page_context); + _jspx_th_fmt_005fmessage_005f27.setParent(null); + // /WEB-INF/dashboardbetaadmin.jsp(82,68) name = key type = null reqTime = true required = false fragment = false deferredValue = false expectedTypeName = null deferredMethod = false methodSignature = null + _jspx_th_fmt_005fmessage_005f27.setKey("dashboardbeta.previousweek"); + int _jspx_eval_fmt_005fmessage_005f27 = _jspx_th_fmt_005fmessage_005f27.doStartTag(); + if (_jspx_th_fmt_005fmessage_005f27.doEndTag() == javax.servlet.jsp.tagext.Tag.SKIP_PAGE) { + return true; + } + _005fjspx_005ftagPool_005ffmt_005fmessage_0026_005fkey_005fnobody.reuse(_jspx_th_fmt_005fmessage_005f27); + return false; + } + + private boolean _jspx_meth_fmt_005fmessage_005f28(javax.servlet.jsp.PageContext _jspx_page_context) + throws java.lang.Throwable { + javax.servlet.jsp.PageContext pageContext = _jspx_page_context; + javax.servlet.jsp.JspWriter out = _jspx_page_context.getOut(); + // fmt:message + org.apache.taglibs.standard.tag.rt.fmt.MessageTag _jspx_th_fmt_005fmessage_005f28 = (org.apache.taglibs.standard.tag.rt.fmt.MessageTag) _005fjspx_005ftagPool_005ffmt_005fmessage_0026_005fkey_005fnobody.get(org.apache.taglibs.standard.tag.rt.fmt.MessageTag.class); + _jspx_th_fmt_005fmessage_005f28.setPageContext(_jspx_page_context); + _jspx_th_fmt_005fmessage_005f28.setParent(null); + // /WEB-INF/dashboardbetaadmin.jsp(83,71) name = key type = null reqTime = true required = false fragment = false deferredValue = false expectedTypeName = null deferredMethod = false methodSignature = null + _jspx_th_fmt_005fmessage_005f28.setKey("dashboardbeta.4weeksprevious"); + int _jspx_eval_fmt_005fmessage_005f28 = _jspx_th_fmt_005fmessage_005f28.doStartTag(); + if (_jspx_th_fmt_005fmessage_005f28.doEndTag() == javax.servlet.jsp.tagext.Tag.SKIP_PAGE) { + return true; + } + _005fjspx_005ftagPool_005ffmt_005fmessage_0026_005fkey_005fnobody.reuse(_jspx_th_fmt_005fmessage_005f28); + return false; + } + + private boolean _jspx_meth_fmt_005fmessage_005f29(javax.servlet.jsp.PageContext _jspx_page_context) + throws java.lang.Throwable { + javax.servlet.jsp.PageContext pageContext = _jspx_page_context; + javax.servlet.jsp.JspWriter out = _jspx_page_context.getOut(); + // fmt:message + org.apache.taglibs.standard.tag.rt.fmt.MessageTag _jspx_th_fmt_005fmessage_005f29 = (org.apache.taglibs.standard.tag.rt.fmt.MessageTag) _005fjspx_005ftagPool_005ffmt_005fmessage_0026_005fkey_005fnobody.get(org.apache.taglibs.standard.tag.rt.fmt.MessageTag.class); + _jspx_th_fmt_005fmessage_005f29.setPageContext(_jspx_page_context); + _jspx_th_fmt_005fmessage_005f29.setParent(null); + // /WEB-INF/dashboardbetaadmin.jsp(84,74) name = key type = null reqTime = true required = false fragment = false deferredValue = false expectedTypeName = null deferredMethod = false methodSignature = null + _jspx_th_fmt_005fmessage_005f29.setKey("dashboardbeta.sameweeklastyear"); + int _jspx_eval_fmt_005fmessage_005f29 = _jspx_th_fmt_005fmessage_005f29.doStartTag(); + if (_jspx_th_fmt_005fmessage_005f29.doEndTag() == javax.servlet.jsp.tagext.Tag.SKIP_PAGE) { + return true; + } + _005fjspx_005ftagPool_005ffmt_005fmessage_0026_005fkey_005fnobody.reuse(_jspx_th_fmt_005fmessage_005f29); + return false; + } + + private boolean _jspx_meth_fmt_005fmessage_005f30(javax.servlet.jsp.PageContext _jspx_page_context) + throws java.lang.Throwable { + javax.servlet.jsp.PageContext pageContext = _jspx_page_context; + javax.servlet.jsp.JspWriter out = _jspx_page_context.getOut(); + // fmt:message + org.apache.taglibs.standard.tag.rt.fmt.MessageTag _jspx_th_fmt_005fmessage_005f30 = (org.apache.taglibs.standard.tag.rt.fmt.MessageTag) _005fjspx_005ftagPool_005ffmt_005fmessage_0026_005fkey_005fnobody.get(org.apache.taglibs.standard.tag.rt.fmt.MessageTag.class); + _jspx_th_fmt_005fmessage_005f30.setPageContext(_jspx_page_context); + _jspx_th_fmt_005fmessage_005f30.setParent(null); + // /WEB-INF/dashboardbetaadmin.jsp(85,70) name = key type = null reqTime = true required = false fragment = false deferredValue = false expectedTypeName = null deferredMethod = false methodSignature = null + _jspx_th_fmt_005fmessage_005f30.setKey("dashboardbeta.previousmonth"); + int _jspx_eval_fmt_005fmessage_005f30 = _jspx_th_fmt_005fmessage_005f30.doStartTag(); + if (_jspx_th_fmt_005fmessage_005f30.doEndTag() == javax.servlet.jsp.tagext.Tag.SKIP_PAGE) { + return true; + } + _005fjspx_005ftagPool_005ffmt_005fmessage_0026_005fkey_005fnobody.reuse(_jspx_th_fmt_005fmessage_005f30); + return false; + } + + private boolean _jspx_meth_fmt_005fmessage_005f31(javax.servlet.jsp.PageContext _jspx_page_context) + throws java.lang.Throwable { + javax.servlet.jsp.PageContext pageContext = _jspx_page_context; + javax.servlet.jsp.JspWriter out = _jspx_page_context.getOut(); + // fmt:message + org.apache.taglibs.standard.tag.rt.fmt.MessageTag _jspx_th_fmt_005fmessage_005f31 = (org.apache.taglibs.standard.tag.rt.fmt.MessageTag) _005fjspx_005ftagPool_005ffmt_005fmessage_0026_005fkey_005fnobody.get(org.apache.taglibs.standard.tag.rt.fmt.MessageTag.class); + _jspx_th_fmt_005fmessage_005f31.setPageContext(_jspx_page_context); + _jspx_th_fmt_005fmessage_005f31.setParent(null); + // /WEB-INF/dashboardbetaadmin.jsp(86,75) name = key type = null reqTime = true required = false fragment = false deferredValue = false expectedTypeName = null deferredMethod = false methodSignature = null + _jspx_th_fmt_005fmessage_005f31.setKey("dashboardbeta.samemonthlastyear"); + int _jspx_eval_fmt_005fmessage_005f31 = _jspx_th_fmt_005fmessage_005f31.doStartTag(); + if (_jspx_th_fmt_005fmessage_005f31.doEndTag() == javax.servlet.jsp.tagext.Tag.SKIP_PAGE) { + return true; + } + _005fjspx_005ftagPool_005ffmt_005fmessage_0026_005fkey_005fnobody.reuse(_jspx_th_fmt_005fmessage_005f31); + return false; + } + + private boolean _jspx_meth_fmt_005fmessage_005f32(javax.servlet.jsp.PageContext _jspx_page_context) + throws java.lang.Throwable { + javax.servlet.jsp.PageContext pageContext = _jspx_page_context; + javax.servlet.jsp.JspWriter out = _jspx_page_context.getOut(); + // fmt:message + org.apache.taglibs.standard.tag.rt.fmt.MessageTag _jspx_th_fmt_005fmessage_005f32 = (org.apache.taglibs.standard.tag.rt.fmt.MessageTag) _005fjspx_005ftagPool_005ffmt_005fmessage_0026_005fkey_005fnobody.get(org.apache.taglibs.standard.tag.rt.fmt.MessageTag.class); + _jspx_th_fmt_005fmessage_005f32.setPageContext(_jspx_page_context); + _jspx_th_fmt_005fmessage_005f32.setParent(null); + // /WEB-INF/dashboardbetaadmin.jsp(87,72) name = key type = null reqTime = true required = false fragment = false deferredValue = false expectedTypeName = null deferredMethod = false methodSignature = null + _jspx_th_fmt_005fmessage_005f32.setKey("dashboardbeta.previous6month"); + int _jspx_eval_fmt_005fmessage_005f32 = _jspx_th_fmt_005fmessage_005f32.doStartTag(); + if (_jspx_th_fmt_005fmessage_005f32.doEndTag() == javax.servlet.jsp.tagext.Tag.SKIP_PAGE) { + return true; + } + _005fjspx_005ftagPool_005ffmt_005fmessage_0026_005fkey_005fnobody.reuse(_jspx_th_fmt_005fmessage_005f32); + return false; + } + + private boolean _jspx_meth_fmt_005fmessage_005f33(javax.servlet.jsp.PageContext _jspx_page_context) + throws java.lang.Throwable { + javax.servlet.jsp.PageContext pageContext = _jspx_page_context; + javax.servlet.jsp.JspWriter out = _jspx_page_context.getOut(); + // fmt:message + org.apache.taglibs.standard.tag.rt.fmt.MessageTag _jspx_th_fmt_005fmessage_005f33 = (org.apache.taglibs.standard.tag.rt.fmt.MessageTag) _005fjspx_005ftagPool_005ffmt_005fmessage_0026_005fkey_005fnobody.get(org.apache.taglibs.standard.tag.rt.fmt.MessageTag.class); + _jspx_th_fmt_005fmessage_005f33.setPageContext(_jspx_page_context); + _jspx_th_fmt_005fmessage_005f33.setParent(null); + // /WEB-INF/dashboardbetaadmin.jsp(88,77) name = key type = null reqTime = true required = false fragment = false deferredValue = false expectedTypeName = null deferredMethod = false methodSignature = null + _jspx_th_fmt_005fmessage_005f33.setKey("dashboardbeta.same6monthslastyear"); + int _jspx_eval_fmt_005fmessage_005f33 = _jspx_th_fmt_005fmessage_005f33.doStartTag(); + if (_jspx_th_fmt_005fmessage_005f33.doEndTag() == javax.servlet.jsp.tagext.Tag.SKIP_PAGE) { + return true; + } + _005fjspx_005ftagPool_005ffmt_005fmessage_0026_005fkey_005fnobody.reuse(_jspx_th_fmt_005fmessage_005f33); + return false; + } + + private boolean _jspx_meth_fmt_005fmessage_005f34(javax.servlet.jsp.PageContext _jspx_page_context) + throws java.lang.Throwable { + javax.servlet.jsp.PageContext pageContext = _jspx_page_context; + javax.servlet.jsp.JspWriter out = _jspx_page_context.getOut(); + // fmt:message + org.apache.taglibs.standard.tag.rt.fmt.MessageTag _jspx_th_fmt_005fmessage_005f34 = (org.apache.taglibs.standard.tag.rt.fmt.MessageTag) _005fjspx_005ftagPool_005ffmt_005fmessage_0026_005fkey_005fnobody.get(org.apache.taglibs.standard.tag.rt.fmt.MessageTag.class); + _jspx_th_fmt_005fmessage_005f34.setPageContext(_jspx_page_context); + _jspx_th_fmt_005fmessage_005f34.setParent(null); + // /WEB-INF/dashboardbetaadmin.jsp(89,70) name = key type = null reqTime = true required = false fragment = false deferredValue = false expectedTypeName = null deferredMethod = false methodSignature = null + _jspx_th_fmt_005fmessage_005f34.setKey("dashboardbeta.previousyear"); + int _jspx_eval_fmt_005fmessage_005f34 = _jspx_th_fmt_005fmessage_005f34.doStartTag(); + if (_jspx_th_fmt_005fmessage_005f34.doEndTag() == javax.servlet.jsp.tagext.Tag.SKIP_PAGE) { + return true; + } + _005fjspx_005ftagPool_005ffmt_005fmessage_0026_005fkey_005fnobody.reuse(_jspx_th_fmt_005fmessage_005f34); + return false; + } + + private boolean _jspx_meth_fmt_005fmessage_005f35(javax.servlet.jsp.PageContext _jspx_page_context) + throws java.lang.Throwable { + javax.servlet.jsp.PageContext pageContext = _jspx_page_context; + javax.servlet.jsp.JspWriter out = _jspx_page_context.getOut(); + // fmt:message + org.apache.taglibs.standard.tag.rt.fmt.MessageTag _jspx_th_fmt_005fmessage_005f35 = (org.apache.taglibs.standard.tag.rt.fmt.MessageTag) _005fjspx_005ftagPool_005ffmt_005fmessage_0026_005fkey_005fnobody.get(org.apache.taglibs.standard.tag.rt.fmt.MessageTag.class); + _jspx_th_fmt_005fmessage_005f35.setPageContext(_jspx_page_context); + _jspx_th_fmt_005fmessage_005f35.setParent(null); + // /WEB-INF/dashboardbetaadmin.jsp(94,66) name = key type = null reqTime = true required = false fragment = false deferredValue = false expectedTypeName = null deferredMethod = false methodSignature = null + _jspx_th_fmt_005fmessage_005f35.setKey("dashboardbeta.runreport"); + int _jspx_eval_fmt_005fmessage_005f35 = _jspx_th_fmt_005fmessage_005f35.doStartTag(); + if (_jspx_th_fmt_005fmessage_005f35.doEndTag() == javax.servlet.jsp.tagext.Tag.SKIP_PAGE) { + return true; + } + _005fjspx_005ftagPool_005ffmt_005fmessage_0026_005fkey_005fnobody.reuse(_jspx_th_fmt_005fmessage_005f35); + return false; + } + + private boolean _jspx_meth_fmt_005fmessage_005f36(javax.servlet.jsp.PageContext _jspx_page_context) + throws java.lang.Throwable { + javax.servlet.jsp.PageContext pageContext = _jspx_page_context; + javax.servlet.jsp.JspWriter out = _jspx_page_context.getOut(); + // fmt:message + org.apache.taglibs.standard.tag.rt.fmt.MessageTag _jspx_th_fmt_005fmessage_005f36 = (org.apache.taglibs.standard.tag.rt.fmt.MessageTag) _005fjspx_005ftagPool_005ffmt_005fmessage_0026_005fkey_005fnobody.get(org.apache.taglibs.standard.tag.rt.fmt.MessageTag.class); + _jspx_th_fmt_005fmessage_005f36.setPageContext(_jspx_page_context); + _jspx_th_fmt_005fmessage_005f36.setParent(null); + // /WEB-INF/dashboardbetaadmin.jsp(95,103) name = key type = null reqTime = true required = false fragment = false deferredValue = false expectedTypeName = null deferredMethod = false methodSignature = null + _jspx_th_fmt_005fmessage_005f36.setKey("dashboardbeta.editcas"); + int _jspx_eval_fmt_005fmessage_005f36 = _jspx_th_fmt_005fmessage_005f36.doStartTag(); + if (_jspx_th_fmt_005fmessage_005f36.doEndTag() == javax.servlet.jsp.tagext.Tag.SKIP_PAGE) { + return true; + } + _005fjspx_005ftagPool_005ffmt_005fmessage_0026_005fkey_005fnobody.reuse(_jspx_th_fmt_005fmessage_005f36); + return false; + } + + private boolean _jspx_meth_fmt_005fmessage_005f37(javax.servlet.jsp.PageContext _jspx_page_context) + throws java.lang.Throwable { + javax.servlet.jsp.PageContext pageContext = _jspx_page_context; + javax.servlet.jsp.JspWriter out = _jspx_page_context.getOut(); + // fmt:message + org.apache.taglibs.standard.tag.rt.fmt.MessageTag _jspx_th_fmt_005fmessage_005f37 = (org.apache.taglibs.standard.tag.rt.fmt.MessageTag) _005fjspx_005ftagPool_005ffmt_005fmessage_0026_005fkey_005fnobody.get(org.apache.taglibs.standard.tag.rt.fmt.MessageTag.class); + _jspx_th_fmt_005fmessage_005f37.setPageContext(_jspx_page_context); + _jspx_th_fmt_005fmessage_005f37.setParent(null); + // /WEB-INF/dashboardbetaadmin.jsp(106,112) name = key type = null reqTime = true required = false fragment = false deferredValue = false expectedTypeName = null deferredMethod = false methodSignature = null + _jspx_th_fmt_005fmessage_005f37.setKey("dashboardbeta.createdashboard"); + int _jspx_eval_fmt_005fmessage_005f37 = _jspx_th_fmt_005fmessage_005f37.doStartTag(); + if (_jspx_th_fmt_005fmessage_005f37.doEndTag() == javax.servlet.jsp.tagext.Tag.SKIP_PAGE) { + return true; + } + _005fjspx_005ftagPool_005ffmt_005fmessage_0026_005fkey_005fnobody.reuse(_jspx_th_fmt_005fmessage_005f37); + return false; + } + + private boolean _jspx_meth_c_005fif_005f3(javax.servlet.jsp.PageContext _jspx_page_context) + throws java.lang.Throwable { + javax.servlet.jsp.PageContext pageContext = _jspx_page_context; + javax.servlet.jsp.JspWriter out = _jspx_page_context.getOut(); + // c:if + org.apache.taglibs.standard.tag.rt.core.IfTag _jspx_th_c_005fif_005f3 = (org.apache.taglibs.standard.tag.rt.core.IfTag) _005fjspx_005ftagPool_005fc_005fif_0026_005ftest.get(org.apache.taglibs.standard.tag.rt.core.IfTag.class); + _jspx_th_c_005fif_005f3.setPageContext(_jspx_page_context); + _jspx_th_c_005fif_005f3.setParent(null); + // /WEB-INF/footer.jsp(15,1) name = test type = boolean reqTime = true required = true fragment = false deferredValue = false expectedTypeName = null deferredMethod = false methodSignature = null + _jspx_th_c_005fif_005f3.setTest(((java.lang.Boolean) org.apache.jasper.runtime.PageContextImpl.proprietaryEvaluate("${not empty style_footername }", boolean.class, (javax.servlet.jsp.PageContext)_jspx_page_context, null)).booleanValue()); + int _jspx_eval_c_005fif_005f3 = _jspx_th_c_005fif_005f3.doStartTag(); + if (_jspx_eval_c_005fif_005f3 != javax.servlet.jsp.tagext.Tag.SKIP_BODY) { + do { + out.write("\r\n"); + out.write(" "); + out.write((java.lang.String) org.apache.jasper.runtime.PageContextImpl.proprietaryEvaluate("${style_footername}", java.lang.String.class, (javax.servlet.jsp.PageContext)_jspx_page_context, null)); + out.write('\r'); + out.write('\n'); + out.write(' '); + int evalDoAfterBody = _jspx_th_c_005fif_005f3.doAfterBody(); + if (evalDoAfterBody != javax.servlet.jsp.tagext.BodyTag.EVAL_BODY_AGAIN) + break; + } while (true); + } + if (_jspx_th_c_005fif_005f3.doEndTag() == javax.servlet.jsp.tagext.Tag.SKIP_PAGE) { + return true; + } + _005fjspx_005ftagPool_005fc_005fif_0026_005ftest.reuse(_jspx_th_c_005fif_005f3); + return false; + } + + private boolean _jspx_meth_fmt_005fmessage_005f38(javax.servlet.jsp.PageContext _jspx_page_context) + throws java.lang.Throwable { + javax.servlet.jsp.PageContext pageContext = _jspx_page_context; + javax.servlet.jsp.JspWriter out = _jspx_page_context.getOut(); + // fmt:message + org.apache.taglibs.standard.tag.rt.fmt.MessageTag _jspx_th_fmt_005fmessage_005f38 = (org.apache.taglibs.standard.tag.rt.fmt.MessageTag) _005fjspx_005ftagPool_005ffmt_005fmessage_0026_005fkey_005fnobody.get(org.apache.taglibs.standard.tag.rt.fmt.MessageTag.class); + _jspx_th_fmt_005fmessage_005f38.setPageContext(_jspx_page_context); + _jspx_th_fmt_005fmessage_005f38.setParent(null); + // /WEB-INF/dashboardbetaadmin.jsp(115,100) name = key type = null reqTime = true required = false fragment = false deferredValue = false expectedTypeName = null deferredMethod = false methodSignature = null + _jspx_th_fmt_005fmessage_005f38.setKey("dashboardbeta.ok"); + int _jspx_eval_fmt_005fmessage_005f38 = _jspx_th_fmt_005fmessage_005f38.doStartTag(); + if (_jspx_th_fmt_005fmessage_005f38.doEndTag() == javax.servlet.jsp.tagext.Tag.SKIP_PAGE) { + return true; + } + _005fjspx_005ftagPool_005ffmt_005fmessage_0026_005fkey_005fnobody.reuse(_jspx_th_fmt_005fmessage_005f38); + return false; + } + + private boolean _jspx_meth_fmt_005fmessage_005f39(javax.servlet.jsp.PageContext _jspx_page_context) + throws java.lang.Throwable { + javax.servlet.jsp.PageContext pageContext = _jspx_page_context; + javax.servlet.jsp.JspWriter out = _jspx_page_context.getOut(); + // fmt:message + org.apache.taglibs.standard.tag.rt.fmt.MessageTag _jspx_th_fmt_005fmessage_005f39 = (org.apache.taglibs.standard.tag.rt.fmt.MessageTag) _005fjspx_005ftagPool_005ffmt_005fmessage_0026_005fkey_005fnobody.get(org.apache.taglibs.standard.tag.rt.fmt.MessageTag.class); + _jspx_th_fmt_005fmessage_005f39.setPageContext(_jspx_page_context); + _jspx_th_fmt_005fmessage_005f39.setParent(null); + // /WEB-INF/dashboardbetaadmin.jsp(120,27) name = key type = null reqTime = true required = false fragment = false deferredValue = false expectedTypeName = null deferredMethod = false methodSignature = null + _jspx_th_fmt_005fmessage_005f39.setKey("dashboardbeta.leftsidecas"); + int _jspx_eval_fmt_005fmessage_005f39 = _jspx_th_fmt_005fmessage_005f39.doStartTag(); + if (_jspx_th_fmt_005fmessage_005f39.doEndTag() == javax.servlet.jsp.tagext.Tag.SKIP_PAGE) { + return true; + } + _005fjspx_005ftagPool_005ffmt_005fmessage_0026_005fkey_005fnobody.reuse(_jspx_th_fmt_005fmessage_005f39); + return false; + } + + private boolean _jspx_meth_fmt_005fmessage_005f40(javax.servlet.jsp.PageContext _jspx_page_context) + throws java.lang.Throwable { + javax.servlet.jsp.PageContext pageContext = _jspx_page_context; + javax.servlet.jsp.JspWriter out = _jspx_page_context.getOut(); + // fmt:message + org.apache.taglibs.standard.tag.rt.fmt.MessageTag _jspx_th_fmt_005fmessage_005f40 = (org.apache.taglibs.standard.tag.rt.fmt.MessageTag) _005fjspx_005ftagPool_005ffmt_005fmessage_0026_005fkey_005fnobody.get(org.apache.taglibs.standard.tag.rt.fmt.MessageTag.class); + _jspx_th_fmt_005fmessage_005f40.setPageContext(_jspx_page_context); + _jspx_th_fmt_005fmessage_005f40.setParent(null); + // /WEB-INF/dashboardbetaadmin.jsp(121,42) name = key type = null reqTime = true required = false fragment = false deferredValue = false expectedTypeName = null deferredMethod = false methodSignature = null + _jspx_th_fmt_005fmessage_005f40.setKey("dashboardbeta.selectall"); + int _jspx_eval_fmt_005fmessage_005f40 = _jspx_th_fmt_005fmessage_005f40.doStartTag(); + if (_jspx_th_fmt_005fmessage_005f40.doEndTag() == javax.servlet.jsp.tagext.Tag.SKIP_PAGE) { + return true; + } + _005fjspx_005ftagPool_005ffmt_005fmessage_0026_005fkey_005fnobody.reuse(_jspx_th_fmt_005fmessage_005f40); + return false; + } + + private boolean _jspx_meth_fmt_005fmessage_005f41(javax.servlet.jsp.PageContext _jspx_page_context) + throws java.lang.Throwable { + javax.servlet.jsp.PageContext pageContext = _jspx_page_context; + javax.servlet.jsp.JspWriter out = _jspx_page_context.getOut(); + // fmt:message + org.apache.taglibs.standard.tag.rt.fmt.MessageTag _jspx_th_fmt_005fmessage_005f41 = (org.apache.taglibs.standard.tag.rt.fmt.MessageTag) _005fjspx_005ftagPool_005ffmt_005fmessage_0026_005fkey_005fnobody.get(org.apache.taglibs.standard.tag.rt.fmt.MessageTag.class); + _jspx_th_fmt_005fmessage_005f41.setPageContext(_jspx_page_context); + _jspx_th_fmt_005fmessage_005f41.setParent(null); + // /WEB-INF/dashboardbetaadmin.jsp(122,41) name = key type = null reqTime = true required = false fragment = false deferredValue = false expectedTypeName = null deferredMethod = false methodSignature = null + _jspx_th_fmt_005fmessage_005f41.setKey("dashboardbeta.selectnone"); + int _jspx_eval_fmt_005fmessage_005f41 = _jspx_th_fmt_005fmessage_005f41.doStartTag(); + if (_jspx_th_fmt_005fmessage_005f41.doEndTag() == javax.servlet.jsp.tagext.Tag.SKIP_PAGE) { + return true; + } + _005fjspx_005ftagPool_005ffmt_005fmessage_0026_005fkey_005fnobody.reuse(_jspx_th_fmt_005fmessage_005f41); + return false; + } + + private boolean _jspx_meth_fmt_005fmessage_005f42(javax.servlet.jsp.PageContext _jspx_page_context) + throws java.lang.Throwable { + javax.servlet.jsp.PageContext pageContext = _jspx_page_context; + javax.servlet.jsp.JspWriter out = _jspx_page_context.getOut(); + // fmt:message + org.apache.taglibs.standard.tag.rt.fmt.MessageTag _jspx_th_fmt_005fmessage_005f42 = (org.apache.taglibs.standard.tag.rt.fmt.MessageTag) _005fjspx_005ftagPool_005ffmt_005fmessage_0026_005fkey_005fnobody.get(org.apache.taglibs.standard.tag.rt.fmt.MessageTag.class); + _jspx_th_fmt_005fmessage_005f42.setPageContext(_jspx_page_context); + _jspx_th_fmt_005fmessage_005f42.setParent(null); + // /WEB-INF/dashboardbetaadmin.jsp(126,74) name = key type = null reqTime = true required = false fragment = false deferredValue = false expectedTypeName = null deferredMethod = false methodSignature = null + _jspx_th_fmt_005fmessage_005f42.setKey("dashboardbeta.ok"); + int _jspx_eval_fmt_005fmessage_005f42 = _jspx_th_fmt_005fmessage_005f42.doStartTag(); + if (_jspx_th_fmt_005fmessage_005f42.doEndTag() == javax.servlet.jsp.tagext.Tag.SKIP_PAGE) { + return true; + } + _005fjspx_005ftagPool_005ffmt_005fmessage_0026_005fkey_005fnobody.reuse(_jspx_th_fmt_005fmessage_005f42); + return false; + } + + private boolean _jspx_meth_fmt_005fmessage_005f43(javax.servlet.jsp.PageContext _jspx_page_context) + throws java.lang.Throwable { + javax.servlet.jsp.PageContext pageContext = _jspx_page_context; + javax.servlet.jsp.JspWriter out = _jspx_page_context.getOut(); + // fmt:message + org.apache.taglibs.standard.tag.rt.fmt.MessageTag _jspx_th_fmt_005fmessage_005f43 = (org.apache.taglibs.standard.tag.rt.fmt.MessageTag) _005fjspx_005ftagPool_005ffmt_005fmessage_0026_005fkey_005fnobody.get(org.apache.taglibs.standard.tag.rt.fmt.MessageTag.class); + _jspx_th_fmt_005fmessage_005f43.setPageContext(_jspx_page_context); + _jspx_th_fmt_005fmessage_005f43.setParent(null); + // /WEB-INF/dashboardbetaadmin.jsp(131,27) name = key type = null reqTime = true required = false fragment = false deferredValue = false expectedTypeName = null deferredMethod = false methodSignature = null + _jspx_th_fmt_005fmessage_005f43.setKey("dashboardbeta.rightsidecas"); + int _jspx_eval_fmt_005fmessage_005f43 = _jspx_th_fmt_005fmessage_005f43.doStartTag(); + if (_jspx_th_fmt_005fmessage_005f43.doEndTag() == javax.servlet.jsp.tagext.Tag.SKIP_PAGE) { + return true; + } + _005fjspx_005ftagPool_005ffmt_005fmessage_0026_005fkey_005fnobody.reuse(_jspx_th_fmt_005fmessage_005f43); + return false; + } + + private boolean _jspx_meth_fmt_005fmessage_005f44(javax.servlet.jsp.PageContext _jspx_page_context) + throws java.lang.Throwable { + javax.servlet.jsp.PageContext pageContext = _jspx_page_context; + javax.servlet.jsp.JspWriter out = _jspx_page_context.getOut(); + // fmt:message + org.apache.taglibs.standard.tag.rt.fmt.MessageTag _jspx_th_fmt_005fmessage_005f44 = (org.apache.taglibs.standard.tag.rt.fmt.MessageTag) _005fjspx_005ftagPool_005ffmt_005fmessage_0026_005fkey_005fnobody.get(org.apache.taglibs.standard.tag.rt.fmt.MessageTag.class); + _jspx_th_fmt_005fmessage_005f44.setPageContext(_jspx_page_context); + _jspx_th_fmt_005fmessage_005f44.setParent(null); + // /WEB-INF/dashboardbetaadmin.jsp(132,42) name = key type = null reqTime = true required = false fragment = false deferredValue = false expectedTypeName = null deferredMethod = false methodSignature = null + _jspx_th_fmt_005fmessage_005f44.setKey("dashboardbeta.selectall"); + int _jspx_eval_fmt_005fmessage_005f44 = _jspx_th_fmt_005fmessage_005f44.doStartTag(); + if (_jspx_th_fmt_005fmessage_005f44.doEndTag() == javax.servlet.jsp.tagext.Tag.SKIP_PAGE) { + return true; + } + _005fjspx_005ftagPool_005ffmt_005fmessage_0026_005fkey_005fnobody.reuse(_jspx_th_fmt_005fmessage_005f44); + return false; + } + + private boolean _jspx_meth_fmt_005fmessage_005f45(javax.servlet.jsp.PageContext _jspx_page_context) + throws java.lang.Throwable { + javax.servlet.jsp.PageContext pageContext = _jspx_page_context; + javax.servlet.jsp.JspWriter out = _jspx_page_context.getOut(); + // fmt:message + org.apache.taglibs.standard.tag.rt.fmt.MessageTag _jspx_th_fmt_005fmessage_005f45 = (org.apache.taglibs.standard.tag.rt.fmt.MessageTag) _005fjspx_005ftagPool_005ffmt_005fmessage_0026_005fkey_005fnobody.get(org.apache.taglibs.standard.tag.rt.fmt.MessageTag.class); + _jspx_th_fmt_005fmessage_005f45.setPageContext(_jspx_page_context); + _jspx_th_fmt_005fmessage_005f45.setParent(null); + // /WEB-INF/dashboardbetaadmin.jsp(133,41) name = key type = null reqTime = true required = false fragment = false deferredValue = false expectedTypeName = null deferredMethod = false methodSignature = null + _jspx_th_fmt_005fmessage_005f45.setKey("dashboardbeta.selectnone"); + int _jspx_eval_fmt_005fmessage_005f45 = _jspx_th_fmt_005fmessage_005f45.doStartTag(); + if (_jspx_th_fmt_005fmessage_005f45.doEndTag() == javax.servlet.jsp.tagext.Tag.SKIP_PAGE) { + return true; + } + _005fjspx_005ftagPool_005ffmt_005fmessage_0026_005fkey_005fnobody.reuse(_jspx_th_fmt_005fmessage_005f45); + return false; + } + + private boolean _jspx_meth_fmt_005fmessage_005f46(javax.servlet.jsp.PageContext _jspx_page_context) + throws java.lang.Throwable { + javax.servlet.jsp.PageContext pageContext = _jspx_page_context; + javax.servlet.jsp.JspWriter out = _jspx_page_context.getOut(); + // fmt:message + org.apache.taglibs.standard.tag.rt.fmt.MessageTag _jspx_th_fmt_005fmessage_005f46 = (org.apache.taglibs.standard.tag.rt.fmt.MessageTag) _005fjspx_005ftagPool_005ffmt_005fmessage_0026_005fkey_005fnobody.get(org.apache.taglibs.standard.tag.rt.fmt.MessageTag.class); + _jspx_th_fmt_005fmessage_005f46.setPageContext(_jspx_page_context); + _jspx_th_fmt_005fmessage_005f46.setParent(null); + // /WEB-INF/dashboardbetaadmin.jsp(137,74) name = key type = null reqTime = true required = false fragment = false deferredValue = false expectedTypeName = null deferredMethod = false methodSignature = null + _jspx_th_fmt_005fmessage_005f46.setKey("dashboardbeta.ok"); + int _jspx_eval_fmt_005fmessage_005f46 = _jspx_th_fmt_005fmessage_005f46.doStartTag(); + if (_jspx_th_fmt_005fmessage_005f46.doEndTag() == javax.servlet.jsp.tagext.Tag.SKIP_PAGE) { + return true; + } + _005fjspx_005ftagPool_005ffmt_005fmessage_0026_005fkey_005fnobody.reuse(_jspx_th_fmt_005fmessage_005f46); + return false; + } +} diff --git a/app/opt/tomcat9/work/Catalina/smartconnect.internal.yel.or.id/ROOT/org/apache/jsp/WEB_002dINF/forgotpassword_jsp.class b/app/opt/tomcat9/work/Catalina/smartconnect.internal.yel.or.id/ROOT/org/apache/jsp/WEB_002dINF/forgotpassword_jsp.class new file mode 100644 index 0000000..548c150 Binary files /dev/null and b/app/opt/tomcat9/work/Catalina/smartconnect.internal.yel.or.id/ROOT/org/apache/jsp/WEB_002dINF/forgotpassword_jsp.class differ diff --git a/app/opt/tomcat9/work/Catalina/smartconnect.internal.yel.or.id/ROOT/org/apache/jsp/WEB_002dINF/forgotpassword_jsp.java b/app/opt/tomcat9/work/Catalina/smartconnect.internal.yel.or.id/ROOT/org/apache/jsp/WEB_002dINF/forgotpassword_jsp.java new file mode 100644 index 0000000..5b0f544 --- /dev/null +++ b/app/opt/tomcat9/work/Catalina/smartconnect.internal.yel.or.id/ROOT/org/apache/jsp/WEB_002dINF/forgotpassword_jsp.java @@ -0,0 +1,1102 @@ +/* + * Generated by the Jasper component of Apache Tomcat + * Version: Apache Tomcat/9.0.107 + * Generated at: 2025-07-30 05:27:26 UTC + * Note: The last modified time of this file was set to + * the last modified time of the source file after + * generation to assist with modification tracking. + */ +package org.apache.jsp.WEB_002dINF; + +import javax.servlet.*; +import javax.servlet.http.*; +import javax.servlet.jsp.*; +import java.time.LocalDate; +import java.time.format.DateTimeFormatter; + +public final class forgotpassword_jsp extends org.apache.jasper.runtime.HttpJspBase + implements org.apache.jasper.runtime.JspSourceDependent, + org.apache.jasper.runtime.JspSourceImports { + + private static final javax.servlet.jsp.JspFactory _jspxFactory = + javax.servlet.jsp.JspFactory.getDefaultFactory(); + + private static java.util.Map _jspx_dependants; + + static { + _jspx_dependants = new java.util.HashMap(6); + _jspx_dependants.put("jar:file:/opt/tomcat9/webapps/ROOT/WEB-INF/lib/jstl-1.2.jar!/META-INF/c.tld", Long.valueOf(1153385082000L)); + _jspx_dependants.put("/WEB-INF/header.jsp", Long.valueOf(1753790711298L)); + _jspx_dependants.put("jar:file:/opt/tomcat9/webapps/ROOT/WEB-INF/lib/jstl-1.2.jar!/META-INF/fmt.tld", Long.valueOf(1153385082000L)); + _jspx_dependants.put("/WEB-INF/includes.jsp", Long.valueOf(1753790711298L)); + _jspx_dependants.put("/WEB-INF/lib/jstl-1.2.jar", Long.valueOf(1753790711326L)); + _jspx_dependants.put("/WEB-INF/footer.jsp", Long.valueOf(1753790711298L)); + } + + private static final java.util.Set _jspx_imports_packages; + + private static final java.util.Set _jspx_imports_classes; + + static { + _jspx_imports_packages = new java.util.LinkedHashSet<>(4); + _jspx_imports_packages.add("javax.servlet"); + _jspx_imports_packages.add("javax.servlet.http"); + _jspx_imports_packages.add("javax.servlet.jsp"); + _jspx_imports_classes = new java.util.LinkedHashSet<>(3); + _jspx_imports_classes.add("java.time.LocalDate"); + _jspx_imports_classes.add("java.time.format.DateTimeFormatter"); + } + + private org.apache.jasper.runtime.TagHandlerPool _005fjspx_005ftagPool_005ffmt_005fsetBundle_0026_005fbasename_005fnobody; + private org.apache.jasper.runtime.TagHandlerPool _005fjspx_005ftagPool_005fc_005fset_0026_005fvar_005fvalue_005fnobody; + private org.apache.jasper.runtime.TagHandlerPool _005fjspx_005ftagPool_005fc_005fforEach_0026_005fvar_005fitems; + private org.apache.jasper.runtime.TagHandlerPool _005fjspx_005ftagPool_005fc_005fif_0026_005ftest; + private org.apache.jasper.runtime.TagHandlerPool _005fjspx_005ftagPool_005ffmt_005fmessage_0026_005fkey_005fnobody; + private org.apache.jasper.runtime.TagHandlerPool _005fjspx_005ftagPool_005fc_005fchoose; + private org.apache.jasper.runtime.TagHandlerPool _005fjspx_005ftagPool_005fc_005fwhen_0026_005ftest; + private org.apache.jasper.runtime.TagHandlerPool _005fjspx_005ftagPool_005fc_005fotherwise; + + private volatile javax.el.ExpressionFactory _el_expressionfactory; + private volatile org.apache.tomcat.InstanceManager _jsp_instancemanager; + + public java.util.Map getDependants() { + return _jspx_dependants; + } + + public java.util.Set getPackageImports() { + return _jspx_imports_packages; + } + + public java.util.Set getClassImports() { + return _jspx_imports_classes; + } + + public javax.el.ExpressionFactory _jsp_getExpressionFactory() { + if (_el_expressionfactory == null) { + synchronized (this) { + if (_el_expressionfactory == null) { + _el_expressionfactory = _jspxFactory.getJspApplicationContext(getServletConfig().getServletContext()).getExpressionFactory(); + } + } + } + return _el_expressionfactory; + } + + public org.apache.tomcat.InstanceManager _jsp_getInstanceManager() { + if (_jsp_instancemanager == null) { + synchronized (this) { + if (_jsp_instancemanager == null) { + _jsp_instancemanager = org.apache.jasper.runtime.InstanceManagerFactory.getInstanceManager(getServletConfig()); + } + } + } + return _jsp_instancemanager; + } + + public void _jspInit() { + _005fjspx_005ftagPool_005ffmt_005fsetBundle_0026_005fbasename_005fnobody = org.apache.jasper.runtime.TagHandlerPool.getTagHandlerPool(getServletConfig()); + _005fjspx_005ftagPool_005fc_005fset_0026_005fvar_005fvalue_005fnobody = org.apache.jasper.runtime.TagHandlerPool.getTagHandlerPool(getServletConfig()); + _005fjspx_005ftagPool_005fc_005fforEach_0026_005fvar_005fitems = org.apache.jasper.runtime.TagHandlerPool.getTagHandlerPool(getServletConfig()); + _005fjspx_005ftagPool_005fc_005fif_0026_005ftest = org.apache.jasper.runtime.TagHandlerPool.getTagHandlerPool(getServletConfig()); + _005fjspx_005ftagPool_005ffmt_005fmessage_0026_005fkey_005fnobody = org.apache.jasper.runtime.TagHandlerPool.getTagHandlerPool(getServletConfig()); + _005fjspx_005ftagPool_005fc_005fchoose = org.apache.jasper.runtime.TagHandlerPool.getTagHandlerPool(getServletConfig()); + _005fjspx_005ftagPool_005fc_005fwhen_0026_005ftest = org.apache.jasper.runtime.TagHandlerPool.getTagHandlerPool(getServletConfig()); + _005fjspx_005ftagPool_005fc_005fotherwise = org.apache.jasper.runtime.TagHandlerPool.getTagHandlerPool(getServletConfig()); + } + + public void _jspDestroy() { + _005fjspx_005ftagPool_005ffmt_005fsetBundle_0026_005fbasename_005fnobody.release(); + _005fjspx_005ftagPool_005fc_005fset_0026_005fvar_005fvalue_005fnobody.release(); + _005fjspx_005ftagPool_005fc_005fforEach_0026_005fvar_005fitems.release(); + _005fjspx_005ftagPool_005fc_005fif_0026_005ftest.release(); + _005fjspx_005ftagPool_005ffmt_005fmessage_0026_005fkey_005fnobody.release(); + _005fjspx_005ftagPool_005fc_005fchoose.release(); + _005fjspx_005ftagPool_005fc_005fwhen_0026_005ftest.release(); + _005fjspx_005ftagPool_005fc_005fotherwise.release(); + } + + public void _jspService(final javax.servlet.http.HttpServletRequest request, final javax.servlet.http.HttpServletResponse response) + throws java.io.IOException, javax.servlet.ServletException { + + if (!javax.servlet.DispatcherType.ERROR.equals(request.getDispatcherType())) { + final java.lang.String _jspx_method = request.getMethod(); + if ("OPTIONS".equals(_jspx_method)) { + response.setHeader("Allow","GET, HEAD, POST, OPTIONS"); + return; + } + if (!"GET".equals(_jspx_method) && !"POST".equals(_jspx_method) && !"HEAD".equals(_jspx_method)) { + response.setHeader("Allow","GET, HEAD, POST, OPTIONS"); + response.sendError(HttpServletResponse.SC_METHOD_NOT_ALLOWED, "JSPs only permit GET, POST or HEAD. Jasper also permits OPTIONS"); + return; + } + } + + final javax.servlet.jsp.PageContext pageContext; + javax.servlet.http.HttpSession session = null; + final javax.servlet.ServletContext application; + final javax.servlet.ServletConfig config; + javax.servlet.jsp.JspWriter out = null; + final java.lang.Object page = this; + javax.servlet.jsp.JspWriter _jspx_out = null; + javax.servlet.jsp.PageContext _jspx_page_context = null; + + + try { + response.setContentType("text/html; charset=UTF-8"); + pageContext = _jspxFactory.getPageContext(this, request, response, + null, true, 8192, true); + _jspx_page_context = pageContext; + application = pageContext.getServletContext(); + config = pageContext.getServletConfig(); + session = pageContext.getSession(); + out = pageContext.getOut(); + _jspx_out = out; + + out.write("\r\n"); + out.write("\r\n"); + out.write("\r\n"); + out.write("\r\n"); + out.write("\r\n"); + out.write("\r\n"); + out.write("\r\n"); + if (_jspx_meth_fmt_005fsetBundle_005f0(_jspx_page_context)) + return; + out.write("\r\n"); + out.write("\r\n"); + out.write("\r\n"); + out.write("\r\n"); + out.write("\r\n"); + out.write("\r\n"); + out.write("\r\n"); + out.write(" \r\n"); + out.write("\r\n"); + out.write("\r\n"); + out.write("\r\n"); + out.write("\r\n"); + out.write("\r\n"); + if (_jspx_meth_c_005fset_005f0(_jspx_page_context)) + return; + out.write('\r'); + out.write('\n'); + if (_jspx_meth_c_005fforEach_005f0(_jspx_page_context)) + return; + out.write("\r\n"); + out.write("\r\n"); + out.write("\r\n"); + out.write("\r\n"); + out.write("\r\n"); + out.write("\r\n"); + out.write("\r\n"); + out.write(""); + if (_jspx_meth_fmt_005fmessage_005f0(_jspx_page_context)) + return; + out.write("\r\n"); + out.write("\r\n"); + out.write("\r\n"); + out.write("\r\n"); + out.write("\r\n"); + out.write("\r\n"); + out.write("\r\n"); + out.write("\r\n"); + out.write("
\r\n"); + if (_jspx_meth_c_005fif_005f1(_jspx_page_context)) + return; + out.write("\r\n"); + out.write("
\r\n"); + if (_jspx_meth_c_005fchoose_005f0(_jspx_page_context)) + return; + out.write(" \r\n"); + out.write("\r\n"); + out.write("
\r\n"); + out.write("\r\n"); + out.write("
\r\n"); + out.write("\r\n"); + out.write("\r\n"); + out.write("
\r\n"); + out.write("
\r\n"); + out.write("
\r\n"); + out.write(" \r\n"); + out.write("
\r\n"); + out.write("
"); + if (_jspx_meth_fmt_005fmessage_005f5(_jspx_page_context)) + return; + out.write("
\r\n"); + out.write("

"); + if (_jspx_meth_fmt_005fmessage_005f6(_jspx_page_context)) + return; + out.write("\r\n"); + out.write("

\r\n"); + out.write("
\r\n"); + out.write("
\r\n"); + out.write(" \r\n"); + out.write(" \r\n"); + out.write(" \r\n"); + out.write("
\r\n"); + out.write("
\r\n"); + out.write("
\r\n"); + out.write("\r\n"); + out.write("\r\n"); + out.write("\r\n"); + out.write("\r\n"); + out.write("\r\n"); + out.write("\r\n"); + out.write("
\r\n"); + String year = DateTimeFormatter.ofPattern("YYYY").format(LocalDate.now()); + out.write("\r\n"); + out.write("\r\n"); + out.write("
\r\n"); + out.write(" "); + // c:if + org.apache.taglibs.standard.tag.rt.core.IfTag _jspx_th_c_005fif_005f2 = (org.apache.taglibs.standard.tag.rt.core.IfTag) _005fjspx_005ftagPool_005fc_005fif_0026_005ftest.get(org.apache.taglibs.standard.tag.rt.core.IfTag.class); + _jspx_th_c_005fif_005f2.setPageContext(_jspx_page_context); + _jspx_th_c_005fif_005f2.setParent(null); + // /WEB-INF/footer.jsp(11,1) name = test type = boolean reqTime = true required = true fragment = false deferredValue = false expectedTypeName = null deferredMethod = false methodSignature = null + _jspx_th_c_005fif_005f2.setTest(((java.lang.Boolean) org.apache.jasper.runtime.PageContextImpl.proprietaryEvaluate("${empty style_footername }", boolean.class, (javax.servlet.jsp.PageContext)_jspx_page_context, null)).booleanValue()); + int _jspx_eval_c_005fif_005f2 = _jspx_th_c_005fif_005f2.doStartTag(); + if (_jspx_eval_c_005fif_005f2 != javax.servlet.jsp.tagext.Tag.SKIP_BODY) { + do { + out.write("\r\n"); + out.write(" \r\n"); + out.write("

Copyright 2015-"); + out.print(year); + out.write("

\r\n"); + out.write(" "); + int evalDoAfterBody = _jspx_th_c_005fif_005f2.doAfterBody(); + if (evalDoAfterBody != javax.servlet.jsp.tagext.BodyTag.EVAL_BODY_AGAIN) + break; + } while (true); + } + if (_jspx_th_c_005fif_005f2.doEndTag() == javax.servlet.jsp.tagext.Tag.SKIP_PAGE) { + return; + } + _005fjspx_005ftagPool_005fc_005fif_0026_005ftest.reuse(_jspx_th_c_005fif_005f2); + out.write('\r'); + out.write('\n'); + out.write(' '); + if (_jspx_meth_c_005fif_005f3(_jspx_page_context)) + return; + out.write("\r\n"); + out.write("
\r\n"); + out.write("
\r\n"); + out.write("\r\n"); + out.write("\r\n"); + out.write("\r\n"); + out.write(""); + } catch (java.lang.Throwable t) { + if (!(t instanceof javax.servlet.jsp.SkipPageException)){ + out = _jspx_out; + if (out != null && out.getBufferSize() != 0) + try { + if (response.isCommitted()) { + out.flush(); + } else { + out.clearBuffer(); + } + } catch (java.io.IOException e) {} + if (_jspx_page_context != null) _jspx_page_context.handlePageException(t); + else throw new ServletException(t); + } + } finally { + _jspxFactory.releasePageContext(_jspx_page_context); + } + } + + private boolean _jspx_meth_fmt_005fsetBundle_005f0(javax.servlet.jsp.PageContext _jspx_page_context) + throws java.lang.Throwable { + javax.servlet.jsp.PageContext pageContext = _jspx_page_context; + javax.servlet.jsp.JspWriter out = _jspx_page_context.getOut(); + // fmt:setBundle + org.apache.taglibs.standard.tag.rt.fmt.SetBundleTag _jspx_th_fmt_005fsetBundle_005f0 = (org.apache.taglibs.standard.tag.rt.fmt.SetBundleTag) _005fjspx_005ftagPool_005ffmt_005fsetBundle_0026_005fbasename_005fnobody.get(org.apache.taglibs.standard.tag.rt.fmt.SetBundleTag.class); + _jspx_th_fmt_005fsetBundle_005f0.setPageContext(_jspx_page_context); + _jspx_th_fmt_005fsetBundle_005f0.setParent(null); + // /WEB-INF/includes.jsp(5,0) name = basename type = null reqTime = true required = true fragment = false deferredValue = false expectedTypeName = null deferredMethod = false methodSignature = null + _jspx_th_fmt_005fsetBundle_005f0.setBasename("org.wcs.smart.connect.i18n.web_messages"); + int _jspx_eval_fmt_005fsetBundle_005f0 = _jspx_th_fmt_005fsetBundle_005f0.doStartTag(); + if (_jspx_th_fmt_005fsetBundle_005f0.doEndTag() == javax.servlet.jsp.tagext.Tag.SKIP_PAGE) { + return true; + } + _005fjspx_005ftagPool_005ffmt_005fsetBundle_0026_005fbasename_005fnobody.reuse(_jspx_th_fmt_005fsetBundle_005f0); + return false; + } + + private boolean _jspx_meth_c_005fset_005f0(javax.servlet.jsp.PageContext _jspx_page_context) + throws java.lang.Throwable { + javax.servlet.jsp.PageContext pageContext = _jspx_page_context; + javax.servlet.jsp.JspWriter out = _jspx_page_context.getOut(); + // c:set + org.apache.taglibs.standard.tag.rt.core.SetTag _jspx_th_c_005fset_005f0 = (org.apache.taglibs.standard.tag.rt.core.SetTag) _005fjspx_005ftagPool_005fc_005fset_0026_005fvar_005fvalue_005fnobody.get(org.apache.taglibs.standard.tag.rt.core.SetTag.class); + _jspx_th_c_005fset_005f0.setPageContext(_jspx_page_context); + _jspx_th_c_005fset_005f0.setParent(null); + // /WEB-INF/includes.jsp(18,0) name = var type = java.lang.String reqTime = false required = false fragment = false deferredValue = false expectedTypeName = null deferredMethod = false methodSignature = null + _jspx_th_c_005fset_005f0.setVar("supportedLang"); + // /WEB-INF/includes.jsp(18,0) name = value type = javax.el.ValueExpression reqTime = true required = false fragment = false deferredValue = true expectedTypeName = java.lang.Object deferredMethod = false methodSignature = null + _jspx_th_c_005fset_005f0.setValue(new org.apache.jasper.el.JspValueExpression("/WEB-INF/includes.jsp(18,0) 'es,fr,hi,in,km,lo,ms,ru,th,vi,zh'",_jsp_getExpressionFactory().createValueExpression("es,fr,hi,in,km,lo,ms,ru,th,vi,zh",java.lang.Object.class)).getValue(_jspx_page_context.getELContext())); + int _jspx_eval_c_005fset_005f0 = _jspx_th_c_005fset_005f0.doStartTag(); + if (_jspx_th_c_005fset_005f0.doEndTag() == javax.servlet.jsp.tagext.Tag.SKIP_PAGE) { + return true; + } + _005fjspx_005ftagPool_005fc_005fset_0026_005fvar_005fvalue_005fnobody.reuse(_jspx_th_c_005fset_005f0); + return false; + } + + private boolean _jspx_meth_c_005fforEach_005f0(javax.servlet.jsp.PageContext _jspx_page_context) + throws java.lang.Throwable { + javax.servlet.jsp.PageContext pageContext = _jspx_page_context; + javax.servlet.jsp.JspWriter out = _jspx_page_context.getOut(); + // c:forEach + org.apache.taglibs.standard.tag.rt.core.ForEachTag _jspx_th_c_005fforEach_005f0 = (org.apache.taglibs.standard.tag.rt.core.ForEachTag) _005fjspx_005ftagPool_005fc_005fforEach_0026_005fvar_005fitems.get(org.apache.taglibs.standard.tag.rt.core.ForEachTag.class); + _jspx_th_c_005fforEach_005f0.setPageContext(_jspx_page_context); + _jspx_th_c_005fforEach_005f0.setParent(null); + // /WEB-INF/includes.jsp(19,0) name = var type = java.lang.String reqTime = false required = false fragment = false deferredValue = false expectedTypeName = null deferredMethod = false methodSignature = null + _jspx_th_c_005fforEach_005f0.setVar("item"); + // /WEB-INF/includes.jsp(19,0) name = items type = javax.el.ValueExpression reqTime = true required = false fragment = false deferredValue = true expectedTypeName = java.lang.Object deferredMethod = false methodSignature = null + _jspx_th_c_005fforEach_005f0.setItems(new org.apache.jasper.el.JspValueExpression("/WEB-INF/includes.jsp(19,0) '${supportedLang}'",_jsp_getExpressionFactory().createValueExpression(_jspx_page_context.getELContext(),"${supportedLang}",java.lang.Object.class)).getValue(_jspx_page_context.getELContext())); + int[] _jspx_push_body_count_c_005fforEach_005f0 = new int[] { 0 }; + try { + int _jspx_eval_c_005fforEach_005f0 = _jspx_th_c_005fforEach_005f0.doStartTag(); + if (_jspx_eval_c_005fforEach_005f0 != javax.servlet.jsp.tagext.Tag.SKIP_BODY) { + do { + out.write("\r\n"); + out.write(" "); + if (_jspx_meth_c_005fif_005f0(_jspx_th_c_005fforEach_005f0, _jspx_page_context, _jspx_push_body_count_c_005fforEach_005f0)) + return true; + out.write('\r'); + out.write('\n'); + int evalDoAfterBody = _jspx_th_c_005fforEach_005f0.doAfterBody(); + if (evalDoAfterBody != javax.servlet.jsp.tagext.BodyTag.EVAL_BODY_AGAIN) + break; + } while (true); + } + if (_jspx_th_c_005fforEach_005f0.doEndTag() == javax.servlet.jsp.tagext.Tag.SKIP_PAGE) { + return true; + } + } catch (java.lang.Throwable _jspx_exception) { + while (_jspx_push_body_count_c_005fforEach_005f0[0]-- > 0) + out = _jspx_page_context.popBody(); + _jspx_th_c_005fforEach_005f0.doCatch(_jspx_exception); + } finally { + _jspx_th_c_005fforEach_005f0.doFinally(); + } + _005fjspx_005ftagPool_005fc_005fforEach_0026_005fvar_005fitems.reuse(_jspx_th_c_005fforEach_005f0); + return false; + } + + private boolean _jspx_meth_c_005fif_005f0(javax.servlet.jsp.tagext.JspTag _jspx_th_c_005fforEach_005f0, javax.servlet.jsp.PageContext _jspx_page_context, int[] _jspx_push_body_count_c_005fforEach_005f0) + throws java.lang.Throwable { + javax.servlet.jsp.PageContext pageContext = _jspx_page_context; + javax.servlet.jsp.JspWriter out = _jspx_page_context.getOut(); + // c:if + org.apache.taglibs.standard.tag.rt.core.IfTag _jspx_th_c_005fif_005f0 = (org.apache.taglibs.standard.tag.rt.core.IfTag) _005fjspx_005ftagPool_005fc_005fif_0026_005ftest.get(org.apache.taglibs.standard.tag.rt.core.IfTag.class); + _jspx_th_c_005fif_005f0.setPageContext(_jspx_page_context); + _jspx_th_c_005fif_005f0.setParent((javax.servlet.jsp.tagext.Tag) _jspx_th_c_005fforEach_005f0); + // /WEB-INF/includes.jsp(20,2) name = test type = boolean reqTime = true required = true fragment = false deferredValue = false expectedTypeName = null deferredMethod = false methodSignature = null + _jspx_th_c_005fif_005f0.setTest(((java.lang.Boolean) org.apache.jasper.runtime.PageContextImpl.proprietaryEvaluate("${item eq pageContext.request.locale.language}", boolean.class, (javax.servlet.jsp.PageContext)_jspx_page_context, null)).booleanValue()); + int _jspx_eval_c_005fif_005f0 = _jspx_th_c_005fif_005f0.doStartTag(); + if (_jspx_eval_c_005fif_005f0 != javax.servlet.jsp.tagext.Tag.SKIP_BODY) { + do { + out.write("\r\n"); + out.write(" \r\n"); + out.write(" "); + int evalDoAfterBody = _jspx_th_c_005fif_005f0.doAfterBody(); + if (evalDoAfterBody != javax.servlet.jsp.tagext.BodyTag.EVAL_BODY_AGAIN) + break; + } while (true); + } + if (_jspx_th_c_005fif_005f0.doEndTag() == javax.servlet.jsp.tagext.Tag.SKIP_PAGE) { + return true; + } + _005fjspx_005ftagPool_005fc_005fif_0026_005ftest.reuse(_jspx_th_c_005fif_005f0); + return false; + } + + private boolean _jspx_meth_fmt_005fmessage_005f0(javax.servlet.jsp.PageContext _jspx_page_context) + throws java.lang.Throwable { + javax.servlet.jsp.PageContext pageContext = _jspx_page_context; + javax.servlet.jsp.JspWriter out = _jspx_page_context.getOut(); + // fmt:message + org.apache.taglibs.standard.tag.rt.fmt.MessageTag _jspx_th_fmt_005fmessage_005f0 = (org.apache.taglibs.standard.tag.rt.fmt.MessageTag) _005fjspx_005ftagPool_005ffmt_005fmessage_0026_005fkey_005fnobody.get(org.apache.taglibs.standard.tag.rt.fmt.MessageTag.class); + _jspx_th_fmt_005fmessage_005f0.setPageContext(_jspx_page_context); + _jspx_th_fmt_005fmessage_005f0.setParent(null); + // /WEB-INF/forgotpassword.jsp(7,7) name = key type = null reqTime = true required = false fragment = false deferredValue = false expectedTypeName = null deferredMethod = false methodSignature = null + _jspx_th_fmt_005fmessage_005f0.setKey("forgotpassword.pagetitle"); + int _jspx_eval_fmt_005fmessage_005f0 = _jspx_th_fmt_005fmessage_005f0.doStartTag(); + if (_jspx_th_fmt_005fmessage_005f0.doEndTag() == javax.servlet.jsp.tagext.Tag.SKIP_PAGE) { + return true; + } + _005fjspx_005ftagPool_005ffmt_005fmessage_0026_005fkey_005fnobody.reuse(_jspx_th_fmt_005fmessage_005f0); + return false; + } + + private boolean _jspx_meth_fmt_005fmessage_005f1(javax.servlet.jsp.PageContext _jspx_page_context) + throws java.lang.Throwable { + javax.servlet.jsp.PageContext pageContext = _jspx_page_context; + javax.servlet.jsp.JspWriter out = _jspx_page_context.getOut(); + // fmt:message + org.apache.taglibs.standard.tag.rt.fmt.MessageTag _jspx_th_fmt_005fmessage_005f1 = (org.apache.taglibs.standard.tag.rt.fmt.MessageTag) _005fjspx_005ftagPool_005ffmt_005fmessage_0026_005fkey_005fnobody.get(org.apache.taglibs.standard.tag.rt.fmt.MessageTag.class); + _jspx_th_fmt_005fmessage_005f1.setPageContext(_jspx_page_context); + _jspx_th_fmt_005fmessage_005f1.setParent(null); + // /WEB-INF/forgotpassword.jsp(17,47) name = key type = null reqTime = true required = false fragment = false deferredValue = false expectedTypeName = null deferredMethod = false methodSignature = null + _jspx_th_fmt_005fmessage_005f1.setKey("forgotpassword.processing"); + int _jspx_eval_fmt_005fmessage_005f1 = _jspx_th_fmt_005fmessage_005f1.doStartTag(); + if (_jspx_th_fmt_005fmessage_005f1.doEndTag() == javax.servlet.jsp.tagext.Tag.SKIP_PAGE) { + return true; + } + _005fjspx_005ftagPool_005ffmt_005fmessage_0026_005fkey_005fnobody.reuse(_jspx_th_fmt_005fmessage_005f1); + return false; + } + + private boolean _jspx_meth_fmt_005fmessage_005f2(javax.servlet.jsp.PageContext _jspx_page_context) + throws java.lang.Throwable { + javax.servlet.jsp.PageContext pageContext = _jspx_page_context; + javax.servlet.jsp.JspWriter out = _jspx_page_context.getOut(); + // fmt:message + org.apache.taglibs.standard.tag.rt.fmt.MessageTag _jspx_th_fmt_005fmessage_005f2 = (org.apache.taglibs.standard.tag.rt.fmt.MessageTag) _005fjspx_005ftagPool_005ffmt_005fmessage_0026_005fkey_005fnobody.get(org.apache.taglibs.standard.tag.rt.fmt.MessageTag.class); + _jspx_th_fmt_005fmessage_005f2.setPageContext(_jspx_page_context); + _jspx_th_fmt_005fmessage_005f2.setParent(null); + // /WEB-INF/forgotpassword.jsp(31,48) name = key type = null reqTime = true required = false fragment = false deferredValue = false expectedTypeName = null deferredMethod = false methodSignature = null + _jspx_th_fmt_005fmessage_005f2.setKey("forgotpassword.emailsent"); + int _jspx_eval_fmt_005fmessage_005f2 = _jspx_th_fmt_005fmessage_005f2.doStartTag(); + if (_jspx_th_fmt_005fmessage_005f2.doEndTag() == javax.servlet.jsp.tagext.Tag.SKIP_PAGE) { + return true; + } + _005fjspx_005ftagPool_005ffmt_005fmessage_0026_005fkey_005fnobody.reuse(_jspx_th_fmt_005fmessage_005f2); + return false; + } + + private boolean _jspx_meth_fmt_005fmessage_005f3(javax.servlet.jsp.PageContext _jspx_page_context) + throws java.lang.Throwable { + javax.servlet.jsp.PageContext pageContext = _jspx_page_context; + javax.servlet.jsp.JspWriter out = _jspx_page_context.getOut(); + // fmt:message + org.apache.taglibs.standard.tag.rt.fmt.MessageTag _jspx_th_fmt_005fmessage_005f3 = (org.apache.taglibs.standard.tag.rt.fmt.MessageTag) _005fjspx_005ftagPool_005ffmt_005fmessage_0026_005fkey_005fnobody.get(org.apache.taglibs.standard.tag.rt.fmt.MessageTag.class); + _jspx_th_fmt_005fmessage_005f3.setPageContext(_jspx_page_context); + _jspx_th_fmt_005fmessage_005f3.setParent(null); + // /WEB-INF/forgotpassword.jsp(35,48) name = key type = null reqTime = true required = false fragment = false deferredValue = false expectedTypeName = null deferredMethod = false methodSignature = null + _jspx_th_fmt_005fmessage_005f3.setKey("forgotpassword.emailerror"); + int _jspx_eval_fmt_005fmessage_005f3 = _jspx_th_fmt_005fmessage_005f3.doStartTag(); + if (_jspx_th_fmt_005fmessage_005f3.doEndTag() == javax.servlet.jsp.tagext.Tag.SKIP_PAGE) { + return true; + } + _005fjspx_005ftagPool_005ffmt_005fmessage_0026_005fkey_005fnobody.reuse(_jspx_th_fmt_005fmessage_005f3); + return false; + } + + private boolean _jspx_meth_c_005fif_005f1(javax.servlet.jsp.PageContext _jspx_page_context) + throws java.lang.Throwable { + javax.servlet.jsp.PageContext pageContext = _jspx_page_context; + javax.servlet.jsp.JspWriter out = _jspx_page_context.getOut(); + // c:if + org.apache.taglibs.standard.tag.rt.core.IfTag _jspx_th_c_005fif_005f1 = (org.apache.taglibs.standard.tag.rt.core.IfTag) _005fjspx_005ftagPool_005fc_005fif_0026_005ftest.get(org.apache.taglibs.standard.tag.rt.core.IfTag.class); + _jspx_th_c_005fif_005f1.setPageContext(_jspx_page_context); + _jspx_th_c_005fif_005f1.setParent(null); + // /WEB-INF/header.jsp(3,0) name = test type = boolean reqTime = true required = true fragment = false deferredValue = false expectedTypeName = null deferredMethod = false methodSignature = null + _jspx_th_c_005fif_005f1.setTest(((java.lang.Boolean) org.apache.jasper.runtime.PageContextImpl.proprietaryEvaluate("${not empty pageContext.request.userPrincipal}", boolean.class, (javax.servlet.jsp.PageContext)_jspx_page_context, null)).booleanValue()); + int _jspx_eval_c_005fif_005f1 = _jspx_th_c_005fif_005f1.doStartTag(); + if (_jspx_eval_c_005fif_005f1 != javax.servlet.jsp.tagext.Tag.SKIP_BODY) { + do { + out.write("\r\n"); + out.write("
\r\n"); + out.write("
\r\n"); + out.write(" \r\n"); + out.write(" "); + out.write((java.lang.String) org.apache.jasper.runtime.PageContextImpl.proprietaryEvaluate("${pageContext.request.userPrincipal.name}", java.lang.String.class, (javax.servlet.jsp.PageContext)_jspx_page_context, null)); + out.write("\r\n"); + out.write(" |\r\n"); + out.write(" \r\n"); + out.write("
\r\n"); + out.write("
\r\n"); + int evalDoAfterBody = _jspx_th_c_005fif_005f1.doAfterBody(); + if (evalDoAfterBody != javax.servlet.jsp.tagext.BodyTag.EVAL_BODY_AGAIN) + break; + } while (true); + } + if (_jspx_th_c_005fif_005f1.doEndTag() == javax.servlet.jsp.tagext.Tag.SKIP_PAGE) { + return true; + } + _005fjspx_005ftagPool_005fc_005fif_0026_005ftest.reuse(_jspx_th_c_005fif_005f1); + return false; + } + + private boolean _jspx_meth_fmt_005fmessage_005f4(javax.servlet.jsp.tagext.JspTag _jspx_th_c_005fif_005f1, javax.servlet.jsp.PageContext _jspx_page_context) + throws java.lang.Throwable { + javax.servlet.jsp.PageContext pageContext = _jspx_page_context; + javax.servlet.jsp.JspWriter out = _jspx_page_context.getOut(); + // fmt:message + org.apache.taglibs.standard.tag.rt.fmt.MessageTag _jspx_th_fmt_005fmessage_005f4 = (org.apache.taglibs.standard.tag.rt.fmt.MessageTag) _005fjspx_005ftagPool_005ffmt_005fmessage_0026_005fkey_005fnobody.get(org.apache.taglibs.standard.tag.rt.fmt.MessageTag.class); + _jspx_th_fmt_005fmessage_005f4.setPageContext(_jspx_page_context); + _jspx_th_fmt_005fmessage_005f4.setParent((javax.servlet.jsp.tagext.Tag) _jspx_th_c_005fif_005f1); + // /WEB-INF/header.jsp(9,30) name = key type = null reqTime = true required = false fragment = false deferredValue = false expectedTypeName = null deferredMethod = false methodSignature = null + _jspx_th_fmt_005fmessage_005f4.setKey("header.logout"); + int _jspx_eval_fmt_005fmessage_005f4 = _jspx_th_fmt_005fmessage_005f4.doStartTag(); + if (_jspx_th_fmt_005fmessage_005f4.doEndTag() == javax.servlet.jsp.tagext.Tag.SKIP_PAGE) { + return true; + } + _005fjspx_005ftagPool_005ffmt_005fmessage_0026_005fkey_005fnobody.reuse(_jspx_th_fmt_005fmessage_005f4); + return false; + } + + private boolean _jspx_meth_c_005fchoose_005f0(javax.servlet.jsp.PageContext _jspx_page_context) + throws java.lang.Throwable { + javax.servlet.jsp.PageContext pageContext = _jspx_page_context; + javax.servlet.jsp.JspWriter out = _jspx_page_context.getOut(); + // c:choose + org.apache.taglibs.standard.tag.common.core.ChooseTag _jspx_th_c_005fchoose_005f0 = (org.apache.taglibs.standard.tag.common.core.ChooseTag) _005fjspx_005ftagPool_005fc_005fchoose.get(org.apache.taglibs.standard.tag.common.core.ChooseTag.class); + _jspx_th_c_005fchoose_005f0.setPageContext(_jspx_page_context); + _jspx_th_c_005fchoose_005f0.setParent(null); + int _jspx_eval_c_005fchoose_005f0 = _jspx_th_c_005fchoose_005f0.doStartTag(); + if (_jspx_eval_c_005fchoose_005f0 != javax.servlet.jsp.tagext.Tag.SKIP_BODY) { + do { + out.write('\r'); + out.write('\n'); + out.write(' '); + if (_jspx_meth_c_005fwhen_005f0(_jspx_th_c_005fchoose_005f0, _jspx_page_context)) + return true; + out.write('\r'); + out.write('\n'); + out.write(' '); + if (_jspx_meth_c_005fotherwise_005f0(_jspx_th_c_005fchoose_005f0, _jspx_page_context)) + return true; + out.write('\r'); + out.write('\n'); + int evalDoAfterBody = _jspx_th_c_005fchoose_005f0.doAfterBody(); + if (evalDoAfterBody != javax.servlet.jsp.tagext.BodyTag.EVAL_BODY_AGAIN) + break; + } while (true); + } + if (_jspx_th_c_005fchoose_005f0.doEndTag() == javax.servlet.jsp.tagext.Tag.SKIP_PAGE) { + return true; + } + _005fjspx_005ftagPool_005fc_005fchoose.reuse(_jspx_th_c_005fchoose_005f0); + return false; + } + + private boolean _jspx_meth_c_005fwhen_005f0(javax.servlet.jsp.tagext.JspTag _jspx_th_c_005fchoose_005f0, javax.servlet.jsp.PageContext _jspx_page_context) + throws java.lang.Throwable { + javax.servlet.jsp.PageContext pageContext = _jspx_page_context; + javax.servlet.jsp.JspWriter out = _jspx_page_context.getOut(); + // c:when + org.apache.taglibs.standard.tag.rt.core.WhenTag _jspx_th_c_005fwhen_005f0 = (org.apache.taglibs.standard.tag.rt.core.WhenTag) _005fjspx_005ftagPool_005fc_005fwhen_0026_005ftest.get(org.apache.taglibs.standard.tag.rt.core.WhenTag.class); + _jspx_th_c_005fwhen_005f0.setPageContext(_jspx_page_context); + _jspx_th_c_005fwhen_005f0.setParent((javax.servlet.jsp.tagext.Tag) _jspx_th_c_005fchoose_005f0); + // /WEB-INF/header.jsp(15,1) name = test type = boolean reqTime = true required = true fragment = false deferredValue = false expectedTypeName = null deferredMethod = false methodSignature = null + _jspx_th_c_005fwhen_005f0.setTest(((java.lang.Boolean) org.apache.jasper.runtime.PageContextImpl.proprietaryEvaluate("${empty style_headername}", boolean.class, (javax.servlet.jsp.PageContext)_jspx_page_context, null)).booleanValue()); + int _jspx_eval_c_005fwhen_005f0 = _jspx_th_c_005fwhen_005f0.doStartTag(); + if (_jspx_eval_c_005fwhen_005f0 != javax.servlet.jsp.tagext.Tag.SKIP_BODY) { + do { + out.write(" \r\n"); + out.write(" SMART Connect\r\n"); + out.write(" "); + int evalDoAfterBody = _jspx_th_c_005fwhen_005f0.doAfterBody(); + if (evalDoAfterBody != javax.servlet.jsp.tagext.BodyTag.EVAL_BODY_AGAIN) + break; + } while (true); + } + if (_jspx_th_c_005fwhen_005f0.doEndTag() == javax.servlet.jsp.tagext.Tag.SKIP_PAGE) { + return true; + } + _005fjspx_005ftagPool_005fc_005fwhen_0026_005ftest.reuse(_jspx_th_c_005fwhen_005f0); + return false; + } + + private boolean _jspx_meth_c_005fotherwise_005f0(javax.servlet.jsp.tagext.JspTag _jspx_th_c_005fchoose_005f0, javax.servlet.jsp.PageContext _jspx_page_context) + throws java.lang.Throwable { + javax.servlet.jsp.PageContext pageContext = _jspx_page_context; + javax.servlet.jsp.JspWriter out = _jspx_page_context.getOut(); + // c:otherwise + org.apache.taglibs.standard.tag.common.core.OtherwiseTag _jspx_th_c_005fotherwise_005f0 = (org.apache.taglibs.standard.tag.common.core.OtherwiseTag) _005fjspx_005ftagPool_005fc_005fotherwise.get(org.apache.taglibs.standard.tag.common.core.OtherwiseTag.class); + _jspx_th_c_005fotherwise_005f0.setPageContext(_jspx_page_context); + _jspx_th_c_005fotherwise_005f0.setParent((javax.servlet.jsp.tagext.Tag) _jspx_th_c_005fchoose_005f0); + int _jspx_eval_c_005fotherwise_005f0 = _jspx_th_c_005fotherwise_005f0.doStartTag(); + if (_jspx_eval_c_005fotherwise_005f0 != javax.servlet.jsp.tagext.Tag.SKIP_BODY) { + do { + out.write('\r'); + out.write('\n'); + out.write(' '); + out.write((java.lang.String) org.apache.jasper.runtime.PageContextImpl.proprietaryEvaluate("${style_headername}", java.lang.String.class, (javax.servlet.jsp.PageContext)_jspx_page_context, null)); + out.write('\r'); + out.write('\n'); + out.write(' '); + int evalDoAfterBody = _jspx_th_c_005fotherwise_005f0.doAfterBody(); + if (evalDoAfterBody != javax.servlet.jsp.tagext.BodyTag.EVAL_BODY_AGAIN) + break; + } while (true); + } + if (_jspx_th_c_005fotherwise_005f0.doEndTag() == javax.servlet.jsp.tagext.Tag.SKIP_PAGE) { + return true; + } + _005fjspx_005ftagPool_005fc_005fotherwise.reuse(_jspx_th_c_005fotherwise_005f0); + return false; + } + + private boolean _jspx_meth_fmt_005fmessage_005f5(javax.servlet.jsp.PageContext _jspx_page_context) + throws java.lang.Throwable { + javax.servlet.jsp.PageContext pageContext = _jspx_page_context; + javax.servlet.jsp.JspWriter out = _jspx_page_context.getOut(); + // fmt:message + org.apache.taglibs.standard.tag.rt.fmt.MessageTag _jspx_th_fmt_005fmessage_005f5 = (org.apache.taglibs.standard.tag.rt.fmt.MessageTag) _005fjspx_005ftagPool_005ffmt_005fmessage_0026_005fkey_005fnobody.get(org.apache.taglibs.standard.tag.rt.fmt.MessageTag.class); + _jspx_th_fmt_005fmessage_005f5.setPageContext(_jspx_page_context); + _jspx_th_fmt_005fmessage_005f5.setParent(null); + // /WEB-INF/forgotpassword.jsp(54,26) name = key type = null reqTime = true required = false fragment = false deferredValue = false expectedTypeName = null deferredMethod = false methodSignature = null + _jspx_th_fmt_005fmessage_005f5.setKey("forgotpassword.sectiontitle"); + int _jspx_eval_fmt_005fmessage_005f5 = _jspx_th_fmt_005fmessage_005f5.doStartTag(); + if (_jspx_th_fmt_005fmessage_005f5.doEndTag() == javax.servlet.jsp.tagext.Tag.SKIP_PAGE) { + return true; + } + _005fjspx_005ftagPool_005ffmt_005fmessage_0026_005fkey_005fnobody.reuse(_jspx_th_fmt_005fmessage_005f5); + return false; + } + + private boolean _jspx_meth_fmt_005fmessage_005f6(javax.servlet.jsp.PageContext _jspx_page_context) + throws java.lang.Throwable { + javax.servlet.jsp.PageContext pageContext = _jspx_page_context; + javax.servlet.jsp.JspWriter out = _jspx_page_context.getOut(); + // fmt:message + org.apache.taglibs.standard.tag.rt.fmt.MessageTag _jspx_th_fmt_005fmessage_005f6 = (org.apache.taglibs.standard.tag.rt.fmt.MessageTag) _005fjspx_005ftagPool_005ffmt_005fmessage_0026_005fkey_005fnobody.get(org.apache.taglibs.standard.tag.rt.fmt.MessageTag.class); + _jspx_th_fmt_005fmessage_005f6.setPageContext(_jspx_page_context); + _jspx_th_fmt_005fmessage_005f6.setParent(null); + // /WEB-INF/forgotpassword.jsp(55,5) name = key type = null reqTime = true required = false fragment = false deferredValue = false expectedTypeName = null deferredMethod = false methodSignature = null + _jspx_th_fmt_005fmessage_005f6.setKey("forgotpassword.message"); + int _jspx_eval_fmt_005fmessage_005f6 = _jspx_th_fmt_005fmessage_005f6.doStartTag(); + if (_jspx_th_fmt_005fmessage_005f6.doEndTag() == javax.servlet.jsp.tagext.Tag.SKIP_PAGE) { + return true; + } + _005fjspx_005ftagPool_005ffmt_005fmessage_0026_005fkey_005fnobody.reuse(_jspx_th_fmt_005fmessage_005f6); + return false; + } + + private boolean _jspx_meth_fmt_005fmessage_005f7(javax.servlet.jsp.PageContext _jspx_page_context) + throws java.lang.Throwable { + javax.servlet.jsp.PageContext pageContext = _jspx_page_context; + javax.servlet.jsp.JspWriter out = _jspx_page_context.getOut(); + // fmt:message + org.apache.taglibs.standard.tag.rt.fmt.MessageTag _jspx_th_fmt_005fmessage_005f7 = (org.apache.taglibs.standard.tag.rt.fmt.MessageTag) _005fjspx_005ftagPool_005ffmt_005fmessage_0026_005fkey_005fnobody.get(org.apache.taglibs.standard.tag.rt.fmt.MessageTag.class); + _jspx_th_fmt_005fmessage_005f7.setPageContext(_jspx_page_context); + _jspx_th_fmt_005fmessage_005f7.setParent(null); + // /WEB-INF/forgotpassword.jsp(59,35) name = key type = null reqTime = true required = false fragment = false deferredValue = false expectedTypeName = null deferredMethod = false methodSignature = null + _jspx_th_fmt_005fmessage_005f7.setKey("forgotpassword.username"); + int _jspx_eval_fmt_005fmessage_005f7 = _jspx_th_fmt_005fmessage_005f7.doStartTag(); + if (_jspx_th_fmt_005fmessage_005f7.doEndTag() == javax.servlet.jsp.tagext.Tag.SKIP_PAGE) { + return true; + } + _005fjspx_005ftagPool_005ffmt_005fmessage_0026_005fkey_005fnobody.reuse(_jspx_th_fmt_005fmessage_005f7); + return false; + } + + private boolean _jspx_meth_fmt_005fmessage_005f8(javax.servlet.jsp.PageContext _jspx_page_context) + throws java.lang.Throwable { + javax.servlet.jsp.PageContext pageContext = _jspx_page_context; + javax.servlet.jsp.JspWriter out = _jspx_page_context.getOut(); + // fmt:message + org.apache.taglibs.standard.tag.rt.fmt.MessageTag _jspx_th_fmt_005fmessage_005f8 = (org.apache.taglibs.standard.tag.rt.fmt.MessageTag) _005fjspx_005ftagPool_005ffmt_005fmessage_0026_005fkey_005fnobody.get(org.apache.taglibs.standard.tag.rt.fmt.MessageTag.class); + _jspx_th_fmt_005fmessage_005f8.setPageContext(_jspx_page_context); + _jspx_th_fmt_005fmessage_005f8.setParent(null); + // /WEB-INF/forgotpassword.jsp(61,76) name = key type = null reqTime = true required = false fragment = false deferredValue = false expectedTypeName = null deferredMethod = false methodSignature = null + _jspx_th_fmt_005fmessage_005f8.setKey("forgotpassword.resetbutton"); + int _jspx_eval_fmt_005fmessage_005f8 = _jspx_th_fmt_005fmessage_005f8.doStartTag(); + if (_jspx_th_fmt_005fmessage_005f8.doEndTag() == javax.servlet.jsp.tagext.Tag.SKIP_PAGE) { + return true; + } + _005fjspx_005ftagPool_005ffmt_005fmessage_0026_005fkey_005fnobody.reuse(_jspx_th_fmt_005fmessage_005f8); + return false; + } + + private boolean _jspx_meth_c_005fif_005f3(javax.servlet.jsp.PageContext _jspx_page_context) + throws java.lang.Throwable { + javax.servlet.jsp.PageContext pageContext = _jspx_page_context; + javax.servlet.jsp.JspWriter out = _jspx_page_context.getOut(); + // c:if + org.apache.taglibs.standard.tag.rt.core.IfTag _jspx_th_c_005fif_005f3 = (org.apache.taglibs.standard.tag.rt.core.IfTag) _005fjspx_005ftagPool_005fc_005fif_0026_005ftest.get(org.apache.taglibs.standard.tag.rt.core.IfTag.class); + _jspx_th_c_005fif_005f3.setPageContext(_jspx_page_context); + _jspx_th_c_005fif_005f3.setParent(null); + // /WEB-INF/footer.jsp(15,1) name = test type = boolean reqTime = true required = true fragment = false deferredValue = false expectedTypeName = null deferredMethod = false methodSignature = null + _jspx_th_c_005fif_005f3.setTest(((java.lang.Boolean) org.apache.jasper.runtime.PageContextImpl.proprietaryEvaluate("${not empty style_footername }", boolean.class, (javax.servlet.jsp.PageContext)_jspx_page_context, null)).booleanValue()); + int _jspx_eval_c_005fif_005f3 = _jspx_th_c_005fif_005f3.doStartTag(); + if (_jspx_eval_c_005fif_005f3 != javax.servlet.jsp.tagext.Tag.SKIP_BODY) { + do { + out.write("\r\n"); + out.write(" "); + out.write((java.lang.String) org.apache.jasper.runtime.PageContextImpl.proprietaryEvaluate("${style_footername}", java.lang.String.class, (javax.servlet.jsp.PageContext)_jspx_page_context, null)); + out.write('\r'); + out.write('\n'); + out.write(' '); + int evalDoAfterBody = _jspx_th_c_005fif_005f3.doAfterBody(); + if (evalDoAfterBody != javax.servlet.jsp.tagext.BodyTag.EVAL_BODY_AGAIN) + break; + } while (true); + } + if (_jspx_th_c_005fif_005f3.doEndTag() == javax.servlet.jsp.tagext.Tag.SKIP_PAGE) { + return true; + } + _005fjspx_005ftagPool_005fc_005fif_0026_005ftest.reuse(_jspx_th_c_005fif_005f3); + return false; + } +} diff --git a/app/opt/tomcat9/work/Catalina/smartconnect.internal.yel.or.id/ROOT/org/apache/jsp/WEB_002dINF/home_jsp.class b/app/opt/tomcat9/work/Catalina/smartconnect.internal.yel.or.id/ROOT/org/apache/jsp/WEB_002dINF/home_jsp.class new file mode 100644 index 0000000..358877a Binary files /dev/null and b/app/opt/tomcat9/work/Catalina/smartconnect.internal.yel.or.id/ROOT/org/apache/jsp/WEB_002dINF/home_jsp.class differ diff --git a/app/opt/tomcat9/work/Catalina/smartconnect.internal.yel.or.id/ROOT/org/apache/jsp/WEB_002dINF/home_jsp.java b/app/opt/tomcat9/work/Catalina/smartconnect.internal.yel.or.id/ROOT/org/apache/jsp/WEB_002dINF/home_jsp.java new file mode 100644 index 0000000..88bdeb8 --- /dev/null +++ b/app/opt/tomcat9/work/Catalina/smartconnect.internal.yel.or.id/ROOT/org/apache/jsp/WEB_002dINF/home_jsp.java @@ -0,0 +1,1620 @@ +/* + * Generated by the Jasper component of Apache Tomcat + * Version: Apache Tomcat/9.0.107 + * Generated at: 2025-07-30 05:27:26 UTC + * Note: The last modified time of this file was set to + * the last modified time of the source file after + * generation to assist with modification tracking. + */ +package org.apache.jsp.WEB_002dINF; + +import javax.servlet.*; +import javax.servlet.http.*; +import javax.servlet.jsp.*; +import java.time.LocalDate; +import java.time.format.DateTimeFormatter; + +public final class home_jsp extends org.apache.jasper.runtime.HttpJspBase + implements org.apache.jasper.runtime.JspSourceDependent, + org.apache.jasper.runtime.JspSourceImports { + + private static final javax.servlet.jsp.JspFactory _jspxFactory = + javax.servlet.jsp.JspFactory.getDefaultFactory(); + + private static java.util.Map _jspx_dependants; + + static { + _jspx_dependants = new java.util.HashMap(7); + _jspx_dependants.put("jar:file:/opt/tomcat9/webapps/ROOT/WEB-INF/lib/jstl-1.2.jar!/META-INF/c.tld", Long.valueOf(1153385082000L)); + _jspx_dependants.put("/WEB-INF/header.jsp", Long.valueOf(1753790711298L)); + _jspx_dependants.put("jar:file:/opt/tomcat9/webapps/ROOT/WEB-INF/lib/jstl-1.2.jar!/META-INF/fmt.tld", Long.valueOf(1153385082000L)); + _jspx_dependants.put("/WEB-INF/menu.jsp", Long.valueOf(1753790711454L)); + _jspx_dependants.put("/WEB-INF/includes.jsp", Long.valueOf(1753790711298L)); + _jspx_dependants.put("/WEB-INF/lib/jstl-1.2.jar", Long.valueOf(1753790711326L)); + _jspx_dependants.put("/WEB-INF/footer.jsp", Long.valueOf(1753790711298L)); + } + + private static final java.util.Set _jspx_imports_packages; + + private static final java.util.Set _jspx_imports_classes; + + static { + _jspx_imports_packages = new java.util.LinkedHashSet<>(4); + _jspx_imports_packages.add("javax.servlet"); + _jspx_imports_packages.add("javax.servlet.http"); + _jspx_imports_packages.add("javax.servlet.jsp"); + _jspx_imports_classes = new java.util.LinkedHashSet<>(3); + _jspx_imports_classes.add("java.time.LocalDate"); + _jspx_imports_classes.add("java.time.format.DateTimeFormatter"); + } + + private org.apache.jasper.runtime.TagHandlerPool _005fjspx_005ftagPool_005ffmt_005fsetBundle_0026_005fbasename_005fnobody; + private org.apache.jasper.runtime.TagHandlerPool _005fjspx_005ftagPool_005fc_005fset_0026_005fvar_005fvalue_005fnobody; + private org.apache.jasper.runtime.TagHandlerPool _005fjspx_005ftagPool_005fc_005fforEach_0026_005fvar_005fitems; + private org.apache.jasper.runtime.TagHandlerPool _005fjspx_005ftagPool_005fc_005fif_0026_005ftest; + private org.apache.jasper.runtime.TagHandlerPool _005fjspx_005ftagPool_005ffmt_005fmessage_0026_005fkey_005fnobody; + private org.apache.jasper.runtime.TagHandlerPool _005fjspx_005ftagPool_005fc_005fchoose; + private org.apache.jasper.runtime.TagHandlerPool _005fjspx_005ftagPool_005fc_005fwhen_0026_005ftest; + private org.apache.jasper.runtime.TagHandlerPool _005fjspx_005ftagPool_005fc_005fotherwise; + + private volatile javax.el.ExpressionFactory _el_expressionfactory; + private volatile org.apache.tomcat.InstanceManager _jsp_instancemanager; + + public java.util.Map getDependants() { + return _jspx_dependants; + } + + public java.util.Set getPackageImports() { + return _jspx_imports_packages; + } + + public java.util.Set getClassImports() { + return _jspx_imports_classes; + } + + public javax.el.ExpressionFactory _jsp_getExpressionFactory() { + if (_el_expressionfactory == null) { + synchronized (this) { + if (_el_expressionfactory == null) { + _el_expressionfactory = _jspxFactory.getJspApplicationContext(getServletConfig().getServletContext()).getExpressionFactory(); + } + } + } + return _el_expressionfactory; + } + + public org.apache.tomcat.InstanceManager _jsp_getInstanceManager() { + if (_jsp_instancemanager == null) { + synchronized (this) { + if (_jsp_instancemanager == null) { + _jsp_instancemanager = org.apache.jasper.runtime.InstanceManagerFactory.getInstanceManager(getServletConfig()); + } + } + } + return _jsp_instancemanager; + } + + public void _jspInit() { + _005fjspx_005ftagPool_005ffmt_005fsetBundle_0026_005fbasename_005fnobody = org.apache.jasper.runtime.TagHandlerPool.getTagHandlerPool(getServletConfig()); + _005fjspx_005ftagPool_005fc_005fset_0026_005fvar_005fvalue_005fnobody = org.apache.jasper.runtime.TagHandlerPool.getTagHandlerPool(getServletConfig()); + _005fjspx_005ftagPool_005fc_005fforEach_0026_005fvar_005fitems = org.apache.jasper.runtime.TagHandlerPool.getTagHandlerPool(getServletConfig()); + _005fjspx_005ftagPool_005fc_005fif_0026_005ftest = org.apache.jasper.runtime.TagHandlerPool.getTagHandlerPool(getServletConfig()); + _005fjspx_005ftagPool_005ffmt_005fmessage_0026_005fkey_005fnobody = org.apache.jasper.runtime.TagHandlerPool.getTagHandlerPool(getServletConfig()); + _005fjspx_005ftagPool_005fc_005fchoose = org.apache.jasper.runtime.TagHandlerPool.getTagHandlerPool(getServletConfig()); + _005fjspx_005ftagPool_005fc_005fwhen_0026_005ftest = org.apache.jasper.runtime.TagHandlerPool.getTagHandlerPool(getServletConfig()); + _005fjspx_005ftagPool_005fc_005fotherwise = org.apache.jasper.runtime.TagHandlerPool.getTagHandlerPool(getServletConfig()); + } + + public void _jspDestroy() { + _005fjspx_005ftagPool_005ffmt_005fsetBundle_0026_005fbasename_005fnobody.release(); + _005fjspx_005ftagPool_005fc_005fset_0026_005fvar_005fvalue_005fnobody.release(); + _005fjspx_005ftagPool_005fc_005fforEach_0026_005fvar_005fitems.release(); + _005fjspx_005ftagPool_005fc_005fif_0026_005ftest.release(); + _005fjspx_005ftagPool_005ffmt_005fmessage_0026_005fkey_005fnobody.release(); + _005fjspx_005ftagPool_005fc_005fchoose.release(); + _005fjspx_005ftagPool_005fc_005fwhen_0026_005ftest.release(); + _005fjspx_005ftagPool_005fc_005fotherwise.release(); + } + + public void _jspService(final javax.servlet.http.HttpServletRequest request, final javax.servlet.http.HttpServletResponse response) + throws java.io.IOException, javax.servlet.ServletException { + + if (!javax.servlet.DispatcherType.ERROR.equals(request.getDispatcherType())) { + final java.lang.String _jspx_method = request.getMethod(); + if ("OPTIONS".equals(_jspx_method)) { + response.setHeader("Allow","GET, HEAD, POST, OPTIONS"); + return; + } + if (!"GET".equals(_jspx_method) && !"POST".equals(_jspx_method) && !"HEAD".equals(_jspx_method)) { + response.setHeader("Allow","GET, HEAD, POST, OPTIONS"); + response.sendError(HttpServletResponse.SC_METHOD_NOT_ALLOWED, "JSPs only permit GET, POST or HEAD. Jasper also permits OPTIONS"); + return; + } + } + + final javax.servlet.jsp.PageContext pageContext; + javax.servlet.http.HttpSession session = null; + final javax.servlet.ServletContext application; + final javax.servlet.ServletConfig config; + javax.servlet.jsp.JspWriter out = null; + final java.lang.Object page = this; + javax.servlet.jsp.JspWriter _jspx_out = null; + javax.servlet.jsp.PageContext _jspx_page_context = null; + + + try { + response.setContentType("text/html; charset=UTF-8"); + pageContext = _jspxFactory.getPageContext(this, request, response, + null, true, 8192, true); + _jspx_page_context = pageContext; + application = pageContext.getServletContext(); + config = pageContext.getServletConfig(); + session = pageContext.getSession(); + out = pageContext.getOut(); + _jspx_out = out; + + out.write("\r\n"); + out.write("\r\n"); + out.write("\r\n"); + out.write("\r\n"); + out.write(" "); + out.write("\r\n"); + out.write("\r\n"); + out.write("\r\n"); + if (_jspx_meth_fmt_005fsetBundle_005f0(_jspx_page_context)) + return; + out.write("\r\n"); + out.write("\r\n"); + out.write("\r\n"); + out.write("\r\n"); + out.write("\r\n"); + out.write("\r\n"); + out.write("\r\n"); + out.write(" \r\n"); + out.write("\r\n"); + out.write("\r\n"); + out.write("\r\n"); + out.write("\r\n"); + out.write("\r\n"); + if (_jspx_meth_c_005fset_005f0(_jspx_page_context)) + return; + out.write('\r'); + out.write('\n'); + if (_jspx_meth_c_005fforEach_005f0(_jspx_page_context)) + return; + out.write("\r\n"); + out.write("\r\n"); + out.write("\r\n"); + out.write("\r\n"); + out.write("\r\n"); + out.write("\r\n"); + out.write("\r\n"); + out.write(" \r\n"); + out.write(" \r\n"); + out.write(" \r\n"); + out.write(" "); + if (_jspx_meth_fmt_005fmessage_005f0(_jspx_page_context)) + return; + out.write("\r\n"); + out.write(" \r\n"); + out.write("\r\n"); + out.write("\r\n"); + out.write("\r\n"); + out.write(" "); + out.write("\r\n"); + out.write("
\r\n"); + if (_jspx_meth_c_005fif_005f1(_jspx_page_context)) + return; + out.write("\r\n"); + out.write("
\r\n"); + if (_jspx_meth_c_005fchoose_005f0(_jspx_page_context)) + return; + out.write(" \r\n"); + out.write("\r\n"); + out.write("
\r\n"); + out.write("\r\n"); + out.write("
\r\n"); + out.write("\r\n"); + out.write('\r'); + out.write('\n'); + out.write(' '); + out.write("\r\n"); + out.write("\r\n"); + out.write("\r\n"); + out.write("
\r\n"); + out.write("
\r\n"); + out.write("\r\n"); + out.write("\r\n"); + out.write("\r\n"); + out.write("\r\n"); + out.write("
\r\n"); + out.write("
\r\n"); + out.write("\r\n"); + if (_jspx_meth_c_005fforEach_005f1(_jspx_page_context)) + return; + out.write("\r\n"); + out.write("\r\n"); + out.write("
\r\n"); + out.write("
\r\n"); + out.write("\r\n"); + out.write("
"); + if (_jspx_meth_fmt_005fmessage_005f2(_jspx_page_context)) + return; + out.write("
\r\n"); + out.write(" \r\n"); + out.write(" \r\n"); + out.write("
\r\n"); + out.write("
\r\n"); + out.write(" \r\n"); + out.write("
\r\n"); + out.write("
\r\n"); + out.write("

"); + if (_jspx_meth_fmt_005fmessage_005f3(_jspx_page_context)) + return; + out.write("

\r\n"); + out.write("
\r\n"); + out.write("
\r\n"); + out.write("
\r\n"); + out.write("
"); + if (_jspx_meth_fmt_005fmessage_005f4(_jspx_page_context)) + return; + out.write("
\r\n"); + out.write("
"); + if (_jspx_meth_fmt_005fmessage_005f5(_jspx_page_context)) + return; + out.write("
\r\n"); + out.write("
"); + if (_jspx_meth_fmt_005fmessage_005f6(_jspx_page_context)) + return; + out.write("
\r\n"); + out.write(" \r\n"); + out.write("
\r\n"); + out.write("
\r\n"); + out.write("
\r\n"); + out.write("
\r\n"); + out.write("
\r\n"); + out.write(" \r\n"); + out.write(" \r\n"); + out.write("
\r\n"); + out.write("

"); + if (_jspx_meth_fmt_005fmessage_005f7(_jspx_page_context)) + return; + out.write("

\r\n"); + out.write("
\r\n"); + out.write("
\r\n"); + out.write("
"); + if (_jspx_meth_fmt_005fmessage_005f8(_jspx_page_context)) + return; + out.write("
\r\n"); + out.write("
\r\n"); + out.write("
\r\n"); + out.write("
\r\n"); + out.write("
"); + if (_jspx_meth_fmt_005fmessage_005f9(_jspx_page_context)) + return; + out.write("
\r\n"); + out.write("
\r\n"); + out.write("
\r\n"); + out.write("
\r\n"); + out.write(" \r\n"); + out.write(" "); + if (_jspx_meth_fmt_005fmessage_005f11(_jspx_page_context)) + return; + out.write(" \r\n"); + out.write(" \r\n"); + out.write("

\r\n"); + out.write("
\r\n"); + out.write(" \r\n"); + out.write(" \r\n"); + out.write("
\r\n"); + out.write("\r\n"); + out.write("\r\n"); + out.write("\r\n"); + out.write("\r\n"); + out.write("\r\n"); + out.write("
\r\n"); + String year = DateTimeFormatter.ofPattern("YYYY").format(LocalDate.now()); + out.write("\r\n"); + out.write("\r\n"); + out.write("
\r\n"); + out.write(" "); + // c:if + org.apache.taglibs.standard.tag.rt.core.IfTag _jspx_th_c_005fif_005f2 = (org.apache.taglibs.standard.tag.rt.core.IfTag) _005fjspx_005ftagPool_005fc_005fif_0026_005ftest.get(org.apache.taglibs.standard.tag.rt.core.IfTag.class); + _jspx_th_c_005fif_005f2.setPageContext(_jspx_page_context); + _jspx_th_c_005fif_005f2.setParent(null); + // /WEB-INF/footer.jsp(11,1) name = test type = boolean reqTime = true required = true fragment = false deferredValue = false expectedTypeName = null deferredMethod = false methodSignature = null + _jspx_th_c_005fif_005f2.setTest(((java.lang.Boolean) org.apache.jasper.runtime.PageContextImpl.proprietaryEvaluate("${empty style_footername }", boolean.class, (javax.servlet.jsp.PageContext)_jspx_page_context, null)).booleanValue()); + int _jspx_eval_c_005fif_005f2 = _jspx_th_c_005fif_005f2.doStartTag(); + if (_jspx_eval_c_005fif_005f2 != javax.servlet.jsp.tagext.Tag.SKIP_BODY) { + do { + out.write("\r\n"); + out.write(" \r\n"); + out.write("

Copyright 2015-"); + out.print(year); + out.write("

\r\n"); + out.write(" "); + int evalDoAfterBody = _jspx_th_c_005fif_005f2.doAfterBody(); + if (evalDoAfterBody != javax.servlet.jsp.tagext.BodyTag.EVAL_BODY_AGAIN) + break; + } while (true); + } + if (_jspx_th_c_005fif_005f2.doEndTag() == javax.servlet.jsp.tagext.Tag.SKIP_PAGE) { + return; + } + _005fjspx_005ftagPool_005fc_005fif_0026_005ftest.reuse(_jspx_th_c_005fif_005f2); + out.write('\r'); + out.write('\n'); + out.write(' '); + if (_jspx_meth_c_005fif_005f3(_jspx_page_context)) + return; + out.write("\r\n"); + out.write("
\r\n"); + out.write("
\r\n"); + out.write("\r\n"); + out.write("\r\n"); + out.write("\r\n"); + out.write("\r\n"); + out.write("\r\n"); + out.write("
\r\n"); + out.write("
"); + if (_jspx_meth_fmt_005fmessage_005f16(_jspx_page_context)) + return; + out.write("
\r\n"); + out.write("
\r\n"); + out.write("
\r\n"); + out.write("
\r\n"); + out.write(" \r\n"); + out.write(" \r\n"); + out.write(" \r\n"); + out.write(" \r\n"); + out.write(" \r\n"); + out.write(" \r\n"); + out.write("
\r\n"); + out.write(" \r\n"); + out.write(" \r\n"); + out.write("
\r\n"); + out.write("
\r\n"); + out.write("
\r\n"); + out.write("\r\n"); + out.write("
\r\n"); + out.write("
"); + if (_jspx_meth_fmt_005fmessage_005f19(_jspx_page_context)) + return; + out.write("
\r\n"); + out.write("
\r\n"); + out.write("
\r\n"); + out.write("
\r\n"); + out.write(" \r\n"); + out.write(" \r\n"); + out.write(" \r\n"); + out.write(" \r\n"); + out.write("
\r\n"); + out.write(" \r\n"); + out.write(" \r\n"); + out.write("
\r\n"); + out.write("
\r\n"); + out.write("
\r\n"); + out.write("\r\n"); + out.write("\r\n"); + out.write("
\r\n"); + out.write("
"); + if (_jspx_meth_fmt_005fmessage_005f20(_jspx_page_context)) + return; + out.write("
\r\n"); + out.write("

"); + if (_jspx_meth_fmt_005fmessage_005f21(_jspx_page_context)) + return; + out.write("\r\n"); + out.write("

"); + if (_jspx_meth_fmt_005fmessage_005f22(_jspx_page_context)) + return; + out.write("\r\n"); + out.write("

\r\n"); + out.write("
\r\n"); + out.write("
\r\n"); + out.write("
"); + if (_jspx_meth_fmt_005fmessage_005f23(_jspx_page_context)) + return; + out.write("
\r\n"); + out.write("
"); + if (_jspx_meth_fmt_005fmessage_005f24(_jspx_page_context)) + return; + out.write("
\r\n"); + out.write("
"); + if (_jspx_meth_fmt_005fmessage_005f25(_jspx_page_context)) + return; + out.write("
\r\n"); + out.write("
"); + if (_jspx_meth_fmt_005fmessage_005f26(_jspx_page_context)) + return; + out.write("
\r\n"); + out.write("
\r\n"); + out.write("
\r\n"); + out.write("
\r\n"); + out.write(" \r\n"); + out.write("
\r\n"); + out.write(" \r\n"); + out.write("
\r\n"); + out.write("
\r\n"); + out.write("\r\n"); + out.write(""); + } catch (java.lang.Throwable t) { + if (!(t instanceof javax.servlet.jsp.SkipPageException)){ + out = _jspx_out; + if (out != null && out.getBufferSize() != 0) + try { + if (response.isCommitted()) { + out.flush(); + } else { + out.clearBuffer(); + } + } catch (java.io.IOException e) {} + if (_jspx_page_context != null) _jspx_page_context.handlePageException(t); + else throw new ServletException(t); + } + } finally { + _jspxFactory.releasePageContext(_jspx_page_context); + } + } + + private boolean _jspx_meth_fmt_005fsetBundle_005f0(javax.servlet.jsp.PageContext _jspx_page_context) + throws java.lang.Throwable { + javax.servlet.jsp.PageContext pageContext = _jspx_page_context; + javax.servlet.jsp.JspWriter out = _jspx_page_context.getOut(); + // fmt:setBundle + org.apache.taglibs.standard.tag.rt.fmt.SetBundleTag _jspx_th_fmt_005fsetBundle_005f0 = (org.apache.taglibs.standard.tag.rt.fmt.SetBundleTag) _005fjspx_005ftagPool_005ffmt_005fsetBundle_0026_005fbasename_005fnobody.get(org.apache.taglibs.standard.tag.rt.fmt.SetBundleTag.class); + _jspx_th_fmt_005fsetBundle_005f0.setPageContext(_jspx_page_context); + _jspx_th_fmt_005fsetBundle_005f0.setParent(null); + // /WEB-INF/includes.jsp(5,0) name = basename type = null reqTime = true required = true fragment = false deferredValue = false expectedTypeName = null deferredMethod = false methodSignature = null + _jspx_th_fmt_005fsetBundle_005f0.setBasename("org.wcs.smart.connect.i18n.web_messages"); + int _jspx_eval_fmt_005fsetBundle_005f0 = _jspx_th_fmt_005fsetBundle_005f0.doStartTag(); + if (_jspx_th_fmt_005fsetBundle_005f0.doEndTag() == javax.servlet.jsp.tagext.Tag.SKIP_PAGE) { + return true; + } + _005fjspx_005ftagPool_005ffmt_005fsetBundle_0026_005fbasename_005fnobody.reuse(_jspx_th_fmt_005fsetBundle_005f0); + return false; + } + + private boolean _jspx_meth_c_005fset_005f0(javax.servlet.jsp.PageContext _jspx_page_context) + throws java.lang.Throwable { + javax.servlet.jsp.PageContext pageContext = _jspx_page_context; + javax.servlet.jsp.JspWriter out = _jspx_page_context.getOut(); + // c:set + org.apache.taglibs.standard.tag.rt.core.SetTag _jspx_th_c_005fset_005f0 = (org.apache.taglibs.standard.tag.rt.core.SetTag) _005fjspx_005ftagPool_005fc_005fset_0026_005fvar_005fvalue_005fnobody.get(org.apache.taglibs.standard.tag.rt.core.SetTag.class); + _jspx_th_c_005fset_005f0.setPageContext(_jspx_page_context); + _jspx_th_c_005fset_005f0.setParent(null); + // /WEB-INF/includes.jsp(18,0) name = var type = java.lang.String reqTime = false required = false fragment = false deferredValue = false expectedTypeName = null deferredMethod = false methodSignature = null + _jspx_th_c_005fset_005f0.setVar("supportedLang"); + // /WEB-INF/includes.jsp(18,0) name = value type = javax.el.ValueExpression reqTime = true required = false fragment = false deferredValue = true expectedTypeName = java.lang.Object deferredMethod = false methodSignature = null + _jspx_th_c_005fset_005f0.setValue(new org.apache.jasper.el.JspValueExpression("/WEB-INF/includes.jsp(18,0) 'es,fr,hi,in,km,lo,ms,ru,th,vi,zh'",_jsp_getExpressionFactory().createValueExpression("es,fr,hi,in,km,lo,ms,ru,th,vi,zh",java.lang.Object.class)).getValue(_jspx_page_context.getELContext())); + int _jspx_eval_c_005fset_005f0 = _jspx_th_c_005fset_005f0.doStartTag(); + if (_jspx_th_c_005fset_005f0.doEndTag() == javax.servlet.jsp.tagext.Tag.SKIP_PAGE) { + return true; + } + _005fjspx_005ftagPool_005fc_005fset_0026_005fvar_005fvalue_005fnobody.reuse(_jspx_th_c_005fset_005f0); + return false; + } + + private boolean _jspx_meth_c_005fforEach_005f0(javax.servlet.jsp.PageContext _jspx_page_context) + throws java.lang.Throwable { + javax.servlet.jsp.PageContext pageContext = _jspx_page_context; + javax.servlet.jsp.JspWriter out = _jspx_page_context.getOut(); + // c:forEach + org.apache.taglibs.standard.tag.rt.core.ForEachTag _jspx_th_c_005fforEach_005f0 = (org.apache.taglibs.standard.tag.rt.core.ForEachTag) _005fjspx_005ftagPool_005fc_005fforEach_0026_005fvar_005fitems.get(org.apache.taglibs.standard.tag.rt.core.ForEachTag.class); + _jspx_th_c_005fforEach_005f0.setPageContext(_jspx_page_context); + _jspx_th_c_005fforEach_005f0.setParent(null); + // /WEB-INF/includes.jsp(19,0) name = var type = java.lang.String reqTime = false required = false fragment = false deferredValue = false expectedTypeName = null deferredMethod = false methodSignature = null + _jspx_th_c_005fforEach_005f0.setVar("item"); + // /WEB-INF/includes.jsp(19,0) name = items type = javax.el.ValueExpression reqTime = true required = false fragment = false deferredValue = true expectedTypeName = java.lang.Object deferredMethod = false methodSignature = null + _jspx_th_c_005fforEach_005f0.setItems(new org.apache.jasper.el.JspValueExpression("/WEB-INF/includes.jsp(19,0) '${supportedLang}'",_jsp_getExpressionFactory().createValueExpression(_jspx_page_context.getELContext(),"${supportedLang}",java.lang.Object.class)).getValue(_jspx_page_context.getELContext())); + int[] _jspx_push_body_count_c_005fforEach_005f0 = new int[] { 0 }; + try { + int _jspx_eval_c_005fforEach_005f0 = _jspx_th_c_005fforEach_005f0.doStartTag(); + if (_jspx_eval_c_005fforEach_005f0 != javax.servlet.jsp.tagext.Tag.SKIP_BODY) { + do { + out.write("\r\n"); + out.write(" "); + if (_jspx_meth_c_005fif_005f0(_jspx_th_c_005fforEach_005f0, _jspx_page_context, _jspx_push_body_count_c_005fforEach_005f0)) + return true; + out.write('\r'); + out.write('\n'); + int evalDoAfterBody = _jspx_th_c_005fforEach_005f0.doAfterBody(); + if (evalDoAfterBody != javax.servlet.jsp.tagext.BodyTag.EVAL_BODY_AGAIN) + break; + } while (true); + } + if (_jspx_th_c_005fforEach_005f0.doEndTag() == javax.servlet.jsp.tagext.Tag.SKIP_PAGE) { + return true; + } + } catch (java.lang.Throwable _jspx_exception) { + while (_jspx_push_body_count_c_005fforEach_005f0[0]-- > 0) + out = _jspx_page_context.popBody(); + _jspx_th_c_005fforEach_005f0.doCatch(_jspx_exception); + } finally { + _jspx_th_c_005fforEach_005f0.doFinally(); + } + _005fjspx_005ftagPool_005fc_005fforEach_0026_005fvar_005fitems.reuse(_jspx_th_c_005fforEach_005f0); + return false; + } + + private boolean _jspx_meth_c_005fif_005f0(javax.servlet.jsp.tagext.JspTag _jspx_th_c_005fforEach_005f0, javax.servlet.jsp.PageContext _jspx_page_context, int[] _jspx_push_body_count_c_005fforEach_005f0) + throws java.lang.Throwable { + javax.servlet.jsp.PageContext pageContext = _jspx_page_context; + javax.servlet.jsp.JspWriter out = _jspx_page_context.getOut(); + // c:if + org.apache.taglibs.standard.tag.rt.core.IfTag _jspx_th_c_005fif_005f0 = (org.apache.taglibs.standard.tag.rt.core.IfTag) _005fjspx_005ftagPool_005fc_005fif_0026_005ftest.get(org.apache.taglibs.standard.tag.rt.core.IfTag.class); + _jspx_th_c_005fif_005f0.setPageContext(_jspx_page_context); + _jspx_th_c_005fif_005f0.setParent((javax.servlet.jsp.tagext.Tag) _jspx_th_c_005fforEach_005f0); + // /WEB-INF/includes.jsp(20,2) name = test type = boolean reqTime = true required = true fragment = false deferredValue = false expectedTypeName = null deferredMethod = false methodSignature = null + _jspx_th_c_005fif_005f0.setTest(((java.lang.Boolean) org.apache.jasper.runtime.PageContextImpl.proprietaryEvaluate("${item eq pageContext.request.locale.language}", boolean.class, (javax.servlet.jsp.PageContext)_jspx_page_context, null)).booleanValue()); + int _jspx_eval_c_005fif_005f0 = _jspx_th_c_005fif_005f0.doStartTag(); + if (_jspx_eval_c_005fif_005f0 != javax.servlet.jsp.tagext.Tag.SKIP_BODY) { + do { + out.write("\r\n"); + out.write(" \r\n"); + out.write(" "); + int evalDoAfterBody = _jspx_th_c_005fif_005f0.doAfterBody(); + if (evalDoAfterBody != javax.servlet.jsp.tagext.BodyTag.EVAL_BODY_AGAIN) + break; + } while (true); + } + if (_jspx_th_c_005fif_005f0.doEndTag() == javax.servlet.jsp.tagext.Tag.SKIP_PAGE) { + return true; + } + _005fjspx_005ftagPool_005fc_005fif_0026_005ftest.reuse(_jspx_th_c_005fif_005f0); + return false; + } + + private boolean _jspx_meth_fmt_005fmessage_005f0(javax.servlet.jsp.PageContext _jspx_page_context) + throws java.lang.Throwable { + javax.servlet.jsp.PageContext pageContext = _jspx_page_context; + javax.servlet.jsp.JspWriter out = _jspx_page_context.getOut(); + // fmt:message + org.apache.taglibs.standard.tag.rt.fmt.MessageTag _jspx_th_fmt_005fmessage_005f0 = (org.apache.taglibs.standard.tag.rt.fmt.MessageTag) _005fjspx_005ftagPool_005ffmt_005fmessage_0026_005fkey_005fnobody.get(org.apache.taglibs.standard.tag.rt.fmt.MessageTag.class); + _jspx_th_fmt_005fmessage_005f0.setPageContext(_jspx_page_context); + _jspx_th_fmt_005fmessage_005f0.setParent(null); + // /WEB-INF/home.jsp(10,8) name = key type = null reqTime = true required = false fragment = false deferredValue = false expectedTypeName = null deferredMethod = false methodSignature = null + _jspx_th_fmt_005fmessage_005f0.setKey("home.pagetitle"); + int _jspx_eval_fmt_005fmessage_005f0 = _jspx_th_fmt_005fmessage_005f0.doStartTag(); + if (_jspx_th_fmt_005fmessage_005f0.doEndTag() == javax.servlet.jsp.tagext.Tag.SKIP_PAGE) { + return true; + } + _005fjspx_005ftagPool_005ffmt_005fmessage_0026_005fkey_005fnobody.reuse(_jspx_th_fmt_005fmessage_005f0); + return false; + } + + private boolean _jspx_meth_c_005fif_005f1(javax.servlet.jsp.PageContext _jspx_page_context) + throws java.lang.Throwable { + javax.servlet.jsp.PageContext pageContext = _jspx_page_context; + javax.servlet.jsp.JspWriter out = _jspx_page_context.getOut(); + // c:if + org.apache.taglibs.standard.tag.rt.core.IfTag _jspx_th_c_005fif_005f1 = (org.apache.taglibs.standard.tag.rt.core.IfTag) _005fjspx_005ftagPool_005fc_005fif_0026_005ftest.get(org.apache.taglibs.standard.tag.rt.core.IfTag.class); + _jspx_th_c_005fif_005f1.setPageContext(_jspx_page_context); + _jspx_th_c_005fif_005f1.setParent(null); + // /WEB-INF/header.jsp(3,0) name = test type = boolean reqTime = true required = true fragment = false deferredValue = false expectedTypeName = null deferredMethod = false methodSignature = null + _jspx_th_c_005fif_005f1.setTest(((java.lang.Boolean) org.apache.jasper.runtime.PageContextImpl.proprietaryEvaluate("${not empty pageContext.request.userPrincipal}", boolean.class, (javax.servlet.jsp.PageContext)_jspx_page_context, null)).booleanValue()); + int _jspx_eval_c_005fif_005f1 = _jspx_th_c_005fif_005f1.doStartTag(); + if (_jspx_eval_c_005fif_005f1 != javax.servlet.jsp.tagext.Tag.SKIP_BODY) { + do { + out.write("\r\n"); + out.write("
\r\n"); + out.write("
\r\n"); + out.write(" \r\n"); + out.write(" "); + out.write((java.lang.String) org.apache.jasper.runtime.PageContextImpl.proprietaryEvaluate("${pageContext.request.userPrincipal.name}", java.lang.String.class, (javax.servlet.jsp.PageContext)_jspx_page_context, null)); + out.write("\r\n"); + out.write(" |\r\n"); + out.write(" \r\n"); + out.write("
\r\n"); + out.write("
\r\n"); + int evalDoAfterBody = _jspx_th_c_005fif_005f1.doAfterBody(); + if (evalDoAfterBody != javax.servlet.jsp.tagext.BodyTag.EVAL_BODY_AGAIN) + break; + } while (true); + } + if (_jspx_th_c_005fif_005f1.doEndTag() == javax.servlet.jsp.tagext.Tag.SKIP_PAGE) { + return true; + } + _005fjspx_005ftagPool_005fc_005fif_0026_005ftest.reuse(_jspx_th_c_005fif_005f1); + return false; + } + + private boolean _jspx_meth_fmt_005fmessage_005f1(javax.servlet.jsp.tagext.JspTag _jspx_th_c_005fif_005f1, javax.servlet.jsp.PageContext _jspx_page_context) + throws java.lang.Throwable { + javax.servlet.jsp.PageContext pageContext = _jspx_page_context; + javax.servlet.jsp.JspWriter out = _jspx_page_context.getOut(); + // fmt:message + org.apache.taglibs.standard.tag.rt.fmt.MessageTag _jspx_th_fmt_005fmessage_005f1 = (org.apache.taglibs.standard.tag.rt.fmt.MessageTag) _005fjspx_005ftagPool_005ffmt_005fmessage_0026_005fkey_005fnobody.get(org.apache.taglibs.standard.tag.rt.fmt.MessageTag.class); + _jspx_th_fmt_005fmessage_005f1.setPageContext(_jspx_page_context); + _jspx_th_fmt_005fmessage_005f1.setParent((javax.servlet.jsp.tagext.Tag) _jspx_th_c_005fif_005f1); + // /WEB-INF/header.jsp(9,30) name = key type = null reqTime = true required = false fragment = false deferredValue = false expectedTypeName = null deferredMethod = false methodSignature = null + _jspx_th_fmt_005fmessage_005f1.setKey("header.logout"); + int _jspx_eval_fmt_005fmessage_005f1 = _jspx_th_fmt_005fmessage_005f1.doStartTag(); + if (_jspx_th_fmt_005fmessage_005f1.doEndTag() == javax.servlet.jsp.tagext.Tag.SKIP_PAGE) { + return true; + } + _005fjspx_005ftagPool_005ffmt_005fmessage_0026_005fkey_005fnobody.reuse(_jspx_th_fmt_005fmessage_005f1); + return false; + } + + private boolean _jspx_meth_c_005fchoose_005f0(javax.servlet.jsp.PageContext _jspx_page_context) + throws java.lang.Throwable { + javax.servlet.jsp.PageContext pageContext = _jspx_page_context; + javax.servlet.jsp.JspWriter out = _jspx_page_context.getOut(); + // c:choose + org.apache.taglibs.standard.tag.common.core.ChooseTag _jspx_th_c_005fchoose_005f0 = (org.apache.taglibs.standard.tag.common.core.ChooseTag) _005fjspx_005ftagPool_005fc_005fchoose.get(org.apache.taglibs.standard.tag.common.core.ChooseTag.class); + _jspx_th_c_005fchoose_005f0.setPageContext(_jspx_page_context); + _jspx_th_c_005fchoose_005f0.setParent(null); + int _jspx_eval_c_005fchoose_005f0 = _jspx_th_c_005fchoose_005f0.doStartTag(); + if (_jspx_eval_c_005fchoose_005f0 != javax.servlet.jsp.tagext.Tag.SKIP_BODY) { + do { + out.write('\r'); + out.write('\n'); + out.write(' '); + if (_jspx_meth_c_005fwhen_005f0(_jspx_th_c_005fchoose_005f0, _jspx_page_context)) + return true; + out.write('\r'); + out.write('\n'); + out.write(' '); + if (_jspx_meth_c_005fotherwise_005f0(_jspx_th_c_005fchoose_005f0, _jspx_page_context)) + return true; + out.write('\r'); + out.write('\n'); + int evalDoAfterBody = _jspx_th_c_005fchoose_005f0.doAfterBody(); + if (evalDoAfterBody != javax.servlet.jsp.tagext.BodyTag.EVAL_BODY_AGAIN) + break; + } while (true); + } + if (_jspx_th_c_005fchoose_005f0.doEndTag() == javax.servlet.jsp.tagext.Tag.SKIP_PAGE) { + return true; + } + _005fjspx_005ftagPool_005fc_005fchoose.reuse(_jspx_th_c_005fchoose_005f0); + return false; + } + + private boolean _jspx_meth_c_005fwhen_005f0(javax.servlet.jsp.tagext.JspTag _jspx_th_c_005fchoose_005f0, javax.servlet.jsp.PageContext _jspx_page_context) + throws java.lang.Throwable { + javax.servlet.jsp.PageContext pageContext = _jspx_page_context; + javax.servlet.jsp.JspWriter out = _jspx_page_context.getOut(); + // c:when + org.apache.taglibs.standard.tag.rt.core.WhenTag _jspx_th_c_005fwhen_005f0 = (org.apache.taglibs.standard.tag.rt.core.WhenTag) _005fjspx_005ftagPool_005fc_005fwhen_0026_005ftest.get(org.apache.taglibs.standard.tag.rt.core.WhenTag.class); + _jspx_th_c_005fwhen_005f0.setPageContext(_jspx_page_context); + _jspx_th_c_005fwhen_005f0.setParent((javax.servlet.jsp.tagext.Tag) _jspx_th_c_005fchoose_005f0); + // /WEB-INF/header.jsp(15,1) name = test type = boolean reqTime = true required = true fragment = false deferredValue = false expectedTypeName = null deferredMethod = false methodSignature = null + _jspx_th_c_005fwhen_005f0.setTest(((java.lang.Boolean) org.apache.jasper.runtime.PageContextImpl.proprietaryEvaluate("${empty style_headername}", boolean.class, (javax.servlet.jsp.PageContext)_jspx_page_context, null)).booleanValue()); + int _jspx_eval_c_005fwhen_005f0 = _jspx_th_c_005fwhen_005f0.doStartTag(); + if (_jspx_eval_c_005fwhen_005f0 != javax.servlet.jsp.tagext.Tag.SKIP_BODY) { + do { + out.write(" \r\n"); + out.write(" SMART Connect\r\n"); + out.write(" "); + int evalDoAfterBody = _jspx_th_c_005fwhen_005f0.doAfterBody(); + if (evalDoAfterBody != javax.servlet.jsp.tagext.BodyTag.EVAL_BODY_AGAIN) + break; + } while (true); + } + if (_jspx_th_c_005fwhen_005f0.doEndTag() == javax.servlet.jsp.tagext.Tag.SKIP_PAGE) { + return true; + } + _005fjspx_005ftagPool_005fc_005fwhen_0026_005ftest.reuse(_jspx_th_c_005fwhen_005f0); + return false; + } + + private boolean _jspx_meth_c_005fotherwise_005f0(javax.servlet.jsp.tagext.JspTag _jspx_th_c_005fchoose_005f0, javax.servlet.jsp.PageContext _jspx_page_context) + throws java.lang.Throwable { + javax.servlet.jsp.PageContext pageContext = _jspx_page_context; + javax.servlet.jsp.JspWriter out = _jspx_page_context.getOut(); + // c:otherwise + org.apache.taglibs.standard.tag.common.core.OtherwiseTag _jspx_th_c_005fotherwise_005f0 = (org.apache.taglibs.standard.tag.common.core.OtherwiseTag) _005fjspx_005ftagPool_005fc_005fotherwise.get(org.apache.taglibs.standard.tag.common.core.OtherwiseTag.class); + _jspx_th_c_005fotherwise_005f0.setPageContext(_jspx_page_context); + _jspx_th_c_005fotherwise_005f0.setParent((javax.servlet.jsp.tagext.Tag) _jspx_th_c_005fchoose_005f0); + int _jspx_eval_c_005fotherwise_005f0 = _jspx_th_c_005fotherwise_005f0.doStartTag(); + if (_jspx_eval_c_005fotherwise_005f0 != javax.servlet.jsp.tagext.Tag.SKIP_BODY) { + do { + out.write('\r'); + out.write('\n'); + out.write(' '); + out.write((java.lang.String) org.apache.jasper.runtime.PageContextImpl.proprietaryEvaluate("${style_headername}", java.lang.String.class, (javax.servlet.jsp.PageContext)_jspx_page_context, null)); + out.write('\r'); + out.write('\n'); + out.write(' '); + int evalDoAfterBody = _jspx_th_c_005fotherwise_005f0.doAfterBody(); + if (evalDoAfterBody != javax.servlet.jsp.tagext.BodyTag.EVAL_BODY_AGAIN) + break; + } while (true); + } + if (_jspx_th_c_005fotherwise_005f0.doEndTag() == javax.servlet.jsp.tagext.Tag.SKIP_PAGE) { + return true; + } + _005fjspx_005ftagPool_005fc_005fotherwise.reuse(_jspx_th_c_005fotherwise_005f0); + return false; + } + + private boolean _jspx_meth_c_005fforEach_005f1(javax.servlet.jsp.PageContext _jspx_page_context) + throws java.lang.Throwable { + javax.servlet.jsp.PageContext pageContext = _jspx_page_context; + javax.servlet.jsp.JspWriter out = _jspx_page_context.getOut(); + // c:forEach + org.apache.taglibs.standard.tag.rt.core.ForEachTag _jspx_th_c_005fforEach_005f1 = (org.apache.taglibs.standard.tag.rt.core.ForEachTag) _005fjspx_005ftagPool_005fc_005fforEach_0026_005fvar_005fitems.get(org.apache.taglibs.standard.tag.rt.core.ForEachTag.class); + _jspx_th_c_005fforEach_005f1.setPageContext(_jspx_page_context); + _jspx_th_c_005fforEach_005f1.setParent(null); + // /WEB-INF/menu.jsp(16,0) name = var type = java.lang.String reqTime = false required = false fragment = false deferredValue = false expectedTypeName = null deferredMethod = false methodSignature = null + _jspx_th_c_005fforEach_005f1.setVar("item"); + // /WEB-INF/menu.jsp(16,0) name = items type = javax.el.ValueExpression reqTime = true required = false fragment = false deferredValue = true expectedTypeName = java.lang.Object deferredMethod = false methodSignature = null + _jspx_th_c_005fforEach_005f1.setItems(new org.apache.jasper.el.JspValueExpression("/WEB-INF/menu.jsp(16,0) '${menuitems}'",_jsp_getExpressionFactory().createValueExpression(_jspx_page_context.getELContext(),"${menuitems}",java.lang.Object.class)).getValue(_jspx_page_context.getELContext())); + int[] _jspx_push_body_count_c_005fforEach_005f1 = new int[] { 0 }; + try { + int _jspx_eval_c_005fforEach_005f1 = _jspx_th_c_005fforEach_005f1.doStartTag(); + if (_jspx_eval_c_005fforEach_005f1 != javax.servlet.jsp.tagext.Tag.SKIP_BODY) { + do { + out.write("\r\n"); + out.write("
\r\n"); + out.write(" \r\n"); + out.write("
"); + out.write((java.lang.String) org.apache.jasper.runtime.PageContextImpl.proprietaryEvaluate("${item[0]}", java.lang.String.class, (javax.servlet.jsp.PageContext)_jspx_page_context, null)); + out.write("
\r\n"); + out.write("
\r\n"); + out.write(" "); + int evalDoAfterBody = _jspx_th_c_005fforEach_005f1.doAfterBody(); + if (evalDoAfterBody != javax.servlet.jsp.tagext.BodyTag.EVAL_BODY_AGAIN) + break; + } while (true); + } + if (_jspx_th_c_005fforEach_005f1.doEndTag() == javax.servlet.jsp.tagext.Tag.SKIP_PAGE) { + return true; + } + } catch (java.lang.Throwable _jspx_exception) { + while (_jspx_push_body_count_c_005fforEach_005f1[0]-- > 0) + out = _jspx_page_context.popBody(); + _jspx_th_c_005fforEach_005f1.doCatch(_jspx_exception); + } finally { + _jspx_th_c_005fforEach_005f1.doFinally(); + } + _005fjspx_005ftagPool_005fc_005fforEach_0026_005fvar_005fitems.reuse(_jspx_th_c_005fforEach_005f1); + return false; + } + + private boolean _jspx_meth_fmt_005fmessage_005f2(javax.servlet.jsp.PageContext _jspx_page_context) + throws java.lang.Throwable { + javax.servlet.jsp.PageContext pageContext = _jspx_page_context; + javax.servlet.jsp.JspWriter out = _jspx_page_context.getOut(); + // fmt:message + org.apache.taglibs.standard.tag.rt.fmt.MessageTag _jspx_th_fmt_005fmessage_005f2 = (org.apache.taglibs.standard.tag.rt.fmt.MessageTag) _005fjspx_005ftagPool_005ffmt_005fmessage_0026_005fkey_005fnobody.get(org.apache.taglibs.standard.tag.rt.fmt.MessageTag.class); + _jspx_th_fmt_005fmessage_005f2.setPageContext(_jspx_page_context); + _jspx_th_fmt_005fmessage_005f2.setParent(null); + // /WEB-INF/home.jsp(17,41) name = key type = null reqTime = true required = false fragment = false deferredValue = false expectedTypeName = null deferredMethod = false methodSignature = null + _jspx_th_fmt_005fmessage_005f2.setKey("home.welcome"); + int _jspx_eval_fmt_005fmessage_005f2 = _jspx_th_fmt_005fmessage_005f2.doStartTag(); + if (_jspx_th_fmt_005fmessage_005f2.doEndTag() == javax.servlet.jsp.tagext.Tag.SKIP_PAGE) { + return true; + } + _005fjspx_005ftagPool_005ffmt_005fmessage_0026_005fkey_005fnobody.reuse(_jspx_th_fmt_005fmessage_005f2); + return false; + } + + private boolean _jspx_meth_fmt_005fmessage_005f3(javax.servlet.jsp.PageContext _jspx_page_context) + throws java.lang.Throwable { + javax.servlet.jsp.PageContext pageContext = _jspx_page_context; + javax.servlet.jsp.JspWriter out = _jspx_page_context.getOut(); + // fmt:message + org.apache.taglibs.standard.tag.rt.fmt.MessageTag _jspx_th_fmt_005fmessage_005f3 = (org.apache.taglibs.standard.tag.rt.fmt.MessageTag) _005fjspx_005ftagPool_005ffmt_005fmessage_0026_005fkey_005fnobody.get(org.apache.taglibs.standard.tag.rt.fmt.MessageTag.class); + _jspx_th_fmt_005fmessage_005f3.setPageContext(_jspx_page_context); + _jspx_th_fmt_005fmessage_005f3.setParent(null); + // /WEB-INF/home.jsp(25,55) name = key type = null reqTime = true required = false fragment = false deferredValue = false expectedTypeName = null deferredMethod = false methodSignature = null + _jspx_th_fmt_005fmessage_005f3.setKey("quicklinks.my"); + int _jspx_eval_fmt_005fmessage_005f3 = _jspx_th_fmt_005fmessage_005f3.doStartTag(); + if (_jspx_th_fmt_005fmessage_005f3.doEndTag() == javax.servlet.jsp.tagext.Tag.SKIP_PAGE) { + return true; + } + _005fjspx_005ftagPool_005ffmt_005fmessage_0026_005fkey_005fnobody.reuse(_jspx_th_fmt_005fmessage_005f3); + return false; + } + + private boolean _jspx_meth_fmt_005fmessage_005f4(javax.servlet.jsp.PageContext _jspx_page_context) + throws java.lang.Throwable { + javax.servlet.jsp.PageContext pageContext = _jspx_page_context; + javax.servlet.jsp.JspWriter out = _jspx_page_context.getOut(); + // fmt:message + org.apache.taglibs.standard.tag.rt.fmt.MessageTag _jspx_th_fmt_005fmessage_005f4 = (org.apache.taglibs.standard.tag.rt.fmt.MessageTag) _005fjspx_005ftagPool_005ffmt_005fmessage_0026_005fkey_005fnobody.get(org.apache.taglibs.standard.tag.rt.fmt.MessageTag.class); + _jspx_th_fmt_005fmessage_005f4.setPageContext(_jspx_page_context); + _jspx_th_fmt_005fmessage_005f4.setParent(null); + // /WEB-INF/home.jsp(29,45) name = key type = null reqTime = true required = false fragment = false deferredValue = false expectedTypeName = null deferredMethod = false methodSignature = null + _jspx_th_fmt_005fmessage_005f4.setKey("quicklinks.quicklink"); + int _jspx_eval_fmt_005fmessage_005f4 = _jspx_th_fmt_005fmessage_005f4.doStartTag(); + if (_jspx_th_fmt_005fmessage_005f4.doEndTag() == javax.servlet.jsp.tagext.Tag.SKIP_PAGE) { + return true; + } + _005fjspx_005ftagPool_005ffmt_005fmessage_0026_005fkey_005fnobody.reuse(_jspx_th_fmt_005fmessage_005f4); + return false; + } + + private boolean _jspx_meth_fmt_005fmessage_005f5(javax.servlet.jsp.PageContext _jspx_page_context) + throws java.lang.Throwable { + javax.servlet.jsp.PageContext pageContext = _jspx_page_context; + javax.servlet.jsp.JspWriter out = _jspx_page_context.getOut(); + // fmt:message + org.apache.taglibs.standard.tag.rt.fmt.MessageTag _jspx_th_fmt_005fmessage_005f5 = (org.apache.taglibs.standard.tag.rt.fmt.MessageTag) _005fjspx_005ftagPool_005ffmt_005fmessage_0026_005fkey_005fnobody.get(org.apache.taglibs.standard.tag.rt.fmt.MessageTag.class); + _jspx_th_fmt_005fmessage_005f5.setPageContext(_jspx_page_context); + _jspx_th_fmt_005fmessage_005f5.setParent(null); + // /WEB-INF/home.jsp(30,45) name = key type = null reqTime = true required = false fragment = false deferredValue = false expectedTypeName = null deferredMethod = false methodSignature = null + _jspx_th_fmt_005fmessage_005f5.setKey("quicklinks.order"); + int _jspx_eval_fmt_005fmessage_005f5 = _jspx_th_fmt_005fmessage_005f5.doStartTag(); + if (_jspx_th_fmt_005fmessage_005f5.doEndTag() == javax.servlet.jsp.tagext.Tag.SKIP_PAGE) { + return true; + } + _005fjspx_005ftagPool_005ffmt_005fmessage_0026_005fkey_005fnobody.reuse(_jspx_th_fmt_005fmessage_005f5); + return false; + } + + private boolean _jspx_meth_fmt_005fmessage_005f6(javax.servlet.jsp.PageContext _jspx_page_context) + throws java.lang.Throwable { + javax.servlet.jsp.PageContext pageContext = _jspx_page_context; + javax.servlet.jsp.JspWriter out = _jspx_page_context.getOut(); + // fmt:message + org.apache.taglibs.standard.tag.rt.fmt.MessageTag _jspx_th_fmt_005fmessage_005f6 = (org.apache.taglibs.standard.tag.rt.fmt.MessageTag) _005fjspx_005ftagPool_005ffmt_005fmessage_0026_005fkey_005fnobody.get(org.apache.taglibs.standard.tag.rt.fmt.MessageTag.class); + _jspx_th_fmt_005fmessage_005f6.setPageContext(_jspx_page_context); + _jspx_th_fmt_005fmessage_005f6.setParent(null); + // /WEB-INF/home.jsp(31,45) name = key type = null reqTime = true required = false fragment = false deferredValue = false expectedTypeName = null deferredMethod = false methodSignature = null + _jspx_th_fmt_005fmessage_005f6.setKey("quicklinks.actions"); + int _jspx_eval_fmt_005fmessage_005f6 = _jspx_th_fmt_005fmessage_005f6.doStartTag(); + if (_jspx_th_fmt_005fmessage_005f6.doEndTag() == javax.servlet.jsp.tagext.Tag.SKIP_PAGE) { + return true; + } + _005fjspx_005ftagPool_005ffmt_005fmessage_0026_005fkey_005fnobody.reuse(_jspx_th_fmt_005fmessage_005f6); + return false; + } + + private boolean _jspx_meth_fmt_005fmessage_005f7(javax.servlet.jsp.PageContext _jspx_page_context) + throws java.lang.Throwable { + javax.servlet.jsp.PageContext pageContext = _jspx_page_context; + javax.servlet.jsp.JspWriter out = _jspx_page_context.getOut(); + // fmt:message + org.apache.taglibs.standard.tag.rt.fmt.MessageTag _jspx_th_fmt_005fmessage_005f7 = (org.apache.taglibs.standard.tag.rt.fmt.MessageTag) _005fjspx_005ftagPool_005ffmt_005fmessage_0026_005fkey_005fnobody.get(org.apache.taglibs.standard.tag.rt.fmt.MessageTag.class); + _jspx_th_fmt_005fmessage_005f7.setPageContext(_jspx_page_context); + _jspx_th_fmt_005fmessage_005f7.setParent(null); + // /WEB-INF/home.jsp(41,69) name = key type = null reqTime = true required = false fragment = false deferredValue = false expectedTypeName = null deferredMethod = false methodSignature = null + _jspx_th_fmt_005fmessage_005f7.setKey("quicklinks.new"); + int _jspx_eval_fmt_005fmessage_005f7 = _jspx_th_fmt_005fmessage_005f7.doStartTag(); + if (_jspx_th_fmt_005fmessage_005f7.doEndTag() == javax.servlet.jsp.tagext.Tag.SKIP_PAGE) { + return true; + } + _005fjspx_005ftagPool_005ffmt_005fmessage_0026_005fkey_005fnobody.reuse(_jspx_th_fmt_005fmessage_005f7); + return false; + } + + private boolean _jspx_meth_fmt_005fmessage_005f8(javax.servlet.jsp.PageContext _jspx_page_context) + throws java.lang.Throwable { + javax.servlet.jsp.PageContext pageContext = _jspx_page_context; + javax.servlet.jsp.JspWriter out = _jspx_page_context.getOut(); + // fmt:message + org.apache.taglibs.standard.tag.rt.fmt.MessageTag _jspx_th_fmt_005fmessage_005f8 = (org.apache.taglibs.standard.tag.rt.fmt.MessageTag) _005fjspx_005ftagPool_005ffmt_005fmessage_0026_005fkey_005fnobody.get(org.apache.taglibs.standard.tag.rt.fmt.MessageTag.class); + _jspx_th_fmt_005fmessage_005f8.setPageContext(_jspx_page_context); + _jspx_th_fmt_005fmessage_005f8.setParent(null); + // /WEB-INF/home.jsp(44,45) name = key type = null reqTime = true required = false fragment = false deferredValue = false expectedTypeName = null deferredMethod = false methodSignature = null + _jspx_th_fmt_005fmessage_005f8.setKey("quicklinks.url"); + int _jspx_eval_fmt_005fmessage_005f8 = _jspx_th_fmt_005fmessage_005f8.doStartTag(); + if (_jspx_th_fmt_005fmessage_005f8.doEndTag() == javax.servlet.jsp.tagext.Tag.SKIP_PAGE) { + return true; + } + _005fjspx_005ftagPool_005ffmt_005fmessage_0026_005fkey_005fnobody.reuse(_jspx_th_fmt_005fmessage_005f8); + return false; + } + + private boolean _jspx_meth_fmt_005fmessage_005f9(javax.servlet.jsp.PageContext _jspx_page_context) + throws java.lang.Throwable { + javax.servlet.jsp.PageContext pageContext = _jspx_page_context; + javax.servlet.jsp.JspWriter out = _jspx_page_context.getOut(); + // fmt:message + org.apache.taglibs.standard.tag.rt.fmt.MessageTag _jspx_th_fmt_005fmessage_005f9 = (org.apache.taglibs.standard.tag.rt.fmt.MessageTag) _005fjspx_005ftagPool_005ffmt_005fmessage_0026_005fkey_005fnobody.get(org.apache.taglibs.standard.tag.rt.fmt.MessageTag.class); + _jspx_th_fmt_005fmessage_005f9.setPageContext(_jspx_page_context); + _jspx_th_fmt_005fmessage_005f9.setParent(null); + // /WEB-INF/home.jsp(48,45) name = key type = null reqTime = true required = false fragment = false deferredValue = false expectedTypeName = null deferredMethod = false methodSignature = null + _jspx_th_fmt_005fmessage_005f9.setKey("quicklinks.label"); + int _jspx_eval_fmt_005fmessage_005f9 = _jspx_th_fmt_005fmessage_005f9.doStartTag(); + if (_jspx_th_fmt_005fmessage_005f9.doEndTag() == javax.servlet.jsp.tagext.Tag.SKIP_PAGE) { + return true; + } + _005fjspx_005ftagPool_005ffmt_005fmessage_0026_005fkey_005fnobody.reuse(_jspx_th_fmt_005fmessage_005f9); + return false; + } + + private boolean _jspx_meth_fmt_005fmessage_005f10(javax.servlet.jsp.PageContext _jspx_page_context) + throws java.lang.Throwable { + javax.servlet.jsp.PageContext pageContext = _jspx_page_context; + javax.servlet.jsp.JspWriter out = _jspx_page_context.getOut(); + // fmt:message + org.apache.taglibs.standard.tag.rt.fmt.MessageTag _jspx_th_fmt_005fmessage_005f10 = (org.apache.taglibs.standard.tag.rt.fmt.MessageTag) _005fjspx_005ftagPool_005ffmt_005fmessage_0026_005fkey_005fnobody.get(org.apache.taglibs.standard.tag.rt.fmt.MessageTag.class); + _jspx_th_fmt_005fmessage_005f10.setPageContext(_jspx_page_context); + _jspx_th_fmt_005fmessage_005f10.setParent(null); + // /WEB-INF/home.jsp(53,2) name = key type = null reqTime = true required = false fragment = false deferredValue = false expectedTypeName = null deferredMethod = false methodSignature = null + _jspx_th_fmt_005fmessage_005f10.setKey("quicklinks.createquicklink"); + int _jspx_eval_fmt_005fmessage_005f10 = _jspx_th_fmt_005fmessage_005f10.doStartTag(); + if (_jspx_th_fmt_005fmessage_005f10.doEndTag() == javax.servlet.jsp.tagext.Tag.SKIP_PAGE) { + return true; + } + _005fjspx_005ftagPool_005ffmt_005fmessage_0026_005fkey_005fnobody.reuse(_jspx_th_fmt_005fmessage_005f10); + return false; + } + + private boolean _jspx_meth_fmt_005fmessage_005f11(javax.servlet.jsp.PageContext _jspx_page_context) + throws java.lang.Throwable { + javax.servlet.jsp.PageContext pageContext = _jspx_page_context; + javax.servlet.jsp.JspWriter out = _jspx_page_context.getOut(); + // fmt:message + org.apache.taglibs.standard.tag.rt.fmt.MessageTag _jspx_th_fmt_005fmessage_005f11 = (org.apache.taglibs.standard.tag.rt.fmt.MessageTag) _005fjspx_005ftagPool_005ffmt_005fmessage_0026_005fkey_005fnobody.get(org.apache.taglibs.standard.tag.rt.fmt.MessageTag.class); + _jspx_th_fmt_005fmessage_005f11.setPageContext(_jspx_page_context); + _jspx_th_fmt_005fmessage_005f11.setParent(null); + // /WEB-INF/home.jsp(54,2) name = key type = null reqTime = true required = false fragment = false deferredValue = false expectedTypeName = null deferredMethod = false methodSignature = null + _jspx_th_fmt_005fmessage_005f11.setKey("quicklinks.or"); + int _jspx_eval_fmt_005fmessage_005f11 = _jspx_th_fmt_005fmessage_005f11.doStartTag(); + if (_jspx_th_fmt_005fmessage_005f11.doEndTag() == javax.servlet.jsp.tagext.Tag.SKIP_PAGE) { + return true; + } + _005fjspx_005ftagPool_005ffmt_005fmessage_0026_005fkey_005fnobody.reuse(_jspx_th_fmt_005fmessage_005f11); + return false; + } + + private boolean _jspx_meth_fmt_005fmessage_005f12(javax.servlet.jsp.PageContext _jspx_page_context) + throws java.lang.Throwable { + javax.servlet.jsp.PageContext pageContext = _jspx_page_context; + javax.servlet.jsp.JspWriter out = _jspx_page_context.getOut(); + // fmt:message + org.apache.taglibs.standard.tag.rt.fmt.MessageTag _jspx_th_fmt_005fmessage_005f12 = (org.apache.taglibs.standard.tag.rt.fmt.MessageTag) _005fjspx_005ftagPool_005ffmt_005fmessage_0026_005fkey_005fnobody.get(org.apache.taglibs.standard.tag.rt.fmt.MessageTag.class); + _jspx_th_fmt_005fmessage_005f12.setPageContext(_jspx_page_context); + _jspx_th_fmt_005fmessage_005f12.setParent(null); + // /WEB-INF/home.jsp(55,130) name = key type = null reqTime = true required = false fragment = false deferredValue = false expectedTypeName = null deferredMethod = false methodSignature = null + _jspx_th_fmt_005fmessage_005f12.setKey("quicklinks.createandaddtoall"); + int _jspx_eval_fmt_005fmessage_005f12 = _jspx_th_fmt_005fmessage_005f12.doStartTag(); + if (_jspx_th_fmt_005fmessage_005f12.doEndTag() == javax.servlet.jsp.tagext.Tag.SKIP_PAGE) { + return true; + } + _005fjspx_005ftagPool_005ffmt_005fmessage_0026_005fkey_005fnobody.reuse(_jspx_th_fmt_005fmessage_005f12); + return false; + } + + private boolean _jspx_meth_fmt_005fmessage_005f13(javax.servlet.jsp.PageContext _jspx_page_context) + throws java.lang.Throwable { + javax.servlet.jsp.PageContext pageContext = _jspx_page_context; + javax.servlet.jsp.JspWriter out = _jspx_page_context.getOut(); + // fmt:message + org.apache.taglibs.standard.tag.rt.fmt.MessageTag _jspx_th_fmt_005fmessage_005f13 = (org.apache.taglibs.standard.tag.rt.fmt.MessageTag) _005fjspx_005ftagPool_005ffmt_005fmessage_0026_005fkey_005fnobody.get(org.apache.taglibs.standard.tag.rt.fmt.MessageTag.class); + _jspx_th_fmt_005fmessage_005f13.setPageContext(_jspx_page_context); + _jspx_th_fmt_005fmessage_005f13.setParent(null); + // /WEB-INF/home.jsp(56,195) name = key type = null reqTime = true required = false fragment = false deferredValue = false expectedTypeName = null deferredMethod = false methodSignature = null + _jspx_th_fmt_005fmessage_005f13.setKey("quicklinks.addtolist"); + int _jspx_eval_fmt_005fmessage_005f13 = _jspx_th_fmt_005fmessage_005f13.doStartTag(); + if (_jspx_th_fmt_005fmessage_005f13.doEndTag() == javax.servlet.jsp.tagext.Tag.SKIP_PAGE) { + return true; + } + _005fjspx_005ftagPool_005ffmt_005fmessage_0026_005fkey_005fnobody.reuse(_jspx_th_fmt_005fmessage_005f13); + return false; + } + + private boolean _jspx_meth_fmt_005fmessage_005f14(javax.servlet.jsp.PageContext _jspx_page_context) + throws java.lang.Throwable { + javax.servlet.jsp.PageContext pageContext = _jspx_page_context; + javax.servlet.jsp.JspWriter out = _jspx_page_context.getOut(); + // fmt:message + org.apache.taglibs.standard.tag.rt.fmt.MessageTag _jspx_th_fmt_005fmessage_005f14 = (org.apache.taglibs.standard.tag.rt.fmt.MessageTag) _005fjspx_005ftagPool_005ffmt_005fmessage_0026_005fkey_005fnobody.get(org.apache.taglibs.standard.tag.rt.fmt.MessageTag.class); + _jspx_th_fmt_005fmessage_005f14.setPageContext(_jspx_page_context); + _jspx_th_fmt_005fmessage_005f14.setParent(null); + // /WEB-INF/home.jsp(60,74) name = key type = null reqTime = true required = false fragment = false deferredValue = false expectedTypeName = null deferredMethod = false methodSignature = null + _jspx_th_fmt_005fmessage_005f14.setKey("quicklinks.managemylinks"); + int _jspx_eval_fmt_005fmessage_005f14 = _jspx_th_fmt_005fmessage_005f14.doStartTag(); + if (_jspx_th_fmt_005fmessage_005f14.doEndTag() == javax.servlet.jsp.tagext.Tag.SKIP_PAGE) { + return true; + } + _005fjspx_005ftagPool_005ffmt_005fmessage_0026_005fkey_005fnobody.reuse(_jspx_th_fmt_005fmessage_005f14); + return false; + } + + private boolean _jspx_meth_fmt_005fmessage_005f15(javax.servlet.jsp.PageContext _jspx_page_context) + throws java.lang.Throwable { + javax.servlet.jsp.PageContext pageContext = _jspx_page_context; + javax.servlet.jsp.JspWriter out = _jspx_page_context.getOut(); + // fmt:message + org.apache.taglibs.standard.tag.rt.fmt.MessageTag _jspx_th_fmt_005fmessage_005f15 = (org.apache.taglibs.standard.tag.rt.fmt.MessageTag) _005fjspx_005ftagPool_005ffmt_005fmessage_0026_005fkey_005fnobody.get(org.apache.taglibs.standard.tag.rt.fmt.MessageTag.class); + _jspx_th_fmt_005fmessage_005f15.setPageContext(_jspx_page_context); + _jspx_th_fmt_005fmessage_005f15.setParent(null); + // /WEB-INF/home.jsp(61,94) name = key type = null reqTime = true required = false fragment = false deferredValue = false expectedTypeName = null deferredMethod = false methodSignature = null + _jspx_th_fmt_005fmessage_005f15.setKey("quicklinks.managealllinks"); + int _jspx_eval_fmt_005fmessage_005f15 = _jspx_th_fmt_005fmessage_005f15.doStartTag(); + if (_jspx_th_fmt_005fmessage_005f15.doEndTag() == javax.servlet.jsp.tagext.Tag.SKIP_PAGE) { + return true; + } + _005fjspx_005ftagPool_005ffmt_005fmessage_0026_005fkey_005fnobody.reuse(_jspx_th_fmt_005fmessage_005f15); + return false; + } + + private boolean _jspx_meth_c_005fif_005f3(javax.servlet.jsp.PageContext _jspx_page_context) + throws java.lang.Throwable { + javax.servlet.jsp.PageContext pageContext = _jspx_page_context; + javax.servlet.jsp.JspWriter out = _jspx_page_context.getOut(); + // c:if + org.apache.taglibs.standard.tag.rt.core.IfTag _jspx_th_c_005fif_005f3 = (org.apache.taglibs.standard.tag.rt.core.IfTag) _005fjspx_005ftagPool_005fc_005fif_0026_005ftest.get(org.apache.taglibs.standard.tag.rt.core.IfTag.class); + _jspx_th_c_005fif_005f3.setPageContext(_jspx_page_context); + _jspx_th_c_005fif_005f3.setParent(null); + // /WEB-INF/footer.jsp(15,1) name = test type = boolean reqTime = true required = true fragment = false deferredValue = false expectedTypeName = null deferredMethod = false methodSignature = null + _jspx_th_c_005fif_005f3.setTest(((java.lang.Boolean) org.apache.jasper.runtime.PageContextImpl.proprietaryEvaluate("${not empty style_footername }", boolean.class, (javax.servlet.jsp.PageContext)_jspx_page_context, null)).booleanValue()); + int _jspx_eval_c_005fif_005f3 = _jspx_th_c_005fif_005f3.doStartTag(); + if (_jspx_eval_c_005fif_005f3 != javax.servlet.jsp.tagext.Tag.SKIP_BODY) { + do { + out.write("\r\n"); + out.write(" "); + out.write((java.lang.String) org.apache.jasper.runtime.PageContextImpl.proprietaryEvaluate("${style_footername}", java.lang.String.class, (javax.servlet.jsp.PageContext)_jspx_page_context, null)); + out.write('\r'); + out.write('\n'); + out.write(' '); + int evalDoAfterBody = _jspx_th_c_005fif_005f3.doAfterBody(); + if (evalDoAfterBody != javax.servlet.jsp.tagext.BodyTag.EVAL_BODY_AGAIN) + break; + } while (true); + } + if (_jspx_th_c_005fif_005f3.doEndTag() == javax.servlet.jsp.tagext.Tag.SKIP_PAGE) { + return true; + } + _005fjspx_005ftagPool_005fc_005fif_0026_005ftest.reuse(_jspx_th_c_005fif_005f3); + return false; + } + + private boolean _jspx_meth_fmt_005fmessage_005f16(javax.servlet.jsp.PageContext _jspx_page_context) + throws java.lang.Throwable { + javax.servlet.jsp.PageContext pageContext = _jspx_page_context; + javax.servlet.jsp.JspWriter out = _jspx_page_context.getOut(); + // fmt:message + org.apache.taglibs.standard.tag.rt.fmt.MessageTag _jspx_th_fmt_005fmessage_005f16 = (org.apache.taglibs.standard.tag.rt.fmt.MessageTag) _005fjspx_005ftagPool_005ffmt_005fmessage_0026_005fkey_005fnobody.get(org.apache.taglibs.standard.tag.rt.fmt.MessageTag.class); + _jspx_th_fmt_005fmessage_005f16.setPageContext(_jspx_page_context); + _jspx_th_fmt_005fmessage_005f16.setParent(null); + // /WEB-INF/home.jsp(69,27) name = key type = null reqTime = true required = false fragment = false deferredValue = false expectedTypeName = null deferredMethod = false methodSignature = null + _jspx_th_fmt_005fmessage_005f16.setKey("quicklinks.updatelinks"); + int _jspx_eval_fmt_005fmessage_005f16 = _jspx_th_fmt_005fmessage_005f16.doStartTag(); + if (_jspx_th_fmt_005fmessage_005f16.doEndTag() == javax.servlet.jsp.tagext.Tag.SKIP_PAGE) { + return true; + } + _005fjspx_005ftagPool_005ffmt_005fmessage_0026_005fkey_005fnobody.reuse(_jspx_th_fmt_005fmessage_005f16); + return false; + } + + private boolean _jspx_meth_fmt_005fmessage_005f17(javax.servlet.jsp.PageContext _jspx_page_context) + throws java.lang.Throwable { + javax.servlet.jsp.PageContext pageContext = _jspx_page_context; + javax.servlet.jsp.JspWriter out = _jspx_page_context.getOut(); + // fmt:message + org.apache.taglibs.standard.tag.rt.fmt.MessageTag _jspx_th_fmt_005fmessage_005f17 = (org.apache.taglibs.standard.tag.rt.fmt.MessageTag) _005fjspx_005ftagPool_005ffmt_005fmessage_0026_005fkey_005fnobody.get(org.apache.taglibs.standard.tag.rt.fmt.MessageTag.class); + _jspx_th_fmt_005fmessage_005f17.setPageContext(_jspx_page_context); + _jspx_th_fmt_005fmessage_005f17.setParent(null); + // /WEB-INF/home.jsp(73,39) name = key type = null reqTime = true required = false fragment = false deferredValue = false expectedTypeName = null deferredMethod = false methodSignature = null + _jspx_th_fmt_005fmessage_005f17.setKey("quicklinks.quicklinklabel"); + int _jspx_eval_fmt_005fmessage_005f17 = _jspx_th_fmt_005fmessage_005f17.doStartTag(); + if (_jspx_th_fmt_005fmessage_005f17.doEndTag() == javax.servlet.jsp.tagext.Tag.SKIP_PAGE) { + return true; + } + _005fjspx_005ftagPool_005ffmt_005fmessage_0026_005fkey_005fnobody.reuse(_jspx_th_fmt_005fmessage_005f17); + return false; + } + + private boolean _jspx_meth_fmt_005fmessage_005f18(javax.servlet.jsp.PageContext _jspx_page_context) + throws java.lang.Throwable { + javax.servlet.jsp.PageContext pageContext = _jspx_page_context; + javax.servlet.jsp.JspWriter out = _jspx_page_context.getOut(); + // fmt:message + org.apache.taglibs.standard.tag.rt.fmt.MessageTag _jspx_th_fmt_005fmessage_005f18 = (org.apache.taglibs.standard.tag.rt.fmt.MessageTag) _005fjspx_005ftagPool_005ffmt_005fmessage_0026_005fkey_005fnobody.get(org.apache.taglibs.standard.tag.rt.fmt.MessageTag.class); + _jspx_th_fmt_005fmessage_005f18.setPageContext(_jspx_page_context); + _jspx_th_fmt_005fmessage_005f18.setParent(null); + // /WEB-INF/home.jsp(75,39) name = key type = null reqTime = true required = false fragment = false deferredValue = false expectedTypeName = null deferredMethod = false methodSignature = null + _jspx_th_fmt_005fmessage_005f18.setKey("quicklinks.ordervalue"); + int _jspx_eval_fmt_005fmessage_005f18 = _jspx_th_fmt_005fmessage_005f18.doStartTag(); + if (_jspx_th_fmt_005fmessage_005f18.doEndTag() == javax.servlet.jsp.tagext.Tag.SKIP_PAGE) { + return true; + } + _005fjspx_005ftagPool_005ffmt_005fmessage_0026_005fkey_005fnobody.reuse(_jspx_th_fmt_005fmessage_005f18); + return false; + } + + private boolean _jspx_meth_fmt_005fmessage_005f19(javax.servlet.jsp.PageContext _jspx_page_context) + throws java.lang.Throwable { + javax.servlet.jsp.PageContext pageContext = _jspx_page_context; + javax.servlet.jsp.JspWriter out = _jspx_page_context.getOut(); + // fmt:message + org.apache.taglibs.standard.tag.rt.fmt.MessageTag _jspx_th_fmt_005fmessage_005f19 = (org.apache.taglibs.standard.tag.rt.fmt.MessageTag) _005fjspx_005ftagPool_005ffmt_005fmessage_0026_005fkey_005fnobody.get(org.apache.taglibs.standard.tag.rt.fmt.MessageTag.class); + _jspx_th_fmt_005fmessage_005f19.setPageContext(_jspx_page_context); + _jspx_th_fmt_005fmessage_005f19.setParent(null); + // /WEB-INF/home.jsp(87,27) name = key type = null reqTime = true required = false fragment = false deferredValue = false expectedTypeName = null deferredMethod = false methodSignature = null + _jspx_th_fmt_005fmessage_005f19.setKey("quicklinks.updatequicklink"); + int _jspx_eval_fmt_005fmessage_005f19 = _jspx_th_fmt_005fmessage_005f19.doStartTag(); + if (_jspx_th_fmt_005fmessage_005f19.doEndTag() == javax.servlet.jsp.tagext.Tag.SKIP_PAGE) { + return true; + } + _005fjspx_005ftagPool_005ffmt_005fmessage_0026_005fkey_005fnobody.reuse(_jspx_th_fmt_005fmessage_005f19); + return false; + } + + private boolean _jspx_meth_fmt_005fmessage_005f20(javax.servlet.jsp.PageContext _jspx_page_context) + throws java.lang.Throwable { + javax.servlet.jsp.PageContext pageContext = _jspx_page_context; + javax.servlet.jsp.JspWriter out = _jspx_page_context.getOut(); + // fmt:message + org.apache.taglibs.standard.tag.rt.fmt.MessageTag _jspx_th_fmt_005fmessage_005f20 = (org.apache.taglibs.standard.tag.rt.fmt.MessageTag) _005fjspx_005ftagPool_005ffmt_005fmessage_0026_005fkey_005fnobody.get(org.apache.taglibs.standard.tag.rt.fmt.MessageTag.class); + _jspx_th_fmt_005fmessage_005f20.setPageContext(_jspx_page_context); + _jspx_th_fmt_005fmessage_005f20.setParent(null); + // /WEB-INF/home.jsp(104,28) name = key type = null reqTime = true required = false fragment = false deferredValue = false expectedTypeName = null deferredMethod = false methodSignature = null + _jspx_th_fmt_005fmessage_005f20.setKey("quicklinks.managealltitle"); + int _jspx_eval_fmt_005fmessage_005f20 = _jspx_th_fmt_005fmessage_005f20.doStartTag(); + if (_jspx_th_fmt_005fmessage_005f20.doEndTag() == javax.servlet.jsp.tagext.Tag.SKIP_PAGE) { + return true; + } + _005fjspx_005ftagPool_005ffmt_005fmessage_0026_005fkey_005fnobody.reuse(_jspx_th_fmt_005fmessage_005f20); + return false; + } + + private boolean _jspx_meth_fmt_005fmessage_005f21(javax.servlet.jsp.PageContext _jspx_page_context) + throws java.lang.Throwable { + javax.servlet.jsp.PageContext pageContext = _jspx_page_context; + javax.servlet.jsp.JspWriter out = _jspx_page_context.getOut(); + // fmt:message + org.apache.taglibs.standard.tag.rt.fmt.MessageTag _jspx_th_fmt_005fmessage_005f21 = (org.apache.taglibs.standard.tag.rt.fmt.MessageTag) _005fjspx_005ftagPool_005ffmt_005fmessage_0026_005fkey_005fnobody.get(org.apache.taglibs.standard.tag.rt.fmt.MessageTag.class); + _jspx_th_fmt_005fmessage_005f21.setPageContext(_jspx_page_context); + _jspx_th_fmt_005fmessage_005f21.setParent(null); + // /WEB-INF/home.jsp(105,5) name = key type = null reqTime = true required = false fragment = false deferredValue = false expectedTypeName = null deferredMethod = false methodSignature = null + _jspx_th_fmt_005fmessage_005f21.setKey("quicklinks.deletinglinks"); + int _jspx_eval_fmt_005fmessage_005f21 = _jspx_th_fmt_005fmessage_005f21.doStartTag(); + if (_jspx_th_fmt_005fmessage_005f21.doEndTag() == javax.servlet.jsp.tagext.Tag.SKIP_PAGE) { + return true; + } + _005fjspx_005ftagPool_005ffmt_005fmessage_0026_005fkey_005fnobody.reuse(_jspx_th_fmt_005fmessage_005f21); + return false; + } + + private boolean _jspx_meth_fmt_005fmessage_005f22(javax.servlet.jsp.PageContext _jspx_page_context) + throws java.lang.Throwable { + javax.servlet.jsp.PageContext pageContext = _jspx_page_context; + javax.servlet.jsp.JspWriter out = _jspx_page_context.getOut(); + // fmt:message + org.apache.taglibs.standard.tag.rt.fmt.MessageTag _jspx_th_fmt_005fmessage_005f22 = (org.apache.taglibs.standard.tag.rt.fmt.MessageTag) _005fjspx_005ftagPool_005ffmt_005fmessage_0026_005fkey_005fnobody.get(org.apache.taglibs.standard.tag.rt.fmt.MessageTag.class); + _jspx_th_fmt_005fmessage_005f22.setPageContext(_jspx_page_context); + _jspx_th_fmt_005fmessage_005f22.setParent(null); + // /WEB-INF/home.jsp(106,5) name = key type = null reqTime = true required = false fragment = false deferredValue = false expectedTypeName = null deferredMethod = false methodSignature = null + _jspx_th_fmt_005fmessage_005f22.setKey("quicklinks.updatingurls"); + int _jspx_eval_fmt_005fmessage_005f22 = _jspx_th_fmt_005fmessage_005f22.doStartTag(); + if (_jspx_th_fmt_005fmessage_005f22.doEndTag() == javax.servlet.jsp.tagext.Tag.SKIP_PAGE) { + return true; + } + _005fjspx_005ftagPool_005ffmt_005fmessage_0026_005fkey_005fnobody.reuse(_jspx_th_fmt_005fmessage_005f22); + return false; + } + + private boolean _jspx_meth_fmt_005fmessage_005f23(javax.servlet.jsp.PageContext _jspx_page_context) + throws java.lang.Throwable { + javax.servlet.jsp.PageContext pageContext = _jspx_page_context; + javax.servlet.jsp.JspWriter out = _jspx_page_context.getOut(); + // fmt:message + org.apache.taglibs.standard.tag.rt.fmt.MessageTag _jspx_th_fmt_005fmessage_005f23 = (org.apache.taglibs.standard.tag.rt.fmt.MessageTag) _005fjspx_005ftagPool_005ffmt_005fmessage_0026_005fkey_005fnobody.get(org.apache.taglibs.standard.tag.rt.fmt.MessageTag.class); + _jspx_th_fmt_005fmessage_005f23.setPageContext(_jspx_page_context); + _jspx_th_fmt_005fmessage_005f23.setParent(null); + // /WEB-INF/home.jsp(110,45) name = key type = null reqTime = true required = false fragment = false deferredValue = false expectedTypeName = null deferredMethod = false methodSignature = null + _jspx_th_fmt_005fmessage_005f23.setKey("quicklinks.link"); + int _jspx_eval_fmt_005fmessage_005f23 = _jspx_th_fmt_005fmessage_005f23.doStartTag(); + if (_jspx_th_fmt_005fmessage_005f23.doEndTag() == javax.servlet.jsp.tagext.Tag.SKIP_PAGE) { + return true; + } + _005fjspx_005ftagPool_005ffmt_005fmessage_0026_005fkey_005fnobody.reuse(_jspx_th_fmt_005fmessage_005f23); + return false; + } + + private boolean _jspx_meth_fmt_005fmessage_005f24(javax.servlet.jsp.PageContext _jspx_page_context) + throws java.lang.Throwable { + javax.servlet.jsp.PageContext pageContext = _jspx_page_context; + javax.servlet.jsp.JspWriter out = _jspx_page_context.getOut(); + // fmt:message + org.apache.taglibs.standard.tag.rt.fmt.MessageTag _jspx_th_fmt_005fmessage_005f24 = (org.apache.taglibs.standard.tag.rt.fmt.MessageTag) _005fjspx_005ftagPool_005ffmt_005fmessage_0026_005fkey_005fnobody.get(org.apache.taglibs.standard.tag.rt.fmt.MessageTag.class); + _jspx_th_fmt_005fmessage_005f24.setPageContext(_jspx_page_context); + _jspx_th_fmt_005fmessage_005f24.setParent(null); + // /WEB-INF/home.jsp(111,45) name = key type = null reqTime = true required = false fragment = false deferredValue = false expectedTypeName = null deferredMethod = false methodSignature = null + _jspx_th_fmt_005fmessage_005f24.setKey("quicklinks.createdon"); + int _jspx_eval_fmt_005fmessage_005f24 = _jspx_th_fmt_005fmessage_005f24.doStartTag(); + if (_jspx_th_fmt_005fmessage_005f24.doEndTag() == javax.servlet.jsp.tagext.Tag.SKIP_PAGE) { + return true; + } + _005fjspx_005ftagPool_005ffmt_005fmessage_0026_005fkey_005fnobody.reuse(_jspx_th_fmt_005fmessage_005f24); + return false; + } + + private boolean _jspx_meth_fmt_005fmessage_005f25(javax.servlet.jsp.PageContext _jspx_page_context) + throws java.lang.Throwable { + javax.servlet.jsp.PageContext pageContext = _jspx_page_context; + javax.servlet.jsp.JspWriter out = _jspx_page_context.getOut(); + // fmt:message + org.apache.taglibs.standard.tag.rt.fmt.MessageTag _jspx_th_fmt_005fmessage_005f25 = (org.apache.taglibs.standard.tag.rt.fmt.MessageTag) _005fjspx_005ftagPool_005ffmt_005fmessage_0026_005fkey_005fnobody.get(org.apache.taglibs.standard.tag.rt.fmt.MessageTag.class); + _jspx_th_fmt_005fmessage_005f25.setPageContext(_jspx_page_context); + _jspx_th_fmt_005fmessage_005f25.setParent(null); + // /WEB-INF/home.jsp(112,45) name = key type = null reqTime = true required = false fragment = false deferredValue = false expectedTypeName = null deferredMethod = false methodSignature = null + _jspx_th_fmt_005fmessage_005f25.setKey("quicklinks.isadmin"); + int _jspx_eval_fmt_005fmessage_005f25 = _jspx_th_fmt_005fmessage_005f25.doStartTag(); + if (_jspx_th_fmt_005fmessage_005f25.doEndTag() == javax.servlet.jsp.tagext.Tag.SKIP_PAGE) { + return true; + } + _005fjspx_005ftagPool_005ffmt_005fmessage_0026_005fkey_005fnobody.reuse(_jspx_th_fmt_005fmessage_005f25); + return false; + } + + private boolean _jspx_meth_fmt_005fmessage_005f26(javax.servlet.jsp.PageContext _jspx_page_context) + throws java.lang.Throwable { + javax.servlet.jsp.PageContext pageContext = _jspx_page_context; + javax.servlet.jsp.JspWriter out = _jspx_page_context.getOut(); + // fmt:message + org.apache.taglibs.standard.tag.rt.fmt.MessageTag _jspx_th_fmt_005fmessage_005f26 = (org.apache.taglibs.standard.tag.rt.fmt.MessageTag) _005fjspx_005ftagPool_005ffmt_005fmessage_0026_005fkey_005fnobody.get(org.apache.taglibs.standard.tag.rt.fmt.MessageTag.class); + _jspx_th_fmt_005fmessage_005f26.setPageContext(_jspx_page_context); + _jspx_th_fmt_005fmessage_005f26.setParent(null); + // /WEB-INF/home.jsp(113,45) name = key type = null reqTime = true required = false fragment = false deferredValue = false expectedTypeName = null deferredMethod = false methodSignature = null + _jspx_th_fmt_005fmessage_005f26.setKey("quicklinks.actions"); + int _jspx_eval_fmt_005fmessage_005f26 = _jspx_th_fmt_005fmessage_005f26.doStartTag(); + if (_jspx_th_fmt_005fmessage_005f26.doEndTag() == javax.servlet.jsp.tagext.Tag.SKIP_PAGE) { + return true; + } + _005fjspx_005ftagPool_005ffmt_005fmessage_0026_005fkey_005fnobody.reuse(_jspx_th_fmt_005fmessage_005f26); + return false; + } +} diff --git a/app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/api/CustomQueryApi.class b/app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/api/CustomQueryApi.class deleted file mode 100644 index f15665a..0000000 Binary files a/app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/api/CustomQueryApi.class and /dev/null differ diff --git a/app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/api/DataApi.class b/app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/api/DataApi.class deleted file mode 100644 index d83986d..0000000 Binary files a/app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/api/DataApi.class and /dev/null differ diff --git a/app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/api/DataModelApi.class b/app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/api/DataModelApi.class deleted file mode 100644 index 5bae6e5..0000000 Binary files a/app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/api/DataModelApi.class and /dev/null differ diff --git a/app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/api/SmartInfo.class b/app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/api/SmartInfo.class deleted file mode 100644 index a3d8e45..0000000 Binary files a/app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/api/SmartInfo.class and /dev/null differ diff --git a/app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/hibernate/SmartTable.class b/app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/hibernate/SmartTable.class deleted file mode 100644 index 84358f8..0000000 Binary files a/app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/hibernate/SmartTable.class and /dev/null differ diff --git a/app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/i18n/labels/IncidentLabelProvider.class b/app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/i18n/labels/IncidentLabelProvider.class deleted file mode 100644 index 6643fac..0000000 Binary files a/app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/i18n/labels/IncidentLabelProvider.class and /dev/null differ diff --git a/app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/i18n/labels/ObservationLabelProvider.class b/app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/i18n/labels/ObservationLabelProvider.class deleted file mode 100644 index 1ba981b..0000000 Binary files a/app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/i18n/labels/ObservationLabelProvider.class and /dev/null differ diff --git a/app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/i18n/labels/PatrolQueryLabelProvider$1.class b/app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/i18n/labels/PatrolQueryLabelProvider$1.class deleted file mode 100644 index e3f8792..0000000 Binary files a/app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/i18n/labels/PatrolQueryLabelProvider$1.class and /dev/null differ diff --git a/app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/i18n/labels/PatrolQueryLabelProvider.class b/app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/i18n/labels/PatrolQueryLabelProvider.class deleted file mode 100644 index afe759e..0000000 Binary files a/app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/i18n/labels/PatrolQueryLabelProvider.class and /dev/null differ diff --git a/app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/i18n/labels/SmartLabelProvider.class b/app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/i18n/labels/SmartLabelProvider.class deleted file mode 100644 index e93d33b..0000000 Binary files a/app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/i18n/labels/SmartLabelProvider.class and /dev/null differ diff --git a/app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/custom/CustomIncidentQueryEngine.class b/app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/custom/CustomIncidentQueryEngine.class deleted file mode 100644 index 3d83e2b..0000000 Binary files a/app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/custom/CustomIncidentQueryEngine.class and /dev/null differ diff --git a/app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/custom/CustomPatrolQueryEngine.class b/app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/custom/CustomPatrolQueryEngine.class deleted file mode 100644 index b497caf..0000000 Binary files a/app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/custom/CustomPatrolQueryEngine.class and /dev/null differ diff --git a/app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/custom/CustomQueryEngine.class b/app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/custom/CustomQueryEngine.class deleted file mode 100644 index fc39a8f..0000000 Binary files a/app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/custom/CustomQueryEngine.class and /dev/null differ diff --git a/app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/custom/CustomWaypointQueryEngine.class b/app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/custom/CustomWaypointQueryEngine.class deleted file mode 100644 index 7a72436..0000000 Binary files a/app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/custom/CustomWaypointQueryEngine.class and /dev/null differ diff --git a/app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/AbstractDbFeatureResultSet.class b/app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/AbstractDbFeatureResultSet.class deleted file mode 100644 index 0ce623c..0000000 Binary files a/app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/AbstractDbFeatureResultSet.class and /dev/null differ diff --git a/app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/PsqlFilterToSqlGenerator.class b/app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/PsqlFilterToSqlGenerator.class deleted file mode 100644 index 677f2be..0000000 Binary files a/app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/PsqlFilterToSqlGenerator.class and /dev/null differ diff --git a/app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/SummaryItemLabelProvider.class b/app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/SummaryItemLabelProvider.class deleted file mode 100644 index d50c9cf..0000000 Binary files a/app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/SummaryItemLabelProvider.class and /dev/null differ diff --git a/app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/WaypointQueryResult$2.class b/app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/WaypointQueryResult$2.class deleted file mode 100644 index 2726b9b..0000000 Binary files a/app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/WaypointQueryResult$2.class and /dev/null differ diff --git a/app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/WaypointQueryResult.class b/app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/WaypointQueryResult.class deleted file mode 100644 index b9ac263..0000000 Binary files a/app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/WaypointQueryResult.class and /dev/null differ diff --git a/app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/er/ErMissionQueryResult$4.class b/app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/er/ErMissionQueryResult$4.class deleted file mode 100644 index 720c51a..0000000 Binary files a/app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/er/ErMissionQueryResult$4.class and /dev/null differ diff --git a/app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/er/ErMissionQueryResult.class b/app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/er/ErMissionQueryResult.class deleted file mode 100644 index 3db8838..0000000 Binary files a/app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/er/ErMissionQueryResult.class and /dev/null differ diff --git a/app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/er/ErMissionTrackQueryResult$5.class b/app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/er/ErMissionTrackQueryResult$5.class deleted file mode 100644 index 153c1e1..0000000 Binary files a/app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/er/ErMissionTrackQueryResult$5.class and /dev/null differ diff --git a/app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/er/ErMissionTrackQueryResult.class b/app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/er/ErMissionTrackQueryResult.class deleted file mode 100644 index 36ce665..0000000 Binary files a/app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/er/ErMissionTrackQueryResult.class and /dev/null differ diff --git a/app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/observation/PsqlObsSummaryEngine.class b/app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/observation/PsqlObsSummaryEngine.class deleted file mode 100644 index 123d2ab..0000000 Binary files a/app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/observation/PsqlObsSummaryEngine.class and /dev/null differ diff --git a/app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/patrol/PatrolQueryResult$1.class b/app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/patrol/PatrolQueryResult$1.class deleted file mode 100644 index 8e3324c..0000000 Binary files a/app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/patrol/PatrolQueryResult$1.class and /dev/null differ diff --git a/app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/patrol/PatrolQueryResult.class b/app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/patrol/PatrolQueryResult.class deleted file mode 100644 index 5dff5b6..0000000 Binary files a/app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/patrol/PatrolQueryResult.class and /dev/null differ diff --git a/app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/patrol/PsqlPatrolSummaryEngine$1.class b/app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/patrol/PsqlPatrolSummaryEngine$1.class deleted file mode 100644 index fff6ec6..0000000 Binary files a/app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/patrol/PsqlPatrolSummaryEngine$1.class and /dev/null differ diff --git a/app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/patrol/PsqlPatrolSummaryEngine$2.class b/app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/patrol/PsqlPatrolSummaryEngine$2.class deleted file mode 100644 index 239cad8..0000000 Binary files a/app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/patrol/PsqlPatrolSummaryEngine$2.class and /dev/null differ diff --git a/app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/patrol/PsqlPatrolSummaryEngine.class b/app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/patrol/PsqlPatrolSummaryEngine.class deleted file mode 100644 index 8170b9b..0000000 Binary files a/app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/query/engine/patrol/PsqlPatrolSummaryEngine.class and /dev/null differ diff --git a/app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/servlet/UpgradeServlet.class b/app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/servlet/UpgradeServlet.class deleted file mode 100644 index e3c5484..0000000 Binary files a/app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/servlet/UpgradeServlet.class and /dev/null differ diff --git a/app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/servlet/VersionInfo.class b/app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/servlet/VersionInfo.class deleted file mode 100644 index d0b29ea..0000000 Binary files a/app/webapps/ROOT/WEB-INF/classes/org/wcs/smart/connect/servlet/VersionInfo.class and /dev/null differ diff --git a/app/webapps/ROOT/WEB-INF/classes/version.txt b/app/webapps/ROOT/WEB-INF/classes/version.txt deleted file mode 100644 index 5c5dcbd..0000000 --- a/app/webapps/ROOT/WEB-INF/classes/version.txt +++ /dev/null @@ -1,2 +0,0 @@ -version=7.5.3 -build.date=202211021519 \ No newline at end of file diff --git a/app/webapps/ROOT/WEB-INF/lib/org.eclipse.core.contenttype-3.8.200.jar b/app/webapps/ROOT/WEB-INF/lib/org.eclipse.core.contenttype-3.8.200.jar deleted file mode 100644 index 4c875d8..0000000 Binary files a/app/webapps/ROOT/WEB-INF/lib/org.eclipse.core.contenttype-3.8.200.jar and /dev/null differ diff --git a/app/webapps/ROOT/WEB-INF/lib/org.eclipse.core.jobs-3.13.100.jar b/app/webapps/ROOT/WEB-INF/lib/org.eclipse.core.jobs-3.13.100.jar deleted file mode 100644 index 8aaf63e..0000000 Binary files a/app/webapps/ROOT/WEB-INF/lib/org.eclipse.core.jobs-3.13.100.jar and /dev/null differ diff --git a/app/webapps/ROOT/WEB-INF/lib/org.eclipse.equinox.app-1.6.200.jar b/app/webapps/ROOT/WEB-INF/lib/org.eclipse.equinox.app-1.6.200.jar deleted file mode 100644 index ef34043..0000000 Binary files a/app/webapps/ROOT/WEB-INF/lib/org.eclipse.equinox.app-1.6.200.jar and /dev/null differ diff --git a/app/webapps/ROOT/WEB-INF/lib/org.eclipse.equinox.preferences-3.10.100.jar b/app/webapps/ROOT/WEB-INF/lib/org.eclipse.equinox.preferences-3.10.100.jar deleted file mode 100644 index f491de9..0000000 Binary files a/app/webapps/ROOT/WEB-INF/lib/org.eclipse.equinox.preferences-3.10.100.jar and /dev/null differ diff --git a/app/webapps/ROOT/WEB-INF/lib/org.wcs.smart.core.connect.dataqueue.cybertracker-7.5.3.jar b/app/webapps/ROOT/WEB-INF/lib/org.wcs.smart.core.connect.dataqueue.cybertracker-7.5.3.jar deleted file mode 100644 index 7975ff3..0000000 Binary files a/app/webapps/ROOT/WEB-INF/lib/org.wcs.smart.core.connect.dataqueue.cybertracker-7.5.3.jar and /dev/null differ diff --git a/app/webapps/ROOT/WEB-INF/lib/org.wcs.smart.core.connect.dataqueue.er-7.5.3.jar b/app/webapps/ROOT/WEB-INF/lib/org.wcs.smart.core.connect.dataqueue.er-7.5.3.jar deleted file mode 100644 index 4000720..0000000 Binary files a/app/webapps/ROOT/WEB-INF/lib/org.wcs.smart.core.connect.dataqueue.er-7.5.3.jar and /dev/null differ diff --git a/app/webapps/ROOT/WEB-INF/lib/org.wcs.smart.core.connect.dataqueue.i2-7.5.3.jar b/app/webapps/ROOT/WEB-INF/lib/org.wcs.smart.core.connect.dataqueue.i2-7.5.3.jar deleted file mode 100644 index 09a2776..0000000 Binary files a/app/webapps/ROOT/WEB-INF/lib/org.wcs.smart.core.connect.dataqueue.i2-7.5.3.jar and /dev/null differ diff --git a/app/webapps/ROOT/WEB-INF/lib/org.wcs.smart.core.connect.dataqueue.independentincident-7.5.3.jar b/app/webapps/ROOT/WEB-INF/lib/org.wcs.smart.core.connect.dataqueue.independentincident-7.5.3.jar deleted file mode 100644 index b0d13cf..0000000 Binary files a/app/webapps/ROOT/WEB-INF/lib/org.wcs.smart.core.connect.dataqueue.independentincident-7.5.3.jar and /dev/null differ diff --git a/app/webapps/ROOT/WEB-INF/lib/org.wcs.smart.core.connect.dataqueue.patrol-7.5.3.jar b/app/webapps/ROOT/WEB-INF/lib/org.wcs.smart.core.connect.dataqueue.patrol-7.5.3.jar deleted file mode 100644 index f727aa7..0000000 Binary files a/app/webapps/ROOT/WEB-INF/lib/org.wcs.smart.core.connect.dataqueue.patrol-7.5.3.jar and /dev/null differ diff --git a/app/webapps/ROOT/WEB-INF/lib/org.wcs.smart.core.cybertracker.incident-7.5.3.jar b/app/webapps/ROOT/WEB-INF/lib/org.wcs.smart.core.cybertracker.incident-7.5.3.jar deleted file mode 100644 index 006232d..0000000 Binary files a/app/webapps/ROOT/WEB-INF/lib/org.wcs.smart.core.cybertracker.incident-7.5.3.jar and /dev/null differ diff --git a/app/webapps/ROOT/WEB-INF/lib/org.wcs.smart.core.entity.query.report-7.5.3.jar b/app/webapps/ROOT/WEB-INF/lib/org.wcs.smart.core.entity.query.report-7.5.3.jar deleted file mode 100644 index a4cf9ec..0000000 Binary files a/app/webapps/ROOT/WEB-INF/lib/org.wcs.smart.core.entity.query.report-7.5.3.jar and /dev/null differ diff --git a/app/webapps/ROOT/WEB-INF/lib/org.wcs.smart.core.er-7.5.3.jar b/app/webapps/ROOT/WEB-INF/lib/org.wcs.smart.core.er-7.5.3.jar deleted file mode 100644 index bcc0ce3..0000000 Binary files a/app/webapps/ROOT/WEB-INF/lib/org.wcs.smart.core.er-7.5.3.jar and /dev/null differ diff --git a/app/webapps/ROOT/WEB-INF/lib/org.wcs.smart.core.i2.patrol-7.5.3.jar b/app/webapps/ROOT/WEB-INF/lib/org.wcs.smart.core.i2.patrol-7.5.3.jar deleted file mode 100644 index 7908ce0..0000000 Binary files a/app/webapps/ROOT/WEB-INF/lib/org.wcs.smart.core.i2.patrol-7.5.3.jar and /dev/null differ diff --git a/app/webapps/ROOT/WEB-INF/lib/org.wcs.smart.core.incident-7.5.3.jar b/app/webapps/ROOT/WEB-INF/lib/org.wcs.smart.core.incident-7.5.3.jar deleted file mode 100644 index 4c4d3b9..0000000 Binary files a/app/webapps/ROOT/WEB-INF/lib/org.wcs.smart.core.incident-7.5.3.jar and /dev/null differ diff --git a/app/webapps/ROOT/WEB-INF/lib/org.wcs.smart.core.observation-7.5.3.jar b/app/webapps/ROOT/WEB-INF/lib/org.wcs.smart.core.observation-7.5.3.jar deleted file mode 100644 index 9c78c1e..0000000 Binary files a/app/webapps/ROOT/WEB-INF/lib/org.wcs.smart.core.observation-7.5.3.jar and /dev/null differ diff --git a/app/webapps/ROOT/WEB-INF/lib/org.wcs.smart.core.observation.query-7.5.3.jar b/app/webapps/ROOT/WEB-INF/lib/org.wcs.smart.core.observation.query-7.5.3.jar deleted file mode 100644 index 8060c51..0000000 Binary files a/app/webapps/ROOT/WEB-INF/lib/org.wcs.smart.core.observation.query-7.5.3.jar and /dev/null differ diff --git a/app/webapps/ROOT/WEB-INF/lib/org.wcs.smart.core.observation.query.report-7.5.3.jar b/app/webapps/ROOT/WEB-INF/lib/org.wcs.smart.core.observation.query.report-7.5.3.jar deleted file mode 100644 index 7c831e1..0000000 Binary files a/app/webapps/ROOT/WEB-INF/lib/org.wcs.smart.core.observation.query.report-7.5.3.jar and /dev/null differ diff --git a/app/webapps/ROOT/WEB-INF/lib/org.wcs.smart.core.patrol.query-7.5.3.jar b/app/webapps/ROOT/WEB-INF/lib/org.wcs.smart.core.patrol.query-7.5.3.jar deleted file mode 100644 index b6c76ee..0000000 Binary files a/app/webapps/ROOT/WEB-INF/lib/org.wcs.smart.core.patrol.query-7.5.3.jar and /dev/null differ diff --git a/app/webapps/ROOT/WEB-INF/lib/org.wcs.smart.core.qa.incident-7.5.3.jar b/app/webapps/ROOT/WEB-INF/lib/org.wcs.smart.core.qa.incident-7.5.3.jar deleted file mode 100644 index cff84fc..0000000 Binary files a/app/webapps/ROOT/WEB-INF/lib/org.wcs.smart.core.qa.incident-7.5.3.jar and /dev/null differ diff --git a/app/webapps/ROOT/WEB-INF/lib/org.wcs.smart.core.smartcollect-7.5.3.jar b/app/webapps/ROOT/WEB-INF/lib/org.wcs.smart.core.smartcollect-7.5.3.jar deleted file mode 100644 index 4a6afd7..0000000 Binary files a/app/webapps/ROOT/WEB-INF/lib/org.wcs.smart.core.smartcollect-7.5.3.jar and /dev/null differ diff --git a/certbot-manager.sh b/certbot-manager.sh new file mode 100755 index 0000000..dcba022 --- /dev/null +++ b/certbot-manager.sh @@ -0,0 +1,63 @@ +#!/bin/sh +# +# This script manages the init and renewal of SSL certificates using Certbot with Cloudflare DNS. +# +# https://certbot-dns-cloudflare.readthedocs.io/en/stable/ +# https://eff-certbot.readthedocs.io/en/stable/using.html#certbot-commands + +echo "Starting Certbot Manager..." + +# Function to handle graceful shutdown +cleanup() { + echo "Shutting down certbot manager..." + exit 0 +} + +# Set up signal handling +trap cleanup TERM INT + +# Check if certificate exists, if not, create it +if [ ! -f /etc/letsencrypt/live/smartconnect.internal.yel.or.id/fullchain.pem ]; then + echo "No certificate found, obtaining initial certificate..." + + certbot certonly \ + --dns-cloudflare \ + --dns-cloudflare-credentials /root/.secrets/certbot/cloudflare.ini \ + --non-interactive --agree-tos --no-eff-email --keep-until-expiring \ + -m hendra@yel.or.id \ + -d smartconnect.internal.yel.or.id + + if [ $? -eq 0 ]; then + echo "Initial certificate obtained successfully!" + else + echo "Failed to obtain initial certificate!" + exit 1 + fi +else + echo "Certificate already exists, skipping initial acquisition." +fi + +# Start renewal loop +echo "Starting renewal monitoring..." +while true; do + echo "$(date): Checking for certificate renewal..." + + # Run certbot renew (only renews if needed) + certbot renew \ + --dns-cloudflare \ + --dns-cloudflare-credentials /root/.secrets/certbot/cloudflare.ini \ + --quiet \ + --deploy-hook "docker compose -f /root/sc/docker-compose.yml restart sc7" + + if [ $? -eq 0 ]; then + echo "$(date): Certificate renewal check completed successfully" + else + echo "$(date): Certificate renewal check failed" + fi + + echo "$(date): Sleeping for 12 hours..." + + # Sleep for 12 hours with signal handling + sleep 43200 & + wait $! +done \ No newline at end of file diff --git a/db/scdb_import.sql b/db/scdb_import.sql index 17040a5..7d41b59 100644 --- a/db/scdb_import.sql +++ b/db/scdb_import.sql @@ -1,33 +1,33 @@ --- SMART7 database preparation - --- 1) Create Specific User for SMARTConnect 7 with password -CREATE USER scadmin PASSWORD 'Sm@rtConnIX3'; - --- 2) Create DB for SMARTConnect 7 and make newly created user above as the owner -CREATE DATABASE yel_scdb WITH OWNER scadmin; - --- 3) Grant all privileges on database yel_scdb to scadmin -GRANT ALL PRIVILEGES ON DATABASE yel_scdb TO scadmin; - --- 4) Connect to SMART7 database -\c yel_scdb; - --- 5) install postgis extension -CREATE EXTENSION postgis; - --- 6) install uuid-ossp extension -CREATE EXTENSION "uuid-ossp"; - - -- GENERATES A SMART7 database from scratch -- requires: -- 1) postgis extension to be installed: CREATE EXTENSION postgis; +CREATE EXTENSION IF NOT EXISTS postgis; +CREATE EXTENSION IF NOT EXISTS postgis_topology; +CREATE EXTENSION IF NOT EXISTS fuzzystrmatch; +CREATE EXTENSION IF NOT EXISTS postgis_tiger_geocoder; + +-- Upgrade PostGIS (includes raster) +-- CREATE EXTENSION IF NOT EXISTS postgis VERSION '$POSTGIS_VERSION'; +-- ALTER EXTENSION postgis UPDATE TO '$POSTGIS_VERSION'; + +-- Upgrade Topology +-- CREATE EXTENSION IF NOT EXISTS postgis_topology VERSION '$POSTGIS_VERSION'; +-- ALTER EXTENSION postgis_topology UPDATE TO '$POSTGIS_VERSION'; + +-- Install Tiger dependencies in case not already installed +-- CREATE EXTENSION IF NOT EXISTS fuzzystrmatch; +-- Upgrade US Tiger Geocoder +-- CREATE EXTENSION IF NOT EXISTS postgis_tiger_geocoder VERSION '$POSTGIS_VERSION'; +-- ALTER EXTENSION postgis_tiger_geocoder UPDATE TO '$POSTGIS_VERSION'; + -- 2) uuid-ossp extension to be installed: CREATE EXTENSION "uuid-ossp"; + + CREATE SCHEMA connect; CREATE SCHEMA smart; CREATE SCHEMA query_temp; -CREATE EXTENSION postgis; +--CREATE EXTENSION postgis; CREATE EXTENSION "uuid-ossp"; CREATE OR REPLACE FUNCTION public.manage_user_roles() RETURNS TRIGGER AS $$ @@ -5620,4 +5620,117 @@ update connect.ca_plugin_version set version = '7.5.4' where plugin_id = 'org.wc --don't update the version as we are not deploying a new jar file --update connect.connect_version set version = '7.5.4', last_updated = now(); -update connect.connect_version set version = '7.5.3', filestore_version = '7.5.2', last_updated = now(); +update connect.connect_version set last_updated = now(); +select * from connect.connect_version; +update connect.connect_version set version = '7.5.3', filestore_version = '7.5.2'; + +-- 7.5.7 +with errors as ( +select a.uuid AS list_item_uuid, d.uuid AS correct_icon_uuid +from smart.dm_attribute_list a join smart.dm_attribute b on a.attribute_uuid = b.uuid +join smart.icon c on c.uuid = a.icon_uuid +LEFT JOIN smart.icon d ON d.keyid = c.keyid AND d.ca_uuid = b.ca_uuid +where b.ca_uuid != c.ca_uuid) +update smart.dm_attribute_list set icon_uuid = e.correct_icon_uuid +from errors e where e.list_item_uuid = smart.dm_attribute_list.uuid; + + +update smart.waypoint set last_modified_by = null where last_modified_by not in (select uuid from smart.employee); +alter table smart.waypoint add constraint wp_last_modified_by_fk foreign key (last_modified_by) references smart.employee(uuid); + + +CREATE TABLE smart.quicklink(uuid uuid not null, ca_uuid uuid not null, url varchar(32000), uiorder smallint, employee_uuid uuid, primary key (uuid) ); +ALTER TABLE smart.quicklink ADD FOREIGN KEY (ca_uuid) REFERENCES smart.conservation_area(uuid) on delete cascade on update restrict deferrable initially deferred; +ALTER TABLE smart.quicklink ADD FOREIGN KEY (employee_uuid) REFERENCES smart.employee(uuid) on delete cascade on update restrict deferrable initially deferred; +CREATE TRIGGER trg_quicklink AFTER INSERT OR UPDATE OR DELETE ON smart.quicklink FOR EACH ROW execute procedure connect.trg_changelog_common(); + +ALTER TABLE smart.configurable_model add column use_earth_ranger boolean default false; + +create table smart.incident_waypoint(wp_uuid uuid not null, patrol_uuid uuid, primary key (wp_uuid) ); +ALTER TABLE smart.incident_waypoint ADD FOREIGN KEY (wp_uuid) REFERENCES smart.waypoint(uuid) on delete cascade on update restrict deferrable initially deferred; +ALTER TABLE smart.incident_waypoint ADD FOREIGN KEY (patrol_uuid) REFERENCES smart.patrol(uuid) on delete cascade on update restrict deferrable initially deferred; + +CREATE OR REPLACE FUNCTION connect.trg_incident_waypoint() RETURNS trigger AS $$ + DECLARE + ROW RECORD; +BEGIN + IF (TG_OP = 'UPDATE' OR TG_OP = 'INSERT') THEN + ROW = NEW; + ELSIF (TG_OP = 'DELETE') THEN + ROW = OLD; + END IF; + INSERT INTO connect.change_log + (uuid, action, tablename, key1_fieldname, key1, key2_fieldname, key2_uuid, key2_str, ca_uuid) + SELECT uuid_generate_v4(), TG_OP, TG_TABLE_SCHEMA::TEXT || '.' || TG_TABLE_NAME::TEXT, 'wp_uuid', ROW.WP_UUID, 'patrol_uuid', ROW.patrol_uuid, null, wp.CA_UUID + FROM smart.waypoint wp WHERE wp.uuid = ROW.wp_uuid; + RETURN ROW; +END$$ LANGUAGE 'plpgsql'; + + +CREATE TRIGGER trg_incident_waypoint AFTER INSERT OR UPDATE OR DELETE ON smart.incident_waypoint FOR EACH ROW execute procedure connect.trg_incident_waypoint(); + +alter table smart.waypoint add column source_cm_uuid uuid; +alter table smart.waypoint add foreign key (source_cm_uuid) references smart.configurable_model(uuid) on delete set null on update restrict deferrable initially deferred; + +delete from smart.CT_INCIDENT_LINK where obs_group_uuid is not null and obs_group_uuid not in (select uuid from smart.WP_OBSERVATION_GROUP); +alter table smart.ct_incident_link add foreign key (obs_group_uuid) references smart.wp_observation_group on delete cascade on update restrict deferrable initially deferred; + + +ALTER TABLE smart.cm_node add column integrate_incident_type varchar(32); + +update connect.connect_plugin_version set version = '7.5' where plugin_id = 'org.wcs.smart.cybertracker'; +update connect.ca_plugin_version set version = '7.5' where plugin_id = 'org.wcs.smart.cybertracker'; + +update connect.connect_plugin_version set version = '7.5.7' where plugin_id = 'org.wcs.smart'; +update connect.ca_plugin_version set version = '7.5.7' where plugin_id = 'org.wcs.smart'; +update connect.connect_version set version = '7.5.7', last_updated = now(); + +-- This select triggers the docker healthchecker +select * from connect.connect_version; + +-- Begin SMART API Extensions +CREATE SCHEMA IF NOT EXISTS reporting + AUTHORIZATION postgres; + +GRANT ALL ON SCHEMA reporting TO postgres; + +CREATE OR REPLACE FUNCTION reporting.get_translations( + element uuid, + language uuid DEFAULT (current_setting('var.lang_uuid'::text))::uuid) + RETURNS text + LANGUAGE 'plpgsql' + COST 100 + STABLE STRICT PARALLEL UNSAFE +AS $BODY$ +declare + translated_text text; +begin + select i.value into translated_text from smart.i18n_label as i where i.element_uuid = element and i.language_uuid = language; + if translated_text is null then + -- get the translation for the default language + select i.value into translated_text from + smart.i18n_label as i + left join smart.language as l on i.language_uuid = l.uuid and l.isdefault = True + where i.element_uuid = element; + end if; + if translated_text is null then + return cast(element as text); + end if; + return translated_text; +end; +$BODY$; + +ALTER FUNCTION reporting.get_translations(uuid, uuid) + OWNER TO postgres; + +GRANT EXECUTE ON FUNCTION reporting.get_translations(uuid, uuid) TO PUBLIC; + +GRANT EXECUTE ON FUNCTION reporting.get_translations(uuid, uuid) TO postgres; + + + + +-- End SMART API Extensions + + +DO $$ begin raise notice 'Connect database setup'; end; $$; diff --git a/docker-compose.yml b/docker-compose.yml index 439a2bc..99eced4 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,31 +1,55 @@ services: - smartconnect7: - build: - context: . - args: - - CATALINA_HOME=${CATALINA_HOME} - - SC_PUBLISHED_HOST=${SC_PUBLISHED_HOST} - - SC_FILESTORE_LOCATION=${SC_FILESTORE_LOCATION} - - SC_SERVER_ADMIN=${SC_SERVER_ADMIN} - - POSTGRES_PASSWORD=${POSTGRES_PASSWORD} - - DNS_CLOUDFLARE_API_TOKEN=${DNS_CLOUDFLARE_API_TOKEN} + sc7: container_name: SMARTConnect7 - depends_on: - - pgsql-postgis + image: smartconnect7:latest + deploy: + resources: + limits: + cpus: '2.0' + memory: 8192M + reservations: + cpus: '1.0' + memory: 4096M volumes: - - catalina_home:${CATALINA_HOME} - - sc_filestore:${SC_FILESTORE_LOCATION} - - letsencrypt:/etc/letsencrypt + - catalina_home:/opt/tomcat9 + - filestore:/data/SMARTConnect + - cert:/etc/letsencrypt networks: - frontend - backend ports: - "8443:8443" + depends_on: + pgsql-postgis: + condition: service_healthy + restart: unless-stopped stdin_open: true tty: true + + certbot: + image: certbot/dns-cloudflare:latest + volumes: + - cert:/etc/letsencrypt + - ~/.secrets/certbot/cloudflare.ini:/root/.secrets/certbot/cloudflare.ini + - ./certbot-manager.sh:/certbot-manager.sh:ro + - /var/run/docker.sock:/var/run/docker.sock + - ./docker-compose.yml:/root/sc/docker-compose.yml + entrypoint: ["/bin/sh", "/certbot-manager.sh"] + networks: + - frontend + restart: unless-stopped + pgsql-postgis: container_name: pgsql-postgis image: postgis/postgis:11-2.5 + deploy: + resources: + limits: + cpus: '2.0' + memory: 8192M + reservations: + cpus: '1.0' + memory: 4096M environment: PGDATA: /pgdata POSTGRES_PASSWORD: ${POSTGRES_PASSWORD} @@ -36,8 +60,12 @@ services: - backend ports: - "5432:5432" - stdin_open: true - tty: true + restart: unless-stopped + healthcheck: + test: ["CMD-SHELL", "pg_isready -U postgres -d postgres"] + interval: 5s + timeout: 5s + retries: 5 networks: frontend: @@ -45,6 +73,6 @@ networks: volumes: catalina_home: - sc_filestore: - letsencrypt: + filestore: + cert: pgdata: \ No newline at end of file