I think basedir will be null if the project is being read from the repository. The second line is just a debug statement that crept through, from when I was having trouble with something like 10 ITs fail. They all pass under the current changes.

This holds true even with the changes to the super-POM...all tests pass. I can't vouch for projects outside of that test suite, but I'm sure it'll become apparent in the RCs.

I'll work on getting these merged to trunk as well, though trunk is changing in this area so I'm not sure how relevant this code will wind up being.

-john

Brett Porter wrote:
Hi John,

Couple of questions:

On 26/06/2008, at 4:28 AM, [EMAIL PROTECTED] wrote:


-        pathTranslator.alignToBaseDirectory( model, basedir );
+        if ( basedir != null )
+        {
+            pathTranslator.alignToBaseDirectory( model, basedir );
+        }

Under what conditions is basedir null?


+ if ( logger != null && logger.isDebugEnabled() && projectDir == null )
+        {
+ logger.debug( "Null project directory from:", new Throwable() );
+        }
+

I didn't read the rest of the context - it just looks weird :) Is this indicative of a bug, or is projectDir == null expected behaviour?


  <build>
-    <directory>target</directory>
-    <outputDirectory>target/classes</outputDirectory>
+    <directory>${project.basedir}/target</directory>
+ <outputDirectory>${project.build.directory}/classes</outputDirectory>
    <finalName>${project.artifactId}-${project.version}</finalName>
-    <testOutputDirectory>target/test-classes</testOutputDirectory>
-    <sourceDirectory>src/main/java</sourceDirectory>
-    <scriptSourceDirectory>src/main/scripts</scriptSourceDirectory>
-    <testSourceDirectory>src/test/java</testSourceDirectory>
+ <testOutputDirectory>${project.build.directory}/test-classes</testOutputDirectory>
+    <sourceDirectory>${project.basedir}/src/main/java</sourceDirectory>
+ <scriptSourceDirectory>${project.basedir}/src/main/scripts</scriptSourceDirectory> + <testSourceDirectory>${project.basedir}/src/test/java</testSourceDirectory>
    <resources>
      <resource>
-        <directory>src/main/resources</directory>
+        <directory>${project.basedir}/src/main/resources</directory>
      </resource>
    </resources>
    <testResources>
      <testResource>
-        <directory>src/test/resources</directory>
+        <directory>${project.basedir}/src/test/resources</directory>
      </testResource>

I know you've got test cases to check all the behaviour for people still using the pre-aligned values. Just wondering if this has any side effects (eg, would the default output dir go from being canonical to non-canonical)?

BTW, are you going to be merging these all to trunk in one hit later?

Thanks,
Brett

--
Brett Porter
[EMAIL PROTECTED]
http://blogs.exist.com/bporter/


---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]


--
John Casey
Developer, PMC Member - Apache Maven (http://maven.apache.org)
Blog: http://www.ejlife.net/blogs/buildchimp/


---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Reply via email to