Return-Path: Delivered-To: apmail-avalon-cvs-archive@www.apache.org Received: (qmail 30022 invoked from network); 4 Jul 2004 15:59:27 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur-2.apache.org with SMTP; 4 Jul 2004 15:59:27 -0000 Received: (qmail 58267 invoked by uid 500); 4 Jul 2004 15:59:20 -0000 Delivered-To: apmail-avalon-cvs-archive@avalon.apache.org Received: (qmail 58075 invoked by uid 500); 4 Jul 2004 15:59:15 -0000 Mailing-List: contact cvs-help@avalon.apache.org; run by ezmlm Precedence: bulk List-Unsubscribe: List-Subscribe: List-Help: List-Post: List-Id: "Avalon CVS List" Reply-To: "Avalon Developers List" Delivered-To: mailing list cvs@avalon.apache.org Received: (qmail 57926 invoked by uid 99); 4 Jul 2004 15:59:11 -0000 X-ASF-Spam-Status: No, hits=0.5 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.27.1) with SMTP; Sun, 04 Jul 2004 08:59:10 -0700 Received: (qmail 29860 invoked by uid 65534); 4 Jul 2004 15:59:07 -0000 Date: 4 Jul 2004 15:59:07 -0000 Message-ID: <20040704155907.29857.qmail@minotaur.apache.org> From: mcconnell@apache.org To: cvs@avalon.apache.org Subject: svn commit: rev 22574 - avalon/trunk/tools/magic/src/main/org/apache/avalon/tools/tasks X-Virus-Checked: Checked X-Spam-Rating: minotaur-2.apache.org 1.6.2 0/1000/N Author: mcconnell Date: Sun Jul 4 08:59:06 2004 New Revision: 22574 Modified: avalon/trunk/tools/magic/src/main/org/apache/avalon/tools/tasks/GumpTask.java avalon/trunk/tools/magic/src/main/org/apache/avalon/tools/tasks/ReactorTask.java Log: housekeeping Modified: avalon/trunk/tools/magic/src/main/org/apache/avalon/tools/tasks/GumpTask.java ============================================================================== --- avalon/trunk/tools/magic/src/main/org/apache/avalon/tools/tasks/GumpTask.java (original) +++ avalon/trunk/tools/magic/src/main/org/apache/avalon/tools/tasks/GumpTask.java Sun Jul 4 08:59:06 2004 @@ -310,6 +310,11 @@ } } + if( m_public ) + { + writer.write( "\n\n " ); + } + writer.write( "\n\n\n" ); return definitions.length; } @@ -358,8 +363,8 @@ throws IOException, UnknownResourceException { String path = definition.getBaseDir().getCanonicalPath(); - int j = getProject().getBaseDir().toString().length(); - String basedir = path.substring( j+1 ).replace( '\\', '/' ); + + String basedir = resolveBaseDir( project, path ); writer.write( "\n\n " ); @@ -491,6 +496,19 @@ writer.write( "\n from=\"Magic Integration <dev@avalon.apache.org>\"/>" ); writer.write( "\n " ); + } + + private String resolveBaseDir( Project project, String path ) + { + int j = getProject().getBaseDir().toString().length(); + if( path.length() > j ) + { + return path.substring( j+1 ).replace( '\\', '/' ); + } + else + { + return "."; + } } private String getKeyForResource( Resource resource ) Modified: avalon/trunk/tools/magic/src/main/org/apache/avalon/tools/tasks/ReactorTask.java ============================================================================== --- avalon/trunk/tools/magic/src/main/org/apache/avalon/tools/tasks/ReactorTask.java (original) +++ avalon/trunk/tools/magic/src/main/org/apache/avalon/tools/tasks/ReactorTask.java Sun Jul 4 08:59:06 2004 @@ -93,7 +93,7 @@ public void execute() throws BuildException { final Project project = getProject(); - m_defs = getDefinitions(); + m_defs = getDefinitionList(); final Definition[] defs = walkGraph(); log( "Candidates: " + defs.length ); @@ -236,7 +236,7 @@ return (Definition[]) list.toArray( new Definition[0] ); } - private List getDefinitions() + private List getDefinitionList() { final Project project = getProject(); final File basedir = project.getBaseDir(); --------------------------------------------------------------------- To unsubscribe, e-mail: cvs-unsubscribe@avalon.apache.org For additional commands, e-mail: cvs-help@avalon.apache.org