This is an automated email from the ASF dual-hosted git repository.
remm pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/tomcat-maven-plugin.git
The following commit(s) were added to refs/heads/trunk by this push:
new e447995 Simplify
e447995 is described below
commit e447995d9eca7f2f5d49f4da39e822c55279a7bf
Author: remm <[email protected]>
AuthorDate: Tue Apr 14 16:04:12 2026 +0200
Simplify
Fix minor path bugs and strings.
Drop some dependencies (logging).
---
pom.xml | 43 ++--------------------
.../apache/tomcat/maven/runner/TomcatRunner.java | 38 -------------------
.../tomcat/maven/runner/TomcatRunnerCli.java | 9 -----
src/site/apt/executable-war-jar.apt.vm | 2 -
.../maven/it/AbstractSimpleWarProjectIT.java | 4 --
.../maven/it/AbstractTomcatRunMultiConfigIT.java | 3 +-
.../tomcat/maven/it/AbstractWarProjectIT.java | 18 ++++-----
.../tomcat/maven/it/TomcatRunMultiConfigIT.java | 2 +-
.../tomcat/maven/it/TomcatSimpleWarProjectIT.java | 2 +-
.../src/main/tomcatconf/server.xml | 2 +-
.../src/main/tomcatconf/server.xml | 2 +-
src/test/resources/log4j2-test.xml | 36 ------------------
.../src/main/tomcatconf/server.xml | 6 +--
src/test/resources/tomcat-run-multi-config/pom.xml | 6 +--
14 files changed, 25 insertions(+), 148 deletions(-)
diff --git a/pom.xml b/pom.xml
index ba99c77..496f797 100644
--- a/pom.xml
+++ b/pom.xml
@@ -59,9 +59,7 @@
<it.sleep.time>2000</it.sleep.time>
<verifier.maven.debug>false</verifier.maven.debug>
<verifier.debugJvm>false</verifier.debugJvm>
- <maven.resources.escapeString>\</maven.resources.escapeString>
- <distributionReleaseUrl>
-
https://repository.apache.org/service/local/staging/deploy/maven2</distributionReleaseUrl>
+
<distributionReleaseUrl>https://repository.apache.org/service/local/staging/deploy/maven2</distributionReleaseUrl>
<distributionSnapshotsUrl>
https://repository.apache.org/content/repositories/snapshots</distributionSnapshotsUrl>
@@ -88,11 +86,9 @@
<!-- to prevent isssues with last apache parent pom -->
<arguments />
- <tomcat-maven.siteFilePath>
-
${user.home}/tomcat-maven-plugin-${project.version}/</tomcat-maven.siteFilePath>
+
<tomcat-maven.siteFilePath>${user.home}/tomcat-maven-plugin-${project.version}/</tomcat-maven.siteFilePath>
<tomcat-maven.siteUrlDeployment>file://${tomcat-maven.siteFilePath}</tomcat-maven.siteUrlDeployment>
- <tomcat-maven.scmPubCheckoutDirectory>
-
${user.home}/tomcat-maven-plugin-${project.version}-content</tomcat-maven.scmPubCheckoutDirectory>
+
<tomcat-maven.scmPubCheckoutDirectory>${user.home}/tomcat-maven-plugin-${project.version}-content</tomcat-maven.scmPubCheckoutDirectory>
<managerWebAppPath>${basedir}/target/</managerWebAppPath>
</properties>
@@ -527,8 +523,7 @@
</goals>
<configuration>
<target>
- <unzip src="src/test/manager.war"
- dest="${managerWebAppPath}" />
+ <unzip src="src/test/manager.war"
dest="${managerWebAppPath}" />
</target>
</configuration>
</execution>
@@ -591,16 +586,6 @@
<artifactId>maven-core</artifactId>
<version>${mavenVersion}</version>
<scope>provided</scope>
- <exclusions>
- <exclusion>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-jdk14</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-nop</artifactId>
- </exclusion>
- </exclusions>
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
@@ -652,26 +637,6 @@
<artifactId>httpclient</artifactId>
<version>4.5.14</version>
</dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
- <version>2.0.17</version>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>jcl-over-slf4j</artifactId>
- <version>2.0.17</version>
- </dependency>
- <dependency>
- <groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j-core</artifactId>
- <version>2.25.4</version>
- </dependency>
- <dependency>
- <groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j-slf4j-impl</artifactId>
- <version>2.25.4</version>
- </dependency>
<dependency>
<groupId>org.apache.tomcat.embed</groupId>
diff --git a/src/main/java/org/apache/tomcat/maven/runner/TomcatRunner.java
b/src/main/java/org/apache/tomcat/maven/runner/TomcatRunner.java
index 7ad26f6..14fa46a 100644
--- a/src/main/java/org/apache/tomcat/maven/runner/TomcatRunner.java
+++ b/src/main/java/org/apache/tomcat/maven/runner/TomcatRunner.java
@@ -136,11 +136,6 @@ public class TomcatRunner
PasswordUtil.deobfuscateSystemProps();
- if ( loggerName != null && loggerName.length() > 0 )
- {
- installLogger( loggerName );
- }
-
this.extractDirectoryFile = new File( this.extractDirectory );
debugMessage( "use extractDirectory:" + extractDirectoryFile.getPath()
);
@@ -741,39 +736,6 @@ public class TomcatRunner
return Boolean.parseBoolean( runtimeProperties.getProperty(
ENABLE_NAMING_KEY, Boolean.FALSE.toString() ) );
}
- private void installLogger( String loggerName )
- throws SecurityException, NoSuchMethodException,
IllegalArgumentException, IllegalAccessException,
- InvocationTargetException
- {
- if ( "slf4j".equals( loggerName ) )
- {
-
- try
- {
- // Check class is available
-
- //final Class<?> clazz = Class.forName(
"org.slf4j.bridge.SLF4JBridgeHandler" );
- final Class<?> clazz =
- Thread.currentThread().getContextClassLoader().loadClass(
"org.slf4j.bridge.SLF4JBridgeHandler" );
-
- // Remove all JUL handlers
- java.util.logging.LogManager.getLogManager().reset();
-
- // Install slf4j bridge handler
- final Method method = clazz.getMethod( "install" );
- method.invoke( null );
- }
- catch ( ClassNotFoundException e )
- {
- System.out.println( "WARNING: issue configuring slf4j jul
bridge, skip it" );
- }
- }
- else
- {
- System.out.println( "WARNING: loggerName " + loggerName + " not
supported, skip it" );
- }
- }
-
private Properties loadProperties( File file ) throws IOException
{
Properties properties = new Properties();
diff --git a/src/main/java/org/apache/tomcat/maven/runner/TomcatRunnerCli.java
b/src/main/java/org/apache/tomcat/maven/runner/TomcatRunnerCli.java
index 28e135f..9f95e48 100644
--- a/src/main/java/org/apache/tomcat/maven/runner/TomcatRunnerCli.java
+++ b/src/main/java/org/apache/tomcat/maven/runner/TomcatRunnerCli.java
@@ -88,9 +88,6 @@ public class TomcatRunnerCli
static Option extractDirectory = OptionBuilder.withArgName(
"extractDirectory" ).hasArg().withDescription(
"path to extract war content, default value: .extract" ).create(
"extractDirectory" );
- static Option loggerName = OptionBuilder.withArgName( "loggerName"
).hasArg().withDescription(
- "logger to use: slf4j to use slf4j bridge on top of jul" ).create(
"loggerName" );
-
static Option uriEncoding = OptionBuilder.withArgName( "uriEncoding"
).hasArg().withDescription(
"connector uriEncoding default ISO-8859-1" ).create( "uriEncoding" );
@@ -111,7 +108,6 @@ public class TomcatRunnerCli
.addOption( keyAlias ) //
.addOption( obfuscate ) //
.addOption( extractDirectory ) //
- .addOption( loggerName ) //
.addOption( uriEncoding ) //
.addOption( maxPostSize );
}
@@ -219,11 +215,6 @@ public class TomcatRunnerCli
tomcatRunner.extractDirectory = line.getOptionValue(
extractDirectory.getOpt() );
}
- if ( line.hasOption( loggerName.getOpt() ) )
- {
- tomcatRunner.loggerName = line.getOptionValue( loggerName.getOpt()
);
- }
-
if ( line.hasOption( uriEncoding.getOpt() ) )
{
tomcatRunner.uriEncoding = line.getOptionValue(
uriEncoding.getOpt() );
diff --git a/src/site/apt/executable-war-jar.apt.vm
b/src/site/apt/executable-war-jar.apt.vm
index d3fee4f..c930a12 100644
--- a/src/site/apt/executable-war-jar.apt.vm
+++ b/src/site/apt/executable-war-jar.apt.vm
@@ -167,8 +167,6 @@ usage: java -jar [path to your exec war jar]
-httpsPort <httpsPort> https port to use
-maxPostSize <maxPostSize> max post size in bytes to use
-keyAlias <keyAlias> alias from keystore for ssl
- -loggerName <loggerName> logger to use: slf4j to use slf4j
- bridge on top of jul
-obfuscate <password> obfuscate the password and exit
-resetExtract clean previous extract directory
-serverXmlPath <serverXmlPath> server.xml to use, optional
diff --git
a/src/test/java/org/apache/tomcat/maven/it/AbstractSimpleWarProjectIT.java
b/src/test/java/org/apache/tomcat/maven/it/AbstractSimpleWarProjectIT.java
index 8f180b0..6a4780e 100644
--- a/src/test/java/org/apache/tomcat/maven/it/AbstractSimpleWarProjectIT.java
+++ b/src/test/java/org/apache/tomcat/maven/it/AbstractSimpleWarProjectIT.java
@@ -22,8 +22,6 @@ package org.apache.tomcat.maven.it;
import org.apache.maven.it.VerificationException;
import org.junit.Test;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
import java.io.File;
@@ -37,7 +35,6 @@ import static org.junit.Assert.assertTrue;
public abstract class AbstractSimpleWarProjectIT
extends AbstractWarProjectIT
{
- protected Logger logger = LoggerFactory.getLogger( getClass() );
@Override
protected String getWebappUrl()
@@ -62,7 +59,6 @@ public abstract class AbstractSimpleWarProjectIT
assertTrue( "Tomcat folder should exist in target folder of project at
" + webappHome,
new File( webappHome, "target/tomcat" ).exists() );
- logger.info( "Error Free Log check" );
verifier.verifyErrorFreeLog();
verifyConnectorsStarted();
}
diff --git
a/src/test/java/org/apache/tomcat/maven/it/AbstractTomcatRunMultiConfigIT.java
b/src/test/java/org/apache/tomcat/maven/it/AbstractTomcatRunMultiConfigIT.java
index 794137d..99580a5 100644
---
a/src/test/java/org/apache/tomcat/maven/it/AbstractTomcatRunMultiConfigIT.java
+++
b/src/test/java/org/apache/tomcat/maven/it/AbstractTomcatRunMultiConfigIT.java
@@ -25,6 +25,7 @@ import org.junit.Test;
import java.io.File;
import java.net.URI;
import java.net.URISyntaxException;
+import java.util.logging.Level;
import static junitx.framework.StringAssert.assertContains;
import static org.junit.Assert.assertNotNull;
@@ -56,7 +57,7 @@ public abstract class AbstractTomcatRunMultiConfigIT
}
catch ( URISyntaxException e )
{
- logger.error( "An exception occurred.", e );
+ logger.log(Level.SEVERE, "An exception occurred.", e );
return "http://localhost:"; + getHttpItPort() + "/multi-config";
}
}
diff --git a/src/test/java/org/apache/tomcat/maven/it/AbstractWarProjectIT.java
b/src/test/java/org/apache/tomcat/maven/it/AbstractWarProjectIT.java
index 905bef0..410e26f 100644
--- a/src/test/java/org/apache/tomcat/maven/it/AbstractWarProjectIT.java
+++ b/src/test/java/org/apache/tomcat/maven/it/AbstractWarProjectIT.java
@@ -33,13 +33,13 @@ import org.apache.maven.it.Verifier;
import org.apache.maven.it.util.ResourceExtractor;
import org.junit.After;
import org.junit.Before;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
import java.io.File;
import java.io.IOException;
import java.util.Collections;
import java.util.List;
+import java.util.logging.Level;
+import java.util.logging.Logger;
/**
* Base class for all tests which have a war-project using the
tomcat-maven-plugin below project-resources.
@@ -48,7 +48,7 @@ import java.util.List;
*/
public abstract class AbstractWarProjectIT
{
- protected Logger logger = LoggerFactory.getLogger( getClass() );
+ protected Logger logger = Logger.getLogger( getClass().getName() );
/**
* This URL will be queried for content. It will also be used to wait for
the startup of the webapp.
@@ -164,27 +164,27 @@ public abstract class AbstractWarProjectIT
{
while ( pingUrl() != 200 && currentTime < endTime )
{
- logger.debug( "Ping..." );
+ logger.fine( "Ping..." );
Thread.sleep( 500 );
currentTime = System.currentTimeMillis();
}
if ( currentTime < endTime )
{
responseBody = getResponseBody();
- logger.debug( "Received: " + responseBody );
+ logger.fine( "Received: " + responseBody );
}
else
{
- logger.error( "Timeout met while trying to access web
application." );
+ logger.severe( "Timeout met while trying to access web
application." );
}
}
catch ( IOException e )
{
- logger.error( "Exception while trying to access web application.",
e );
+ logger.log(Level.SEVERE, "Exception while trying to access web
application.", e );
}
catch ( InterruptedException e )
{
- logger.error( "Exception while trying to access web application.",
e );
+ logger.log(Level.SEVERE, "Exception while trying to access web
application.", e );
}
return responseBody;
}
@@ -211,7 +211,7 @@ public abstract class AbstractWarProjectIT
}
catch ( IOException e )
{
- logger.debug( "Ignoring exception while pinging URL " +
httpHead.getURI(), e );
+ logger.log(Level.FINE, "Ignoring exception while pinging URL " +
httpHead.getURI(), e );
return -1;
}
}
diff --git
a/src/test/java/org/apache/tomcat/maven/it/TomcatRunMultiConfigIT.java
b/src/test/java/org/apache/tomcat/maven/it/TomcatRunMultiConfigIT.java
index 7f12020..4a863dd 100644
--- a/src/test/java/org/apache/tomcat/maven/it/TomcatRunMultiConfigIT.java
+++ b/src/test/java/org/apache/tomcat/maven/it/TomcatRunMultiConfigIT.java
@@ -32,6 +32,6 @@ public class TomcatRunMultiConfigIT
{
verifier.verifyTextInLog("INFO: Starting ProtocolHandler [\"http-nio-"
+ getHttpItPort() + "\"]");
verifier.verifyTextInLog("INFO: Starting ProtocolHandler [\"http-nio-"
+ getHttpsItPort() + "\"]");
- verifier.verifyTextInLog("INFO: Starting ProtocolHandler [\"ajp-bio-"
+ getAjpItPort() + "\"]");
+ verifier.verifyTextInLog("INFO: Starting ProtocolHandler
[\"ajp-nio-127.0.0.1-" + getAjpItPort() + "\"]");
}
}
diff --git
a/src/test/java/org/apache/tomcat/maven/it/TomcatSimpleWarProjectIT.java
b/src/test/java/org/apache/tomcat/maven/it/TomcatSimpleWarProjectIT.java
index f87a8f5..90adbd3 100644
--- a/src/test/java/org/apache/tomcat/maven/it/TomcatSimpleWarProjectIT.java
+++ b/src/test/java/org/apache/tomcat/maven/it/TomcatSimpleWarProjectIT.java
@@ -37,6 +37,6 @@ public class TomcatSimpleWarProjectIT
{
verifier.verifyTextInLog("INFO: Starting ProtocolHandler [\"http-nio-"
+ getHttpItPort() + "\"]");
- verifier.verifyTextInLog( "INFO: Starting ProtocolHandler
[\"ajp-bio-"+ getAjpItPort() +"\"]" );
+ verifier.verifyTextInLog( "INFO: Starting ProtocolHandler
[\"ajp-nio-127.0.0.1-"+ getAjpItPort() +"\"]" );
}
}
diff --git
a/src/test/resources/deploy-only-war-project/src/main/tomcatconf/server.xml
b/src/test/resources/deploy-only-war-project/src/main/tomcatconf/server.xml
index 73f3317..d9c2e45 100644
--- a/src/test/resources/deploy-only-war-project/src/main/tomcatconf/server.xml
+++ b/src/test/resources/deploy-only-war-project/src/main/tomcatconf/server.xml
@@ -32,7 +32,7 @@
<Connector port="${its.http.port}" keepAliveTimeout="1800000"
maxKeepAliveRequests="30000" maxThreads="300" />
<Engine name="Catalina" defaultHost="localhost">
<Valve className="org.apache.catalina.valves.AccessLogValve"
- resolveHosts="false"
pattern="%t-ip:%a-protocol::%H-status:%s-localPort:%p-path:%U-time:%D ms"
buffered="false"/>
+
pattern="%t-ip:%a-protocol::%H-status:%s-localPort:%p-path:%U-time:%D ms"
buffered="false"/>
<Realm className="org.apache.catalina.realm.UserDatabaseRealm"
resourceName="UserDatabase" />
<Host name="localhost"
appBase="${project.build.directory}/test-classes/deploy-only-war-project/target/tomcat/webapps">
diff --git
a/src/test/resources/deploy-war-project/src/main/tomcatconf/server.xml
b/src/test/resources/deploy-war-project/src/main/tomcatconf/server.xml
index 960ba62..d6dd7f5 100644
--- a/src/test/resources/deploy-war-project/src/main/tomcatconf/server.xml
+++ b/src/test/resources/deploy-war-project/src/main/tomcatconf/server.xml
@@ -32,7 +32,7 @@
<Connector port="${its.http.port}" keepAliveTimeout="1800000"
maxKeepAliveRequests="30000" maxThreads="300" />
<Engine name="Catalina" defaultHost="localhost">
<Valve className="org.apache.catalina.valves.AccessLogValve"
- resolveHosts="false"
pattern="%t-ip:%a-protocol::%H-status:%s-localPort:%p-path:%U-time:%D ms"
buffered="false"/>
+
pattern="%t-ip:%a-protocol::%H-status:%s-localPort:%p-path:%U-time:%D ms"
buffered="false"/>
<Realm className="org.apache.catalina.realm.UserDatabaseRealm"
resourceName="UserDatabase" />
<Host name="localhost"
appBase="${project.build.directory}/test-classes/deploy-war-project/target/tomcat/webapps">
diff --git a/src/test/resources/log4j2-test.xml
b/src/test/resources/log4j2-test.xml
deleted file mode 100644
index eef73d8..0000000
--- a/src/test/resources/log4j2-test.xml
+++ /dev/null
@@ -1,36 +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.
- -->
-
-
-<configuration>
- <appenders>
- <Console name="console" target="SYSTEM_OUT">
- <PatternLayout pattern="%d{HH:mm:ss.SSS} [%t] %-5level %logger{36} -
%msg%n"/>
- </Console>
- </appenders>
- <loggers>
-
- <root level="info">
- <appender-ref ref="console"/>
- </root>
- </loggers>
-</configuration>
-
-
diff --git
a/src/test/resources/simple-war-project/src/main/tomcatconf/server.xml
b/src/test/resources/simple-war-project/src/main/tomcatconf/server.xml
index 76ab562..5e6dcdf 100644
--- a/src/test/resources/simple-war-project/src/main/tomcatconf/server.xml
+++ b/src/test/resources/simple-war-project/src/main/tomcatconf/server.xml
@@ -29,11 +29,11 @@
</GlobalNamingResources>
<Service name="Catalina">
- <Connector port="8080" keepAliveTimeout="1800000"
maxKeepAliveRequests="30000" maxThreads="300" />
- <Connector port="8088" keepAliveTimeout="1800000"
maxKeepAliveRequests="30000" maxThreads="300" />
+ <Connector port="${its.http.port}" keepAliveTimeout="1800000"
maxKeepAliveRequests="30000" maxThreads="300" />
+ <Connector port="${its.ajp.port}" protocol="AJP/1.3"
keepAliveTimeout="1800000" maxKeepAliveRequests="30000" maxThreads="300" />
<Engine name="Catalina" defaultHost="localhost">
<Valve className="org.apache.catalina.valves.AccessLogValve"
- resolveHosts="false"
pattern="%t-ip:%a-protocol:%H-localPort:%p-path:%U-time:%D ms"/>
+ pattern="%t-ip:%a-protocol:%H-localPort:%p-path:%U-time:%D ms"/>
<Realm className="org.apache.catalina.realm.UserDatabaseRealm"
resourceName="UserDatabase" />
<Host name="localhost" appBase="webapps" />
diff --git a/src/test/resources/tomcat-run-multi-config/pom.xml
b/src/test/resources/tomcat-run-multi-config/pom.xml
index 4204895..d290ced 100644
--- a/src/test/resources/tomcat-run-multi-config/pom.xml
+++ b/src/test/resources/tomcat-run-multi-config/pom.xml
@@ -65,12 +65,12 @@
</goals>
<phase>pre-integration-test</phase>
<configuration>
-
<additionalConfigFilesDir>\${basedir}/src/main/tcconf</additionalConfigFilesDir>
-
<configurationDir>\${project.build.directory}/tc</configurationDir>
+
<additionalConfigFilesDir>${basedir}/src/main/tcconf</additionalConfigFilesDir>
+
<configurationDir>${project.build.directory}/tc</configurationDir>
<path>/multi-config</path>
<port>${its.http.port}</port>
<httpsPort>${its.https.port}</httpsPort>
- <keystoreFile>${keystoreTestPath}</keystoreFile>
+ <keystoreFile>${basedir}/src/test/keystore</keystoreFile>
<ajpPort>${its.ajp.port}</ajpPort>
<uriEncoding>UTF-8</uriEncoding>
<systemProperties>
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
