Author: cziegeler
Date: Mon Jan 10 07:35:09 2011
New Revision: 1057097
URL: http://svn.apache.org/viewvc?rev=1057097&view=rev
Log:
FELIX-2770 : maven-scr-plugin 1.6.0 incompatible with
<packaging>pom</packaging> projects
Modified:
felix/trunk/scrplugin/maven-scr-plugin/src/main/java/org/apache/felix/scrplugin/mojo/MavenJavaClassDescriptorManager.java
Modified:
felix/trunk/scrplugin/maven-scr-plugin/src/main/java/org/apache/felix/scrplugin/mojo/MavenJavaClassDescriptorManager.java
URL:
http://svn.apache.org/viewvc/felix/trunk/scrplugin/maven-scr-plugin/src/main/java/org/apache/felix/scrplugin/mojo/MavenJavaClassDescriptorManager.java?rev=1057097&r1=1057096&r2=1057097&view=diff
==============================================================================
---
felix/trunk/scrplugin/maven-scr-plugin/src/main/java/org/apache/felix/scrplugin/mojo/MavenJavaClassDescriptorManager.java
(original)
+++
felix/trunk/scrplugin/maven-scr-plugin/src/main/java/org/apache/felix/scrplugin/mojo/MavenJavaClassDescriptorManager.java
Mon Jan 10 07:35:09 2011
@@ -19,7 +19,7 @@
package org.apache.felix.scrplugin.mojo;
-import java.io.*;
+import java.io.File;
import java.util.*;
import org.apache.felix.scrplugin.*;
@@ -82,8 +82,13 @@ public class MavenJavaClassDescriptorMan
while ( i.hasNext() )
{
final String tree = i.next();
- this.log.debug( "Scanning source tree " + tree );
final File directory = new File( tree );
+ if ( !directory.exists() )
+ {
+ this.log.warn("Source tree does not exist. Ignoring " + tree);
+ continue;
+ }
+ this.log.debug( "Scanning source tree " + tree );
final DirectoryScanner scanner = new DirectoryScanner();
scanner.setBasedir( directory );