commit 29e23b1ae72ee7cbb5b6983f24da0c2356340b6d
author Jean-Louis Monteiro <jlmonteiro@tomitribe.com> Mon Jul 26 08:36:56 2021 +0200
committer Jean-Louis Monteiro <jlmonteiro@tomitribe.com> Mon Jul 26 08:36:56 2021 +0200
tree 7db957af5a72f1cfef9111cebb2d20443bc2cbe2
parent 54ef1dfaeb56a4c3c9fc6c2e7d7b703347e78fef
parent 4da8748f56ae8481f94dd5833cf0c75af1dda702

Merge branch 'master' of github.com:apache/tomee-patch-plugin into master

tomee-patch-core/src/main/java/org/apache/tomee/patch/core/Clazz.java

diff --git a/tomee-patch-core/src/main/java/org/apache/tomee/patch/core/Clazz.java b/tomee-patch-core/src/main/java/org/apache/tomee/patch/core/Clazz.java
index 9053913..f60370a 100644
--- a/tomee-patch-core/src/main/java/org/apache/tomee/patch/core/Clazz.java
+++ b/tomee-patch-core/src/main/java/org/apache/tomee/patch/core/Clazz.java
@@ -27,9 +27,9 @@
     private int applied;
 
     public Clazz(final String name, final File file) {
-        this.name = name;
-        this.prefix = name.replaceAll("\\.class$", "");
-        this.packge = asPackage(name);
+        this.name = name.replace("\\", "/");
+        this.prefix = this.name.replaceAll("\\.class$", "");
+        this.packge = asPackage(this.name);
         this.file = file;
     }
 

tomee-patch-core/src/test/java/org/apache/tomee/patch/core/ZipToTarTest.java

diff --git a/tomee-patch-core/src/test/java/org/apache/tomee/patch/core/ZipToTarTest.java b/tomee-patch-core/src/test/java/org/apache/tomee/patch/core/ZipToTarTest.java
index 13bca8f..b8a0c1a 100644
--- a/tomee-patch-core/src/test/java/org/apache/tomee/patch/core/ZipToTarTest.java
+++ b/tomee-patch-core/src/test/java/org/apache/tomee/patch/core/ZipToTarTest.java
@@ -57,12 +57,13 @@
             }
         }
 
+        String lineSeperator = System.getProperty("line.separator");
         assertEquals("" +
-                "14 33188 index.txt\n" +
-                "6 33188 color/red/crimson.txt\n" +
-                "6 493 color/blue/navy.sh\n" +
-                "6 33188 color/red/ruby.txt\n" +
-                "6 33188 color/green/forest.txt\n", out.toString());
+                "14 33188 index.txt" + lineSeperator +
+                "6 33188 color/red/crimson.txt" + lineSeperator +
+                "6 493 color/blue/navy.sh" + lineSeperator +
+                "6 33188 color/red/ruby.txt" + lineSeperator +
+                "6 33188 color/green/forest.txt" + lineSeperator, out.toString());
     }
 
 }