Author: dennisl
Date: Sat Jun 21 14:53:44 2008
New Revision: 670262
URL: http://svn.apache.org/viewvc?rev=670262&view=rev
Log:
o Fix errors reported by Checkstyle.
Modified:
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/SiteDeployMojo.java
maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/SiteDescriptorAttachMojo.java
maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/SiteStageDeployMojo.java
Modified:
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/AbstractSiteRenderingMojo.java?rev=670262&r1=670261&r2=670262&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/AbstractSiteRenderingMojo.java
Sat Jun 21 14:53:44 2008
@@ -223,7 +223,10 @@
DecorationModel decorationModel;
try
{
- decorationModel = siteTool.getDecorationModel( project,
reactorProjects, localRepository, repositories, toRelative(
project.getBasedir(), siteDirectory.getAbsolutePath() ), locale,
getInputEncoding(), outputEncoding );
+ decorationModel = siteTool.getDecorationModel( project,
reactorProjects, localRepository, repositories,
+ toRelative(
project.getBasedir(),
+
siteDirectory.getAbsolutePath() ),
+ locale,
getInputEncoding(), outputEncoding );
}
catch ( SiteToolException e )
{
Modified:
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/SiteDeployMojo.java?rev=670262&r1=670261&r2=670262&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/SiteDeployMojo.java
Sat Jun 21 14:53:44 2008
@@ -56,8 +56,6 @@
import org.codehaus.plexus.util.xml.Xpp3Dom;
import java.io.File;
-import java.util.HashMap;
-import java.util.Map;
/**
* Deploys the generated site using <code>scp</code> or <code>file</code>
@@ -270,20 +268,20 @@
String nonProxyHostPrefix = StringUtils.substringBefore(
nonProxyHost, "*" );
String nonProxyHostSuffix = StringUtils.substringAfter(
nonProxyHost, "*" );
// prefix*
- if ( StringUtils.isNotEmpty(nonProxyHostPrefix) &&
host.startsWith( nonProxyHostPrefix )
- && StringUtils.isEmpty(nonProxyHostSuffix) )
+ if ( StringUtils.isNotEmpty( nonProxyHostPrefix ) &&
host.startsWith( nonProxyHostPrefix )
+ && StringUtils.isEmpty( nonProxyHostSuffix ) )
{
return null;
}
// *suffix
- if ( StringUtils.isEmpty(nonProxyHostPrefix)
- && StringUtils.isNotEmpty(nonProxyHostSuffix) &&
host.endsWith( nonProxyHostSuffix ))
+ if ( StringUtils.isEmpty( nonProxyHostPrefix )
+ && StringUtils.isNotEmpty( nonProxyHostSuffix ) &&
host.endsWith( nonProxyHostSuffix ) )
{
return null;
}
// prefix*suffix
- if ( StringUtils.isNotEmpty(nonProxyHostPrefix) &&
host.startsWith( nonProxyHostPrefix )
- && StringUtils.isNotEmpty(nonProxyHostSuffix) &&
host.endsWith( nonProxyHostSuffix ))
+ if ( StringUtils.isNotEmpty( nonProxyHostPrefix ) &&
host.startsWith( nonProxyHostPrefix )
+ && StringUtils.isNotEmpty( nonProxyHostSuffix ) &&
host.endsWith( nonProxyHostSuffix ) )
{
return null;
}
@@ -307,7 +305,8 @@
* @param log
* @throws WagonConfigurationException
*/
- static void configureWagon( Wagon wagon, String repositoryId, Settings
settings, PlexusContainer container, Log log )
+ static void configureWagon( Wagon wagon, String repositoryId, Settings
settings, PlexusContainer container,
+ Log log )
throws WagonConfigurationException
{
// MSITE-25: Make sure that the server settings are inserted
@@ -330,11 +329,13 @@
}
catch ( final ComponentLookupException e )
{
- throw new WagonConfigurationException( repositoryId,
"Unable to lookup wagon configurator. Wagon configuration cannot be applied.",
e );
+ throw new WagonConfigurationException( repositoryId,
"Unable to lookup wagon configurator."
+ + " Wagon configuration cannot be applied.", e );
}
catch ( ComponentConfigurationException e )
{
- throw new WagonConfigurationException( repositoryId,
"Unable to apply wagon configuration.", e );
+ throw new WagonConfigurationException( repositoryId,
"Unable to apply wagon configuration.",
+ e );
}
finally
{
Modified:
maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/SiteDescriptorAttachMojo.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/SiteDescriptorAttachMojo.java?rev=670262&r1=670261&r2=670262&view=diff
==============================================================================
---
maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/SiteDescriptorAttachMojo.java
(original)
+++
maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/SiteDescriptorAttachMojo.java
Sat Jun 21 14:53:44 2008
@@ -72,7 +72,9 @@
{
Locale locale = (Locale) iterator.next();
- File descriptorFile = siteTool.getSiteDescriptorFromBasedir(
toRelative( project.getBasedir(), siteDirectory.getAbsolutePath() ), basedir,
locale );
+ File descriptorFile = siteTool.getSiteDescriptorFromBasedir(
toRelative( project.getBasedir(),
+
siteDirectory.getAbsolutePath() ),
+
basedir, locale );
if ( descriptorFile.exists() )
{
@@ -86,7 +88,8 @@
String siteDescriptorContent = IOUtil.toString(
ReaderFactory.newXmlReader( descriptorFile ) );
siteDescriptorContent =
- siteTool.getInterpolatedSiteDescriptorContent( props,
project, siteDescriptorContent, getInputEncoding(), outputEncoding );
+ siteTool.getInterpolatedSiteDescriptorContent( props,
project, siteDescriptorContent,
+
getInputEncoding(), outputEncoding );
decoration = new DecorationXpp3Reader().read( new
StringReader( siteDescriptorContent ) );
}
Modified:
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/SiteStageDeployMojo.java?rev=670262&r1=670261&r2=670262&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/SiteStageDeployMojo.java
Sat Jun 21 14:53:44 2008
@@ -87,7 +87,7 @@
private PlexusContainer container;
- private final String STAGING_SERVER_ID = "stagingSite";
+ private static final String STAGING_SERVER_ID = "stagingSite";
/**
* @see org.apache.maven.plugin.Mojo#execute()
