Return-Path: Delivered-To: apmail-maven-continuum-commits-archive@www.apache.org Received: (qmail 77618 invoked from network); 12 Aug 2005 05:23:08 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur.apache.org with SMTP; 12 Aug 2005 05:23:08 -0000 Received: (qmail 2266 invoked by uid 500); 12 Aug 2005 05:23:08 -0000 Delivered-To: apmail-maven-continuum-commits-archive@maven.apache.org Received: (qmail 2244 invoked by uid 500); 12 Aug 2005 05:23:07 -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 2230 invoked by uid 99); 12 Aug 2005 05:23:07 -0000 X-ASF-Spam-Status: No, hits=-9.8 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; Thu, 11 Aug 2005 22:23:07 -0700 Received: (qmail 77615 invoked by uid 65534); 12 Aug 2005 05:23:06 -0000 Message-ID: <20050812052306.77614.qmail@minotaur.apache.org> Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r232208 - in /maven/continuum/trunk: continuum-core-it/src/test/java/org/apache/maven/continuum/it/ continuum-core/src/main/java/org/apache/maven/continuum/ continuum-core/src/main/java/org/apache/maven/continuum/core/action/ continuum-core... Date: Fri, 12 Aug 2005 05:23:05 -0000 To: continuum-commits@maven.apache.org From: brett@apache.org X-Mailer: svnmailer-1.0.3 X-Virus-Checked: Checked by ClamAV on apache.org X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N Author: brett Date: Thu Aug 11 22:22:50 2005 New Revision: 232208 URL: http://svn.apache.org/viewcvs?rev=232208&view=rev Log: missing commits from last time Modified: maven/continuum/trunk/continuum-core-it/src/test/java/org/apache/maven/continuum/it/AbstractIntegrationTest.java maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/DefaultContinuum.java maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/core/action/StoreCheckOutScmResultAction.java maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/core/action/StoreProjectAction.java maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/core/action/ValidateProject.java maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/execution/maven/m1/MavenOneBuildExecutor.java maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/execution/maven/m2/DefaultMavenBuilderHelper.java maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/execution/shell/ShellBuildExecutor.java maven/continuum/trunk/continuum-core/src/test/java/org/apache/maven/continuum/DefaultContinuumTest.java Modified: maven/continuum/trunk/continuum-core-it/src/test/java/org/apache/maven/continuum/it/AbstractIntegrationTest.java URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-core-it/src/test/java/org/apache/maven/continuum/it/AbstractIntegrationTest.java?rev=232208&r1=232207&r2=232208&view=diff ============================================================================== --- maven/continuum/trunk/continuum-core-it/src/test/java/org/apache/maven/continuum/it/AbstractIntegrationTest.java (original) +++ maven/continuum/trunk/continuum-core-it/src/test/java/org/apache/maven/continuum/it/AbstractIntegrationTest.java Thu Aug 11 22:22:50 2005 @@ -528,7 +528,6 @@ assertEquals( "project.id", projectId, project.getId() ); assertEquals( "project.name", name, project.getName() ); assertEquals( "project.version", version, project.getVersion() ); - assertEquals( "project.commandLineArguments", commandLineArguments, project.getCommandLineArguments() ); assertEquals( "project.executorId", executorId, project.getExecutorId() ); } Modified: maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/DefaultContinuum.java URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/DefaultContinuum.java?rev=232208&r1=232207&r2=232208&view=diff ============================================================================== --- maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/DefaultContinuum.java (original) +++ maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/DefaultContinuum.java Thu Aug 11 22:22:50 2005 @@ -681,7 +681,6 @@ // } // System.err.println( "=======================" ); - project.setCommandLineArguments( StringUtils.clean( project.getCommandLineArguments() ) ); System.err.println( "persisting " + project.getName() + ", id: " + project.getId() ); project = store.addProject( project ); System.err.println( "persisting " + project.getName() + ", id: " + project.getId() ); @@ -1001,19 +1000,6 @@ } } - public void removeSchedule( String scheduleId ) - throws ContinuumException - { - try - { - store.removeSchedule( scheduleId ); - } - catch ( ContinuumStoreException ex ) - { - throw logAndCreateException( "Error while removing schedule.", ex ); - } - } - // ---------------------------------------------------------------------- // Project scheduling // ---------------------------------------------------------------------- @@ -1103,8 +1089,6 @@ { try { - project.setCommandLineArguments( StringUtils.clean( project.getCommandLineArguments() ) ); - return store.updateProject( project ); } catch ( ContinuumStoreException ex ) Modified: maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/core/action/StoreCheckOutScmResultAction.java URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/core/action/StoreCheckOutScmResultAction.java?rev=232208&r1=232207&r2=232208&view=diff ============================================================================== --- maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/core/action/StoreCheckOutScmResultAction.java (original) +++ maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/core/action/StoreCheckOutScmResultAction.java Thu Aug 11 22:22:50 2005 @@ -18,9 +18,8 @@ import org.apache.maven.continuum.project.ContinuumProject; import org.apache.maven.continuum.scm.ScmResult; -import org.apache.maven.continuum.store.ContinuumStoreException; import org.apache.maven.continuum.store.ContinuumStore; -import org.apache.maven.continuum.ContinuumException; +import org.apache.maven.continuum.store.ContinuumStoreException; import org.codehaus.plexus.taskqueue.execution.TaskExecutionException; import java.util.Map; @@ -45,6 +44,7 @@ ScmResult scmResult = AbstractContinuumAction.getCheckoutResult( context, null ); + // TODO: delete String checkoutErrorMessage = AbstractContinuumAction.getCheckoutErrorMessage( context, null ); String checkoutErrorException = AbstractContinuumAction.getCheckoutErrorException( context, null ); @@ -55,12 +55,14 @@ ContinuumProject project = store.getProject( getProjectId( context ) ); - project.setScmResult( scmResult ); + project.setCheckoutResult( scmResult ); +/* TODO: these should be in the SCM result? project.setCheckOutErrorMessage( checkoutErrorMessage ); project.setCheckOutErrorException( checkoutErrorException ); +*/ store.updateProject( project ); } catch ( ContinuumStoreException e ) Modified: maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/core/action/StoreProjectAction.java URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/core/action/StoreProjectAction.java?rev=232208&r1=232207&r2=232208&view=diff ============================================================================== --- maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/core/action/StoreProjectAction.java (original) +++ maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/core/action/StoreProjectAction.java Thu Aug 11 22:22:50 2005 @@ -18,9 +18,8 @@ import org.apache.maven.continuum.ContinuumException; import org.apache.maven.continuum.project.ContinuumProject; -import org.apache.maven.continuum.store.ContinuumStoreException; import org.apache.maven.continuum.store.ContinuumStore; -import org.codehaus.plexus.util.StringUtils; +import org.apache.maven.continuum.store.ContinuumStoreException; import java.util.Map; @@ -63,8 +62,6 @@ project.setWorkingDirectory( projectWorkingDirectory.getAbsolutePath() ); */ - project.setCommandLineArguments( StringUtils.clean( project.getCommandLineArguments() ) ); - store.updateProject( project ); } } Modified: maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/core/action/ValidateProject.java URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/core/action/ValidateProject.java?rev=232208&r1=232207&r2=232208&view=diff ============================================================================== --- maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/core/action/ValidateProject.java (original) +++ maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/core/action/ValidateProject.java Thu Aug 11 22:22:50 2005 @@ -17,10 +17,9 @@ */ import org.apache.maven.continuum.ContinuumException; -import org.apache.maven.continuum.store.ContinuumStore; import org.apache.maven.continuum.execution.manager.BuildExecutorManager; import org.apache.maven.continuum.project.ContinuumProject; -import org.codehaus.plexus.util.StringUtils; +import org.apache.maven.continuum.store.ContinuumStore; import java.util.Map; @@ -71,13 +70,5 @@ // } // TODO: validate that the SCM provider id - - // ---------------------------------------------------------------------- - // Validate each field - // ---------------------------------------------------------------------- - - // This is not really validating but sanitizing. - - project.setCommandLineArguments( StringUtils.clean( project.getCommandLineArguments() ) ); } } Modified: maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/execution/maven/m1/MavenOneBuildExecutor.java URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/execution/maven/m1/MavenOneBuildExecutor.java?rev=232208&r1=232207&r2=232208&view=diff ============================================================================== --- maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/execution/maven/m1/MavenOneBuildExecutor.java (original) +++ maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/execution/maven/m1/MavenOneBuildExecutor.java Thu Aug 11 22:22:50 2005 @@ -38,7 +38,9 @@ public final static String ID = "maven-1"; - /** @plexus.requirement */ + /** + * @plexus.requirement + */ private MavenOneMetadataHelper metadataHelper; // ---------------------------------------------------------------------- @@ -60,12 +62,9 @@ MavenOneProject project = (MavenOneProject) p; String commandLine = StringUtils.clean( project.getCommandLineArguments() ) + " " + - StringUtils.clean( project.getGoals() ); + StringUtils.clean( project.getGoals() ); - return executeShellCommand( project, - null, - commandLine, - buildOutput ); + return executeShellCommand( project, null, commandLine, buildOutput ); } public void updateProjectFromCheckOut( File workingDirectory, ContinuumProject project ) Modified: maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/execution/maven/m2/DefaultMavenBuilderHelper.java URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/execution/maven/m2/DefaultMavenBuilderHelper.java?rev=232208&r1=232207&r2=232208&view=diff ============================================================================== --- maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/execution/maven/m2/DefaultMavenBuilderHelper.java (original) +++ maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/execution/maven/m2/DefaultMavenBuilderHelper.java Thu Aug 11 22:22:50 2005 @@ -53,19 +53,29 @@ { public static final String DEFAULT_TEST_OUTPUT_DIRECTORY = "target/surefire-reports"; - /** @plexus.requirement */ + /** + * @plexus.requirement + */ private MavenProjectBuilder projectBuilder; - /** @plexus.requirement */ + /** + * @plexus.requirement + */ private ArtifactRepositoryFactory artifactRepositoryFactory; - /** @plexus.requirement */ + /** + * @plexus.requirement + */ private ArtifactRepositoryLayout repositoryLayout; - /** @plexus.requirement */ + /** + * @plexus.requirement + */ private MavenSettingsBuilder mavenSettingsBuilder; - /** @plexus.configuration */ + /** + * @plexus.configuration + */ private String localRepository; // ---------------------------------------------------------------------- @@ -107,7 +117,7 @@ if ( StringUtils.isEmpty( mavenProject.getGroupId() ) ) { - continuumProject.setGroupId( mavenProject.getGroupId() ); + continuumProject.setGroupId( mavenProject.getGroupId() ); } // ---------------------------------------------------------------------- @@ -116,7 +126,7 @@ if ( StringUtils.isEmpty( mavenProject.getArtifactId() ) ) { - continuumProject.setArtifactId( mavenProject.getArtifactId() ); + continuumProject.setArtifactId( mavenProject.getArtifactId() ); } // ---------------------------------------------------------------------- @@ -125,16 +135,10 @@ if ( StringUtils.isEmpty( mavenProject.getUrl() ) ) { - continuumProject.setUrl( mavenProject.getUrl() ); + continuumProject.setUrl( mavenProject.getUrl() ); } // ---------------------------------------------------------------------- - // Test output directory - // ---------------------------------------------------------------------- - - continuumProject.setTestOutputDirectory( DEFAULT_TEST_OUTPUT_DIRECTORY ); - - // ---------------------------------------------------------------------- // Developers // ---------------------------------------------------------------------- @@ -218,8 +222,6 @@ // Validate the MavenProject using some Continuum rules // ---------------------------------------------------------------------- - - // Nag email address CiManagement ciManagement = project.getCiManagement(); @@ -230,7 +232,8 @@ if ( getNotifiers( project ).isEmpty() ) { - throw new MavenBuilderHelperException( "Missing 'notifiers' element in the 'ciManagement' element in the POM." ); + throw new MavenBuilderHelperException( + "Missing 'notifiers' element in the 'ciManagement' element in the POM." ); } // SCM connection @@ -336,10 +339,7 @@ getLogger().warn( "Error while building Maven settings.", e ); } - return artifactRepositoryFactory.createArtifactRepository( "local", - "file://" + localRepository, - repositoryLayout, - null, - null ); + return artifactRepositoryFactory.createArtifactRepository( "local", "file://" + localRepository, + repositoryLayout, null, null ); } } Modified: maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/execution/shell/ShellBuildExecutor.java URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/execution/shell/ShellBuildExecutor.java?rev=232208&r1=232207&r2=232208&view=diff ============================================================================== --- maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/execution/shell/ShellBuildExecutor.java (original) +++ maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/execution/shell/ShellBuildExecutor.java Thu Aug 11 22:22:50 2005 @@ -61,10 +61,7 @@ String executable = project.getExecutable(); - return executeShellCommand( project, - executable, - project.getCommandLineArguments(), - buildOutput ); + return executeShellCommand( project, executable, project.getCommandLineArguments(), buildOutput ); } public void updateProjectFromCheckOut( File workingDirectory, ContinuumProject p ) @@ -76,8 +73,8 @@ if ( new File( executable ).isAbsolute() ) { - throw new ContinuumBuildExecutorException( "The shell script must be a relative path. " + - "It will be relative to the checkout" ); + throw new ContinuumBuildExecutorException( + "The shell script must be a relative path. " + "It will be relative to the checkout" ); } } } Modified: maven/continuum/trunk/continuum-core/src/test/java/org/apache/maven/continuum/DefaultContinuumTest.java URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-core/src/test/java/org/apache/maven/continuum/DefaultContinuumTest.java?rev=232208&r1=232207&r2=232208&view=diff ============================================================================== --- maven/continuum/trunk/continuum-core/src/test/java/org/apache/maven/continuum/DefaultContinuumTest.java (original) +++ maven/continuum/trunk/continuum-core/src/test/java/org/apache/maven/continuum/DefaultContinuumTest.java Thu Aug 11 22:22:50 2005 @@ -127,7 +127,5 @@ continuum.updateMavenTwoProject( project ); project = continuum.getMavenTwoProject( project.getId() ); - - assertNotNull( "The command line arguments are null.", project.getCommandLineArguments() ); } }