o Due to the variations between projects, some projects are passing in full paths

and others are relative paths.  This change checks to see if the path has 
  already been appended to ${basedir}. If not, it prepends basedir.  JXRBean
now expects something that will slot directly into new File(path).


git-svn-id: https://svn.apache.org/repos/asf/maven/maven-1/plugins/trunk@112968 13f79535-47bb-0310-9956-ffa450edef68

jxr/plugin.jelly

@@ -63,6 +63,12 @@
     <copy file="${maven.jxr.stylesheet}"
           tofile="${maven.jxr.destdir}/stylesheet.css"/>
         
+    <!-- XXX This is a dirty hack until the semantics of pom.build.sourceDirectory are cleared up -->
+    <j:set var="sourceDir" value="${pom.build.sourceDirectory}"/>  
+    <j:if test="${!pom.build.sourceDirectory.startsWith(basedir)}">
+    	<j:set var="sourceDir" value="${basedir}/${pom.build.sourceDirectory}"/>
+    </j:if>
+        
     <jxr:jxr
       basedir="${basedir}"
       sourceDir="${pom.build.sourceDirectory}"

jxr/src/main/org/apache/maven/jxr/JxrBean.java

@@ -80,7 +80,7 @@ import org.apache.commons.logging.LogFactory;
  * @author <a href="mailto:lucas@collab.net">Josh Lucas</a>
  * @author <a href="mailto:jason@zenplex.com">Jason van Zyl</a>
  * @author <a href="mailto:brian@brainslug.com">Brian Leonard</a>
- * @version $Id: JxrBean.java,v 1.3 2003/02/05 11:23:25 bwalding Exp $
+ * @version $Id: JxrBean.java,v 1.4 2003/02/21 22:33:53 bwalding Exp $
  */
 public class JxrBean
 {
@@ -131,8 +131,8 @@ public class JxrBean
         for (Iterator i = sourceDirs.iterator(); i.hasNext();)
         {
             String path = (String) i.next();
-
-            path = new File(getBasedir(),path).getCanonicalPath();
+            path = new File(path).getCanonicalPath();
+            
             pkgmgr.process(path);
             
             new JXR(pkgmgr, path, destDir, javadocLinkDir, "HEAD");