From doxia-commits-return-121-apmail-maven-doxia-commits-archive=maven.apache.org@maven.apache.org Thu Apr 06 00:00:32 2006 Return-Path: Delivered-To: apmail-maven-doxia-commits-archive@www.apache.org Received: (qmail 3515 invoked from network); 6 Apr 2006 00:00:32 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur.apache.org with SMTP; 6 Apr 2006 00:00:32 -0000 Received: (qmail 97140 invoked by uid 500); 6 Apr 2006 00:00:31 -0000 Delivered-To: apmail-maven-doxia-commits-archive@maven.apache.org Received: (qmail 97118 invoked by uid 500); 6 Apr 2006 00:00:31 -0000 Mailing-List: contact doxia-commits-help@maven.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: doxia-dev@maven.apache.org Delivered-To: mailing list doxia-commits@maven.apache.org Received: (qmail 97109 invoked by uid 99); 6 Apr 2006 00:00:31 -0000 Received: from asf.osuosl.org (HELO asf.osuosl.org) (140.211.166.49) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 05 Apr 2006 17:00:31 -0700 X-ASF-Spam-Status: No, hits=-9.4 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received: from [209.237.227.194] (HELO minotaur.apache.org) (209.237.227.194) by apache.org (qpsmtpd/0.29) with SMTP; Wed, 05 Apr 2006 17:00:30 -0700 Received: (qmail 3287 invoked by uid 65534); 6 Apr 2006 00:00:10 -0000 Message-ID: <20060406000010.3283.qmail@minotaur.apache.org> Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r391859 - in /maven/doxia/trunk/doxia-site-renderer/src/main/java/org/apache/maven/doxia/siterenderer: DefaultSiteRenderer.java SiteRenderingContext.java Date: Thu, 06 Apr 2006 00:00:06 -0000 To: doxia-commits@maven.apache.org From: brett@apache.org X-Mailer: svnmailer-1.0.7 X-Virus-Checked: Checked by ClamAV on apache.org X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N Author: brett Date: Wed Apr 5 17:00:02 2006 New Revision: 391859 URL: http://svn.apache.org/viewcvs?rev=391859&view=rev Log: [MSITE-98] allow files to be excluded form site generation Submitted by: Jesse McConnell Modified: maven/doxia/trunk/doxia-site-renderer/src/main/java/org/apache/maven/doxia/siterenderer/DefaultSiteRenderer.java maven/doxia/trunk/doxia-site-renderer/src/main/java/org/apache/maven/doxia/siterenderer/SiteRenderingContext.java Modified: maven/doxia/trunk/doxia-site-renderer/src/main/java/org/apache/maven/doxia/siterenderer/DefaultSiteRenderer.java URL: http://svn.apache.org/viewcvs/maven/doxia/trunk/doxia-site-renderer/src/main/java/org/apache/maven/doxia/siterenderer/DefaultSiteRenderer.java?rev=391859&r1=391858&r2=391859&view=diff ============================================================================== --- maven/doxia/trunk/doxia-site-renderer/src/main/java/org/apache/maven/doxia/siterenderer/DefaultSiteRenderer.java (original) +++ maven/doxia/trunk/doxia-site-renderer/src/main/java/org/apache/maven/doxia/siterenderer/DefaultSiteRenderer.java Wed Apr 5 17:00:02 2006 @@ -133,6 +133,7 @@ throws IOException, RendererException { Map files = new LinkedHashMap(); + Map moduleExcludes = siteRenderingContext.getModuleExcludes(); for ( Iterator i = siteRenderingContext.getSiteDirectories().iterator(); i.hasNext(); ) { @@ -145,7 +146,14 @@ File moduleBasedir = new File( siteDirectory, module.getSourceDirectory() ); - addModuleFiles( moduleBasedir, module, files ); + if ( moduleExcludes != null && moduleExcludes.containsKey( module.getParserId() ) ) + { + addModuleFiles( moduleBasedir, module, (String)moduleExcludes.get( module.getParserId() ), files ); + } + else + { + addModuleFiles( moduleBasedir, module, null, files ); + } } } } @@ -156,7 +164,14 @@ try { - addModuleFiles( module.getBasedir(), siteModuleManager.getSiteModule( module.getParserId() ), files ); + if ( moduleExcludes != null && moduleExcludes.containsKey( module.getParserId() ) ) + { + addModuleFiles( module.getBasedir(), siteModuleManager.getSiteModule( module.getParserId() ), (String)moduleExcludes.get( module.getParserId() ), files ); + } + else + { + addModuleFiles( module.getBasedir(), siteModuleManager.getSiteModule( module.getParserId() ), null, files ); + } } catch ( SiteModuleNotFoundException e ) { @@ -166,12 +181,12 @@ return files; } - private void addModuleFiles( File moduleBasedir, SiteModule module, Map files ) + private void addModuleFiles( File moduleBasedir, SiteModule module, String excludes, Map files ) throws IOException, RendererException { if ( moduleBasedir.exists() ) { - List docs = FileUtils.getFileNames( moduleBasedir, "**/*." + module.getExtension(), null, false ); + List docs = FileUtils.getFileNames( moduleBasedir, "**/*." + module.getExtension(), excludes, false ); for ( Iterator k = docs.iterator(); k.hasNext(); ) { Modified: maven/doxia/trunk/doxia-site-renderer/src/main/java/org/apache/maven/doxia/siterenderer/SiteRenderingContext.java URL: http://svn.apache.org/viewcvs/maven/doxia/trunk/doxia-site-renderer/src/main/java/org/apache/maven/doxia/siterenderer/SiteRenderingContext.java?rev=391859&r1=391858&r2=391859&view=diff ============================================================================== --- maven/doxia/trunk/doxia-site-renderer/src/main/java/org/apache/maven/doxia/siterenderer/SiteRenderingContext.java (original) +++ maven/doxia/trunk/doxia-site-renderer/src/main/java/org/apache/maven/doxia/siterenderer/SiteRenderingContext.java Wed Apr 5 17:00:02 2006 @@ -49,6 +49,8 @@ private List siteDirectories = new ArrayList(); + private Map moduleExcludes; + private List modules = new ArrayList(); public String getTemplateName() @@ -151,4 +153,13 @@ return modules; } + public Map getModuleExcludes() + { + return moduleExcludes; + } + + public void setModuleExcludes( Map moduleExcludes ) + { + this.moduleExcludes = moduleExcludes; + } }