[MRM-598] avoid javascript validation errors by removing upper limits that aren't...

Merged from: r639284

git-svn-id: https://svn.apache.org/repos/asf/maven/archiva/trunk@639286 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/archiva-web/archiva-webapp/src/main/resources/org/apache/maven/archiva/web/action/admin/networkproxies/ConfigureNetworkProxyAction-saveNetworkProxy-validation.xml b/archiva-web/archiva-webapp/src/main/resources/org/apache/maven/archiva/web/action/admin/networkproxies/ConfigureNetworkProxyAction-saveNetworkProxy-validation.xml
index 401708c3a94dec213d931a31d4fb38d98b128e59..eccd629f4dd774d2adcde3c82b984e550fbd1349 100644 (file)
--- a/archiva-web/archiva-webapp/src/main/resources/org/apache/maven/archiva/web/action/admin/networkproxies/ConfigureNetworkProxyAction-saveNetworkProxy-validation.xml
+++ b/archiva-web/archiva-webapp/src/main/resources/org/apache/maven/archiva/web/action/admin/networkproxies/ConfigureNetworkProxyAction-saveNetworkProxy-validation.xml
@@ -50,8 +50,11 @@
     </field-validator>
     <field-validator type="int">
       <param name="min">1</param>
+<!-- Webwork bug renders this as 65.535
       <param name="max">65535</param>
       <message>Port needs to be between ${min} and ${max}</message>
+-->
+      <message>Port needs to be larger than ${min}</message>
     </field-validator>
   </field>
-</validators>
\ No newline at end of file
+</validators>

diff --git a/archiva-web/archiva-webapp/src/main/resources/org/apache/maven/archiva/web/action/admin/repositories/AddManagedRepositoryAction-validation.xml b/archiva-web/archiva-webapp/src/main/resources/org/apache/maven/archiva/web/action/admin/repositories/AddManagedRepositoryAction-validation.xml
index 0852feab10bbc330e41da00cf79ca90ec6829e0c..23f4cb49582821081e8879a85a0830689e8f0e90 100644 (file)
--- a/archiva-web/archiva-webapp/src/main/resources/org/apache/maven/archiva/web/action/admin/repositories/AddManagedRepositoryAction-validation.xml
+++ b/archiva-web/archiva-webapp/src/main/resources/org/apache/maven/archiva/web/action/admin/repositories/AddManagedRepositoryAction-validation.xml
@@ -38,17 +38,16 @@
     </field-validator>
   </field>   
   <field name="repository.retentionCount">
-       <field-validator type="int">
-       <param name="min">1</param>
-        <param name="max">100</param>
-               <message>Repository Purge By Retention Count needs to be between ${min} and ${max}.</message>
-       </field-validator>    
+    <field-validator type="int">
+      <param name="min">1</param>
+      <param name="max">100</param>
+      <message>Repository Purge By Retention Count needs to be between ${min} and ${max}.</message>
+    </field-validator>    
   </field>
-   <field name="repository.daysOlder">
-       <field-validator type="int">
-       <param name="min">0</param>
-        <param name="max">1000</param>
-               <message>Repository Purge By Days Older Than needs to be between ${min} and ${max}.</message>
-       </field-validator>    
+  <field name="repository.daysOlder">
+    <field-validator type="int">
+      <param name="min">0</param>
+      <message>Repository Purge By Days Older Than needs to be larger than ${min}.</message>
+    </field-validator>    
   </field>
-</validators>
\ No newline at end of file
+</validators>

diff --git a/archiva-web/archiva-webapp/src/main/resources/org/apache/maven/archiva/web/action/admin/repositories/EditManagedRepositoryAction-validation.xml b/archiva-web/archiva-webapp/src/main/resources/org/apache/maven/archiva/web/action/admin/repositories/EditManagedRepositoryAction-validation.xml
index 1c3997ce5560567ce6cd8c3264b38c7b3d21c64d..4ce434a43ed03bc96122f9332340d56867b4af77 100644 (file)
--- a/archiva-web/archiva-webapp/src/main/resources/org/apache/maven/archiva/web/action/admin/repositories/EditManagedRepositoryAction-validation.xml
+++ b/archiva-web/archiva-webapp/src/main/resources/org/apache/maven/archiva/web/action/admin/repositories/EditManagedRepositoryAction-validation.xml
@@ -38,17 +38,16 @@
     </field-validator>
   </field>
   <field name="repository.retentionCount">
-       <field-validator type="int">
-       <param name="min">1</param>
-        <param name="max">100</param>
-               <message>Repository Purge By Retention Count needs to be between ${min} and ${max}.</message>
-       </field-validator>    
+    <field-validator type="int">
+      <param name="min">1</param>
+      <param name="max">100</param>
+      <message>Repository Purge By Retention Count needs to be between ${min} and ${max}.</message>
+    </field-validator>    
   </field>
-   <field name="repository.daysOlder">
-       <field-validator type="int">
-       <param name="min">0</param>
-        <param name="max">1000</param>
-               <message>Repository Purge By Days Older Than needs to be between ${min} and ${max}.</message>
-       </field-validator>    
+  <field name="repository.daysOlder">
+    <field-validator type="int">
+      <param name="min">0</param>
+      <message>Repository Purge By Days Older Than needs to be larger than ${min}.</message>
+    </field-validator>    
   </field>
-</validators>
\ No newline at end of file
+</validators>

diff --git a/archiva-web/archiva-webapp/src/main/resources/org/apache/maven/archiva/web/action/reports/GenerateReportAction-validation.xml b/archiva-web/archiva-webapp/src/main/resources/org/apache/maven/archiva/web/action/reports/GenerateReportAction-validation.xml
index 75e11aa55d99f9f3e637ef0aaf1b048e92a6d83e..a31c0652de9810fb08600ce69371b7be5f3c0be9 100644 (file)
--- a/archiva-web/archiva-webapp/src/main/resources/org/apache/maven/archiva/web/action/reports/GenerateReportAction-validation.xml
+++ b/archiva-web/archiva-webapp/src/main/resources/org/apache/maven/archiva/web/action/reports/GenerateReportAction-validation.xml
@@ -25,8 +25,7 @@
   <field name="rowCount">
     <field-validator type="int">
       <param name="min">10</param>
-      <param name="max">5000</param>
-      <message>Row count must be between ${min} and ${max}.</message>
+      <message>Row count must be larger than ${min}.</message>
     </field-validator>
   </field>
   <!-- 
@@ -42,4 +41,4 @@
       <message>You must provide a repository id.</message>
     </field-validator>
   </field>
-</validators>
\ No newline at end of file
+</validators>