evenisse 2003/09/02 05:55:12
Modified: . project.xml
src/java/org/apache/maven MavenUtils.java
src/test/java/org/apache/maven/project
ProjectInheritanceTest.java
Log:
- Remove unneeded ${basedir}
- Update makeAbsolutePath for return a correct pathname and not a mixture of
slash/backslash for separator on windows.
Now, if we use a relative path or an absolute path, we obtain the same string for
absolute path.
Revision Changes Path
1.300 +4 -4 maven/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/maven/project.xml,v
retrieving revision 1.299
retrieving revision 1.300
diff -u -r1.299 -r1.300
--- project.xml 30 Aug 2003 01:40:04 -0000 1.299
+++ project.xml 2 Sep 2003 12:55:12 -0000 1.300
@@ -538,8 +538,8 @@
</dependencies>
<build>
<nagEmailAddress>[EMAIL PROTECTED]</nagEmailAddress>
- <sourceDirectory>${basedir}/src/java</sourceDirectory>
- <unitTestSourceDirectory>${basedir}/src/test/java</unitTestSourceDirectory>
+ <sourceDirectory>src/java</sourceDirectory>
+ <unitTestSourceDirectory>src/test/java</unitTestSourceDirectory>
<unitTest>
<includes>
<include>**/*Test.java</include>
@@ -551,7 +551,7 @@
</unitTest>
<resources>
<resource>
- <directory>${basedir}/src/conf</directory>
+ <directory>src/conf</directory>
<includes>
<include>*.xsd</include>
<include>*.dtd</include>
@@ -561,7 +561,7 @@
</includes>
</resource>
<resource>
- <directory>${basedir}/src/messages</directory>
+ <directory>src/messages</directory>
<targetPath>org/apache/maven/messages</targetPath>
<includes>
<include>messages*.properties</include>
1.104 +7 -3 maven/src/java/org/apache/maven/MavenUtils.java
Index: MavenUtils.java
===================================================================
RCS file: /home/cvs/maven/src/java/org/apache/maven/MavenUtils.java,v
retrieving revision 1.103
retrieving revision 1.104
diff -u -r1.103 -r1.104
--- MavenUtils.java 2 Sep 2003 10:28:28 -0000 1.103
+++ MavenUtils.java 2 Sep 2003 12:55:12 -0000 1.104
@@ -1071,11 +1071,15 @@
*/
public static String makeAbsolutePath( File basedir, String dir ) throws
IOException
{
- if ( !(new File( dir ).isAbsolute()) )
+ File f = new File( dir );
+ if ( !(f.isAbsolute()) )
{
return new File( basedir, dir ).getCanonicalPath();
}
- return dir;
+ else
+ {
+ return f.getCanonicalPath();
+ }
}
/**
1.38 +6 -5
maven/src/test/java/org/apache/maven/project/ProjectInheritanceTest.java
Index: ProjectInheritanceTest.java
===================================================================
RCS file:
/home/cvs/maven/src/test/java/org/apache/maven/project/ProjectInheritanceTest.java,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- ProjectInheritanceTest.java 28 Aug 2003 23:32:05 -0000 1.37
+++ ProjectInheritanceTest.java 2 Sep 2003 12:55:12 -0000 1.38
@@ -69,7 +69,7 @@
private String TEST_DOCUMENT = null;
private String TEST_DOCUMENT2 = null;
private String baseDir;
- private String FS = "/"; // note: same on windows and others
+ private String FS = null;
public ProjectInheritanceTest( String testName )
{
@@ -88,6 +88,7 @@
assertNotNull( "The system property basedir was not defined.", baseDir );
String fs = System.getProperty( "file.separator" );
assertNotNull( "The system property file.separator was not defined.", fs );
+ FS = fs;
TEST_DOCUMENT = baseDir + "/src/test/extend/project-child.xml";
TEST_DOCUMENT2 = baseDir +
"/src/test/extend/child_project/project-child2.xml";
}
@@ -122,15 +123,15 @@
baseDir = p.getContext().findVariable("basedir").toString();
// Test Source Directories
- assertEquals( baseDir + FS + "src/java", p.getBuild().getSourceDirectory()
);
+ System.out.println(baseDir + FS + "src" + FS + "java");
+ System.out.println(p.getBuild().getSourceDirectory());
+ assertEquals( baseDir + FS + "src" + FS + "java",
p.getBuild().getSourceDirectory() );
// Unit Test Source Directories
- assertEquals( baseDir + FS + "src/test/java",
p.getBuild().getUnitTestSourceDirectory() );
+ assertEquals( baseDir + FS + "src" + FS + "test" + FS + "java",
p.getBuild().getUnitTestSourceDirectory() );
// Test Aspect Source Directories
//assertEquals("src/aspect", p.getBuild().getAspectSourceDirectory());
- // Test Test Source Directories ;-)
- assertEquals( baseDir + FS + "src/test/java",
p.getBuild().getUnitTestSourceDirectory() );
String iuSrc = p.getBuild().getIntegrationUnitTestSourceDirectory();
assertTrue( "Should be empty in maven's project descriptor: [" + iuSrc +
"]",
StringUtils.isEmpty( iuSrc ) );
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
