continuum-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From c...@apache.org
Subject svn commit: r708765 [1/7] - in /continuum/branches/continuum-transient-state: ./ continuum-api/ continuum-api/src/main/java/org/apache/continuum/configuration/ continuum-api/src/main/java/org/apache/continuum/dao/ continuum-api/src/main/java/org/apache...
Date Wed, 29 Oct 2008 04:16:22 GMT
Author: ctan
Date: Tue Oct 28 21:16:12 2008
New Revision: 708765

URL: http://svn.apache.org/viewvc?rev=708765&view=rev
Log:
merging trunk to transient-state branch -r 690852:708342

Added:
    continuum/branches/continuum-transient-state/continuum-api/src/main/java/org/apache/continuum/dao/ContinuumReleaseResultDao.java
      - copied unchanged from r708368, continuum/trunk/continuum-api/src/main/java/org/apache/continuum/dao/ContinuumReleaseResultDao.java
    continuum/branches/continuum-transient-state/continuum-commons/src/main/java/org/apache/continuum/
      - copied from r708368, continuum/trunk/continuum-commons/src/main/java/org/apache/continuum/
    continuum/branches/continuum-transient-state/continuum-commons/src/main/java/org/apache/continuum/installation/
      - copied from r708368, continuum/trunk/continuum-commons/src/main/java/org/apache/continuum/installation/
    continuum/branches/continuum-transient-state/continuum-commons/src/main/java/org/apache/continuum/installation/DefaultInstallationService.java
      - copied unchanged from r708368, continuum/trunk/continuum-commons/src/main/java/org/apache/continuum/installation/DefaultInstallationService.java
    continuum/branches/continuum-transient-state/continuum-commons/src/main/java/org/apache/continuum/profile/
      - copied from r708368, continuum/trunk/continuum-commons/src/main/java/org/apache/continuum/profile/
    continuum/branches/continuum-transient-state/continuum-commons/src/main/java/org/apache/continuum/profile/DefaultProfileService.java
      - copied unchanged from r708368, continuum/trunk/continuum-commons/src/main/java/org/apache/continuum/profile/DefaultProfileService.java
    continuum/branches/continuum-transient-state/continuum-commons/src/main/java/org/apache/continuum/utils/
      - copied from r708368, continuum/trunk/continuum-commons/src/main/java/org/apache/continuum/utils/
    continuum/branches/continuum-transient-state/continuum-commons/src/main/java/org/apache/continuum/utils/shell/
      - copied from r708368, continuum/trunk/continuum-commons/src/main/java/org/apache/continuum/utils/shell/
    continuum/branches/continuum-transient-state/continuum-commons/src/main/java/org/apache/continuum/utils/shell/DefaultShellCommandHelper.java
      - copied unchanged from r708368, continuum/trunk/continuum-commons/src/main/java/org/apache/continuum/utils/shell/DefaultShellCommandHelper.java
    continuum/branches/continuum-transient-state/continuum-commons/src/main/java/org/apache/continuum/utils/shell/ExecutionResult.java
      - copied unchanged from r708368, continuum/trunk/continuum-commons/src/main/java/org/apache/continuum/utils/shell/ExecutionResult.java
    continuum/branches/continuum-transient-state/continuum-commons/src/main/java/org/apache/continuum/utils/shell/ShellCommandHelper.java
      - copied unchanged from r708368, continuum/trunk/continuum-commons/src/main/java/org/apache/continuum/utils/shell/ShellCommandHelper.java
    continuum/branches/continuum-transient-state/continuum-commons/src/test/java/org/apache/continuum/
      - copied from r708368, continuum/trunk/continuum-commons/src/test/java/org/apache/continuum/
    continuum/branches/continuum-transient-state/continuum-commons/src/test/java/org/apache/continuum/installation/
      - copied from r708368, continuum/trunk/continuum-commons/src/test/java/org/apache/continuum/installation/
    continuum/branches/continuum-transient-state/continuum-commons/src/test/java/org/apache/continuum/installation/DefaultInstallationServiceTest.java
      - copied unchanged from r708368, continuum/trunk/continuum-commons/src/test/java/org/apache/continuum/installation/DefaultInstallationServiceTest.java
    continuum/branches/continuum-transient-state/continuum-commons/src/test/java/org/apache/continuum/profile/
      - copied from r708368, continuum/trunk/continuum-commons/src/test/java/org/apache/continuum/profile/
    continuum/branches/continuum-transient-state/continuum-commons/src/test/java/org/apache/continuum/profile/DefaultProfileServiceTest.java
      - copied unchanged from r708368, continuum/trunk/continuum-commons/src/test/java/org/apache/continuum/profile/DefaultProfileServiceTest.java
    continuum/branches/continuum-transient-state/continuum-core/src/test/java/org/apache/continuum/notification/
      - copied from r708368, continuum/trunk/continuum-core/src/test/java/org/apache/continuum/notification/
    continuum/branches/continuum-transient-state/continuum-core/src/test/java/org/apache/continuum/notification/mail/
      - copied from r708368, continuum/trunk/continuum-core/src/test/java/org/apache/continuum/notification/mail/
    continuum/branches/continuum-transient-state/continuum-core/src/test/java/org/apache/continuum/notification/mail/MockJavaMailSender.java
      - copied unchanged from r708368, continuum/trunk/continuum-core/src/test/java/org/apache/continuum/notification/mail/MockJavaMailSender.java
    continuum/branches/continuum-transient-state/continuum-docs/src/site/apt/administrator_guides/localRepository.apt
      - copied unchanged from r708368, continuum/trunk/continuum-docs/src/site/apt/administrator_guides/localRepository.apt
    continuum/branches/continuum-transient-state/continuum-docs/src/site/apt/administrator_guides/purgeConfiguration.apt
      - copied unchanged from r708368, continuum/trunk/continuum-docs/src/site/apt/administrator_guides/purgeConfiguration.apt
    continuum/branches/continuum-transient-state/continuum-docs/src/site/resources/images/directorypurgeconfiguration-add.png
      - copied unchanged from r708368, continuum/trunk/continuum-docs/src/site/resources/images/directorypurgeconfiguration-add.png
    continuum/branches/continuum-transient-state/continuum-docs/src/site/resources/images/disabled_purgenow.gif
      - copied unchanged from r708368, continuum/trunk/continuum-docs/src/site/resources/images/disabled_purgenow.gif
    continuum/branches/continuum-transient-state/continuum-docs/src/site/resources/images/localrepositories-view.png
      - copied unchanged from r708368, continuum/trunk/continuum-docs/src/site/resources/images/localrepositories-view.png
    continuum/branches/continuum-transient-state/continuum-docs/src/site/resources/images/localrepositories.png
      - copied unchanged from r708368, continuum/trunk/continuum-docs/src/site/resources/images/localrepositories.png
    continuum/branches/continuum-transient-state/continuum-docs/src/site/resources/images/localrepository-add.png
      - copied unchanged from r708368, continuum/trunk/continuum-docs/src/site/resources/images/localrepository-add.png
    continuum/branches/continuum-transient-state/continuum-docs/src/site/resources/images/purgeconfigurations-view.png
      - copied unchanged from r708368, continuum/trunk/continuum-docs/src/site/resources/images/purgeconfigurations-view.png
    continuum/branches/continuum-transient-state/continuum-docs/src/site/resources/images/purgeconfigurations.png
      - copied unchanged from r708368, continuum/trunk/continuum-docs/src/site/resources/images/purgeconfigurations.png
    continuum/branches/continuum-transient-state/continuum-docs/src/site/resources/images/purgenow.gif
      - copied unchanged from r708368, continuum/trunk/continuum-docs/src/site/resources/images/purgenow.gif
    continuum/branches/continuum-transient-state/continuum-docs/src/site/resources/images/repositorypurgeconfiguration-add.png
      - copied unchanged from r708368, continuum/trunk/continuum-docs/src/site/resources/images/repositorypurgeconfiguration-add.png
    continuum/branches/continuum-transient-state/continuum-jetty/src/main/resources/
      - copied from r708368, continuum/trunk/continuum-jetty/src/main/resources/
    continuum/branches/continuum-transient-state/continuum-jetty/src/main/tmp/
      - copied from r708368, continuum/trunk/continuum-jetty/src/main/tmp/
    continuum/branches/continuum-transient-state/continuum-release/src/main/java/org/apache/continuum/
      - copied from r708368, continuum/trunk/continuum-release/src/main/java/org/apache/continuum/
    continuum/branches/continuum-transient-state/continuum-release/src/main/java/org/apache/continuum/release/
      - copied from r708368, continuum/trunk/continuum-release/src/main/java/org/apache/continuum/release/
    continuum/branches/continuum-transient-state/continuum-release/src/main/java/org/apache/continuum/release/config/
      - copied from r708368, continuum/trunk/continuum-release/src/main/java/org/apache/continuum/release/config/
    continuum/branches/continuum-transient-state/continuum-release/src/main/java/org/apache/continuum/release/config/ContinuumPropertiesReleaseDescriptorStore.java
      - copied unchanged from r708368, continuum/trunk/continuum-release/src/main/java/org/apache/continuum/release/config/ContinuumPropertiesReleaseDescriptorStore.java
    continuum/branches/continuum-transient-state/continuum-release/src/main/java/org/apache/continuum/release/config/ContinuumReleaseDescriptor.java
      - copied unchanged from r708368, continuum/trunk/continuum-release/src/main/java/org/apache/continuum/release/config/ContinuumReleaseDescriptor.java
    continuum/branches/continuum-transient-state/continuum-release/src/main/java/org/apache/continuum/release/phase/
      - copied from r708368, continuum/trunk/continuum-release/src/main/java/org/apache/continuum/release/phase/
    continuum/branches/continuum-transient-state/continuum-release/src/main/java/org/apache/continuum/release/phase/AbstractContinuumRunGoalsPhase.java
      - copied unchanged from r708368, continuum/trunk/continuum-release/src/main/java/org/apache/continuum/release/phase/AbstractContinuumRunGoalsPhase.java
    continuum/branches/continuum-transient-state/continuum-release/src/main/java/org/apache/continuum/release/phase/RunPerformGoalsPhase.java
      - copied unchanged from r708368, continuum/trunk/continuum-release/src/main/java/org/apache/continuum/release/phase/RunPerformGoalsPhase.java
    continuum/branches/continuum-transient-state/continuum-release/src/main/java/org/apache/continuum/release/phase/RunPrepareGoalsPhase.java
      - copied unchanged from r708368, continuum/trunk/continuum-release/src/main/java/org/apache/continuum/release/phase/RunPrepareGoalsPhase.java
    continuum/branches/continuum-transient-state/continuum-store/src/main/java/org/apache/continuum/dao/ContinuumReleaseResultDaoImpl.java
      - copied unchanged from r708368, continuum/trunk/continuum-store/src/main/java/org/apache/continuum/dao/ContinuumReleaseResultDaoImpl.java
    continuum/branches/continuum-transient-state/continuum-webapp/src/main/java/org/apache/continuum/web/action/ReleaseResultAction.java
      - copied unchanged from r708368, continuum/trunk/continuum-webapp/src/main/java/org/apache/continuum/web/action/ReleaseResultAction.java
    continuum/branches/continuum-transient-state/continuum-webapp/src/main/webapp/WEB-INF/jsp/confirmReleaseResultsRemoval.jsp
      - copied unchanged from r708368, continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/confirmReleaseResultsRemoval.jsp
    continuum/branches/continuum-transient-state/continuum-webapp/src/main/webapp/WEB-INF/jsp/projectGroupReleaseResults.jsp
      - copied unchanged from r708368, continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/projectGroupReleaseResults.jsp
Removed:
    continuum/branches/continuum-transient-state/continuum-core/src/main/java/org/apache/maven/continuum/installation/
    continuum/branches/continuum-transient-state/continuum-core/src/main/java/org/apache/maven/continuum/profile/
    continuum/branches/continuum-transient-state/continuum-core/src/main/java/org/apache/maven/continuum/utils/shell/
    continuum/branches/continuum-transient-state/continuum-core/src/test/java/org/apache/maven/continuum/installation/
    continuum/branches/continuum-transient-state/continuum-core/src/test/java/org/apache/maven/continuum/profile/
Modified:
    continuum/branches/continuum-transient-state/   (props changed)
    continuum/branches/continuum-transient-state/continuum-api/pom.xml
    continuum/branches/continuum-transient-state/continuum-api/src/main/java/org/apache/continuum/configuration/GeneralConfiguration.java
    continuum/branches/continuum-transient-state/continuum-api/src/main/java/org/apache/continuum/dao/BuildResultDao.java
    continuum/branches/continuum-transient-state/continuum-api/src/main/java/org/apache/continuum/taskqueue/manager/TaskQueueManager.java
    continuum/branches/continuum-transient-state/continuum-api/src/main/java/org/apache/maven/continuum/Continuum.java
    continuum/branches/continuum-transient-state/continuum-api/src/main/java/org/apache/maven/continuum/configuration/ConfigurationService.java
    continuum/branches/continuum-transient-state/continuum-api/src/main/java/org/apache/maven/continuum/release/ContinuumReleaseManager.java
    continuum/branches/continuum-transient-state/continuum-base/continuum-configuration/pom.xml
    continuum/branches/continuum-transient-state/continuum-base/continuum-configuration/src/main/java/org/apache/continuum/configuration/DefaultContinuumConfiguration.java
    continuum/branches/continuum-transient-state/continuum-base/continuum-configuration/src/main/mdo/continuum-configuration.xml
    continuum/branches/continuum-transient-state/continuum-base/continuum-scm/pom.xml
    continuum/branches/continuum-transient-state/continuum-base/pom.xml
    continuum/branches/continuum-transient-state/continuum-commons/pom.xml
    continuum/branches/continuum-transient-state/continuum-commons/src/main/java/org/apache/maven/continuum/configuration/DefaultConfigurationService.java
    continuum/branches/continuum-transient-state/continuum-commons/src/main/resources/META-INF/spring-context.xml
    continuum/branches/continuum-transient-state/continuum-core/pom.xml
    continuum/branches/continuum-transient-state/continuum-core/src/main/java/org/apache/continuum/repository/DefaultRepositoryService.java
    continuum/branches/continuum-transient-state/continuum-core/src/main/java/org/apache/continuum/taskqueue/manager/DefaultTaskQueueManager.java
    continuum/branches/continuum-transient-state/continuum-core/src/main/java/org/apache/maven/continuum/DefaultContinuum.java
    continuum/branches/continuum-transient-state/continuum-core/src/main/java/org/apache/maven/continuum/buildcontroller/DefaultBuildController.java
    continuum/branches/continuum-transient-state/continuum-core/src/main/java/org/apache/maven/continuum/execution/AbstractBuildExecutor.java
    continuum/branches/continuum-transient-state/continuum-core/src/main/java/org/apache/maven/continuum/execution/maven/m1/DefaultMavenOneMetadataHelper.java
    continuum/branches/continuum-transient-state/continuum-core/src/main/java/org/apache/maven/continuum/execution/maven/m2/MavenTwoBuildExecutor.java
    continuum/branches/continuum-transient-state/continuum-core/src/main/java/org/apache/maven/continuum/notification/mail/MailContinuumNotifier.java
    continuum/branches/continuum-transient-state/continuum-core/src/main/java/org/apache/maven/continuum/project/builder/AbstractContinuumProjectBuilder.java
    continuum/branches/continuum-transient-state/continuum-core/src/main/resources/META-INF/spring-context.xml
    continuum/branches/continuum-transient-state/continuum-core/src/main/resources/org/apache/maven/continuum/notification/mail/templates/common.vm
    continuum/branches/continuum-transient-state/continuum-core/src/test/java/org/apache/maven/continuum/DefaultContinuumTest.java
    continuum/branches/continuum-transient-state/continuum-core/src/test/java/org/apache/maven/continuum/buildcontroller/DefaultBuildControllerTest.java
    continuum/branches/continuum-transient-state/continuum-core/src/test/java/org/apache/maven/continuum/execution/ContinuumBuildExecutorTest.java
    continuum/branches/continuum-transient-state/continuum-core/src/test/java/org/apache/maven/continuum/notification/mail/MailContinuumNotifierTest.java
    continuum/branches/continuum-transient-state/continuum-core/src/test/resources/org/apache/maven/continuum/notification/ContinuumNotificationDispatcherTest.xml
    continuum/branches/continuum-transient-state/continuum-core/src/test/resources/org/apache/maven/continuum/notification/mail/MailContinuumNotifierTest.xml
    continuum/branches/continuum-transient-state/continuum-data-management/continuum-legacy/pom.xml
    continuum/branches/continuum-transient-state/continuum-data-management/data-management-api/pom.xml
    continuum/branches/continuum-transient-state/continuum-data-management/data-management-cli/pom.xml
    continuum/branches/continuum-transient-state/continuum-data-management/data-management-jdo/pom.xml
    continuum/branches/continuum-transient-state/continuum-data-management/data-management-redback-jdo/pom.xml
    continuum/branches/continuum-transient-state/continuum-data-management/pom.xml
    continuum/branches/continuum-transient-state/continuum-data-management/redback-legacy/pom.xml
    continuum/branches/continuum-transient-state/continuum-docs/pom.xml
    continuum/branches/continuum-transient-state/continuum-docs/src/site/apt/administrator_guides/appearance.apt
    continuum/branches/continuum-transient-state/continuum-docs/src/site/apt/administrator_guides/external-db.apt
    continuum/branches/continuum-transient-state/continuum-docs/src/site/apt/administrator_guides/index.apt
    continuum/branches/continuum-transient-state/continuum-docs/src/site/apt/administrator_guides/jdk.apt
    continuum/branches/continuum-transient-state/continuum-docs/src/site/apt/administrator_guides/security/customising-security.apt
    continuum/branches/continuum-transient-state/continuum-docs/src/site/apt/administrator_guides/security/ldap.apt
    continuum/branches/continuum-transient-state/continuum-docs/src/site/apt/administrator_guides/shutdown.apt
    continuum/branches/continuum-transient-state/continuum-docs/src/site/apt/developer_guides/building.apt
    continuum/branches/continuum-transient-state/continuum-docs/src/site/apt/developer_guides/xmlrpc.apt
    continuum/branches/continuum-transient-state/continuum-docs/src/site/apt/getting-started.apt
    continuum/branches/continuum-transient-state/continuum-docs/src/site/apt/index.apt
    continuum/branches/continuum-transient-state/continuum-docs/src/site/apt/installation/geronimo.apt
    continuum/branches/continuum-transient-state/continuum-docs/src/site/apt/installation/glassfish.apt
    continuum/branches/continuum-transient-state/continuum-docs/src/site/apt/installation/installation.apt
    continuum/branches/continuum-transient-state/continuum-docs/src/site/apt/installation/jboss.apt
    continuum/branches/continuum-transient-state/continuum-docs/src/site/apt/installation/jetty.apt
    continuum/branches/continuum-transient-state/continuum-docs/src/site/apt/installation/requirements.apt
    continuum/branches/continuum-transient-state/continuum-docs/src/site/apt/installation/standalone.apt
    continuum/branches/continuum-transient-state/continuum-docs/src/site/apt/installation/tomcat.apt
    continuum/branches/continuum-transient-state/continuum-docs/src/site/apt/installation/upgrade.apt
    continuum/branches/continuum-transient-state/continuum-docs/src/site/apt/user_guides/building_project/index.apt
    continuum/branches/continuum-transient-state/continuum-docs/src/site/apt/user_guides/managing_builddef/index.apt
    continuum/branches/continuum-transient-state/continuum-docs/src/site/apt/user_guides/managing_project/addProject.apt
    continuum/branches/continuum-transient-state/continuum-docs/src/site/apt/user_guides/managing_project/editProject.apt
    continuum/branches/continuum-transient-state/continuum-docs/src/site/apt/user_guides/managing_project/removeProject.apt
    continuum/branches/continuum-transient-state/continuum-docs/src/site/apt/user_guides/notification/index.apt
    continuum/branches/continuum-transient-state/continuum-docs/src/site/site.xml
    continuum/branches/continuum-transient-state/continuum-docs/src/site/xdoc/   (props changed)
    continuum/branches/continuum-transient-state/continuum-docs/src/site/xdoc/release-notes.xml
    continuum/branches/continuum-transient-state/continuum-jetty/pom.xml
    continuum/branches/continuum-transient-state/continuum-jetty/src/main/assembly/bin.xml
    continuum/branches/continuum-transient-state/continuum-model/pom.xml
    continuum/branches/continuum-transient-state/continuum-model/src/main/mdo/continuum.xml
    continuum/branches/continuum-transient-state/continuum-model/src/main/resources/package-mssql.orm
    continuum/branches/continuum-transient-state/continuum-notifiers/continuum-notifier-api/pom.xml
    continuum/branches/continuum-transient-state/continuum-notifiers/continuum-notifier-irc/pom.xml
    continuum/branches/continuum-transient-state/continuum-notifiers/continuum-notifier-jabber/pom.xml
    continuum/branches/continuum-transient-state/continuum-notifiers/continuum-notifier-msn/pom.xml
    continuum/branches/continuum-transient-state/continuum-notifiers/continuum-notifier-wagon/pom.xml
    continuum/branches/continuum-transient-state/continuum-notifiers/pom.xml
    continuum/branches/continuum-transient-state/continuum-purge/   (props changed)
    continuum/branches/continuum-transient-state/continuum-purge/pom.xml
    continuum/branches/continuum-transient-state/continuum-release/pom.xml
    continuum/branches/continuum-transient-state/continuum-release/src/main/java/org/apache/maven/continuum/release/DefaultContinuumReleaseManager.java
    continuum/branches/continuum-transient-state/continuum-release/src/main/java/org/apache/maven/continuum/release/tasks/AbstractReleaseProjectTask.java
    continuum/branches/continuum-transient-state/continuum-release/src/main/java/org/apache/maven/continuum/release/tasks/PerformReleaseProjectTask.java
    continuum/branches/continuum-transient-state/continuum-release/src/main/java/org/apache/maven/continuum/release/tasks/PrepareReleaseProjectTask.java
    continuum/branches/continuum-transient-state/continuum-release/src/main/java/org/apache/maven/continuum/release/tasks/RollbackReleaseProjectTask.java
    continuum/branches/continuum-transient-state/continuum-release/src/main/resources/META-INF/plexus/components.xml
    continuum/branches/continuum-transient-state/continuum-release/src/test/java/org/apache/maven/continuum/release/executors/ReleaseTaskExecutorTest.java
    continuum/branches/continuum-transient-state/continuum-reports/pom.xml
    continuum/branches/continuum-transient-state/continuum-reports/src/main/java/org/apache/maven/continuum/reports/surefire/DefaultReportTestSuiteGenerator.java
    continuum/branches/continuum-transient-state/continuum-reports/src/main/java/org/apache/maven/continuum/reports/surefire/ReportTestResult.java
    continuum/branches/continuum-transient-state/continuum-reports/src/main/java/org/apache/maven/continuum/reports/surefire/ReportTestSuite.java
    continuum/branches/continuum-transient-state/continuum-reports/src/test/java/org/apache/maven/continuum/reports/surefire/DefaultReportTestSuiteGeneratorTest.java
    continuum/branches/continuum-transient-state/continuum-reports/src/test/resources/continuum-core/TEST-org.apache.maven.continuum.scm.ContinuumScmTest.xml
    continuum/branches/continuum-transient-state/continuum-security/pom.xml
    continuum/branches/continuum-transient-state/continuum-security/src/main/resources/META-INF/redback/redback.xml
    continuum/branches/continuum-transient-state/continuum-store/pom.xml
    continuum/branches/continuum-transient-state/continuum-store/src/main/java/org/apache/continuum/dao/BuildResultDaoImpl.java
    continuum/branches/continuum-transient-state/continuum-store/src/main/java/org/apache/continuum/dao/DaoUtilsImpl.java
    continuum/branches/continuum-transient-state/continuum-store/src/test/java/org/apache/maven/continuum/store/AbstractContinuumStoreTestCase.java
    continuum/branches/continuum-transient-state/continuum-store/src/test/java/org/apache/maven/continuum/store/ContinuumStoreTest.java
    continuum/branches/continuum-transient-state/continuum-test/pom.xml
    continuum/branches/continuum-transient-state/continuum-test/src/main/java/org/apache/maven/continuum/AbstractContinuumTest.java
    continuum/branches/continuum-transient-state/continuum-test/src/main/java/org/apache/maven/continuum/configuration/ConfigurationServiceMock.java
    continuum/branches/continuum-transient-state/continuum-webapp-test/pom.xml
    continuum/branches/continuum-transient-state/continuum-webapp/pom.xml
    continuum/branches/continuum-transient-state/continuum-webapp/src/   (props changed)
    continuum/branches/continuum-transient-state/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/AbstractBuildDefinitionAction.java
    continuum/branches/continuum-transient-state/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/AddMavenProjectAction.java
    continuum/branches/continuum-transient-state/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ContinuumActionSupport.java
    continuum/branches/continuum-transient-state/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ProjectGroupAction.java
    continuum/branches/continuum-transient-state/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ReleaseInProgressAction.java
    continuum/branches/continuum-transient-state/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ReleasePerformAction.java
    continuum/branches/continuum-transient-state/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ReleasePrepareAction.java
    continuum/branches/continuum-transient-state/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ReleaseProjectAction.java
    continuum/branches/continuum-transient-state/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ReleaseRollbackAction.java
    continuum/branches/continuum-transient-state/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/admin/ConfigurationAction.java
    continuum/branches/continuum-transient-state/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/admin/ProfileAction.java
    continuum/branches/continuum-transient-state/continuum-webapp/src/main/resources/META-INF/plexus/application.xml
    continuum/branches/continuum-transient-state/continuum-webapp/src/main/resources/localization/Continuum.properties
    continuum/branches/continuum-transient-state/continuum-webapp/src/main/resources/localization/Continuum_fr.properties
    continuum/branches/continuum-transient-state/continuum-webapp/src/main/resources/localization/Continuum_pt_BR.properties
    continuum/branches/continuum-transient-state/continuum-webapp/src/main/resources/org/apache/maven/continuum/web/action/admin/ConfigurationAction.properties
    continuum/branches/continuum-transient-state/continuum-webapp/src/main/resources/xwork.xml
    continuum/branches/continuum-transient-state/continuum-webapp/src/main/webapp/WEB-INF/applicationContext.xml
    continuum/branches/continuum-transient-state/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/configuration.jsp
    continuum/branches/continuum-transient-state/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/configurationEdit.jsp
    continuum/branches/continuum-transient-state/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/profilesList.jsp
    continuum/branches/continuum-transient-state/continuum-webapp/src/main/webapp/WEB-INF/jsp/components/buildDefinitionGroupSummaryComponent.jsp
    continuum/branches/continuum-transient-state/continuum-webapp/src/main/webapp/WEB-INF/jsp/components/projectGroupTabComponent.jsp
    continuum/branches/continuum-transient-state/continuum-webapp/src/main/webapp/WEB-INF/jsp/groupSummary.jsp
    continuum/branches/continuum-transient-state/continuum-webapp/src/main/webapp/WEB-INF/jsp/projectGroupEdit.jsp
    continuum/branches/continuum-transient-state/continuum-webapp/src/main/webapp/WEB-INF/jsp/projectGroupSummary.jsp
    continuum/branches/continuum-transient-state/continuum-webapp/src/main/webapp/WEB-INF/jsp/releaseFinished.jsp
    continuum/branches/continuum-transient-state/continuum-webapp/src/main/webapp/WEB-INF/jsp/releaseInProgress.jsp
    continuum/branches/continuum-transient-state/continuum-webapp/src/main/webapp/WEB-INF/jsp/releaseInitialized.jsp
    continuum/branches/continuum-transient-state/continuum-webapp/src/main/webapp/WEB-INF/jsp/releasePerformFromScm.jsp
    continuum/branches/continuum-transient-state/continuum-webapp/src/main/webapp/WEB-INF/jsp/releasePrepare.jsp
    continuum/branches/continuum-transient-state/continuum-webapp/src/main/webapp/WEB-INF/jsp/releaseRollbackWarning.jsp
    continuum/branches/continuum-transient-state/continuum-webapp/src/main/webapp/WEB-INF/jsp/releaseViewResult.jsp
    continuum/branches/continuum-transient-state/continuum-xmlrpc/continuum-xmlrpc-api/pom.xml
    continuum/branches/continuum-transient-state/continuum-xmlrpc/continuum-xmlrpc-api/src/main/java/org/apache/maven/continuum/xmlrpc/ContinuumService.java
    continuum/branches/continuum-transient-state/continuum-xmlrpc/continuum-xmlrpc-api/src/main/mdo/continuum-service.xml
    continuum/branches/continuum-transient-state/continuum-xmlrpc/continuum-xmlrpc-backup/pom.xml
    continuum/branches/continuum-transient-state/continuum-xmlrpc/continuum-xmlrpc-backup/src/main/java/org/apache/maven/continuum/xmlrpc/backup/Backup.java
    continuum/branches/continuum-transient-state/continuum-xmlrpc/continuum-xmlrpc-client/pom.xml
    continuum/branches/continuum-transient-state/continuum-xmlrpc/continuum-xmlrpc-client/src/main/java/org/apache/maven/continuum/xmlrpc/client/ContinuumXmlRpcClient.java
    continuum/branches/continuum-transient-state/continuum-xmlrpc/continuum-xmlrpc-client/src/main/java/org/apache/maven/continuum/xmlrpc/client/SampleClient.java
    continuum/branches/continuum-transient-state/continuum-xmlrpc/continuum-xmlrpc-server/pom.xml
    continuum/branches/continuum-transient-state/continuum-xmlrpc/continuum-xmlrpc-server/src/main/java/org/apache/maven/continuum/xmlrpc/server/AbstractContinuumSecureService.java
    continuum/branches/continuum-transient-state/continuum-xmlrpc/continuum-xmlrpc-server/src/main/java/org/apache/maven/continuum/xmlrpc/server/ContinuumServiceImpl.java
    continuum/branches/continuum-transient-state/continuum-xmlrpc/continuum-xmlrpc-server/src/main/resources/dozerBeanMapping.xml
    continuum/branches/continuum-transient-state/continuum-xmlrpc/pom.xml
    continuum/branches/continuum-transient-state/maven-continuum-plugin/pom.xml
    continuum/branches/continuum-transient-state/maven-continuum-plugin/src/main/java/org/apache/maven/continuum/plugin/AddMavenTwoProject.java
    continuum/branches/continuum-transient-state/pom.xml

Propchange: continuum/branches/continuum-transient-state/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Tue Oct 28 21:16:12 2008
@@ -6,5 +6,5 @@
 *.ipr
 *.iws
 *.iml
-projectFilesBackup
+projectFilesBackup*
 .metadata

Propchange: continuum/branches/continuum-transient-state/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Oct 28 21:16:12 2008
@@ -1 +1 @@
-/continuum/branches/continuum-1.2.x:690684,690689-690799
+/continuum/branches/continuum-1.2.x:690684,690689-690799,698449-698533,698817-698819,699529,700250,700273,700936,705894,705910,708339

Modified: continuum/branches/continuum-transient-state/continuum-api/pom.xml
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-transient-state/continuum-api/pom.xml?rev=708765&r1=708764&r2=708765&view=diff
==============================================================================
--- continuum/branches/continuum-transient-state/continuum-api/pom.xml (original)
+++ continuum/branches/continuum-transient-state/continuum-api/pom.xml Tue Oct 28 21:16:12 2008
@@ -21,7 +21,7 @@
   <parent>
     <artifactId>continuum</artifactId>
     <groupId>org.apache.continuum</groupId>
-    <version>1.2-SNAPSHOT</version>
+    <version>1.3-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>continuum-api</artifactId>

Modified: continuum/branches/continuum-transient-state/continuum-api/src/main/java/org/apache/continuum/configuration/GeneralConfiguration.java
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-transient-state/continuum-api/src/main/java/org/apache/continuum/configuration/GeneralConfiguration.java?rev=708765&r1=708764&r2=708765&view=diff
==============================================================================
--- continuum/branches/continuum-transient-state/continuum-api/src/main/java/org/apache/continuum/configuration/GeneralConfiguration.java (original)
+++ continuum/branches/continuum-transient-state/continuum-api/src/main/java/org/apache/continuum/configuration/GeneralConfiguration.java Tue Oct 28 21:16:12 2008
@@ -39,6 +39,8 @@
     private String baseUrl;
 
     private ProxyConfiguration proxyConfiguration;
+    
+    private File releaseOutputDirectory;
 
     public GeneralConfiguration()
     {
@@ -101,5 +103,14 @@
         return ReflectionToStringBuilder.toString( this );
     }
 
+    public File getReleaseOutputDirectory()
+    {
+        return releaseOutputDirectory;
+    }
+    
+    public void setReleaseOutputDirectory( File releaseOutputDirectory )
+    {
+        this.releaseOutputDirectory = releaseOutputDirectory;
+    }
 
 }

Modified: continuum/branches/continuum-transient-state/continuum-api/src/main/java/org/apache/continuum/dao/BuildResultDao.java
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-transient-state/continuum-api/src/main/java/org/apache/continuum/dao/BuildResultDao.java?rev=708765&r1=708764&r2=708765&view=diff
==============================================================================
--- continuum/branches/continuum-transient-state/continuum-api/src/main/java/org/apache/continuum/dao/BuildResultDao.java (original)
+++ continuum/branches/continuum-transient-state/continuum-api/src/main/java/org/apache/continuum/dao/BuildResultDao.java Tue Oct 28 21:16:12 2008
@@ -55,6 +55,15 @@
 
     List<BuildResult> getBuildResultsForProject( int projectId, long startIndex, long endIndex );
 
+    /**
+     * @since 1.2
+     * @param projectId
+     * @param startIndex
+     * @return the returned list will contains all BuildResult for this project after the startId
+     */
+    List<BuildResult> getBuildResultsForProjectFromId( int projectId, long startId )
+        throws ContinuumStoreException;   
+    
     List<BuildResult> getBuildResultsForProject( int projectId, long fromDate );
 
     Map<Integer, BuildResult> getLatestBuildResultsByProjectGroupId( int projectGroupId );

Modified: continuum/branches/continuum-transient-state/continuum-api/src/main/java/org/apache/continuum/taskqueue/manager/TaskQueueManager.java
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-transient-state/continuum-api/src/main/java/org/apache/continuum/taskqueue/manager/TaskQueueManager.java?rev=708765&r1=708764&r2=708765&view=diff
==============================================================================
--- continuum/branches/continuum-transient-state/continuum-api/src/main/java/org/apache/continuum/taskqueue/manager/TaskQueueManager.java (original)
+++ continuum/branches/continuum-transient-state/continuum-api/src/main/java/org/apache/continuum/taskqueue/manager/TaskQueueManager.java Tue Oct 28 21:16:12 2008
@@ -19,6 +19,9 @@
     void cancelBuildTask( int projectId )
         throws TaskQueueManagerException;
 
+    boolean cancelCurrentBuild()
+        throws TaskQueueManagerException;
+
     TaskQueue getBuildQueue();
 
     TaskQueueExecutor getBuildTaskQueueExecutor()

Modified: continuum/branches/continuum-transient-state/continuum-api/src/main/java/org/apache/maven/continuum/Continuum.java
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-transient-state/continuum-api/src/main/java/org/apache/maven/continuum/Continuum.java?rev=708765&r1=708764&r2=708765&view=diff
==============================================================================
--- continuum/branches/continuum-transient-state/continuum-api/src/main/java/org/apache/maven/continuum/Continuum.java (original)
+++ continuum/branches/continuum-transient-state/continuum-api/src/main/java/org/apache/maven/continuum/Continuum.java Tue Oct 28 21:16:12 2008
@@ -24,8 +24,10 @@
 import java.util.List;
 import java.util.Map;
 
+import org.apache.continuum.model.release.ContinuumReleaseResult;
 import org.apache.continuum.model.project.ProjectScmRoot;
 import org.apache.continuum.purge.ContinuumPurgeManager;
+import org.apache.continuum.purge.PurgeConfigurationService;
 import org.apache.continuum.repository.RepositoryService;
 import org.apache.continuum.taskqueue.manager.TaskQueueManager;
 import org.apache.maven.continuum.builddefinition.BuildDefinitionService;
@@ -147,57 +149,6 @@
     Map<Integer, BuildResult> getBuildResultsInSuccess();
 
     // ----------------------------------------------------------------------
-    // Queues
-    // ----------------------------------------------------------------------
-/*
-    public List<BuildProjectTask> getProjectsInBuildQueue()
-        throws ContinuumException;
-
-    boolean isInBuildingQueue( int projectId )
-        throws ContinuumException;
-
-    boolean isInBuildingQueue( int projectId, int buildDefinitionId )
-        throws ContinuumException;
-
-    boolean removeProjectsFromBuildingQueue( int[] projectsId )
-        throws ContinuumException;
-
-    /**
-     * @param hashCodes BuildProjectTask hashCodes
-     * @throws ContinuumException
-     */
-/*    void removeProjectsFromBuildingQueueWithHashCodes( int[] hashCodes )
-        throws ContinuumException;
-
-    boolean removeFromBuildingQueue( int projectId, int buildDefinitionId, int trigger, String projectName )
-        throws ContinuumException;
-
-    boolean isInCheckoutQueue( int projectId )
-        throws ContinuumException;
-
-    boolean removeProjectFromCheckoutQueue( int projectId )
-        throws ContinuumException;
-
-    List /* CheckOutTask *//*getCheckOutTasksInQueue()
-        throws ContinuumException;
-
-    boolean removeProjectsFromCheckoutQueue( int[] projectId )
-        throws ContinuumException;
-
-    /**
-     * @param hashCodes CheckOutTask hashCodes
-     * @throws ContinuumException
-     */
-/*    void removeTasksFromCheckoutQueueWithHashCodes( int[] hashCodes )
-        throws ContinuumException;
-
-    TaskQueueExecutor getPrepareBuildTaskQueueExecutor()
-        throws ContinuumException;
-    
-    boolean isProjectInPrepareBuild( int projectId )
-        throws ContinuumException;
-*/    
-    // ----------------------------------------------------------------------
     // Building
     // ----------------------------------------------------------------------
 
@@ -657,6 +608,8 @@
     // ----------------------------------------------------------------------
     ContinuumPurgeManager getPurgeManager();
 
+    PurgeConfigurationService getPurgeConfigurationService();
+    
     // ----------------------------------------------------------------------
     // Repository Service
     // ----------------------------------------------------------------------
@@ -687,9 +640,6 @@
 
     void prepareBuildProjects( Collection<Map<Integer, Integer>> projectsAndBuildDefinitions, int trigger )
         throws ContinuumException;
-    
-    //void prepareBuildProjects( Map<Integer, Integer> projectsAndBuildDefinitionsMap )
-    //    throws ContinuumException;
 
     // ----------------------------------------------------------------------
     // Task Queue Manager
@@ -698,4 +648,23 @@
 
     public void startup()
         throws ContinuumException;
+
+    ContinuumReleaseResult addContinuumReleaseResult( ContinuumReleaseResult releaseResult )
+        throws ContinuumException;
+
+    void removeContinuumReleaseResult( int releaseResultId )
+        throws ContinuumException;
+
+    ContinuumReleaseResult getContinuumReleaseResult( int releaseResultId )
+        throws ContinuumException;
+
+    List<ContinuumReleaseResult> getContinuumReleaseResultsByProjectGroup( int projectGroupId );
+
+    List<ContinuumReleaseResult> getAllContinuumReleaseResults();
+
+    ContinuumReleaseResult getContinuumReleaseResult( int projectId, String releaseGoal, long startTime, long endTime )
+        throws ContinuumException;
+
+    String getReleaseOutput( int releaseResultId )
+        throws ContinuumException;
 }

Modified: continuum/branches/continuum-transient-state/continuum-api/src/main/java/org/apache/maven/continuum/configuration/ConfigurationService.java
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-transient-state/continuum-api/src/main/java/org/apache/maven/continuum/configuration/ConfigurationService.java?rev=708765&r1=708764&r2=708765&view=diff
==============================================================================
--- continuum/branches/continuum-transient-state/continuum-api/src/main/java/org/apache/maven/continuum/configuration/ConfigurationService.java (original)
+++ continuum/branches/continuum-transient-state/continuum-api/src/main/java/org/apache/maven/continuum/configuration/ConfigurationService.java Tue Oct 28 21:16:12 2008
@@ -71,6 +71,18 @@
 
     File getTestReportsDirectory( int buildId, int projectId )
         throws ConfigurationException;
+    
+    File getReleaseOutputDirectory();
+    
+    void setReleaseOutputDirectory( File releaseOutputDirectory );
+    
+    File getReleaseOutputDirectory( int projectGroupId );
+    
+    File getReleaseOutputFile( int projectGroupId, String releaseName )
+        throws ConfigurationException;
+
+    String getReleaseOutput( int projectGroupId, String releaseName )
+        throws ConfigurationException;
 
     // ----------------------------------------------------------------------
     //

Modified: continuum/branches/continuum-transient-state/continuum-api/src/main/java/org/apache/maven/continuum/release/ContinuumReleaseManager.java
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-transient-state/continuum-api/src/main/java/org/apache/maven/continuum/release/ContinuumReleaseManager.java?rev=708765&r1=708764&r2=708765&view=diff
==============================================================================
--- continuum/branches/continuum-transient-state/continuum-api/src/main/java/org/apache/maven/continuum/release/ContinuumReleaseManager.java (original)
+++ continuum/branches/continuum-transient-state/continuum-api/src/main/java/org/apache/maven/continuum/release/ContinuumReleaseManager.java Tue Oct 28 21:16:12 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<String, String> getEnvironments( Profile profile );
 }

Modified: continuum/branches/continuum-transient-state/continuum-base/continuum-configuration/pom.xml
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-transient-state/continuum-base/continuum-configuration/pom.xml?rev=708765&r1=708764&r2=708765&view=diff
==============================================================================
--- continuum/branches/continuum-transient-state/continuum-base/continuum-configuration/pom.xml (original)
+++ continuum/branches/continuum-transient-state/continuum-base/continuum-configuration/pom.xml Tue Oct 28 21:16:12 2008
@@ -21,7 +21,7 @@
   <parent>
     <artifactId>continuum-base</artifactId>
     <groupId>org.apache.continuum</groupId>
-    <version>1.2-SNAPSHOT</version>
+    <version>1.3-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>continuum-configuration</artifactId>

Modified: continuum/branches/continuum-transient-state/continuum-base/continuum-configuration/src/main/java/org/apache/continuum/configuration/DefaultContinuumConfiguration.java
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-transient-state/continuum-base/continuum-configuration/src/main/java/org/apache/continuum/configuration/DefaultContinuumConfiguration.java?rev=708765&r1=708764&r2=708765&view=diff
==============================================================================
--- continuum/branches/continuum-transient-state/continuum-base/continuum-configuration/src/main/java/org/apache/continuum/configuration/DefaultContinuumConfiguration.java (original)
+++ continuum/branches/continuum-transient-state/continuum-base/continuum-configuration/src/main/java/org/apache/continuum/configuration/DefaultContinuumConfiguration.java Tue Oct 28 21:16:12 2008
@@ -143,6 +143,12 @@
                     .getProxyConfiguration().getProxyUser() );
                 this.generalConfiguration.setProxyConfiguration( proxyConfiguration );
             }
+            if ( StringUtils.isNotEmpty( configuration.getReleaseOutputDirectory() ) )
+            {
+                // TODO take care if file exists?
+                this.generalConfiguration.setReleaseOutputDirectory( new File( configuration
+                    .getReleaseOutputDirectory() ) );
+            }
         }
         catch ( IOException e )
         {
@@ -197,6 +203,11 @@
                                                                          this.generalConfiguration
                                                                              .getProxyConfiguration().getProxyHost() );
             }
+            if ( this.generalConfiguration.getReleaseOutputDirectory() != null )
+            {
+                configurationModel.setReleaseOutputDirectory( this.generalConfiguration.getReleaseOutputDirectory()
+                    .getPath() );
+            }
 
             ContinuumConfigurationModelXpp3Writer writer = new ContinuumConfigurationModelXpp3Writer();
             FileWriter fileWriter = new FileWriter( file );

Modified: continuum/branches/continuum-transient-state/continuum-base/continuum-configuration/src/main/mdo/continuum-configuration.xml
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-transient-state/continuum-base/continuum-configuration/src/main/mdo/continuum-configuration.xml?rev=708765&r1=708764&r2=708765&view=diff
==============================================================================
--- continuum/branches/continuum-transient-state/continuum-base/continuum-configuration/src/main/mdo/continuum-configuration.xml (original)
+++ continuum/branches/continuum-transient-state/continuum-base/continuum-configuration/src/main/mdo/continuum-configuration.xml Tue Oct 28 21:16:12 2008
@@ -60,7 +60,12 @@
             <type>ProxyConfiguration</type>
             <multiplicity>1</multiplicity>
           </association>          
-        </field>                     
+        </field>     
+        <field>
+          <name>releaseOutputDirectory</name>
+          <version>1.0.0+</version>
+          <type>String</type>
+        </field>                
       </fields>
     </class>
     <class xml.tagName="proxy-configuration">

Modified: continuum/branches/continuum-transient-state/continuum-base/continuum-scm/pom.xml
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-transient-state/continuum-base/continuum-scm/pom.xml?rev=708765&r1=708764&r2=708765&view=diff
==============================================================================
--- continuum/branches/continuum-transient-state/continuum-base/continuum-scm/pom.xml (original)
+++ continuum/branches/continuum-transient-state/continuum-base/continuum-scm/pom.xml Tue Oct 28 21:16:12 2008
@@ -21,7 +21,7 @@
   <parent>
     <artifactId>continuum-base</artifactId>
     <groupId>org.apache.continuum</groupId>
-    <version>1.2-SNAPSHOT</version>
+    <version>1.3-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>continuum-scm</artifactId>

Modified: continuum/branches/continuum-transient-state/continuum-base/pom.xml
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-transient-state/continuum-base/pom.xml?rev=708765&r1=708764&r2=708765&view=diff
==============================================================================
--- continuum/branches/continuum-transient-state/continuum-base/pom.xml (original)
+++ continuum/branches/continuum-transient-state/continuum-base/pom.xml Tue Oct 28 21:16:12 2008
@@ -21,7 +21,7 @@
   <parent>
     <artifactId>continuum</artifactId>
     <groupId>org.apache.continuum</groupId>
-    <version>1.2-SNAPSHOT</version>
+    <version>1.3-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>continuum-base</artifactId>

Modified: continuum/branches/continuum-transient-state/continuum-commons/pom.xml
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-transient-state/continuum-commons/pom.xml?rev=708765&r1=708764&r2=708765&view=diff
==============================================================================
--- continuum/branches/continuum-transient-state/continuum-commons/pom.xml (original)
+++ continuum/branches/continuum-transient-state/continuum-commons/pom.xml Tue Oct 28 21:16:12 2008
@@ -22,7 +22,7 @@
   <parent>
     <artifactId>continuum</artifactId>
     <groupId>org.apache.continuum</groupId>
-    <version>1.2-SNAPSHOT</version>
+    <version>1.3-SNAPSHOT</version>
   </parent>
   <artifactId>continuum-commons</artifactId>
   <name>Continuum :: Commons</name>
@@ -43,6 +43,17 @@
       <groupId>org.codehaus.plexus</groupId>
       <artifactId>plexus-spring</artifactId>
     </dependency>    
+    <dependency>
+      <groupId>org.apache.maven.release</groupId>
+      <artifactId>maven-release-manager</artifactId>
+      <version>1.0-alpha-3</version>
+      <exclusions>
+        <exclusion>
+          <groupId>org.codehaus.plexus</groupId>
+          <artifactId>plexus-container-default</artifactId>
+        </exclusion>
+      </exclusions>
+    </dependency>
     <!-- === Testing Dependencies === -->
     <dependency>
       <groupId>hsqldb</groupId>

Modified: continuum/branches/continuum-transient-state/continuum-commons/src/main/java/org/apache/maven/continuum/configuration/DefaultConfigurationService.java
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-transient-state/continuum-commons/src/main/java/org/apache/maven/continuum/configuration/DefaultConfigurationService.java?rev=708765&r1=708764&r2=708765&view=diff
==============================================================================
--- continuum/branches/continuum-transient-state/continuum-commons/src/main/java/org/apache/maven/continuum/configuration/DefaultConfigurationService.java (original)
+++ continuum/branches/continuum-transient-state/continuum-commons/src/main/java/org/apache/maven/continuum/configuration/DefaultConfigurationService.java Tue Oct 28 21:16:12 2008
@@ -244,6 +244,37 @@
         }
     }
 
+    public File getReleaseOutputDirectory()
+    {
+        File releaseOutputDirectory = generalConfiguration.getReleaseOutputDirectory();
+
+        if ( releaseOutputDirectory == null )
+        {
+            releaseOutputDirectory = getFile( systemConf.getReleaseOutputDirectory() );
+            setReleaseOutputDirectory( releaseOutputDirectory );
+        }
+        return releaseOutputDirectory;
+    }
+
+    public void setReleaseOutputDirectory( File releaseOutputDirectory )
+    {
+        if ( releaseOutputDirectory == null )
+        {
+            generalConfiguration.setReleaseOutputDirectory( releaseOutputDirectory );
+            return;
+        }
+
+        File f = releaseOutputDirectory;
+        try
+        {
+            f = f.getCanonicalFile();
+        }
+        catch ( IOException e )
+        {
+        }
+        generalConfiguration.setReleaseOutputDirectory( f );
+    }
+
     // ----------------------------------------------------------------------
     //
     // ----------------------------------------------------------------------
@@ -288,6 +319,68 @@
         return new File( dir, buildId + ".log.txt" );
     }
 
+    public File getReleaseOutputDirectory( int projectGroupId )
+    {
+        if ( getReleaseOutputDirectory() == null )
+        {
+            return null;
+        }
+        
+        File dir = new File( getReleaseOutputDirectory(), Integer.toString( projectGroupId ) );
+        
+        try
+        {
+            dir = dir.getCanonicalFile();
+        }
+        catch ( IOException e )
+        {
+        }
+        
+        return dir;
+    }
+
+    public File getReleaseOutputFile( int projectGroupId, String name )
+        throws ConfigurationException
+    {
+        File dir = getReleaseOutputDirectory( projectGroupId );
+
+        if ( dir == null )
+        {
+            return null;
+        }
+        
+        if ( !dir.exists() && !dir.mkdirs() )
+        {
+            throw new ConfigurationException(
+                "Could not make the release output directory: " + "'" + dir.getAbsolutePath() + "'." );
+        }
+
+        return new File( dir, name + ".log.txt" );
+    }
+
+    public String getReleaseOutput( int projectGroupId, String name )
+        throws ConfigurationException
+    {
+        File file = getReleaseOutputFile( projectGroupId, name );
+
+        try
+        {
+            if ( file.exists() )
+            {
+                return FileUtils.fileRead( file.getAbsolutePath() );
+            }
+            else
+            {
+                return "There are no output for this release.";
+            }
+        }
+        catch ( IOException e )
+        {
+            log.warn( "Error reading release output for release '" + name + "'.", e );
+            return null;
+        }
+    }
+
     // ----------------------------------------------------------------------
     //
     // ----------------------------------------------------------------------

Modified: continuum/branches/continuum-transient-state/continuum-commons/src/main/resources/META-INF/spring-context.xml
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-transient-state/continuum-commons/src/main/resources/META-INF/spring-context.xml?rev=708765&r1=708764&r2=708765&view=diff
==============================================================================
--- continuum/branches/continuum-transient-state/continuum-commons/src/main/resources/META-INF/spring-context.xml (original)
+++ continuum/branches/continuum-transient-state/continuum-commons/src/main/resources/META-INF/spring-context.xml Tue Oct 28 21:16:12 2008
@@ -25,7 +25,7 @@
 
   <bean id="configurationService" class="org.apache.maven.continuum.configuration.DefaultConfigurationService"
         init-method="initialize">
-    <property name="applicationHome" value="target"/>
+    <property name="applicationHome" value="data"/>
     <property name="scheduleDao" ref="scheduleDao"/>
     <property name="systemConfigurationDao" ref="systemConfigurationDao"/>
     <property name="configuration" ref="continuumConfiguration"/>

Modified: continuum/branches/continuum-transient-state/continuum-core/pom.xml
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-transient-state/continuum-core/pom.xml?rev=708765&r1=708764&r2=708765&view=diff
==============================================================================
--- continuum/branches/continuum-transient-state/continuum-core/pom.xml (original)
+++ continuum/branches/continuum-transient-state/continuum-core/pom.xml Tue Oct 28 21:16:12 2008
@@ -21,7 +21,7 @@
   <parent>  
     <artifactId>continuum</artifactId>
     <groupId>org.apache.continuum</groupId>
-    <version>1.2-SNAPSHOT</version>
+    <version>1.3-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>continuum-core</artifactId>
@@ -167,6 +167,16 @@
       <artifactId>archiva-repository-layer</artifactId>
       <version>${archiva.version}</version>
     </dependency>
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-context-support</artifactId>
+    </dependency>    
+    <dependency>
+      <groupId>javax.mail</groupId>
+      <artifactId>mail</artifactId>
+      <version>1.4</version>
+      <scope>provided</scope>
+    </dependency>    
     <!-- === Testing Dependencies === -->
     <dependency>
       <groupId>hsqldb</groupId>

Modified: continuum/branches/continuum-transient-state/continuum-core/src/main/java/org/apache/continuum/repository/DefaultRepositoryService.java
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-transient-state/continuum-core/src/main/java/org/apache/continuum/repository/DefaultRepositoryService.java?rev=708765&r1=708764&r2=708765&view=diff
==============================================================================
--- continuum/branches/continuum-transient-state/continuum-core/src/main/java/org/apache/continuum/repository/DefaultRepositoryService.java (original)
+++ continuum/branches/continuum-transient-state/continuum-core/src/main/java/org/apache/continuum/repository/DefaultRepositoryService.java Tue Oct 28 21:16:12 2008
@@ -72,6 +72,20 @@
 
         try
         {
+            List<LocalRepository> repos = getAllLocalRepositories();
+            for ( LocalRepository repo : repos )
+            {
+                if ( repo.getName().equals( localRepository.getName() ) )
+                {
+                    throw new RepositoryServiceException( "Local repository name must be unique" );
+                }
+                
+                if ( repo.getLocation().equals( localRepository.getLocation() ) )
+                {
+                    throw new RepositoryServiceException( "Local repository location must be unique" );
+                }
+            }
+
             localRepository.setName( localRepository.getName().trim() );
             localRepository.setLocation( localRepository.getLocation().trim() );
 

Modified: continuum/branches/continuum-transient-state/continuum-core/src/main/java/org/apache/continuum/taskqueue/manager/DefaultTaskQueueManager.java
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-transient-state/continuum-core/src/main/java/org/apache/continuum/taskqueue/manager/DefaultTaskQueueManager.java?rev=708765&r1=708764&r2=708765&view=diff
==============================================================================
--- continuum/branches/continuum-transient-state/continuum-core/src/main/java/org/apache/continuum/taskqueue/manager/DefaultTaskQueueManager.java (original)
+++ continuum/branches/continuum-transient-state/continuum-core/src/main/java/org/apache/continuum/taskqueue/manager/DefaultTaskQueueManager.java Tue Oct 28 21:16:12 2008
@@ -104,7 +104,31 @@
             }
         }
     }
-    
+
+    public boolean cancelCurrentBuild()
+        throws TaskQueueManagerException
+    {
+        Task task = getBuildTaskQueueExecutor().getCurrentTask();
+        
+        if ( task != null )
+        {
+            if ( task instanceof BuildProjectTask )
+            {
+                getLogger().info( "Cancelling current build task" );
+                return getBuildTaskQueueExecutor().cancelTask( task );
+            }
+            else
+            {
+                getLogger().warn( "Current task not a BuildProjectTask - not cancelling" );
+            }
+        }
+        else
+        {
+            getLogger().warn( "No task running - not cancelling" );
+        }
+        return false;
+    }
+
     public TaskQueue getBuildQueue()
     {
         return buildQueue;
@@ -483,7 +507,7 @@
                 }
             }
         }
-    
+
         for ( BuildProjectTask buildProjectTask : tasks )
         {
             getLogger().info( "cancel build for project " + buildProjectTask.getProjectId() );

Modified: continuum/branches/continuum-transient-state/continuum-core/src/main/java/org/apache/maven/continuum/DefaultContinuum.java
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-transient-state/continuum-core/src/main/java/org/apache/maven/continuum/DefaultContinuum.java?rev=708765&r1=708764&r2=708765&view=diff
==============================================================================
--- continuum/branches/continuum-transient-state/continuum-core/src/main/java/org/apache/maven/continuum/DefaultContinuum.java (original)
+++ continuum/branches/continuum-transient-state/continuum-core/src/main/java/org/apache/maven/continuum/DefaultContinuum.java Tue Oct 28 21:16:12 2008
@@ -33,18 +33,20 @@
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
-//import org.apache.commons.lang.ArrayUtils;
 import org.apache.continuum.configuration.ContinuumConfigurationException;
 import org.apache.continuum.dao.BuildDefinitionDao;
 import org.apache.continuum.dao.BuildResultDao;
+import org.apache.continuum.dao.ContinuumReleaseResultDao;
 import org.apache.continuum.dao.DaoUtils;
 import org.apache.continuum.dao.NotifierDao;
 import org.apache.continuum.dao.ProjectDao;
 import org.apache.continuum.dao.ProjectGroupDao;
 import org.apache.continuum.dao.ProjectScmRootDao;
 import org.apache.continuum.dao.ScheduleDao;
+import org.apache.continuum.model.release.ContinuumReleaseResult;
 import org.apache.continuum.model.project.ProjectScmRoot;
 import org.apache.continuum.purge.ContinuumPurgeManager;
+import org.apache.continuum.purge.PurgeConfigurationService;
 import org.apache.continuum.repository.RepositoryService;
 import org.apache.continuum.taskqueue.manager.TaskQueueManager;
 import org.apache.continuum.taskqueue.manager.TaskQueueManagerException;
@@ -77,7 +79,6 @@
 import org.apache.maven.continuum.project.builder.maven.MavenOneContinuumProjectBuilder;
 import org.apache.maven.continuum.project.builder.maven.MavenTwoContinuumProjectBuilder;
 import org.apache.maven.continuum.release.ContinuumReleaseManager;
-//import org.apache.maven.continuum.scm.queue.CheckOutTask;
 import org.apache.maven.continuum.scm.queue.PrepareBuildProjectsTask;
 import org.apache.maven.continuum.store.ContinuumObjectNotFoundException;
 import org.apache.maven.continuum.store.ContinuumStoreException;
@@ -89,7 +90,6 @@
 import org.codehaus.plexus.action.Action;
 import org.codehaus.plexus.action.ActionManager;
 import org.codehaus.plexus.action.ActionNotFoundException;
-//import org.codehaus.plexus.component.repository.exception.ComponentLookupException;
 import org.codehaus.plexus.context.Context;
 import org.codehaus.plexus.context.ContextException;
 import org.codehaus.plexus.logging.AbstractLogEnabled;
@@ -99,10 +99,7 @@
 import org.codehaus.plexus.personality.plexus.lifecycle.phase.Startable;
 import org.codehaus.plexus.personality.plexus.lifecycle.phase.StartingException;
 import org.codehaus.plexus.personality.plexus.lifecycle.phase.StoppingException;
-//import org.codehaus.plexus.taskqueue.Task;
-//import org.codehaus.plexus.taskqueue.TaskQueue;
 import org.codehaus.plexus.taskqueue.TaskQueueException;
-//import org.codehaus.plexus.taskqueue.execution.TaskQueueExecutor;
 import org.codehaus.plexus.util.FileUtils;
 import org.codehaus.plexus.util.StringUtils;
 import org.codehaus.plexus.util.dag.CycleDetectedException;
@@ -165,6 +162,11 @@
     /**
      * @plexus.requirement
      */
+    private ContinuumReleaseResultDao releaseResultDao;
+
+    /**
+     * @plexus.requirement
+     */
     private ProjectScmRootDao projectScmRootDao;
     
     /**
@@ -195,7 +197,7 @@
     // ----------------------------------------------------------------------
     // Moved from core
     // ----------------------------------------------------------------------
-    
+
     /**
      * @plexus.requirement
      */
@@ -236,6 +238,11 @@
      */
     private RepositoryService repositoryService;
 
+	/**
+     * @plexus.requirement
+     */
+    private PurgeConfigurationService purgeConfigurationService;
+
     /**
      * @plexus.requirement
      */
@@ -289,6 +296,11 @@
         return taskQueueManager;
     }
 
+    public PurgeConfigurationService getPurgeConfigurationService()
+    {
+        return purgeConfigurationService;
+    }
+
     // ----------------------------------------------------------------------
     // Project Groups
     // ----------------------------------------------------------------------
@@ -563,6 +575,31 @@
         {
             Project project = getProjectWithBuilds( projectId );
 
+			List<ContinuumReleaseResult> releaseResults = releaseResultDao.getContinuumReleaseResultsByProject( projectId );
+
+			try
+            {
+                for ( ContinuumReleaseResult releaseResult : releaseResults )
+                {
+                    releaseResultDao.removeContinuumReleaseResult( releaseResult );
+                }
+
+                File releaseOutputDirectory = configurationService.getReleaseOutputDirectory( project.getProjectGroup().getId() );
+
+                if ( releaseOutputDirectory != null )
+                {
+                    FileUtils.deleteDirectory( releaseOutputDirectory );
+                }
+            }
+            catch ( ContinuumStoreException e )
+            {
+                throw new ContinuumException( "Error while deleting continuum release result of project group", e );
+            }
+            catch ( IOException e )
+            {
+                throw logAndCreateException( "Error while deleting project group release output directory.", e );
+            }
+			
             getLogger().info( "Remove project " + project.getName() + "(" + projectId + ")" );
 
             try
@@ -3031,6 +3068,109 @@
         return buildDefinitionService;
     }
 
+    public ContinuumReleaseResult addContinuumReleaseResult( ContinuumReleaseResult releaseResult )
+        throws ContinuumException
+    {
+        try
+        {
+            return releaseResultDao.addContinuumReleaseResult( releaseResult );
+        }
+        catch ( ContinuumStoreException e )
+        {
+            throw new ContinuumException( "Error while adding continuumReleaseResult", e );
+        }
+    }
+    
+    public void removeContinuumReleaseResult( int releaseResultId )
+        throws ContinuumException
+    {
+        ContinuumReleaseResult releaseResult = getContinuumReleaseResult( releaseResultId );
+    
+        try
+        {
+            releaseResultDao.removeContinuumReleaseResult( releaseResult );
+        }
+        catch ( ContinuumStoreException e )
+        {
+            throw new ContinuumException( "Error while deleting continuumReleaseResult: " + releaseResultId, e );
+        }
+    
+        try
+        {
+            int projectGroupId = releaseResult.getProjectGroup().getId();
+    
+            String name = "releases-" + releaseResult.getStartTime();
+    
+            File releaseFile = getConfiguration().getReleaseOutputFile( projectGroupId, name );
+    
+            if ( releaseFile.exists() )
+            {
+                releaseFile.delete();
+            }
+        }
+        catch ( ConfigurationException e )
+        {
+            getLogger().info( "skip error during cleanup release files " + e.getMessage(), e );
+        }
+    }
+    
+    public ContinuumReleaseResult getContinuumReleaseResult( int releaseResultId )
+        throws ContinuumException
+    {
+        try
+        {
+            return releaseResultDao.getContinuumReleaseResult( releaseResultId );
+        }
+        catch ( ContinuumObjectNotFoundException e )
+        {
+            throw new ContinuumException( "No continuumReleaseResult found: " + releaseResultId );
+        }
+        catch ( ContinuumStoreException e )
+        {
+            throw new ContinuumException( "Error while retrieving continuumReleaseResult: " + releaseResultId, e );
+        }
+    }
+    
+    public List<ContinuumReleaseResult> getAllContinuumReleaseResults()
+    {
+        return releaseResultDao.getAllContinuumReleaseResults();
+    }
+    
+    public List<ContinuumReleaseResult> getContinuumReleaseResultsByProjectGroup( int projectGroupId )
+    {
+        return releaseResultDao.getContinuumReleaseResultsByProjectGroup( projectGroupId );
+    }
+    
+    public ContinuumReleaseResult getContinuumReleaseResult( int projectId, String releaseGoal, long startTime, long endTime )
+        throws ContinuumException
+    {
+        try
+        {
+            return releaseResultDao.getContinuumReleaseResult( projectId, releaseGoal, startTime, endTime );
+        }
+        catch ( ContinuumStoreException e )
+        {
+            throw new ContinuumException( "Error while retrieving continuumReleaseResult of projectId " + projectId + " with releaseGoal: " + releaseGoal, e);
+        }
+    }
+    
+    public String getReleaseOutput( int releaseResultId )
+        throws ContinuumException
+    {
+        ContinuumReleaseResult releaseResult = getContinuumReleaseResult( releaseResultId );
+    
+        ProjectGroup projectGroup = releaseResult.getProjectGroup();
+    
+        try
+        {
+            return configurationService.getReleaseOutput( projectGroup.getId(), "releases-" + releaseResult.getStartTime() );
+        }
+        catch ( ConfigurationException e )
+        {
+            throw new ContinuumException( "Error while retrieving release output for release: " + releaseResultId );
+        }
+    }
+
     public List<ProjectScmRoot> getProjectScmRootByProjectGroup( int projectGroupId )
     {
         return projectScmRootDao.getProjectScmRootByProjectGroup( projectGroupId );
@@ -3072,8 +3212,8 @@
     }
    
     public Collection<Map<Integer, Integer>> getProjectsAndBuildDefinitions( Collection<Project> projects, 
-                                                                    List<BuildDefinition> bds,
-                                                                    boolean checkDefaultBuildDefinitionForProject )
+                                                                             List<BuildDefinition> bds,
+                                                                             boolean checkDefaultBuildDefinitionForProject )
         throws ContinuumException
     {
         Map<String, Map<Integer, Integer>> map = new HashMap<String, Map<Integer, Integer>>();
@@ -3170,7 +3310,7 @@
     }
 
     public Collection<Map<Integer, Integer>> getProjectsAndBuildDefinitions( Collection<Project> projects, 
-                                                                    int buildDefinitionId )
+                                                                             int buildDefinitionId )
         throws ContinuumException
     {
         Map<String, Map<Integer,Integer>> map = new HashMap<String, Map<Integer, Integer>>();

Modified: continuum/branches/continuum-transient-state/continuum-core/src/main/java/org/apache/maven/continuum/buildcontroller/DefaultBuildController.java
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-transient-state/continuum-core/src/main/java/org/apache/maven/continuum/buildcontroller/DefaultBuildController.java?rev=708765&r1=708764&r2=708765&view=diff
==============================================================================
--- continuum/branches/continuum-transient-state/continuum-core/src/main/java/org/apache/maven/continuum/buildcontroller/DefaultBuildController.java (original)
+++ continuum/branches/continuum-transient-state/continuum-core/src/main/java/org/apache/maven/continuum/buildcontroller/DefaultBuildController.java Tue Oct 28 21:16:12 2008
@@ -27,6 +27,7 @@
 import org.apache.continuum.model.project.ProjectScmRoot;
 import org.apache.maven.continuum.core.action.AbstractContinuumAction;
 import org.apache.maven.continuum.execution.ContinuumBuildExecutor;
+import org.apache.maven.continuum.execution.ContinuumBuildExecutorConstants;
 import org.apache.maven.continuum.execution.manager.BuildExecutorManager;
 import org.apache.maven.continuum.model.project.BuildDefinition;
 import org.apache.maven.continuum.model.project.BuildResult;
@@ -34,7 +35,6 @@
 import org.apache.maven.continuum.model.project.ProjectDependency;
 import org.apache.maven.continuum.model.scm.ChangeFile;
 import org.apache.maven.continuum.model.scm.ChangeSet;
-//import org.apache.maven.continuum.model.scm.ScmResult;
 import org.apache.maven.continuum.notification.ContinuumNotificationDispatcher;
 import org.apache.maven.continuum.project.ContinuumProjectState;
 import org.apache.maven.continuum.store.ContinuumObjectNotFoundException;
@@ -47,7 +47,6 @@
 import org.codehaus.plexus.action.ActionNotFoundException;
 import org.codehaus.plexus.logging.AbstractLogEnabled;
 import org.codehaus.plexus.taskqueue.execution.TaskExecutionException;
-//import org.codehaus.plexus.util.StringUtils;
 
 import java.util.ArrayList;
 import java.util.Iterator;
@@ -151,16 +150,18 @@
             }
             catch ( TaskExecutionException e )
             {
-                //just log the error but don't stop the build from progressing in order not to suppress any build result messages there 
+                updateBuildResult( context, ContinuumUtils.throwableToString( e ) );
+
+                //just log the error but don't stop the build from progressing in order not to suppress any build result messages there
                 getLogger().error( "Error executing action update-project-from-working-directory '", e );
             }
 
             performAction( "execute-builder", context );
-            
+
             performAction( "deploy-artifact", context );
 
             context.setCancelled( (Boolean) actionContext.get( AbstractContinuumAction.KEY_CANCELLED ) );
-            
+
             String s = (String) actionContext.get( AbstractContinuumAction.KEY_BUILD_ID );
 
             if ( s != null && !context.isCancelled() )
@@ -331,7 +332,7 @@
         try
         {
             Project project = projectDao.getProjectWithScmDetails( projectId );
-            
+
             context.setProject( project );
 
             BuildDefinition buildDefinition = buildDefinitionDao.getBuildDefinition( buildDefinitionId );
@@ -342,7 +343,7 @@
                 buildResultDao.getLatestBuildResultForBuildDefinition( projectId, buildDefinitionId );
 
             context.setOldBuildResult( oldBuildResult );
-            
+
             context.setScmResult( project.getScmResult() );
         }
         catch ( ContinuumStoreException e )
@@ -368,7 +369,7 @@
         {
             actionContext.put( AbstractContinuumAction.KEY_OLD_BUILD_ID, context.getOldBuildResult().getId() );
         }
-        
+
         return context;
     }
 
@@ -430,6 +431,11 @@
         throws TaskExecutionException
     {
         BuildDefinition buildDefinition = context.getBuildDefinition();
+        if ( buildDefinition.isBuildFresh() )
+        {
+            getLogger().info( "FreshBuild configured, building" );
+            return true;
+        }
         if ( buildDefinition.isAlwaysBuild() )
         {
             getLogger().info( "AlwaysBuild configured, building" );
@@ -492,7 +498,8 @@
         }
 
         // Check changes
-        if ( !shouldBuild && !allChangesUnknown && !context.getScmResult().getChanges().isEmpty() )
+        if ( !shouldBuild && ( ( !allChangesUnknown && !context.getScmResult().getChanges().isEmpty() ) ||
+            project.getExecutorId().equals( ContinuumBuildExecutorConstants.MAVEN_TWO_BUILD_EXECUTOR ) ) )
         {
             try
             {
@@ -503,6 +510,7 @@
             }
             catch ( Exception e )
             {
+                updateBuildResult( context, ContinuumUtils.throwableToString( e ) );
                 throw new TaskExecutionException( "Can't determine if the project should build or not", e );
             }
         }
@@ -693,9 +701,9 @@
         throws TaskExecutionException
     {
         Project project = context.getProject();
-        
+
         int projectGroupId = project.getProjectGroup().getId();
-        
+
         List<ProjectScmRoot> scmRoots = projectScmRootDao.getProjectScmRootByProjectGroup( projectGroupId );
 
         for ( ProjectScmRoot projectScmRoot : scmRoots )
@@ -706,11 +714,11 @@
                 {
                     return true;
                 }
-                
+
                 break;
             }
         }
-        
+
         return false;
     }
 

Modified: continuum/branches/continuum-transient-state/continuum-core/src/main/java/org/apache/maven/continuum/execution/AbstractBuildExecutor.java
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-transient-state/continuum-core/src/main/java/org/apache/maven/continuum/execution/AbstractBuildExecutor.java?rev=708765&r1=708764&r2=708765&view=diff
==============================================================================
--- continuum/branches/continuum-transient-state/continuum-core/src/main/java/org/apache/maven/continuum/execution/AbstractBuildExecutor.java (original)
+++ continuum/branches/continuum-transient-state/continuum-core/src/main/java/org/apache/maven/continuum/execution/AbstractBuildExecutor.java Tue Oct 28 21:16:12 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-transient-state/continuum-core/src/main/java/org/apache/maven/continuum/execution/maven/m1/DefaultMavenOneMetadataHelper.java
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-transient-state/continuum-core/src/main/java/org/apache/maven/continuum/execution/maven/m1/DefaultMavenOneMetadataHelper.java?rev=708765&r1=708764&r2=708765&view=diff
==============================================================================
--- continuum/branches/continuum-transient-state/continuum-core/src/main/java/org/apache/maven/continuum/execution/maven/m1/DefaultMavenOneMetadataHelper.java (original)
+++ continuum/branches/continuum-transient-state/continuum-core/src/main/java/org/apache/maven/continuum/execution/maven/m1/DefaultMavenOneMetadataHelper.java Tue Oct 28 21:16:12 2008
@@ -217,7 +217,7 @@
 
             if ( StringUtils.isEmpty( scmConnection ) )
             {
-                result.addError( ContinuumProjectBuildingResult.ERROR_MISSING_SCM );
+                result.addError( ContinuumProjectBuildingResult.ERROR_MISSING_SCM, name );
 
                 // Do not throw an exception or return here, gather up as many results as possible first.
             }

Modified: continuum/branches/continuum-transient-state/continuum-core/src/main/java/org/apache/maven/continuum/execution/maven/m2/MavenTwoBuildExecutor.java
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-transient-state/continuum-core/src/main/java/org/apache/maven/continuum/execution/maven/m2/MavenTwoBuildExecutor.java?rev=708765&r1=708764&r2=708765&view=diff
==============================================================================
--- continuum/branches/continuum-transient-state/continuum-core/src/main/java/org/apache/maven/continuum/execution/maven/m2/MavenTwoBuildExecutor.java (original)
+++ continuum/branches/continuum-transient-state/continuum-core/src/main/java/org/apache/maven/continuum/execution/maven/m2/MavenTwoBuildExecutor.java Tue Oct 28 21:16:12 2008
@@ -407,8 +407,25 @@
             return true;
         }
 
-        //check if changes are only in sub-modules or not
         MavenProject project = getMavenProject( continuumProject, workingDirectory, buildDefinition );
+
+        //CONTINUUM-1815: additional check for projects recently released
+        if ( !continuumProject.getVersion().equals( project.getVersion() ) )
+        {
+            getLogger().info( "Found changes in project's version ( maybe project was recently released ), building" );
+            return true;
+        }
+        
+        if ( changes.isEmpty() )
+        {
+            if ( getLogger().isDebugEnabled() )
+            {
+                getLogger().info( "Found no changes, not building" );
+            }
+            return false;
+        }
+        
+        //check if changes are only in sub-modules or not
         List<String> modules = project.getModules();
 
         List<ChangeFile> files = new ArrayList<ChangeFile>();



Mime
View raw message