testjars.<beanName>**.class is not repackaged

Closes gh-76

Author: rwinch

spring-boot-testjars/src/main/java/org/springframework/experimental/boot/server/exec/ScanningClasspathEntry.java

@@ -57,7 +57,10 @@ class ScanningClasspathEntry implements ClasspathEntry {
 		this.renameResource = (name) -> {
 			String prefix = baseDir + "/";
 			int index = name.lastIndexOf(prefix);
-			return (index > -1) ? name.substring(index + prefix.length()) : name;
+			// .class files stay in the same package (otherwise invalid), but resources
+			// are relative to baseDir
+			int length = (name.endsWith(".class") ? 0 : prefix.length());
+			return (index > -1) ? name.substring(index + length) : name;
 		};
 	}
 

spring-boot-testjars/src/test/java/org/springframework/experimental/boot/server/exec/CommonsExecWebServerFactoryBeanTests.java

@@ -24,6 +24,7 @@
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
+import java.util.Optional;
 
 import org.junit.jupiter.api.Test;
 
@@ -155,6 +156,19 @@ void classpathWhenYamlDefaults() throws Exception {
 		});
 	}
 
+	// gh-76
+	@Test
+	void classpathWhenJavaDefaults() throws Exception {
+		CommonsExecWebServerFactoryBean factory = CommonsExecWebServerFactoryBean.builder();
+		factory.setBeanName("javaDefaults");
+		factory.classpath((cp) -> {
+			List<ClasspathEntry> classpath = cp.getClasspath();
+			Optional<String> javaDefaultsEntry = classpath.stream().map(ClasspathEntry::resolve).flatMap(List::stream)
+					.filter((path) -> new File(path, "testjars/javaDefaults/Main.class").exists()).findFirst();
+			assertThat(javaDefaultsEntry.isPresent()).isTrue();
+		});
+	}
+
 	@Test
 	void setAdditionalBeanClassNamesWhenSingleName() {
 		String envName = "testjars.additionalBeanClassNames";

spring-boot-testjars/src/test/java/testjars/javaDefaults/Main.java

@@ -0,0 +1,21 @@
+/*
+ * Copyright 2012-2023 the original author or authors.
+ *
+ * Licensed 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
+ *
+ *      https://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.
+ */
+
+package testjars.javaDefaults;
+
+public class Main {
+
+}