Return-Path: Delivered-To: apmail-maven-commits-archive@www.apache.org Received: (qmail 25332 invoked from network); 24 Apr 2008 20:34:14 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 24 Apr 2008 20:34:14 -0000 Received: (qmail 65891 invoked by uid 500); 24 Apr 2008 20:34:15 -0000 Delivered-To: apmail-maven-commits-archive@maven.apache.org Received: (qmail 65839 invoked by uid 500); 24 Apr 2008 20:34:15 -0000 Mailing-List: contact commits-help@maven.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@maven.apache.org Delivered-To: mailing list commits@maven.apache.org Received: (qmail 65826 invoked by uid 99); 24 Apr 2008 20:34:15 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 24 Apr 2008 13:34:15 -0700 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.3] (HELO eris.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 24 Apr 2008 20:33:30 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id DF10D1A983A; Thu, 24 Apr 2008 13:33:50 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r651407 - /maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/SiteStageMojo.java Date: Thu, 24 Apr 2008 20:33:49 -0000 To: commits@maven.apache.org From: bentmann@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20080424203350.DF10D1A983A@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: bentmann Date: Thu Apr 24 13:33:47 2008 New Revision: 651407 URL: http://svn.apache.org/viewvc?rev=651407&view=rev Log: [MSITE-303] Discard invalid characters from directory name generated for staging site Modified: maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/SiteStageMojo.java Modified: maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/SiteStageMojo.java URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/SiteStageMojo.java?rev=651407&r1=651406&r2=651407&view=diff ============================================================================== --- maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/SiteStageMojo.java (original) +++ maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/SiteStageMojo.java Thu Apr 24 13:33:47 2008 @@ -155,16 +155,17 @@ } Repository repository = new Repository( site.getId(), site.getUrl() ); - if ( StringUtils.isEmpty( repository.getBasedir() ) ) + StringBuffer hierarchy = new StringBuffer( 1024 ); + hierarchy.append( repository.getHost() ); + if ( !StringUtils.isEmpty( repository.getBasedir() ) ) { - return repository.getHost(); + if ( !repository.getBasedir().startsWith( "/" ) ) + { + hierarchy.append( '/' ); + } + hierarchy.append( repository.getBasedir() ); } - if ( repository.getBasedir().startsWith( "/" ) ) - { - return repository.getHost() + repository.getBasedir(); - } - - return repository.getHost() + "/" + repository.getBasedir(); + return hierarchy.toString().replaceAll( "[\\:\\?\\*]", "" ); } }