This is an automated email from the ASF dual-hosted git repository.
rmaucher 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 851e6b4 Some minor fixes
851e6b4 is described below
commit 851e6b45040a6fe7b711d0b594c99eeee9ff1797
Author: remm <[email protected]>
AuthorDate: Fri Jun 5 10:57:00 2026 +0200
Some minor fixes
Fix the AJP protocol name (AjpProtocol was removed long ago).
---
.../tomcat/maven/plugin/tomcat/AbstractCatalinaMojo.java | 3 +--
.../maven/plugin/tomcat/run/AbstractExecWarMojo.java | 14 +++++++++-----
.../maven/plugin/tomcat/run/AbstractStandaloneWarMojo.java | 8 +++-----
.../java/org/apache/tomcat/maven/runner/TomcatRunner.java | 2 +-
4 files changed, 14 insertions(+), 13 deletions(-)
diff --git
a/src/main/java/org/apache/tomcat/maven/plugin/tomcat/AbstractCatalinaMojo.java
b/src/main/java/org/apache/tomcat/maven/plugin/tomcat/AbstractCatalinaMojo.java
index b8ade83..052a168 100644
---
a/src/main/java/org/apache/tomcat/maven/plugin/tomcat/AbstractCatalinaMojo.java
+++
b/src/main/java/org/apache/tomcat/maven/plugin/tomcat/AbstractCatalinaMojo.java
@@ -150,9 +150,8 @@ public abstract class AbstractCatalinaMojo extends
AbstractTomcatMojo {
* details
*/
protected TomcatManager getManager() throws MojoExecutionException {
- TomcatManager manager = this.manager;
if (manager == null) {
- manager = getManagerInternal();
+ getManagerInternal();
}
return manager;
}
diff --git
a/src/main/java/org/apache/tomcat/maven/plugin/tomcat/run/AbstractExecWarMojo.java
b/src/main/java/org/apache/tomcat/maven/plugin/tomcat/run/AbstractExecWarMojo.java
index 7cea8dc..7ed73a5 100644
---
a/src/main/java/org/apache/tomcat/maven/plugin/tomcat/run/AbstractExecWarMojo.java
+++
b/src/main/java/org/apache/tomcat/maven/plugin/tomcat/run/AbstractExecWarMojo.java
@@ -254,12 +254,10 @@ public abstract class AbstractExecWarMojo extends
AbstractTomcatMojo {
return;
}
// project.addAttachedArtifact( );
- File warExecFile = new File(buildDirectory, finalName);
- if (warExecFile.exists()) {
- warExecFile.delete();
- }
-
File execWarJar = new File(buildDirectory, finalName);
+ if (execWarJar.exists()) {
+ execWarJar.delete();
+ }
FileOutputStream execWarJarOutputStream = null;
ArchiveOutputStream<JarArchiveEntry> os = null;
@@ -474,6 +472,12 @@ public abstract class AbstractExecWarMojo extends
AbstractTomcatMojo {
IOUtils.closeQuietly(tmpManifestWriter);
IOUtils.closeQuietly(execWarJarOutputStream);
IOUtils.closeQuietly(tmpPropertiesFileOutputStream);
+ if (tmpPropertiesFile != null) {
+ tmpPropertiesFile.delete();
+ }
+ if (tmpManifestFile != null) {
+ tmpManifestFile.delete();
+ }
}
}
diff --git
a/src/main/java/org/apache/tomcat/maven/plugin/tomcat/run/AbstractStandaloneWarMojo.java
b/src/main/java/org/apache/tomcat/maven/plugin/tomcat/run/AbstractStandaloneWarMojo.java
index 1af42f8..87aa4a9 100644
---
a/src/main/java/org/apache/tomcat/maven/plugin/tomcat/run/AbstractStandaloneWarMojo.java
+++
b/src/main/java/org/apache/tomcat/maven/plugin/tomcat/run/AbstractStandaloneWarMojo.java
@@ -89,12 +89,10 @@ public abstract class AbstractStandaloneWarMojo extends
AbstractExecWarMojo {
throw new MojoFailureException("Packaging must be of type war for
standalone-war goal.");
}
- File warExecFile = new File(buildDirectory, finalName);
- if (warExecFile.exists()) {
- warExecFile.delete();
- }
-
File execWarJar = new File(buildDirectory, finalName);
+ if (execWarJar.exists()) {
+ execWarJar.delete();
+ }
FileOutputStream execWarJarOutputStream = null;
ArchiveOutputStream<JarArchiveEntry> os = null;
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 a475cd2..4bf74e8 100644
--- a/src/main/java/org/apache/tomcat/maven/runner/TomcatRunner.java
+++ b/src/main/java/org/apache/tomcat/maven/runner/TomcatRunner.java
@@ -385,7 +385,7 @@ public class TomcatRunner {
// create ajp connector
if (ajpPort > 0) {
- Connector ajpConnector = new
Connector("org.apache.coyote.ajp.AjpProtocol");
+ Connector ajpConnector = new Connector("AJP/1.3");
ajpConnector.setPort(ajpPort);
ajpConnector.setURIEncoding(uriEncoding);
if (ajpSecret != null) {
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
