[jboss-svn-commits] JBL Code SVN: r17106 - labs/jbossbuild/maven-plugins/trunk/maven-jdocbook-plugin/src/main/java/org/jboss/maven/shared/resource.

[jboss-svn-commits at lists.jboss.org]

Author: steve.ebersole at jboss.com
Date: 2007-12-08 00:48:07 -0500 (Sat, 08 Dec 2007)
New Revision: 17106

Modified:
   labs/jbossbuild/maven-plugins/trunk/maven-jdocbook-plugin/src/main/java/org/jboss/maven/shared/resource/ResourceDelegate.java
Log:
account for relative resource directory references

Modified: labs/jbossbuild/maven-plugins/trunk/maven-jdocbook-plugin/src/main/java/org/jboss/maven/shared/resource/ResourceDelegate.java
===================================================================
--- labs/jbossbuild/maven-plugins/trunk/maven-jdocbook-plugin/src/main/java/org/jboss/maven/shared/resource/ResourceDelegate.java	2007-12-07 20:21:49 UTC (rev 17105)
+++ labs/jbossbuild/maven-plugins/trunk/maven-jdocbook-plugin/src/main/java/org/jboss/maven/shared/resource/ResourceDelegate.java	2007-12-08 05:48:07 UTC (rev 17106)
@@ -46,6 +46,7 @@
 public class ResourceDelegate {
 	public static final String[] DEFAULT_DEFAULT_INCLUDES = new String[] { "**/**" };
 
+	private final File basedir;
 	private final File baseTargetDirectory;
 	private final String[] defaultIncludes;
 	private final String[] defaultExcludes;
@@ -79,6 +80,7 @@
 			String[] defaultIncludes,
 			String[] defaultExcludes,
 			Log log) {
+		this.basedir = project.getBasedir();
 		this.baseTargetDirectory = baseTargetDirectory;
 		this.defaultIncludes = defaultIncludes;
 		this.defaultExcludes = defaultExcludes;
@@ -134,6 +136,17 @@
 	 * @return The collected matching file names.
 	 */
 	private String[] collectFileNames(Resource resource) {
+		File resourceDirectory = new File( resource.getDirectory() );
+		if ( !resourceDirectory.exists() && !resource.getDirectory().startsWith( "/" ) ) {
+			resourceDirectory = new File( basedir, resource.getDirectory() );
+			if ( !resourceDirectory.exists() ) {
+				resourceDirectory = null;
+			}
+		}
+		if ( resourceDirectory == null ) {
+			throw new ResourceException( "could not locate specified resource directory" );
+		}
+
 		DirectoryScanner scanner = new DirectoryScanner();
 		scanner.setBasedir( resource.getDirectory() );
 		scanner.setIncludes( determineIncludes( resource ) );