Return-Path: X-Original-To: apmail-felix-commits-archive@www.apache.org Delivered-To: apmail-felix-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 2B3D9754E for ; Thu, 11 Aug 2011 09:28:23 +0000 (UTC) Received: (qmail 25738 invoked by uid 500); 11 Aug 2011 09:28:22 -0000 Delivered-To: apmail-felix-commits-archive@felix.apache.org Received: (qmail 24827 invoked by uid 500); 11 Aug 2011 09:28:03 -0000 Mailing-List: contact commits-help@felix.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@felix.apache.org Delivered-To: mailing list commits@felix.apache.org Received: (qmail 23897 invoked by uid 99); 11 Aug 2011 09:27:55 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 11 Aug 2011 09:27:55 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 11 Aug 2011 09:27:52 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id A0A9B238889B for ; Thu, 11 Aug 2011 09:27:32 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1156554 - in /felix/trunk/scrplugin/maven-scr-plugin: changelog.txt src/main/java/org/apache/felix/scrplugin/mojo/MavenJavaClassDescriptorManager.java src/main/java/org/apache/felix/scrplugin/mojo/SCRDescriptorMojo.java Date: Thu, 11 Aug 2011 09:27:32 -0000 To: commits@felix.apache.org From: cziegeler@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20110811092732.A0A9B238889B@eris.apache.org> Author: cziegeler Date: Thu Aug 11 09:27:32 2011 New Revision: 1156554 URL: http://svn.apache.org/viewvc?rev=1156554&view=rev Log: FELIX-3066 : Add support for source directory include filter via plugin configuration. Apply patch from Jan Volckaert Modified: felix/trunk/scrplugin/maven-scr-plugin/changelog.txt felix/trunk/scrplugin/maven-scr-plugin/src/main/java/org/apache/felix/scrplugin/mojo/MavenJavaClassDescriptorManager.java felix/trunk/scrplugin/maven-scr-plugin/src/main/java/org/apache/felix/scrplugin/mojo/SCRDescriptorMojo.java Modified: felix/trunk/scrplugin/maven-scr-plugin/changelog.txt URL: http://svn.apache.org/viewvc/felix/trunk/scrplugin/maven-scr-plugin/changelog.txt?rev=1156554&r1=1156553&r2=1156554&view=diff ============================================================================== --- felix/trunk/scrplugin/maven-scr-plugin/changelog.txt (original) +++ felix/trunk/scrplugin/maven-scr-plugin/changelog.txt Thu Aug 11 09:27:32 2011 @@ -1,3 +1,10 @@ +Changes from 1.7.2 to 1.7.4 +--------------------------- + +** Improvement + * [FELIX-3066] - Add support for source directory include filter via plugin configuration + + Changes from 1.7.0 to 1.7.2 --------------------------- 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=1156554&r1=1156553&r2=1156554&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 Thu Aug 11 09:27:32 2011 @@ -36,6 +36,8 @@ public class MavenJavaClassDescriptorMan private final MavenProject project; + private final String includeString; + private final String excludeString; /** The component definitions from other bundles hashed by classname. */ @@ -43,12 +45,13 @@ public class MavenJavaClassDescriptorMan public MavenJavaClassDescriptorManager( MavenProject project, Log log, ClassLoader classLoader, - String[] annotationTagProviders, String excludeString, boolean parseJavadocs, boolean processAnnotations ) + String[] annotationTagProviders, String includeString, String excludeString, boolean parseJavadocs, boolean processAnnotations ) throws SCRDescriptorFailureException { super( log, classLoader, annotationTagProviders, parseJavadocs, processAnnotations ); this.project = project; + this.includeString = includeString; this.excludeString = excludeString; } @@ -68,7 +71,11 @@ public class MavenJavaClassDescriptorMan final Iterator i = project.getCompileSourceRoots().iterator(); // FELIX-509: check for excludes - final String[] includes = new String[] { "**/*.java" }; + String[] includes = new String[] { "**/*.java" }; + if ( includeString != null ) { + includes = StringUtils.split( includeString, "," ); + } + final String[] excludes; if ( excludeString != null ) { Modified: felix/trunk/scrplugin/maven-scr-plugin/src/main/java/org/apache/felix/scrplugin/mojo/SCRDescriptorMojo.java URL: http://svn.apache.org/viewvc/felix/trunk/scrplugin/maven-scr-plugin/src/main/java/org/apache/felix/scrplugin/mojo/SCRDescriptorMojo.java?rev=1156554&r1=1156553&r2=1156554&view=diff ============================================================================== --- felix/trunk/scrplugin/maven-scr-plugin/src/main/java/org/apache/felix/scrplugin/mojo/SCRDescriptorMojo.java (original) +++ felix/trunk/scrplugin/maven-scr-plugin/src/main/java/org/apache/felix/scrplugin/mojo/SCRDescriptorMojo.java Thu Aug 11 09:27:32 2011 @@ -125,6 +125,14 @@ public class SCRDescriptorMojo extends A */ protected boolean strictMode; + + /** + * The comma separated list of tokens to include when processing sources. + * + * @parameter alias="includes" + */ + private String sourceIncludes; + /** * The comma separated list of tokens to exclude when processing sources. * @@ -166,7 +174,7 @@ public class SCRDescriptorMojo extends A final ClassLoader classLoader = new URLClassLoader( getClassPath(), this.getClass().getClassLoader() ); final JavaClassDescriptorManager jManager = new MavenJavaClassDescriptorManager( project, scrLog, - classLoader, this.annotationTagProviders, this.sourceExcludes, this.parseJavadoc, + classLoader, this.annotationTagProviders, this.sourceIncludes, this.sourceExcludes, this.parseJavadoc, this.processAnnotations ); final SCRDescriptorGenerator generator = new SCRDescriptorGenerator( scrLog );