Return-Path: X-Original-To: apmail-archiva-commits-archive@www.apache.org Delivered-To: apmail-archiva-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 2FD108893 for ; Tue, 13 Sep 2011 12:02:50 +0000 (UTC) Received: (qmail 83150 invoked by uid 500); 13 Sep 2011 12:02:49 -0000 Delivered-To: apmail-archiva-commits-archive@archiva.apache.org Received: (qmail 83061 invoked by uid 500); 13 Sep 2011 12:02:43 -0000 Mailing-List: contact commits-help@archiva.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@archiva.apache.org Delivered-To: mailing list commits@archiva.apache.org Received: (qmail 83040 invoked by uid 99); 13 Sep 2011 12:02:40 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 13 Sep 2011 12:02:40 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 13 Sep 2011 12:02:39 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id E883D2388994 for ; Tue, 13 Sep 2011 12:02:18 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1170130 - /archiva/trunk/archiva-modules/archiva-base/archiva-repository-admin/src/main/java/org/apache/archiva/admin/repository/managed/DefaultManagedRepositoryAdmin.java Date: Tue, 13 Sep 2011 12:02:18 -0000 To: commits@archiva.apache.org From: olamy@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20110913120218.E883D2388994@eris.apache.org> Author: olamy Date: Tue Sep 13 12:02:18 2011 New Revision: 1170130 URL: http://svn.apache.org/viewvc?rev=1170130&view=rev Log: during ManagedRepository update save only once as it cause some issues on RegistryListener (repo not found at the first save after removing the updated repo) Modified: archiva/trunk/archiva-modules/archiva-base/archiva-repository-admin/src/main/java/org/apache/archiva/admin/repository/managed/DefaultManagedRepositoryAdmin.java Modified: archiva/trunk/archiva-modules/archiva-base/archiva-repository-admin/src/main/java/org/apache/archiva/admin/repository/managed/DefaultManagedRepositoryAdmin.java URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-base/archiva-repository-admin/src/main/java/org/apache/archiva/admin/repository/managed/DefaultManagedRepositoryAdmin.java?rev=1170130&r1=1170129&r2=1170130&view=diff ============================================================================== --- archiva/trunk/archiva-modules/archiva-base/archiva-repository-admin/src/main/java/org/apache/archiva/admin/repository/managed/DefaultManagedRepositoryAdmin.java (original) +++ archiva/trunk/archiva-modules/archiva-base/archiva-repository-admin/src/main/java/org/apache/archiva/admin/repository/managed/DefaultManagedRepositoryAdmin.java Tue Sep 13 12:02:18 2011 @@ -152,7 +152,8 @@ public class DefaultManagedRepositoryAdm managedRepository.isReleases(), managedRepository.isSnapshots(), needStageRepo, managedRepository.getCronExpression(), managedRepository.getIndexDirectory(), managedRepository.getDaysOlder(), managedRepository.getRetentionCount(), - managedRepository.isDeleteReleasedSnapshots(), auditInformation ) != null; + managedRepository.isDeleteReleasedSnapshots(), auditInformation, + getArchivaConfiguration().getConfiguration() ) != null; } @@ -162,12 +163,11 @@ public class DefaultManagedRepositoryAdm boolean stageRepoNeeded, String cronExpression, String indexDir, int daysOlder, int retentionCount, boolean deteleReleasedSnapshots, - AuditInformation auditInformation ) + AuditInformation auditInformation, + Configuration config ) throws RepositoryAdminException { - Configuration config = getArchivaConfiguration().getConfiguration(); - // FIXME : olamy can be empty to avoid scheduled scan ? if ( StringUtils.isNotBlank( cronExpression ) ) { @@ -349,7 +349,8 @@ public class DefaultManagedRepositoryAdm for ( String repoGroup : repoGroups ) { // copy to prevent UnsupportedOperationException - RepositoryGroupConfiguration repositoryGroupConfiguration = config.findRepositoryGroupById( repoGroup ); + RepositoryGroupConfiguration repositoryGroupConfiguration = + config.findRepositoryGroupById( repoGroup ); List repos = new ArrayList( repositoryGroupConfiguration.getRepositories() ); config.removeRepositoryGroup( repositoryGroupConfiguration ); repos.remove( repository.getId() ); @@ -405,18 +406,14 @@ public class DefaultManagedRepositoryAdm configuration.removeManagedRepository( stagingRepository ); } - if ( toremove != null && stagingRepository != null ) - { - saveConfiguration( configuration ); - } - ManagedRepositoryConfiguration managedRepositoryConfiguration = addManagedRepository( managedRepository.getId(), managedRepository.getLayout(), managedRepository.getName(), managedRepository.getLocation(), managedRepository.isBlockRedeployments(), managedRepository.isReleases(), managedRepository.isSnapshots(), needStageRepo, managedRepository.getCronExpression(), managedRepository.getIndexDirectory(), managedRepository.getDaysOlder(), managedRepository.getRetentionCount(), - managedRepository.isDeleteReleasedSnapshots(), auditInformation ); + managedRepository.isDeleteReleasedSnapshots(), auditInformation, + getArchivaConfiguration().getConfiguration() ); // Save the repository configuration. RepositorySession repositorySession = getRepositorySessionFactory().createSession();