continuum-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ol...@apache.org
Subject svn commit: r594666 - in /maven/continuum/trunk/continuum-webapp/src/main: java/org/apache/maven/continuum/web/validator/ resources/org/apache/maven/continuum/web/action/admin/
Date Tue, 13 Nov 2007 22:09:43 GMT
Author: olamy
Date: Tue Nov 13 14:09:42 2007
New Revision: 594666

URL: http://svn.apache.org/viewvc?rev=594666&view=rev
Log:
[CONTINUUM-1564] Adding Continuum Installations accepts null value for "value/path" field

Modified:
    maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/validator/InstallationValidator.java
    maven/continuum/trunk/continuum-webapp/src/main/resources/org/apache/maven/continuum/web/action/admin/InstallationAction-saveInstallation-validation.xml
    maven/continuum/trunk/continuum-webapp/src/main/resources/org/apache/maven/continuum/web/action/admin/InstallationAction.properties
    maven/continuum/trunk/continuum-webapp/src/main/resources/org/apache/maven/continuum/web/action/admin/InstallationAction_fr.properties

Modified: maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/validator/InstallationValidator.java
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/validator/InstallationValidator.java?rev=594666&r1=594665&r2=594666&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/validator/InstallationValidator.java
(original)
+++ maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/validator/InstallationValidator.java
Tue Nov 13 14:09:42 2007
@@ -59,12 +59,14 @@
         String name = (String) this.getFieldValue( "installation.name", object );
         if ( StringUtils.isEmpty( name ) )
         {
-            // nothing empty name
             return;
         }
 
         String varValue = (String) this.getFieldValue( "installation.varValue", object );
-
+        if (StringUtils.isEmpty( varValue ))
+        {
+            return;
+        }
         // TODO validating varValue != null depending on type (not null for envVar)
 
         String type = (String) this.getFieldValue( "installation.type", object );

Modified: maven/continuum/trunk/continuum-webapp/src/main/resources/org/apache/maven/continuum/web/action/admin/InstallationAction-saveInstallation-validation.xml
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-webapp/src/main/resources/org/apache/maven/continuum/web/action/admin/InstallationAction-saveInstallation-validation.xml?rev=594666&r1=594665&r2=594666&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-webapp/src/main/resources/org/apache/maven/continuum/web/action/admin/InstallationAction-saveInstallation-validation.xml
(original)
+++ maven/continuum/trunk/continuum-webapp/src/main/resources/org/apache/maven/continuum/web/action/admin/InstallationAction-saveInstallation-validation.xml
Tue Nov 13 14:09:42 2007
@@ -28,6 +28,11 @@
     </field-validator>
   </field>
   <field name="installation.varValue">
+    <field-validator type="requiredstring">
+      <message key="installation.varValue.required"/>
+    </field-validator>
+  </field>  
+  <field name="installation.varValue">
     <field-validator type="installationValidator">
       <message key="installation.varValue.version.failed"/>
     </field-validator>

Modified: maven/continuum/trunk/continuum-webapp/src/main/resources/org/apache/maven/continuum/web/action/admin/InstallationAction.properties
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-webapp/src/main/resources/org/apache/maven/continuum/web/action/admin/InstallationAction.properties?rev=594666&r1=594665&r2=594666&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-webapp/src/main/resources/org/apache/maven/continuum/web/action/admin/InstallationAction.properties
(original)
+++ maven/continuum/trunk/continuum-webapp/src/main/resources/org/apache/maven/continuum/web/action/admin/InstallationAction.properties
Tue Nov 13 14:09:42 2007
@@ -18,4 +18,5 @@
 #
 
 installation.name.required = You must define a name.
+installation.varValue.required = You must define a value.
 installation.varValue.version.failed = Failed to validate installation, check server log.


Modified: maven/continuum/trunk/continuum-webapp/src/main/resources/org/apache/maven/continuum/web/action/admin/InstallationAction_fr.properties
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-webapp/src/main/resources/org/apache/maven/continuum/web/action/admin/InstallationAction_fr.properties?rev=594666&r1=594665&r2=594666&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-webapp/src/main/resources/org/apache/maven/continuum/web/action/admin/InstallationAction_fr.properties
(original)
+++ maven/continuum/trunk/continuum-webapp/src/main/resources/org/apache/maven/continuum/web/action/admin/InstallationAction_fr.properties
Tue Nov 13 14:09:42 2007
@@ -18,4 +18,5 @@
 #
 
 installation.name.required = Vous devez sp\u00e9cifier un nom.
+installation.varValue.required = Vous devez sp\u00e9cifier une valeur.
 installation.varValue.version.failed = Echec lors de la validation de l''installation, v\u00e9rifier
les logs du serveur. 



Mime
View raw message