mirror of
https://github.com/apache/struts.git
synced 2026-08-06 07:06:58 +00:00
Lukasz Lenart
0a8b111e36
* WW-5537 fix(core): resolve classloader/memory leaks during Tomcat hot deployment Introduce InternalDestroyable interface with container-based discovery to clean up static caches, daemon threads, and shared references that pin the webapp classloader after undeploy. This prevents OutOfMemoryError (Metaspace) on repeated hot deployments. Changes: - Add InternalDestroyable/ContextAwareDestroyable interfaces for cleanup hooks - Clear OGNL, Component, ScopeInterceptor, DefaultFileManager static caches - Stop FinalizableReferenceQueue daemon thread and null its classloader - Clear FreeMarker template/introspection caches from ServletContext - Replace ContainerHolder ThreadLocal with volatile to prevent thread-pool leaks - Clear static dispatcherListeners list on Dispatcher cleanup - Add JSONCacheDestroyable for json plugin cache cleanup - Register all destroyables via struts-beans.xml / struts-plugin.xml Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com> * WW-5537 chore(showcase): add log4j-web for proper Log4j2 lifecycle in Servlet container Without log4j-web, Log4j2 SoftReferences delay classloader GC after undeploy. The log4j-web module provides Log4jServletContextListener which ensures proper Log4j2 shutdown during ServletContext destruction. Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com> * WW-5537 fix(core): use ThreadLocal with generation counter in ContainerHolder Replace the volatile shared reference with a ThreadLocal backed by a volatile generation counter. Per-request clear() only affects the current thread (safe for concurrent requests and tests). On undeploy, invalidateAll() advances the generation counter so idle pool threads detect staleness on next access and self-clear, preventing classloader leaks without breaking test isolation. Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com> --------- Co-authored-by: Claude Opus 4.6 <noreply@anthropic.com>
267 lines
9.1 KiB
XML
267 lines
9.1 KiB
XML
<?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/maven-v4_0_0.xsd">
|
|
<modelVersion>4.0.0</modelVersion>
|
|
<parent>
|
|
<groupId>org.apache.struts</groupId>
|
|
<artifactId>struts2-apps</artifactId>
|
|
<version>6.9.0-SNAPSHOT</version>
|
|
</parent>
|
|
|
|
<artifactId>struts2-showcase</artifactId>
|
|
<packaging>war</packaging>
|
|
<name>Struts 2 Showcase Webapp</name>
|
|
|
|
<profiles>
|
|
<profile>
|
|
<id>hostedqa</id>
|
|
<properties>
|
|
<resourceId>12</resourceId>
|
|
<suiteId>9</suiteId>
|
|
<clientConfigs>8</clientConfigs>
|
|
<appConfigs>7</appConfigs>
|
|
</properties>
|
|
</profile>
|
|
</profiles>
|
|
<dependencies>
|
|
<dependency>
|
|
<groupId>org.apache.struts</groupId>
|
|
<artifactId>struts2-config-browser-plugin</artifactId>
|
|
</dependency>
|
|
|
|
<dependency>
|
|
<groupId>org.apache.struts</groupId>
|
|
<artifactId>struts2-sitemesh-plugin</artifactId>
|
|
</dependency>
|
|
|
|
<dependency>
|
|
<groupId>org.apache.struts</groupId>
|
|
<artifactId>struts2-tiles-plugin</artifactId>
|
|
</dependency>
|
|
|
|
<dependency>
|
|
<groupId>org.apache.struts</groupId>
|
|
<artifactId>struts2-dwr-plugin</artifactId>
|
|
</dependency>
|
|
|
|
<dependency>
|
|
<groupId>org.apache.struts</groupId>
|
|
<artifactId>struts2-json-plugin</artifactId>
|
|
</dependency>
|
|
|
|
<dependency>
|
|
<groupId>org.apache.struts</groupId>
|
|
<artifactId>struts2-convention-plugin</artifactId>
|
|
</dependency>
|
|
|
|
<dependency>
|
|
<groupId>org.apache.struts</groupId>
|
|
<artifactId>struts2-spring-plugin</artifactId>
|
|
</dependency>
|
|
|
|
<dependency>
|
|
<groupId>org.apache.struts</groupId>
|
|
<artifactId>struts2-bean-validation-plugin</artifactId>
|
|
</dependency>
|
|
|
|
<dependency>
|
|
<groupId>org.apache.struts</groupId>
|
|
<artifactId>struts2-async-plugin</artifactId>
|
|
</dependency>
|
|
|
|
<dependency>
|
|
<groupId>org.apache.struts</groupId>
|
|
<artifactId>struts2-velocity-plugin</artifactId>
|
|
</dependency>
|
|
|
|
<dependency>
|
|
<groupId>org.apache.struts</groupId>
|
|
<artifactId>struts2-xslt-plugin</artifactId>
|
|
</dependency>
|
|
|
|
<dependency>
|
|
<groupId>javax.servlet</groupId>
|
|
<artifactId>javax.servlet-api</artifactId>
|
|
<scope>provided</scope>
|
|
</dependency>
|
|
|
|
<!-- Logging -->
|
|
<dependency>
|
|
<groupId>org.apache.logging.log4j</groupId>
|
|
<artifactId>log4j-api</artifactId>
|
|
</dependency>
|
|
<dependency>
|
|
<groupId>org.apache.logging.log4j</groupId>
|
|
<artifactId>log4j-core</artifactId>
|
|
</dependency>
|
|
<dependency>
|
|
<groupId>org.apache.logging.log4j</groupId>
|
|
<artifactId>log4j-jcl</artifactId>
|
|
</dependency>
|
|
<dependency>
|
|
<groupId>org.apache.logging.log4j</groupId>
|
|
<artifactId>log4j-slf4j-impl</artifactId>
|
|
</dependency>
|
|
<dependency>
|
|
<groupId>org.apache.logging.log4j</groupId>
|
|
<artifactId>log4j-web</artifactId>
|
|
</dependency>
|
|
|
|
<dependency>
|
|
<groupId>opensymphony</groupId>
|
|
<artifactId>sitemesh</artifactId>
|
|
</dependency>
|
|
<dependency>
|
|
<groupId>org.directwebremoting</groupId>
|
|
<artifactId>dwr</artifactId>
|
|
</dependency>
|
|
|
|
<dependency>
|
|
<groupId>junit</groupId>
|
|
<artifactId>junit</artifactId>
|
|
<scope>test</scope>
|
|
</dependency>
|
|
|
|
<dependency>
|
|
<groupId>org.assertj</groupId>
|
|
<artifactId>assertj-core</artifactId>
|
|
<scope>test</scope>
|
|
</dependency>
|
|
|
|
<dependency>
|
|
<groupId>net.sourceforge.htmlunit</groupId>
|
|
<artifactId>htmlunit</artifactId>
|
|
<scope>test</scope>
|
|
</dependency>
|
|
|
|
<!-- BeanValidation Example -->
|
|
<dependency>
|
|
<groupId>org.hibernate.validator</groupId>
|
|
<artifactId>hibernate-validator</artifactId>
|
|
<version>${hibernate-validator.version}</version>
|
|
</dependency>
|
|
|
|
</dependencies>
|
|
|
|
<build>
|
|
<plugins>
|
|
<plugin>
|
|
<groupId>org.apache.maven.plugins</groupId>
|
|
<artifactId>maven-failsafe-plugin</artifactId>
|
|
<version>3.5.5</version>
|
|
<configuration>
|
|
<includes>
|
|
<include>it.org.apache.struts2.showcase.*Test</include>
|
|
</includes>
|
|
<systemPropertyVariables>
|
|
<http.port>8090</http.port>
|
|
</systemPropertyVariables>
|
|
</configuration>
|
|
<executions>
|
|
<execution>
|
|
<id>integration-test</id>
|
|
<goals>
|
|
<goal>integration-test</goal>
|
|
</goals>
|
|
</execution>
|
|
<execution>
|
|
<id>verify</id>
|
|
<goals>
|
|
<goal>verify</goal>
|
|
</goals>
|
|
</execution>
|
|
</executions>
|
|
</plugin>
|
|
<plugin>
|
|
<groupId>org.eclipse.jetty</groupId>
|
|
<artifactId>jetty-maven-plugin</artifactId>
|
|
<version>9.4.46.v20220331</version>
|
|
<configuration>
|
|
<stopKey>CTRL+C</stopKey>
|
|
<stopPort>8999</stopPort>
|
|
<systemProperties>
|
|
<systemProperty>
|
|
<name>slf4j</name>
|
|
<value>false</value>
|
|
</systemProperty>
|
|
</systemProperties>
|
|
<httpConnector>
|
|
<port>8090</port>
|
|
</httpConnector>
|
|
<scanIntervalSeconds>10</scanIntervalSeconds>
|
|
<webAppSourceDirectory>${basedir}/src/main/webapp/</webAppSourceDirectory>
|
|
<webAppConfig>
|
|
<contextPath>/struts2-showcase</contextPath>
|
|
<descriptor>${basedir}/src/main/webapp/WEB-INF/web.xml</descriptor>
|
|
</webAppConfig>
|
|
</configuration>
|
|
<executions>
|
|
<execution>
|
|
<id>start-jetty</id>
|
|
<phase>pre-integration-test</phase>
|
|
<goals>
|
|
<!-- stop any previous instance to free up the port -->
|
|
<goal>stop</goal>
|
|
<goal>start</goal>
|
|
</goals>
|
|
</execution>
|
|
<execution>
|
|
<id>stop-jetty</id>
|
|
<phase>post-integration-test</phase>
|
|
<goals>
|
|
<goal>stop</goal>
|
|
</goals>
|
|
</execution>
|
|
</executions>
|
|
</plugin>
|
|
|
|
<plugin>
|
|
<artifactId>maven-surefire-plugin</artifactId>
|
|
<configuration>
|
|
<argLine>@{argLine}</argLine>
|
|
<excludes>
|
|
<exclude>it/**</exclude>
|
|
<exclude>**/*$*</exclude>
|
|
</excludes>
|
|
</configuration>
|
|
</plugin>
|
|
</plugins>
|
|
|
|
<resources>
|
|
<!-- Include resources under src/main/java in WEB-INF/classes -->
|
|
<resource>
|
|
<directory>src/main/resources</directory>
|
|
</resource>
|
|
<resource>
|
|
<directory>src/main/java</directory>
|
|
<includes>
|
|
<include>**/*.java</include>
|
|
</includes>
|
|
</resource>
|
|
</resources>
|
|
|
|
</build>
|
|
<properties>
|
|
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
|
|
</properties>
|
|
</project>
|