Return-Path: Delivered-To: apmail-continuum-commits-archive@www.apache.org Received: (qmail 59001 invoked from network); 19 Sep 2008 15:50:40 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 19 Sep 2008 15:50:40 -0000 Received: (qmail 33259 invoked by uid 500); 19 Sep 2008 15:50:37 -0000 Delivered-To: apmail-continuum-commits-archive@continuum.apache.org Received: (qmail 33223 invoked by uid 500); 19 Sep 2008 15:50:37 -0000 Mailing-List: contact commits-help@continuum.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@continuum.apache.org Delivered-To: mailing list commits@continuum.apache.org Received: (qmail 33214 invoked by uid 99); 19 Sep 2008 15:50:37 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 19 Sep 2008 08:50:37 -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.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 19 Sep 2008 15:49:45 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id ECB69238899E; Fri, 19 Sep 2008 08:49:47 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r697137 - in /continuum/branches/CONTINUUM-1572: continuum-api/src/main/java/org/apache/maven/continuum/release/ continuum-commons/ continuum-commons/src/main/java/org/apache/continuum/ continuum-commons/src/main/java/org/apache/continuum/u... Date: Fri, 19 Sep 2008 15:49:46 -0000 To: commits@continuum.apache.org From: ctan@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20080919154947.ECB69238899E@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: ctan Date: Fri Sep 19 08:49:45 2008 New Revision: 697137 URL: http://svn.apache.org/viewvc?rev=697137&view=rev Log: added support for build environments when releasing Added: continuum/branches/CONTINUUM-1572/continuum-commons/src/main/java/org/apache/continuum/ continuum/branches/CONTINUUM-1572/continuum-commons/src/main/java/org/apache/continuum/utils/ continuum/branches/CONTINUUM-1572/continuum-commons/src/main/java/org/apache/continuum/utils/shell/ continuum/branches/CONTINUUM-1572/continuum-commons/src/main/java/org/apache/continuum/utils/shell/DefaultShellCommandHelper.java - copied, changed from r697095, continuum/branches/CONTINUUM-1572/continuum-core/src/main/java/org/apache/maven/continuum/utils/shell/DefaultShellCommandHelper.java continuum/branches/CONTINUUM-1572/continuum-commons/src/main/java/org/apache/continuum/utils/shell/ExecutionResult.java - copied, changed from r697095, continuum/branches/CONTINUUM-1572/continuum-core/src/main/java/org/apache/maven/continuum/utils/shell/ExecutionResult.java continuum/branches/CONTINUUM-1572/continuum-commons/src/main/java/org/apache/continuum/utils/shell/ShellCommandHelper.java continuum/branches/CONTINUUM-1572/continuum-release/src/main/java/org/apache/continuum/ continuum/branches/CONTINUUM-1572/continuum-release/src/main/java/org/apache/continuum/release/ continuum/branches/CONTINUUM-1572/continuum-release/src/main/java/org/apache/continuum/release/config/ continuum/branches/CONTINUUM-1572/continuum-release/src/main/java/org/apache/continuum/release/config/ContinuumPropertiesReleaseDescriptorStore.java continuum/branches/CONTINUUM-1572/continuum-release/src/main/java/org/apache/continuum/release/config/ContinuumReleaseDescriptor.java continuum/branches/CONTINUUM-1572/continuum-release/src/main/java/org/apache/continuum/release/phase/ continuum/branches/CONTINUUM-1572/continuum-release/src/main/java/org/apache/continuum/release/phase/AbstractContinuumRunGoalsPhase.java continuum/branches/CONTINUUM-1572/continuum-release/src/main/java/org/apache/continuum/release/phase/RunPerformGoalsPhase.java continuum/branches/CONTINUUM-1572/continuum-release/src/main/java/org/apache/continuum/release/phase/RunPrepareGoalsPhase.java Removed: continuum/branches/CONTINUUM-1572/continuum-core/src/main/java/org/apache/maven/continuum/utils/shell/ Modified: continuum/branches/CONTINUUM-1572/continuum-api/src/main/java/org/apache/maven/continuum/release/ContinuumReleaseManager.java continuum/branches/CONTINUUM-1572/continuum-commons/pom.xml continuum/branches/CONTINUUM-1572/continuum-core/src/main/java/org/apache/maven/continuum/execution/AbstractBuildExecutor.java continuum/branches/CONTINUUM-1572/continuum-core/src/main/java/org/apache/maven/continuum/profile/DefaultProfileService.java continuum/branches/CONTINUUM-1572/continuum-core/src/test/java/org/apache/maven/continuum/execution/ContinuumBuildExecutorTest.java continuum/branches/CONTINUUM-1572/continuum-release/src/main/java/org/apache/maven/continuum/release/DefaultContinuumReleaseManager.java continuum/branches/CONTINUUM-1572/continuum-release/src/main/java/org/apache/maven/continuum/release/tasks/AbstractReleaseProjectTask.java continuum/branches/CONTINUUM-1572/continuum-release/src/main/java/org/apache/maven/continuum/release/tasks/PerformReleaseProjectTask.java continuum/branches/CONTINUUM-1572/continuum-release/src/main/java/org/apache/maven/continuum/release/tasks/PrepareReleaseProjectTask.java continuum/branches/CONTINUUM-1572/continuum-release/src/main/java/org/apache/maven/continuum/release/tasks/RollbackReleaseProjectTask.java continuum/branches/CONTINUUM-1572/continuum-release/src/main/resources/META-INF/plexus/components.xml continuum/branches/CONTINUUM-1572/continuum-release/src/test/java/org/apache/maven/continuum/release/executors/ReleaseTaskExecutorTest.java continuum/branches/CONTINUUM-1572/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ReleasePerformAction.java continuum/branches/CONTINUUM-1572/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ReleasePrepareAction.java continuum/branches/CONTINUUM-1572/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/admin/ProfileAction.java continuum/branches/CONTINUUM-1572/continuum-webapp/src/main/resources/localization/Continuum.properties continuum/branches/CONTINUUM-1572/continuum-webapp/src/main/resources/xwork.xml continuum/branches/CONTINUUM-1572/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/profilesList.jsp continuum/branches/CONTINUUM-1572/continuum-webapp/src/main/webapp/WEB-INF/jsp/releasePerformFromScm.jsp continuum/branches/CONTINUUM-1572/continuum-webapp/src/main/webapp/WEB-INF/jsp/releasePrepare.jsp Modified: continuum/branches/CONTINUUM-1572/continuum-api/src/main/java/org/apache/maven/continuum/release/ContinuumReleaseManager.java URL: http://svn.apache.org/viewvc/continuum/branches/CONTINUUM-1572/continuum-api/src/main/java/org/apache/maven/continuum/release/ContinuumReleaseManager.java?rev=697137&r1=697136&r2=697137&view=diff ============================================================================== --- continuum/branches/CONTINUUM-1572/continuum-api/src/main/java/org/apache/maven/continuum/release/ContinuumReleaseManager.java (original) +++ continuum/branches/CONTINUUM-1572/continuum-api/src/main/java/org/apache/maven/continuum/release/ContinuumReleaseManager.java Fri Sep 19 08:49:45 2008 @@ -21,6 +21,7 @@ import org.apache.continuum.model.repository.LocalRepository; import org.apache.maven.continuum.model.project.Project; +import org.apache.maven.continuum.model.system.Profile; import java.io.File; import java.util.Map; @@ -50,6 +51,22 @@ String prepare( Project project, Properties releaseProperties, Map releaseVersions, Map developmentVersions, ContinuumReleaseManagerListener listener ) throws ContinuumReleaseException; + + /** + * Prepare a project for release + * + * @param project + * @param releaseProperties + * @param releaseVersions + * @param developmentVersions + * @param listener + * @param profile + * @return + * @throws ContinuumReleaseException + */ + String prepare( Project project, Properties releaseProperties, Map releaseVersions, Map developmentVersions, + ContinuumReleaseManagerListener listener, Profile profile ) + throws ContinuumReleaseException; /** * Perform a release based on a given releaseId @@ -99,4 +116,6 @@ void perform( String releaseId, File buildDirectory, String goals, boolean useReleaseProfile, ContinuumReleaseManagerListener listener, LocalRepository repository ) throws ContinuumReleaseException; + + Map getEnvironments( Profile profile ); } Modified: continuum/branches/CONTINUUM-1572/continuum-commons/pom.xml URL: http://svn.apache.org/viewvc/continuum/branches/CONTINUUM-1572/continuum-commons/pom.xml?rev=697137&r1=697136&r2=697137&view=diff ============================================================================== --- continuum/branches/CONTINUUM-1572/continuum-commons/pom.xml (original) +++ continuum/branches/CONTINUUM-1572/continuum-commons/pom.xml Fri Sep 19 08:49:45 2008 @@ -43,6 +43,17 @@ org.codehaus.plexus plexus-spring + + org.apache.maven.release + maven-release-manager + 1.0-alpha-3 + + + org.codehaus.plexus + plexus-container-default + + + hsqldb Copied: continuum/branches/CONTINUUM-1572/continuum-commons/src/main/java/org/apache/continuum/utils/shell/DefaultShellCommandHelper.java (from r697095, continuum/branches/CONTINUUM-1572/continuum-core/src/main/java/org/apache/maven/continuum/utils/shell/DefaultShellCommandHelper.java) URL: http://svn.apache.org/viewvc/continuum/branches/CONTINUUM-1572/continuum-commons/src/main/java/org/apache/continuum/utils/shell/DefaultShellCommandHelper.java?p2=continuum/branches/CONTINUUM-1572/continuum-commons/src/main/java/org/apache/continuum/utils/shell/DefaultShellCommandHelper.java&p1=continuum/branches/CONTINUUM-1572/continuum-core/src/main/java/org/apache/maven/continuum/utils/shell/DefaultShellCommandHelper.java&r1=697095&r2=697137&rev=697137&view=diff ============================================================================== --- continuum/branches/CONTINUUM-1572/continuum-core/src/main/java/org/apache/maven/continuum/utils/shell/DefaultShellCommandHelper.java (original) +++ continuum/branches/CONTINUUM-1572/continuum-commons/src/main/java/org/apache/continuum/utils/shell/DefaultShellCommandHelper.java Fri Sep 19 08:49:45 2008 @@ -1,4 +1,4 @@ -package org.apache.maven.continuum.utils.shell; +package org.apache.continuum.utils.shell; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -19,7 +19,12 @@ * under the License. */ +import org.apache.maven.shared.release.ReleaseResult; +import org.apache.maven.shared.release.exec.MavenExecutorException; +import org.apache.maven.shared.release.exec.TeeConsumer; import org.codehaus.plexus.logging.AbstractLogEnabled; +import org.codehaus.plexus.util.StringUtils; +import org.codehaus.plexus.util.cli.CommandLineException; import org.codehaus.plexus.util.cli.CommandLineUtils; import org.codehaus.plexus.util.cli.Commandline; import org.codehaus.plexus.util.cli.StreamConsumer; @@ -35,7 +40,7 @@ /** * @author Trygve Laugstøl * @version $Id$ - * @plexus.component role="org.apache.maven.continuum.utils.shell.ShellCommandHelper" + * @plexus.component role="org.apache.continuum.utils.shell.ShellCommandHelper" * role-hint="default" */ public class DefaultShellCommandHelper @@ -150,4 +155,68 @@ { CommandLineUtils.killProcess( idCommand ); } + + public void executeGoals( File workingDirectory, String goals, boolean interactive, String arguments, + ReleaseResult relResult, Map environments ) + throws Exception + { + Commandline cl = new Commandline(); + + Commandline.Argument argument = cl.createArgument(); + + argument.setLine( arguments ); + + executeGoals( workingDirectory, goals, interactive, argument.getParts(), relResult, environments ); + } + + public void executeGoals( File workingDirectory, String goals, boolean interactive, String[] arguments, + ReleaseResult relResult, Map environments ) + throws Exception + { + Commandline cl = createCommandline( workingDirectory, "mvn", arguments, -1, environments ); + + if ( goals != null ) + { + // accept both space and comma, so the old way still work + String[] tokens = StringUtils.split( goals, ", " ); + + for ( int i = 0; i < tokens.length; ++i ) + { + cl.createArgument().setValue( tokens[i] ); + } + } + + cl.createArgument().setValue( "--no-plugin-updates" ); + + if ( !interactive ) + { + cl.createArgument().setValue( "--batch-mode" ); + } + + StreamConsumer stdOut = new TeeConsumer( System.out ); + + StreamConsumer stdErr = new TeeConsumer( System.err ); + + try + { + relResult.appendInfo( "Executing: " + cl.toString() ); + getLogger().info( "Executing: " + cl.toString() ); + + int result = CommandLineUtils.executeCommandLine( cl, stdOut, stdErr ); + + if ( result != 0 ) + { + throw new MavenExecutorException( "Maven execution failed, exit code: \'" + result + "\'", result, + stdOut.toString(), stdErr.toString() ); + } + } + catch ( CommandLineException e ) + { + throw new MavenExecutorException( "Can't run goal " + goals, stdOut.toString(), stdErr.toString(), e ); + } + finally + { + relResult.appendOutput( stdOut.toString() ); + } + } } Copied: continuum/branches/CONTINUUM-1572/continuum-commons/src/main/java/org/apache/continuum/utils/shell/ExecutionResult.java (from r697095, continuum/branches/CONTINUUM-1572/continuum-core/src/main/java/org/apache/maven/continuum/utils/shell/ExecutionResult.java) URL: http://svn.apache.org/viewvc/continuum/branches/CONTINUUM-1572/continuum-commons/src/main/java/org/apache/continuum/utils/shell/ExecutionResult.java?p2=continuum/branches/CONTINUUM-1572/continuum-commons/src/main/java/org/apache/continuum/utils/shell/ExecutionResult.java&p1=continuum/branches/CONTINUUM-1572/continuum-core/src/main/java/org/apache/maven/continuum/utils/shell/ExecutionResult.java&r1=697095&r2=697137&rev=697137&view=diff ============================================================================== --- continuum/branches/CONTINUUM-1572/continuum-core/src/main/java/org/apache/maven/continuum/utils/shell/ExecutionResult.java (original) +++ continuum/branches/CONTINUUM-1572/continuum-commons/src/main/java/org/apache/continuum/utils/shell/ExecutionResult.java Fri Sep 19 08:49:45 2008 @@ -1,4 +1,4 @@ -package org.apache.maven.continuum.utils.shell; +package org.apache.continuum.utils.shell; /* * Licensed to the Apache Software Foundation (ASF) under one Added: continuum/branches/CONTINUUM-1572/continuum-commons/src/main/java/org/apache/continuum/utils/shell/ShellCommandHelper.java URL: http://svn.apache.org/viewvc/continuum/branches/CONTINUUM-1572/continuum-commons/src/main/java/org/apache/continuum/utils/shell/ShellCommandHelper.java?rev=697137&view=auto ============================================================================== --- continuum/branches/CONTINUUM-1572/continuum-commons/src/main/java/org/apache/continuum/utils/shell/ShellCommandHelper.java (added) +++ continuum/branches/CONTINUUM-1572/continuum-commons/src/main/java/org/apache/continuum/utils/shell/ShellCommandHelper.java Fri Sep 19 08:49:45 2008 @@ -0,0 +1,55 @@ +package org.apache.continuum.utils.shell; + +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you 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 java.io.File; +import java.util.Map; + +import org.apache.continuum.utils.shell.ExecutionResult; +import org.apache.maven.shared.release.ReleaseResult; + +/** + * @author Trygve Laugstøl + * @version $Id: ShellCommandHelper.java 548732 2007-06-19 14:04:13Z evenisse $ + */ +public interface ShellCommandHelper +{ + String ROLE = ShellCommandHelper.class.getName(); + + ExecutionResult executeShellCommand( File workingDirectory, String executable, String arguments, File output, + long idCommand, Map environments ) + throws Exception; + + ExecutionResult executeShellCommand( File workingDirectory, String executable, String[] arguments, File output, + long idCommand, Map environments ) + throws Exception; + + boolean isRunning( long idCommand ); + + void killProcess( long idCommand ); + + void executeGoals( File workingDirectory, String goals, boolean interactive, String arguments, + ReleaseResult relResult, Map environments ) + throws Exception; + + void executeGoals( File workingDirectory, String goals, boolean interactive, String[] arguments, + ReleaseResult relResult, Map environments ) + throws Exception; +} Modified: continuum/branches/CONTINUUM-1572/continuum-core/src/main/java/org/apache/maven/continuum/execution/AbstractBuildExecutor.java URL: http://svn.apache.org/viewvc/continuum/branches/CONTINUUM-1572/continuum-core/src/main/java/org/apache/maven/continuum/execution/AbstractBuildExecutor.java?rev=697137&r1=697136&r2=697137&view=diff ============================================================================== --- continuum/branches/CONTINUUM-1572/continuum-core/src/main/java/org/apache/maven/continuum/execution/AbstractBuildExecutor.java (original) +++ continuum/branches/CONTINUUM-1572/continuum-core/src/main/java/org/apache/maven/continuum/execution/AbstractBuildExecutor.java Fri Sep 19 08:49:45 2008 @@ -19,6 +19,8 @@ * under the License. */ +import org.apache.continuum.utils.shell.ExecutionResult; +import org.apache.continuum.utils.shell.ShellCommandHelper; import org.apache.maven.artifact.Artifact; import org.apache.maven.continuum.installation.InstallationService; import org.apache.maven.continuum.model.project.BuildDefinition; @@ -28,8 +30,6 @@ import org.apache.maven.continuum.model.system.Profile; import org.apache.maven.continuum.project.ContinuumProjectState; import org.apache.maven.continuum.utils.WorkingDirectoryService; -import org.apache.maven.continuum.utils.shell.ExecutionResult; -import org.apache.maven.continuum.utils.shell.ShellCommandHelper; import org.codehaus.plexus.commandline.ExecutableResolver; import org.codehaus.plexus.logging.AbstractLogEnabled; import org.codehaus.plexus.personality.plexus.lifecycle.phase.Initializable; Modified: continuum/branches/CONTINUUM-1572/continuum-core/src/main/java/org/apache/maven/continuum/profile/DefaultProfileService.java URL: http://svn.apache.org/viewvc/continuum/branches/CONTINUUM-1572/continuum-core/src/main/java/org/apache/maven/continuum/profile/DefaultProfileService.java?rev=697137&r1=697136&r2=697137&view=diff ============================================================================== --- continuum/branches/CONTINUUM-1572/continuum-core/src/main/java/org/apache/maven/continuum/profile/DefaultProfileService.java (original) +++ continuum/branches/CONTINUUM-1572/continuum-core/src/main/java/org/apache/maven/continuum/profile/DefaultProfileService.java Fri Sep 19 08:49:45 2008 @@ -131,7 +131,14 @@ public void deleteProfile( int profileId ) throws ProfileException { - profileDao.removeProfile( getProfile( profileId ) ); + try + { + profileDao.removeProfile( getProfile( profileId ) ); + } + catch ( Exception e ) + { + throw new ProfileException( "Cannot remove the profile", e ); + } } /** Modified: continuum/branches/CONTINUUM-1572/continuum-core/src/test/java/org/apache/maven/continuum/execution/ContinuumBuildExecutorTest.java URL: http://svn.apache.org/viewvc/continuum/branches/CONTINUUM-1572/continuum-core/src/test/java/org/apache/maven/continuum/execution/ContinuumBuildExecutorTest.java?rev=697137&r1=697136&r2=697137&view=diff ============================================================================== --- continuum/branches/CONTINUUM-1572/continuum-core/src/test/java/org/apache/maven/continuum/execution/ContinuumBuildExecutorTest.java (original) +++ continuum/branches/CONTINUUM-1572/continuum-core/src/test/java/org/apache/maven/continuum/execution/ContinuumBuildExecutorTest.java Fri Sep 19 08:49:45 2008 @@ -25,14 +25,14 @@ import junit.framework.TestCase; +import org.apache.continuum.utils.shell.ExecutionResult; +import org.apache.continuum.utils.shell.ShellCommandHelper; import org.apache.maven.continuum.configuration.ConfigurationService; import org.apache.maven.continuum.configuration.DefaultConfigurationService; import org.apache.maven.continuum.model.project.BuildDefinition; import org.apache.maven.continuum.model.project.Project; import org.apache.maven.continuum.model.project.ProjectGroup; import org.apache.maven.continuum.utils.ChrootJailWorkingDirectoryService; -import org.apache.maven.continuum.utils.shell.ExecutionResult; -import org.apache.maven.continuum.utils.shell.ShellCommandHelper; import org.codehaus.plexus.logging.Logger; import org.codehaus.plexus.logging.console.ConsoleLogger; import org.jmock.Expectations; Added: continuum/branches/CONTINUUM-1572/continuum-release/src/main/java/org/apache/continuum/release/config/ContinuumPropertiesReleaseDescriptorStore.java URL: http://svn.apache.org/viewvc/continuum/branches/CONTINUUM-1572/continuum-release/src/main/java/org/apache/continuum/release/config/ContinuumPropertiesReleaseDescriptorStore.java?rev=697137&view=auto ============================================================================== --- continuum/branches/CONTINUUM-1572/continuum-release/src/main/java/org/apache/continuum/release/config/ContinuumPropertiesReleaseDescriptorStore.java (added) +++ continuum/branches/CONTINUUM-1572/continuum-release/src/main/java/org/apache/continuum/release/config/ContinuumPropertiesReleaseDescriptorStore.java Fri Sep 19 08:49:45 2008 @@ -0,0 +1,348 @@ +package org.apache.continuum.release.config; + +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you 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 java.io.File; +import java.io.FileInputStream; +import java.io.FileNotFoundException; +import java.io.FileOutputStream; +import java.io.IOException; +import java.io.InputStream; +import java.io.OutputStream; +import java.util.HashMap; +import java.util.Iterator; +import java.util.Map; +import java.util.Properties; +import java.util.Set; +import java.util.Map.Entry; + +import org.apache.maven.model.Scm; +import org.apache.maven.shared.release.config.PropertiesReleaseDescriptorStore; +import org.apache.maven.shared.release.config.ReleaseDescriptor; +import org.apache.maven.shared.release.config.ReleaseDescriptorStoreException; +import org.apache.maven.shared.release.config.ReleaseUtils; +import org.codehaus.plexus.util.IOUtil; + +public class ContinuumPropertiesReleaseDescriptorStore + extends PropertiesReleaseDescriptorStore +{ + public ReleaseDescriptor read( ReleaseDescriptor mergeDescriptor, File file ) + throws ReleaseDescriptorStoreException + { + Properties properties = new Properties(); + + InputStream inStream = null; + try + { + inStream = new FileInputStream( file ); + + properties.load( inStream ); + } + catch ( FileNotFoundException e ) + { + getLogger().debug( file.getName() + " not found - using empty properties" ); + } + catch ( IOException e ) + { + throw new ReleaseDescriptorStoreException( + "Error reading properties file '" + file.getName() + "': " + e.getMessage(), e ); + } + finally + { + IOUtil.close( inStream ); + } + + ContinuumReleaseDescriptor releaseDescriptor = new ContinuumReleaseDescriptor(); + releaseDescriptor.setCompletedPhase( properties.getProperty( "completedPhase" ) ); + releaseDescriptor.setScmSourceUrl( properties.getProperty( "scm.url" ) ); + releaseDescriptor.setScmUsername( properties.getProperty( "scm.username" ) ); + releaseDescriptor.setScmPassword( properties.getProperty( "scm.password" ) ); + releaseDescriptor.setScmPrivateKey( properties.getProperty( "scm.privateKey" ) ); + releaseDescriptor.setScmPrivateKeyPassPhrase( properties.getProperty( "scm.passphrase" ) ); + releaseDescriptor.setScmTagBase( properties.getProperty( "scm.tagBase" ) ); + releaseDescriptor.setScmReleaseLabel( properties.getProperty( "scm.tag" ) ); + releaseDescriptor.setScmCommentPrefix( properties.getProperty( "scm.commentPrefix" ) ); + releaseDescriptor.setAdditionalArguments( properties.getProperty( "exec.additionalArguments" ) ); + releaseDescriptor.setPomFileName( properties.getProperty( "exec.pomFileName" ) ); + releaseDescriptor.setPreparationGoals( properties.getProperty( "preparationGoals" ) ); + + loadResolvedDependencies( properties, releaseDescriptor ); + + // boolean properties are not written to the properties file because the value from the caller is always used + + for ( Iterator i = properties.keySet().iterator(); i.hasNext(); ) + { + String property = (String) i.next(); + if ( property.startsWith( "project.rel." ) ) + { + releaseDescriptor.mapReleaseVersion( property.substring( "project.rel.".length() ), + properties.getProperty( property ) ); + } + else if ( property.startsWith( "project.dev." ) ) + { + releaseDescriptor.mapDevelopmentVersion( property.substring( "project.dev.".length() ), + properties.getProperty( property ) ); + } + else if ( property.startsWith( "project.scm." ) ) + { + int index = property.lastIndexOf( '.' ); + if ( index > "project.scm.".length() ) + { + String key = property.substring( "project.scm.".length(), index ); + + if ( !releaseDescriptor.getOriginalScmInfo().containsKey( key ) ) + { + if ( properties.getProperty( "project.scm." + key + ".empty" ) != null ) + { + releaseDescriptor.mapOriginalScmInfo( key, null ); + } + else + { + Scm scm = new Scm(); + scm.setConnection( properties.getProperty( "project.scm." + key + ".connection" ) ); + scm.setDeveloperConnection( + properties.getProperty( "project.scm." + key + ".developerConnection" ) ); + scm.setUrl( properties.getProperty( "project.scm." + key + ".url" ) ); + scm.setTag( properties.getProperty( "project.scm." + key + ".tag" ) ); + + releaseDescriptor.mapOriginalScmInfo( key, scm ); + } + } + } + } + else if ( property.startsWith( "build.env." ) ) + { + releaseDescriptor.mapEnvironments( property.substring( "build.env.".length() ), + properties.getProperty( property ) ); + } + } + + if ( mergeDescriptor != null ) + { + releaseDescriptor = (ContinuumReleaseDescriptor) ReleaseUtils.merge( releaseDescriptor, mergeDescriptor ); + releaseDescriptor.setEnvironments( ( (ContinuumReleaseDescriptor)mergeDescriptor ).getEnvironments() ); + } + + return releaseDescriptor; + } + + public void write( ReleaseDescriptor configFile, File file ) + throws ReleaseDescriptorStoreException + { + ContinuumReleaseDescriptor config = (ContinuumReleaseDescriptor) configFile; + Properties properties = new Properties(); + properties.setProperty( "completedPhase", config.getCompletedPhase() ); + properties.setProperty( "scm.url", config.getScmSourceUrl() ); + if ( config.getScmUsername() != null ) + { + properties.setProperty( "scm.username", config.getScmUsername() ); + } + if ( config.getScmPassword() != null ) + { + properties.setProperty( "scm.password", config.getScmPassword() ); + } + if ( config.getScmPrivateKey() != null ) + { + properties.setProperty( "scm.privateKey", config.getScmPrivateKey() ); + } + if ( config.getScmPrivateKeyPassPhrase() != null ) + { + properties.setProperty( "scm.passphrase", config.getScmPrivateKeyPassPhrase() ); + } + if ( config.getScmTagBase() != null ) + { + properties.setProperty( "scm.tagBase", config.getScmTagBase() ); + } + if ( config.getScmReleaseLabel() != null ) + { + properties.setProperty( "scm.tag", config.getScmReleaseLabel() ); + } + if ( config.getScmCommentPrefix() != null ) + { + properties.setProperty( "scm.commentPrefix", config.getScmCommentPrefix() ); + } + if ( config.getAdditionalArguments() != null ) + { + properties.setProperty( "exec.additionalArguments", config.getAdditionalArguments() ); + } + if ( config.getPomFileName() != null ) + { + properties.setProperty( "exec.pomFileName", config.getPomFileName() ); + } + if ( config.getPreparationGoals() != null ) + { + properties.setProperty( "preparationGoals", config.getPreparationGoals() ); + } + + // boolean properties are not written to the properties file because the value from the caller is always used + + for ( Iterator i = config.getReleaseVersions().entrySet().iterator(); i.hasNext(); ) + { + Map.Entry entry = (Map.Entry) i.next(); + properties.setProperty( "project.rel." + entry.getKey(), (String) entry.getValue() ); + } + + for ( Iterator i = config.getDevelopmentVersions().entrySet().iterator(); i.hasNext(); ) + { + Map.Entry entry = (Map.Entry) i.next(); + properties.setProperty( "project.dev." + entry.getKey(), (String) entry.getValue() ); + } + + for ( Iterator i = config.getOriginalScmInfo().entrySet().iterator(); i.hasNext(); ) + { + Map.Entry entry = (Map.Entry) i.next(); + Scm scm = (Scm) entry.getValue(); + String prefix = "project.scm." + entry.getKey(); + if ( scm != null ) + { + if ( scm.getConnection() != null ) + { + properties.setProperty( prefix + ".connection", scm.getConnection() ); + } + if ( scm.getDeveloperConnection() != null ) + { + properties.setProperty( prefix + ".developerConnection", scm.getDeveloperConnection() ); + } + if ( scm.getUrl() != null ) + { + properties.setProperty( prefix + ".url", scm.getUrl() ); + } + if ( scm.getTag() != null ) + { + properties.setProperty( prefix + ".tag", scm.getTag() ); + } + } + else + { + properties.setProperty( prefix + ".empty", "true" ); + } + } + + for ( Iterator i = config.getEnvironments().entrySet().iterator(); i.hasNext(); ) + { + Map.Entry entry = (Map.Entry) i.next(); + properties.setProperty( "build.env." + entry.getKey(), (String) entry.getValue() ); + } + + if ( ( config.getResolvedSnapshotDependencies() != null ) && + ( config.getResolvedSnapshotDependencies().size() > 0 ) ) + { + processResolvedDependencies( properties, config.getResolvedSnapshotDependencies() ); + } + + OutputStream outStream = null; + //noinspection OverlyBroadCatchBlock + try + { + outStream = new FileOutputStream( file ); + + properties.store( outStream, "release configuration" ); + } + catch ( IOException e ) + { + throw new ReleaseDescriptorStoreException( + "Error writing properties file '" + file.getName() + "': " + e.getMessage(), e ); + } + finally + { + IOUtil.close( outStream ); + } + + } + + private void processResolvedDependencies( Properties prop, Map resolvedDependencies ) + { + Set entries = resolvedDependencies.entrySet(); + Iterator iterator = entries.iterator(); + Entry currentEntry; + + while ( iterator.hasNext() ) + { + currentEntry = (Entry) iterator.next(); + + Map versionMap = (Map) currentEntry.getValue(); + + prop.setProperty( "dependency." + currentEntry.getKey() + ".release", + (String) versionMap.get( ReleaseDescriptor.RELEASE_KEY ) ); + prop.setProperty( "dependency." + currentEntry.getKey() + ".development", + (String) versionMap.get( ReleaseDescriptor.DEVELOPMENT_KEY ) ); + } + } + + private static File getDefaultReleasePropertiesFile( ReleaseDescriptor mergeDescriptor ) + { + return new File( mergeDescriptor.getWorkingDirectory(), "release.properties" ); + } + + private void loadResolvedDependencies( Properties prop, ReleaseDescriptor descriptor ) + { + Map resolvedDependencies = new HashMap(); + + Set entries = prop.entrySet(); + Iterator iterator = entries.iterator(); + String propertyName; + Entry currentEntry; + + while ( iterator.hasNext() ) + { + currentEntry = (Entry) iterator.next(); + propertyName = (String) currentEntry.getKey(); + + if ( propertyName.startsWith( "dependency." ) ) + { + Map versionMap; + String artifactVersionlessKey; + int startIndex; + int endIndex; + String versionType; + + versionMap = new HashMap(); + startIndex = propertyName.lastIndexOf( "dependency." ); + + if ( propertyName.indexOf( ".development" ) != -1 ) + { + endIndex = propertyName.indexOf( ".development" ); + versionType = ReleaseDescriptor.DEVELOPMENT_KEY; + } + else + { + endIndex = propertyName.indexOf( ".release" ); + versionType = ReleaseDescriptor.RELEASE_KEY; + } + + artifactVersionlessKey = propertyName.substring( startIndex, endIndex ); + + if ( resolvedDependencies.containsKey( artifactVersionlessKey ) ) + { + versionMap = (Map) resolvedDependencies.get( artifactVersionlessKey ); + } + else + { + versionMap = new HashMap(); + resolvedDependencies.put( artifactVersionlessKey, versionMap ); + } + + versionMap.put( versionType, currentEntry.getValue() ); + } + } + + descriptor.setResolvedSnapshotDependencies( resolvedDependencies ); + } +} Added: continuum/branches/CONTINUUM-1572/continuum-release/src/main/java/org/apache/continuum/release/config/ContinuumReleaseDescriptor.java URL: http://svn.apache.org/viewvc/continuum/branches/CONTINUUM-1572/continuum-release/src/main/java/org/apache/continuum/release/config/ContinuumReleaseDescriptor.java?rev=697137&view=auto ============================================================================== --- continuum/branches/CONTINUUM-1572/continuum-release/src/main/java/org/apache/continuum/release/config/ContinuumReleaseDescriptor.java (added) +++ continuum/branches/CONTINUUM-1572/continuum-release/src/main/java/org/apache/continuum/release/config/ContinuumReleaseDescriptor.java Fri Sep 19 08:49:45 2008 @@ -0,0 +1,68 @@ +package org.apache.continuum.release.config; + +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you 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 java.util.HashMap; +import java.util.Map; + +import org.apache.maven.shared.release.config.ReleaseDescriptor; + +/** + * @author Maria Catherine Tan + */ +public class ContinuumReleaseDescriptor + extends ReleaseDescriptor +{ + private Map environments; + + public void addEnvironment( String name, String value ) + { + getEnvironments().put( name, value ); + } + + public Map getEnvironments() + { + if ( environments == null ) + { + environments = new HashMap(); + } + + return environments; + } + + public void mapEnvironments( String name, String value) + { + if ( environments == null ) + { + environments = new HashMap(); + } + else + { + assert !environments.containsKey( name ); + } + + environments.put( name, value ); + } + + public void setEnvironments( Map environments ) + { + this.environments = environments; + } +} Added: continuum/branches/CONTINUUM-1572/continuum-release/src/main/java/org/apache/continuum/release/phase/AbstractContinuumRunGoalsPhase.java URL: http://svn.apache.org/viewvc/continuum/branches/CONTINUUM-1572/continuum-release/src/main/java/org/apache/continuum/release/phase/AbstractContinuumRunGoalsPhase.java?rev=697137&view=auto ============================================================================== --- continuum/branches/CONTINUUM-1572/continuum-release/src/main/java/org/apache/continuum/release/phase/AbstractContinuumRunGoalsPhase.java (added) +++ continuum/branches/CONTINUUM-1572/continuum-release/src/main/java/org/apache/continuum/release/phase/AbstractContinuumRunGoalsPhase.java Fri Sep 19 08:49:45 2008 @@ -0,0 +1,77 @@ +package org.apache.continuum.release.phase; + +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you 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 java.io.File; +import java.util.Map; + +import org.apache.continuum.release.config.ContinuumReleaseDescriptor; +import org.apache.continuum.utils.shell.ShellCommandHelper; +import org.apache.maven.shared.release.ReleaseExecutionException; +import org.apache.maven.shared.release.ReleaseResult; +import org.apache.maven.shared.release.config.ReleaseDescriptor; +import org.apache.maven.shared.release.phase.AbstractRunGoalsPhase; +import org.codehaus.plexus.util.StringUtils; + +/** + * @author Maria Catherine Tan + */ +public abstract class AbstractContinuumRunGoalsPhase + extends AbstractRunGoalsPhase +{ + /** + * @plexus.requirement + */ + private ShellCommandHelper shellCommandHelper; + + public ReleaseResult execute( ReleaseDescriptor releaseDescriptor, File workingDirectory, + String additionalArguments ) + throws ReleaseExecutionException + { + ReleaseResult result = new ReleaseResult(); + + try + { + String goals = getGoals( releaseDescriptor ); + if ( !StringUtils.isEmpty( goals ) ) + { + Map environments = null; + + if ( releaseDescriptor instanceof ContinuumReleaseDescriptor ) + { + environments = ( (ContinuumReleaseDescriptor) releaseDescriptor ).getEnvironments(); + } + + shellCommandHelper.executeGoals( determineWorkingDirectory( workingDirectory, + releaseDescriptor.getScmRelativePathProjectDirectory() ), + goals, releaseDescriptor.isInteractive(), additionalArguments, result, + environments ); + } + } + catch ( Exception e ) + { + throw new ReleaseExecutionException( e.getMessage(), e ); + } + + result.setResultCode( ReleaseResult.SUCCESS ); + + return result; + } +} Added: continuum/branches/CONTINUUM-1572/continuum-release/src/main/java/org/apache/continuum/release/phase/RunPerformGoalsPhase.java URL: http://svn.apache.org/viewvc/continuum/branches/CONTINUUM-1572/continuum-release/src/main/java/org/apache/continuum/release/phase/RunPerformGoalsPhase.java?rev=697137&view=auto ============================================================================== --- continuum/branches/CONTINUUM-1572/continuum-release/src/main/java/org/apache/continuum/release/phase/RunPerformGoalsPhase.java (added) +++ continuum/branches/CONTINUUM-1572/continuum-release/src/main/java/org/apache/continuum/release/phase/RunPerformGoalsPhase.java Fri Sep 19 08:49:45 2008 @@ -0,0 +1,76 @@ +package org.apache.continuum.release.phase; + +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you 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 java.io.File; +import java.util.List; + +import org.apache.maven.settings.Settings; +import org.apache.maven.shared.release.ReleaseExecutionException; +import org.apache.maven.shared.release.ReleaseFailureException; +import org.apache.maven.shared.release.ReleaseResult; +import org.apache.maven.shared.release.config.ReleaseDescriptor; +import org.codehaus.plexus.util.StringUtils; + +/** + * Run Release Perform Goals + * @plexus.component role="org.apache.maven.shared.release.phase.ReleasePhase" role-hint="run-release-perform-goals" + */ +public class RunPerformGoalsPhase + extends AbstractContinuumRunGoalsPhase +{ + @Override + protected String getGoals( ReleaseDescriptor releaseDescriptor ) + { + return releaseDescriptor.getPerformGoals(); + } + + public ReleaseResult execute( ReleaseDescriptor releaseDescriptor, Settings settings, List reactorProjects ) + throws ReleaseExecutionException, ReleaseFailureException + { + String additionalArguments = releaseDescriptor.getAdditionalArguments(); + + if ( releaseDescriptor.isUseReleaseProfile() ) + { + if ( !StringUtils.isEmpty( additionalArguments ) ) + { + additionalArguments = additionalArguments + " -DperformRelease=true"; + } + else + { + additionalArguments = "-DperformRelease=true"; + } + } + + return execute( releaseDescriptor, new File( releaseDescriptor.getCheckoutDirectory() ), additionalArguments ); + } + + public ReleaseResult simulate( ReleaseDescriptor releaseDescriptor, Settings settings, List reactorProjects ) + throws ReleaseExecutionException, ReleaseFailureException + { + ReleaseResult result = new ReleaseResult(); + + logInfo( result, "Executing perform goals" ); + + execute( releaseDescriptor, settings, reactorProjects ); + + return result; + } +} \ No newline at end of file Added: continuum/branches/CONTINUUM-1572/continuum-release/src/main/java/org/apache/continuum/release/phase/RunPrepareGoalsPhase.java URL: http://svn.apache.org/viewvc/continuum/branches/CONTINUUM-1572/continuum-release/src/main/java/org/apache/continuum/release/phase/RunPrepareGoalsPhase.java?rev=697137&view=auto ============================================================================== --- continuum/branches/CONTINUUM-1572/continuum-release/src/main/java/org/apache/continuum/release/phase/RunPrepareGoalsPhase.java (added) +++ continuum/branches/CONTINUUM-1572/continuum-release/src/main/java/org/apache/continuum/release/phase/RunPrepareGoalsPhase.java Fri Sep 19 08:49:45 2008 @@ -0,0 +1,63 @@ +package org.apache.continuum.release.phase; + +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you 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 java.io.File; +import java.util.List; + +import org.apache.maven.settings.Settings; +import org.apache.maven.shared.release.ReleaseExecutionException; +import org.apache.maven.shared.release.ReleaseFailureException; +import org.apache.maven.shared.release.ReleaseResult; +import org.apache.maven.shared.release.config.ReleaseDescriptor; + +/** + * Run Release Preparation Goals + * @plexus.component role="org.apache.maven.shared.release.phase.ReleasePhase" role-hint="run-release-prepare-goals" + */ +public class RunPrepareGoalsPhase + extends AbstractContinuumRunGoalsPhase +{ + @Override + protected String getGoals( ReleaseDescriptor releaseDescriptor ) + { + return releaseDescriptor.getPreparationGoals(); + } + + public ReleaseResult execute( ReleaseDescriptor releaseDescriptor, Settings settings, List reactorProjects ) + throws ReleaseExecutionException, ReleaseFailureException + { + return execute( releaseDescriptor, new File( releaseDescriptor.getWorkingDirectory() ), + releaseDescriptor.getAdditionalArguments() ); + } + + public ReleaseResult simulate( ReleaseDescriptor releaseDescriptor, Settings settings, List reactorProjects ) + throws ReleaseExecutionException, ReleaseFailureException + { + ReleaseResult result = new ReleaseResult(); + + logInfo( result, "Executing preparation goals - since this is simulation mode it is running against the " + + "original project, not the rewritten ones" ); + + execute( releaseDescriptor, settings, reactorProjects ); + + return result; + } +} Modified: continuum/branches/CONTINUUM-1572/continuum-release/src/main/java/org/apache/maven/continuum/release/DefaultContinuumReleaseManager.java URL: http://svn.apache.org/viewvc/continuum/branches/CONTINUUM-1572/continuum-release/src/main/java/org/apache/maven/continuum/release/DefaultContinuumReleaseManager.java?rev=697137&r1=697136&r2=697137&view=diff ============================================================================== --- continuum/branches/CONTINUUM-1572/continuum-release/src/main/java/org/apache/maven/continuum/release/DefaultContinuumReleaseManager.java (original) +++ continuum/branches/CONTINUUM-1572/continuum-release/src/main/java/org/apache/maven/continuum/release/DefaultContinuumReleaseManager.java Fri Sep 19 08:49:45 2008 @@ -20,7 +20,11 @@ */ import org.apache.continuum.model.repository.LocalRepository; +import org.apache.continuum.release.config.ContinuumReleaseDescriptor; +import org.apache.maven.continuum.installation.InstallationService; import org.apache.maven.continuum.model.project.Project; +import org.apache.maven.continuum.model.system.Installation; +import org.apache.maven.continuum.model.system.Profile; import org.apache.maven.continuum.release.tasks.PerformReleaseProjectTask; import org.apache.maven.continuum.release.tasks.PrepareReleaseProjectTask; import org.apache.maven.continuum.release.tasks.RollbackReleaseProjectTask; @@ -32,9 +36,13 @@ import org.codehaus.plexus.taskqueue.Task; import org.codehaus.plexus.taskqueue.TaskQueue; import org.codehaus.plexus.taskqueue.TaskQueueException; +import org.codehaus.plexus.util.StringUtils; import java.io.File; +import java.util.Collections; +import java.util.HashMap; import java.util.Hashtable; +import java.util.List; import java.util.Map; import java.util.Properties; @@ -69,6 +77,11 @@ * @plexus.requirement */ private WorkingDirectoryService workingDirectoryService; + + /** + * @plexus.requirement + */ + private InstallationService installationService; private Map listeners; @@ -90,16 +103,23 @@ ContinuumReleaseManagerListener listener ) throws ContinuumReleaseException { + return prepare( project, releaseProperties, relVersions, devVersions, listener, null ); + } + + public String prepare( Project project, Properties releaseProperties, Map relVersions, Map devVersions, + ContinuumReleaseManagerListener listener, Profile profile ) + throws ContinuumReleaseException + { String releaseId = project.getGroupId() + ":" + project.getArtifactId(); - ReleaseDescriptor descriptor = getReleaseDescriptor( project, releaseProperties, relVersions, devVersions ); + ReleaseDescriptor descriptor = getReleaseDescriptor( project, releaseProperties, relVersions, devVersions, profile ); getListeners().put( releaseId, listener ); try { prepareReleaseQueue.put( - new PrepareReleaseProjectTask( releaseId, descriptor, (ReleaseManagerListener) listener ) ); + new PrepareReleaseProjectTask( releaseId, descriptor, (ReleaseManagerListener) listener, profile ) ); } catch ( TaskQueueException e ) @@ -199,10 +219,43 @@ return releaseResults; } + public Map getEnvironments( Profile profile ) + { + if ( profile == null ) + { + return Collections.EMPTY_MAP; + } + + Map envVars = new HashMap(); + if ( profile == null ) + { + return envVars; + } + + String javaHome = getJavaHomeValue( profile ); + if ( !StringUtils.isEmpty( javaHome ) ) + { + envVars.put( installationService.getEnvVar( InstallationService.JDK_TYPE ), javaHome ); + } + + Installation builder = profile.getBuilder(); + if ( builder != null ) + { + envVars.put( installationService.getEnvVar( InstallationService.MAVEN2_TYPE ), builder.getVarValue() ); + } + + List installations = profile.getEnvironmentVariables(); + for ( Installation installation : installations ) + { + envVars.put( installation.getVarName(), installation.getVarValue() ); + } + return envVars; + } + private ReleaseDescriptor getReleaseDescriptor( Project project, Properties releaseProperties, Map relVersions, - Map devVersions ) + Map devVersions, Profile profile ) { - ReleaseDescriptor descriptor = new ReleaseDescriptor(); + ContinuumReleaseDescriptor descriptor = new ContinuumReleaseDescriptor(); String workingDirectory = workingDirectoryService.getWorkingDirectory( project ).getPath(); //release properties from the project @@ -235,7 +288,10 @@ //forced properties descriptor.setInteractive( false ); - + + //set environments + descriptor.setEnvironments( getEnvironments( profile ) ); + return descriptor; } @@ -266,4 +322,14 @@ return listeners; } + + private String getJavaHomeValue( Profile profile ) + { + Installation jdk = profile.getJdk(); + if ( jdk == null ) + { + return null; + } + return jdk.getVarValue(); + } } Modified: continuum/branches/CONTINUUM-1572/continuum-release/src/main/java/org/apache/maven/continuum/release/tasks/AbstractReleaseProjectTask.java URL: http://svn.apache.org/viewvc/continuum/branches/CONTINUUM-1572/continuum-release/src/main/java/org/apache/maven/continuum/release/tasks/AbstractReleaseProjectTask.java?rev=697137&r1=697136&r2=697137&view=diff ============================================================================== --- continuum/branches/CONTINUUM-1572/continuum-release/src/main/java/org/apache/maven/continuum/release/tasks/AbstractReleaseProjectTask.java (original) +++ continuum/branches/CONTINUUM-1572/continuum-release/src/main/java/org/apache/maven/continuum/release/tasks/AbstractReleaseProjectTask.java Fri Sep 19 08:49:45 2008 @@ -19,6 +19,7 @@ * under the License. */ +import org.apache.maven.continuum.model.system.Profile; import org.apache.maven.shared.release.ReleaseManagerListener; import org.apache.maven.shared.release.config.ReleaseDescriptor; import org.codehaus.plexus.taskqueue.Task; @@ -37,11 +38,15 @@ private long maxExecutionTime; - public AbstractReleaseProjectTask( String releaseId, ReleaseDescriptor descriptor, ReleaseManagerListener listener ) + private Profile profile; + + public AbstractReleaseProjectTask( String releaseId, ReleaseDescriptor descriptor, ReleaseManagerListener listener, + Profile profile ) { this.releaseId = releaseId; this.descriptor = descriptor; this.listener = listener; + this.profile = profile; } public ReleaseDescriptor getDescriptor() @@ -83,4 +88,14 @@ { this.maxExecutionTime = maxTime; } + + public Profile getProfile() + { + return profile; + } + + public void setProfile( Profile profile ) + { + this.profile = profile; + } } Modified: continuum/branches/CONTINUUM-1572/continuum-release/src/main/java/org/apache/maven/continuum/release/tasks/PerformReleaseProjectTask.java URL: http://svn.apache.org/viewvc/continuum/branches/CONTINUUM-1572/continuum-release/src/main/java/org/apache/maven/continuum/release/tasks/PerformReleaseProjectTask.java?rev=697137&r1=697136&r2=697137&view=diff ============================================================================== --- continuum/branches/CONTINUUM-1572/continuum-release/src/main/java/org/apache/maven/continuum/release/tasks/PerformReleaseProjectTask.java (original) +++ continuum/branches/CONTINUUM-1572/continuum-release/src/main/java/org/apache/maven/continuum/release/tasks/PerformReleaseProjectTask.java Fri Sep 19 08:49:45 2008 @@ -20,6 +20,7 @@ */ import org.apache.continuum.model.repository.LocalRepository; +import org.apache.maven.continuum.model.system.Profile; import org.apache.maven.shared.release.ReleaseManagerListener; import org.apache.maven.shared.release.config.ReleaseDescriptor; @@ -42,13 +43,20 @@ public PerformReleaseProjectTask( String releaseId, ReleaseDescriptor descriptor, File buildDirectory, String goals, boolean useReleaseProfile, ReleaseManagerListener listener ) { - this( releaseId, descriptor, buildDirectory, goals, useReleaseProfile, listener, null ); + this( releaseId, descriptor, buildDirectory, goals, useReleaseProfile, listener, null, null ); } public PerformReleaseProjectTask( String releaseId, ReleaseDescriptor descriptor, File buildDirectory, String goals, boolean useReleaseProfile, ReleaseManagerListener listener, LocalRepository repository ) { - super( releaseId, descriptor, listener ); + this( releaseId, descriptor, buildDirectory, goals, useReleaseProfile, listener, repository, null ); + } + + public PerformReleaseProjectTask( String releaseId, ReleaseDescriptor descriptor, File buildDirectory, String goals, + boolean useReleaseProfile, ReleaseManagerListener listener, LocalRepository repository, + Profile profile ) + { + super( releaseId, descriptor, listener, profile ); setBuildDirectory( buildDirectory ); setGoals( goals ); setUseReleaseProfile( useReleaseProfile ); Modified: continuum/branches/CONTINUUM-1572/continuum-release/src/main/java/org/apache/maven/continuum/release/tasks/PrepareReleaseProjectTask.java URL: http://svn.apache.org/viewvc/continuum/branches/CONTINUUM-1572/continuum-release/src/main/java/org/apache/maven/continuum/release/tasks/PrepareReleaseProjectTask.java?rev=697137&r1=697136&r2=697137&view=diff ============================================================================== --- continuum/branches/CONTINUUM-1572/continuum-release/src/main/java/org/apache/maven/continuum/release/tasks/PrepareReleaseProjectTask.java (original) +++ continuum/branches/CONTINUUM-1572/continuum-release/src/main/java/org/apache/maven/continuum/release/tasks/PrepareReleaseProjectTask.java Fri Sep 19 08:49:45 2008 @@ -19,6 +19,7 @@ * under the License. */ +import org.apache.maven.continuum.model.system.Profile; import org.apache.maven.shared.release.ReleaseManagerListener; import org.apache.maven.shared.release.config.ReleaseDescriptor; @@ -30,6 +31,11 @@ { public PrepareReleaseProjectTask( String releaseId, ReleaseDescriptor descriptor, ReleaseManagerListener listener ) { - super( releaseId, descriptor, listener ); + this( releaseId, descriptor, listener, null ); + } + + public PrepareReleaseProjectTask( String releaseId, ReleaseDescriptor descriptor, ReleaseManagerListener listener, Profile profile ) + { + super( releaseId, descriptor, listener, profile ); } } Modified: continuum/branches/CONTINUUM-1572/continuum-release/src/main/java/org/apache/maven/continuum/release/tasks/RollbackReleaseProjectTask.java URL: http://svn.apache.org/viewvc/continuum/branches/CONTINUUM-1572/continuum-release/src/main/java/org/apache/maven/continuum/release/tasks/RollbackReleaseProjectTask.java?rev=697137&r1=697136&r2=697137&view=diff ============================================================================== --- continuum/branches/CONTINUUM-1572/continuum-release/src/main/java/org/apache/maven/continuum/release/tasks/RollbackReleaseProjectTask.java (original) +++ continuum/branches/CONTINUUM-1572/continuum-release/src/main/java/org/apache/maven/continuum/release/tasks/RollbackReleaseProjectTask.java Fri Sep 19 08:49:45 2008 @@ -1,5 +1,6 @@ package org.apache.maven.continuum.release.tasks; +import org.apache.maven.continuum.model.system.Profile; import org.apache.maven.shared.release.ReleaseManagerListener; import org.apache.maven.shared.release.config.ReleaseDescriptor; @@ -30,6 +31,11 @@ { public RollbackReleaseProjectTask( String releaseId, ReleaseDescriptor descriptor, ReleaseManagerListener listener ) { - super( releaseId, descriptor, listener ); + this( releaseId, descriptor, listener, null ); + } + + public RollbackReleaseProjectTask( String releaseId, ReleaseDescriptor descriptor, ReleaseManagerListener listener, Profile profile ) + { + super( releaseId, descriptor, listener, profile ); } } Modified: continuum/branches/CONTINUUM-1572/continuum-release/src/main/resources/META-INF/plexus/components.xml URL: http://svn.apache.org/viewvc/continuum/branches/CONTINUUM-1572/continuum-release/src/main/resources/META-INF/plexus/components.xml?rev=697137&r1=697136&r2=697137&view=diff ============================================================================== --- continuum/branches/CONTINUUM-1572/continuum-release/src/main/resources/META-INF/plexus/components.xml (original) +++ continuum/branches/CONTINUUM-1572/continuum-release/src/main/resources/META-INF/plexus/components.xml Fri Sep 19 08:49:45 2008 @@ -240,7 +240,7 @@ org.apache.maven.shared.release.config.ReleaseDescriptorStore - properties + continuum-release-properties configStore @@ -260,7 +260,7 @@ map-development-versions rewrite-poms-for-release generate-release-poms - run-preparation-goals + run-release-prepare-goals scm-commit-release scm-tag rewrite-poms-for-development @@ -271,7 +271,7 @@ verify-completed-prepare-phases checkout-project-from-scm - run-perform-goals + run-release-perform-goals generate-reactor-projects @@ -304,7 +304,27 @@ - + + org.apache.maven.shared.release.phase.ReleasePhase + run-release-prepare-goals + org.apache.continuum.release.phase.RunPrepareGoalsPhase + + + org.apache.continuum.utils.shell.ShellCommandHelper + + + + + org.apache.maven.shared.release.phase.ReleasePhase + run-release-perform-goals + org.apache.continuum.release.phase.RunPerformGoalsPhase + + + org.apache.continuum.utils.shell.ShellCommandHelper + + + + org.apache.maven.artifact.metadata.ArtifactMetadataSource @@ -318,12 +338,16 @@ org.apache.maven.artifact.factory.ArtifactFactory - org.apache.maven.artifact.repository.metadata.RepositoryMetadataManager + org.apache.maven.artifact.repository.metadata.RepositoryMetadataManager + + org.apache.maven.shared.release.config.ReleaseDescriptorStore + continuum-release-properties + org.apache.continuum.release.config.ContinuumPropertiesReleaseDescriptorStore + Modified: continuum/branches/CONTINUUM-1572/continuum-release/src/test/java/org/apache/maven/continuum/release/executors/ReleaseTaskExecutorTest.java URL: http://svn.apache.org/viewvc/continuum/branches/CONTINUUM-1572/continuum-release/src/test/java/org/apache/maven/continuum/release/executors/ReleaseTaskExecutorTest.java?rev=697137&r1=697136&r2=697137&view=diff ============================================================================== --- continuum/branches/CONTINUUM-1572/continuum-release/src/test/java/org/apache/maven/continuum/release/executors/ReleaseTaskExecutorTest.java (original) +++ continuum/branches/CONTINUUM-1572/continuum-release/src/test/java/org/apache/maven/continuum/release/executors/ReleaseTaskExecutorTest.java Fri Sep 19 08:49:45 2008 @@ -21,6 +21,7 @@ import java.io.File; +import org.apache.continuum.release.config.ContinuumReleaseDescriptor; import org.apache.maven.continuum.release.ContinuumReleaseManager; import org.apache.maven.continuum.release.tasks.PerformReleaseProjectTask; import org.apache.maven.continuum.release.tasks.PrepareReleaseProjectTask; @@ -98,7 +99,7 @@ File testDir = new File( getBasedir(), "target/test-classes/test-dir" ); FileUtils.deleteDirectory( testDir ); - ReleaseDescriptor descriptor = new ReleaseDescriptor(); + ContinuumReleaseDescriptor descriptor = new ContinuumReleaseDescriptor(); descriptor.setInteractive( false ); descriptor.setScmSourceUrl( "scm:svn:file://localhost/" + scmPath + "/trunk" ); descriptor.setWorkingDirectory( workDir.getAbsolutePath() ); @@ -140,7 +141,7 @@ File testDir = new File( getBasedir(), "target/test-classes/test-dir" ); FileUtils.deleteDirectory( testDir ); - ReleaseDescriptor descriptor = new ReleaseDescriptor(); + ContinuumReleaseDescriptor descriptor = new ContinuumReleaseDescriptor(); descriptor.setInteractive( false ); descriptor.setScmSourceUrl( "scm:svn:file://localhost/" + scmPath + "/trunk" ); descriptor.setWorkingDirectory( workDir.getAbsolutePath() ); @@ -185,7 +186,7 @@ File testDir = new File( getBasedir(), "target/test-classes/test-dir" ); FileUtils.deleteDirectory( testDir ); - ReleaseDescriptor descriptor = new ReleaseDescriptor(); + ContinuumReleaseDescriptor descriptor = new ContinuumReleaseDescriptor(); descriptor.setInteractive( false ); descriptor.setScmSourceUrl( "scm:svn:file://localhost/" + scmPath + "/trunk" ); descriptor.setWorkingDirectory( workDir.getAbsolutePath() ); Modified: continuum/branches/CONTINUUM-1572/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ReleasePerformAction.java URL: http://svn.apache.org/viewvc/continuum/branches/CONTINUUM-1572/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ReleasePerformAction.java?rev=697137&r1=697136&r2=697137&view=diff ============================================================================== --- continuum/branches/CONTINUUM-1572/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ReleasePerformAction.java (original) +++ continuum/branches/CONTINUUM-1572/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ReleasePerformAction.java Fri Sep 19 08:49:45 2008 @@ -20,8 +20,10 @@ */ import org.apache.continuum.model.repository.LocalRepository; +import org.apache.continuum.release.config.ContinuumReleaseDescriptor; import org.apache.maven.continuum.ContinuumException; import org.apache.maven.continuum.model.project.Project; +import org.apache.maven.continuum.model.system.Profile; import org.apache.maven.continuum.release.ContinuumReleaseManager; import org.apache.maven.continuum.release.ContinuumReleaseManagerListener; import org.apache.maven.continuum.release.DefaultReleaseManagerListener; @@ -31,6 +33,7 @@ import org.apache.maven.shared.release.config.ReleaseDescriptor; import java.io.File; +import java.util.List; /** * @author Edwin Punzalan @@ -63,6 +66,10 @@ private String projectGroupName = ""; + private List profiles; + + private int profileId; + public String inputFromScm() throws Exception { @@ -79,6 +86,8 @@ releaseId = ""; + profiles = this.getContinuum().getProfileService().getAllProfiles(); + return SUCCESS; } @@ -132,12 +141,20 @@ { ContinuumReleaseManager releaseManager = getContinuum().getReleaseManager(); - ReleaseDescriptor descriptor = new ReleaseDescriptor(); + ContinuumReleaseDescriptor descriptor = new ContinuumReleaseDescriptor(); descriptor.setScmSourceUrl( scmUrl ); descriptor.setScmUsername( scmUsername ); descriptor.setScmPassword( scmPassword ); descriptor.setScmReleaseLabel( scmTag ); descriptor.setScmTagBase( scmTagBase ); + + Profile profile = null; + + if ( profileId != -1 ) + { + profile = getContinuum().getProfileService().getProfile( profileId ); + descriptor.setEnvironments( releaseManager.getEnvironments( profile ) ); + } do { @@ -291,4 +308,25 @@ return projectGroupName; } + + public List getProfiles() + { + return profiles; + } + + public void setProfiles( List profiles ) + { + this.profiles = profiles; + } + + public int getProfileId() + { + return profileId; + } + + public void setProfileId( int profileId ) + { + this.profileId = profileId; + } + } Modified: continuum/branches/CONTINUUM-1572/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ReleasePrepareAction.java URL: http://svn.apache.org/viewvc/continuum/branches/CONTINUUM-1572/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ReleasePrepareAction.java?rev=697137&r1=697136&r2=697137&view=diff ============================================================================== --- continuum/branches/CONTINUUM-1572/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ReleasePrepareAction.java (original) +++ continuum/branches/CONTINUUM-1572/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ReleasePrepareAction.java Fri Sep 19 08:49:45 2008 @@ -21,6 +21,7 @@ import org.apache.maven.continuum.ContinuumException; import org.apache.maven.continuum.model.project.Project; +import org.apache.maven.continuum.model.system.Profile; import org.apache.maven.continuum.release.ContinuumReleaseManager; import org.apache.maven.continuum.release.ContinuumReleaseManagerListener; import org.apache.maven.continuum.release.DefaultReleaseManagerListener; @@ -85,6 +86,10 @@ private String projectGroupName = ""; + private List profiles; + + private int profileId; + public String input() throws Exception { @@ -138,6 +143,8 @@ processProject( workingDirectory, "pom.xml" ); + profiles = this.getContinuum().getProfileService().getAllProfiles(); + return SUCCESS; } @@ -210,11 +217,18 @@ { name = project.getArtifactId(); } + + Profile profile = null; + + if ( profileId != -1 ) + { + profile = getContinuum().getProfileService().getProfile( profileId ); + } ContinuumReleaseManager releaseManager = getContinuum().getReleaseManager(); releaseId = - releaseManager.prepare( project, getReleaseProperties(), getRelVersionMap(), getDevVersionMap(), listener ); + releaseManager.prepare( project, getReleaseProperties(), getRelVersionMap(), getDevVersionMap(), listener, profile ); return SUCCESS; } @@ -526,4 +540,24 @@ return projectGroupName; } + + public List getProfiles() + { + return profiles; + } + + public void setProfiles( List profiles ) + { + this.profiles = profiles; + } + + public int getProfileId() + { + return profileId; + } + + public void setProfileId( int profileId ) + { + this.profileId = profileId; + } } Modified: continuum/branches/CONTINUUM-1572/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/admin/ProfileAction.java URL: http://svn.apache.org/viewvc/continuum/branches/CONTINUUM-1572/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/admin/ProfileAction.java?rev=697137&r1=697136&r2=697137&view=diff ============================================================================== --- continuum/branches/CONTINUUM-1572/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/admin/ProfileAction.java (original) +++ continuum/branches/CONTINUUM-1572/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/admin/ProfileAction.java Fri Sep 19 08:49:45 2008 @@ -37,6 +37,7 @@ import org.codehaus.plexus.redback.xwork.interceptor.SecureActionBundle; import org.codehaus.plexus.redback.xwork.interceptor.SecureActionException; +import com.opensymphony.webwork.ServletActionContext; import com.opensymphony.xwork.Preparable; /** @@ -70,6 +71,8 @@ private List profileInstallations; + private String message; + // ------------------------------------------------------- // Webwork Methods // ------------------------------------------------------- @@ -84,6 +87,13 @@ public String list() throws Exception { + String errorMessage = ServletActionContext.getRequest().getParameter( "errorMessage" ); + + if ( errorMessage != null ) + { + addActionError( errorMessage ); + } + this.profiles = profileService.getAllProfiles(); return SUCCESS; } @@ -149,10 +159,18 @@ public String delete() throws Exception - { - profileService.deleteProfile( profile.getId() ); - this.profiles = profileService.getAllProfiles(); - return SUCCESS; + { + try + { + profileService.deleteProfile( profile.getId() ); + this.profiles = profileService.getAllProfiles(); + return SUCCESS; + } + catch ( ProfileException e ) + { + message = "profile.remove.error"; + return ERROR; + } } public String confirmDelete() @@ -283,4 +301,14 @@ { this.installationId = installationId; } + + public String getMessage() + { + return message; + } + + public void setMessage( String message ) + { + this.message = message; + } } Modified: continuum/branches/CONTINUUM-1572/continuum-webapp/src/main/resources/localization/Continuum.properties URL: http://svn.apache.org/viewvc/continuum/branches/CONTINUUM-1572/continuum-webapp/src/main/resources/localization/Continuum.properties?rev=697137&r1=697136&r2=697137&view=diff ============================================================================== --- continuum/branches/CONTINUUM-1572/continuum-webapp/src/main/resources/localization/Continuum.properties (original) +++ continuum/branches/CONTINUUM-1572/continuum-webapp/src/main/resources/localization/Continuum.properties Fri Sep 19 08:49:45 2008 @@ -654,6 +654,20 @@ releaseViewResult.noOutput=No Output releaseViewResult.projectName=Project Name releaseViewResult.releaseGoal=Release Goal +releasePrepare.scmUsername.label=SCM Username +releasePrepare.scmPassword.label=SCM Password +releasePrepare.scmTag.label=SCM Tag +releasePrepare.scmTagBase.label=SCM Tag Base +releasePrepare.prepareGoals.label=Preparation Goals +releasePrepare.buildEnvironment.label=Build Environment +releasePerformFromScm.scmUrl.label=SCM Connection URL +releasePerformFromScm.scmUsername.label=SCM Username +releasePerformFromScm.scmPassword.label=SCM Password +releasePerformFromScm.scmTag.label=SCM Tag +releasePerformFromScm.scmTagBase.label=SCM Tag Base +releasePerformFromScm.goals.label=Maven Arguments +releasePerformFromScm.useReleaseProfile.label=Use Release Profile +releasePerformFromScm.buildEnvironment.label=Build Environment # ---------------------------------------------------------------------- # Page: User @@ -697,6 +711,7 @@ profile.no.installations = No installations available profile.name.already.exists = A Build Environment with the same name already exists profile.name.required = You must define a name. +profile.remove.error = The Build Environment can't be removed, it is probably used by a build definition. # ---------------------------------------------------------------------- # Page: Installations List Modified: continuum/branches/CONTINUUM-1572/continuum-webapp/src/main/resources/xwork.xml URL: http://svn.apache.org/viewvc/continuum/branches/CONTINUUM-1572/continuum-webapp/src/main/resources/xwork.xml?rev=697137&r1=697136&r2=697137&view=diff ============================================================================== --- continuum/branches/CONTINUUM-1572/continuum-webapp/src/main/resources/xwork.xml (original) +++ continuum/branches/CONTINUUM-1572/continuum-webapp/src/main/resources/xwork.xml Fri Sep 19 08:49:45 2008 @@ -618,6 +618,12 @@ /admin list + + buildEnvList + /admin + list + ${message} + Modified: continuum/branches/CONTINUUM-1572/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/profilesList.jsp URL: http://svn.apache.org/viewvc/continuum/branches/CONTINUUM-1572/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/profilesList.jsp?rev=697137&r1=697136&r2=697137&view=diff ============================================================================== --- continuum/branches/CONTINUUM-1572/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/profilesList.jsp (original) +++ continuum/branches/CONTINUUM-1572/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/profilesList.jsp Fri Sep 19 08:49:45 2008 @@ -33,6 +33,14 @@ + +
+ +

+ +
+ +
- - - - + + + + - + - - + + +
Modified: continuum/branches/CONTINUUM-1572/continuum-webapp/src/main/webapp/WEB-INF/jsp/releasePrepare.jsp URL: http://svn.apache.org/viewvc/continuum/branches/CONTINUUM-1572/continuum-webapp/src/main/webapp/WEB-INF/jsp/releasePrepare.jsp?rev=697137&r1=697136&r2=697137&view=diff ============================================================================== --- continuum/branches/CONTINUUM-1572/continuum-webapp/src/main/webapp/WEB-INF/jsp/releasePrepare.jsp (original) +++ continuum/branches/CONTINUUM-1572/continuum-webapp/src/main/webapp/WEB-INF/jsp/releasePrepare.jsp Fri Sep 19 08:49:45 2008 @@ -32,14 +32,16 @@ "/>
- - - + + + - + - -
+ + +