You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by ma...@apache.org on 2008/02/29 17:41:55 UTC
svn commit: r632382 - in /maven/sandbox/trunk/shared/maven-runtime/src:
main/java/org/apache/maven/shared/runtime/
test/java/org/apache/maven/shared/runtime/
Author: markh
Date: Fri Feb 29 08:41:46 2008
New Revision: 632382
URL: http://svn.apache.org/viewvc?rev=632382&view=rev
Log:
Renamed method to avoid ambiguity
Modified:
maven/sandbox/trunk/shared/maven-runtime/src/main/java/org/apache/maven/shared/runtime/DefaultMavenRuntime.java
maven/sandbox/trunk/shared/maven-runtime/src/main/java/org/apache/maven/shared/runtime/MavenRuntime.java
maven/sandbox/trunk/shared/maven-runtime/src/test/java/org/apache/maven/shared/runtime/DefaultMavenRuntimeTest.java
Modified: maven/sandbox/trunk/shared/maven-runtime/src/main/java/org/apache/maven/shared/runtime/DefaultMavenRuntime.java
URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/shared/maven-runtime/src/main/java/org/apache/maven/shared/runtime/DefaultMavenRuntime.java?rev=632382&r1=632381&r2=632382&view=diff
==============================================================================
--- maven/sandbox/trunk/shared/maven-runtime/src/main/java/org/apache/maven/shared/runtime/DefaultMavenRuntime.java (original)
+++ maven/sandbox/trunk/shared/maven-runtime/src/main/java/org/apache/maven/shared/runtime/DefaultMavenRuntime.java Fri Feb 29 08:41:46 2008
@@ -50,7 +50,7 @@
/**
* {@inheritDoc}
*/
- public List getProjectProperties( ClassLoader classLoader ) throws MavenRuntimeException
+ public List getProjectsProperties( ClassLoader classLoader ) throws MavenRuntimeException
{
PropertiesMavenRuntimeVisitor visitor = new PropertiesMavenRuntimeVisitor();
Modified: maven/sandbox/trunk/shared/maven-runtime/src/main/java/org/apache/maven/shared/runtime/MavenRuntime.java
URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/shared/maven-runtime/src/main/java/org/apache/maven/shared/runtime/MavenRuntime.java?rev=632382&r1=632381&r2=632382&view=diff
==============================================================================
--- maven/sandbox/trunk/shared/maven-runtime/src/main/java/org/apache/maven/shared/runtime/MavenRuntime.java (original)
+++ maven/sandbox/trunk/shared/maven-runtime/src/main/java/org/apache/maven/shared/runtime/MavenRuntime.java Fri Feb 29 08:41:46 2008
@@ -61,7 +61,7 @@
* @throws MavenRuntimeException
* if an error occurred introspecting the Maven runtime environment
*/
- List getProjectProperties( ClassLoader classLoader ) throws MavenRuntimeException;
+ List getProjectsProperties( ClassLoader classLoader ) throws MavenRuntimeException;
/**
* Gets the specified class's Maven project.
Modified: maven/sandbox/trunk/shared/maven-runtime/src/test/java/org/apache/maven/shared/runtime/DefaultMavenRuntimeTest.java
URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/shared/maven-runtime/src/test/java/org/apache/maven/shared/runtime/DefaultMavenRuntimeTest.java?rev=632382&r1=632381&r2=632382&view=diff
==============================================================================
--- maven/sandbox/trunk/shared/maven-runtime/src/test/java/org/apache/maven/shared/runtime/DefaultMavenRuntimeTest.java (original)
+++ maven/sandbox/trunk/shared/maven-runtime/src/test/java/org/apache/maven/shared/runtime/DefaultMavenRuntimeTest.java Fri Feb 29 08:41:46 2008
@@ -68,7 +68,7 @@
mavenRuntime = (MavenRuntime) lookup( MavenRuntime.ROLE );
}
- // getProjectProperties(Class) tests --------------------------------------
+ // getProjectProperties tests ---------------------------------------------
public void testGetProjectPropertiesWithDefaultPackageClass()
throws TestToolsException, ClassNotFoundException, MavenRuntimeException, IOException
@@ -124,9 +124,9 @@
assertMavenProjectProperties( "org.apache.maven.shared.runtime.tests:testSingleJar:1.0", properties );
}
- // getProjectProperties(ClassLoader) tests --------------------------------
+ // getProjectsProperties tests --------------------------------------------
- public void testGetProjectPropertiesWithSingleJar()
+ public void testGetProjectsPropertiesWithSingleJar()
throws TestToolsException, MavenRuntimeException, IOException
{
packageProject( "testSingleJar/pom.xml" );
@@ -135,14 +135,14 @@
URLClassLoader classLoader = newClassLoader( jar );
- List properties = mavenRuntime.getProjectProperties( classLoader );
+ List properties = mavenRuntime.getProjectsProperties( classLoader );
close( classLoader );
assertMavenProjectProperties( "org.apache.maven.shared.runtime.tests:testSingleJar:1.0", properties );
}
- public void testGetProjectPropertiesWithMultipleJars()
+ public void testGetProjectsPropertiesWithMultipleJars()
throws TestToolsException, MavenRuntimeException, IOException
{
packageProject( "testMultipleJars/project1/pom.xml" );
@@ -155,7 +155,7 @@
URLClassLoader classLoader = newClassLoader( new File[] { jar1, jar2, jar3 } );
- List properties = mavenRuntime.getProjectProperties( classLoader );
+ List properties = mavenRuntime.getProjectsProperties( classLoader );
close( classLoader );