Fixes FELIX-2808 - scan for local packages by looking for *.class files instead of *.java so that all the JVM languages can be supported.
git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@1064245 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/bundleplugin/src/main/java/org/apache/felix/bundleplugin/BundlePlugin.java b/bundleplugin/src/main/java/org/apache/felix/bundleplugin/BundlePlugin.java
index 1804210..96b1d17 100644
--- a/bundleplugin/src/main/java/org/apache/felix/bundleplugin/BundlePlugin.java
+++ b/bundleplugin/src/main/java/org/apache/felix/bundleplugin/BundlePlugin.java
@@ -379,7 +379,7 @@
includeMavenResources( currentProject, builder, getLog() );
// calculate default export/private settings based on sources
- addLocalPackages( currentProject.getCompileSourceRoots(), builder );
+ addLocalPackages( outputDirectory, builder );
// update BND instructions to embed selected Maven dependencies
Collection embeddableArtifacts = getEmbeddableArtifacts( currentProject, builder );
@@ -913,29 +913,25 @@
}
- private static void addLocalPackages( List sourceDirectories, Analyzer analyzer )
+ private static void addLocalPackages( File outputDirectory, Analyzer analyzer )
{
Collection packages = new LinkedHashSet();
- for ( Iterator d = sourceDirectories.iterator(); d.hasNext(); )
+ if ( outputDirectory != null && outputDirectory.isDirectory() )
{
- String sourceDirectory = (String) d.next();
- if ( sourceDirectory != null && new File( sourceDirectory ).isDirectory() )
+ // scan classes directory for potential packages
+ DirectoryScanner scanner = new DirectoryScanner();
+ scanner.setBasedir( outputDirectory );
+ scanner.setIncludes( new String[]
+ { "**/*.class" } );
+
+ scanner.addDefaultExcludes();
+ scanner.scan();
+
+ String[] paths = scanner.getIncludedFiles();
+ for ( int i = 0; i < paths.length; i++ )
{
- // scan local Java sources for potential packages
- DirectoryScanner scanner = new DirectoryScanner();
- scanner.setBasedir( sourceDirectory );
- scanner.setIncludes( new String[]
- { "**/*.java" } );
-
- scanner.addDefaultExcludes();
- scanner.scan();
-
- String[] paths = scanner.getIncludedFiles();
- for ( int i = 0; i < paths.length; i++ )
- {
- packages.add( getPackageName( paths[i] ) );
- }
+ packages.add( getPackageName( paths[i] ) );
}
}