Author: jdcasey
Date: Fri Sep 11 21:50:37 2009
New Revision: 814046
URL: http://svn.apache.org/viewvc?rev=814046&view=rev
Log:
Convert to require JDK 1.5, and add IT for custom expression delimiters for
resource filtering. Made a minor bugfix to compensate for the ${*} delimiter,
in case it is specified.
Added:
maven/plugins/trunk/maven-remote-resources-plugin/src/it/resources/custom-filter-delim/
maven/plugins/trunk/maven-remote-resources-plugin/src/it/resources/custom-filter-delim/pom.xml
(with props)
maven/plugins/trunk/maven-remote-resources-plugin/src/it/resources/custom-filter-delim/src/
maven/plugins/trunk/maven-remote-resources-plugin/src/it/resources/custom-filter-delim/src/main/
maven/plugins/trunk/maven-remote-resources-plugin/src/it/resources/custom-filter-delim/src/main/java/
maven/plugins/trunk/maven-remote-resources-plugin/src/it/resources/custom-filter-delim/src/main/java/org/
maven/plugins/trunk/maven-remote-resources-plugin/src/it/resources/custom-filter-delim/src/main/java/org/apache/
maven/plugins/trunk/maven-remote-resources-plugin/src/it/resources/custom-filter-delim/src/main/java/org/apache/maven/
maven/plugins/trunk/maven-remote-resources-plugin/src/it/resources/custom-filter-delim/src/main/java/org/apache/maven/plugin/
maven/plugins/trunk/maven-remote-resources-plugin/src/it/resources/custom-filter-delim/src/main/java/org/apache/maven/plugin/rresource/
maven/plugins/trunk/maven-remote-resources-plugin/src/it/resources/custom-filter-delim/src/main/java/org/apache/maven/plugin/rresource/it/
maven/plugins/trunk/maven-remote-resources-plugin/src/it/resources/custom-filter-delim/src/main/java/org/apache/maven/plugin/rresource/it/App.java
(with props)
maven/plugins/trunk/maven-remote-resources-plugin/src/it/resources/custom-filter-delim/src/main/resources/
maven/plugins/trunk/maven-remote-resources-plugin/src/it/resources/custom-filter-delim/src/main/resources/DEPENDENCIES
maven/plugins/trunk/maven-remote-resources-plugin/src/test/java/org/apache/maven/plugin/resources/remote/it/IT_CustomFilterDelimiter.java
(with props)
Modified:
maven/plugins/trunk/maven-remote-resources-plugin/pom.xml
maven/plugins/trunk/maven-remote-resources-plugin/src/main/java/org/apache/maven/plugin/resources/remote/BundleRemoteResourcesMojo.java
maven/plugins/trunk/maven-remote-resources-plugin/src/main/java/org/apache/maven/plugin/resources/remote/ProcessRemoteResourcesMojo.java
maven/plugins/trunk/maven-remote-resources-plugin/src/test/java/org/apache/maven/plugin/resources/remote/it/IT002_FilterLocalOverride.java
Modified: maven/plugins/trunk/maven-remote-resources-plugin/pom.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-remote-resources-plugin/pom.xml?rev=814046&r1=814045&r2=814046&view=diff
==============================================================================
--- maven/plugins/trunk/maven-remote-resources-plugin/pom.xml (original)
+++ maven/plugins/trunk/maven-remote-resources-plugin/pom.xml Fri Sep 11
21:50:37 2009
@@ -277,6 +277,16 @@
<testResource>
<directory>src/it/resources</directory>
<filtering>true</filtering>
+ <excludes>
+ <exclude>custom-filter-delim/src/main/resources/**</exclude>
+ </excludes>
+ </testResource>
+ <testResource>
+ <directory>src/it/resources</directory>
+ <filtering>false</filtering>
+ <includes>
+ <include>custom-filter-delim/src/main/resources/**</include>
+ </includes>
</testResource>
</testResources>
Added:
maven/plugins/trunk/maven-remote-resources-plugin/src/it/resources/custom-filter-delim/pom.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-remote-resources-plugin/src/it/resources/custom-filter-delim/pom.xml?rev=814046&view=auto
==============================================================================
---
maven/plugins/trunk/maven-remote-resources-plugin/src/it/resources/custom-filter-delim/pom.xml
(added)
+++
maven/plugins/trunk/maven-remote-resources-plugin/src/it/resources/custom-filter-delim/pom.xml
Fri Sep 11 21:50:37 2009
@@ -0,0 +1,56 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd";>
+ <modelVersion>4.0.0</modelVersion>
+
+ <groupId>org.apache.maven.plugin.rresource.it</groupId>
+ <artifactId>custom-filter-delim</artifactId>
+ <version>${project.version}</version>
+
+ <repositories>
+ <repository>
+ <id>main-local</id>
+ <url>file:${localRepository}</url>
+ <releases>
+ <enabled>true</enabled>
+ </releases>
+ <snapshots>
+ <enabled>true</enabled>
+ </snapshots>
+ </repository>
+ </repositories>
+
+ <build>
+ <resources>
+ <resource>
+ <directory>src/main/resources</directory>
+ <filtering>true</filtering>
+ </resource>
+ </resources>
+
+ <plugins>
+ <plugin>
+ <artifactId>maven-remote-resources-plugin</artifactId>
+ <version>${project.version}</version>
+ <executions>
+ <execution>
+ <id>remote-resources</id>
+ <phase>validate</phase>
+ <goals>
+ <goal>process</goal>
+ </goals>
+ <configuration>
+ <resourceBundles>
+
<resourceBundle>org.apache.maven.plugin.rresource.it:resource-bundle-with-template:${project.version}</resourceBundle>
+ </resourceBundles>
+ <filterDelimiters>
+ <filterDelimiter>${*}</filterDelimiter>
+ </filterDelimiters>
+ <filterUsesDefaultDelimiters>false</filterUsesDefaultDelimiters>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+
+</project>
Propchange:
maven/plugins/trunk/maven-remote-resources-plugin/src/it/resources/custom-filter-delim/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Added:
maven/plugins/trunk/maven-remote-resources-plugin/src/it/resources/custom-filter-delim/src/main/java/org/apache/maven/plugin/rresource/it/App.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-remote-resources-plugin/src/it/resources/custom-filter-delim/src/main/java/org/apache/maven/plugin/rresource/it/App.java?rev=814046&view=auto
==============================================================================
---
maven/plugins/trunk/maven-remote-resources-plugin/src/it/resources/custom-filter-delim/src/main/java/org/apache/maven/plugin/rresource/it/App.java
(added)
+++
maven/plugins/trunk/maven-remote-resources-plugin/src/it/resources/custom-filter-delim/src/main/java/org/apache/maven/plugin/rresource/it/App.java
Fri Sep 11 21:50:37 2009
@@ -0,0 +1,13 @@
+package org.apache.maven.plugin.rresource.it;
+
+/**
+ * Hello world!
+ *
+ */
+public class App
+{
+ public static void main( String[] args )
+ {
+ System.out.println( "Hello World!" );
+ }
+}
Propchange:
maven/plugins/trunk/maven-remote-resources-plugin/src/it/resources/custom-filter-delim/src/main/java/org/apache/maven/plugin/rresource/it/App.java
------------------------------------------------------------------------------
svn:eol-style = native
Added:
maven/plugins/trunk/maven-remote-resources-plugin/src/it/resources/custom-filter-delim/src/main/resources/DEPENDENCIES
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-remote-resources-plugin/src/it/resources/custom-filter-delim/src/main/resources/DEPENDENCIES?rev=814046&view=auto
==============================================================================
---
maven/plugins/trunk/maven-remote-resources-plugin/src/it/resources/custom-filter-delim/src/main/resources/DEPENDENCIES
(added)
+++
maven/plugins/trunk/maven-remote-resources-plugin/src/it/resources/custom-filter-delim/src/main/resources/DEPENDENCIES
Fri Sep 11 21:50:37 2009
@@ -0,0 +1 @@
+Override: ${project.artifactId}
Modified:
maven/plugins/trunk/maven-remote-resources-plugin/src/main/java/org/apache/maven/plugin/resources/remote/BundleRemoteResourcesMojo.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-remote-resources-plugin/src/main/java/org/apache/maven/plugin/resources/remote/BundleRemoteResourcesMojo.java?rev=814046&r1=814045&r2=814046&view=diff
==============================================================================
---
maven/plugins/trunk/maven-remote-resources-plugin/src/main/java/org/apache/maven/plugin/resources/remote/BundleRemoteResourcesMojo.java
(original)
+++
maven/plugins/trunk/maven-remote-resources-plugin/src/main/java/org/apache/maven/plugin/resources/remote/BundleRemoteResourcesMojo.java
Fri Sep 11 21:50:37 2009
@@ -26,13 +26,12 @@
import org.codehaus.plexus.util.FileUtils;
import org.codehaus.plexus.util.StringUtils;
-import java.util.Arrays;
-import java.util.List;
-import java.util.Iterator;
import java.io.File;
+import java.io.FileWriter;
import java.io.IOException;
import java.io.Writer;
-import java.io.FileWriter;
+import java.util.Arrays;
+import java.util.List;
/**
* Bundle up resources that should be considered as a remote-resource.
@@ -126,12 +125,10 @@
scanner.addDefaultExcludes();
scanner.scan();
- List includedFiles = Arrays.asList( scanner.getIncludedFiles() );
+ List<String> includedFiles = Arrays.asList( scanner.getIncludedFiles()
);
- for ( Iterator i = includedFiles.iterator(); i.hasNext(); )
+ for ( String resource : includedFiles )
{
- String resource = (String) i.next();
-
remoteResourcesBundle.addRemoteResource( StringUtils.replace(
resource, '\\', '/' ) );
}
Modified:
maven/plugins/trunk/maven-remote-resources-plugin/src/main/java/org/apache/maven/plugin/resources/remote/ProcessRemoteResourcesMojo.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-remote-resources-plugin/src/main/java/org/apache/maven/plugin/resources/remote/ProcessRemoteResourcesMojo.java?rev=814046&r1=814045&r2=814046&view=diff
==============================================================================
---
maven/plugins/trunk/maven-remote-resources-plugin/src/main/java/org/apache/maven/plugin/resources/remote/ProcessRemoteResourcesMojo.java
(original)
+++
maven/plugins/trunk/maven-remote-resources-plugin/src/main/java/org/apache/maven/plugin/resources/remote/ProcessRemoteResourcesMojo.java
Fri Sep 11 21:50:37 2009
@@ -93,7 +93,6 @@
import java.util.Date;
import java.util.Enumeration;
import java.util.HashMap;
-import java.util.Iterator;
import java.util.LinkedHashSet;
import java.util.List;
import java.util.Map;
@@ -149,13 +148,13 @@
* @parameter
* @since 1.1
*/
- protected List filterDelimiters;
+ protected List<String> filterDelimiters;
/**
* @parameter default-value="true"
* @since 1.1
*/
- protected boolean filterUsesDefaultDelimiters;
+ protected boolean useDefaultFilterDelimiters;
/**
* If true, only generate resources in the directory of the root project
in a multimodule build.
@@ -198,7 +197,7 @@
* @readonly
* @required
*/
- private List remoteArtifactRepositories;
+ private List<ArtifactRepository> remoteArtifactRepositories;
/**
* The current Maven project.
@@ -241,15 +240,13 @@
* @parameter
* @since 1.1
*/
- private List supplementalModelArtifacts;
+ private List<String> supplementalModelArtifacts;
/**
* Map of artifacts to supplemental project object models.
*/
- private Map supplementModels;
+ private Map<String, Model> supplementModels;
-
-
/**
* Merges supplemental data model with artifact
* metadata. Useful when processing artifacts with
@@ -267,7 +264,7 @@
* @parameter
* @required
*/
- private List resourceBundles;
+ private List<String> resourceBundles;
/**
* Skip remote-resource processing
@@ -298,7 +295,7 @@
*
* @parameter
*/
- private Map properties = new HashMap();
+ private Map<String, String> properties = new HashMap<String, String>();
/**
* The list of resources defined for the project.
@@ -307,7 +304,7 @@
* @readonly
* @required
*/
- private List resources;
+ private List<Resource> resources;
/**
* Artifact downloader.
@@ -437,6 +434,7 @@
*/
protected ProjectDependenciesResolver dependencyResolver;
+ @SuppressWarnings( "unchecked" )
public void execute()
throws MojoExecutionException
{
@@ -484,7 +482,7 @@
validate();
- List resourceBundleArtifacts = downloadBundles( resourceBundles );
+ List<File> resourceBundleArtifacts = downloadBundles(
resourceBundles );
supplementModels = loadSupplements( supplementalModels );
VelocityContext context = new VelocityContext( properties );
@@ -562,12 +560,10 @@
{
if ( supplementalModelArtifacts != null &&
!supplementalModelArtifacts.isEmpty() )
{
- List artifacts = downloadBundles( supplementalModelArtifacts );
+ List<File> artifacts = downloadBundles( supplementalModelArtifacts
);
- for ( Iterator i = artifacts.iterator(); i.hasNext(); )
+ for ( File artifact : artifacts )
{
- File artifact = (File) i.next();
-
if ( artifact.isDirectory() )
{
locator.addSearchPath( FileResourceLoader.ID,
artifact.getAbsolutePath() );
@@ -590,16 +586,17 @@
}
}
- protected List getProjects()
+ @SuppressWarnings( "unchecked" )
+ protected List<MavenProject> getProjects()
throws MojoExecutionException
{
- List projects = new ArrayList();
+ List<MavenProject> projects = new ArrayList<MavenProject>();
// add filters in well known order, least specific to most specific
FilterArtifacts filter = new FilterArtifacts();
- Set depArtifacts;
- Set artifacts = resolveProjectArtifacts();
+ Set<Artifact> depArtifacts;
+ Set<Artifact> artifacts = resolveProjectArtifacts();
if ( runOnlyAtExecutionRoot )
{
depArtifacts = aggregateProjectDependencyArtifacts();
@@ -625,12 +622,11 @@
}
- for ( Iterator it = artifacts.iterator(); it.hasNext(); )
+ for ( Artifact artifact : artifacts )
{
- Artifact artifact = (Artifact) it.next();
try
{
- List remoteRepo = remoteArtifactRepositories;
+ List<ArtifactRepository> remoteRepo =
remoteArtifactRepositories;
if ( artifact.isSnapshot() )
{
VersionRange rng = VersionRange.createFromVersion(
artifact.getBaseVersion() );
@@ -682,14 +678,15 @@
return projects;
}
- private Set resolveProjectArtifacts()
+ @SuppressWarnings( "unchecked" )
+ private Set<Artifact> resolveProjectArtifacts()
throws MojoExecutionException
{
try
{
if ( runOnlyAtExecutionRoot )
{
- List projects = mavenSession.getSortedProjects();
+ List<MavenProject> projects = mavenSession.getSortedProjects();
return dependencyResolver.resolve( projects,
Collections.singleton( Artifact.SCOPE_TEST ), mavenSession );
}
else
@@ -709,20 +706,20 @@
}
}
- private Set aggregateProjectDependencyArtifacts()
+ @SuppressWarnings( "unchecked" )
+ private Set<Artifact> aggregateProjectDependencyArtifacts()
throws MojoExecutionException
{
- Set artifacts = new LinkedHashSet();
+ Set<Artifact> artifacts = new LinkedHashSet<Artifact>();
- List projects = mavenSession.getSortedProjects();
- for ( Iterator it = projects.iterator(); it.hasNext(); )
+ List<MavenProject> projects = mavenSession.getSortedProjects();
+ for ( MavenProject p : projects )
{
- MavenProject p = (MavenProject) it.next();
if ( p.getDependencyArtifacts() == null )
{
try
{
- Set depArtifacts = p.createArtifacts( artifactFactory,
null, null );
+ Set<Artifact> depArtifacts = p.createArtifacts(
artifactFactory, null, null );
p.setDependencyArtifacts( depArtifacts );
if ( depArtifacts != null && !depArtifacts.isEmpty() )
@@ -741,22 +738,20 @@
return artifacts;
}
- protected Map getProjectsSortedByOrganization( List projects )
+ protected Map<Organization, List<MavenProject>>
getProjectsSortedByOrganization( List<MavenProject> projects )
throws MojoExecutionException
{
- Map organizations = new TreeMap( new OrganizationComparator() );
- List unknownOrganization = new ArrayList();
+ Map<Organization, List<MavenProject>> organizations = new
TreeMap<Organization, List<MavenProject>>( new OrganizationComparator() );
+ List<MavenProject> unknownOrganization = new ArrayList<MavenProject>();
- for ( Iterator i = projects.iterator(); i.hasNext(); )
+ for ( MavenProject p : projects )
{
- MavenProject p = (MavenProject) i.next();
-
if ( p.getOrganization() != null && StringUtils.isNotEmpty(
p.getOrganization().getName() ) )
{
- List sortedProjects = (List) organizations.get(
p.getOrganization() );
+ List<MavenProject> sortedProjects = (List<MavenProject>)
organizations.get( p.getOrganization() );
if ( sortedProjects == null )
{
- sortedProjects = new ArrayList();
+ sortedProjects = new ArrayList<MavenProject>();
}
sortedProjects.add( p );
@@ -780,9 +775,8 @@
protected boolean copyResourceIfExists( File file, String relFileName,
VelocityContext context )
throws IOException, MojoExecutionException
{
- for ( Iterator i = resources.iterator(); i.hasNext(); )
+ for ( Resource resource : resources )
{
- Resource resource = (Resource) i.next();
File resourceDirectory = new File( resource.getDirectory() );
if ( !resourceDirectory.exists() )
@@ -868,6 +862,7 @@
return false;
}
+ @SuppressWarnings( "unchecked" )
private MavenFileFilterRequest setupRequest( Resource resource, File
source, File file )
{
MavenFileFilterRequest req = new MavenFileFilterRequest();
@@ -886,12 +881,23 @@
if ( filterDelimiters != null && !filterDelimiters.isEmpty() )
{
- LinkedHashSet delims = new LinkedHashSet();
- if ( filterUsesDefaultDelimiters )
+ LinkedHashSet<String> delims = new LinkedHashSet<String>();
+ if ( useDefaultFilterDelimiters )
{
delims.addAll( req.getDelimiters() );
}
- delims.addAll( filterDelimiters );
+
+ for ( String delim : filterDelimiters )
+ {
+ if ( delim == null )
+ {
+ delims.add( "${*}" );
+ }
+ else
+ {
+ delims.add( delim );
+ }
+ }
req.setDelimiters( delims );
}
@@ -904,10 +910,8 @@
{
int bundleCount = 1;
- for ( Iterator i = resourceBundles.iterator(); i.hasNext(); )
+ for ( String artifactDescriptor : resourceBundles )
{
- String artifactDescriptor = (String) i.next();
-
// groupId:artifactId:version
String[] s = StringUtils.split( artifactDescriptor, ":" );
@@ -959,7 +963,7 @@
inceptionYear = year;
}
context.put( "project", project );
- List projects = getProjects();
+ List<MavenProject> projects = getProjects();
context.put( "projects", projects );
context.put( "projectsSortedByOrganization",
getProjectsSortedByOrganization( projects ) );
@@ -975,27 +979,25 @@
}
}
- private List downloadBundles( List bundles )
+ @SuppressWarnings( "unchecked" )
+ private List<File> downloadBundles( List<String> bundles )
throws MojoExecutionException
{
- List bundleArtifacts = new ArrayList();
+ List<File> bundleArtifacts = new ArrayList<File>();
try
{
- for ( Iterator i = bundles.iterator(); i.hasNext(); )
+ for ( String artifactDescriptor : bundles )
{
- String artifactDescriptor = (String) i.next();
// groupId:artifactId:version
String[] s = artifactDescriptor.split( ":" );
File artifact = null;
//check if the artifact is part of the reactor
if ( mavenSession != null )
{
- List list = mavenSession.getSortedProjects();
- Iterator it = list.iterator();
- while ( it.hasNext() )
+ List<MavenProject> list = mavenSession.getSortedProjects();
+ for ( MavenProject p : list )
{
- MavenProject p = (MavenProject) it.next();
if ( s[0].equals( p.getGroupId() )
&& s[1].equals( p.getArtifactId() )
&& s[2].equals( p.getVersion() ) )
@@ -1024,14 +1026,13 @@
return bundleArtifacts;
}
- private void initalizeClassloader( RemoteResourcesClassLoader cl, List
artifacts )
+ private void initalizeClassloader( RemoteResourcesClassLoader cl,
List<File> artifacts )
throws MojoExecutionException
{
try
{
- for ( Iterator i = artifacts.iterator(); i.hasNext(); )
+ for ( File artifact : artifacts )
{
- File artifact = (File) i.next();
cl.addURL( artifact.toURI().toURL() );
}
}
@@ -1041,6 +1042,7 @@
}
}
+ @SuppressWarnings( "unchecked" )
protected void processResourceBundles( RemoteResourcesClassLoader
classLoader, VelocityContext context )
throws MojoExecutionException
{
@@ -1049,7 +1051,7 @@
try
{
- for ( Enumeration e = classLoader.getResources(
BundleRemoteResourcesMojo.RESOURCES_MANIFEST );
+ for ( Enumeration<URL> e = classLoader.getResources(
BundleRemoteResourcesMojo.RESOURCES_MANIFEST );
e.hasMoreElements(); )
{
URL url = (URL) e.nextElement();
@@ -1062,10 +1064,8 @@
RemoteResourcesBundle bundle = bundleReader.read( reader );
- for ( Iterator i = bundle.getRemoteResources().iterator();
i.hasNext(); )
+ for ( String bundleResource : (List<String>)
bundle.getRemoteResources() )
{
- String bundleResource = (String) i.next();
-
String projectResource = bundleResource;
boolean doVelocity = false;
@@ -1239,16 +1239,17 @@
return groupId.trim() + ":" + artifactId.trim();
}
- private Map loadSupplements( String models[] )
+ @SuppressWarnings( "unchecked" )
+ private Map<String, Model> loadSupplements( String models[] )
throws MojoExecutionException
{
if ( models == null )
{
getLog().debug( "Supplemental data models won't be loaded. " +
"No models specified." );
- return Collections.EMPTY_MAP;
+ return Collections.emptyMap();
}
- List supplements = new ArrayList();
+ List<Supplement> supplements = new ArrayList<Supplement>();
for ( int idx = 0; idx < models.length; idx++ )
{
String set = models[idx];
@@ -1283,11 +1284,9 @@
getLog().debug( "Loading supplements complete." );
- Map supplementMap = new HashMap();
- for ( Iterator i = supplements.iterator(); i.hasNext(); )
+ Map<String, Model> supplementMap = new HashMap<String, Model>();
+ for ( Supplement sd : supplements )
{
- Supplement sd = (Supplement) i.next();
-
Xpp3Dom dom = (Xpp3Dom) sd.getProject();
Model m = getSupplement( dom );
@@ -1319,12 +1318,10 @@
}
class OrganizationComparator
- implements Comparator
+ implements Comparator<Organization>
{
- public int compare( Object o1, Object o2 )
+ public int compare( Organization org1, Organization org2 )
{
- Organization org1 = (Organization) o1;
- Organization org2 = (Organization) o2;
int i = compareStrings( org1.getName(), org2.getName() );
if (i == 0)
{
@@ -1333,7 +1330,7 @@
return i;
}
- public boolean equals( Object o1, Object o2 )
+ public boolean equals( Organization o1, Organization o2 )
{
return compare(o1, o2) == 0;
}
@@ -1357,21 +1354,16 @@
}
class ProjectComparator
- implements Comparator
+ implements Comparator<MavenProject>
{
- public int compare( Object o1, Object o2 )
+ @SuppressWarnings( "unchecked" )
+ public int compare( MavenProject p1, MavenProject p2 )
{
- MavenProject p1 = (MavenProject) o1;
- MavenProject p2 = (MavenProject) o2;
-
return p1.getArtifact().compareTo( p2.getArtifact() );
}
- public boolean equals( Object o1, Object o2 )
+ public boolean equals( MavenProject p1, MavenProject p2 )
{
- MavenProject p1 = (MavenProject) o1;
- MavenProject p2 = (MavenProject) o2;
-
return p1.getArtifact().equals( p2.getArtifact() );
}
}
Modified:
maven/plugins/trunk/maven-remote-resources-plugin/src/test/java/org/apache/maven/plugin/resources/remote/it/IT002_FilterLocalOverride.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-remote-resources-plugin/src/test/java/org/apache/maven/plugin/resources/remote/it/IT002_FilterLocalOverride.java?rev=814046&r1=814045&r2=814046&view=diff
==============================================================================
---
maven/plugins/trunk/maven-remote-resources-plugin/src/test/java/org/apache/maven/plugin/resources/remote/it/IT002_FilterLocalOverride.java
(original)
+++
maven/plugins/trunk/maven-remote-resources-plugin/src/test/java/org/apache/maven/plugin/resources/remote/it/IT002_FilterLocalOverride.java
Fri Sep 11 21:50:37 2009
@@ -19,8 +19,6 @@
File dir = TestUtils.getTestDir( "002-filterLocalOverride" );
Verifier verifier = new Verifier( dir.getAbsolutePath() );
- verifier.getCliOptions().add( "-X" );
-
verifier.executeGoal( "generate-resources" );
verifier.verifyErrorFreeLog();
verifier.resetStreams();
Added:
maven/plugins/trunk/maven-remote-resources-plugin/src/test/java/org/apache/maven/plugin/resources/remote/it/IT_CustomFilterDelimiter.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-remote-resources-plugin/src/test/java/org/apache/maven/plugin/resources/remote/it/IT_CustomFilterDelimiter.java?rev=814046&view=auto
==============================================================================
---
maven/plugins/trunk/maven-remote-resources-plugin/src/test/java/org/apache/maven/plugin/resources/remote/it/IT_CustomFilterDelimiter.java
(added)
+++
maven/plugins/trunk/maven-remote-resources-plugin/src/test/java/org/apache/maven/plugin/resources/remote/it/IT_CustomFilterDelimiter.java
Fri Sep 11 21:50:37 2009
@@ -0,0 +1,35 @@
+package org.apache.maven.plugin.resources.remote.it;
+
+import org.apache.maven.it.VerificationException;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.plugin.resources.remote.it.support.TestUtils;
+import org.codehaus.plexus.util.FileUtils;
+
+import java.io.File;
+import java.io.IOException;
+import java.net.URISyntaxException;
+
+public class IT_CustomFilterDelimiter
+ extends AbstractIT
+{
+
+ @SuppressWarnings( "unchecked" )
+ public void test()
+ throws IOException, URISyntaxException, VerificationException
+ {
+ File dir = TestUtils.getTestDir( "custom-filter-delim" );
+ Verifier verifier = new Verifier( dir.getAbsolutePath() );
+
+ verifier.getCliOptions().add( "-X" );
+
+ verifier.executeGoal( "validate" );
+ verifier.verifyErrorFreeLog();
+ verifier.resetStreams();
+
+ File output = new File( dir,
"target/maven-shared-archive-resources/DEPENDENCIES" );
+ String content = FileUtils.fileRead( output );
+
+ assertTrue( content.indexOf( "Override: custom-filter-delim" ) > -1 );
+ }
+
+}
Propchange:
maven/plugins/trunk/maven-remote-resources-plugin/src/test/java/org/apache/maven/plugin/resources/remote/it/IT_CustomFilterDelimiter.java
------------------------------------------------------------------------------
svn:eol-style = native
