From d1fe90fe66fdabfa653ae3073f82a1ff61d200c5 Mon Sep 17 00:00:00 2001
From: Olivier Lamy <olamy@apache.org>
Date: Tue, 13 Sep 2011 17:47:31 +0000
Subject: [PATCH] fix field name

git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1170269 13f79535-47bb-0310-9956-ffa450edef68
---
 .../webapp/WEB-INF/jsp/admin/confirmAddRepository.jsp     | 8 ++++----
 .../main/webapp/WEB-INF/jsp/include/mergeActionForm.jspf  | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/confirmAddRepository.jsp b/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/confirmAddRepository.jsp
index 09ca17e0a..727880586 100644
--- a/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/confirmAddRepository.jsp
+++ b/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/confirmAddRepository.jsp
@@ -63,7 +63,7 @@
       </tr>
       <tr>
         <td>Index Directory:</td>
-        <td><c:out value="${repository.indexDir}" /></td>
+        <td><c:out value="${repository.indexDirectory}" /></td>
       </tr>
       <tr>
         <td>Type:</td>
@@ -81,7 +81,7 @@
       </tr>
       <tr>
         <td>Cron:</td>
-        <td><c:out value="${repository.refreshCronExpression}" /></td>
+        <td><c:out value="${repository.cronExpression}" /></td>
       </tr>
       <tr>
         <td>Repository Purge By Days Older Than:</td>
@@ -115,9 +115,9 @@
       <s:hidden name="repository.id" value="%{#attr.repository.id}"/>
       <s:hidden name="repository.name" value="%{#attr.repository.name}"/>
       <s:hidden name="repository.location" value="%{#attr.repository.location}"/>
-      <s:hidden name="repository.indexDir" value="%{#attr.repository.indexDir}"/>
+      <s:hidden name="repository.indexDir" value="%{#attr.repository.indexDirectory}"/>
       <s:hidden name="repository.layout" value="%{#attr.repository.layout}"/>
-      <s:hidden name="repository.refreshCronExpression" value="%{#attr.repository.refreshCronExpression}"/>
+      <s:hidden name="repository.cronExpression" value="%{#attr.repository.cronExpression}"/>
       <s:hidden name="repository.daysOlder" value="%{#attr.repository.daysOlder}"/>
       <s:hidden name="repository.retentionCount" value="%{#attr.repository.retentionCount}"/>
       <s:hidden name="repository.releases" value="%{#attr.repository.releases}"/>
diff --git a/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/include/mergeActionForm.jspf b/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/include/mergeActionForm.jspf
index 93e20dc9c..d173f911a 100644
--- a/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/include/mergeActionForm.jspf
+++ b/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/include/mergeActionForm.jspf
@@ -31,7 +31,7 @@
 <s:textfield name="repository.indexDir" label="Index Directory" size="50"/>
 <s:select list="#@java.util.LinkedHashMap@{'default' : 'Maven 2.x Repository', 'legacy' : 'Maven 1.x Repository'}"
            name="repository.layout" label="Type"/>
-<s:textfield name="repository.refreshCronExpression" label="Cron" size="40" required="true"/>
+<s:textfield name="repository.cronExpression" label="Cron" size="40" required="true"/>
 <s:textfield name="repository.daysOlder" label="Repository Purge By Days Older Than" size="5"/>
 <s:textfield name="repository.retentionCount" label="Repository Purge By Retention Count" size="5"/>
 <s:checkbox name="repository.releases" value="repository.releases" label="Releases Included"/>