Changeset 5334 for branches/release-0.15.x/pustefix-live/src/main/java/org/pustefixframework/live/LiveResolver.java

Timestamp:

09/01/10 16:16:44 (21 months ago)

Author:

seelmann

Message:

Deterministic guess of fallback docroot, refactored some code to LiveUtils?

Files:

• branches/release-0.15.x/pustefix-live/src/main/java/org/pustefixframework/live/LiveResolver.java (modified) (3 diffs)

branches/release-0.15.x/pustefix-live/src/main/java/org/pustefixframework/live/LiveResolver.java

@@ -64 +64 @@
             throw new IllegalArgumentException(path);
         }
-        
+
         if (file.exists()) {
             url = file.toURI().toURL();
@@ -93 +93 @@
             LOG.debug("Resolving live module root from live.xml for " + url + ":" + path);
         }
-        
+
         if (path.startsWith("/")) {
             path = path.substring(1);
@@ -185 +185 @@
     }
 
-    private static File guessFallbackDocroot(String srcMainWebapp) {
+    private static File guessFallbackDocroot(String srcMainWebapp) throws Exception {
         File srcMainWebappDir = new File(srcMainWebapp);
         if (srcMainWebappDir.exists() && srcMainWebappDir.isDirectory()) {
             File projectDir = srcMainWebappDir.getParentFile().getParentFile().getParentFile();
+            File pomFile = LiveUtils.guessPom(srcMainWebapp);
             File target = new File(projectDir, "target");
-            if (target.exists() && target.isDirectory()) {
+            if (pomFile != null && pomFile.exists() && target.exists() && target.isDirectory()) {
+                String artifactId = LiveUtils.getArtifactFromPom(pomFile);
                 for (File file : target.listFiles()) {
-                    if (file.isDirectory()) {
+                    if (file.isDirectory() && file.getName().startsWith(artifactId)) {
                         File webInfDir = new File(file, "WEB-INF");
                         if (webInfDir.exists())