This is an automated email from the ASF dual-hosted git repository. kwin pushed a commit to branch bugfix/jcr-root-detection in repository https://gitbox.apache.org/repos/asf/sling-ide-tooling.git
commit 94c8d1fc8644cb7830d867d2c1d045bfe43ed9e9 Author: Konrad Windszus <[email protected]> AuthorDate: Wed Oct 8 12:19:29 2025 +0200 SLING-12955 Accept projects without a jcr_root without emitting an error Never detect jcr_root in derived folders (below target) as content root as those are regularly cleared. --- .../m2e/internal/MavenProjectUtilsTest.java | 4 +-- .../ContentPackageProjectConfigurator.java | 4 +-- .../eclipse/m2e/internal/MavenProjectUtils.java | 31 +++++++++++++++++----- 3 files changed, 29 insertions(+), 10 deletions(-) diff --git a/eclipse/eclipse-m2e-test/src/org/apache/sling/ide/eclipse/m2e/internal/MavenProjectUtilsTest.java b/eclipse/eclipse-m2e-test/src/org/apache/sling/ide/eclipse/m2e/internal/MavenProjectUtilsTest.java index d5b590db..e2ee2ed2 100644 --- a/eclipse/eclipse-m2e-test/src/org/apache/sling/ide/eclipse/m2e/internal/MavenProjectUtilsTest.java +++ b/eclipse/eclipse-m2e-test/src/org/apache/sling/ide/eclipse/m2e/internal/MavenProjectUtilsTest.java @@ -69,14 +69,14 @@ public class MavenProjectUtilsTest { java.nio.file.Path rootPath = Paths.get("src", "org", "apache", "sling", "ide", "eclipse", "m2e", "internal", "project1"); Assert.assertTrue("rootPath not found", Files.exists(rootPath)); // create folder structure, - Optional<java.nio.file.Path> actualJcrRoot = MavenProjectUtils.guessJcrRootFolder(rootPath); + Optional<java.nio.file.Path> actualJcrRoot = MavenProjectUtils.guessJcrRootFolder(rootPath, projectRule.getProject()); Assert.assertTrue(actualJcrRoot.isPresent()); Assert.assertEquals(Paths.get("src", "main", "content", "jcr_root"), actualJcrRoot.get()); // test jcr_root beyond level 4 rootPath = Paths.get("src", "org", "apache", "sling", "ide", "eclipse", "m2e", "internal", "project2"); Assert.assertTrue("rootPath not found", Files.exists(rootPath)); - actualJcrRoot = MavenProjectUtils.guessJcrRootFolder(rootPath); + actualJcrRoot = MavenProjectUtils.guessJcrRootFolder(rootPath, projectRule.getProject()); Assert.assertFalse(actualJcrRoot.isPresent()); } diff --git a/eclipse/eclipse-m2e-ui/src/org/apache/sling/ide/eclipse/m2e/internal/ContentPackageProjectConfigurator.java b/eclipse/eclipse-m2e-ui/src/org/apache/sling/ide/eclipse/m2e/internal/ContentPackageProjectConfigurator.java index 3229fb67..dcb9c99f 100644 --- a/eclipse/eclipse-m2e-ui/src/org/apache/sling/ide/eclipse/m2e/internal/ContentPackageProjectConfigurator.java +++ b/eclipse/eclipse-m2e-ui/src/org/apache/sling/ide/eclipse/m2e/internal/ContentPackageProjectConfigurator.java @@ -90,10 +90,10 @@ public class ContentPackageProjectConfigurator extends AbstractProjectConfigurat // core configuration for sling ide plugin try { - Optional<java.nio.file.Path> contentSyncPath = MavenProjectUtils.guessJcrRootFolder(mavenProject); + Optional<java.nio.file.Path> contentSyncPath = MavenProjectUtils.guessJcrRootFolder(mavenProject.getBasedir().toPath(), project); if (!contentSyncPath.isPresent()) { // add marker - addMarker(pomFile, "Could not detect jcr_root path for this content package!", IMarker.SEVERITY_ERROR); + addMarker(pomFile, "Could not detect jcr_root path for this content package!", IMarker.SEVERITY_INFO); return; } diff --git a/eclipse/eclipse-m2e-ui/src/org/apache/sling/ide/eclipse/m2e/internal/MavenProjectUtils.java b/eclipse/eclipse-m2e-ui/src/org/apache/sling/ide/eclipse/m2e/internal/MavenProjectUtils.java index fc31fa96..2841746d 100644 --- a/eclipse/eclipse-m2e-ui/src/org/apache/sling/ide/eclipse/m2e/internal/MavenProjectUtils.java +++ b/eclipse/eclipse-m2e-ui/src/org/apache/sling/ide/eclipse/m2e/internal/MavenProjectUtils.java @@ -19,6 +19,7 @@ package org.apache.sling.ide.eclipse.m2e.internal; import java.io.IOException; import java.nio.file.Files; import java.nio.file.Path; +import java.nio.file.attribute.BasicFileAttributes; import java.util.ArrayList; import java.util.LinkedHashSet; import java.util.List; @@ -32,6 +33,8 @@ import org.apache.maven.model.Dependency; import org.apache.maven.model.Plugin; import org.apache.maven.project.MavenProject; import org.codehaus.plexus.util.xml.Xpp3Dom; +import org.eclipse.core.resources.IProject; +import org.eclipse.core.resources.IResource; public class MavenProjectUtils { @@ -39,12 +42,15 @@ public class MavenProjectUtils { private static final Pattern SERVLET_API_VERSION_MATCHER = Pattern.compile("^(\\d\\.\\d)"); private static final int MAX_RELATIVE_DEPTH_OF_JCR_ROOT = 4; // relative depth of jcr_root in content packages from the Maven basedir - public static Optional<Path> guessJcrRootFolder(MavenProject project) throws IOException { - return guessJcrRootFolder(project.getBasedir().toPath()); - } - - static Optional<Path> guessJcrRootFolder(Path baseDir) throws IOException { - try (Stream<Path> stream = Files.find(baseDir, MAX_RELATIVE_DEPTH_OF_JCR_ROOT, (a, b) -> a.endsWith("jcr_root"))) { + /** + * Similar to the logic in the <a href="https://github.com/apache/jackrabbit-filevault-package-maven-plugin/blob/92637f43f72c7a61e34d0636b1a1354a522a5877/src/main/java/org/apache/jackrabbit/filevault/maven/packaging/mojo/AbstractSourceAndMetadataPackageMojo.java#L47";> + * content-package-maven-plugin to find the jcr_root folder</a>. However not considering derived resources (e.g. target/jcr_root). + * @param baseDir + * @return + * @throws IOException + */ + public static Optional<Path> guessJcrRootFolder(Path baseDir, IProject eclipseProject) throws IOException { + try (Stream<Path> stream = Files.find(baseDir, MAX_RELATIVE_DEPTH_OF_JCR_ROOT, (a, b) -> isJcrRoot(a, b, eclipseProject))) { Optional<Path> jcrRoot = stream.findFirst(); if (jcrRoot.isPresent()) { jcrRoot = Optional.of(baseDir.relativize(jcrRoot.get())); @@ -53,6 +59,19 @@ public class MavenProjectUtils { } } + static boolean isJcrRoot(Path path, BasicFileAttributes attrs, IProject eclipseProject) { + if (path.endsWith("jcr_root")) { + // skip derived jcr_root folders (e.g. target/jcr_root) + IResource resource = eclipseProject.findMember(path.toString()); + if (resource == null) { + throw new IllegalStateException("Could not find IResource for path " + path); + } + return !resource.isDerived(); + } else { + return false; + } + } + public static String guessServletApiVersion(MavenProject project) { for ( Dependency dependency : project.getDependencies() ) {
