simplified

git-svn-id: https://hudson.dev.java.net/svn/hudson/trunk/hudson/main@10230 71c3de6d-444a-0410-be80-ed276b4c234a

core/src/main/java/hudson/maven/MavenBuild.java

@@ -285,6 +285,10 @@ public class MavenBuild extends AbstractBuild<MavenModule,MavenBuild> {
             return new FilePath(MavenBuild.this.getParent().getRootDir());
         }
 
+        public FilePath getModuleSetRootDir() {
+            return new FilePath(MavenBuild.this.getParent().getParent().getRootDir());
+        }
+
         public FilePath getArtifactsDir() {
             return new FilePath(MavenBuild.this.getArtifactsDir());
         }

core/src/main/java/hudson/maven/MavenBuildProxy.java

@@ -61,6 +61,11 @@ public interface MavenBuildProxy {
      */
     FilePath getProjectRootDir();
 
+    /**
+     * Root directory of the owner {@link MavenModuleSet}
+     */
+    FilePath getModuleSetRootDir();
+
     /**
      * @see MavenBuild#getArtifactsDir()
      */
@@ -144,6 +149,10 @@ public interface MavenBuildProxy {
             return core.getProjectRootDir();
         }
 
+        public FilePath getModuleSetRootDir() {
+            retur ncore.getModuleSetRootDir();
+        }
+
         public FilePath getArtifactsDir() {
             return core.getArtifactsDir();
         }

core/src/main/java/hudson/maven/reporters/MavenJavadocArchiver.java

@@ -52,15 +52,10 @@ public class MavenJavadocArchiver extends MavenReporter {
         if(destDir.exists()) {
             // javadoc:javadoc just skips itself when the current project is not a java project 
             FilePath target;
-            if(aggregated) {
+            if(aggregated)
                 // store at MavenModuleSet level. 
-                target = build.execute(new MavenBuildProxy.BuildCallable<FilePath,IOException>() {
-                    public FilePath call(MavenBuild build) throws IOException, InterruptedException {
-                        return new FilePath(build.getProject().getParent().getRootDir());
-                    }
-                    private static final long serialVersionUID = 1L;
-                });
-            } else
+                target = build.getModuleSetRootDir();
+            else
                 target = build.getProjectRootDir();
 
             target = target.child("javadoc");