You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by kr...@apache.org on 2013/08/25 21:20:08 UTC
svn commit: r1517369 - in /maven/plugins/trunk/maven-rar-plugin/src:
main/java/org/apache/maven/plugin/rar/RarMojo.java
test/java/org/apache/maven/plugin/rar/RarMojoTest.java
Author: krosenvold
Date: Sun Aug 25 19:20:07 2013
New Revision: 1517369
URL: http://svn.apache.org/r1517369
Log:
Java5 for rar plugin, with a little manual tlc
Modified:
maven/plugins/trunk/maven-rar-plugin/src/main/java/org/apache/maven/plugin/rar/RarMojo.java
maven/plugins/trunk/maven-rar-plugin/src/test/java/org/apache/maven/plugin/rar/RarMojoTest.java
Modified: maven/plugins/trunk/maven-rar-plugin/src/main/java/org/apache/maven/plugin/rar/RarMojo.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-rar-plugin/src/main/java/org/apache/maven/plugin/rar/RarMojo.java?rev=1517369&r1=1517368&r2=1517369&view=diff
==============================================================================
--- maven/plugins/trunk/maven-rar-plugin/src/main/java/org/apache/maven/plugin/rar/RarMojo.java (original)
+++ maven/plugins/trunk/maven-rar-plugin/src/main/java/org/apache/maven/plugin/rar/RarMojo.java Sun Aug 25 19:20:07 2013
@@ -44,7 +44,6 @@ import java.io.File;
import java.io.IOException;
import java.util.ArrayList;
import java.util.Collections;
-import java.util.Iterator;
import java.util.LinkedHashSet;
import java.util.List;
import java.util.Set;
@@ -283,7 +282,7 @@ public class RarMojo
// Check if jar file is there and if requested, copy it
try
{
- if ( includeJar.booleanValue() )
+ if (includeJar)
{
File generatedJarFile = new File( outputDirectory, finalName + ".jar" );
if ( generatedJarFile.exists() )
@@ -301,18 +300,16 @@ public class RarMojo
// Copy dependencies
try
{
- Set artifacts = project.getArtifacts();
- for ( Iterator iter = artifacts.iterator(); iter.hasNext(); )
- {
- Artifact artifact = (Artifact) iter.next();
-
- ScopeArtifactFilter filter = new ScopeArtifactFilter( Artifact.SCOPE_RUNTIME );
- if ( !artifact.isOptional() && filter.include( artifact )
- && artifact.getArtifactHandler().isAddedToClasspath() )
- {
- getLog().info( "Copying artifact[" + artifact.getGroupId() + ", " + artifact.getId() + ", "
- + artifact.getScope() + "]" );
- FileUtils.copyFileToDirectory( artifact.getFile(), getBuildDir() );
+ @SuppressWarnings("unchecked")
+ Set<Artifact> artifacts = project.getArtifacts();
+ for (Artifact artifact : artifacts) {
+
+ ScopeArtifactFilter filter = new ScopeArtifactFilter(Artifact.SCOPE_RUNTIME);
+ if (!artifact.isOptional() && filter.include(artifact)
+ && artifact.getArtifactHandler().isAddedToClasspath()) {
+ getLog().info("Copying artifact[" + artifact.getGroupId() + ", " + artifact.getId() + ", "
+ + artifact.getScope() + "]");
+ FileUtils.copyFileToDirectory(artifact.getFile(), getBuildDir());
}
}
}
@@ -355,6 +352,7 @@ public class RarMojo
LinkedHashSet<String> delims = new LinkedHashSet<String>();
if ( useDefaultDelimiters )
{
+ //noinspection unchecked
delims.addAll( mavenResourcesExecution.getDelimiters() );
}
Modified: maven/plugins/trunk/maven-rar-plugin/src/test/java/org/apache/maven/plugin/rar/RarMojoTest.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-rar-plugin/src/test/java/org/apache/maven/plugin/rar/RarMojoTest.java?rev=1517369&r1=1517368&r2=1517369&view=diff
==============================================================================
--- maven/plugins/trunk/maven-rar-plugin/src/test/java/org/apache/maven/plugin/rar/RarMojoTest.java (original)
+++ maven/plugins/trunk/maven-rar-plugin/src/test/java/org/apache/maven/plugin/rar/RarMojoTest.java Sun Aug 25 19:20:07 2013
@@ -27,12 +27,12 @@ import org.codehaus.plexus.util.FileUtil
import java.io.File;
import java.util.ArrayList;
import java.util.Enumeration;
-import java.util.Iterator;
import java.util.List;
/**
* @author <a href="mailto:aramirez@apache.org">Allan Ramirez</a>
*/
+@SuppressWarnings("ConstantConditions")
public class RarMojoTest
extends AbstractMojoTestCase
{
@@ -63,7 +63,7 @@ public class RarMojoTest
Boolean includeJar = (Boolean) getVariableValueFromObject( mojo, "includeJar" );
- assertTrue( includeJar.booleanValue() );
+ assertTrue(includeJar);
//include the project jar to the rar
File projectJar = new File( getBasedir(), "src/test/resources/unit/basic-rar-test/target/test-rar.jar" );
@@ -81,7 +81,7 @@ public class RarMojoTest
File[] fileNames = workDirectory.listFiles();
- List expectedFiles = new ArrayList();
+ List<String> expectedFiles = new ArrayList<String>();
expectedFiles.add( "maven-artifact01-1.0-SNAPSHOT.jar" );
expectedFiles.add( "maven-artifact02-1.0-SNAPSHOT.jar" );
@@ -89,20 +89,16 @@ public class RarMojoTest
assertEquals( "Files in working directory", expectedFiles.size(), fileNames.length );
- for ( int i = 0; i < fileNames.length; i++ )
- {
- String fileName = fileNames[i].getName();
+ for (File fileName1 : fileNames) {
+ String fileName = fileName1.getName();
- assertTrue( expectedFiles.contains( fileName ) );
+ assertTrue(expectedFiles.contains(fileName));
- if ( expectedFiles.contains( fileName ) )
- {
- expectedFiles.remove( fileName );
- assertFalse( expectedFiles.contains( fileName ) );
- }
- else
- {
- fail( fileName + " is not included in expected files." );
+ if (expectedFiles.contains(fileName)) {
+ expectedFiles.remove(fileName);
+ assertFalse(expectedFiles.contains(fileName));
+ } else {
+ fail(fileName + " is not included in expected files.");
}
}
@@ -114,7 +110,7 @@ public class RarMojoTest
assertTrue( rarFile.exists() );
//expected files/directories inside the rar file
- expectedFiles = new ArrayList();
+ expectedFiles = new ArrayList<String>();
expectedFiles.add( "META-INF/maven/org.apache.maven.test/maven-rar-test/pom.properties" );
expectedFiles.add( "META-INF/maven/org.apache.maven.test/maven-rar-test/pom.xml" );
@@ -162,12 +158,11 @@ public class RarMojoTest
File[] fileNames = workDirectory.listFiles();
- List expectedFiles = new ArrayList();
- List fileList = new ArrayList();
+ List<String> expectedFiles = new ArrayList<String>();
+ List<String> fileList = new ArrayList<String>();
- for ( int i = 0; i < fileNames.length; i++ )
- {
- addFileToList( fileNames[i], fileList );
+ for (File fileName : fileNames) {
+ addFileToList(fileName, fileList);
}
expectedFiles.add( "ra.xml" );
@@ -185,7 +180,7 @@ public class RarMojoTest
assertTrue( rarFile.exists() );
//expected files/directories inside the rar file
- expectedFiles = new ArrayList();
+ expectedFiles = new ArrayList<String>();
expectedFiles.add( "META-INF/maven/org.apache.maven.test/maven-rar-test/pom.properties" );
expectedFiles.add( "META-INF/maven/org.apache.maven.test/maven-rar-test/pom.xml" );
@@ -300,24 +295,20 @@ public class RarMojoTest
private int getSizeOfExpectedFiles( List fileList, List expectedFiles )
{
- for ( Iterator iter = fileList.iterator(); iter.hasNext(); )
- {
- String fileName = (String) iter.next();
+ for (Object aFileList : fileList) {
+ String fileName = (String) aFileList;
- if ( expectedFiles.contains( fileName ) )
- {
- expectedFiles.remove( fileName );
- assertFalse( expectedFiles.contains( fileName ) );
- }
- else
- {
- fail( fileName + " is not included in the expected files" );
+ if (expectedFiles.contains(fileName)) {
+ expectedFiles.remove(fileName);
+ assertFalse(expectedFiles.contains(fileName));
+ } else {
+ fail(fileName + " is not included in the expected files");
}
}
return expectedFiles.size();
}
- private void addFileToList( File file, List fileList )
+ private void addFileToList( File file, List<String> fileList )
{
if ( !file.isDirectory() )
{
@@ -329,9 +320,8 @@ public class RarMojoTest
File[] files = file.listFiles();
- for ( int i = 0; i < files.length; i++ )
- {
- addFileToList( files[i], fileList );
+ for (File file1 : files) {
+ addFileToList(file1, fileList);
}
}
}