You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by rf...@apache.org on 2013/10/19 15:25:34 UTC
svn commit: r1533761 - in /maven/shared/trunk/maven-project-utils/src:
main/java/org/apache/maven/shared/project/utils/ProjectUtils.java
test/java/org/apache/maven/shared/project/utils/ProjectUtilsTest.java
Author: rfscholte
Date: Sat Oct 19 13:25:34 2013
New Revision: 1533761
URL: http://svn.apache.org/r1533761
Log:
SharedFolder might cause confusion. It's not about some network share, but about the folder that all the (reactor-)projects share. Renaming it.
Modified:
maven/shared/trunk/maven-project-utils/src/main/java/org/apache/maven/shared/project/utils/ProjectUtils.java
maven/shared/trunk/maven-project-utils/src/test/java/org/apache/maven/shared/project/utils/ProjectUtilsTest.java
Modified: maven/shared/trunk/maven-project-utils/src/main/java/org/apache/maven/shared/project/utils/ProjectUtils.java
URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-project-utils/src/main/java/org/apache/maven/shared/project/utils/ProjectUtils.java?rev=1533761&r1=1533760&r2=1533761&view=diff
==============================================================================
--- maven/shared/trunk/maven-project-utils/src/main/java/org/apache/maven/shared/project/utils/ProjectUtils.java (original)
+++ maven/shared/trunk/maven-project-utils/src/main/java/org/apache/maven/shared/project/utils/ProjectUtils.java Sat Oct 19 13:25:34 2013
@@ -223,7 +223,7 @@ public final class ProjectUtils
* @param project the project
* @return the shared folder
*/
- public static File getSharedFolder( MavenProject project )
+ public static File getJoinedFolder( MavenProject project )
{
if( project == null )
{
@@ -232,7 +232,7 @@ public final class ProjectUtils
try
{
- return getSharedFolder( project.getBasedir(), project.getModel() );
+ return getJoinedFolder( project.getBasedir(), project.getModel() );
}
catch ( IOException e )
{
@@ -248,9 +248,9 @@ public final class ProjectUtils
return null; //@todo fix exception handling
}
- private static final File getSharedFolder( File baseDirectory, Model model ) throws IOException, XmlPullParserException
+ private static final File getJoinedFolder( File baseDirectory, Model model ) throws IOException, XmlPullParserException
{
- File sharedFolder = baseDirectory;
+ File joinedFolder = baseDirectory;
for( String module : getAllModules( model ).keySet() )
{
@@ -258,19 +258,19 @@ public final class ProjectUtils
Model submodel = readModel( moduleFile );
- File modulesSharedFolder = getSharedFolder( moduleFile.getParentFile(), submodel );
+ File modulesJoinedFolder = getJoinedFolder( moduleFile.getParentFile(), submodel );
- sharedFolder = getSharedFolder( sharedFolder, modulesSharedFolder );
+ joinedFolder = getJoinedFolder( joinedFolder, modulesJoinedFolder );
}
- return sharedFolder;
+ return joinedFolder;
}
// Don't make this method public, it has nothing to do with a MavenProject.
// If required on more places, create a separate Utils-class
- protected static final File getSharedFolder( File lhs, File rhs )
+ protected static final File getJoinedFolder( File lhs, File rhs )
{
- File sharedFolder = null;
+ File joinedFolder = null;
Stack<File> lhsStack = new Stack<File>();
@@ -296,10 +296,10 @@ public final class ProjectUtils
if( nextFile.isDirectory() && nextFile.equals( rhsStack.pop() ) )
{
- sharedFolder = nextFile;
+ joinedFolder = nextFile;
}
}
- return sharedFolder;
+ return joinedFolder;
}
}
Modified: maven/shared/trunk/maven-project-utils/src/test/java/org/apache/maven/shared/project/utils/ProjectUtilsTest.java
URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-project-utils/src/test/java/org/apache/maven/shared/project/utils/ProjectUtilsTest.java?rev=1533761&r1=1533760&r2=1533761&view=diff
==============================================================================
--- maven/shared/trunk/maven-project-utils/src/test/java/org/apache/maven/shared/project/utils/ProjectUtilsTest.java (original)
+++ maven/shared/trunk/maven-project-utils/src/test/java/org/apache/maven/shared/project/utils/ProjectUtilsTest.java Sat Oct 19 13:25:34 2013
@@ -37,85 +37,85 @@ public class ProjectUtilsTest
}
@Test
- public void getSharedFolderNullDirectories()
+ public void getJoinedFolderNullDirectories()
throws Exception
{
- assertNull( ProjectUtils.getSharedFolder( null, null ) );
+ assertNull( ProjectUtils.getJoinedFolder( null, null ) );
}
@Test
- public void getSharedFolderNullLeftFolder()
+ public void getJoinedFolderNullLeftFolder()
throws Exception
{
- assertNull( ProjectUtils.getSharedFolder( null, ROOT_FOLDER ) );
+ assertNull( ProjectUtils.getJoinedFolder( null, ROOT_FOLDER ) );
}
@Test
- public void getSharedFolderNullRightFolder()
+ public void getJoinedFolderNullRightFolder()
throws Exception
{
- assertNull( ProjectUtils.getSharedFolder( ROOT_FOLDER, null ) );
+ assertNull( ProjectUtils.getJoinedFolder( ROOT_FOLDER, null ) );
}
@Test
- public void getSharedFolderSameDirectory()
+ public void getJoinedFolderSameDirectory()
throws Exception
{
File folder = ROOT_FOLDER;
- assertEquals( folder, ProjectUtils.getSharedFolder( folder, folder ) );
+ assertEquals( folder, ProjectUtils.getJoinedFolder( folder, folder ) );
}
@Test
- public void getSharedFolderSameFile()
+ public void getJoinedFolderSameFile()
throws Exception
{
File pomFile = new File( "pom.xml" );
- assertEquals( pomFile.getParentFile(), ProjectUtils.getSharedFolder( pomFile, pomFile ) );
+ assertEquals( pomFile.getParentFile(), ProjectUtils.getJoinedFolder( pomFile, pomFile ) );
}
@Test
- public void getSharedFolderDeeperLeftFolder()
+ public void getJoinedFolderDeeperLeftFolder()
throws Exception
{
File lhsFolder = new File( ROOT_FOLDER, "src" );
File rhsFolder = ROOT_FOLDER;
- assertEquals( rhsFolder, ProjectUtils.getSharedFolder( lhsFolder, rhsFolder ) );
+ assertEquals( rhsFolder, ProjectUtils.getJoinedFolder( lhsFolder, rhsFolder ) );
}
@Test
- public void getSharedFolderDeeperRightFolder()
+ public void getJoinedFolderDeeperRightFolder()
throws Exception
{
File lhsFolder = ROOT_FOLDER;
File rhsFolder = new File( ROOT_FOLDER, "src" );
- assertEquals( lhsFolder, ProjectUtils.getSharedFolder( lhsFolder, rhsFolder ) );
+ assertEquals( lhsFolder, ProjectUtils.getJoinedFolder( lhsFolder, rhsFolder ) );
}
@Test
- public void getSharedFolderFileAndDeeperLeftFolder()
+ public void getJoinedFolderFileAndDeeperLeftFolder()
throws Exception
{
File folder = ROOT_FOLDER;
File lhsFolder = new File( folder, "src" );
File rhsFolder = new File( folder, "pom.xml" );
- assertEquals( folder, ProjectUtils.getSharedFolder( lhsFolder, rhsFolder ) );
+ assertEquals( folder, ProjectUtils.getJoinedFolder( lhsFolder, rhsFolder ) );
}
@Test
- public void getSharedFolderFileAndDeeperRightFolder()
+ public void getJoinedFolderFileAndDeeperRightFolder()
throws Exception
{
File folder = ROOT_FOLDER;
File lhsFolder = new File( folder, "pom.xml" );
File rhsFolder = new File( folder, "src" );
- assertEquals( folder, ProjectUtils.getSharedFolder( lhsFolder, rhsFolder ) );
+ assertEquals( folder, ProjectUtils.getJoinedFolder( lhsFolder, rhsFolder ) );
}
}