Author: brett
Date: Wed Sep 28 18:49:28 2005
New Revision: 292371
URL: http://svn.apache.org/viewcvs?rev=292371&view=rev
Log:
rename packages and mojos class names
Added:
maven/components/trunk/maven-plugins/maven-site-plugin/src/main/java/org/apache/maven/plugins/
maven/components/trunk/maven-plugins/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/
maven/components/trunk/maven-plugins/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/SiteDeployMojo.java
- copied, changed from r292366,
maven/components/trunk/maven-plugins/maven-site-plugin/src/main/java/org/apache/maven/doxia/ScpSiteDeployMojo.java
maven/components/trunk/maven-plugins/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/SiteMojo.java
- copied, changed from r292096,
maven/components/trunk/maven-plugins/maven-site-plugin/src/main/java/org/apache/maven/doxia/DoxiaMojo.java
maven/components/trunk/maven-plugins/maven-site-plugin/src/main/resources/org/apache/maven/plugins/
maven/components/trunk/maven-plugins/maven-site-plugin/src/main/resources/org/apache/maven/plugins/site/
- copied from r292096,
maven/components/trunk/maven-plugins/maven-site-plugin/src/main/resources/org/apache/maven/doxia/
maven/components/trunk/maven-plugins/maven-site-plugin/src/main/resources/org/apache/maven/plugins/site/css/
- copied from r292367,
maven/components/trunk/maven-plugins/maven-site-plugin/src/main/resources/org/apache/maven/doxia/css/
maven/components/trunk/maven-plugins/maven-site-plugin/src/main/resources/org/apache/maven/plugins/site/images/
- copied from r292367,
maven/components/trunk/maven-plugins/maven-site-plugin/src/main/resources/org/apache/maven/doxia/images/
maven/components/trunk/maven-plugins/maven-site-plugin/src/main/resources/org/apache/maven/plugins/site/maven-site.vm
- copied unchanged from r292367,
maven/components/trunk/maven-plugins/maven-site-plugin/src/main/resources/org/apache/maven/doxia/maven-site.vm
maven/components/trunk/maven-plugins/maven-site-plugin/src/main/resources/org/apache/maven/plugins/site/resources.txt
- copied unchanged from r292367,
maven/components/trunk/maven-plugins/maven-site-plugin/src/main/resources/org/apache/maven/doxia/resources.txt
Removed:
maven/components/trunk/maven-plugins/maven-site-plugin/src/main/java/org/apache/maven/doxia/
maven/components/trunk/maven-plugins/maven-site-plugin/src/main/resources/org/apache/maven/doxia/
Copied:
maven/components/trunk/maven-plugins/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/SiteDeployMojo.java
(from r292366,
maven/components/trunk/maven-plugins/maven-site-plugin/src/main/java/org/apache/maven/doxia/ScpSiteDeployMojo.java)
URL:
http://svn.apache.org/viewcvs/maven/components/trunk/maven-plugins/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/SiteDeployMojo.java?p2=maven/components/trunk/maven-plugins/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/SiteDeployMojo.java&p1=maven/components/trunk/maven-plugins/maven-site-plugin/src/main/java/org/apache/maven/doxia/ScpSiteDeployMojo.java&r1=292366&r2=292371&rev=292371&view=diff
==============================================================================
---
maven/components/trunk/maven-plugins/maven-site-plugin/src/main/java/org/apache/maven/doxia/ScpSiteDeployMojo.java
(original)
+++
maven/components/trunk/maven-plugins/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/SiteDeployMojo.java
Wed Sep 28 18:49:28 2005
@@ -1,4 +1,4 @@
-package org.apache.maven.doxia;
+package org.apache.maven.plugins.site;
/*
* Copyright 2001-2005 The Apache Software Foundation.
@@ -48,7 +48,7 @@
* @version $Id$
* @goal deploy
*/
-public class ScpSiteDeployMojo
+public class SiteDeployMojo
extends AbstractMojo
{
/**
Copied:
maven/components/trunk/maven-plugins/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/SiteMojo.java
(from r292096,
maven/components/trunk/maven-plugins/maven-site-plugin/src/main/java/org/apache/maven/doxia/DoxiaMojo.java)
URL:
http://svn.apache.org/viewcvs/maven/components/trunk/maven-plugins/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/SiteMojo.java?p2=maven/components/trunk/maven-plugins/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/SiteMojo.java&p1=maven/components/trunk/maven-plugins/maven-site-plugin/src/main/java/org/apache/maven/doxia/DoxiaMojo.java&r1=292096&r2=292371&rev=292371&view=diff
==============================================================================
---
maven/components/trunk/maven-plugins/maven-site-plugin/src/main/java/org/apache/maven/doxia/DoxiaMojo.java
(original)
+++
maven/components/trunk/maven-plugins/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/SiteMojo.java
Wed Sep 28 18:49:28 2005
@@ -1,4 +1,4 @@
-package org.apache.maven.doxia;
+package org.apache.maven.plugins.site;
/*
* Copyright 2001-2005 The Apache Software Foundation.
@@ -61,10 +61,10 @@
* @goal site
* @requiresDependencyResolution test
*/
-public class DoxiaMojo
+public class SiteMojo
extends AbstractMojo
{
- private static final String RESOURCE_DIR = "org/apache/maven/doxia";
+ private static final String RESOURCE_DIR = "org/apache/maven/plugins/site";
private static final String DEFAULT_TEMPLATE = RESOURCE_DIR +
"/maven-site.vm";
@@ -211,7 +211,7 @@
{
if ( templateDirectory == null )
{
- siteRenderer.setTemplateClassLoader(
DoxiaMojo.class.getClassLoader() );
+ siteRenderer.setTemplateClassLoader(
SiteMojo.class.getClassLoader() );
}
else
{
@@ -1052,7 +1052,7 @@
*/
private InputStream getStream( String name )
{
- return DoxiaMojo.class.getClassLoader().getResourceAsStream( name );
+ return SiteMojo.class.getClassLoader().getResourceAsStream( name );
}
/**
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
