Author: vsiveton
Date: Fri Jul 18 08:13:08 2008
New Revision: 677929
URL: http://svn.apache.org/viewvc?rev=677929&view=rev
Log:
o fixed some minor checkstyle errors
Modified:
maven/plugin-testing/trunk/maven-plugin-testing-harness/src/main/java/org/apache/maven/plugin/testing/AbstractMojoTestCase.java
maven/plugin-testing/trunk/maven-plugin-testing-tools/src/main/java/org/apache/maven/shared/test/plugin/ComponentTestTool.java
maven/plugin-testing/trunk/maven-plugin-testing-tools/src/main/java/org/apache/maven/shared/test/plugin/PluginTestTool.java
maven/plugin-testing/trunk/maven-plugin-testing-tools/src/main/java/org/apache/maven/shared/test/plugin/ProjectTool.java
maven/plugin-testing/trunk/maven-plugin-testing-tools/src/main/java/org/apache/maven/shared/test/plugin/RepositoryTool.java
Modified:
maven/plugin-testing/trunk/maven-plugin-testing-harness/src/main/java/org/apache/maven/plugin/testing/AbstractMojoTestCase.java
URL:
http://svn.apache.org/viewvc/maven/plugin-testing/trunk/maven-plugin-testing-harness/src/main/java/org/apache/maven/plugin/testing/AbstractMojoTestCase.java?rev=677929&r1=677928&r2=677929&view=diff
==============================================================================
---
maven/plugin-testing/trunk/maven-plugin-testing-harness/src/main/java/org/apache/maven/plugin/testing/AbstractMojoTestCase.java
(original)
+++
maven/plugin-testing/trunk/maven-plugin-testing-harness/src/main/java/org/apache/maven/plugin/testing/AbstractMojoTestCase.java
Fri Jul 18 08:13:08 2008
@@ -251,7 +251,8 @@
if ( pluginConfigurationElement == null )
{
- throw new ConfigurationException( "Cannot find a
configuration element for a plugin with an artifactId of " + artifactId + "." );
+ throw new ConfigurationException( "Cannot find a
configuration element for a plugin with an "
+ + "artifactId of " + artifactId + "." );
}
}
}
Modified:
maven/plugin-testing/trunk/maven-plugin-testing-tools/src/main/java/org/apache/maven/shared/test/plugin/ComponentTestTool.java
URL:
http://svn.apache.org/viewvc/maven/plugin-testing/trunk/maven-plugin-testing-tools/src/main/java/org/apache/maven/shared/test/plugin/ComponentTestTool.java?rev=677929&r1=677928&r2=677929&view=diff
==============================================================================
---
maven/plugin-testing/trunk/maven-plugin-testing-tools/src/main/java/org/apache/maven/shared/test/plugin/ComponentTestTool.java
(original)
+++
maven/plugin-testing/trunk/maven-plugin-testing-tools/src/main/java/org/apache/maven/shared/test/plugin/ComponentTestTool.java
Fri Jul 18 08:13:08 2008
@@ -125,7 +125,8 @@
* @return The base-directory location of the generated local repository
* @throws TestToolsException if any
*/
- public File prepareComponentForUnitTestingWithMavenBuilds( File pomFile,
String testVersion, File localRepositoryDir )
+ public File prepareComponentForUnitTestingWithMavenBuilds( File pomFile,
String testVersion,
+ File
localRepositoryDir )
throws TestToolsException
{
return prepareForTesting( pomFile, testVersion, true,
localRepositoryDir );
@@ -188,7 +189,8 @@
MavenProject project = projectTool.packageProjectArtifact( pomFile,
testVersion, skipUnitTests, buildLog );
- repositoryTool.createLocalRepositoryFromComponentProject( project, new
File( realProjectDir, "pom.xml" ), localRepoDir );
+ repositoryTool.createLocalRepositoryFromComponentProject( project, new
File( realProjectDir, "pom.xml" ),
+ localRepoDir
);
return localRepoDir;
}
Modified:
maven/plugin-testing/trunk/maven-plugin-testing-tools/src/main/java/org/apache/maven/shared/test/plugin/PluginTestTool.java
URL:
http://svn.apache.org/viewvc/maven/plugin-testing/trunk/maven-plugin-testing-tools/src/main/java/org/apache/maven/shared/test/plugin/PluginTestTool.java?rev=677929&r1=677928&r2=677929&view=diff
==============================================================================
---
maven/plugin-testing/trunk/maven-plugin-testing-tools/src/main/java/org/apache/maven/shared/test/plugin/PluginTestTool.java
(original)
+++
maven/plugin-testing/trunk/maven-plugin-testing-tools/src/main/java/org/apache/maven/shared/test/plugin/PluginTestTool.java
Fri Jul 18 08:13:08 2008
@@ -190,7 +190,8 @@
MavenProject project = projectTool.packageProjectArtifact( pomFile,
testVersion, skipUnitTests, buildLog );
- repositoryTool.createLocalRepositoryFromComponentProject( project, new
File( realProjectDir, "pom.xml" ), localRepoDir );
+ repositoryTool.createLocalRepositoryFromComponentProject( project, new
File( realProjectDir, "pom.xml" ),
+ localRepoDir
);
return localRepoDir;
}
Modified:
maven/plugin-testing/trunk/maven-plugin-testing-tools/src/main/java/org/apache/maven/shared/test/plugin/ProjectTool.java
URL:
http://svn.apache.org/viewvc/maven/plugin-testing/trunk/maven-plugin-testing-tools/src/main/java/org/apache/maven/shared/test/plugin/ProjectTool.java?rev=677929&r1=677928&r2=677929&view=diff
==============================================================================
---
maven/plugin-testing/trunk/maven-plugin-testing-tools/src/main/java/org/apache/maven/shared/test/plugin/ProjectTool.java
(original)
+++
maven/plugin-testing/trunk/maven-plugin-testing-tools/src/main/java/org/apache/maven/shared/test/plugin/ProjectTool.java
Fri Jul 18 08:13:08 2008
@@ -237,12 +237,14 @@
goals.add( "package" );
File buildLog = logFile == null ? pomInfo.getBuildLogFile() : logFile;
- System.out.println( "Now Building test version of the plugin...\nUsing
staged plugin-pom: " + pomInfo.getPomFile().getAbsolutePath() );
+ System.out.println( "Now Building test version of the plugin...\nUsing
staged plugin-pom: "
+ + pomInfo.getPomFile().getAbsolutePath() );
buildTool.executeMaven( pomInfo.getPomFile(), properties, goals,
buildLog );
- File artifactFile = new File( pomInfo.getPomFile().getParentFile(),
pomInfo.getBuildDirectory() + "/" + pomInfo.getFinalName() );
- System.out.println("Using IT Plugin Jar:
"+artifactFile.getAbsolutePath());
+ File artifactFile = new File( pomInfo.getPomFile().getParentFile(),
+ pomInfo.getBuildDirectory() + "/" +
pomInfo.getFinalName() );
+ System.out.println( "Using IT Plugin Jar: " +
artifactFile.getAbsolutePath() );
try
{
MavenProject project = projectBuilder.build( pomInfo.getPomFile(),
repositoryTool
@@ -328,10 +330,11 @@
buildDirectory = "target";
}
- buildDirectory = (
buildDirectory+File.separatorChar+"it-build-target" );
+ buildDirectory = ( buildDirectory + File.separatorChar +
"it-build-target" );
build.setDirectory( buildDirectory );
- build.setOutputDirectory(
buildDirectory+File.separatorChar+"classes" );
- System.out.println("Using "+build.getDirectory()+" and
"+build.getOutputDirectory()+" to build IT version of plugin");
+ build.setOutputDirectory( buildDirectory + File.separatorChar +
"classes" );
+ System.out.println( "Using " + build.getDirectory() + " and " +
build.getOutputDirectory()
+ + " to build IT version of plugin" );
model.setBuild( build );
finalName = build.getFinalName();
Modified:
maven/plugin-testing/trunk/maven-plugin-testing-tools/src/main/java/org/apache/maven/shared/test/plugin/RepositoryTool.java
URL:
http://svn.apache.org/viewvc/maven/plugin-testing/trunk/maven-plugin-testing-tools/src/main/java/org/apache/maven/shared/test/plugin/RepositoryTool.java?rev=677929&r1=677928&r2=677929&view=diff
==============================================================================
---
maven/plugin-testing/trunk/maven-plugin-testing-tools/src/main/java/org/apache/maven/shared/test/plugin/RepositoryTool.java
(original)
+++
maven/plugin-testing/trunk/maven-plugin-testing-tools/src/main/java/org/apache/maven/shared/test/plugin/RepositoryTool.java
Fri Jul 18 08:13:08 2008
@@ -185,7 +185,8 @@
* @param targetLocalRepoBasedir
* @throws TestToolsException if any
*/
- public void createLocalRepositoryFromComponentProject( MavenProject
project, File realPomFile, File targetLocalRepoBasedir )
+ public void createLocalRepositoryFromComponentProject( MavenProject
project, File realPomFile,
+ File
targetLocalRepoBasedir )
throws TestToolsException
{
Artifact artifact = project.getArtifact();
