You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@continuum.apache.org by jm...@apache.org on 2009/05/21 03:34:56 UTC
svn commit: r776919 - in /continuum/trunk:
continuum-api/src/main/java/org/apache/continuum/dao/
continuum-api/src/main/java/org/apache/continuum/purge/
continuum-core/src/main/java/org/apache/continuum/purge/
continuum-core/src/main/java/org/apache/ma...
Author: jmorales
Date: Thu May 21 01:34:56 2009
New Revision: 776919
URL: http://svn.apache.org/viewvc?rev=776919&view=rev
Log:
[CONTINUUM-2235] Only schedule enabled purgeConfiguration
merged r776906:776907 from 1.3.x branch
Modified:
continuum/trunk/continuum-api/src/main/java/org/apache/continuum/dao/DirectoryPurgeConfigurationDao.java
continuum/trunk/continuum-api/src/main/java/org/apache/continuum/dao/RepositoryPurgeConfigurationDao.java
continuum/trunk/continuum-api/src/main/java/org/apache/continuum/purge/PurgeConfigurationService.java
continuum/trunk/continuum-core/src/main/java/org/apache/continuum/purge/DefaultContinuumPurgeManager.java
continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/build/settings/DefaultSchedulesActivator.java
continuum/trunk/continuum-purge/src/main/java/org/apache/continuum/purge/DefaultPurgeConfigurationService.java
continuum/trunk/continuum-store/src/main/java/org/apache/continuum/dao/DirectoryPurgeConfigurationDaoImpl.java
continuum/trunk/continuum-store/src/main/java/org/apache/continuum/dao/RepositoryPurgeConfigurationDaoImpl.java
Modified: continuum/trunk/continuum-api/src/main/java/org/apache/continuum/dao/DirectoryPurgeConfigurationDao.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-api/src/main/java/org/apache/continuum/dao/DirectoryPurgeConfigurationDao.java?rev=776919&r1=776918&r2=776919&view=diff
==============================================================================
--- continuum/trunk/continuum-api/src/main/java/org/apache/continuum/dao/DirectoryPurgeConfigurationDao.java (original)
+++ continuum/trunk/continuum-api/src/main/java/org/apache/continuum/dao/DirectoryPurgeConfigurationDao.java Thu May 21 01:34:56 2009
@@ -34,6 +34,8 @@
List<DirectoryPurgeConfiguration> getDirectoryPurgeConfigurationsBySchedule( int scheduleId );
+ List<DirectoryPurgeConfiguration> getEnableDirectoryPurgeConfigurationsBySchedule( int scheduleId );
+
List<DirectoryPurgeConfiguration> getDirectoryPurgeConfigurationsByLocation( String location );
List<DirectoryPurgeConfiguration> getDirectoryPurgeConfigurationsByType( String type );
Modified: continuum/trunk/continuum-api/src/main/java/org/apache/continuum/dao/RepositoryPurgeConfigurationDao.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-api/src/main/java/org/apache/continuum/dao/RepositoryPurgeConfigurationDao.java?rev=776919&r1=776918&r2=776919&view=diff
==============================================================================
--- continuum/trunk/continuum-api/src/main/java/org/apache/continuum/dao/RepositoryPurgeConfigurationDao.java (original)
+++ continuum/trunk/continuum-api/src/main/java/org/apache/continuum/dao/RepositoryPurgeConfigurationDao.java Thu May 21 01:34:56 2009
@@ -33,6 +33,8 @@
List<RepositoryPurgeConfiguration> getAllRepositoryPurgeConfigurations();
List<RepositoryPurgeConfiguration> getRepositoryPurgeConfigurationsBySchedule( int scheduleId );
+
+ List<RepositoryPurgeConfiguration> getEnableRepositoryPurgeConfigurationsBySchedule( int scheduleId );
List<RepositoryPurgeConfiguration> getRepositoryPurgeConfigurationsByLocalRepository( int repositoryId );
Modified: continuum/trunk/continuum-api/src/main/java/org/apache/continuum/purge/PurgeConfigurationService.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-api/src/main/java/org/apache/continuum/purge/PurgeConfigurationService.java?rev=776919&r1=776918&r2=776919&view=diff
==============================================================================
--- continuum/trunk/continuum-api/src/main/java/org/apache/continuum/purge/PurgeConfigurationService.java (original)
+++ continuum/trunk/continuum-api/src/main/java/org/apache/continuum/purge/PurgeConfigurationService.java Thu May 21 01:34:56 2009
@@ -60,6 +60,8 @@
List<RepositoryPurgeConfiguration> getRepositoryPurgeConfigurationsBySchedule( int scheduleId );
+ List<RepositoryPurgeConfiguration> getEnableRepositoryPurgeConfigurationsBySchedule( int scheduleId );
+
List<RepositoryPurgeConfiguration> getRepositoryPurgeConfigurationsByRepository( int repositoryId );
List<RepositoryPurgeConfiguration> getAllRepositoryPurgeConfigurations();
@@ -80,6 +82,8 @@
List<DirectoryPurgeConfiguration> getDirectoryPurgeConfigurationsBySchedule( int scheduleId );
+ List<DirectoryPurgeConfiguration> getEnableDirectoryPurgeConfigurationsBySchedule( int scheduleId );
+
List<DirectoryPurgeConfiguration> getDirectoryPurgeConfigurationsByLocation( String location );
List<DirectoryPurgeConfiguration> getAllDirectoryPurgeConfigurations();
Modified: continuum/trunk/continuum-core/src/main/java/org/apache/continuum/purge/DefaultContinuumPurgeManager.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-core/src/main/java/org/apache/continuum/purge/DefaultContinuumPurgeManager.java?rev=776919&r1=776918&r2=776919&view=diff
==============================================================================
--- continuum/trunk/continuum-core/src/main/java/org/apache/continuum/purge/DefaultContinuumPurgeManager.java (original)
+++ continuum/trunk/continuum-core/src/main/java/org/apache/continuum/purge/DefaultContinuumPurgeManager.java Thu May 21 01:34:56 2009
@@ -69,8 +69,8 @@
List<RepositoryPurgeConfiguration> repoPurgeList = null;
List<DirectoryPurgeConfiguration> dirPurgeList = null;
- repoPurgeList = purgeConfigurationService.getRepositoryPurgeConfigurationsBySchedule( schedule.getId() );
- dirPurgeList = purgeConfigurationService.getDirectoryPurgeConfigurationsBySchedule( schedule.getId() );
+ repoPurgeList = purgeConfigurationService.getEnableRepositoryPurgeConfigurationsBySchedule( schedule.getId() );
+ dirPurgeList = purgeConfigurationService.getEnableDirectoryPurgeConfigurationsBySchedule( schedule.getId() );
if ( repoPurgeList != null && repoPurgeList.size() > 0 )
{
Modified: continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/build/settings/DefaultSchedulesActivator.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/build/settings/DefaultSchedulesActivator.java?rev=776919&r1=776918&r2=776919&view=diff
==============================================================================
--- continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/build/settings/DefaultSchedulesActivator.java (original)
+++ continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/build/settings/DefaultSchedulesActivator.java Thu May 21 01:34:56 2009
@@ -249,9 +249,9 @@
private boolean isScheduleFromPurgeJob( Schedule schedule )
{
List<RepositoryPurgeConfiguration> repoPurgeConfigs =
- repositoryPurgeConfigurationDao.getRepositoryPurgeConfigurationsBySchedule( schedule.getId() );
+ repositoryPurgeConfigurationDao.getEnableRepositoryPurgeConfigurationsBySchedule( schedule.getId() );
List<DirectoryPurgeConfiguration> dirPurgeConfigs =
- directoryPurgeConfigurationDao.getDirectoryPurgeConfigurationsBySchedule( schedule.getId() );
+ directoryPurgeConfigurationDao.getEnableDirectoryPurgeConfigurationsBySchedule( schedule.getId() );
return repoPurgeConfigs.size() > 0 || dirPurgeConfigs.size() > 0;
Modified: continuum/trunk/continuum-purge/src/main/java/org/apache/continuum/purge/DefaultPurgeConfigurationService.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-purge/src/main/java/org/apache/continuum/purge/DefaultPurgeConfigurationService.java?rev=776919&r1=776918&r2=776919&view=diff
==============================================================================
--- continuum/trunk/continuum-purge/src/main/java/org/apache/continuum/purge/DefaultPurgeConfigurationService.java (original)
+++ continuum/trunk/continuum-purge/src/main/java/org/apache/continuum/purge/DefaultPurgeConfigurationService.java Thu May 21 01:34:56 2009
@@ -209,6 +209,11 @@
{
return directoryPurgeConfigurationDao.getDirectoryPurgeConfigurationsBySchedule( scheduleId );
}
+
+ public List<DirectoryPurgeConfiguration> getEnableDirectoryPurgeConfigurationsBySchedule( int scheduleId )
+ {
+ return directoryPurgeConfigurationDao.getEnableDirectoryPurgeConfigurationsBySchedule( scheduleId );
+ }
public List<RepositoryPurgeConfiguration> getRepositoryPurgeConfigurationsByRepository( int repositoryId )
{
@@ -219,6 +224,11 @@
{
return repositoryPurgeConfigurationDao.getRepositoryPurgeConfigurationsBySchedule( scheduleId );
}
+
+ public List<RepositoryPurgeConfiguration> getEnableRepositoryPurgeConfigurationsBySchedule( int scheduleId )
+ {
+ return repositoryPurgeConfigurationDao.getEnableRepositoryPurgeConfigurationsBySchedule( scheduleId );
+ }
public void removeDirectoryPurgeConfiguration( DirectoryPurgeConfiguration purgeConfig )
throws PurgeConfigurationServiceException
Modified: continuum/trunk/continuum-store/src/main/java/org/apache/continuum/dao/DirectoryPurgeConfigurationDaoImpl.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-store/src/main/java/org/apache/continuum/dao/DirectoryPurgeConfigurationDaoImpl.java?rev=776919&r1=776918&r2=776919&view=diff
==============================================================================
--- continuum/trunk/continuum-store/src/main/java/org/apache/continuum/dao/DirectoryPurgeConfigurationDaoImpl.java (original)
+++ continuum/trunk/continuum-store/src/main/java/org/apache/continuum/dao/DirectoryPurgeConfigurationDaoImpl.java Thu May 21 01:34:56 2009
@@ -74,6 +74,36 @@
rollback( tx );
}
}
+
+ public List<DirectoryPurgeConfiguration> getEnableDirectoryPurgeConfigurationsBySchedule( int scheduleId )
+ {
+ PersistenceManager pm = getPersistenceManager();
+
+ Transaction tx = pm.currentTransaction();
+
+ try
+ {
+ tx.begin();
+
+ Extent extent = pm.getExtent( DirectoryPurgeConfiguration.class, true );
+
+ Query query = pm.newQuery( extent );
+
+ query.declareParameters( "int scheduleId" );
+
+ query.setFilter( "this.schedule.id == scheduleId && this.enabled == true" );
+
+ List result = (List) query.execute( scheduleId );
+
+ return result == null ? Collections.EMPTY_LIST : (List) pm.detachCopyAll( result );
+ }
+ finally
+ {
+ tx.commit();
+
+ rollback( tx );
+ }
+ }
public List<DirectoryPurgeConfiguration> getDirectoryPurgeConfigurationsByLocation( String location )
{
Modified: continuum/trunk/continuum-store/src/main/java/org/apache/continuum/dao/RepositoryPurgeConfigurationDaoImpl.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-store/src/main/java/org/apache/continuum/dao/RepositoryPurgeConfigurationDaoImpl.java?rev=776919&r1=776918&r2=776919&view=diff
==============================================================================
--- continuum/trunk/continuum-store/src/main/java/org/apache/continuum/dao/RepositoryPurgeConfigurationDaoImpl.java (original)
+++ continuum/trunk/continuum-store/src/main/java/org/apache/continuum/dao/RepositoryPurgeConfigurationDaoImpl.java Thu May 21 01:34:56 2009
@@ -75,6 +75,36 @@
rollback( tx );
}
}
+
+ public List<RepositoryPurgeConfiguration> getEnableRepositoryPurgeConfigurationsBySchedule( int scheduleId )
+ {
+ PersistenceManager pm = getPersistenceManager();
+
+ Transaction tx = pm.currentTransaction();
+
+ try
+ {
+ tx.begin();
+
+ Extent extent = pm.getExtent( RepositoryPurgeConfiguration.class, true );
+
+ Query query = pm.newQuery( extent );
+
+ query.declareParameters( "int scheduleId" );
+
+ query.setFilter( "this.schedule.id == scheduleId && this.enabled == true" );
+
+ List result = (List) query.execute( scheduleId );
+
+ return result == null ? Collections.EMPTY_LIST : (List) pm.detachCopyAll( result );
+ }
+ finally
+ {
+ tx.commit();
+
+ rollback( tx );
+ }
+ }
public List<RepositoryPurgeConfiguration> getRepositoryPurgeConfigurationsByLocalRepository( int repositoryId )
{