This is an automated email from the ASF dual-hosted git repository.
remm pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomcat-jakartaee-migration.git
The following commit(s) were added to refs/heads/master by this push:
new 9ad4d7b Improve logging to avoid confusing users on what is really
happening
9ad4d7b is described below
commit 9ad4d7be8bdc7d71016c27930e407e5f680bde89
Author: remm <[email protected]>
AuthorDate: Thu Apr 1 10:52:10 2021 +0200
Improve logging to avoid confusing users on what is really happening
---
src/main/java/org/apache/tomcat/jakartaee/ClassConverter.java | 7 ++++---
.../resources/org/apache/tomcat/jakartaee/LocalStrings.properties | 2 +-
2 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/src/main/java/org/apache/tomcat/jakartaee/ClassConverter.java
b/src/main/java/org/apache/tomcat/jakartaee/ClassConverter.java
index 81deddf..ea92b1a 100644
--- a/src/main/java/org/apache/tomcat/jakartaee/ClassConverter.java
+++ b/src/main/java/org/apache/tomcat/jakartaee/ClassConverter.java
@@ -104,7 +104,8 @@ public class ClassConverter implements Converter,
ClassFileTransformer {
if (pos >= 0) {
if (loader.getResource(current.substring(pos)
+ ".class") == null) {
if (logger.isLoggable(Level.FINE)) {
- logger.log(Level.FINE,
sm.getString("classConverter.skipName", current.substring(pos)));
+ logger.log(Level.FINE,
sm.getString("classConverter.skipName",
+
current.substring(pos).replace('/','.')));
}
// Cancel the replacement as the
replacement does not exist
String originalFragment =
current.replace("jakarta/", "javax/");
@@ -122,9 +123,9 @@ public class ClassConverter implements Converter,
ClassFileTransformer {
if (logger.isLoggable(Level.FINE)) {
if (converted) {
- logger.log(Level.FINE,
sm.getString("classConverter.converted", path));
+ logger.log(Level.FINE,
sm.getString("classConverter.converted", path.replace('/','.')));
} else if (logger.isLoggable(Level.FINEST)) {
- logger.log(Level.FINEST,
sm.getString("classConverter.noConversion", path));
+ logger.log(Level.FINEST,
sm.getString("classConverter.noConversion", path.replace('/','.')));
}
}
diff --git
a/src/main/resources/org/apache/tomcat/jakartaee/LocalStrings.properties
b/src/main/resources/org/apache/tomcat/jakartaee/LocalStrings.properties
index e46a8d8..54fa2fe 100644
--- a/src/main/resources/org/apache/tomcat/jakartaee/LocalStrings.properties
+++ b/src/main/resources/org/apache/tomcat/jakartaee/LocalStrings.properties
@@ -15,7 +15,7 @@
classConverter.converted=Migrated class [{0}]
classConverter.noConversion=No conversion necessary for [{0}]
-classConverter.skipName=Skip conversion of class [{0}] as it is not accessible
to the classloader
+classConverter.skipName=Skip conversion of class usage from the javax
namespace to [{0}] as it is not accessible to the classloader
migration.archive.complete=Migration finished for archive [{0}]
migration.archive.memory=Migration starting for archive [{0}] using in memory
copy
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
