mav...

hboutemy Sun, 01 Jun 2014 10:04:18 -0700

Author: hboutemy
Date: Sun Jun  1 17:03:18 2014
New Revision: 1599008

URL: http://svn.apache.org/r1599008
Log:
[MSITE-715] refactor: split Mojos in render/deploy/run sub-packages


Added:
    
maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/deploy/
    
maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/deploy/AbstractDeployMojo.java
      - copied, changed from r1599006, 
maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/AbstractDeployMojo.java
    
maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/deploy/AbstractStagingMojo.java
      - copied, changed from r1595622, 
maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/AbstractStagingMojo.java
    
maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/deploy/SiteDeployMojo.java
      - copied, changed from r1595622, 
maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/SiteDeployMojo.java
    
maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/deploy/SiteStageDeployMojo.java
      - copied, changed from r1595622, 
maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/SiteStageDeployMojo.java
    
maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/deploy/SiteStageMojo.java
      - copied, changed from r1595622, 
maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/SiteStageMojo.java
    
maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/deploy/wagon/
      - copied from r1599006, 
maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/wagon/
    
maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/render/
    
maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/render/AbstractSiteRenderingMojo.java
      - copied, changed from r1598682, 
maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/AbstractSiteRenderingMojo.java
    
maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/render/CategorySummaryDocumentRenderer.java
      - copied, changed from r1595622, 
maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/CategorySummaryDocumentRenderer.java
    
maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/render/ReportDocumentRenderer.java
      - copied, changed from r1598430, 
maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/ReportDocumentRenderer.java
    
maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/render/SiteJarMojo.java
      - copied, changed from r1595622, 
maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/SiteJarMojo.java
    
maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/render/SiteMap.java
      - copied, changed from r1595622, 
maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/SiteMap.java
    
maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/render/SiteMojo.java
      - copied, changed from r1598428, 
maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/SiteMojo.java
    
maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/run/
      - copied from r1595622, 
maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/webapp/
    
maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/run/SiteRunMojo.java
      - copied, changed from r1595622, 
maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/SiteRunMojo.java
    maven/plugins/trunk/maven-site-plugin/src/main/resources/run/
      - copied from r1595622, 
maven/plugins/trunk/maven-site-plugin/src/main/resources/webapp/
    
maven/plugins/trunk/maven-site-plugin/src/test/java/org/apache/maven/plugins/site/deploy/
    
maven/plugins/trunk/maven-site-plugin/src/test/java/org/apache/maven/plugins/site/deploy/AbstractSiteDeployWebDavTest.java
      - copied, changed from r1595622, 
maven/plugins/trunk/maven-site-plugin/src/test/java/org/apache/maven/plugins/site/AbstractSiteDeployWebDavTest.java
    
maven/plugins/trunk/maven-site-plugin/src/test/java/org/apache/maven/plugins/site/deploy/AuthAsyncProxyServlet.java
      - copied, changed from r1595622, 
maven/plugins/trunk/maven-site-plugin/src/test/java/org/apache/maven/plugins/site/AuthAsyncProxyServlet.java
    
maven/plugins/trunk/maven-site-plugin/src/test/java/org/apache/maven/plugins/site/deploy/SimpleDavServerHandler.java
      - copied, changed from r1595622, 
maven/plugins/trunk/maven-site-plugin/src/test/java/org/apache/maven/plugins/site/SimpleDavServerHandler.java
    
maven/plugins/trunk/maven-site-plugin/src/test/java/org/apache/maven/plugins/site/deploy/SiteDeployMojoTest.java
      - copied, changed from r1595622, 
maven/plugins/trunk/maven-site-plugin/src/test/java/org/apache/maven/plugins/site/SiteDeployMojoTest.java
    
maven/plugins/trunk/maven-site-plugin/src/test/java/org/apache/maven/plugins/site/deploy/SiteDeployWebDavTest.java
      - copied, changed from r1595622, 
maven/plugins/trunk/maven-site-plugin/src/test/java/org/apache/maven/plugins/site/SiteDeployWebDavTest.java
    
maven/plugins/trunk/maven-site-plugin/src/test/java/org/apache/maven/plugins/site/render/
    
maven/plugins/trunk/maven-site-plugin/src/test/java/org/apache/maven/plugins/site/render/SiteMojoTest.java
      - copied, changed from r1595622, 
maven/plugins/trunk/maven-site-plugin/src/test/java/org/apache/maven/plugins/site/SiteMojoTest.java
Removed:
    
maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/AbstractDeployMojo.java
    
maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/AbstractSiteRenderingMojo.java
    
maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/AbstractStagingMojo.java
    
maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/CategorySummaryDocumentRenderer.java
    
maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/ReportDocumentRenderer.java
    
maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/SiteDeployMojo.java
    
maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/SiteJarMojo.java
    
maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/SiteMap.java
    
maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/SiteMojo.java
    
maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/SiteRunMojo.java
    
maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/SiteStageDeployMojo.java
    
maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/SiteStageMojo.java
    
maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/wagon/
    
maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/webapp/
    maven/plugins/trunk/maven-site-plugin/src/main/resources/webapp/
    
maven/plugins/trunk/maven-site-plugin/src/test/java/org/apache/maven/plugins/site/AbstractSiteDeployWebDavTest.java
    
maven/plugins/trunk/maven-site-plugin/src/test/java/org/apache/maven/plugins/site/AuthAsyncProxyServlet.java
    
maven/plugins/trunk/maven-site-plugin/src/test/java/org/apache/maven/plugins/site/SimpleDavServerHandler.java
    
maven/plugins/trunk/maven-site-plugin/src/test/java/org/apache/maven/plugins/site/SiteDeployMojoTest.java
    
maven/plugins/trunk/maven-site-plugin/src/test/java/org/apache/maven/plugins/site/SiteDeployWebDavTest.java
    
maven/plugins/trunk/maven-site-plugin/src/test/java/org/apache/maven/plugins/site/SiteMojoTest.java
Modified:
    maven/plugins/trunk/maven-site-plugin/pom.xml
    
maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/EffectiveSiteMojo.java
    
maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/deploy/wagon/BugFixedRepository.java
    
maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/deploy/wagon/PathUtils.java
    
maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/run/DoxiaBean.java
    
maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/run/DoxiaFilter.java

Modified: maven/plugins/trunk/maven-site-plugin/pom.xml
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-site-plugin/pom.xml?rev=1599008&r1=1599007&r2=1599008&view=diff
==============================================================================
--- maven/plugins/trunk/maven-site-plugin/pom.xml (original)
+++ maven/plugins/trunk/maven-site-plugin/pom.xml Sun Jun  1 17:03:18 2014
@@ -197,7 +197,7 @@ under the License.
     <wagonVersion>1.0</wagonVersion>
     <plexusVersion>1.5.4</plexusVersion>
     <scmVersion>1.4</scmVersion>
-    <mavenPluginPluginVersion>3.2</mavenPluginPluginVersion>
+    <mavenPluginPluginVersion>3.3</mavenPluginPluginVersion>
     <!-- for ITs -->
     <javadocPluginVersion>2.9.1</javadocPluginVersion>
     <projectInfoReportsPluginVersion>2.7</projectInfoReportsPluginVersion>

Modified: 
maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/EffectiveSiteMojo.java
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/EffectiveSiteMojo.java?rev=1599008&r1=1599007&r2=1599008&view=diff
==============================================================================
--- 
maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/EffectiveSiteMojo.java
 (original)
+++ 
maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/EffectiveSiteMojo.java
 Sun Jun  1 17:03:18 2014
@@ -23,10 +23,8 @@ import java.io.File;
 import java.io.IOException;
 import java.io.StringWriter;
 import java.io.Writer;
-
 import java.text.DateFormat;
 import java.text.SimpleDateFormat;
-
 import java.util.Date;
 import java.util.List;
 import java.util.Locale;
@@ -36,9 +34,9 @@ import org.apache.maven.doxia.site.decor
 import org.apache.maven.doxia.siterenderer.SiteRenderingContext;
 import org.apache.maven.plugin.MojoExecutionException;
 import org.apache.maven.plugin.MojoFailureException;
-
 import org.apache.maven.plugins.annotations.Mojo;
 import org.apache.maven.plugins.annotations.Parameter;
+import org.apache.maven.plugins.site.render.AbstractSiteRenderingMojo;
 import org.codehaus.plexus.util.IOUtil;
 import org.codehaus.plexus.util.StringUtils;
 import org.codehaus.plexus.util.WriterFactory;

Copied: 
maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/deploy/AbstractDeployMojo.java
 (from r1599006, 
maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/AbstractDeployMojo.java)
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/deploy/AbstractDeployMojo.java?p2=maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/deploy/AbstractDeployMojo.java&p1=maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/AbstractDeployMojo.java&r1=1599006&r2=1599008&rev=1599008&view=diff
==============================================================================
--- 
maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/AbstractDeployMojo.java
 (original)
+++ 
maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/deploy/AbstractDeployMojo.java
 Sun Jun  1 17:03:18 2014
@@ -1,4 +1,4 @@
-package org.apache.maven.plugins.site;
+package org.apache.maven.plugins.site.deploy;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
@@ -29,7 +29,8 @@ import org.apache.maven.plugin.MojoExecu
 import org.apache.maven.plugin.logging.Log;
 import org.apache.maven.plugins.annotations.Component;
 import org.apache.maven.plugins.annotations.Parameter;
-import org.apache.maven.plugins.site.wagon.BugFixedRepository;
+import org.apache.maven.plugins.site.AbstractSiteMojo;
+import org.apache.maven.plugins.site.deploy.wagon.BugFixedRepository;
 import org.apache.maven.project.MavenProject;
 import org.apache.maven.settings.Proxy;
 import org.apache.maven.settings.Server;

Copied: 
maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/deploy/AbstractStagingMojo.java
 (from r1595622, 
maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/AbstractStagingMojo.java)
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/deploy/AbstractStagingMojo.java?p2=maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/deploy/AbstractStagingMojo.java&p1=maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/AbstractStagingMojo.java&r1=1595622&r2=1599008&rev=1599008&view=diff
==============================================================================
--- 
maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/AbstractStagingMojo.java
 (original)
+++ 
maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/deploy/AbstractStagingMojo.java
 Sun Jun  1 17:03:18 2014
@@ -1,4 +1,4 @@
-package org.apache.maven.plugins.site;
+package org.apache.maven.plugins.site.deploy;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one

Copied: 
maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/deploy/SiteDeployMojo.java
 (from r1595622, 
maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/SiteDeployMojo.java)
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/deploy/SiteDeployMojo.java?p2=maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/deploy/SiteDeployMojo.java&p1=maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/SiteDeployMojo.java&r1=1595622&r2=1599008&rev=1599008&view=diff
==============================================================================
--- 
maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/SiteDeployMojo.java
 (original)
+++ 
maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/deploy/SiteDeployMojo.java
 Sun Jun  1 17:03:18 2014
@@ -1,4 +1,4 @@
-package org.apache.maven.plugins.site;
+package org.apache.maven.plugins.site.deploy;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one

Copied: 
maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/deploy/SiteStageDeployMojo.java
 (from r1595622, 
maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/SiteStageDeployMojo.java)
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/deploy/SiteStageDeployMojo.java?p2=maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/deploy/SiteStageDeployMojo.java&p1=maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/SiteStageDeployMojo.java&r1=1595622&r2=1599008&rev=1599008&view=diff
==============================================================================
--- 
maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/SiteStageDeployMojo.java
 (original)
+++ 
maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/deploy/SiteStageDeployMojo.java
 Sun Jun  1 17:03:18 2014
@@ -1,4 +1,4 @@
-package org.apache.maven.plugins.site;
+package org.apache.maven.plugins.site.deploy;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one

Copied: 
maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/deploy/SiteStageMojo.java
 (from r1595622, 
maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/SiteStageMojo.java)
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/deploy/SiteStageMojo.java?p2=maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/deploy/SiteStageMojo.java&p1=maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/SiteStageMojo.java&r1=1595622&r2=1599008&rev=1599008&view=diff
==============================================================================
--- 
maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/SiteStageMojo.java
 (original)
+++ 
maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/deploy/SiteStageMojo.java
 Sun Jun  1 17:03:18 2014
@@ -1,4 +1,4 @@
-package org.apache.maven.plugins.site;
+package org.apache.maven.plugins.site.deploy;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one

Modified: 
maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/deploy/wagon/BugFixedRepository.java
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/deploy/wagon/BugFixedRepository.java?rev=1599008&r1=1599006&r2=1599008&view=diff
==============================================================================
--- 
maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/deploy/wagon/BugFixedRepository.java
 (original)
+++ 
maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/deploy/wagon/BugFixedRepository.java
 Sun Jun  1 17:03:18 2014
@@ -1,4 +1,4 @@
-package org.apache.maven.plugins.site.wagon;
+package org.apache.maven.plugins.site.deploy.wagon;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one

Modified: 
maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/deploy/wagon/PathUtils.java
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/deploy/wagon/PathUtils.java?rev=1599008&r1=1599006&r2=1599008&view=diff
==============================================================================
--- 
maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/deploy/wagon/PathUtils.java
 (original)
+++ 
maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/deploy/wagon/PathUtils.java
 Sun Jun  1 17:03:18 2014
@@ -1,4 +1,4 @@
-package org.apache.maven.plugins.site.wagon;
+package org.apache.maven.plugins.site.deploy.wagon;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one

Copied: 
maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/render/AbstractSiteRenderingMojo.java
 (from r1598682, 
maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/AbstractSiteRenderingMojo.java)
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/render/AbstractSiteRenderingMojo.java?p2=maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/render/AbstractSiteRenderingMojo.java&p1=maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/AbstractSiteRenderingMojo.java&r1=1598682&r2=1599008&rev=1599008&view=diff
==============================================================================
--- 
maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/AbstractSiteRenderingMojo.java
 (original)
+++ 
maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/render/AbstractSiteRenderingMojo.java
 Sun Jun  1 17:03:18 2014
@@ -1,4 +1,4 @@
-package org.apache.maven.plugins.site;
+package org.apache.maven.plugins.site.render;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
@@ -47,6 +47,7 @@ import org.apache.maven.plugin.MojoExecu
 import org.apache.maven.plugin.MojoFailureException;
 import org.apache.maven.plugins.annotations.Component;
 import org.apache.maven.plugins.annotations.Parameter;
+import org.apache.maven.plugins.site.AbstractSiteMojo;
 import org.apache.maven.reporting.MavenReport;
 import org.apache.maven.reporting.exec.MavenReportExecution;
 import org.apache.maven.reporting.exec.MavenReportExecutor;

Copied: 
maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/render/CategorySummaryDocumentRenderer.java
 (from r1595622, 
maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/CategorySummaryDocumentRenderer.java)
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/render/CategorySummaryDocumentRenderer.java?p2=maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/render/CategorySummaryDocumentRenderer.java&p1=maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/CategorySummaryDocumentRenderer.java&r1=1595622&r2=1599008&rev=1599008&view=diff
==============================================================================
--- 
maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/CategorySummaryDocumentRenderer.java
 (original)
+++ 
maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/render/CategorySummaryDocumentRenderer.java
 Sun Jun  1 17:03:18 2014
@@ -1,4 +1,4 @@
-package org.apache.maven.plugins.site;
+package org.apache.maven.plugins.site.render;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one

Copied: 
maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/render/ReportDocumentRenderer.java
 (from r1598430, 
maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/ReportDocumentRenderer.java)
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/render/ReportDocumentRenderer.java?p2=maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/render/ReportDocumentRenderer.java&p1=maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/ReportDocumentRenderer.java&r1=1598430&r2=1599008&rev=1599008&view=diff
==============================================================================
--- 
maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/ReportDocumentRenderer.java
 (original)
+++ 
maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/render/ReportDocumentRenderer.java
 Sun Jun  1 17:03:18 2014
@@ -1,4 +1,4 @@
-package org.apache.maven.plugins.site;
+package org.apache.maven.plugins.site.render;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one

Copied: 
maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/render/SiteJarMojo.java
 (from r1595622, 
maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/SiteJarMojo.java)
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/render/SiteJarMojo.java?p2=maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/render/SiteJarMojo.java&p1=maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/SiteJarMojo.java&r1=1595622&r2=1599008&rev=1599008&view=diff
==============================================================================
--- 
maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/SiteJarMojo.java
 (original)
+++ 
maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/render/SiteJarMojo.java
 Sun Jun  1 17:03:18 2014
@@ -1,4 +1,4 @@
-package org.apache.maven.plugins.site;
+package org.apache.maven.plugins.site.render;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one

Copied: 
maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/render/SiteMap.java
 (from r1595622, 
maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/SiteMap.java)
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/render/SiteMap.java?p2=maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/render/SiteMap.java&p1=maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/SiteMap.java&r1=1595622&r2=1599008&rev=1599008&view=diff
==============================================================================
--- 
maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/SiteMap.java
 (original)
+++ 
maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/render/SiteMap.java
 Sun Jun  1 17:03:18 2014
@@ -1,4 +1,4 @@
-package org.apache.maven.plugins.site;
+package org.apache.maven.plugins.site.render;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
@@ -41,7 +41,7 @@ import org.codehaus.plexus.i18n.I18N;
  * @since 2.1
  */
 public class SiteMap
- {
+{
 
     private String encoding;
     private I18N i18n;

Copied: 
maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/render/SiteMojo.java
 (from r1598428, 
maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/SiteMojo.java)
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/render/SiteMojo.java?p2=maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/render/SiteMojo.java&p1=maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/SiteMojo.java&r1=1598428&r2=1599008&rev=1599008&view=diff
==============================================================================
--- 
maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/SiteMojo.java
 (original)
+++ 
maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/render/SiteMojo.java
 Sun Jun  1 17:03:18 2014
@@ -1,4 +1,4 @@
-package org.apache.maven.plugins.site;
+package org.apache.maven.plugins.site.render;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
@@ -37,6 +37,7 @@ import org.apache.maven.plugin.MojoFailu
 import org.apache.maven.plugins.annotations.Mojo;
 import org.apache.maven.plugins.annotations.Parameter;
 import org.apache.maven.plugins.annotations.ResolutionScope;
+import org.apache.maven.project.MavenProject;
 import org.apache.maven.reporting.MavenReport;
 import org.apache.maven.reporting.exec.MavenReportExecution;
 
@@ -283,4 +284,9 @@ public class SiteMojo
 
         return file;
     }
+
+    public MavenProject getProject()
+    {
+        return project;
+    }
 }

Modified: 
maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/run/DoxiaBean.java
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/run/DoxiaBean.java?rev=1599008&r1=1595622&r2=1599008&view=diff
==============================================================================
--- 
maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/run/DoxiaBean.java
 (original)
+++ 
maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/run/DoxiaBean.java
 Sun Jun  1 17:03:18 2014
@@ -1,4 +1,4 @@
-package org.apache.maven.plugins.site.webapp;
+package org.apache.maven.plugins.site.run;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one

Modified: 
maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/run/DoxiaFilter.java
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/run/DoxiaFilter.java?rev=1599008&r1=1595622&r2=1599008&view=diff
==============================================================================
--- 
maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/run/DoxiaFilter.java
 (original)
+++ 
maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/run/DoxiaFilter.java
 Sun Jun  1 17:03:18 2014
@@ -1,4 +1,4 @@
-package org.apache.maven.plugins.site.webapp;
+package org.apache.maven.plugins.site.run;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
@@ -23,7 +23,7 @@ import org.apache.maven.doxia.siterender
 import org.apache.maven.doxia.siterenderer.Renderer;
 import org.apache.maven.doxia.siterenderer.RendererException;
 import org.apache.maven.doxia.siterenderer.SiteRenderingContext;
-import org.apache.maven.plugins.site.ReportDocumentRenderer;
+import org.apache.maven.plugins.site.render.ReportDocumentRenderer;
 
 import javax.servlet.Filter;
 import javax.servlet.FilterChain;
@@ -33,6 +33,7 @@ import javax.servlet.ServletException;
 import javax.servlet.ServletRequest;
 import javax.servlet.ServletResponse;
 import javax.servlet.http.HttpServletRequest;
+
 import java.io.File;
 import java.io.IOException;
 import java.util.ArrayList;

Copied: 
maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/run/SiteRunMojo.java
 (from r1595622, 
maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/SiteRunMojo.java)
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/run/SiteRunMojo.java?p2=maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/run/SiteRunMojo.java&p1=maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/SiteRunMojo.java&r1=1595622&r2=1599008&rev=1599008&view=diff
==============================================================================
--- 
maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/SiteRunMojo.java
 (original)
+++ 
maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/run/SiteRunMojo.java
 Sun Jun  1 17:03:18 2014
@@ -1,4 +1,4 @@
-package org.apache.maven.plugins.site;
+package org.apache.maven.plugins.site.run;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
@@ -24,7 +24,6 @@ import java.io.FileNotFoundException;
 import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
-
 import java.util.HashMap;
 import java.util.List;
 import java.util.Locale;
@@ -36,12 +35,9 @@ import org.apache.maven.plugin.MojoExecu
 import org.apache.maven.plugin.MojoFailureException;
 import org.apache.maven.plugins.annotations.Mojo;
 import org.apache.maven.plugins.annotations.Parameter;
-import org.apache.maven.plugins.site.webapp.DoxiaBean;
-import org.apache.maven.plugins.site.webapp.DoxiaFilter;
+import org.apache.maven.plugins.site.render.AbstractSiteRenderingMojo;
 import org.apache.maven.reporting.exec.MavenReportExecution;
-
 import org.codehaus.plexus.util.IOUtil;
-
 import org.mortbay.jetty.Connector;
 import org.mortbay.jetty.Handler;
 import org.mortbay.jetty.Server;

Copied: 
maven/plugins/trunk/maven-site-plugin/src/test/java/org/apache/maven/plugins/site/deploy/AbstractSiteDeployWebDavTest.java
 (from r1595622, 
maven/plugins/trunk/maven-site-plugin/src/test/java/org/apache/maven/plugins/site/AbstractSiteDeployWebDavTest.java)
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-site-plugin/src/test/java/org/apache/maven/plugins/site/deploy/AbstractSiteDeployWebDavTest.java?p2=maven/plugins/trunk/maven-site-plugin/src/test/java/org/apache/maven/plugins/site/deploy/AbstractSiteDeployWebDavTest.java&p1=maven/plugins/trunk/maven-site-plugin/src/test/java/org/apache/maven/plugins/site/AbstractSiteDeployWebDavTest.java&r1=1595622&r2=1599008&rev=1599008&view=diff
==============================================================================
--- 
maven/plugins/trunk/maven-site-plugin/src/test/java/org/apache/maven/plugins/site/AbstractSiteDeployWebDavTest.java
 (original)
+++ 
maven/plugins/trunk/maven-site-plugin/src/test/java/org/apache/maven/plugins/site/deploy/AbstractSiteDeployWebDavTest.java
 Sun Jun  1 17:03:18 2014
@@ -1,4 +1,4 @@
-package org.apache.maven.plugins.site;
+package org.apache.maven.plugins.site.deploy;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
@@ -34,7 +34,7 @@ import org.apache.maven.execution.MavenE
 import org.apache.maven.execution.MavenSession;
 import org.apache.maven.plugin.AbstractMojo;
 import org.apache.maven.plugin.testing.AbstractMojoTestCase;
-import org.apache.maven.plugins.site.SimpleDavServerHandler.HttpRequest;
+import org.apache.maven.plugins.site.deploy.SimpleDavServerHandler.HttpRequest;
 import org.apache.maven.plugins.site.stubs.SiteMavenProjectStub;
 import org.apache.maven.settings.Proxy;
 import org.apache.maven.settings.Settings;

Copied: 
maven/plugins/trunk/maven-site-plugin/src/test/java/org/apache/maven/plugins/site/deploy/AuthAsyncProxyServlet.java
 (from r1595622, 
maven/plugins/trunk/maven-site-plugin/src/test/java/org/apache/maven/plugins/site/AuthAsyncProxyServlet.java)
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-site-plugin/src/test/java/org/apache/maven/plugins/site/deploy/AuthAsyncProxyServlet.java?p2=maven/plugins/trunk/maven-site-plugin/src/test/java/org/apache/maven/plugins/site/deploy/AuthAsyncProxyServlet.java&p1=maven/plugins/trunk/maven-site-plugin/src/test/java/org/apache/maven/plugins/site/AuthAsyncProxyServlet.java&r1=1595622&r2=1599008&rev=1599008&view=diff
==============================================================================
--- 
maven/plugins/trunk/maven-site-plugin/src/test/java/org/apache/maven/plugins/site/AuthAsyncProxyServlet.java
 (original)
+++ 
maven/plugins/trunk/maven-site-plugin/src/test/java/org/apache/maven/plugins/site/deploy/AuthAsyncProxyServlet.java
 Sun Jun  1 17:03:18 2014
@@ -1,4 +1,4 @@
-package org.apache.maven.plugins.site;
+package org.apache.maven.plugins.site.deploy;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
@@ -34,7 +34,7 @@ import javax.servlet.http.HttpServletRes
 
 import org.apache.commons.io.FileUtils;
 import org.apache.commons.io.IOUtils;
-import org.apache.maven.plugins.site.SimpleDavServerHandler.HttpRequest;
+import org.apache.maven.plugins.site.deploy.SimpleDavServerHandler.HttpRequest;
 import org.mortbay.jetty.security.B64Code;
 import org.mortbay.proxy.AsyncProxyServlet;
 import org.slf4j.Logger;

Copied: 
maven/plugins/trunk/maven-site-plugin/src/test/java/org/apache/maven/plugins/site/deploy/SimpleDavServerHandler.java
 (from r1595622, 
maven/plugins/trunk/maven-site-plugin/src/test/java/org/apache/maven/plugins/site/SimpleDavServerHandler.java)
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-site-plugin/src/test/java/org/apache/maven/plugins/site/deploy/SimpleDavServerHandler.java?p2=maven/plugins/trunk/maven-site-plugin/src/test/java/org/apache/maven/plugins/site/deploy/SimpleDavServerHandler.java&p1=maven/plugins/trunk/maven-site-plugin/src/test/java/org/apache/maven/plugins/site/SimpleDavServerHandler.java&r1=1595622&r2=1599008&rev=1599008&view=diff
==============================================================================
--- 
maven/plugins/trunk/maven-site-plugin/src/test/java/org/apache/maven/plugins/site/SimpleDavServerHandler.java
 (original)
+++ 
maven/plugins/trunk/maven-site-plugin/src/test/java/org/apache/maven/plugins/site/deploy/SimpleDavServerHandler.java
 Sun Jun  1 17:03:18 2014
@@ -1,4 +1,4 @@
-package org.apache.maven.plugins.site;
+package org.apache.maven.plugins.site.deploy;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one

Copied: 
maven/plugins/trunk/maven-site-plugin/src/test/java/org/apache/maven/plugins/site/deploy/SiteDeployMojoTest.java
 (from r1595622, 
maven/plugins/trunk/maven-site-plugin/src/test/java/org/apache/maven/plugins/site/SiteDeployMojoTest.java)
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-site-plugin/src/test/java/org/apache/maven/plugins/site/deploy/SiteDeployMojoTest.java?p2=maven/plugins/trunk/maven-site-plugin/src/test/java/org/apache/maven/plugins/site/deploy/SiteDeployMojoTest.java&p1=maven/plugins/trunk/maven-site-plugin/src/test/java/org/apache/maven/plugins/site/SiteDeployMojoTest.java&r1=1595622&r2=1599008&rev=1599008&view=diff
==============================================================================
--- 
maven/plugins/trunk/maven-site-plugin/src/test/java/org/apache/maven/plugins/site/SiteDeployMojoTest.java
 (original)
+++ 
maven/plugins/trunk/maven-site-plugin/src/test/java/org/apache/maven/plugins/site/deploy/SiteDeployMojoTest.java
 Sun Jun  1 17:03:18 2014
@@ -1,4 +1,4 @@
-package org.apache.maven.plugins.site;
+package org.apache.maven.plugins.site.deploy;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one

Copied: 
maven/plugins/trunk/maven-site-plugin/src/test/java/org/apache/maven/plugins/site/deploy/SiteDeployWebDavTest.java
 (from r1595622, 
maven/plugins/trunk/maven-site-plugin/src/test/java/org/apache/maven/plugins/site/SiteDeployWebDavTest.java)
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-site-plugin/src/test/java/org/apache/maven/plugins/site/deploy/SiteDeployWebDavTest.java?p2=maven/plugins/trunk/maven-site-plugin/src/test/java/org/apache/maven/plugins/site/deploy/SiteDeployWebDavTest.java&p1=maven/plugins/trunk/maven-site-plugin/src/test/java/org/apache/maven/plugins/site/SiteDeployWebDavTest.java&r1=1595622&r2=1599008&rev=1599008&view=diff
==============================================================================
--- 
maven/plugins/trunk/maven-site-plugin/src/test/java/org/apache/maven/plugins/site/SiteDeployWebDavTest.java
 (original)
+++ 
maven/plugins/trunk/maven-site-plugin/src/test/java/org/apache/maven/plugins/site/deploy/SiteDeployWebDavTest.java
 Sun Jun  1 17:03:18 2014
@@ -1,4 +1,4 @@
-package org.apache.maven.plugins.site;
+package org.apache.maven.plugins.site.deploy;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
@@ -22,6 +22,7 @@ package org.apache.maven.plugins.site;
 import java.io.File;
 
 import org.apache.maven.plugin.AbstractMojo;
+import org.apache.maven.plugins.site.deploy.SiteDeployMojo;
 
 /**
  * @author Olivier Lamy

Copied: 
maven/plugins/trunk/maven-site-plugin/src/test/java/org/apache/maven/plugins/site/render/SiteMojoTest.java
 (from r1595622, 
maven/plugins/trunk/maven-site-plugin/src/test/java/org/apache/maven/plugins/site/SiteMojoTest.java)
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-site-plugin/src/test/java/org/apache/maven/plugins/site/render/SiteMojoTest.java?p2=maven/plugins/trunk/maven-site-plugin/src/test/java/org/apache/maven/plugins/site/render/SiteMojoTest.java&p1=maven/plugins/trunk/maven-site-plugin/src/test/java/org/apache/maven/plugins/site/SiteMojoTest.java&r1=1595622&r2=1599008&rev=1599008&view=diff
==============================================================================
--- 
maven/plugins/trunk/maven-site-plugin/src/test/java/org/apache/maven/plugins/site/SiteMojoTest.java
 (original)
+++ 
maven/plugins/trunk/maven-site-plugin/src/test/java/org/apache/maven/plugins/site/render/SiteMojoTest.java
 Sun Jun  1 17:03:18 2014
@@ -1,4 +1,4 @@
-package org.apache.maven.plugins.site;
+package org.apache.maven.plugins.site.render;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
@@ -24,6 +24,7 @@ import java.util.HashMap;
 
 import org.apache.maven.doxia.tools.SiteTool;
 import org.apache.maven.plugin.testing.AbstractMojoTestCase;
+import org.apache.maven.plugins.site.render.SiteMojo;
 import org.codehaus.plexus.util.FileUtils;
 import org.junit.Before;
 import org.junit.Test;
@@ -73,7 +74,7 @@ public class SiteMojoTest
 
         SiteTool siteTool = (SiteTool) lookup( SiteTool.ROLE );
         siteDescriptorContent =
-            siteTool.getInterpolatedSiteDescriptorContent( new HashMap<String, 
String>(), siteMojo.project,
+            siteTool.getInterpolatedSiteDescriptorContent( new HashMap<String, 
String>(), siteMojo.getProject(),
                                                            
siteDescriptorContent, "UTF-8", "UTF-8" );
         assertNotNull( siteDescriptorContent );
         assertTrue(!siteDescriptorContent.contains("${project.name}"));

svn commit: r1599008 - in /maven/plugins/trunk/maven-site-plugin: ./ src/main/java/org/apache/maven/plugins/site/ src/main/java/org/apache/maven/plugins/site/deploy/ src/main/java/org/apache/maven/plugins/site/deploy/wagon/ src/main/java/org/apache/mav...

Reply via email to