You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by re...@apache.org on 2020/06/25 13:02:28 UTC
[tomcat] branch 9.0.x updated (dd35fd4 -> 1094d17)
This is an automated email from the ASF dual-hosted git repository.
remm pushed a change to branch 9.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git.
from dd35fd4 Make sure recycle() is called once the Stream is closed
new 9eec670 Delete AOT Maven packaging from 9
new 1094d17 Update Graal documentation to reflect changes
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
res/tomcat-maven/Dockerfile | 56 ----------------
res/tomcat-maven/DockerfileGraal | 40 ------------
res/tomcat-maven/README.md | 88 -------------------------
res/tomcat-maven/graal-webapp.ant.xml | 50 --------------
res/tomcat-maven/pom.xml | 111 --------------------------------
res/tomcat-maven/tomcat-jni.json | 7 --
res/tomcat-maven/tomcat-reflection.json | 51 ---------------
res/tomcat-maven/tomcat-resource.json | 82 -----------------------
res/tomcat-maven/tomcat.yaml | 36 -----------
webapps/docs/graal.xml | 70 +++++++++++++-------
10 files changed, 48 insertions(+), 543 deletions(-)
delete mode 100644 res/tomcat-maven/Dockerfile
delete mode 100644 res/tomcat-maven/DockerfileGraal
delete mode 100644 res/tomcat-maven/README.md
delete mode 100644 res/tomcat-maven/graal-webapp.ant.xml
delete mode 100644 res/tomcat-maven/pom.xml
delete mode 100644 res/tomcat-maven/tomcat-jni.json
delete mode 100644 res/tomcat-maven/tomcat-reflection.json
delete mode 100644 res/tomcat-maven/tomcat-resource.json
delete mode 100644 res/tomcat-maven/tomcat.yaml
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org
[tomcat] 02/02: Update Graal documentation to reflect changes
Posted by re...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
remm pushed a commit to branch 9.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit 1094d17cfbdfbbc635582fd133612e4b5907ea7d
Author: remm <re...@apache.org>
AuthorDate: Thu Jun 25 14:57:54 2020 +0200
Update Graal documentation to reflect changes
---
webapps/docs/graal.xml | 70 ++++++++++++++++++++++++++++++++++----------------
1 file changed, 48 insertions(+), 22 deletions(-)
diff --git a/webapps/docs/graal.xml b/webapps/docs/graal.xml
index 0d9535f..442ba22 100644
--- a/webapps/docs/graal.xml
+++ b/webapps/docs/graal.xml
@@ -35,7 +35,7 @@
<section name="Introduction">
<p>
- Tomcat supports using the GraalVM Native Image tool to produce
+ Tomcat supports using the GraalVM/Mandrel Native Image tool to produce
a native binary including the container. This documentation page
describes the build process of such an image.
</p>
@@ -49,21 +49,31 @@
the process will use the Maven shade plugin JAR packaging (fat JAR). The
idea is to produce a single JAR that contains all necessary classes from
Tomcat, the webapps and all additional dependencies. Although Tomcat has
- received compatibility fixes to support GraalVM native images, any library
+ received compatibility fixes to support native images, any library
may not be compatible and may require replacement code (the GraalVM
documentation has more details about this).
</p>
<p>
- Download and install GraalVM. The first step is then to add the
- native-image tool.
- <source>export JAVA_HOME=/absolute...path...to/graalvm-ce-javaX-x.y.z
+ Download and install GraalVM or Mandrel.
+ </p>
+
+ <p>
+ If using GraalVM, the first step is then to add the Native Image tool.
+ <source>export JAVA_HOME=/absolute...path...to/graalvm-ce-javaX-x.y.z
cd $JAVA_HOME/bin
./gu install native-image</source>
- Download the Tomcat Maven packaging from
- https://github.com/apache/tomcat/tree/master/res/tomcat-maven and place
- all the files in a folder (named tomcat-maven in this documentation.
- <source>export TOMCAT_MAVEN=/absolute...path...to/tomcat-maven</source>
+ Mandrel already includes the Native Image tool ready to use, so this
+ step can be skipped. Only JAVA_HOME must be set to the mandrelJDK folder,
+ such as:
+ <source>export JAVA_HOME=/absolute...path...to/mandrel-javaXX-platform-x.x.x.x</source>
+ </p>
+
+ <p>
+ Download the Tomcat Stuffed module from
+ https://github.com/apache/tomcat/tree/master/modules/stuffed and place
+ all the files in a folder <code>stuffed</code> in this documentation.
+ <source>export TOMCAT_STUFFED=/absolute...path...to/stuffed</source>
The build process now requires both Ant and Maven.
</p>
@@ -72,7 +82,7 @@ cd $JAVA_HOME/bin
<section name="Packaging and Building">
<p>
- Inside the tomcat-maven folder, the directory structure is the same as for
+ Inside the tomcat-stuffed folder, the directory structure is the same as for
regular Tomcat. The main configuration files are placed in the conf folder,
and if using the default server.xml the webapps are placed in the webapps
folder.
@@ -81,14 +91,28 @@ cd $JAVA_HOME/bin
<p>
The first step is to build the fat Tomcat JAR with all dependencies.
Any JSP in the webapp must all be precompiled and packaged.
- <source>cd $TOMCAT_MAVEN
+ <source>cd $TOMCAT_STUFFED
mvn package
-ant -Dwebapp.name=somewebapp -f graal-webapp.ant.xml</source>
+ant -Dwebapp.name=somewebapp -f webapp-jspc.ant.xml</source>
Dependencies for the webapp should now be added to the main pom.xml,
following with building the complete fat JAR.
<source>mvn package</source>
</p>
+ <p>
+ As it is best to avoid using reflection whenever possible with Ahead of
+ Time compilation, it can be a good idea to generate and compile Tomcat
+ Embedded code out of the main server.xml configuration as well as the
+ context.xml files used to configure the contexts.
+ <source>$JAVA_HOME/bin/java\
+ -Dcatalina.base=. -Djava.util.logging.config.file=conf/logging.properties\
+ -jar target/tomcat-stuffed-1.0.jar --catalina -generateCode src/main/java
+mvn package</source>
+ The rest of the process described here will assume this step was done and
+ the <code>--catalina -useGeneratedCode</code> arguments are added to the
+ command lines. If this was not the case, they should be removed.
+ </p>
+
</section>
<section name="Native image configuration">
@@ -103,9 +127,9 @@ ant -Dwebapp.name=somewebapp -f graal-webapp.ant.xml</source>
<p>
Run the GraalVM substrate VM using the trace agent:
<source>$JAVA_HOME/bin/java\
- -agentlib:native-image-agent=config-output-dir=$TOMCAT_MAVEN/target/\
+ -agentlib:native-image-agent=config-output-dir=$TOMCAT_STUFFED/target/\
-Dcatalina.base=. -Djava.util.logging.config.file=conf/logging.properties\
- -jar target/tomcat-maven-1.0.jar</source>
+ -jar target/tomcat-stuffed-1.0.jar --catalina -useGeneratedCode</source>
</p>
<p>
@@ -136,18 +160,18 @@ ant -Dwebapp.name=somewebapp -f graal-webapp.ant.xml</source>
--initialize-at-build-time=org.eclipse.jdt,org.apache.el.parser.SimpleNode,javax.servlet.jsp.JspFactory,org.apache.jasper.servlet.JasperInitializer,org.apache.jasper.runtime.JspFactoryImpl\
-H:+JNI -H:+ReportUnsupportedElementsAtRuntime\
-H:+ReportExceptionStackTraces -H:EnableURLProtocols=http,https,jar,jrt\
- -H:ConfigurationFileDirectories=$TOMCAT_MAVEN/target/\
- -H:ReflectionConfigurationFiles=$TOMCAT_MAVEN/tomcat-reflection.json\
- -H:ResourceConfigurationFiles=$TOMCAT_MAVEN/tomcat-resource.json\
- -H:JNIConfigurationFiles=$TOMCAT_MAVEN/tomcat-jni.json\
- -jar $TOMCAT_MAVEN/target/tomcat-maven-1.0.jar</source>
+ -H:ConfigurationFileDirectories=$TOMCAT_STUFFED/target/\
+ -H:ReflectionConfigurationFiles=$TOMCAT_STUFFED/tomcat-reflection.json\
+ -H:ResourceConfigurationFiles=$TOMCAT_STUFFED/tomcat-resource.json\
+ -H:JNIConfigurationFiles=$TOMCAT_STUFFED/tomcat-jni.json\
+ -jar $TOMCAT_STUFFED/target/tomcat-stuffed-1.0.jar</source>
The additional <code>--static</code> parameter enables static linking of
glibc, zlib and libstd++ in the generated binary.
</p>
<p>
Running the native image is then:
- <source>./tomcat-maven-1.0 -Dcatalina.base=. -Djava.util.logging.config.file=conf/logging.properties</source>
+ <source>./tomcat-stuffed-1.0 -Dcatalina.base=. -Djava.util.logging.config.file=conf/logging.properties --catalina -useGeneratedCode</source>
</p>
</section>
@@ -176,9 +200,11 @@ ant -Dwebapp.name=somewebapp -f graal-webapp.ant.xml</source>
<p>
Missing items for better Tomcat functionality:
<ul>
- <li>Java serialization: Clustering and session persistence are not
+ <li><a href="https://github.com/oracle/graal/issues/460">Java
+ serialization</a>: Clustering and session persistence are not
functional</li>
- <li>JMX: The usual monitoring and management is not usable</li>
+ <li><a href="https://github.com/oracle/graal/issues/2103">JMX</a>:
+ The usual monitoring and management is not usable</li>
<li>java.util.logging LogManager: Configuration through a system property
is not implemented, so standard java.util.logging must be used instead
of JULI</li>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org
[tomcat] 01/02: Delete AOT Maven packaging from 9
Posted by re...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
remm pushed a commit to branch 9.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit 9eec670512e044b0dc7f9e943375cf882e88e430
Author: remm <re...@apache.org>
AuthorDate: Thu Jun 25 15:00:25 2020 +0200
Delete AOT Maven packaging from 9
For now, it doesn't need separate duplicate instructions and
configuration, so no need to not use it from trunk.
---
res/tomcat-maven/Dockerfile | 56 ----------------
res/tomcat-maven/DockerfileGraal | 40 ------------
res/tomcat-maven/README.md | 88 -------------------------
res/tomcat-maven/graal-webapp.ant.xml | 50 --------------
res/tomcat-maven/pom.xml | 111 --------------------------------
res/tomcat-maven/tomcat-jni.json | 7 --
res/tomcat-maven/tomcat-reflection.json | 51 ---------------
res/tomcat-maven/tomcat-resource.json | 82 -----------------------
res/tomcat-maven/tomcat.yaml | 36 -----------
9 files changed, 521 deletions(-)
diff --git a/res/tomcat-maven/Dockerfile b/res/tomcat-maven/Dockerfile
deleted file mode 100644
index 512f232..0000000
--- a/res/tomcat-maven/Dockerfile
+++ /dev/null
@@ -1,56 +0,0 @@
-# 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.
-
-FROM openjdk:8-jre-alpine
-VOLUME /tmp
-
-USER root
-RUN mkdir -m 777 -p /deployments
-
-ADD target/tomcat-maven-1.0.jar /deployments/app.jar
-ADD conf /deployments/conf
-ADD webapps /deployments/webapps
-RUN chmod 777 /deployments/webapps
-
-WORKDIR /deployments
-
-ARG namespace=tomcat
-ENV KUBERNETES_NAMESPACE=$namespace
-ARG port=8080
-EXPOSE $port
-
-ENV JAVA_OPTS="-Dcatalina.base=. -Djava.security.egd=file:/dev/urandom"
-
-# Add JULI logging configuration
-ENV JAVA_OPTS="${JAVA_OPTS} -Djava.util.logging.manager=org.apache.juli.ClassLoaderLogManager -Djava.util.logging.config.file=conf/logging.properties"
-
-RUN sh -c 'touch app.jar'
-
-RUN mkdir -p /opt
-
-# Optional: Add Jolokia agent for JMX monitoring and management
-# RUN mkdir /opt/jolokia && wget https://repo.maven.apache.org/maven2/org/jolokia/jolokia-jvm/1.6.2/jolokia-jvm-1.6.2-agent.jar -O /opt/jolokia/jolokia.jar
-# ARG jolokiaport=8778
-# ENV JAVA_OPTS="-javaagent:/opt/jolokia/jolokia.jar=host=*,port=$jolokiaport,protocol=https,authIgnoreCerts=true ${JAVA_OPTS}"
-# EXPOSE $jolokiaport
-
-# Optional: Add Prometheus agent for JMX monitoring
-# RUN mkdir /opt/prometheus && wget https://repo.maven.apache.org/maven2/io/prometheus/jmx/jmx_prometheus_javaagent/0.12.0/jmx_prometheus_javaagent-0.12.0.jar -O /opt/prometheus/prometheus.jar && wget https://raw.githubusercontent.com/prometheus/jmx_exporter/master/example_configs/tomcat.yml -O conf/prometheus.yaml
-# ARG prometheusport=9404
-# ENV JAVA_OPTS="-javaagent:/opt/prometheus/prometheus.jar=$prometheusport:conf/prometheus.yaml ${JAVA_OPTS}"
-# EXPOSE $prometheusport
-
-ENTRYPOINT [ "sh", "-c", "java $JAVA_OPTS -jar app.jar" ]
diff --git a/res/tomcat-maven/DockerfileGraal b/res/tomcat-maven/DockerfileGraal
deleted file mode 100644
index b801aa3..0000000
--- a/res/tomcat-maven/DockerfileGraal
+++ /dev/null
@@ -1,40 +0,0 @@
-# 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.
-
-FROM busybox:glibc
-
-VOLUME /tmp
-
-USER root
-RUN mkdir -m 777 -p /deployments
-
-ADD tomcat-maven-1.0 /deployments/app
-ADD conf /deployments/conf
-ADD webapps /deployments/webapps
-
-WORKDIR /deployments
-
-ARG namespace=tomcat
-ENV KUBERNETES_NAMESPACE=$namespace
-ARG port=8080
-EXPOSE $port
-
-ENV JAVA_OPTS="-Dcatalina.base=. -Djava.security.egd=file:/dev/urandom"
-
-# Add JULI logging configuration
-ENV JAVA_OPTS="${JAVA_OPTS} -Djava.util.logging.manager=org.apache.juli.ClassLoaderLogManager -Djava.util.logging.config.file=conf/logging.properties"
-
-ENTRYPOINT [ "sh", "-c", "/deployments/app $JAVA_OPTS" ]
diff --git a/res/tomcat-maven/README.md b/res/tomcat-maven/README.md
deleted file mode 100644
index b5e54f7..0000000
--- a/res/tomcat-maven/README.md
+++ /dev/null
@@ -1,88 +0,0 @@
-<!--
-
- 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 distribution for Apache Maven
-
-## Configuration
-
-Configuration is located in `conf/server.xml`, `conf/web.xml`, `conf/logging.properties`, all other configuration files, resources and context files are located in `conf`, identical to standalone Tomcat.
-
-## Building
-
-### Maven build
-
-Update Tomcat version number in the `pom.xml`, customize Tomcat components in the dependencies to keep the ones needed (only the main `tomcat-catalina` is mandatory). Custom Tomcat components sources can be added to the usual Maven build path and will be included in the package that is built.
-```
-mvn clean; mvn package
-```
-
-### Docker build
-
-```
-docker build -t apache/tomcat-maven:1.0 -f ./Dockerfile .
-```
-Docker build arguments include `namepsace` (default is `tomcat`) and `port` which should match the Tomcat port in `server.xml` (default is `8080`). Other ports that need to be exposed can be added in the `Dockerfile` as needed. Webapps should be added to the `webapps` folder where they will be auto deployed by the host if using the defaults. Otherwise, the `Dockerfile` command line can be edited like below to include the necesary resources and command line arguments to run a single or mu [...]
-
-## Running
-
-Add a webapp as folder mywebapp (for this example, or specify another path), or a path from which a configured Host will auto deploy
-```
---path: Specify a path the wepapp will use
---war: Add the spcified path (directory or war) as a webapp (if no path has been specified, it will be the root webapp)
-```
-
-The JULI logging manager configuration is optional but makes logging more readable and configurable:
-`-Djava.util.logging.manager=org.apache.juli.ClassLoaderLogManager -Djava.util.logging.config.file=conf/logging.properties`
-The default JULI configuration uses `catalina.base`, so specifying the system property with `-Dcatalina.base=.` is also useful.
-
-### Command line example with a single root webapp
-
-```
-java -Dcatalina.base=. -Djava.util.logging.manager=org.apache.juli.ClassLoaderLogManager -Djava.util.logging.config.file=conf/logging.properties -jar target/tomcat-maven-1.0.jar --war myrootwebapp
-```
-
-### Command line example with three webapps
-
-```
-java -Dcatalina.base=. -Djava.util.logging.manager=org.apache.juli.ClassLoaderLogManager -Djava.util.logging.config.file=conf/logging.properties -jar target/tomcat-maven-1.0.jar --war myrootwebapp --path /path1 --war mywebapp1 --path /path2 --war mywebapp2
-```
-
-## Cloud
-
-### Deployment
-
-An example `tomcat.yaml` is included which uses the Docker image. It uses the health check valve which can be added in `conf/server.xml`, or a similar service responding to requests on `/health`. It also declares the optional Jolokia and Prometheus ports for monitoring.
-
-### Cluster
-
-If using the Kubernetes cloud clustering membership provider, the pod needs to have the permission to view other pods. For exemple with Openshift, this is done with:
-```
-oc policy add-role-to-user view system:serviceaccount:$(oc project -q):default -n $(oc project -q)
-```
-
-## Native Image
-
-The Tomcat documentation includes information on using the native-image tool (docs/graal.html).
-
-Running in a container is possible, an example `DockerfileGraal` is given. To use a native image in a container that is not identical to the build platform,
-the `native-image` call will need to use the additional `--static` parameter to statically link base libraries (this will then require zlib and glibc
-static libraries). Due to TLS using dynamic libraries (SunEC for JSSE and tomcat-native for OpenSSL), TLS support is not available with static linking.
-If TLS support is needed, the native image must instead be built on a platform identical to the target platform.
diff --git a/res/tomcat-maven/graal-webapp.ant.xml b/res/tomcat-maven/graal-webapp.ant.xml
deleted file mode 100644
index 8a0d502..0000000
--- a/res/tomcat-maven/graal-webapp.ant.xml
+++ /dev/null
@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- 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.
--->
-<project name="Webapp packaging for GraalVM" default="package" basedir=".">
-
- <property name="webapp.name" value="examples" />
-
- <typedef name="jasper" classname="org.apache.jasper.JspC">
- <classpath>
- <fileset file="${basedir}/target/tomcat-maven-1.0.jar" />
- <fileset dir="${basedir}/webapps/${webapp.name}/WEB-INF/lib" includes="*.jar" erroronmissingdir="false" />
- </classpath>
- </typedef>
-
- <target name="package">
-
- <!-- Will contain the webapp classes -->
- <mkdir dir="${basedir}/src/main/java" />
- <mkdir dir="${basedir}/src/main/resources" />
-
- <!-- JSP precompilation -->
- <jasper validateXml="false" package="${webapp.name}.org.apache.jsp"
- uriroot="${basedir}/webapps/${webapp.name}"
- webXml="${basedir}/webapps/${webapp.name}/WEB-INF/tomcat-web.xml"
- outputDir="${basedir}/src/main/java" />
- <!-- Copy all webapp classes to the mvn compile location -->
- <copy todir="${basedir}/src/main/java">
- <fileset dir="${basedir}/webapps/${webapp.name}/WEB-INF/classes" includes="**/*.java" erroronmissingdir="false" />
- </copy>
- <copy todir="${basedir}/src/main/resources">
- <fileset dir="${basedir}/webapps/${webapp.name}/WEB-INF/classes" includes="**/*.properties" erroronmissingdir="false" />
- </copy>
-
- </target>
-
-</project>
\ No newline at end of file
diff --git a/res/tomcat-maven/pom.xml b/res/tomcat-maven/pom.xml
deleted file mode 100644
index 5ba522d..0000000
--- a/res/tomcat-maven/pom.xml
+++ /dev/null
@@ -1,111 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- 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.
--->
-<project xmlns="http://maven.apache.org/POM/4.0.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
- http://maven.apache.org/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
-
- <groupId>org.apache.tomcat</groupId>
- <artifactId>tomcat-maven</artifactId>
- <version>1.0</version>
- <packaging>jar</packaging>
-
- <properties>
- <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <mainClass>org.apache.catalina.startup.Tomcat</mainClass>
- <tomcat.version>9.0.33</tomcat.version>
- </properties>
-
- <dependencies>
- <dependency>
- <groupId>org.apache.tomcat</groupId>
- <artifactId>tomcat-catalina</artifactId>
- <version>${tomcat.version}</version>
- </dependency>
- <!-- Optional: Jasper -->
- <dependency>
- <groupId>org.apache.tomcat</groupId>
- <artifactId>tomcat-jasper</artifactId>
- <version>${tomcat.version}</version>
- </dependency>
- <!-- Optional: Clustering -->
- <dependency>
- <groupId>org.apache.tomcat</groupId>
- <artifactId>tomcat-catalina-ha</artifactId>
- <version>${tomcat.version}</version>
- </dependency>
- <!-- Optional: Websockets -->
- <dependency>
- <groupId>org.apache.tomcat</groupId>
- <artifactId>tomcat-websocket</artifactId>
- <version>${tomcat.version}</version>
- </dependency>
- <!-- Optional: DBCP based pool -->
- <dependency>
- <groupId>org.apache.tomcat</groupId>
- <artifactId>tomcat-dbcp</artifactId>
- <version>${tomcat.version}</version>
- </dependency>
- <!-- Optional: Store configuration listener -->
- <dependency>
- <groupId>org.apache.tomcat</groupId>
- <artifactId>tomcat-storeconfig</artifactId>
- <version>${tomcat.version}</version>
- </dependency>
- </dependencies>
-
- <build>
- <plugins>
- <!-- Build any extra classes for your custom Tomcat components if needed -->
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <version>3.8.1</version>
- <configuration>
- <source>1.8</source>
- <target>1.8</target>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-shade-plugin</artifactId>
- <version>3.2.1</version>
- <executions>
- <execution>
- <phase>package</phase>
- <goals>
- <goal>shade</goal>
- </goals>
- <configuration>
- <createDependencyReducedPom>false</createDependencyReducedPom>
- <transformers>
- <transformer implementation="org.apache.maven.plugins.shade.resource.AppendingTransformer">
- <resource>META-INF/services/javax.servlet.ServletContainerInitializer</resource>
- </transformer>
- <transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
- <mainClass>${mainClass}</mainClass>
- </transformer>
- </transformers>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
-</project>
diff --git a/res/tomcat-maven/tomcat-jni.json b/res/tomcat-maven/tomcat-jni.json
deleted file mode 100644
index a72c482..0000000
--- a/res/tomcat-maven/tomcat-jni.json
+++ /dev/null
@@ -1,7 +0,0 @@
-[
-{ "name":"org.apache.tomcat.jni.Error" },
-{ "name":"org.apache.tomcat.jni.FileInfo" },
-{ "name":"org.apache.tomcat.jni.Sockaddr" },
-{ "name":"org.apache.tomcat.jni.SSL", "methods":[{"name":"newSSL","parameterTypes":["long","boolean"]}] },
-{ "name":"java.lang.String", "methods":[{"name":"<init>","parameterTypes":["byte[]"]},{"name":"getBytes","parameterTypes":[]}] }
-]
diff --git a/res/tomcat-maven/tomcat-reflection.json b/res/tomcat-maven/tomcat-reflection.json
deleted file mode 100644
index 00478e0..0000000
--- a/res/tomcat-maven/tomcat-reflection.json
+++ /dev/null
@@ -1,51 +0,0 @@
-[
-{ "name":"java.lang.Object" },
-{ "name":"javax.servlet.http.HttpServlet" },
-{ "name":"org.apache.catalina.AccessLog" },
-{ "name":"org.apache.catalina.AsyncDispatcher" },
-{ "name":"org.apache.catalina.Authenticator" },
-{ "name":"org.apache.catalina.Cluster" },
-{ "name":"org.apache.catalina.Container" },
-{ "name":"org.apache.catalina.Contained" },
-{ "name":"org.apache.catalina.Context" },
-{ "name":"org.apache.catalina.CredentialHandler" },
-{ "name":"org.apache.catalina.DistributedManager" },
-{ "name":"org.apache.catalina.Engine" },
-{ "name":"org.apache.catalina.Executor" },
-{ "name":"org.apache.catalina.Group" },
-{ "name":"org.apache.catalina.Host" },
-{ "name":"org.apache.catalina.JmxEnabled" },
-{ "name":"org.apache.catalina.Lifecycle" },
-{ "name":"org.apache.catalina.LifecycleListener" },
-{ "name":"org.apache.catalina.Loader" },
-{ "name":"org.apache.catalina.Manager" },
-{ "name":"org.apache.catalina.Pipeline" },
-{ "name":"org.apache.catalina.Realm" },
-{ "name":"org.apache.catalina.Role" },
-{ "name":"org.apache.catalina.Server" },
-{ "name":"org.apache.catalina.Service" },
-{ "name":"org.apache.catalina.Session" },
-{ "name":"org.apache.catalina.SessionIdGenerator" },
-{ "name":"org.apache.catalina.SessionListener" },
-{ "name":"org.apache.catalina.Store" },
-{ "name":"org.apache.catalina.StoreManager" },
-{ "name":"org.apache.catalina.User" },
-{ "name":"org.apache.catalina.UserDatabase" },
-{ "name":"org.apache.catalina.Valve" },
-{ "name":"org.apache.catalina.WebResource" },
-{ "name":"org.apache.catalina.WebResourceRoot" },
-{ "name":"org.apache.catalina.WebResourceSet" },
-{ "name":"org.apache.catalina.Wrapper" },
-{ "name":"org.apache.catalina.tribes.Channel" },
-{ "name":"org.apache.catalina.tribes.MembershipService" },
-{ "name":"org.apache.coyote.UpgradeProtocol" },
-{ "name":"com.sun.org.apache.xerces.internal.jaxp.SAXParserFactoryImpl", "methods" : [{"name": "<init>","parameterTypes":[]}] },
-{ "name":"com.sun.org.apache.xerces.internal.jaxp.DocumentBuilderFactoryImpl", "methods" : [{"name": "<init>","parameterTypes":[]}] },
-{ "name":"org.apache.catalina.authenticator.jaspic.AuthConfigFactoryImpl", "methods" : [{"name": "<init>","parameterTypes":[]}] },
-{ "name":"org.apache.el.ExpressionFactoryImpl", "methods" : [{"name":"<init>","parameterTypes":[]}] },
-{ "name":"org.apache.naming.factory.EjbFactory", "methods" : [{"name": "<init>","parameterTypes":[]}] },
-{ "name":"org.apache.naming.factory.ResourceEnvFactory", "methods" : [{"name": "<init>","parameterTypes":[]}] },
-{ "name":"org.apache.naming.factory.ResourceFactory", "methods" : [{"name": "<init>","parameterTypes":[]}] },
-{ "name":"org.apache.naming.factory.TransactionFactory", "methods" : [{"name": "<init>","parameterTypes":[]}] },
-{ "name":"org.apache.tomcat.websocket.server.WsHttpUpgradeHandler", "methods" : [{"name": "<init>","parameterTypes":[] }] }
-]
diff --git a/res/tomcat-maven/tomcat-resource.json b/res/tomcat-maven/tomcat-resource.json
deleted file mode 100644
index 7b541d1..0000000
--- a/res/tomcat-maven/tomcat-resource.json
+++ /dev/null
@@ -1,82 +0,0 @@
-{
- "bundles":[
- {"name":"javax.el.LocalStrings"},
- {"name":"javax.servlet.LocalStrings"},
- {"name":"javax.servlet.http.LocalStrings"},
- {"name":"org.apache.catalina.authenticator.LocalStrings"},
- {"name":"org.apache.catalina.authenticator.jaspic.LocalStrings"},
- {"name":"org.apache.catalina.connector.LocalStrings"},
- {"name":"org.apache.catalina.core.LocalStrings"},
- {"name":"org.apache.catalina.deploy.LocalStrings"},
- {"name":"org.apache.catalina.filters.LocalStrings"},
- {"name":"org.apache.catalina.ha.authenticator.LocalStrings"},
- {"name":"org.apache.catalina.ha.backend.LocalStrings"},
- {"name":"org.apache.catalina.ha.context.LocalStrings"},
- {"name":"org.apache.catalina.ha.deploy.LocalStrings"},
- {"name":"org.apache.catalina.ha.session.LocalStrings"},
- {"name":"org.apache.catalina.ha.tcp.LocalStrings"},
- {"name":"org.apache.catalina.loader.LocalStrings"},
- {"name":"org.apache.catalina.manager.LocalStrings"},
- {"name":"org.apache.catalina.manager.host.LocalStrings"},
- {"name":"org.apache.catalina.mapper.LocalStrings"},
- {"name":"org.apache.catalina.mbeans.LocalStrings"},
- {"name":"org.apache.catalina.realm.LocalStrings"},
- {"name":"org.apache.catalina.security.LocalStrings"},
- {"name":"org.apache.catalina.servlets.LocalStrings"},
- {"name":"org.apache.catalina.session.LocalStrings"},
- {"name":"org.apache.catalina.startup.LocalStrings"},
- {"name":"org.apache.catalina.storeconfig.LocalStrings"},
- {"name":"org.apache.catalina.tribes.group.LocalStrings"},
- {"name":"org.apache.catalina.tribes.group.interceptors.LocalStrings"},
- {"name":"org.apache.catalina.tribes.io.LocalStrings"},
- {"name":"org.apache.catalina.tribes.jmx.LocalStrings"},
- {"name":"org.apache.catalina.tribes.membership.LocalStrings"},
- {"name":"org.apache.catalina.tribes.membership.cloud.LocalStrings"},
- {"name":"org.apache.catalina.tribes.tipis.LocalStrings"},
- {"name":"org.apache.catalina.tribes.transport.LocalStrings"},
- {"name":"org.apache.catalina.tribes.transport.bio.LocalStrings"},
- {"name":"org.apache.catalina.tribes.transport.nio.LocalStrings"},
- {"name":"org.apache.catalina.tribes.util.LocalStrings"},
- {"name":"org.apache.catalina.users.LocalStrings"},
- {"name":"org.apache.catalina.util.LocalStrings"},
- {"name":"org.apache.catalina.valves.LocalStrings"},
- {"name":"org.apache.catalina.valves.rewrite.LocalStrings"},
- {"name":"org.apache.catalina.webresources.LocalStrings"},
- {"name":"org.apache.coyote.LocalStrings"},
- {"name":"org.apache.coyote.http11.LocalStrings"},
- {"name":"org.apache.coyote.http11.filters.LocalStrings"},
- {"name":"org.apache.coyote.http11.upgrade.LocalStrings"},
- {"name":"org.apache.coyote.http2.LocalStrings"},
- {"name":"org.apache.el.Messages"},
- {"name":"org.apache.jasper.resources.LocalStrings"},
- {"name":"org.apache.naming.LocalStrings"},
- {"name":"org.apache.naming.factory.LocalStrings"},
- {"name":"org.apache.naming.factory.webservices.LocalStrings"},
- {"name":"org.apache.tomcat.dbcp.dbcp2.LocalStrings"},
- {"name":"org.apache.tomcat.util.LocalStrings"},
- {"name":"org.apache.tomcat.util.buf.LocalStrings"},
- {"name":"org.apache.tomcat.util.codec.binary.LocalStrings"},
- {"name":"org.apache.tomcat.util.compat.LocalStrings"},
- {"name":"org.apache.tomcat.util.descriptor.LocalStrings"},
- {"name":"org.apache.tomcat.util.descriptor.tld.LocalStrings"},
- {"name":"org.apache.tomcat.util.descriptor.web.LocalStrings"},
- {"name":"org.apache.tomcat.util.digester.LocalStrings"},
- {"name":"org.apache.tomcat.util.http.LocalStrings"},
- {"name":"org.apache.tomcat.util.http.parser.LocalStrings"},
- {"name":"org.apache.tomcat.util.json.LocalStrings"},
- {"name":"org.apache.tomcat.util.modeler.LocalStrings"},
- {"name":"org.apache.tomcat.util.net.LocalStrings"},
- {"name":"org.apache.tomcat.util.scan.LocalStrings"},
- {"name":"org.apache.tomcat.util.security.LocalStrings"},
- {"name":"org.apache.tomcat.util.threads.res.LocalStrings"},
- {"name":"org.apache.tomcat.websocket.LocalStrings"},
- {"name":"org.apache.tomcat.websocket.pojo.LocalStrings"},
- {"name":"org.apache.tomcat.websocket.server.LocalStrings"}
- ],
- "resources":[
- {"pattern":".*/mbeans-descriptors.xml$"},
- {"pattern":".*/*.properties$"},
- {"pattern":".*/*.dtd$"},
- {"pattern":".*/*.xsd$"}
- ]
-}
diff --git a/res/tomcat-maven/tomcat.yaml b/res/tomcat-maven/tomcat.yaml
deleted file mode 100644
index 9f115eb..0000000
--- a/res/tomcat-maven/tomcat.yaml
+++ /dev/null
@@ -1,36 +0,0 @@
-kind: Deployment
-apiVersion: extensions/v1beta1
-metadata:
- name: tomcat
- creationTimestamp:
- labels:
- run: tomcat
-spec:
- replicas: 1
- selector:
- matchLabels:
- run: tomcat
- template:
- metadata:
- creationTimestamp:
- labels:
- run: tomcat
- spec:
- containers:
- - name: tomcat
- image: apache/tomcat-maven:1.0
- ports:
- - containerPort: 8080
- - containerPort: 8778
- name: jolokia
- - containerPort: 9404
- name: prometheus
- readinessProbe:
- httpGet:
- path: /health
- port: 8080
- initialDelaySeconds: 3
- periodSeconds: 3
- resources: {}
- strategy: {}
-status: {}
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org