Author: oching
Date: Sun Aug 5 22:45:38 2007
New Revision: 563030
URL: http://svn.apache.org/viewvc?view=rev&rev=563030
Log:
[MRM-275]
- Added days older, retention count and delete released snapshots fields in
repository page.
- Updated RepositoryPurgeConsumer
Modified:
maven/archiva/trunk/archiva-base/archiva-configuration/src/main/mdo/configuration.mdo
maven/archiva/trunk/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/maven/archiva/consumers/core/repository/RepositoryPurgeConsumer.java
maven/archiva/trunk/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/repositories/AdminRepositoryConfiguration.java
maven/archiva/trunk/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/include/repositoryForm.jspf
maven/archiva/trunk/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/repositories.jsp
Modified:
maven/archiva/trunk/archiva-base/archiva-configuration/src/main/mdo/configuration.mdo
URL:
http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-base/archiva-configuration/src/main/mdo/configuration.mdo?view=diff&rev=563030&r1=563029&r2=563030
==============================================================================
---
maven/archiva/trunk/archiva-base/archiva-configuration/src/main/mdo/configuration.mdo
(original)
+++
maven/archiva/trunk/archiva-base/archiva-configuration/src/main/mdo/configuration.mdo
Sun Aug 5 22:45:38 2007
@@ -286,6 +286,15 @@
</description>
<defaultValue>100</defaultValue>
</field>
+ <field>
+ <name>deleteReleasedSnapshots</name>
+ <version>1.0.0+</version>
+ <type>boolean</type>
+ <description>
+ True if the released snapshots are to be removed from the repo
during repository purge.
+ </description>
+ <defaultValue>false</defaultValue>
+ </field>
</fields>
<codeSegments>
<codeSegment>
@@ -323,7 +332,8 @@
}
return this.url.startsWith( "file" );
- }
+ }
+
]]></code>
</codeSegment>
</codeSegments>
Modified:
maven/archiva/trunk/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/maven/archiva/consumers/core/repository/RepositoryPurgeConsumer.java
URL:
http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/maven/archiva/consumers/core/repository/RepositoryPurgeConsumer.java?view=diff&rev=563030&r1=563029&r2=563030
==============================================================================
---
maven/archiva/trunk/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/maven/archiva/consumers/core/repository/RepositoryPurgeConsumer.java
(original)
+++
maven/archiva/trunk/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/maven/archiva/consumers/core/repository/RepositoryPurgeConsumer.java
Sun Aug 5 22:45:38 2007
@@ -81,7 +81,7 @@
/**
* @plexus.requirement role-hint="jdo"
*/
- private ArchivaDAO dao;
+ private ArchivaDAO dao;
/**
* @plexus.requirement
@@ -176,7 +176,11 @@
{
try
{
- cleanUp.process( path, configuration.getConfiguration() );
+ RepositoryConfiguration repoConfig =
configuration.getConfiguration().findRepositoryById( repository.getId() );
+ if( repoConfig.isDeleteReleasedSnapshots() )
+ {
+ cleanUp.process( path, configuration.getConfiguration() );
+ }
repoPurge.process( path, configuration.getConfiguration() );
}
Modified:
maven/archiva/trunk/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/repositories/AdminRepositoryConfiguration.java
URL:
http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/repositories/AdminRepositoryConfiguration.java?view=diff&rev=563030&r1=563029&r2=563030
==============================================================================
---
maven/archiva/trunk/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/repositories/AdminRepositoryConfiguration.java
(original)
+++
maven/archiva/trunk/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/repositories/AdminRepositoryConfiguration.java
Sun Aug 5 22:45:38 2007
@@ -59,6 +59,10 @@
this.setIndexDir( repoconfig.getIndexDir() );
this.setRefreshCronExpression( repoconfig.getRefreshCronExpression() );
+ this.setDaysOlder( repoconfig.getDaysOlder() );
+ this.setRetentionCount( repoconfig.getRetentionCount() );
+ this.setDeleteReleasedSnapshots(
repoconfig.isDeleteReleasedSnapshots() );
+
if ( repoconfig.isManaged() )
{
RepositoryURL url = new RepositoryURL( repoconfig.getUrl() );
Modified:
maven/archiva/trunk/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/include/repositoryForm.jspf
URL:
http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/include/repositoryForm.jspf?view=diff&rev=563030&r1=563029&r2=563030
==============================================================================
---
maven/archiva/trunk/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/include/repositoryForm.jspf
(original)
+++
maven/archiva/trunk/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/include/repositoryForm.jspf
Sun Aug 5 22:45:38 2007
@@ -24,7 +24,12 @@
<ww:select list="[EMAIL PROTECTED]@{'default' : 'Maven 2.x Repository',
'legacy' : 'Maven 1.x Repository'}"
name="repository.layout" label="Type"/>
<ww:textfield name="repository.refreshCronExpression" label="Cron" size="40"
required="true" />
+<ww:textfield name="repository.daysOlder" label="Repository Purge By Days
Older Than" size="5"/>
+<ww:textfield name="repository.retentionCount" label="Repository Purge By
Retention Count" size="5"/>
<ww:checkbox name="repository.releases" value="repository.releases"
label="Releases Included"/>
<ww:checkbox name="repository.snapshots" value="repository.snapshots"
label="Snapshots Included"/>
<ww:checkbox name="repository.indexed" value="repository.indexed"
label="Scannable"/>
+<ww:checkbox name="repository.deleteReleasedSnapshots"
value="repository.deleteReleasedSnapshots"
+ label="Delete Released Snapshots"/>
+
Modified:
maven/archiva/trunk/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/repositories.jsp
URL:
http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/repositories.jsp?view=diff&rev=563030&r1=563029&r2=563030
==============================================================================
---
maven/archiva/trunk/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/repositories.jsp
(original)
+++
maven/archiva/trunk/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/repositories.jsp
Sun Aug 5 22:45:38 2007
@@ -130,6 +130,14 @@
</c:otherwise>
</c:choose>
</td>
+ </tr>
+ <tr>
+ <th>Repository Purge By Days Older Than</th>
+ <td>${repository.daysOlder}</td>
+ </tr>
+ <tr>
+ <th>Repository Purge By Retention Count</th>
+ <td>${repository.retentionCount}</td>
</tr>
<tr>
<th>Releases Included</th>
@@ -142,6 +150,10 @@
<tr>
<th>Scanned</th>
<td class="${repository.indexed ? 'donemark' : 'errormark'}
booleanIcon"> ${repository.indexed}</td>
+ </tr>
+ <tr>
+ <th>Delete Released Snapshots</th>
+ <td class="${repository.deleteReleasedSnapshots ? 'donemark' :
'errormark'} booleanIcon"> ${repository.deleteReleasedSnapshots}</td>
</tr>
<c:if test="${repository.indexed}">
<tr>
