Return-Path: Delivered-To: apmail-maven-continuum-commits-archive@www.apache.org Received: (qmail 97659 invoked from network); 26 Aug 2006 03:48:17 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur.apache.org with SMTP; 26 Aug 2006 03:48:17 -0000 Received: (qmail 63588 invoked by uid 500); 26 Aug 2006 03:48:16 -0000 Delivered-To: apmail-maven-continuum-commits-archive@maven.apache.org Received: (qmail 63565 invoked by uid 500); 26 Aug 2006 03:48:16 -0000 Mailing-List: contact continuum-commits-help@maven.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: continuum-dev@maven.apache.org Delivered-To: mailing list continuum-commits@maven.apache.org Received: (qmail 63554 invoked by uid 99); 26 Aug 2006 03:48:16 -0000 Received: from asf.osuosl.org (HELO asf.osuosl.org) (140.211.166.49) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 25 Aug 2006 20:48:16 -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-SPF: pass (asf.osuosl.org: local policy) Received: from [140.211.166.113] (HELO eris.apache.org) (140.211.166.113) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 25 Aug 2006 20:48:13 -0700 Received: by eris.apache.org (Postfix, from userid 65534) id 466001A981A; Fri, 25 Aug 2006 20:47:53 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r437067 [1/2] - in /maven/continuum/branches/continuum-acegi: continuum-api/src/main/java/org/apache/maven/continuum/build/settings/ continuum-core/src/main/java/org/apache/maven/continuum/buildcontroller/ continuum-core/src/main/java/org/a... Date: Sat, 26 Aug 2006 03:47:43 -0000 To: continuum-commits@maven.apache.org From: carlos@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20060826034753.466001A981A@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N Author: carlos Date: Fri Aug 25 20:47:41 2006 New Revision: 437067 URL: http://svn.apache.org/viewvc?rev=437067&view=rev Log: Merged rev# 433444-437057 from trunk Added: maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/mdo/session-models.mdo - copied unchanged from r437057, maven/continuum/trunk/continuum-webapp/src/main/mdo/session-models.mdo maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/mdo/view-models.mdo - copied unchanged from r437057, maven/continuum/trunk/continuum-webapp/src/main/mdo/view-models.mdo maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/webapp/index.jsp - copied unchanged from r437057, maven/continuum/trunk/continuum-webapp/src/main/webapp/index.jsp Removed: maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/LoginAction.java maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/mdo/view-models.xml maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/webapp/index.html Modified: maven/continuum/branches/continuum-acegi/continuum-api/src/main/java/org/apache/maven/continuum/build/settings/BuildSettingsConstants.java maven/continuum/branches/continuum-acegi/continuum-api/src/main/java/org/apache/maven/continuum/build/settings/SchedulesActivationException.java maven/continuum/branches/continuum-acegi/continuum-api/src/main/java/org/apache/maven/continuum/build/settings/SchedulesActivator.java maven/continuum/branches/continuum-acegi/continuum-core/src/main/java/org/apache/maven/continuum/buildcontroller/BuildContext.java maven/continuum/branches/continuum-acegi/continuum-core/src/main/java/org/apache/maven/continuum/project/builder/maven/MavenTwoContinuumProjectBuilder.java maven/continuum/branches/continuum-acegi/continuum-core/src/test/java/org/apache/maven/continuum/DefaultContinuumUnitTest.java maven/continuum/branches/continuum-acegi/continuum-core/src/test/java/org/apache/maven/continuum/notification/mail/FormatterToolTest.java maven/continuum/branches/continuum-acegi/continuum-core/src/test/java/org/apache/maven/continuum/project/builder/maven/MavenTwoContinuumProjectBuilderTest.java maven/continuum/branches/continuum-acegi/continuum-core/src/test/resources/projects/continuum/continuum-core/pom.xml maven/continuum/branches/continuum-acegi/continuum-core/src/test/resources/projects/continuum/continuum-model/pom.xml maven/continuum/branches/continuum-acegi/continuum-core/src/test/resources/projects/continuum/continuum-notifiers/continuum-notifier-irc/pom.xml maven/continuum/branches/continuum-acegi/continuum-core/src/test/resources/projects/continuum/continuum-notifiers/continuum-notifier-jabber/pom.xml maven/continuum/branches/continuum-acegi/continuum-core/src/test/resources/projects/continuum/continuum-notifiers/pom.xml maven/continuum/branches/continuum-acegi/continuum-core/src/test/resources/projects/continuum/continuum-plexus-application/pom.xml maven/continuum/branches/continuum-acegi/continuum-core/src/test/resources/projects/continuum/continuum-web/pom.xml maven/continuum/branches/continuum-acegi/continuum-core/src/test/resources/projects/continuum/continuum-xmlrpc/pom.xml maven/continuum/branches/continuum-acegi/continuum-core/src/test/resources/projects/continuum/pom.xml maven/continuum/branches/continuum-acegi/continuum-webapp/pom.xml maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/AbstractNotifierEditAction.java maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/AddMavenOneProjectAction.java maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/AddMavenTwoProjectAction.java maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/AddProjectAction.java maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/BuildDefinitionAction.java maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/BuildProjectAction.java maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/BuildResultAction.java maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/BuildResultsListAction.java maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/CheckConfigurationAction.java maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ConfigurationAction.java maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ContinuumActionSupport.java maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/DeleteNotifierAction.java maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/DeleteProjectAction.java maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/GroupSummaryAction.java maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ProjectEditAction.java maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ProjectGroupAction.java maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ProjectViewAction.java maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ScheduleAction.java maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/SummaryAction.java maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/WorkingCopyAction.java maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/component/BuildDefinitionSummaryAction.java maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/resources/META-INF/plexus/application.xml maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/resources/xwork.xml maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/webapp/WEB-INF/web.xml maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/webapp/configurationEdit.jsp maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/webapp/projectView.jsp maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/webapp/summary.jsp Modified: maven/continuum/branches/continuum-acegi/continuum-api/src/main/java/org/apache/maven/continuum/build/settings/BuildSettingsConstants.java URL: http://svn.apache.org/viewvc/maven/continuum/branches/continuum-acegi/continuum-api/src/main/java/org/apache/maven/continuum/build/settings/BuildSettingsConstants.java?rev=437067&r1=437066&r2=437067&view=diff ============================================================================== --- maven/continuum/branches/continuum-acegi/continuum-api/src/main/java/org/apache/maven/continuum/build/settings/BuildSettingsConstants.java (original) +++ maven/continuum/branches/continuum-acegi/continuum-api/src/main/java/org/apache/maven/continuum/build/settings/BuildSettingsConstants.java Fri Aug 25 20:47:41 2006 @@ -18,7 +18,7 @@ /** * @author Jason van Zyl - * @version $Id:$ + * @version $Id$ */ public class BuildSettingsConstants { Modified: maven/continuum/branches/continuum-acegi/continuum-api/src/main/java/org/apache/maven/continuum/build/settings/SchedulesActivationException.java URL: http://svn.apache.org/viewvc/maven/continuum/branches/continuum-acegi/continuum-api/src/main/java/org/apache/maven/continuum/build/settings/SchedulesActivationException.java?rev=437067&r1=437066&r2=437067&view=diff ============================================================================== --- maven/continuum/branches/continuum-acegi/continuum-api/src/main/java/org/apache/maven/continuum/build/settings/SchedulesActivationException.java (original) +++ maven/continuum/branches/continuum-acegi/continuum-api/src/main/java/org/apache/maven/continuum/build/settings/SchedulesActivationException.java Fri Aug 25 20:47:41 2006 @@ -2,7 +2,7 @@ /** * @author Jason van Zyl - * @version $Id:$ + * @version $Id$ */ public class SchedulesActivationException extends Exception Modified: maven/continuum/branches/continuum-acegi/continuum-api/src/main/java/org/apache/maven/continuum/build/settings/SchedulesActivator.java URL: http://svn.apache.org/viewvc/maven/continuum/branches/continuum-acegi/continuum-api/src/main/java/org/apache/maven/continuum/build/settings/SchedulesActivator.java?rev=437067&r1=437066&r2=437067&view=diff ============================================================================== --- maven/continuum/branches/continuum-acegi/continuum-api/src/main/java/org/apache/maven/continuum/build/settings/SchedulesActivator.java (original) +++ maven/continuum/branches/continuum-acegi/continuum-api/src/main/java/org/apache/maven/continuum/build/settings/SchedulesActivator.java Fri Aug 25 20:47:41 2006 @@ -21,7 +21,7 @@ /** * @author Jason van Zyl - * @version $Id:$ + * @version $Id$ */ public interface SchedulesActivator { Modified: maven/continuum/branches/continuum-acegi/continuum-core/src/main/java/org/apache/maven/continuum/buildcontroller/BuildContext.java URL: http://svn.apache.org/viewvc/maven/continuum/branches/continuum-acegi/continuum-core/src/main/java/org/apache/maven/continuum/buildcontroller/BuildContext.java?rev=437067&r1=437066&r2=437067&view=diff ============================================================================== --- maven/continuum/branches/continuum-acegi/continuum-core/src/main/java/org/apache/maven/continuum/buildcontroller/BuildContext.java (original) +++ maven/continuum/branches/continuum-acegi/continuum-core/src/main/java/org/apache/maven/continuum/buildcontroller/BuildContext.java Fri Aug 25 20:47:41 2006 @@ -1,5 +1,21 @@ package org.apache.maven.continuum.buildcontroller; +/* + * Copyright 2004-2006 The Apache Software Foundation. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + import org.apache.maven.continuum.core.action.AbstractContinuumAction; import org.apache.maven.continuum.model.project.BuildDefinition; import org.apache.maven.continuum.model.project.BuildResult; @@ -18,7 +34,6 @@ */ public class BuildContext { - private long startTime; private Project project; @@ -125,5 +140,4 @@ { this.trigger = trigger; } - } Modified: maven/continuum/branches/continuum-acegi/continuum-core/src/main/java/org/apache/maven/continuum/project/builder/maven/MavenTwoContinuumProjectBuilder.java URL: http://svn.apache.org/viewvc/maven/continuum/branches/continuum-acegi/continuum-core/src/main/java/org/apache/maven/continuum/project/builder/maven/MavenTwoContinuumProjectBuilder.java?rev=437067&r1=437066&r2=437067&view=diff ============================================================================== --- maven/continuum/branches/continuum-acegi/continuum-core/src/main/java/org/apache/maven/continuum/project/builder/maven/MavenTwoContinuumProjectBuilder.java (original) +++ maven/continuum/branches/continuum-acegi/continuum-core/src/main/java/org/apache/maven/continuum/project/builder/maven/MavenTwoContinuumProjectBuilder.java Fri Aug 25 20:47:41 2006 @@ -93,15 +93,16 @@ { MavenProject mavenProject; - try { + try + { mavenProject = builderHelper.getMavenProject( result, createMetadataFile( url, username, password ) ); - - if( (result != null) && result.hasErrors()) + + if ( result.hasErrors() ) { return; } } - catch (MalformedURLException e) + catch ( MalformedURLException e ) { getLogger().debug( "Error adding project: Malformed URL " + url, e ); result.addError( ContinuumProjectBuildingResult.ERROR_MALFORMED_URL ); @@ -118,7 +119,8 @@ { ProjectGroup projectGroup = buildProjectGroup( mavenProject, result ); - // project groups have the top lvl build definition which is the default build defintion for the sub projects + // project groups have the top lvl build definition which is the default build defintion for the sub + // projects if ( projectGroup != null ) { BuildDefinition bd = new BuildDefinition(); @@ -145,7 +147,7 @@ // jdo complains that Collections.singletonList(bd) is a second class object and fails. ArrayList arrayList = new ArrayList(); - arrayList.add(bd); + arrayList.add( bd ); projectGroup.setBuildDefinitions( arrayList ); @@ -155,14 +157,7 @@ if ( !excludedPackagingTypes.contains( mavenProject.getPackaging() ) ) { - String defaultGoal = "clean install"; - - if ( mavenProject.getBuild() != null && mavenProject.getBuild().getDefaultGoal() != null ) - { - defaultGoal = mavenProject.getBuild().getDefaultGoal(); - } - - Project continuumProject = new Project(); + Project continuumProject = new Project(); builderHelper.mapMavenProjectToContinuumProject( result, mavenProject, continuumProject ); Modified: maven/continuum/branches/continuum-acegi/continuum-core/src/test/java/org/apache/maven/continuum/DefaultContinuumUnitTest.java URL: http://svn.apache.org/viewvc/maven/continuum/branches/continuum-acegi/continuum-core/src/test/java/org/apache/maven/continuum/DefaultContinuumUnitTest.java?rev=437067&r1=437066&r2=437067&view=diff ============================================================================== --- maven/continuum/branches/continuum-acegi/continuum-core/src/test/java/org/apache/maven/continuum/DefaultContinuumUnitTest.java (original) +++ maven/continuum/branches/continuum-acegi/continuum-core/src/test/java/org/apache/maven/continuum/DefaultContinuumUnitTest.java Fri Aug 25 20:47:41 2006 @@ -25,7 +25,7 @@ /** * Test for {@link DefaultContinuum}. - * + * * @author Carlos Sanchez * @version $Id$ */ @@ -42,7 +42,7 @@ Mock actionManagerMock = new Mock( ActionManager.class ); - actionManagerMock.expects( once() ).will( returnValue( (Action) actionMock.proxy() ) ); + actionManagerMock.expects( once() ).will( returnValue( actionMock.proxy() ) ); continuum.setActionManager( (ActionManager) actionManagerMock.proxy() ); Modified: maven/continuum/branches/continuum-acegi/continuum-core/src/test/java/org/apache/maven/continuum/notification/mail/FormatterToolTest.java URL: http://svn.apache.org/viewvc/maven/continuum/branches/continuum-acegi/continuum-core/src/test/java/org/apache/maven/continuum/notification/mail/FormatterToolTest.java?rev=437067&r1=437066&r2=437067&view=diff ============================================================================== --- maven/continuum/branches/continuum-acegi/continuum-core/src/test/java/org/apache/maven/continuum/notification/mail/FormatterToolTest.java (original) +++ maven/continuum/branches/continuum-acegi/continuum-core/src/test/java/org/apache/maven/continuum/notification/mail/FormatterToolTest.java Fri Aug 25 20:47:41 2006 @@ -1,6 +1,3 @@ -/* - * Copyright (c) 2005 Your Corporation. All Rights Reserved. - */ package org.apache.maven.continuum.notification.mail; import junit.framework.TestCase; Modified: maven/continuum/branches/continuum-acegi/continuum-core/src/test/java/org/apache/maven/continuum/project/builder/maven/MavenTwoContinuumProjectBuilderTest.java URL: http://svn.apache.org/viewvc/maven/continuum/branches/continuum-acegi/continuum-core/src/test/java/org/apache/maven/continuum/project/builder/maven/MavenTwoContinuumProjectBuilderTest.java?rev=437067&r1=437066&r2=437067&view=diff ============================================================================== --- maven/continuum/branches/continuum-acegi/continuum-core/src/test/java/org/apache/maven/continuum/project/builder/maven/MavenTwoContinuumProjectBuilderTest.java (original) +++ maven/continuum/branches/continuum-acegi/continuum-core/src/test/java/org/apache/maven/continuum/project/builder/maven/MavenTwoContinuumProjectBuilderTest.java Fri Aug 25 20:47:41 2006 @@ -18,6 +18,7 @@ import org.apache.maven.continuum.AbstractContinuumTest; import org.apache.maven.continuum.model.project.Project; +import org.apache.maven.continuum.model.project.ProjectDependency; import org.apache.maven.continuum.model.project.ProjectGroup; import org.apache.maven.continuum.model.project.ProjectNotifier; import org.apache.maven.continuum.project.builder.ContinuumProjectBuilder; @@ -42,8 +43,8 @@ public void testGetEmailAddressWhenTypeIsSetToEmail() throws Exception { - ContinuumProjectBuilder projectBuilder = - (ContinuumProjectBuilder) lookup( ContinuumProjectBuilder.ROLE, MavenTwoContinuumProjectBuilder.ID ); + ContinuumProjectBuilder projectBuilder = (ContinuumProjectBuilder) lookup( ContinuumProjectBuilder.ROLE, + MavenTwoContinuumProjectBuilder.ID ); File pom = getTestFile( "src/test/repository/maven-builder-helper-1.xml" ); @@ -73,8 +74,8 @@ public void testGetEmailAddressWhenTypeIsntSet() throws Exception { - ContinuumProjectBuilder projectBuilder = - (ContinuumProjectBuilder) lookup( ContinuumProjectBuilder.ROLE, MavenTwoContinuumProjectBuilder.ID ); + ContinuumProjectBuilder projectBuilder = (ContinuumProjectBuilder) lookup( ContinuumProjectBuilder.ROLE, + MavenTwoContinuumProjectBuilder.ID ); File pom = getTestFile( "src/test/repository/maven-builder-helper-2.xml" ); @@ -104,8 +105,8 @@ public void testGetScmUrlWithParams() throws Exception { - ContinuumProjectBuilder projectBuilder = - (ContinuumProjectBuilder) lookup( ContinuumProjectBuilder.ROLE, MavenTwoContinuumProjectBuilder.ID ); + ContinuumProjectBuilder projectBuilder = (ContinuumProjectBuilder) lookup( ContinuumProjectBuilder.ROLE, + MavenTwoContinuumProjectBuilder.ID ); File pom = getTestFile( "src/test/repository/maven-builder-helper-3.xml" ); @@ -143,19 +144,26 @@ public void testCreateProjectsWithModules() throws Exception { - ContinuumProjectBuilder projectBuilder = - (ContinuumProjectBuilder) lookup( ContinuumProjectBuilder.ROLE, MavenTwoContinuumProjectBuilder.ID ); + ContinuumProjectBuilder projectBuilder = (ContinuumProjectBuilder) lookup( ContinuumProjectBuilder.ROLE, + MavenTwoContinuumProjectBuilder.ID ); - String url = getTestFile( "src/test/resources/projects/continuum/pom.xml" ).toURL().toExternalForm(); + URL url = getClass().getClassLoader().getResource( "projects/continuum/pom.xml" ); // Eat System.out PrintStream ps = System.out; - System.setOut( new PrintStream( new ByteArrayOutputStream() ) ); + ContinuumProjectBuildingResult result; - ContinuumProjectBuildingResult result = projectBuilder.buildProjectsFromMetadata( new URL( url ), null, null ); + try + { + System.setOut( new PrintStream( new ByteArrayOutputStream() ) ); - System.setOut( ps ); + result = projectBuilder.buildProjectsFromMetadata( url, null, null ); + } + finally + { + System.setOut( ps ); + } assertNotNull( result ); @@ -185,7 +193,7 @@ assertEquals( "projectGroup.description", "Continuum Project Description", projectGroup.getDescription() ); -// assertEquals( "projectGroup.url", "http://cvs.continuum.codehaus.org/", projectGroup.getUrl() ); + // assertEquals( "projectGroup.url", "http://cvs.continuum.codehaus.org/", projectGroup.getUrl() ); // ---------------------------------------------------------------------- // Assert the projects built @@ -193,7 +201,7 @@ assertNotNull( result.getProjects() ); - assertEquals( 6, result.getProjects().size() ); + assertEquals( 9, result.getProjects().size() ); Map projects = new HashMap(); @@ -211,6 +219,45 @@ assertMavenTwoProject( "Continuum Plexus Application", projects ); assertMavenTwoProject( "Continuum Web", projects ); assertMavenTwoProject( "Continuum XMLRPC Interface", projects ); + assertMavenTwoProject( "Continuum Notifiers", projects ); + assertMavenTwoProject( "Continuum IRC Notifier", projects ); + assertMavenTwoProject( "Continuum Jabber Notifier", projects ); + + assertEquals( "continuum-parent-notifiers", + ( (Project) projects.get( "Continuum IRC Notifier" ) ).getParent().getArtifactId() ); + + assertEquals( "continuum-parent-notifiers", + ( (Project) projects.get( "Continuum Jabber Notifier" ) ).getParent().getArtifactId() ); + + assertDependency( "Continuum Model", "Continuum Web", projects ); + + } + + private void assertDependency( String dep, String proj, Map projects ) + { + Project p = (Project) projects.get( proj ); + + Project dependency = (Project) projects.get( dep ); + + assertNotNull( p ); + + assertNotNull( dependency ); + + assertNotNull( p.getDependencies() ); + + for ( Iterator i = p.getDependencies().iterator(); i.hasNext(); ) + { + ProjectDependency pd = (ProjectDependency) i.next(); + + if ( pd.getArtifactId().equals( dependency.getArtifactId() ) + && pd.getGroupId().equals( dependency.getGroupId() ) + && pd.getVersion().equals( dependency.getVersion() ) ) + { + return; + } + } + + assertFalse( true ); } // ---------------------------------------------------------------------- @@ -225,7 +272,7 @@ assertEquals( name, project.getName() ); - String scmUrl = "scm:svn:http://svn.apache.org/repos/asf/maven/continuum/trunk"; + String scmUrl = "scm:svn:http://svn.apache.org/repos/asf/maven/continuum/tags"; assertTrue( project.getScmUrl().startsWith( scmUrl ) ); } Modified: maven/continuum/branches/continuum-acegi/continuum-core/src/test/resources/projects/continuum/continuum-core/pom.xml URL: http://svn.apache.org/viewvc/maven/continuum/branches/continuum-acegi/continuum-core/src/test/resources/projects/continuum/continuum-core/pom.xml?rev=437067&r1=437066&r2=437067&view=diff ============================================================================== --- maven/continuum/branches/continuum-acegi/continuum-core/src/test/resources/projects/continuum/continuum-core/pom.xml (original) +++ maven/continuum/branches/continuum-acegi/continuum-core/src/test/resources/projects/continuum/continuum-core/pom.xml Fri Aug 25 20:47:41 2006 @@ -3,7 +3,7 @@ continuum-parent org.apache.maven.continuum - 1.0-alpha-2-SNAPSHOT + 1.0.3 continuum-core Continuum Core @@ -11,7 +11,7 @@ org.apache.maven.continuum continuum-model - 1.0-alpha-2-SNAPSHOT + 1.0.3 Modified: maven/continuum/branches/continuum-acegi/continuum-core/src/test/resources/projects/continuum/continuum-web/pom.xml URL: http://svn.apache.org/viewvc/maven/continuum/branches/continuum-acegi/continuum-core/src/test/resources/projects/continuum/continuum-web/pom.xml?rev=437067&r1=437066&r2=437067&view=diff ============================================================================== --- maven/continuum/branches/continuum-acegi/continuum-core/src/test/resources/projects/continuum/continuum-web/pom.xml (original) +++ maven/continuum/branches/continuum-acegi/continuum-core/src/test/resources/projects/continuum/continuum-web/pom.xml Fri Aug 25 20:47:41 2006 @@ -3,7 +3,7 @@ org.apache.maven.continuum continuum-parent - 1.0-alpha-2-SNAPSHOT + 1.0.3 continuum-web Continuum Web @@ -11,12 +11,12 @@ org.apache.maven.continuum continuum-model - 1.0-alpha-2-SNAPSHOT + 1.0.3 org.apache.maven.continuum continuum-core - 1.0-alpha-2-SNAPSHOT + 1.0.3