Return-Path: 
 <commits-return-4112-apmail-continuum-commits-archive=continuum.apache.org@continuum.apache.org>
Delivered-To: apmail-continuum-commits-archive@www.apache.org
Received: (qmail 60931 invoked from network); 25 Jul 2008 00:16:59 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2)
  by minotaur.apache.org with SMTP; 25 Jul 2008 00:16:59 -0000
Received: (qmail 8208 invoked by uid 500); 25 Jul 2008 00:16:59 -0000
Delivered-To: apmail-continuum-commits-archive@continuum.apache.org
Received: (qmail 8152 invoked by uid 500); 25 Jul 2008 00:16:58 -0000
Mailing-List: contact commits-help@continuum.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:commits-help@continuum.apache.org>
List-Unsubscribe: <mailto:commits-unsubscribe@continuum.apache.org>
List-Post: <mailto:commits@continuum.apache.org>
List-Id: <commits.continuum.apache.org>
Reply-To: dev@continuum.apache.org
Delivered-To: mailing list commits@continuum.apache.org
Received: (qmail 8142 invoked by uid 99); 25 Jul 2008 00:16:58 -0000
Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136)
    by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 24 Jul 2008 17:16:58 -0700
X-ASF-Spam-Status: No, hits=-2000.0 required=10.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; Fri, 25 Jul 2008 00:16:12 +0000
Received: by eris.apache.org (Postfix, from userid 65534)
	id B4EA52388986; Thu, 24 Jul 2008 17:16:07 -0700 (PDT)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r679626 - in
 /continuum/branches/CONTINUUM-782/continuum-webapp/src/main:
 java/org/apache/continuum/web/action/admin/PurgeConfigurationAction.java
 webapp/WEB-INF/jsp/admin/editPurgeConfiguration.jsp
Date: Fri, 25 Jul 2008 00:16:07 -0000
To: commits@continuum.apache.org
From: olamy@apache.org
X-Mailer: svnmailer-1.0.8
Message-Id: <20080725001607.B4EA52388986@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org

Author: olamy
Date: Thu Jul 24 17:16:06 2008
New Revision: 679626

URL: http://svn.apache.org/viewvc?rev=679626&view=rev
Log:
capability to configure default flag

Modified:
    continuum/branches/CONTINUUM-782/continuum-webapp/src/main/java/org/apache/continuum/web/action/admin/PurgeConfigurationAction.java
    continuum/branches/CONTINUUM-782/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/editPurgeConfiguration.jsp

Modified: continuum/branches/CONTINUUM-782/continuum-webapp/src/main/java/org/apache/continuum/web/action/admin/PurgeConfigurationAction.java
URL: http://svn.apache.org/viewvc/continuum/branches/CONTINUUM-782/continuum-webapp/src/main/java/org/apache/continuum/web/action/admin/PurgeConfigurationAction.java?rev=679626&r1=679625&r2=679626&view=diff
==============================================================================
--- continuum/branches/CONTINUUM-782/continuum-webapp/src/main/java/org/apache/continuum/web/action/admin/PurgeConfigurationAction.java (original)
+++ continuum/branches/CONTINUUM-782/continuum-webapp/src/main/java/org/apache/continuum/web/action/admin/PurgeConfigurationAction.java Thu Jul 24 17:16:06 2008
@@ -163,7 +163,7 @@
             if ( purgeConfig instanceof RepositoryPurgeConfiguration )
             {
                 RepositoryPurgeConfiguration repoPurge = (RepositoryPurgeConfiguration) purgeConfig;
-                
+
                 this.purgeType = PURGE_TYPE_REPOSITORY;
                 this.daysOlder = repoPurge.getDaysOlder();
                 this.retentionCount = repoPurge.getRetentionCount();

Modified: continuum/branches/CONTINUUM-782/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/editPurgeConfiguration.jsp
URL: http://svn.apache.org/viewvc/continuum/branches/CONTINUUM-782/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/editPurgeConfiguration.jsp?rev=679626&r1=679625&r2=679626&view=diff
==============================================================================
--- continuum/branches/CONTINUUM-782/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/editPurgeConfiguration.jsp (original)
+++ continuum/branches/CONTINUUM-782/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/editPurgeConfiguration.jsp Thu Jul 24 17:16:06 2008
@@ -56,15 +56,7 @@
             <c:if test="${purgeType == 'repository'}">
               <ww:checkbox label="%{getText('purgeConfig.deleteReleasedSnapshots.label')}" name="deleteReleasedSnapshots"/>
             </c:if>
-            <c:choose>
-              <c:when test="${defaultPurgeConfiguration == true}">
-                <ww:hidden name="defaultPurgeConfiguration"/>
-                <ww:label label="%{getText('purgeConfig.defaultPurge.label')}" value="true"/>
-              </c:when>
-              <c:otherwise>
-                <ww:checkbox label="%{getText('purgeConfig.defaultPurge.label')}" name="defaultPurgeConfiguration" value="defaultPurgeConfiguration" fieldValue="true"/>
-              </c:otherwise>
-            </c:choose>
+            <ww:checkbox label="%{getText('purgeConfig.defaultPurge.label')}" name="defaultPurgeConfiguration" value="defaultPurgeConfiguration" fieldValue="true"/>
             <ww:select label="%{getText('purgeConfig.schedule.label')}" name="scheduleId" list="schedules"
                        headerKey="-1" headerValue=""/>
             <ww:textfield label="%{getText('purgeConfig.description.label')}" name="description"/>