svn commit: r946932 - in /maven/doxia/doxia/trunk: doxia-core/src/main/java/org/apache/maven/doxia/parser/AbstractParser.java doxia-modules/doxia-module-apt/src/main/java/org/apache/maven/doxia/module/apt/AptParser.java

[ltheussl]

Author: ltheussl
Date: Fri May 21 08:36:30 2010
New Revision: 946932

URL: http://svn.apache.org/viewvc?rev=946932&view=rev
Log:
deprecate getBasedir(). add notes about DOXIA-373

Modified:
    
maven/doxia/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/parser/AbstractParser.java
    
maven/doxia/doxia/trunk/doxia-modules/doxia-module-apt/src/main/java/org/apache/maven/doxia/module/apt/AptParser.java

Modified: 
maven/doxia/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/parser/AbstractParser.java
URL: 
http://svn.apache.org/viewvc/maven/doxia/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/parser/AbstractParser.java?rev=946932&r1=946931&r2=946932&view=diff
==============================================================================
--- 
maven/doxia/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/parser/AbstractParser.java
 (original)
+++ 
maven/doxia/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/parser/AbstractParser.java
 Fri May 21 08:36:30 2010
@@ -83,10 +83,13 @@ public abstract class AbstractParser
      * Returns the current base directory.
      *
      * @return The base directory.
+     *
+     * @deprecated this does not work in multi-module builds, see DOXIA-373
      */
     protected File getBasedir()
     {
         // TODO: This is baaad, it should come in with the request.
+        // (this is only used for macro requests, see AptParser)
 
         String basedir = System.getProperty( "basedir" );
 

Modified: 
maven/doxia/doxia/trunk/doxia-modules/doxia-module-apt/src/main/java/org/apache/maven/doxia/module/apt/AptParser.java
URL: 
http://svn.apache.org/viewvc/maven/doxia/doxia/trunk/doxia-modules/doxia-module-apt/src/main/java/org/apache/maven/doxia/module/apt/AptParser.java?rev=946932&r1=946931&r2=946932&view=diff
==============================================================================
--- 
maven/doxia/doxia/trunk/doxia-modules/doxia-module-apt/src/main/java/org/apache/maven/doxia/module/apt/AptParser.java
 (original)
+++ 
maven/doxia/doxia/trunk/doxia-modules/doxia-module-apt/src/main/java/org/apache/maven/doxia/module/apt/AptParser.java
 Fri May 21 08:36:30 2010
@@ -2916,6 +2916,8 @@ public class AptParser
             aptParser.enableLogging( getLog() );
             parameters.put( "parser", aptParser );
 
+            // getBasedir() does not work in multi-module builds, see DOXIA-373
+            // the basedir should be injected from here, see DOXIA-224
             MacroRequest request = new MacroRequest( parameters, getBasedir() 
);
             try
             {