From d2212757c7e9b22cb92b2d97a4f8d21b0712c3f2 Mon Sep 17 00:00:00 2001
From: Olivier Lamy <olamy@apache.org>
Date: Thu, 13 Jun 2013 16:54:38 +1000
Subject: [PATCH] Revert "[JENKINS-18326] add maven site support for nested
 submodules"

This reverts commit f460e1e817cd7dc2c61bb1b916e79b737bcdb17a.
---
 .../maven/reporters/MavenSiteArchiver.java    | 47 ++-----------------
 1 file changed, 4 insertions(+), 43 deletions(-)

diff --git a/maven-plugin/src/main/java/hudson/maven/reporters/MavenSiteArchiver.java b/maven-plugin/src/main/java/hudson/maven/reporters/MavenSiteArchiver.java
index c810607af7..acdd773a52 100644
--- a/maven-plugin/src/main/java/hudson/maven/reporters/MavenSiteArchiver.java
+++ b/maven-plugin/src/main/java/hudson/maven/reporters/MavenSiteArchiver.java
@@ -33,7 +33,6 @@ import hudson.maven.MavenModuleSet;
 import hudson.maven.MavenModuleSetBuild;
 import hudson.maven.MavenReporter;
 import hudson.maven.MavenReporterDescriptor;
-import hudson.maven.ModuleName;
 import hudson.maven.MojoInfo;
 import hudson.maven.MavenBuildProxy.BuildCallable;
 import hudson.model.AbstractItem;
@@ -42,9 +41,6 @@ import hudson.model.BuildListener;
 import hudson.model.DirectoryBrowserSupport;
 import hudson.model.ProminentProjectAction;
 import hudson.model.Result;
-
-import org.apache.maven.model.DistributionManagement;
-import org.apache.maven.model.Site;
 import org.apache.maven.project.MavenProject;
 import org.codehaus.plexus.component.configurator.ComponentConfigurationException;
 
@@ -107,62 +103,27 @@ public class MavenSiteArchiver extends MavenReporter {
      * @throws InterruptedException 
      */
     private String getModuleName(MavenBuildProxy build, MavenProject pom) throws IOException, InterruptedException {
-        Object[] moduleRoot = build.execute(new BuildCallable<Object[], IOException>() {
+        String moduleRoot = build.execute(new BuildCallable<String, IOException>() {
             private static final long serialVersionUID = 1L;
 
             //@Override
-            @Override
-            public Object[] call(MavenBuild mavenBuild) throws IOException, InterruptedException {
+            public String call(MavenBuild mavenBuild) throws IOException, InterruptedException {
                  MavenModuleSetBuild moduleSetBuild = mavenBuild.getModuleSetBuild();
                  if (moduleSetBuild == null) {
                      throw new IOException("Parent build not found!"); 
                  }
-                 MavenModuleSet project = moduleSetBuild.getProject();
-                 MavenModule rootModule = project.getRootModule();
-                 ModuleName moduleName = rootModule.getModuleName();
-
-                 return new Object[] { moduleSetBuild.getModuleRoot().getRemote(), moduleName };
+                 return moduleSetBuild.getModuleRoot().getRemote();
             }
         });
         final File pomBaseDir = pom.getBasedir();
-        final File remoteWorkspaceDir = new File((String)moduleRoot[0]);
+        final File remoteWorkspaceDir = new File(moduleRoot);
         if (pomBaseDir.equals(remoteWorkspaceDir)) {
             return "";
         } else {
-            String projectSite = getDistributionUrl(pom);
-            if (projectSite != null) {
-                String parentSite = getRootDistributionUrl(pom, (ModuleName)moduleRoot[1]);
-                if (parentSite != null) {
-                    return projectSite.substring(parentSite.length() + 1, projectSite.length());
-                }
-            }
             return pom.getArtifactId();
         }
     }
 
-    private String getRootDistributionUrl(MavenProject pom, ModuleName rootModuleName) {
-        MavenProject parent = pom.getParent();
-        while (parent != null) {
-            ModuleName parentModuleName = new ModuleName(parent.getGroupId(), parent.getArtifactId());
-            if (rootModuleName.equals(parentModuleName)) {
-                String parentSite = getDistributionUrl(parent);
-                return parentSite;
-            }
-            parent = parent.getParent();
-        }
-        return null;
-    }
-
-    private String getDistributionUrl(MavenProject pom) {
-        final DistributionManagement distributionManagement = pom.getDistributionManagement();
-        if (distributionManagement != null) {
-            final Site site = distributionManagement.getSite();
-            if (site != null) {
-                return site.getUrl();
-            }
-        }
-        return null;
-    }
 
     public Collection<? extends Action> getProjectActions(MavenModule project) {
         return Collections.singleton(new SiteAction(project));
-- 
GitLab