You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@continuum.apache.org by ev...@apache.org on 2008/08/07 21:38:56 UTC
svn commit: r683689 [1/7] - in
/continuum/branches/continuum-refactoring-evenisse: ./ continuum-api/
continuum-api/src/main/java/org/apache/continuum/dao/
continuum-api/src/main/java/org/apache/continuum/purge/
continuum-api/src/main/java/org/apache/co...
Author: evenisse
Date: Thu Aug 7 12:38:49 2008
New Revision: 683689
URL: http://svn.apache.org/viewvc?rev=683689&view=rev
Log:
merge from trunk r.682547
Added:
continuum/branches/continuum-refactoring-evenisse/continuum-api/src/main/java/org/apache/continuum/dao/DirectoryPurgeConfigurationDao.java (with props)
continuum/branches/continuum-refactoring-evenisse/continuum-api/src/main/java/org/apache/continuum/dao/LocalRepositoryDao.java (with props)
continuum/branches/continuum-refactoring-evenisse/continuum-api/src/main/java/org/apache/continuum/dao/RepositoryPurgeConfigurationDao.java (with props)
continuum/branches/continuum-refactoring-evenisse/continuum-api/src/main/java/org/apache/continuum/purge/
- copied from r682986, continuum/trunk/continuum-api/src/main/java/org/apache/continuum/purge/
continuum/branches/continuum-refactoring-evenisse/continuum-api/src/main/java/org/apache/continuum/purge/ContinuumPurgeManager.java
- copied unchanged from r682986, continuum/trunk/continuum-api/src/main/java/org/apache/continuum/purge/ContinuumPurgeManager.java
continuum/branches/continuum-refactoring-evenisse/continuum-api/src/main/java/org/apache/continuum/purge/ContinuumPurgeManagerException.java
- copied unchanged from r682986, continuum/trunk/continuum-api/src/main/java/org/apache/continuum/purge/ContinuumPurgeManagerException.java
continuum/branches/continuum-refactoring-evenisse/continuum-api/src/main/java/org/apache/continuum/purge/PurgeConfigurationService.java
- copied unchanged from r682986, continuum/trunk/continuum-api/src/main/java/org/apache/continuum/purge/PurgeConfigurationService.java
continuum/branches/continuum-refactoring-evenisse/continuum-api/src/main/java/org/apache/continuum/purge/PurgeConfigurationServiceException.java
- copied unchanged from r682986, continuum/trunk/continuum-api/src/main/java/org/apache/continuum/purge/PurgeConfigurationServiceException.java
continuum/branches/continuum-refactoring-evenisse/continuum-api/src/main/java/org/apache/continuum/purge/controller/
- copied from r682986, continuum/trunk/continuum-api/src/main/java/org/apache/continuum/purge/controller/
continuum/branches/continuum-refactoring-evenisse/continuum-api/src/main/java/org/apache/continuum/purge/controller/PurgeController.java
- copied unchanged from r682986, continuum/trunk/continuum-api/src/main/java/org/apache/continuum/purge/controller/PurgeController.java
continuum/branches/continuum-refactoring-evenisse/continuum-api/src/main/java/org/apache/continuum/purge/executor/
- copied from r682986, continuum/trunk/continuum-api/src/main/java/org/apache/continuum/purge/executor/
continuum/branches/continuum-refactoring-evenisse/continuum-api/src/main/java/org/apache/continuum/purge/executor/ContinuumPurgeExecutor.java
- copied unchanged from r682986, continuum/trunk/continuum-api/src/main/java/org/apache/continuum/purge/executor/ContinuumPurgeExecutor.java
continuum/branches/continuum-refactoring-evenisse/continuum-api/src/main/java/org/apache/continuum/purge/executor/ContinuumPurgeExecutorException.java
- copied unchanged from r682986, continuum/trunk/continuum-api/src/main/java/org/apache/continuum/purge/executor/ContinuumPurgeExecutorException.java
continuum/branches/continuum-refactoring-evenisse/continuum-api/src/main/java/org/apache/continuum/purge/repository/
- copied from r682986, continuum/trunk/continuum-api/src/main/java/org/apache/continuum/purge/repository/
continuum/branches/continuum-refactoring-evenisse/continuum-api/src/main/java/org/apache/continuum/purge/repository/content/
- copied from r682986, continuum/trunk/continuum-api/src/main/java/org/apache/continuum/purge/repository/content/
continuum/branches/continuum-refactoring-evenisse/continuum-api/src/main/java/org/apache/continuum/purge/repository/content/RepositoryManagedContent.java
- copied unchanged from r682986, continuum/trunk/continuum-api/src/main/java/org/apache/continuum/purge/repository/content/RepositoryManagedContent.java
continuum/branches/continuum-refactoring-evenisse/continuum-api/src/main/java/org/apache/continuum/purge/repository/scanner/
- copied from r682986, continuum/trunk/continuum-api/src/main/java/org/apache/continuum/purge/repository/scanner/
continuum/branches/continuum-refactoring-evenisse/continuum-api/src/main/java/org/apache/continuum/purge/repository/scanner/RepositoryScanner.java
- copied unchanged from r682986, continuum/trunk/continuum-api/src/main/java/org/apache/continuum/purge/repository/scanner/RepositoryScanner.java
continuum/branches/continuum-refactoring-evenisse/continuum-api/src/main/java/org/apache/continuum/repository/
- copied from r682986, continuum/trunk/continuum-api/src/main/java/org/apache/continuum/repository/
continuum/branches/continuum-refactoring-evenisse/continuum-api/src/main/java/org/apache/continuum/repository/RepositoryService.java
- copied unchanged from r682986, continuum/trunk/continuum-api/src/main/java/org/apache/continuum/repository/RepositoryService.java
continuum/branches/continuum-refactoring-evenisse/continuum-api/src/main/java/org/apache/continuum/repository/RepositoryServiceException.java
- copied unchanged from r682986, continuum/trunk/continuum-api/src/main/java/org/apache/continuum/repository/RepositoryServiceException.java
continuum/branches/continuum-refactoring-evenisse/continuum-core/src/main/java/org/apache/continuum/
- copied from r682986, continuum/trunk/continuum-core/src/main/java/org/apache/continuum/
continuum/branches/continuum-refactoring-evenisse/continuum-core/src/main/java/org/apache/continuum/purge/
- copied from r682986, continuum/trunk/continuum-core/src/main/java/org/apache/continuum/purge/
continuum/branches/continuum-refactoring-evenisse/continuum-core/src/main/java/org/apache/continuum/purge/DefaultContinuumPurgeManager.java
- copied, changed from r682986, continuum/trunk/continuum-core/src/main/java/org/apache/continuum/purge/DefaultContinuumPurgeManager.java
continuum/branches/continuum-refactoring-evenisse/continuum-core/src/main/java/org/apache/continuum/repository/
- copied from r682986, continuum/trunk/continuum-core/src/main/java/org/apache/continuum/repository/
continuum/branches/continuum-refactoring-evenisse/continuum-core/src/main/java/org/apache/continuum/repository/DefaultRepositoryService.java
- copied, changed from r682986, continuum/trunk/continuum-core/src/main/java/org/apache/continuum/repository/DefaultRepositoryService.java
continuum/branches/continuum-refactoring-evenisse/continuum-core/src/main/java/org/apache/maven/continuum/scheduler/ContinuumPurgeJob.java
- copied unchanged from r682986, continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/scheduler/ContinuumPurgeJob.java
continuum/branches/continuum-refactoring-evenisse/continuum-core/src/test/java/org/apache/continuum/
- copied from r682986, continuum/trunk/continuum-core/src/test/java/org/apache/continuum/
continuum/branches/continuum-refactoring-evenisse/continuum-core/src/test/java/org/apache/continuum/purge/
- copied from r682986, continuum/trunk/continuum-core/src/test/java/org/apache/continuum/purge/
continuum/branches/continuum-refactoring-evenisse/continuum-core/src/test/java/org/apache/continuum/purge/DefaultContinuumPurgeManagerTest.java
- copied, changed from r682986, continuum/trunk/continuum-core/src/test/java/org/apache/continuum/purge/DefaultContinuumPurgeManagerTest.java
continuum/branches/continuum-refactoring-evenisse/continuum-core/src/test/java/org/apache/continuum/repository/
- copied from r682986, continuum/trunk/continuum-core/src/test/java/org/apache/continuum/repository/
continuum/branches/continuum-refactoring-evenisse/continuum-core/src/test/java/org/apache/continuum/repository/DefaultRepositoryServiceTest.java
- copied, changed from r682986, continuum/trunk/continuum-core/src/test/java/org/apache/continuum/repository/DefaultRepositoryServiceTest.java
continuum/branches/continuum-refactoring-evenisse/continuum-core/src/test/resources/org/apache/continuum/
- copied from r682986, continuum/trunk/continuum-core/src/test/resources/org/apache/continuum/
continuum/branches/continuum-refactoring-evenisse/continuum-core/src/test/resources/org/apache/continuum/purge/
- copied from r682986, continuum/trunk/continuum-core/src/test/resources/org/apache/continuum/purge/
continuum/branches/continuum-refactoring-evenisse/continuum-core/src/test/resources/org/apache/continuum/purge/DefaultContinuumPurgeManagerTest.xml
- copied unchanged from r682986, continuum/trunk/continuum-core/src/test/resources/org/apache/continuum/purge/DefaultContinuumPurgeManagerTest.xml
continuum/branches/continuum-refactoring-evenisse/continuum-core/src/test/resources/org/apache/continuum/repository/
- copied from r682986, continuum/trunk/continuum-core/src/test/resources/org/apache/continuum/repository/
continuum/branches/continuum-refactoring-evenisse/continuum-core/src/test/resources/org/apache/continuum/repository/DefaultRepositoryServiceTest.xml
- copied unchanged from r682986, continuum/trunk/continuum-core/src/test/resources/org/apache/continuum/repository/DefaultRepositoryServiceTest.xml
continuum/branches/continuum-refactoring-evenisse/continuum-docs/src/site/resources/css/
- copied from r682986, continuum/trunk/continuum-docs/src/site/resources/css/
continuum/branches/continuum-refactoring-evenisse/continuum-docs/src/site/resources/css/site.css
- copied unchanged from r682986, continuum/trunk/continuum-docs/src/site/resources/css/site.css
continuum/branches/continuum-refactoring-evenisse/continuum-docs/src/site/resources/images/add-ant-project-menu.png
- copied unchanged from r682986, continuum/trunk/continuum-docs/src/site/resources/images/add-ant-project-menu.png
continuum/branches/continuum-refactoring-evenisse/continuum-docs/src/site/resources/images/add-ant-project.png
- copied unchanged from r682986, continuum/trunk/continuum-docs/src/site/resources/images/add-ant-project.png
continuum/branches/continuum-refactoring-evenisse/continuum-docs/src/site/resources/images/add-installation.png
- copied unchanged from r682986, continuum/trunk/continuum-docs/src/site/resources/images/add-installation.png
continuum/branches/continuum-refactoring-evenisse/continuum-docs/src/site/resources/images/add-jdk.png
- copied unchanged from r682986, continuum/trunk/continuum-docs/src/site/resources/images/add-jdk.png
continuum/branches/continuum-refactoring-evenisse/continuum-docs/src/site/resources/images/add-m1-project-menu.png
- copied unchanged from r682986, continuum/trunk/continuum-docs/src/site/resources/images/add-m1-project-menu.png
continuum/branches/continuum-refactoring-evenisse/continuum-docs/src/site/resources/images/add-m1-project.png
- copied unchanged from r682986, continuum/trunk/continuum-docs/src/site/resources/images/add-m1-project.png
continuum/branches/continuum-refactoring-evenisse/continuum-docs/src/site/resources/images/add-m2-project-menu.png
- copied unchanged from r682986, continuum/trunk/continuum-docs/src/site/resources/images/add-m2-project-menu.png
continuum/branches/continuum-refactoring-evenisse/continuum-docs/src/site/resources/images/add-m2-project.png
- copied unchanged from r682986, continuum/trunk/continuum-docs/src/site/resources/images/add-m2-project.png
continuum/branches/continuum-refactoring-evenisse/continuum-docs/src/site/resources/images/add-project-from-group.png
- copied unchanged from r682986, continuum/trunk/continuum-docs/src/site/resources/images/add-project-from-group.png
continuum/branches/continuum-refactoring-evenisse/continuum-docs/src/site/resources/images/add-project-group-detail.png
- copied unchanged from r682986, continuum/trunk/continuum-docs/src/site/resources/images/add-project-group-detail.png
continuum/branches/continuum-refactoring-evenisse/continuum-docs/src/site/resources/images/add-project-group.png
- copied unchanged from r682986, continuum/trunk/continuum-docs/src/site/resources/images/add-project-group.png
continuum/branches/continuum-refactoring-evenisse/continuum-docs/src/site/resources/images/add-shell-project-menu.png
- copied unchanged from r682986, continuum/trunk/continuum-docs/src/site/resources/images/add-shell-project-menu.png
continuum/branches/continuum-refactoring-evenisse/continuum-docs/src/site/resources/images/add-shell-project.png
- copied unchanged from r682986, continuum/trunk/continuum-docs/src/site/resources/images/add-shell-project.png
continuum/branches/continuum-refactoring-evenisse/continuum-docs/src/site/resources/images/admin-account-creation.png
- copied unchanged from r682986, continuum/trunk/continuum-docs/src/site/resources/images/admin-account-creation.png
continuum/branches/continuum-refactoring-evenisse/continuum-docs/src/site/resources/images/bg.jpg
- copied unchanged from r682986, continuum/trunk/continuum-docs/src/site/resources/images/bg.jpg
continuum/branches/continuum-refactoring-evenisse/continuum-docs/src/site/resources/images/build-result.png
- copied unchanged from r682986, continuum/trunk/continuum-docs/src/site/resources/images/build-result.png
continuum/branches/continuum-refactoring-evenisse/continuum-docs/src/site/resources/images/build-results.png
- copied unchanged from r682986, continuum/trunk/continuum-docs/src/site/resources/images/build-results.png
continuum/branches/continuum-refactoring-evenisse/continuum-docs/src/site/resources/images/builddefinition-template-edit.png
- copied unchanged from r682986, continuum/trunk/continuum-docs/src/site/resources/images/builddefinition-template-edit.png
continuum/branches/continuum-refactoring-evenisse/continuum-docs/src/site/resources/images/builddefinition-templates-list.png
- copied unchanged from r682986, continuum/trunk/continuum-docs/src/site/resources/images/builddefinition-templates-list.png
continuum/branches/continuum-refactoring-evenisse/continuum-docs/src/site/resources/images/builddefinition-templates.png
- copied unchanged from r682986, continuum/trunk/continuum-docs/src/site/resources/images/builddefinition-templates.png
continuum/branches/continuum-refactoring-evenisse/continuum-docs/src/site/resources/images/configuration-footer.png
- copied unchanged from r682986, continuum/trunk/continuum-docs/src/site/resources/images/configuration-footer.png
continuum/branches/continuum-refactoring-evenisse/continuum-docs/src/site/resources/images/configuration-menu.png
- copied unchanged from r682986, continuum/trunk/continuum-docs/src/site/resources/images/configuration-menu.png
continuum/branches/continuum-refactoring-evenisse/continuum-docs/src/site/resources/images/configuration.png
- copied unchanged from r682986, continuum/trunk/continuum-docs/src/site/resources/images/configuration.png
continuum/branches/continuum-refactoring-evenisse/continuum-docs/src/site/resources/images/configure-appearance.png
- copied unchanged from r682986, continuum/trunk/continuum-docs/src/site/resources/images/configure-appearance.png
continuum/branches/continuum-refactoring-evenisse/continuum-docs/src/site/resources/images/continuum_logo_75.gif
- copied unchanged from r682986, continuum/trunk/continuum-docs/src/site/resources/images/continuum_logo_75.gif
continuum/branches/continuum-refactoring-evenisse/continuum-docs/src/site/resources/images/delete.gif
- copied unchanged from r682986, continuum/trunk/continuum-docs/src/site/resources/images/delete.gif
continuum/branches/continuum-refactoring-evenisse/continuum-docs/src/site/resources/images/installation-tool-edit.png
- copied unchanged from r682986, continuum/trunk/continuum-docs/src/site/resources/images/installation-tool-edit.png
continuum/branches/continuum-refactoring-evenisse/continuum-docs/src/site/resources/images/installation-type-choice.png
- copied unchanged from r682986, continuum/trunk/continuum-docs/src/site/resources/images/installation-type-choice.png
continuum/branches/continuum-refactoring-evenisse/continuum-docs/src/site/resources/images/installation-validation-failed.png
- copied unchanged from r682986, continuum/trunk/continuum-docs/src/site/resources/images/installation-validation-failed.png
continuum/branches/continuum-refactoring-evenisse/continuum-docs/src/site/resources/images/installations.png
- copied unchanged from r682986, continuum/trunk/continuum-docs/src/site/resources/images/installations.png
continuum/branches/continuum-refactoring-evenisse/continuum-docs/src/site/resources/images/jconsole1.jpg
- copied unchanged from r682986, continuum/trunk/continuum-docs/src/site/resources/images/jconsole1.jpg
continuum/branches/continuum-refactoring-evenisse/continuum-docs/src/site/resources/images/jconsole2.jpg
- copied unchanged from r682986, continuum/trunk/continuum-docs/src/site/resources/images/jconsole2.jpg
continuum/branches/continuum-refactoring-evenisse/continuum-docs/src/site/resources/images/jdk-validation-failed.png
- copied unchanged from r682986, continuum/trunk/continuum-docs/src/site/resources/images/jdk-validation-failed.png
continuum/branches/continuum-refactoring-evenisse/continuum-docs/src/site/resources/images/logo_apache.jpg
- copied unchanged from r682986, continuum/trunk/continuum-docs/src/site/resources/images/logo_apache.jpg
continuum/branches/continuum-refactoring-evenisse/continuum-docs/src/site/resources/images/logo_maven.jpg
- copied unchanged from r682986, continuum/trunk/continuum-docs/src/site/resources/images/logo_maven.jpg
continuum/branches/continuum-refactoring-evenisse/continuum-docs/src/site/resources/images/maven-logo-2.gif
- copied unchanged from r682986, continuum/trunk/continuum-docs/src/site/resources/images/maven-logo-2.gif
continuum/branches/continuum-refactoring-evenisse/continuum-docs/src/site/resources/images/notifier-mail-add.png
- copied unchanged from r682986, continuum/trunk/continuum-docs/src/site/resources/images/notifier-mail-add.png
continuum/branches/continuum-refactoring-evenisse/continuum-docs/src/site/resources/images/notifiers-button-project.png
- copied unchanged from r682986, continuum/trunk/continuum-docs/src/site/resources/images/notifiers-button-project.png
continuum/branches/continuum-refactoring-evenisse/continuum-docs/src/site/resources/images/notifiers-link-project-group.png
- copied unchanged from r682986, continuum/trunk/continuum-docs/src/site/resources/images/notifiers-link-project-group.png
continuum/branches/continuum-refactoring-evenisse/continuum-docs/src/site/resources/images/notifiers-type-choice.png
- copied unchanged from r682986, continuum/trunk/continuum-docs/src/site/resources/images/notifiers-type-choice.png
continuum/branches/continuum-refactoring-evenisse/continuum-docs/src/site/resources/images/project-view-bottom.png
- copied unchanged from r682986, continuum/trunk/continuum-docs/src/site/resources/images/project-view-bottom.png
continuum/branches/continuum-refactoring-evenisse/continuum-docs/src/site/resources/images/project-view-top.png
- copied unchanged from r682986, continuum/trunk/continuum-docs/src/site/resources/images/project-view-top.png
continuum/branches/continuum-refactoring-evenisse/continuum-docs/src/site/resources/images/queues-menu.png
- copied unchanged from r682986, continuum/trunk/continuum-docs/src/site/resources/images/queues-menu.png
continuum/branches/continuum-refactoring-evenisse/continuum-docs/src/site/resources/images/select-company-pom.png
- copied unchanged from r682986, continuum/trunk/continuum-docs/src/site/resources/images/select-company-pom.png
continuum/branches/continuum-refactoring-evenisse/continuum-docs/src/site/resources/images/selected-company-pom.png
- copied unchanged from r682986, continuum/trunk/continuum-docs/src/site/resources/images/selected-company-pom.png
continuum/branches/continuum-refactoring-evenisse/continuum-purge/ (props changed)
- copied from r682986, continuum/trunk/continuum-purge/
continuum/branches/continuum-refactoring-evenisse/continuum-purge/pom.xml
- copied, changed from r682986, continuum/trunk/continuum-purge/pom.xml
continuum/branches/continuum-refactoring-evenisse/continuum-purge/src/
- copied from r682986, continuum/trunk/continuum-purge/src/
continuum/branches/continuum-refactoring-evenisse/continuum-purge/src/main/
- copied from r682986, continuum/trunk/continuum-purge/src/main/
continuum/branches/continuum-refactoring-evenisse/continuum-purge/src/main/java/
- copied from r682986, continuum/trunk/continuum-purge/src/main/java/
continuum/branches/continuum-refactoring-evenisse/continuum-purge/src/main/java/org/
- copied from r682986, continuum/trunk/continuum-purge/src/main/java/org/
continuum/branches/continuum-refactoring-evenisse/continuum-purge/src/main/java/org/apache/
- copied from r682986, continuum/trunk/continuum-purge/src/main/java/org/apache/
continuum/branches/continuum-refactoring-evenisse/continuum-purge/src/main/java/org/apache/continuum/
- copied from r682986, continuum/trunk/continuum-purge/src/main/java/org/apache/continuum/
continuum/branches/continuum-refactoring-evenisse/continuum-purge/src/main/java/org/apache/continuum/purge/
- copied from r682986, continuum/trunk/continuum-purge/src/main/java/org/apache/continuum/purge/
continuum/branches/continuum-refactoring-evenisse/continuum-purge/src/main/java/org/apache/continuum/purge/ContinuumPurgeConstants.java
- copied, changed from r682986, continuum/trunk/continuum-purge/src/main/java/org/apache/continuum/purge/ContinuumPurgeConstants.java
continuum/branches/continuum-refactoring-evenisse/continuum-purge/src/main/java/org/apache/continuum/purge/DefaultPurgeConfigurationService.java
- copied, changed from r682986, continuum/trunk/continuum-purge/src/main/java/org/apache/continuum/purge/DefaultPurgeConfigurationService.java
continuum/branches/continuum-refactoring-evenisse/continuum-purge/src/main/java/org/apache/continuum/purge/controller/
- copied from r682986, continuum/trunk/continuum-purge/src/main/java/org/apache/continuum/purge/controller/
continuum/branches/continuum-refactoring-evenisse/continuum-purge/src/main/java/org/apache/continuum/purge/controller/DirectoryPurgeController.java
- copied, changed from r682986, continuum/trunk/continuum-purge/src/main/java/org/apache/continuum/purge/controller/DirectoryPurgeController.java
continuum/branches/continuum-refactoring-evenisse/continuum-purge/src/main/java/org/apache/continuum/purge/controller/RepositoryPurgeController.java
- copied, changed from r682986, continuum/trunk/continuum-purge/src/main/java/org/apache/continuum/purge/controller/RepositoryPurgeController.java
continuum/branches/continuum-refactoring-evenisse/continuum-purge/src/main/java/org/apache/continuum/purge/executor/
- copied from r682986, continuum/trunk/continuum-purge/src/main/java/org/apache/continuum/purge/executor/
continuum/branches/continuum-refactoring-evenisse/continuum-purge/src/main/java/org/apache/continuum/purge/executor/AbstractContinuumPurgeExecutor.java
- copied, changed from r682986, continuum/trunk/continuum-purge/src/main/java/org/apache/continuum/purge/executor/AbstractContinuumPurgeExecutor.java
continuum/branches/continuum-refactoring-evenisse/continuum-purge/src/main/java/org/apache/continuum/purge/executor/CleanAllPurgeExecutor.java
- copied, changed from r682986, continuum/trunk/continuum-purge/src/main/java/org/apache/continuum/purge/executor/CleanAllPurgeExecutor.java
continuum/branches/continuum-refactoring-evenisse/continuum-purge/src/main/java/org/apache/continuum/purge/executor/DaysOldDirectoryPurgeExecutor.java
- copied, changed from r682986, continuum/trunk/continuum-purge/src/main/java/org/apache/continuum/purge/executor/DaysOldDirectoryPurgeExecutor.java
continuum/branches/continuum-refactoring-evenisse/continuum-purge/src/main/java/org/apache/continuum/purge/executor/DaysOldRepositoryPurgeExecutor.java
- copied, changed from r682986, continuum/trunk/continuum-purge/src/main/java/org/apache/continuum/purge/executor/DaysOldRepositoryPurgeExecutor.java
continuum/branches/continuum-refactoring-evenisse/continuum-purge/src/main/java/org/apache/continuum/purge/executor/ReleasedSnapshotsRepositoryPurgeExecutor.java
- copied, changed from r682986, continuum/trunk/continuum-purge/src/main/java/org/apache/continuum/purge/executor/ReleasedSnapshotsRepositoryPurgeExecutor.java
continuum/branches/continuum-refactoring-evenisse/continuum-purge/src/main/java/org/apache/continuum/purge/executor/RetentionCountDirectoryPurgeExecutor.java
- copied, changed from r682986, continuum/trunk/continuum-purge/src/main/java/org/apache/continuum/purge/executor/RetentionCountDirectoryPurgeExecutor.java
continuum/branches/continuum-refactoring-evenisse/continuum-purge/src/main/java/org/apache/continuum/purge/executor/RetentionCountRepositoryPurgeExecutor.java
- copied, changed from r682986, continuum/trunk/continuum-purge/src/main/java/org/apache/continuum/purge/executor/RetentionCountRepositoryPurgeExecutor.java
continuum/branches/continuum-refactoring-evenisse/continuum-purge/src/main/java/org/apache/continuum/purge/repository/
- copied from r682986, continuum/trunk/continuum-purge/src/main/java/org/apache/continuum/purge/repository/
continuum/branches/continuum-refactoring-evenisse/continuum-purge/src/main/java/org/apache/continuum/purge/repository/content/
- copied from r682986, continuum/trunk/continuum-purge/src/main/java/org/apache/continuum/purge/repository/content/
continuum/branches/continuum-refactoring-evenisse/continuum-purge/src/main/java/org/apache/continuum/purge/repository/content/ManagedDefaultRepositoryContent.java
- copied, changed from r682986, continuum/trunk/continuum-purge/src/main/java/org/apache/continuum/purge/repository/content/ManagedDefaultRepositoryContent.java
continuum/branches/continuum-refactoring-evenisse/continuum-purge/src/main/java/org/apache/continuum/purge/repository/content/ManagedLegacyRepositoryContent.java
- copied, changed from r682986, continuum/trunk/continuum-purge/src/main/java/org/apache/continuum/purge/repository/content/ManagedLegacyRepositoryContent.java
continuum/branches/continuum-refactoring-evenisse/continuum-purge/src/main/java/org/apache/continuum/purge/repository/scanner/
- copied from r682986, continuum/trunk/continuum-purge/src/main/java/org/apache/continuum/purge/repository/scanner/
continuum/branches/continuum-refactoring-evenisse/continuum-purge/src/main/java/org/apache/continuum/purge/repository/scanner/DefaultRepositoryScanner.java
- copied, changed from r682986, continuum/trunk/continuum-purge/src/main/java/org/apache/continuum/purge/repository/scanner/DefaultRepositoryScanner.java
continuum/branches/continuum-refactoring-evenisse/continuum-purge/src/main/java/org/apache/continuum/purge/repository/scanner/RepositoryScannerInstance.java
- copied, changed from r682986, continuum/trunk/continuum-purge/src/main/java/org/apache/continuum/purge/repository/scanner/RepositoryScannerInstance.java
continuum/branches/continuum-refactoring-evenisse/continuum-purge/src/main/java/org/apache/continuum/purge/repository/utils/
- copied from r682986, continuum/trunk/continuum-purge/src/main/java/org/apache/continuum/purge/repository/utils/
continuum/branches/continuum-refactoring-evenisse/continuum-purge/src/main/java/org/apache/continuum/purge/repository/utils/FileTypes.java
- copied, changed from r682986, continuum/trunk/continuum-purge/src/main/java/org/apache/continuum/purge/repository/utils/FileTypes.java
continuum/branches/continuum-refactoring-evenisse/continuum-purge/src/main/java/org/apache/continuum/purge/repository/utils/FilenameParser.java
- copied, changed from r682986, continuum/trunk/continuum-purge/src/main/java/org/apache/continuum/purge/repository/utils/FilenameParser.java
continuum/branches/continuum-refactoring-evenisse/continuum-purge/src/main/java/org/apache/continuum/purge/repository/utils/LegacyPathParser.java
- copied, changed from r682986, continuum/trunk/continuum-purge/src/main/java/org/apache/continuum/purge/repository/utils/LegacyPathParser.java
continuum/branches/continuum-refactoring-evenisse/continuum-purge/src/main/java/org/apache/continuum/purge/task/
- copied from r682986, continuum/trunk/continuum-purge/src/main/java/org/apache/continuum/purge/task/
continuum/branches/continuum-refactoring-evenisse/continuum-purge/src/main/java/org/apache/continuum/purge/task/PurgeTask.java
- copied, changed from r682986, continuum/trunk/continuum-purge/src/main/java/org/apache/continuum/purge/task/PurgeTask.java
continuum/branches/continuum-refactoring-evenisse/continuum-purge/src/main/java/org/apache/continuum/purge/task/PurgeTaskExecutor.java
- copied, changed from r682986, continuum/trunk/continuum-purge/src/main/java/org/apache/continuum/purge/task/PurgeTaskExecutor.java
continuum/branches/continuum-refactoring-evenisse/continuum-purge/src/main/resources/
- copied from r682986, continuum/trunk/continuum-purge/src/main/resources/
continuum/branches/continuum-refactoring-evenisse/continuum-purge/src/main/resources/META-INF/
- copied from r682986, continuum/trunk/continuum-purge/src/main/resources/META-INF/
continuum/branches/continuum-refactoring-evenisse/continuum-purge/src/main/resources/META-INF/plexus/
- copied from r682986, continuum/trunk/continuum-purge/src/main/resources/META-INF/plexus/
continuum/branches/continuum-refactoring-evenisse/continuum-purge/src/main/resources/META-INF/plexus/components.xml
- copied, changed from r682986, continuum/trunk/continuum-purge/src/main/resources/META-INF/plexus/components.xml
continuum/branches/continuum-refactoring-evenisse/continuum-purge/src/test/
- copied from r682986, continuum/trunk/continuum-purge/src/test/
continuum/branches/continuum-refactoring-evenisse/continuum-purge/src/test/java/
- copied from r682986, continuum/trunk/continuum-purge/src/test/java/
continuum/branches/continuum-refactoring-evenisse/continuum-purge/src/test/java/org/
- copied from r682986, continuum/trunk/continuum-purge/src/test/java/org/
continuum/branches/continuum-refactoring-evenisse/continuum-purge/src/test/java/org/apache/
- copied from r682986, continuum/trunk/continuum-purge/src/test/java/org/apache/
continuum/branches/continuum-refactoring-evenisse/continuum-purge/src/test/java/org/apache/continuum/
- copied from r682986, continuum/trunk/continuum-purge/src/test/java/org/apache/continuum/
continuum/branches/continuum-refactoring-evenisse/continuum-purge/src/test/java/org/apache/continuum/purge/
- copied from r682986, continuum/trunk/continuum-purge/src/test/java/org/apache/continuum/purge/
continuum/branches/continuum-refactoring-evenisse/continuum-purge/src/test/java/org/apache/continuum/purge/AbstractPurgeTest.java
- copied, changed from r682986, continuum/trunk/continuum-purge/src/test/java/org/apache/continuum/purge/AbstractPurgeTest.java
continuum/branches/continuum-refactoring-evenisse/continuum-purge/src/test/java/org/apache/continuum/purge/DefaultPurgeConfigurationServiceTest.java
- copied, changed from r682986, continuum/trunk/continuum-purge/src/test/java/org/apache/continuum/purge/DefaultPurgeConfigurationServiceTest.java
continuum/branches/continuum-refactoring-evenisse/continuum-purge/src/test/java/org/apache/continuum/purge/executor/
- copied from r682986, continuum/trunk/continuum-purge/src/test/java/org/apache/continuum/purge/executor/
continuum/branches/continuum-refactoring-evenisse/continuum-purge/src/test/java/org/apache/continuum/purge/executor/AbstractPurgeExecutorTest.java
- copied, changed from r682986, continuum/trunk/continuum-purge/src/test/java/org/apache/continuum/purge/executor/AbstractPurgeExecutorTest.java
continuum/branches/continuum-refactoring-evenisse/continuum-purge/src/test/java/org/apache/continuum/purge/executor/CleanAllPurgeExecutorTest.java
- copied, changed from r682986, continuum/trunk/continuum-purge/src/test/java/org/apache/continuum/purge/executor/CleanAllPurgeExecutorTest.java
continuum/branches/continuum-refactoring-evenisse/continuum-purge/src/test/java/org/apache/continuum/purge/executor/DaysOldDirectoryPurgeExecutorTest.java
- copied, changed from r682986, continuum/trunk/continuum-purge/src/test/java/org/apache/continuum/purge/executor/DaysOldDirectoryPurgeExecutorTest.java
continuum/branches/continuum-refactoring-evenisse/continuum-purge/src/test/java/org/apache/continuum/purge/executor/DaysOldRepositoryPurgeExecutorTest.java
- copied, changed from r682986, continuum/trunk/continuum-purge/src/test/java/org/apache/continuum/purge/executor/DaysOldRepositoryPurgeExecutorTest.java
continuum/branches/continuum-refactoring-evenisse/continuum-purge/src/test/java/org/apache/continuum/purge/executor/ReleasedSnapshotsRepositoryPurgeExecutorTest.java
- copied, changed from r682986, continuum/trunk/continuum-purge/src/test/java/org/apache/continuum/purge/executor/ReleasedSnapshotsRepositoryPurgeExecutorTest.java
continuum/branches/continuum-refactoring-evenisse/continuum-purge/src/test/java/org/apache/continuum/purge/executor/RetentionCountDirectoryPurgeExecutorTest.java
- copied, changed from r682986, continuum/trunk/continuum-purge/src/test/java/org/apache/continuum/purge/executor/RetentionCountDirectoryPurgeExecutorTest.java
continuum/branches/continuum-refactoring-evenisse/continuum-purge/src/test/java/org/apache/continuum/purge/executor/RetentionCountRepositoryPurgeExecutorTest.java
- copied, changed from r682986, continuum/trunk/continuum-purge/src/test/java/org/apache/continuum/purge/executor/RetentionCountRepositoryPurgeExecutorTest.java
continuum/branches/continuum-refactoring-evenisse/continuum-purge/src/test/resources/
- copied from r682986, continuum/trunk/continuum-purge/src/test/resources/
continuum/branches/continuum-refactoring-evenisse/continuum-purge/src/test/resources/META-INF/
- copied from r682986, continuum/trunk/continuum-purge/src/test/resources/META-INF/
continuum/branches/continuum-refactoring-evenisse/continuum-purge/src/test/resources/META-INF/continuum/
- copied from r682986, continuum/trunk/continuum-purge/src/test/resources/META-INF/continuum/
continuum/branches/continuum-refactoring-evenisse/continuum-purge/src/test/resources/META-INF/continuum/continuum-configuration.xml
- copied, changed from r682986, continuum/trunk/continuum-purge/src/test/resources/META-INF/continuum/continuum-configuration.xml
continuum/branches/continuum-refactoring-evenisse/continuum-store/src/main/java/org/apache/continuum/dao/DirectoryPurgeConfigurationDaoImpl.java (with props)
continuum/branches/continuum-refactoring-evenisse/continuum-store/src/main/java/org/apache/continuum/dao/LocalRepositoryDaoImpl.java (with props)
continuum/branches/continuum-refactoring-evenisse/continuum-store/src/main/java/org/apache/continuum/dao/RepositoryPurgeConfigurationDaoImpl.java (with props)
continuum/branches/continuum-refactoring-evenisse/continuum-webapp/src/main/java/org/apache/continuum/web/action/
- copied from r682986, continuum/trunk/continuum-webapp/src/main/java/org/apache/continuum/web/action/
continuum/branches/continuum-refactoring-evenisse/continuum-webapp/src/main/java/org/apache/continuum/web/action/admin/
- copied from r682986, continuum/trunk/continuum-webapp/src/main/java/org/apache/continuum/web/action/admin/
continuum/branches/continuum-refactoring-evenisse/continuum-webapp/src/main/java/org/apache/continuum/web/action/admin/LocalRepositoryAction.java
- copied unchanged from r682986, continuum/trunk/continuum-webapp/src/main/java/org/apache/continuum/web/action/admin/LocalRepositoryAction.java
continuum/branches/continuum-refactoring-evenisse/continuum-webapp/src/main/java/org/apache/continuum/web/action/admin/PurgeConfigurationAction.java
- copied unchanged from r682986, continuum/trunk/continuum-webapp/src/main/java/org/apache/continuum/web/action/admin/PurgeConfigurationAction.java
continuum/branches/continuum-refactoring-evenisse/continuum-webapp/src/main/resources/org/apache/continuum/
- copied from r682986, continuum/trunk/continuum-webapp/src/main/resources/org/apache/continuum/
continuum/branches/continuum-refactoring-evenisse/continuum-webapp/src/main/resources/org/apache/continuum/web/
- copied from r682986, continuum/trunk/continuum-webapp/src/main/resources/org/apache/continuum/web/
continuum/branches/continuum-refactoring-evenisse/continuum-webapp/src/main/resources/org/apache/continuum/web/action/
- copied from r682986, continuum/trunk/continuum-webapp/src/main/resources/org/apache/continuum/web/action/
continuum/branches/continuum-refactoring-evenisse/continuum-webapp/src/main/resources/org/apache/continuum/web/action/admin/
- copied from r682986, continuum/trunk/continuum-webapp/src/main/resources/org/apache/continuum/web/action/admin/
continuum/branches/continuum-refactoring-evenisse/continuum-webapp/src/main/resources/org/apache/continuum/web/action/admin/LocalRepositoryAction-saveRepository-validation.xml
- copied unchanged from r682986, continuum/trunk/continuum-webapp/src/main/resources/org/apache/continuum/web/action/admin/LocalRepositoryAction-saveRepository-validation.xml
continuum/branches/continuum-refactoring-evenisse/continuum-webapp/src/main/resources/org/apache/continuum/web/action/admin/LocalRepositoryAction.properties
- copied unchanged from r682986, continuum/trunk/continuum-webapp/src/main/resources/org/apache/continuum/web/action/admin/LocalRepositoryAction.properties
continuum/branches/continuum-refactoring-evenisse/continuum-webapp/src/main/resources/org/apache/continuum/web/action/admin/PurgeConfigurationAction-savePurgeConfig-validation.xml
- copied unchanged from r682986, continuum/trunk/continuum-webapp/src/main/resources/org/apache/continuum/web/action/admin/PurgeConfigurationAction-savePurgeConfig-validation.xml
continuum/branches/continuum-refactoring-evenisse/continuum-webapp/src/main/resources/org/apache/continuum/web/action/admin/PurgeConfigurationAction.properties
- copied unchanged from r682986, continuum/trunk/continuum-webapp/src/main/resources/org/apache/continuum/web/action/admin/PurgeConfigurationAction.properties
continuum/branches/continuum-refactoring-evenisse/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/confirmDeleteLocalRepository.jsp
- copied unchanged from r682986, continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/confirmDeleteLocalRepository.jsp
continuum/branches/continuum-refactoring-evenisse/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/editLocalRepository.jsp
- copied unchanged from r682986, continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/editLocalRepository.jsp
continuum/branches/continuum-refactoring-evenisse/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/editPurgeConfiguration.jsp
- copied unchanged from r682986, continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/editPurgeConfiguration.jsp
continuum/branches/continuum-refactoring-evenisse/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/localRepositoriesList.jsp
- copied unchanged from r682986, continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/localRepositoriesList.jsp
continuum/branches/continuum-refactoring-evenisse/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/purgeConfigurationsList.jsp
- copied unchanged from r682986, continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/purgeConfigurationsList.jsp
continuum/branches/continuum-refactoring-evenisse/continuum-webapp/src/main/webapp/images/disabled_purgenow.gif
- copied unchanged from r682986, continuum/trunk/continuum-webapp/src/main/webapp/images/disabled_purgenow.gif
continuum/branches/continuum-refactoring-evenisse/continuum-webapp/src/main/webapp/images/purgenow.gif
- copied unchanged from r682986, continuum/trunk/continuum-webapp/src/main/webapp/images/purgenow.gif
Removed:
continuum/branches/continuum-refactoring-evenisse/ci_continuum.sh
continuum/branches/continuum-refactoring-evenisse/continuum-core/src/main/java/org/apache/maven/continuum/utils/PlexusContainerManager.java
Modified:
continuum/branches/continuum-refactoring-evenisse/continuum-api/pom.xml
continuum/branches/continuum-refactoring-evenisse/continuum-api/src/main/java/org/apache/continuum/dao/BuildDefinitionDao.java
continuum/branches/continuum-refactoring-evenisse/continuum-api/src/main/java/org/apache/continuum/dao/ProjectGroupDao.java
continuum/branches/continuum-refactoring-evenisse/continuum-api/src/main/java/org/apache/maven/continuum/Continuum.java
continuum/branches/continuum-refactoring-evenisse/continuum-api/src/main/java/org/apache/maven/continuum/project/builder/AbstractContinuumProjectBuilder.java
continuum/branches/continuum-refactoring-evenisse/continuum-api/src/main/java/org/apache/maven/continuum/release/ContinuumReleaseManager.java
continuum/branches/continuum-refactoring-evenisse/continuum-core/pom.xml
continuum/branches/continuum-refactoring-evenisse/continuum-core/src/main/java/org/apache/maven/continuum/DefaultContinuum.java
continuum/branches/continuum-refactoring-evenisse/continuum-core/src/main/java/org/apache/maven/continuum/build/settings/DefaultSchedulesActivator.java
continuum/branches/continuum-refactoring-evenisse/continuum-core/src/main/java/org/apache/maven/continuum/core/action/DeployArtifactContinuumAction.java
continuum/branches/continuum-refactoring-evenisse/continuum-core/src/main/java/org/apache/maven/continuum/execution/maven/m1/MavenOneBuildExecutor.java
continuum/branches/continuum-refactoring-evenisse/continuum-core/src/main/java/org/apache/maven/continuum/execution/maven/m2/DefaultMavenBuilderHelper.java
continuum/branches/continuum-refactoring-evenisse/continuum-core/src/main/java/org/apache/maven/continuum/execution/maven/m2/MavenBuilderHelper.java
continuum/branches/continuum-refactoring-evenisse/continuum-core/src/main/java/org/apache/maven/continuum/execution/maven/m2/MavenTwoBuildExecutor.java
continuum/branches/continuum-refactoring-evenisse/continuum-core/src/main/java/org/apache/maven/continuum/initialization/DefaultContinuumInitializer.java
continuum/branches/continuum-refactoring-evenisse/continuum-core/src/main/java/org/apache/maven/continuum/project/builder/maven/MavenTwoContinuumProjectBuilder.java
continuum/branches/continuum-refactoring-evenisse/continuum-core/src/test/java/org/apache/maven/continuum/DefaultContinuumTest.java
continuum/branches/continuum-refactoring-evenisse/continuum-data-management/continuum-legacy/pom.xml
continuum/branches/continuum-refactoring-evenisse/continuum-data-management/data-management-jdo/pom.xml
continuum/branches/continuum-refactoring-evenisse/continuum-data-management/data-management-jdo/src/main/java/org/apache/maven/continuum/management/JdoDataManagementTool.java
continuum/branches/continuum-refactoring-evenisse/continuum-data-management/data-management-jdo/src/test/java/org/apache/maven/continuum/management/DataManagementToolTest.java
continuum/branches/continuum-refactoring-evenisse/continuum-data-management/data-management-jdo/src/test/resources/expected.xml
continuum/branches/continuum-refactoring-evenisse/continuum-data-management/redback-legacy/pom.xml
continuum/branches/continuum-refactoring-evenisse/continuum-docs/pom.xml
continuum/branches/continuum-refactoring-evenisse/continuum-docs/src/site/apt/administrator_guides/appearance.apt
continuum/branches/continuum-refactoring-evenisse/continuum-docs/src/site/apt/administrator_guides/builddefTemplate.apt
continuum/branches/continuum-refactoring-evenisse/continuum-docs/src/site/apt/administrator_guides/builder.apt
continuum/branches/continuum-refactoring-evenisse/continuum-docs/src/site/apt/administrator_guides/configuration.apt
continuum/branches/continuum-refactoring-evenisse/continuum-docs/src/site/apt/administrator_guides/jdk.apt
continuum/branches/continuum-refactoring-evenisse/continuum-docs/src/site/apt/administrator_guides/monitoring.apt
continuum/branches/continuum-refactoring-evenisse/continuum-docs/src/site/apt/administrator_guides/profiles.apt
continuum/branches/continuum-refactoring-evenisse/continuum-docs/src/site/apt/administrator_guides/projectgroup.apt
continuum/branches/continuum-refactoring-evenisse/continuum-docs/src/site/apt/administrator_guides/shutdown.apt
continuum/branches/continuum-refactoring-evenisse/continuum-docs/src/site/apt/developer_guides/building.apt
continuum/branches/continuum-refactoring-evenisse/continuum-docs/src/site/apt/developer_guides/xmlrpc.apt
continuum/branches/continuum-refactoring-evenisse/continuum-docs/src/site/apt/getting-started.apt
continuum/branches/continuum-refactoring-evenisse/continuum-docs/src/site/apt/index.apt
continuum/branches/continuum-refactoring-evenisse/continuum-docs/src/site/apt/installation/geronimo.apt
continuum/branches/continuum-refactoring-evenisse/continuum-docs/src/site/apt/installation/glassfish.apt
continuum/branches/continuum-refactoring-evenisse/continuum-docs/src/site/apt/installation/jboss.apt
continuum/branches/continuum-refactoring-evenisse/continuum-docs/src/site/apt/installation/jetty.apt
continuum/branches/continuum-refactoring-evenisse/continuum-docs/src/site/apt/installation/standalone.apt
continuum/branches/continuum-refactoring-evenisse/continuum-docs/src/site/apt/installation/tomcat.apt
continuum/branches/continuum-refactoring-evenisse/continuum-docs/src/site/apt/user_guides/managing_project/addProject.apt
continuum/branches/continuum-refactoring-evenisse/continuum-docs/src/site/apt/user_guides/managing_project/editProject.apt
continuum/branches/continuum-refactoring-evenisse/continuum-docs/src/site/apt/user_guides/managing_project/removeProject.apt
continuum/branches/continuum-refactoring-evenisse/continuum-docs/src/site/apt/user_guides/notification/index.apt
continuum/branches/continuum-refactoring-evenisse/continuum-docs/src/site/apt/user_guides/notification/mail.apt
continuum/branches/continuum-refactoring-evenisse/continuum-docs/src/site/apt/user_guides/release/perform.apt
continuum/branches/continuum-refactoring-evenisse/continuum-docs/src/site/apt/user_guides/release/prepare.apt
continuum/branches/continuum-refactoring-evenisse/continuum-docs/src/site/apt/user_guides/viewing_queues/index.apt
continuum/branches/continuum-refactoring-evenisse/continuum-docs/src/site/site.xml
continuum/branches/continuum-refactoring-evenisse/continuum-model/pom.xml
continuum/branches/continuum-refactoring-evenisse/continuum-model/src/main/mdo/continuum.xml
continuum/branches/continuum-refactoring-evenisse/continuum-notifiers/continuum-notifier-jabber/pom.xml
continuum/branches/continuum-refactoring-evenisse/continuum-notifiers/continuum-notifier-msn/pom.xml
continuum/branches/continuum-refactoring-evenisse/continuum-notifiers/continuum-notifier-wagon/pom.xml
continuum/branches/continuum-refactoring-evenisse/continuum-notifiers/continuum-notifier-wagon/src/test/java/org/apache/maven/continuum/wagon/WagonContinuumNotifierTest.java
continuum/branches/continuum-refactoring-evenisse/continuum-release/pom.xml
continuum/branches/continuum-refactoring-evenisse/continuum-release/src/main/java/org/apache/maven/continuum/release/DefaultContinuumReleaseManager.java
continuum/branches/continuum-refactoring-evenisse/continuum-release/src/main/java/org/apache/maven/continuum/release/executors/PerformReleaseTaskExecutor.java
continuum/branches/continuum-refactoring-evenisse/continuum-release/src/main/java/org/apache/maven/continuum/release/tasks/PerformReleaseProjectTask.java
continuum/branches/continuum-refactoring-evenisse/continuum-reports/src/test/java/org/apache/maven/continuum/reports/surefire/DefaultReportTestSuiteGeneratorTest.java
continuum/branches/continuum-refactoring-evenisse/continuum-security/src/main/java/org/apache/maven/continuum/security/ContinuumRoleConstants.java
continuum/branches/continuum-refactoring-evenisse/continuum-security/src/main/resources/META-INF/redback/redback.xml
continuum/branches/continuum-refactoring-evenisse/continuum-store/pom.xml
continuum/branches/continuum-refactoring-evenisse/continuum-store/src/main/java/org/apache/continuum/dao/BuildDefinitionDaoImpl.java
continuum/branches/continuum-refactoring-evenisse/continuum-store/src/main/java/org/apache/continuum/dao/DaoUtilsImpl.java
continuum/branches/continuum-refactoring-evenisse/continuum-store/src/main/java/org/apache/continuum/dao/ProjectGroupDaoImpl.java
continuum/branches/continuum-refactoring-evenisse/continuum-store/src/test/java/org/apache/maven/continuum/store/AbstractContinuumStoreTestCase.java
continuum/branches/continuum-refactoring-evenisse/continuum-store/src/test/java/org/apache/maven/continuum/store/ContinuumStoreTest.java
continuum/branches/continuum-refactoring-evenisse/continuum-store/src/test/resources/org/apache/maven/continuum/store/ContinuumStoreTest.xml
continuum/branches/continuum-refactoring-evenisse/continuum-webapp/pom.xml
continuum/branches/continuum-refactoring-evenisse/continuum-webapp/src/main/java/org/apache/continuum/web/startup/ContinuumStartup.java
continuum/branches/continuum-refactoring-evenisse/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/AddProjectGroupAction.java
continuum/branches/continuum-refactoring-evenisse/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/GroupSummaryAction.java
continuum/branches/continuum-refactoring-evenisse/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ProjectGroupAction.java
continuum/branches/continuum-refactoring-evenisse/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ReleasePerformAction.java
continuum/branches/continuum-refactoring-evenisse/continuum-webapp/src/main/mdo/view-models.mdo
continuum/branches/continuum-refactoring-evenisse/continuum-webapp/src/main/resources/META-INF/plexus/application.xml
continuum/branches/continuum-refactoring-evenisse/continuum-webapp/src/main/resources/localization/Continuum.properties
continuum/branches/continuum-refactoring-evenisse/continuum-webapp/src/main/resources/xwork.xml
continuum/branches/continuum-refactoring-evenisse/continuum-webapp/src/main/webapp/WEB-INF/jsp/groupSummary.jsp
continuum/branches/continuum-refactoring-evenisse/continuum-webapp/src/main/webapp/WEB-INF/jsp/navigations/Menu.jsp
continuum/branches/continuum-refactoring-evenisse/continuum-webapp/src/main/webapp/WEB-INF/jsp/projectGroupAdd.jsp
continuum/branches/continuum-refactoring-evenisse/continuum-webapp/src/main/webapp/WEB-INF/jsp/projectGroupEdit.jsp
continuum/branches/continuum-refactoring-evenisse/continuum-webapp/src/main/webapp/WEB-INF/jsp/projectGroupSummary.jsp
continuum/branches/continuum-refactoring-evenisse/continuum-webapp/src/test/java/org/apache/maven/continuum/web/action/ContinuumActionLoggingTest.java
continuum/branches/continuum-refactoring-evenisse/continuum-xmlrpc/continuum-xmlrpc-backup/pom.xml
continuum/branches/continuum-refactoring-evenisse/continuum-xmlrpc/continuum-xmlrpc-server/pom.xml
continuum/branches/continuum-refactoring-evenisse/maven-continuum-plugin/pom.xml
continuum/branches/continuum-refactoring-evenisse/pom.xml
Modified: continuum/branches/continuum-refactoring-evenisse/continuum-api/pom.xml
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-refactoring-evenisse/continuum-api/pom.xml?rev=683689&r1=683688&r2=683689&view=diff
==============================================================================
--- continuum/branches/continuum-refactoring-evenisse/continuum-api/pom.xml (original)
+++ continuum/branches/continuum-refactoring-evenisse/continuum-api/pom.xml Thu Aug 7 12:38:49 2008
@@ -37,6 +37,10 @@
</dependency>
<dependency>
<groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-spring</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-utils</artifactId>
</dependency>
<dependency>
@@ -55,5 +59,15 @@
<groupId>org.apache.maven</groupId>
<artifactId>maven-artifact</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.apache.archiva</groupId>
+ <artifactId>archiva-common</artifactId>
+ <version>${archiva.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.archiva</groupId>
+ <artifactId>archiva-repository-layer</artifactId>
+ <version>${archiva.version}</version>
+ </dependency>
</dependencies>
-</project>
\ No newline at end of file
+</project>
Modified: continuum/branches/continuum-refactoring-evenisse/continuum-api/src/main/java/org/apache/continuum/dao/BuildDefinitionDao.java
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-refactoring-evenisse/continuum-api/src/main/java/org/apache/continuum/dao/BuildDefinitionDao.java?rev=683689&r1=683688&r2=683689&view=diff
==============================================================================
--- continuum/branches/continuum-refactoring-evenisse/continuum-api/src/main/java/org/apache/continuum/dao/BuildDefinitionDao.java (original)
+++ continuum/branches/continuum-refactoring-evenisse/continuum-api/src/main/java/org/apache/continuum/dao/BuildDefinitionDao.java Thu Aug 7 12:38:49 2008
@@ -117,4 +117,6 @@
List<BuildDefinition> getAllTemplates()
throws ContinuumStoreException;
+
+ List<BuildDefinition> getBuildDefinitionsBySchedule( int scheduleId );
}
Added: continuum/branches/continuum-refactoring-evenisse/continuum-api/src/main/java/org/apache/continuum/dao/DirectoryPurgeConfigurationDao.java
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-refactoring-evenisse/continuum-api/src/main/java/org/apache/continuum/dao/DirectoryPurgeConfigurationDao.java?rev=683689&view=auto
==============================================================================
--- continuum/branches/continuum-refactoring-evenisse/continuum-api/src/main/java/org/apache/continuum/dao/DirectoryPurgeConfigurationDao.java (added)
+++ continuum/branches/continuum-refactoring-evenisse/continuum-api/src/main/java/org/apache/continuum/dao/DirectoryPurgeConfigurationDao.java Thu Aug 7 12:38:49 2008
@@ -0,0 +1,52 @@
+package org.apache.continuum.dao;
+
+/*
+ * 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 org.apache.continuum.model.repository.DirectoryPurgeConfiguration;
+import org.apache.maven.continuum.store.ContinuumStoreException;
+
+import java.util.List;
+
+/**
+ * @author <a href="mailto:evenisse@apache.org">Emmanuel Venisse</a>
+ * @version $Id$
+ */
+public interface DirectoryPurgeConfigurationDao
+{
+ List<DirectoryPurgeConfiguration> getAllDirectoryPurgeConfigurations();
+
+ List<DirectoryPurgeConfiguration> getDirectoryPurgeConfigurationsBySchedule( int scheduleId );
+
+ List<DirectoryPurgeConfiguration> getDirectoryPurgeConfigurationsByLocation( String location );
+
+ List<DirectoryPurgeConfiguration> getDirectoryPurgeConfigurationsByType( String type );
+
+ DirectoryPurgeConfiguration getDirectoryPurgeConfiguration( int configurationId )
+ throws ContinuumStoreException;
+
+ DirectoryPurgeConfiguration addDirectoryPurgeConfiguration( DirectoryPurgeConfiguration purgeConfiguration )
+ throws ContinuumStoreException;
+
+ void updateDirectoryPurgeConfiguration( DirectoryPurgeConfiguration purgeConfiguration )
+ throws ContinuumStoreException;
+
+ void removeDirectoryPurgeConfiguration( DirectoryPurgeConfiguration purgeConfiguration )
+ throws ContinuumStoreException;
+}
Propchange: continuum/branches/continuum-refactoring-evenisse/continuum-api/src/main/java/org/apache/continuum/dao/DirectoryPurgeConfigurationDao.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: continuum/branches/continuum-refactoring-evenisse/continuum-api/src/main/java/org/apache/continuum/dao/DirectoryPurgeConfigurationDao.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Added: continuum/branches/continuum-refactoring-evenisse/continuum-api/src/main/java/org/apache/continuum/dao/LocalRepositoryDao.java
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-refactoring-evenisse/continuum-api/src/main/java/org/apache/continuum/dao/LocalRepositoryDao.java?rev=683689&view=auto
==============================================================================
--- continuum/branches/continuum-refactoring-evenisse/continuum-api/src/main/java/org/apache/continuum/dao/LocalRepositoryDao.java (added)
+++ continuum/branches/continuum-refactoring-evenisse/continuum-api/src/main/java/org/apache/continuum/dao/LocalRepositoryDao.java Thu Aug 7 12:38:49 2008
@@ -0,0 +1,54 @@
+package org.apache.continuum.dao;
+
+/*
+ * 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 org.apache.continuum.model.repository.LocalRepository;
+import org.apache.maven.continuum.store.ContinuumStoreException;
+
+import java.util.List;
+
+/**
+ * @author <a href="mailto:evenisse@apache.org">Emmanuel Venisse</a>
+ * @version $Id$
+ */
+public interface LocalRepositoryDao
+{
+ LocalRepository addLocalRepository( LocalRepository repository )
+ throws ContinuumStoreException;
+
+ void updateLocalRepository( LocalRepository repository )
+ throws ContinuumStoreException;
+
+ void removeLocalRepository( LocalRepository repository )
+ throws ContinuumStoreException;
+
+ List<LocalRepository> getAllLocalRepositories();
+
+ List<LocalRepository> getLocalRepositoriesByLayout( String layout );
+
+ LocalRepository getLocalRepository( int repositoryId )
+ throws ContinuumStoreException;
+
+ LocalRepository getLocalRepositoryByName( String name )
+ throws ContinuumStoreException;
+
+ LocalRepository getLocalRepositoryByLocation( String location )
+ throws ContinuumStoreException;
+}
Propchange: continuum/branches/continuum-refactoring-evenisse/continuum-api/src/main/java/org/apache/continuum/dao/LocalRepositoryDao.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: continuum/branches/continuum-refactoring-evenisse/continuum-api/src/main/java/org/apache/continuum/dao/LocalRepositoryDao.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Modified: continuum/branches/continuum-refactoring-evenisse/continuum-api/src/main/java/org/apache/continuum/dao/ProjectGroupDao.java
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-refactoring-evenisse/continuum-api/src/main/java/org/apache/continuum/dao/ProjectGroupDao.java?rev=683689&r1=683688&r2=683689&view=diff
==============================================================================
--- continuum/branches/continuum-refactoring-evenisse/continuum-api/src/main/java/org/apache/continuum/dao/ProjectGroupDao.java (original)
+++ continuum/branches/continuum-refactoring-evenisse/continuum-api/src/main/java/org/apache/continuum/dao/ProjectGroupDao.java Thu Aug 7 12:38:49 2008
@@ -166,4 +166,6 @@
*/
ProjectGroup getProjectGroupWithBuildDetailsByProjectGroupId( int projectGroupId )
throws ContinuumStoreException;
+
+ List<ProjectGroup> getProjectGroupByRepository( int repositoryId );
}
Added: continuum/branches/continuum-refactoring-evenisse/continuum-api/src/main/java/org/apache/continuum/dao/RepositoryPurgeConfigurationDao.java
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-refactoring-evenisse/continuum-api/src/main/java/org/apache/continuum/dao/RepositoryPurgeConfigurationDao.java?rev=683689&view=auto
==============================================================================
--- continuum/branches/continuum-refactoring-evenisse/continuum-api/src/main/java/org/apache/continuum/dao/RepositoryPurgeConfigurationDao.java (added)
+++ continuum/branches/continuum-refactoring-evenisse/continuum-api/src/main/java/org/apache/continuum/dao/RepositoryPurgeConfigurationDao.java Thu Aug 7 12:38:49 2008
@@ -0,0 +1,50 @@
+package org.apache.continuum.dao;
+
+/*
+ * 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 org.apache.continuum.model.repository.RepositoryPurgeConfiguration;
+import org.apache.maven.continuum.store.ContinuumStoreException;
+
+import java.util.List;
+
+/**
+ * @author <a href="mailto:evenisse@apache.org">Emmanuel Venisse</a>
+ * @version $Id$
+ */
+public interface RepositoryPurgeConfigurationDao
+{
+ List<RepositoryPurgeConfiguration> getAllRepositoryPurgeConfigurations();
+
+ List<RepositoryPurgeConfiguration> getRepositoryPurgeConfigurationsBySchedule( int scheduleId );
+
+ List<RepositoryPurgeConfiguration> getRepositoryPurgeConfigurationsByLocalRepository( int repositoryId );
+
+ RepositoryPurgeConfiguration getRepositoryPurgeConfiguration( int configurationId )
+ throws ContinuumStoreException;
+
+ RepositoryPurgeConfiguration addRepositoryPurgeConfiguration( RepositoryPurgeConfiguration purgeConfiguration )
+ throws ContinuumStoreException;
+
+ void updateRepositoryPurgeConfiguration( RepositoryPurgeConfiguration purgeConfiguration )
+ throws ContinuumStoreException;
+
+ void removeRepositoryPurgeConfiguration( RepositoryPurgeConfiguration purgeConfiguration )
+ throws ContinuumStoreException;
+}
Propchange: continuum/branches/continuum-refactoring-evenisse/continuum-api/src/main/java/org/apache/continuum/dao/RepositoryPurgeConfigurationDao.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: continuum/branches/continuum-refactoring-evenisse/continuum-api/src/main/java/org/apache/continuum/dao/RepositoryPurgeConfigurationDao.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Modified: continuum/branches/continuum-refactoring-evenisse/continuum-api/src/main/java/org/apache/maven/continuum/Continuum.java
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-refactoring-evenisse/continuum-api/src/main/java/org/apache/maven/continuum/Continuum.java?rev=683689&r1=683688&r2=683689&view=diff
==============================================================================
--- continuum/branches/continuum-refactoring-evenisse/continuum-api/src/main/java/org/apache/maven/continuum/Continuum.java (original)
+++ continuum/branches/continuum-refactoring-evenisse/continuum-api/src/main/java/org/apache/maven/continuum/Continuum.java Thu Aug 7 12:38:49 2008
@@ -24,6 +24,8 @@
import java.util.List;
import java.util.Map;
+import org.apache.continuum.purge.ContinuumPurgeManager;
+import org.apache.continuum.repository.RepositoryService;
import org.apache.maven.continuum.builddefinition.BuildDefinitionService;
import org.apache.maven.continuum.buildqueue.BuildProjectTask;
import org.apache.maven.continuum.configuration.ConfigurationService;
@@ -96,6 +98,8 @@
public ProjectGroup getProjectGroupByGroupIdWithBuildDetails( String groupId )
throws ContinuumException;
+ public List<ProjectGroup> getAllProjectGroupsWithRepository( int repositoryId );
+
// ----------------------------------------------------------------------
// Project
// ----------------------------------------------------------------------
@@ -632,6 +636,15 @@
BuildDefinitionService getBuildDefinitionService();
+ // ----------------------------------------------------------------------
+ // Continuum Purge
+ // ----------------------------------------------------------------------
+ ContinuumPurgeManager getPurgeManager();
+
+ // ----------------------------------------------------------------------
+ // Repository Service
+ // ----------------------------------------------------------------------
+ RepositoryService getRepositoryService();
public void startup()
throws ContinuumException;
Modified: continuum/branches/continuum-refactoring-evenisse/continuum-api/src/main/java/org/apache/maven/continuum/project/builder/AbstractContinuumProjectBuilder.java
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-refactoring-evenisse/continuum-api/src/main/java/org/apache/maven/continuum/project/builder/AbstractContinuumProjectBuilder.java?rev=683689&r1=683688&r2=683689&view=diff
==============================================================================
--- continuum/branches/continuum-refactoring-evenisse/continuum-api/src/main/java/org/apache/maven/continuum/project/builder/AbstractContinuumProjectBuilder.java (original)
+++ continuum/branches/continuum-refactoring-evenisse/continuum-api/src/main/java/org/apache/maven/continuum/project/builder/AbstractContinuumProjectBuilder.java Thu Aug 7 12:38:49 2008
@@ -96,7 +96,11 @@
File continuumTmpDir = new File( TMP_DIR, "continuum" );
+ // FIXME should deleted after has been reading
File uploadDirectory = new File( continuumTmpDir, baseDirectory );
+
+ uploadDirectory.deleteOnExit();
+
// resolve any '..' as it will cause issues
uploadDirectory = uploadDirectory.getCanonicalFile();
Modified: continuum/branches/continuum-refactoring-evenisse/continuum-api/src/main/java/org/apache/maven/continuum/release/ContinuumReleaseManager.java
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-refactoring-evenisse/continuum-api/src/main/java/org/apache/maven/continuum/release/ContinuumReleaseManager.java?rev=683689&r1=683688&r2=683689&view=diff
==============================================================================
--- continuum/branches/continuum-refactoring-evenisse/continuum-api/src/main/java/org/apache/maven/continuum/release/ContinuumReleaseManager.java (original)
+++ continuum/branches/continuum-refactoring-evenisse/continuum-api/src/main/java/org/apache/maven/continuum/release/ContinuumReleaseManager.java Thu Aug 7 12:38:49 2008
@@ -19,6 +19,7 @@
* under the License.
*/
+import org.apache.continuum.model.repository.LocalRepository;
import org.apache.maven.continuum.model.project.Project;
import java.io.File;
@@ -94,4 +95,8 @@
Map getReleaseResults();
Map getListeners();
+
+ void perform( String releaseId, File buildDirectory, String goals, boolean useReleaseProfile,
+ ContinuumReleaseManagerListener listener, LocalRepository repository )
+ throws ContinuumReleaseException;
}
Modified: continuum/branches/continuum-refactoring-evenisse/continuum-core/pom.xml
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-refactoring-evenisse/continuum-core/pom.xml?rev=683689&r1=683688&r2=683689&view=diff
==============================================================================
--- continuum/branches/continuum-refactoring-evenisse/continuum-core/pom.xml (original)
+++ continuum/branches/continuum-refactoring-evenisse/continuum-core/pom.xml Thu Aug 7 12:38:49 2008
@@ -79,8 +79,18 @@
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-command-line</artifactId>
<version>1.0-alpha-2</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-container-default</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
+ <groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-component-api</artifactId>
+ </dependency>
+ <dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-artifact</artifactId>
</dependency>
@@ -112,6 +122,12 @@
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-action</artifactId>
<version>1.0-alpha-6</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-container-default</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.codehaus.plexus</groupId>
@@ -126,15 +142,6 @@
<artifactId>continuum-store</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.maven.scm</groupId>
- <artifactId>maven-scm-manager-plexus</artifactId>
- </dependency>
- <dependency>
- <groupId>velocity</groupId>
- <artifactId>velocity</artifactId>
- <version>1.4</version>
- </dependency>
- <dependency>
<groupId>org.apache.continuum</groupId>
<artifactId>continuum-release</artifactId>
</dependency>
@@ -150,6 +157,20 @@
<groupId>org.codehaus.plexus.redback</groupId>
<artifactId>redback-rbac-role-manager</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.apache.continuum</groupId>
+ <artifactId>continuum-purge</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.archiva</groupId>
+ <artifactId>archiva-common</artifactId>
+ <version>${archiva.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.archiva</groupId>
+ <artifactId>archiva-repository-layer</artifactId>
+ <version>${archiva.version}</version>
+ </dependency>
<!-- === Testing Dependencies === -->
<dependency>
<groupId>hsqldb</groupId>
@@ -214,7 +235,7 @@
</dependency>
<dependency>
<groupId>org.codehaus.plexus</groupId>
- <artifactId>plexus-log4j-logging</artifactId>
+ <artifactId>plexus-slf4j-logging</artifactId>
<scope>test</scope>
</dependency>
<dependency>
@@ -231,7 +252,17 @@
<groupId>commons-collections</groupId>
<artifactId>commons-collections</artifactId>
<scope>test</scope>
- </dependency>
+ </dependency>
+ <dependency>
+ <groupId>jmock</groupId>
+ <artifactId>jmock</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.jmock</groupId>
+ <artifactId>jmock-junit3</artifactId>
+ <scope>test</scope>
+ </dependency>
</dependencies>
<build>
<plugins>
Copied: continuum/branches/continuum-refactoring-evenisse/continuum-core/src/main/java/org/apache/continuum/purge/DefaultContinuumPurgeManager.java (from r682986, continuum/trunk/continuum-core/src/main/java/org/apache/continuum/purge/DefaultContinuumPurgeManager.java)
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-refactoring-evenisse/continuum-core/src/main/java/org/apache/continuum/purge/DefaultContinuumPurgeManager.java?p2=continuum/branches/continuum-refactoring-evenisse/continuum-core/src/main/java/org/apache/continuum/purge/DefaultContinuumPurgeManager.java&p1=continuum/trunk/continuum-core/src/main/java/org/apache/continuum/purge/DefaultContinuumPurgeManager.java&r1=682986&r2=683689&rev=683689&view=diff
==============================================================================
--- continuum/trunk/continuum-core/src/main/java/org/apache/continuum/purge/DefaultContinuumPurgeManager.java (original)
+++ continuum/branches/continuum-refactoring-evenisse/continuum-core/src/main/java/org/apache/continuum/purge/DefaultContinuumPurgeManager.java Thu Aug 7 12:38:49 2008
@@ -19,22 +19,16 @@
* under the License.
*/
-import java.util.ArrayList;
-import java.util.List;
-
import org.apache.commons.lang.ArrayUtils;
+import org.apache.continuum.dao.ProjectDao;
import org.apache.continuum.model.repository.DirectoryPurgeConfiguration;
import org.apache.continuum.model.repository.LocalRepository;
import org.apache.continuum.model.repository.RepositoryPurgeConfiguration;
-import org.apache.continuum.purge.ContinuumPurgeManager;
-import org.apache.continuum.purge.ContinuumPurgeManagerException;
-import org.apache.continuum.purge.PurgeConfigurationService;
import org.apache.continuum.purge.task.PurgeTask;
import org.apache.maven.continuum.buildqueue.BuildProjectTask;
import org.apache.maven.continuum.model.project.Project;
import org.apache.maven.continuum.model.project.Schedule;
import org.apache.maven.continuum.release.tasks.PerformReleaseProjectTask;
-import org.apache.maven.continuum.store.ContinuumStore;
import org.apache.maven.continuum.store.ContinuumStoreException;
import org.codehaus.plexus.PlexusConstants;
import org.codehaus.plexus.PlexusContainer;
@@ -47,40 +41,43 @@
import org.codehaus.plexus.taskqueue.TaskQueueException;
import org.codehaus.plexus.taskqueue.execution.TaskQueueExecutor;
+import java.util.ArrayList;
+import java.util.List;
+
/**
* DefaultContinuumPurgeManager
- *
+ *
* @author Maria Catherine Tan
* @version $Id$
- * @since 25 jul 07
* @plexus.component role="org.apache.continuum.purge.ContinuumPurgeManager" role-hint="default"
+ * @since 25 jul 07
*/
public class DefaultContinuumPurgeManager
implements ContinuumPurgeManager, Contextualizable
{
/**
- * @plexus.requirement role-hint="jdo"
+ * @plexus.requirement
*/
- private ContinuumStore store;
-
+ private ProjectDao projectDao;
+
/**
* @plexus.requirement role-hint="purge"
*/
private TaskQueue purgeQueue;
-
+
/**
* @plexus.requirement
*/
private PurgeConfigurationService purgeConfigurationService;
-
+
private PlexusContainer container;
-
+
public void purge( Schedule schedule )
throws ContinuumPurgeManagerException
{
List<RepositoryPurgeConfiguration> repoPurgeList = null;
List<DirectoryPurgeConfiguration> dirPurgeList = null;
-
+
repoPurgeList = purgeConfigurationService.getRepositoryPurgeConfigurationsBySchedule( schedule.getId() );
dirPurgeList = purgeConfigurationService.getDirectoryPurgeConfigurationsBySchedule( schedule.getId() );
@@ -91,7 +88,7 @@
purgeRepository( repoPurge );
}
}
-
+
if ( dirPurgeList != null && dirPurgeList.size() > 0 )
{
for ( DirectoryPurgeConfiguration dirPurge : dirPurgeList )
@@ -100,13 +97,13 @@
}
}
}
-
+
public boolean isRepositoryInPurgeQueue( int repositoryId )
throws ContinuumPurgeManagerException
{
- List<RepositoryPurgeConfiguration> repoPurgeConfigs =
+ List<RepositoryPurgeConfiguration> repoPurgeConfigs =
purgeConfigurationService.getRepositoryPurgeConfigurationsByRepository( repositoryId );
-
+
for ( RepositoryPurgeConfiguration repoPurge : repoPurgeConfigs )
{
if ( isInPurgeQueue( repoPurge.getId() ) )
@@ -116,21 +113,21 @@
}
return false;
}
-
+
public boolean isRepositoryInUse( int repositoryId )
throws ContinuumPurgeManagerException
{
try
{
Task task = getCurrentTask( "build-project" );
-
+
if ( task != null && task instanceof BuildProjectTask )
{
- int projectId = ((BuildProjectTask) task).getProjectId();
-
- Project project = store.getProject( projectId );
+ int projectId = ( (BuildProjectTask) task ).getProjectId();
+
+ Project project = projectDao.getProject( projectId );
LocalRepository repository = project.getProjectGroup().getLocalRepository();
-
+
if ( repository != null && repository.getId() == repositoryId )
{
return true;
@@ -147,15 +144,15 @@
public void removeRepositoryFromPurgeQueue( int repositoryId )
throws ContinuumPurgeManagerException
{
- List<RepositoryPurgeConfiguration> repoPurgeConfigs =
+ List<RepositoryPurgeConfiguration> repoPurgeConfigs =
purgeConfigurationService.getRepositoryPurgeConfigurationsByRepository( repositoryId );
-
+
for ( RepositoryPurgeConfiguration repoPurge : repoPurgeConfigs )
{
removeFromPurgeQueue( repoPurge.getId() );
}
}
-
+
public boolean removeFromPurgeQueue( int[] purgeConfigIds )
throws ContinuumPurgeManagerException
{
@@ -163,16 +160,16 @@
{
return false;
}
-
+
if ( purgeConfigIds.length < 1 )
{
return false;
}
-
+
List<PurgeTask> queue = getAllPurgeConfigurationsInPurgeQueue();
-
+
List<PurgeTask> tasks = new ArrayList<PurgeTask>();
-
+
for ( PurgeTask task : queue )
{
if ( task != null )
@@ -183,20 +180,20 @@
}
}
}
-
+
if ( !tasks.isEmpty() )
{
return purgeQueue.removeAll( tasks );
}
-
+
return false;
}
-
+
public boolean removeFromPurgeQueue( int purgeConfigId )
throws ContinuumPurgeManagerException
{
List<PurgeTask> queue = getAllPurgeConfigurationsInPurgeQueue();
-
+
for ( PurgeTask task : queue )
{
if ( task != null && task.getPurgeConfigurationId() == purgeConfigId )
@@ -213,10 +210,9 @@
try
{
LocalRepository repository = repoPurge.getRepository();
-
+
// do not purge if repository is in use and if repository is already in purge queue
- if ( !isRepositoryInUse( repository.getId() ) &&
- !isInPurgeQueue( repoPurge.getId() ) )
+ if ( !isRepositoryInUse( repository.getId() ) && !isInPurgeQueue( repoPurge.getId() ) )
{
purgeQueue.put( new PurgeTask( repoPurge.getId() ) );
}
@@ -226,7 +222,7 @@
throw new ContinuumPurgeManagerException( "Error while enqueuing repository", e );
}
}
-
+
public void purgeDirectory( DirectoryPurgeConfiguration dirPurge )
throws ContinuumPurgeManagerException
{
@@ -245,17 +241,17 @@
// do not purge if build in progress
if ( !buildInProgress() && !isInPurgeQueue( dirPurge.getId() ) )
{
- purgeQueue.put( new PurgeTask( dirPurge.getId() ) );
+ purgeQueue.put( new PurgeTask( dirPurge.getId() ) );
}
}
-
+
}
catch ( TaskQueueException e )
{
throw new ContinuumPurgeManagerException( "Error while enqueuing repository", e );
}
}
-
+
public void contextualize( Context context )
throws ContextException
{
@@ -266,17 +262,17 @@
throws ContinuumPurgeManagerException
{
List<PurgeTask> queue = getAllPurgeConfigurationsInPurgeQueue();
-
+
for ( PurgeTask task : queue )
{
- if ( task != null && task.getPurgeConfigurationId() == purgeConfigId)
+ if ( task != null && task.getPurgeConfigurationId() == purgeConfigId )
{
return true;
}
}
return false;
}
-
+
private List<PurgeTask> getAllPurgeConfigurationsInPurgeQueue()
throws ContinuumPurgeManagerException
{
@@ -289,7 +285,7 @@
throw new ContinuumPurgeManagerException( "Error while getting the purge configs in purge queue", e );
}
}
-
+
private Task getCurrentTask( String task )
throws ContinuumPurgeManagerException
{
@@ -303,30 +299,30 @@
throw new ContinuumPurgeManagerException( "Unable to lookup current task", e );
}
}
-
- private boolean buildInProgress()
+
+ private boolean buildInProgress()
throws ContinuumPurgeManagerException
{
Task task = getCurrentTask( "build-project" );
-
+
if ( task != null && task instanceof BuildProjectTask )
{
return true;
}
-
+
return false;
}
-
+
private boolean releaseInProgress()
throws ContinuumPurgeManagerException
{
Task task = getCurrentTask( "perform-release" );
-
+
if ( task != null && task instanceof PerformReleaseProjectTask )
{
return true;
}
-
+
return false;
}
}
\ No newline at end of file