svn commit: r1101669 [2/4] - in /continuum/branches/continuum-1.3.x: ./ continuum-webapp-test/src/test/resources/ continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/ continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/p...

[ct...@apache.org]

Modified: continuum/branches/continuum-1.3.x/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/AddProjectAction.java
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-1.3.x/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/AddProjectAction.java?rev=1101669&r1=1101668&r2=1101669&view=diff
==============================================================================
--- continuum/branches/continuum-1.3.x/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/AddProjectAction.java (original)
+++ continuum/branches/continuum-1.3.x/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/AddProjectAction.java Tue May 10 22:46:21 2011
@@ -23,6 +23,7 @@ import java.util.ArrayList;
 import java.util.Collection;
 import java.util.List;
 
+import org.apache.commons.lang.StringEscapeUtils;
 import org.apache.continuum.web.util.AuditLog;
 import org.apache.continuum.web.util.AuditLogConstants;
 import org.apache.maven.continuum.ContinuumException;
@@ -89,44 +90,8 @@ public class AddProjectAction
 
     private boolean emptyProjectGroups;
 
-    public void validate()
-    {
-        clearErrorsAndMessages();
-        try
-        {
-            if ( ( projectName != null ) && !( projectName.trim().length() > 0 ) )
-            {
-                addActionError( getText( "addProject.name.required" ) );
-            }
-            if ( ( projectVersion != null ) && !( projectVersion.trim().length() > 0 ) )
-            {
-                addActionError( getText( "addProject.version.required" ) );
-            }
-            if ( ( projectScmUrl != null ) && !( projectScmUrl.trim().length() > 0 ) )
-            {
-                addActionError( getText( "addProject.scmUrl.required" ) );
-            }
-            if ( isEmptyProjectGroups() )
-            {
-                addActionError( getText( "addProject.projectGroup.required" ) );
-            }
-            if ( hasActionErrors() )
-            {
-                input();
-            }
-        }
-        catch ( ContinuumException e )
-        {
-            logger.error( e.getMessage(), e );
-        }
-        catch ( BuildDefinitionServiceException e )
-        {
-            logger.error( e.getMessage(), e );
-        }
-    }
-
     public String add()
-        throws ContinuumException
+        throws ContinuumException, ProfileException, BuildDefinitionServiceException
     {
         initializeProjectGroupName();
 
@@ -147,6 +112,11 @@ public class AddProjectAction
             return REQUIRES_AUTHORIZATION;
         }
 
+        if ( isEmptyProjectGroups() )
+        {
+            addActionError( getText( "addProject.projectGroup.required" ) );
+        }
+
         String projectNameTrim = projectName.trim();
         String versionTrim = projectVersion.trim();
         String scmTrim = projectScmUrl.trim();
@@ -159,17 +129,22 @@ public class AddProjectAction
                 StringUtils.equalsIgnoreCase( project.getScmUrl(), scmTrim ) )
             {
                 addActionError( getText( "projectName.already.exist.error" ) );
-                return INPUT;
+                break;
             }
         }
 
+        if ( hasActionErrors() )
+        {
+            return INPUT;
+        }
+
         Project project = new Project();
 
         project.setName( projectNameTrim );
 
         if ( projectDescription != null )
         {
-            project.setDescription( projectDescription.trim() );
+            project.setDescription( StringEscapeUtils.escapeXml( StringEscapeUtils.unescapeXml( projectDescription.trim() ) ) );
         }
 
         project.setVersion( versionTrim );

Modified: continuum/branches/continuum-1.3.x/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/AddProjectGroupAction.java
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-1.3.x/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/AddProjectGroupAction.java?rev=1101669&r1=1101668&r2=1101669&view=diff
==============================================================================
--- continuum/branches/continuum-1.3.x/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/AddProjectGroupAction.java (original)
+++ continuum/branches/continuum-1.3.x/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/AddProjectGroupAction.java Tue May 10 22:46:21 2011
@@ -19,10 +19,9 @@ package org.apache.maven.continuum.web.a
  * under the License.
  */
 
-import com.opensymphony.xwork2.Validateable;
-
 import java.util.List;
 
+import org.apache.commons.lang.StringEscapeUtils;
 import org.apache.continuum.web.util.AuditLog;
 import org.apache.continuum.web.util.AuditLogConstants;
 import org.apache.continuum.model.repository.LocalRepository;
@@ -39,7 +38,6 @@ import org.slf4j.LoggerFactory;
  */
 public class AddProjectGroupAction
     extends ContinuumActionSupport
-    implements Validateable
 {
     private static final Logger logger = LoggerFactory.getLogger( AddProjectGroupAction.class );
 
@@ -61,72 +59,52 @@ public class AddProjectGroupAction
         repositories = getContinuum().getRepositoryService().getAllLocalRepositories();
     }
 
-    public void validate()
+    public String execute()
     {
-        clearErrorsAndMessages();
-        if ( name != null && name.equals( "" ) )
+        try
         {
-            addActionError( getText( "projectGroup.error.name.required" ) );
+            checkAddProjectGroupAuthorization();
         }
-        else if ( name != null && name.trim().equals( "" ) )
+        catch ( AuthorizationRequiredException authzE )
         {
-            addActionError( getText( "projectGroup.error.name.cannot.be.spaces" ) );
+            addActionError( authzE.getMessage() );
+            return REQUIRES_AUTHORIZATION;
         }
-        else if ( name != null && !name.equals( "" ) )
+
+        for ( ProjectGroup projectGroup : getContinuum().getAllProjectGroups() )
         {
-            for ( ProjectGroup projectGroup : getContinuum().getAllProjectGroups() )
+            if ( name.equals( projectGroup.getName() ) )
             {
-                if ( name.equals( projectGroup.getName() ) )
-                {
-                    addActionError( getText( "projectGroup.error.name.already.exists" ) );
-                    break;
-                }
+                addActionError( getText( "projectGroup.error.name.already.exists" ) );
+                break;
             }
         }
-        if ( groupId != null && groupId.equals( "" ) )
-        {
-            addActionError( getText( "projectGroup.error.groupId.required" ) );
-        }
-        else if ( groupId != null && groupId.trim().equals( "" ) )
-        {
-            addActionError( getText( "projectGroup.error.groupId.cannot.be.spaces" ) );
-        }
-        else
+
+        try
         {
-            try
+            if ( getContinuum().getProjectGroupByGroupId( groupId ) != null )
             {
-                if ( getContinuum().getProjectGroupByGroupId( groupId ) != null )
-                {
-                    addActionError( getText( "projectGroup.error.groupId.already.exists" ) );
-                }
-            }
-            catch ( ContinuumException e )
-            {
-                //since we want to add a new project group, we should be getting
-                //this exception
+                addActionError( getText( "projectGroup.error.groupId.already.exists" ) );
             }
         }
-    }
-
-    public String execute()
-    {
-        try
+        catch ( ContinuumException e )
         {
-            checkAddProjectGroupAuthorization();
+            //since we want to add a new project group, we should be getting
+            //this exception
         }
-        catch ( AuthorizationRequiredException authzE )
+
+        if ( hasActionErrors() )
         {
-            addActionError( authzE.getMessage() );
-            return REQUIRES_AUTHORIZATION;
+            return INPUT;
         }
 
         ProjectGroup projectGroup = new ProjectGroup();
 
-        projectGroup.setName( name );
+        projectGroup.setName( name.trim() );
 
-        projectGroup.setGroupId( groupId );
+        projectGroup.setGroupId( groupId.trim() );
 
-        projectGroup.setDescription( description );
+        projectGroup.setDescription( StringEscapeUtils.escapeXml( StringEscapeUtils.unescapeXml( description ) ) );
 
         try
         {

Modified: continuum/branches/continuum-1.3.x/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/BuildDefinitionAction.java
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-1.3.x/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/BuildDefinitionAction.java?rev=1101669&r1=1101668&r2=1101669&view=diff
==============================================================================
--- continuum/branches/continuum-1.3.x/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/BuildDefinitionAction.java (original)
+++ continuum/branches/continuum-1.3.x/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/BuildDefinitionAction.java Tue May 10 22:46:21 2011
@@ -37,6 +37,7 @@ import org.apache.maven.continuum.profil
 import org.apache.maven.continuum.store.ContinuumStoreException;
 import org.apache.maven.continuum.web.exception.AuthorizationRequiredException;
 import org.apache.maven.continuum.web.exception.ContinuumActionException;
+import org.apache.commons.lang.StringEscapeUtils;
 import org.apache.continuum.web.util.AuditLog;
 import org.apache.continuum.web.util.AuditLogConstants;
 import org.codehaus.plexus.util.StringUtils;
@@ -490,7 +491,7 @@ public class BuildDefinitionAction
                 buildDefinition.setProfile( profile );
             }
         }
-        buildDefinition.setDescription( description );
+        buildDefinition.setDescription( StringEscapeUtils.escapeXml( StringEscapeUtils.unescapeXml( description ) ) );
         buildDefinition.setType( buildDefinitionType );
         buildDefinition.setAlwaysBuild( alwaysBuild );
         return buildDefinition;

Modified: continuum/branches/continuum-1.3.x/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ProjectGroupAction.java
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-1.3.x/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ProjectGroupAction.java?rev=1101669&r1=1101668&r2=1101669&view=diff
==============================================================================
--- continuum/branches/continuum-1.3.x/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ProjectGroupAction.java (original)
+++ continuum/branches/continuum-1.3.x/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ProjectGroupAction.java Tue May 10 22:46:21 2011
@@ -28,8 +28,10 @@ import java.util.Iterator;
 import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.regex.Pattern;
 
 import org.apache.commons.collections.ComparatorUtils;
+import org.apache.commons.lang.StringEscapeUtils;
 import org.apache.commons.lang.StringUtils;
 import org.apache.continuum.buildmanager.BuildManagerException;
 import org.apache.continuum.buildmanager.BuildsManager;
@@ -142,6 +144,14 @@ public class ProjectGroupAction
 
     private List<ProjectScmRoot> projectScmRoots;
 
+    public void prepare()
+        throws Exception
+    {
+        super.prepare();
+    
+        repositories = getContinuum().getRepositoryService().getAllLocalRepositories();
+    }
+    
     public String summary()
         throws ContinuumException
     {
@@ -186,7 +196,7 @@ public class ProjectGroupAction
         }
 
         if ( projectGroup != null )
-        {
+        {   
             if ( projectGroup.getProjects() != null && projectGroup.getProjects().size() > 0 )
             {
                 int nbMaven2Projects = 0;
@@ -436,34 +446,20 @@ public class ProjectGroupAction
             return REQUIRES_AUTHORIZATION;
         }
 
-        if ( name != null )
+        for ( ProjectGroup projectGroup : getContinuum().getAllProjectGroups() )
         {
-            if ( name.equals( "" ) )
+            if ( name.equals( projectGroup.getName() ) && projectGroup.getId() != projectGroupId )
             {
-                addActionError( getText( "projectGroup.error.name.required" ) );
-            }
-            else if ( name.trim().equals( "" ) )
-            {
-                addActionError( getText( "projectGroup.error.name.cannot.be.spaces" ) );
-            }
-            else
-            {
-                name = name.trim();
-                for ( ProjectGroup projectGroup : getContinuum().getAllProjectGroups() )
-                {
-                    if ( name.equals( projectGroup.getName() ) && projectGroup.getId() != projectGroupId )
-                    {
-                        addActionError( getText( "projectGroup.error.name.already.exists" ) );
-                    }
-                }
-            }
-            if ( hasActionErrors() )
-            {
-                initialize();
-                return INPUT;
+                addActionError( getText( "projectGroup.error.name.already.exists" ) );
             }
         }
 
+        if ( hasActionErrors() )
+        {
+            initialize();
+            return INPUT;
+        }
+
         projectGroup = getContinuum().getProjectGroupWithProjects( projectGroupId );
 
         // need to administer roles since they are based off of this
@@ -487,7 +483,7 @@ public class ProjectGroupAction
 
         }
 
-        projectGroup.setDescription( description );
+        projectGroup.setDescription( StringEscapeUtils.escapeXml( StringEscapeUtils.unescapeXml( description ) ) );
 
         // [CONTINUUM-2228]. In select field can't select empty values.
         if ( repositoryId > 0 )

Modified: continuum/branches/continuum-1.3.x/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ScheduleAction.java
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-1.3.x/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ScheduleAction.java?rev=1101669&r1=1101668&r2=1101669&view=diff
==============================================================================
--- continuum/branches/continuum-1.3.x/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ScheduleAction.java (original)
+++ continuum/branches/continuum-1.3.x/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ScheduleAction.java Tue May 10 22:46:21 2011
@@ -26,6 +26,7 @@ import java.util.Collection;
 import java.util.Collections;
 import java.util.List;
 
+import org.apache.commons.lang.StringEscapeUtils;
 import org.apache.commons.lang.StringUtils;
 import org.apache.maven.continuum.ContinuumException;
 import org.apache.maven.continuum.model.project.BuildQueue;
@@ -283,7 +284,7 @@ public class ScheduleAction
         schedule.setActive( active );
         schedule.setCronExpression( getCronExpression() );
         schedule.setDelay( delay );
-        schedule.setDescription( description );
+        schedule.setDescription( StringEscapeUtils.escapeXml( StringEscapeUtils.unescapeXml( description ) ) );
         schedule.setName( name );
         schedule.setMaxJobExecutionTime(maxJobExecutionTime);
         if (!getContinuum().getConfiguration().isDistributedBuildEnabled()) {

Modified: continuum/branches/continuum-1.3.x/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/admin/BuildDefinitionTemplateAction.java
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-1.3.x/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/admin/BuildDefinitionTemplateAction.java?rev=1101669&r1=1101668&r2=1101669&view=diff
==============================================================================
--- continuum/branches/continuum-1.3.x/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/admin/BuildDefinitionTemplateAction.java (original)
+++ continuum/branches/continuum-1.3.x/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/admin/BuildDefinitionTemplateAction.java Tue May 10 22:46:21 2011
@@ -27,6 +27,7 @@ import java.util.Collections;
 import java.util.LinkedList;
 import java.util.List;
 
+import org.apache.commons.lang.StringEscapeUtils;
 import org.apache.continuum.web.util.AuditLog;
 import org.apache.continuum.web.util.AuditLogConstants;
 import org.apache.maven.continuum.ContinuumException;
@@ -231,6 +232,10 @@ public class BuildDefinitionTemplateActi
         throws Exception
     {
         Schedule schedule = null;
+
+        // need to escape xml to prevent xss attacks
+        buildDefinition.setDescription( StringEscapeUtils.escapeXml( StringEscapeUtils.unescapeXml( buildDefinition.getDescription() ) ) );
+
         if ( buildDefinition.getProfile() != null )
         {
             Profile profile = getContinuum().getProfileService().getProfile( buildDefinition.getProfile().getId() );

Modified: continuum/branches/continuum-1.3.x/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/component/AbstractFooterAction.java
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-1.3.x/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/component/AbstractFooterAction.java?rev=1101669&r1=1101668&r2=1101669&view=diff
==============================================================================
--- continuum/branches/continuum-1.3.x/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/component/AbstractFooterAction.java (original)
+++ continuum/branches/continuum-1.3.x/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/component/AbstractFooterAction.java Tue May 10 22:46:21 2011
@@ -18,6 +18,7 @@
  */
 package org.apache.maven.continuum.web.action.component;
 
+import org.apache.commons.lang.StringEscapeUtils;
 import org.apache.maven.continuum.web.action.ContinuumActionSupport;
 import org.apache.maven.continuum.web.appareance.AppareanceConfiguration;
 
@@ -51,6 +52,4 @@ public abstract class AbstractFooterActi
     {
         this.footer = footer;
     }
-
-    
 }

Modified: continuum/branches/continuum-1.3.x/continuum-webapp/src/main/java/org/apache/maven/continuum/web/appareance/DefaultAppareanceConfiguration.java
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-1.3.x/continuum-webapp/src/main/java/org/apache/maven/continuum/web/appareance/DefaultAppareanceConfiguration.java?rev=1101669&r1=1101668&r2=1101669&view=diff
==============================================================================
--- continuum/branches/continuum-1.3.x/continuum-webapp/src/main/java/org/apache/maven/continuum/web/appareance/DefaultAppareanceConfiguration.java (original)
+++ continuum/branches/continuum-1.3.x/continuum-webapp/src/main/java/org/apache/maven/continuum/web/appareance/DefaultAppareanceConfiguration.java Tue May 10 22:46:21 2011
@@ -31,6 +31,8 @@ import org.codehaus.plexus.personality.p
 import org.codehaus.plexus.util.ReaderFactory;
 import org.codehaus.plexus.util.StringUtils;
 import org.codehaus.plexus.util.xml.pull.XmlPullParserException;
+import org.jsoup.Jsoup;
+import org.jsoup.safety.Whitelist;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -104,7 +106,9 @@ public class DefaultAppareanceConfigurat
     public void saveFooter( String footerHtmlContent )
         throws IOException
     {
-        continuumAppearance.setFooter( footerHtmlContent );
+        String safeFooterHtmlContent = Jsoup.clean( footerHtmlContent, Whitelist.basic() );
+
+        continuumAppearance.setFooter( safeFooterHtmlContent );
         ContinuumAppearanceModelsXpp3Writer writer = new ContinuumAppearanceModelsXpp3Writer();
         File confFile = getAppearanceConfigurationFile();
         if ( !confFile.exists() )
@@ -114,7 +118,7 @@ public class DefaultAppareanceConfigurat
         FileWriter fileWriter = new FileWriter( confFile );
         writer.write( fileWriter, continuumAppearance );
         fileWriter.close();
-        this.footer = footerHtmlContent;
+        this.footer = safeFooterHtmlContent;
     }
 
 

Modified: continuum/branches/continuum-1.3.x/continuum-webapp/src/main/resources/localization/Continuum.properties
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-1.3.x/continuum-webapp/src/main/resources/localization/Continuum.properties?rev=1101669&r1=1101668&r2=1101669&view=diff
==============================================================================
--- continuum/branches/continuum-1.3.x/continuum-webapp/src/main/resources/localization/Continuum.properties (original)
+++ continuum/branches/continuum-1.3.x/continuum-webapp/src/main/resources/localization/Continuum.properties Tue May 10 22:46:21 2011
@@ -218,9 +218,12 @@ projectGroup.add.section.title = Add Pro
 projectGroup.error.name.required = Project Group Name is required.
 projectGroup.error.name.cannot.be.spaces = Project Group Name cannot contain spaces only.
 projectGroup.error.name.already.exists = Project Group Name already exists.
+projectGroup.error.name.invalid = Name contains invalid characters.
 projectGroup.error.groupId.required = Project Group ID is required.
 projectGroup.error.groupId.cannot.be.spaces = Project Group ID cannot contain spaces only.
 projectGroup.error.groupId.already.exists = Project Group ID already exists.
+projectGroup.error.groupId.invalid = Id contains invalid characters.
+projectGroup.error.description.invalid = Description contains invalid characters.
 
 # ----------------------------------------------------------------------
 # Page: Edit Project Group

Modified: continuum/branches/continuum-1.3.x/continuum-webapp/src/main/resources/org/apache/continuum/web/action/admin/BuildAgentAction-saveBuildAgent-validation.xml
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-1.3.x/continuum-webapp/src/main/resources/org/apache/continuum/web/action/admin/BuildAgentAction-saveBuildAgent-validation.xml?rev=1101669&r1=1101668&r2=1101669&view=diff
==============================================================================
--- continuum/branches/continuum-1.3.x/continuum-webapp/src/main/resources/org/apache/continuum/web/action/admin/BuildAgentAction-saveBuildAgent-validation.xml (original)
+++ continuum/branches/continuum-1.3.x/continuum-webapp/src/main/resources/org/apache/continuum/web/action/admin/BuildAgentAction-saveBuildAgent-validation.xml Tue May 10 22:46:21 2011
@@ -26,5 +26,9 @@
     <field-validator type="requiredstring">
       <message key="buildAgent.url.required"/>
     </field-validator>
+    <field-validator type="regex">
+      <param name="expression"><![CDATA[[A-Za-z0-9_.@:/-]*]]></param>
+      <message key="buildAgent.url.invalid"/>
+    </field-validator>
   </field>
 </validators>
\ No newline at end of file

Added: continuum/branches/continuum-1.3.x/continuum-webapp/src/main/resources/org/apache/continuum/web/action/admin/BuildAgentAction-saveBuildAgentGroup-validation.xml
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-1.3.x/continuum-webapp/src/main/resources/org/apache/continuum/web/action/admin/BuildAgentAction-saveBuildAgentGroup-validation.xml?rev=1101669&view=auto
==============================================================================
--- continuum/branches/continuum-1.3.x/continuum-webapp/src/main/resources/org/apache/continuum/web/action/admin/BuildAgentAction-saveBuildAgentGroup-validation.xml (added)
+++ continuum/branches/continuum-1.3.x/continuum-webapp/src/main/resources/org/apache/continuum/web/action/admin/BuildAgentAction-saveBuildAgentGroup-validation.xml Tue May 10 22:46:21 2011
@@ -0,0 +1,34 @@
+<!--
+  ~ Licensed to the Apache Software Foundation (ASF) under one
+  ~ or more contributor license agreements.  See the NOTICE file
+  ~ distributed with this work for additional information
+  ~ regarding copyright ownership.  The ASF licenses this file
+  ~ to you under the Apache License, Version 2.0 (the
+  ~ "License"); you may not use this file except in compliance
+  ~ with the License.  You may obtain a copy of the License at
+  ~
+  ~   http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing,
+  ~ software distributed under the License is distributed on an
+  ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+  ~ KIND, either express or implied.  See the License for the
+  ~ specific language governing permissions and limitations
+  ~ under the License.
+  -->
+  
+<!DOCTYPE validators PUBLIC
+    "-//OpenSymphony Group//XWork Validator 1.0.2//EN"
+    "http://www.opensymphony.com/xwork/xwork-validator-1.0.2.dtd">
+
+<validators>
+  <field name="buildAgentGroup.name">
+    <field-validator type="requiredstring">
+      <message key="buildAgentGroup.name.required"/>
+    </field-validator>
+    <field-validator type="regex">
+      <param name="expression"><![CDATA[[A-Za-z0-9_.\s\-]*]]></param>
+      <message key="buildAgentGroup.name.invalid"/>
+    </field-validator>
+  </field>
+</validators>
\ No newline at end of file

Modified: continuum/branches/continuum-1.3.x/continuum-webapp/src/main/resources/org/apache/continuum/web/action/admin/BuildAgentAction.properties
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-1.3.x/continuum-webapp/src/main/resources/org/apache/continuum/web/action/admin/BuildAgentAction.properties?rev=1101669&r1=1101668&r2=1101669&view=diff
==============================================================================
--- continuum/branches/continuum-1.3.x/continuum-webapp/src/main/resources/org/apache/continuum/web/action/admin/BuildAgentAction.properties (original)
+++ continuum/branches/continuum-1.3.x/continuum-webapp/src/main/resources/org/apache/continuum/web/action/admin/BuildAgentAction.properties Tue May 10 22:46:21 2011
@@ -18,6 +18,9 @@
 #
 
 buildAgent.url.required = Build agent url is required.
+buildAgent.url.invalid = Build agent url is invalid.
 buildAgent.error.exist = Build agent already exists.
 buildAgent.error.delete.busy = Cannot delete build agent because it's busy at the moment
 buildAgent.error.notfound = Build agent does not exist.
+buildAgentGroup.name.required = Build agent group name is required.
+buildAgentGroup.name.invalid = Build agent group name contains invalid characters.
\ No newline at end of file

Modified: continuum/branches/continuum-1.3.x/continuum-webapp/src/main/resources/org/apache/continuum/web/action/admin/LocalRepositoryAction-saveRepository-validation.xml
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-1.3.x/continuum-webapp/src/main/resources/org/apache/continuum/web/action/admin/LocalRepositoryAction-saveRepository-validation.xml?rev=1101669&r1=1101668&r2=1101669&view=diff
==============================================================================
--- continuum/branches/continuum-1.3.x/continuum-webapp/src/main/resources/org/apache/continuum/web/action/admin/LocalRepositoryAction-saveRepository-validation.xml (original)
+++ continuum/branches/continuum-1.3.x/continuum-webapp/src/main/resources/org/apache/continuum/web/action/admin/LocalRepositoryAction-saveRepository-validation.xml Tue May 10 22:46:21 2011
@@ -26,10 +26,18 @@
     <field-validator type="requiredstring">
       <message key="repository.name.required"/>
     </field-validator>
+    <field-validator type="regex">
+      <param name="expression"><![CDATA[[A-Za-z0-9_.\s\-]*]]></param>
+      <message key="repository.name.invalid"/>
+    </field-validator>
   </field>
   <field name="repository.location">
     <field-validator type="requiredstring">
       <message key="repository.location.required"/>
     </field-validator>
+    <field-validator type="regex">
+      <param name="expression"><![CDATA[[A-Za-z0-9_.:\\/\s\-]*]]></param>
+      <message key="repository.location.invalid"/>
+    </field-validator>
   </field>
 </validators>

Modified: continuum/branches/continuum-1.3.x/continuum-webapp/src/main/resources/org/apache/continuum/web/action/admin/LocalRepositoryAction.properties
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-1.3.x/continuum-webapp/src/main/resources/org/apache/continuum/web/action/admin/LocalRepositoryAction.properties?rev=1101669&r1=1101668&r2=1101669&view=diff
==============================================================================
--- continuum/branches/continuum-1.3.x/continuum-webapp/src/main/resources/org/apache/continuum/web/action/admin/LocalRepositoryAction.properties (original)
+++ continuum/branches/continuum-1.3.x/continuum-webapp/src/main/resources/org/apache/continuum/web/action/admin/LocalRepositoryAction.properties Tue May 10 22:46:21 2011
@@ -18,4 +18,6 @@
 #
 
 repository.name.required = You must define a name.
+repository.name.invalid = Local repository name contains invalid characters.
 repository.location.required = You must define a local repository directory.
+repository.location.invalid = Local repository location contains invalid characters.
\ No newline at end of file

Modified: continuum/branches/continuum-1.3.x/continuum-webapp/src/main/resources/org/apache/continuum/web/action/admin/PurgeConfigurationAction.properties
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-1.3.x/continuum-webapp/src/main/resources/org/apache/continuum/web/action/admin/PurgeConfigurationAction.properties?rev=1101669&r1=1101668&r2=1101669&view=diff
==============================================================================
--- continuum/branches/continuum-1.3.x/continuum-webapp/src/main/resources/org/apache/continuum/web/action/admin/PurgeConfigurationAction.properties (original)
+++ continuum/branches/continuum-1.3.x/continuum-webapp/src/main/resources/org/apache/continuum/web/action/admin/PurgeConfigurationAction.properties Tue May 10 22:46:21 2011
@@ -18,4 +18,5 @@
 #
 
 purgeConfig.daysOlder.min = Days Older must be a positive number.
-purgeConfig.retentionCount.min = Retention Count must be greater than 0.
\ No newline at end of file
+purgeConfig.retentionCount.min = Retention Count must be greater than 0.
+purgeConfig.description.invalid = Description contains invalid characters.
\ No newline at end of file

Modified: continuum/branches/continuum-1.3.x/continuum-webapp/src/main/resources/org/apache/maven/continuum/web/action/AddProjectAction-addProject-validation.xml
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-1.3.x/continuum-webapp/src/main/resources/org/apache/maven/continuum/web/action/AddProjectAction-addProject-validation.xml?rev=1101669&r1=1101668&r2=1101669&view=diff
==============================================================================
--- continuum/branches/continuum-1.3.x/continuum-webapp/src/main/resources/org/apache/maven/continuum/web/action/AddProjectAction-addProject-validation.xml (original)
+++ continuum/branches/continuum-1.3.x/continuum-webapp/src/main/resources/org/apache/maven/continuum/web/action/AddProjectAction-addProject-validation.xml Tue May 10 22:46:21 2011
@@ -26,15 +26,36 @@
     <field-validator type="requiredstring">
       <message key="addProject.name.required"/>
     </field-validator>
+    <field-validator type="regex">
+      <param name="trim">true</param>
+      <param name="expression"><![CDATA[[a-zA-Z0-9_.\s:-]*]]></param>
+      <message key="addProject.name.invalid"/>
+    </field-validator>
   </field>
   <field name="projectVersion">
     <field-validator type="requiredstring">
       <message key="addProject.version.required"/>
     </field-validator>
+    <field-validator type="regex">
+      <param name="trim">true</param>
+      <param name="expression"><![CDATA[[a-zA-Z0-9.-]*]]></param>
+      <message key="addProject.version.invalid"/>
+    </field-validator>
   </field>
   <field name="projectScmUrl">
     <field-validator type="requiredstring">
       <message key="addProject.scmUrl.required"/>
     </field-validator>
+    <field-validator type="regex">
+      <param name="expression"><![CDATA[[a-zA-Z0-9_.:${}#~=@\\/|\[\]-]*]]></param>
+      <message key="addProject.scmUrl.invalid"/>
+    </field-validator>
+  </field>
+  <field name="projectScmTag">
+    <field-validator type="regex">
+      <param name="trim">true</param>
+      <param name="expression"><![CDATA[[a-zA-Z0-9_.:@\\/|#~=\[\]-]*]]></param>
+      <message key="addProject.scmTag.invalid"/>
+    </field-validator>
   </field>
 </validators>

Modified: continuum/branches/continuum-1.3.x/continuum-webapp/src/main/resources/org/apache/maven/continuum/web/action/AddProjectAction.properties
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-1.3.x/continuum-webapp/src/main/resources/org/apache/maven/continuum/web/action/AddProjectAction.properties?rev=1101669&r1=1101668&r2=1101669&view=diff
==============================================================================
--- continuum/branches/continuum-1.3.x/continuum-webapp/src/main/resources/org/apache/maven/continuum/web/action/AddProjectAction.properties (original)
+++ continuum/branches/continuum-1.3.x/continuum-webapp/src/main/resources/org/apache/maven/continuum/web/action/AddProjectAction.properties Tue May 10 22:46:21 2011
@@ -18,6 +18,10 @@
 #
 
 addProject.name.required = Name is required and cannot contain null or spaces only
-addProject.version.required = Version is required and cannot contain null or spaces only
-addProject.scmUrl.required = SCM Url is required and cannot contain null or spaces only
+addProject.name.invalid = Name contains invalid characters.
+addProject.version.required = Version is required and cannot contain null or spaces only.
+addProject.version.invalid = Version contains invalid characters.
+addProject.scmUrl.required = SCM Url is required and cannot contain null or spaces only.
+addProject.scmUrl.invalid =  SCM Url contains invalid characters.
+addProject.scmTag.invalid = SCM Tag contains invalid characters.
 addProject.projectGroup.required = Project Group is required and all projects must be in a project group

Added: continuum/branches/continuum-1.3.x/continuum-webapp/src/main/resources/org/apache/maven/continuum/web/action/AddProjectGroupAction-addProjectGroup-validation.xml
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-1.3.x/continuum-webapp/src/main/resources/org/apache/maven/continuum/web/action/AddProjectGroupAction-addProjectGroup-validation.xml?rev=1101669&view=auto
==============================================================================
--- continuum/branches/continuum-1.3.x/continuum-webapp/src/main/resources/org/apache/maven/continuum/web/action/AddProjectGroupAction-addProjectGroup-validation.xml (added)
+++ continuum/branches/continuum-1.3.x/continuum-webapp/src/main/resources/org/apache/maven/continuum/web/action/AddProjectGroupAction-addProjectGroup-validation.xml Tue May 10 22:46:21 2011
@@ -0,0 +1,86 @@
+<!--
+  ~ Licensed to the Apache Software Foundation (ASF) under one
+  ~ or more contributor license agreements.  See the NOTICE file
+  ~ distributed with this work for additional information
+  ~ regarding copyright ownership.  The ASF licenses this file
+  ~ to you under the Apache License, Version 2.0 (the
+  ~ "License"); you may not use this file except in compliance
+  ~ with the License.  You may obtain a copy of the License at
+  ~
+  ~   http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing,
+  ~ software distributed under the License is distributed on an
+  ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+  ~ KIND, either express or implied.  See the License for the
+  ~ specific language governing permissions and limitations
+  ~ under the License.
+  -->
+
+<!DOCTYPE validators PUBLIC
+    "-//OpenSymphony Group//XWork Validator 1.0.2//EN"
+    "http://www.opensymphony.com/xwork/xwork-validator-1.0.2.dtd">
+
+<validators>
+  <field name="name">
+    <field-validator type="requiredstring">
+      <message key="addProjectGroup.name.required"/>
+    </field-validator>
+    <field-validator type="regex">
+      <param name="expression"><![CDATA[[A-Za-z0-9_.\s\-]*]]></param>
+      <message key="addProjectGroup.name.invalid"/>
+    </field-validator>
+  </field>
+  <field name="groupId">
+    <field-validator type="requiredstring">
+      <message key="addProjectGroup.groupId.required"/>
+    </field-validator>
+    <field-validator type="regex">
+      <param name="expression"><![CDATA[[a-zA-Z0-9.\\s]*]]></param>
+      <message key="addProjectGroup.groupId.invalid"/>
+    </field-validator>
+  </field>
+</validators>
+<!--
+  ~ Licensed to the Apache Software Foundation (ASF) under one
+  ~ or more contributor license agreements.  See the NOTICE file
+  ~ distributed with this work for additional information
+  ~ regarding copyright ownership.  The ASF licenses this file
+  ~ to you under the Apache License, Version 2.0 (the
+  ~ "License"); you may not use this file except in compliance
+  ~ with the License.  You may obtain a copy of the License at
+  ~
+  ~   http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing,
+  ~ software distributed under the License is distributed on an
+  ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+  ~ KIND, either express or implied.  See the License for the
+  ~ specific language governing permissions and limitations
+  ~ under the License.
+  -->
+
+<!DOCTYPE validators PUBLIC
+    "-//OpenSymphony Group//XWork Validator 1.0.2//EN"
+    "http://www.opensymphony.com/xwork/xwork-validator-1.0.2.dtd">
+
+<validators>
+  <field name="name">
+    <field-validator type="requiredstring">
+      <message key="addProjectGroup.name.required"/>
+    </field-validator>
+    <field-validator type="regex">
+      <param name="expression"><![CDATA[[A-Za-z0-9_.\s\-]*]]></param>
+      <message key="addProjectGroup.name.invalid"/>
+    </field-validator>
+  </field>
+  <field name="groupId">
+    <field-validator type="requiredstring">
+      <message key="addProjectGroup.groupId.required"/>
+    </field-validator>
+    <field-validator type="regex">
+      <param name="expression"><![CDATA[[a-zA-Z0-9.\\s]*]]></param>
+      <message key="addProjectGroup.groupId.invalid"/>
+    </field-validator>
+  </field>
+</validators>
\ No newline at end of file

Added: continuum/branches/continuum-1.3.x/continuum-webapp/src/main/resources/org/apache/maven/continuum/web/action/AddProjectGroupAction.properties
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-1.3.x/continuum-webapp/src/main/resources/org/apache/maven/continuum/web/action/AddProjectGroupAction.properties?rev=1101669&view=auto
==============================================================================
--- continuum/branches/continuum-1.3.x/continuum-webapp/src/main/resources/org/apache/maven/continuum/web/action/AddProjectGroupAction.properties (added)
+++ continuum/branches/continuum-1.3.x/continuum-webapp/src/main/resources/org/apache/maven/continuum/web/action/AddProjectGroupAction.properties Tue May 10 22:46:21 2011
@@ -0,0 +1,48 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+
+addProjectGroup.name.required = Project Group Name is required
+addProjectGroup.name.invalid = Name contains invalid characters.
+addProjectGroup.groupId.required = Project Group ID is required
+addProjectGroup.groupId.invalid = Id contains invalid characters.
+
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+
+addProjectGroup.name.required = Project Group Name is required
+addProjectGroup.name.invalid = Name contains invalid characters.
+addProjectGroup.groupId.required = Project Group ID is required
+addProjectGroup.groupId.invalid = Id contains invalid characters.
+

Added: continuum/branches/continuum-1.3.x/continuum-webapp/src/main/resources/org/apache/maven/continuum/web/action/AddProjectGroupAction_de.properties
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-1.3.x/continuum-webapp/src/main/resources/org/apache/maven/continuum/web/action/AddProjectGroupAction_de.properties?rev=1101669&view=auto
==============================================================================
--- continuum/branches/continuum-1.3.x/continuum-webapp/src/main/resources/org/apache/maven/continuum/web/action/AddProjectGroupAction_de.properties (added)
+++ continuum/branches/continuum-1.3.x/continuum-webapp/src/main/resources/org/apache/maven/continuum/web/action/AddProjectGroupAction_de.properties Tue May 10 22:46:21 2011
@@ -0,0 +1,40 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+
+addProjectGroup.name.required = Es mu\u00DF ein Projektgruppen-Name angegeben werden.
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+
+addProjectGroup.name.required = Es mu\u00DF ein Projektgruppen-Name angegeben werden.

Added: continuum/branches/continuum-1.3.x/continuum-webapp/src/main/resources/org/apache/maven/continuum/web/action/AddProjectGroupAction_en.properties
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-1.3.x/continuum-webapp/src/main/resources/org/apache/maven/continuum/web/action/AddProjectGroupAction_en.properties?rev=1101669&view=auto
==============================================================================
--- continuum/branches/continuum-1.3.x/continuum-webapp/src/main/resources/org/apache/maven/continuum/web/action/AddProjectGroupAction_en.properties (added)
+++ continuum/branches/continuum-1.3.x/continuum-webapp/src/main/resources/org/apache/maven/continuum/web/action/AddProjectGroupAction_en.properties Tue May 10 22:46:21 2011
@@ -0,0 +1,40 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+
+
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+
+

Added: continuum/branches/continuum-1.3.x/continuum-webapp/src/main/resources/org/apache/maven/continuum/web/action/AddProjectGroupAction_fr.properties
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-1.3.x/continuum-webapp/src/main/resources/org/apache/maven/continuum/web/action/AddProjectGroupAction_fr.properties?rev=1101669&view=auto
==============================================================================
--- continuum/branches/continuum-1.3.x/continuum-webapp/src/main/resources/org/apache/maven/continuum/web/action/AddProjectGroupAction_fr.properties (added)
+++ continuum/branches/continuum-1.3.x/continuum-webapp/src/main/resources/org/apache/maven/continuum/web/action/AddProjectGroupAction_fr.properties Tue May 10 22:46:21 2011
@@ -0,0 +1,40 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+
+addProjectGroup.name.required = le nom du groupe de projets est obligatoire
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+
+addProjectGroup.name.required = le nom du groupe de projets est obligatoire

Added: continuum/branches/continuum-1.3.x/continuum-webapp/src/main/resources/org/apache/maven/continuum/web/action/AddProjectGroupAction_pt_BR.properties
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-1.3.x/continuum-webapp/src/main/resources/org/apache/maven/continuum/web/action/AddProjectGroupAction_pt_BR.properties?rev=1101669&view=auto
==============================================================================
--- continuum/branches/continuum-1.3.x/continuum-webapp/src/main/resources/org/apache/maven/continuum/web/action/AddProjectGroupAction_pt_BR.properties (added)
+++ continuum/branches/continuum-1.3.x/continuum-webapp/src/main/resources/org/apache/maven/continuum/web/action/AddProjectGroupAction_pt_BR.properties Tue May 10 22:46:21 2011
@@ -0,0 +1,38 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+addProjectGroup.name.required=Nome de Grupo do Projeto \u00E9 obrigat\u00F3rio
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+addProjectGroup.name.required=Nome de Grupo do Projeto \u00E9 obrigat\u00F3rio

Modified: continuum/branches/continuum-1.3.x/continuum-webapp/src/main/resources/org/apache/maven/continuum/web/action/BuildDefinitionAction-saveBuildDefinition-validation.xml
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-1.3.x/continuum-webapp/src/main/resources/org/apache/maven/continuum/web/action/BuildDefinitionAction-saveBuildDefinition-validation.xml?rev=1101669&r1=1101668&r2=1101669&view=diff
==============================================================================
--- continuum/branches/continuum-1.3.x/continuum-webapp/src/main/resources/org/apache/maven/continuum/web/action/BuildDefinitionAction-saveBuildDefinition-validation.xml (original)
+++ continuum/branches/continuum-1.3.x/continuum-webapp/src/main/resources/org/apache/maven/continuum/web/action/BuildDefinitionAction-saveBuildDefinition-validation.xml Tue May 10 22:46:21 2011
@@ -26,5 +26,24 @@
     <field-validator type="requiredstring">
       <message key="buildDefinition.buildFile.required"/>
     </field-validator>
+    <field-validator type="regex">
+      <param name="trim">true</param>
+      <param name="expression"><![CDATA[[A-Za-z0-9_.\-]*]]></param>
+      <message key="buildDefinition.buildFile.invalid"/>
+    </field-validator>
+  </field>
+  <field name="goals">
+    <field-validator type="regex">
+      <param name="trim">true</param>
+      <param name="expression"><![CDATA[[A-Za-z0-9_:\s\-]*]]></param>
+      <message key="buildDefinition.goals.invalid"/>
+    </field-validator>
+  </field>
+  <field name="arguments">
+    <field-validator type="regex">
+      <param name="trim">true</param>
+      <param name="expression"><![CDATA[[A-Za-z0-9_.\\/=,":\s\-]*]]></param>
+      <message key="buildDefinition.arguments.invalid"/>
+    </field-validator>
   </field>
 </validators>

Modified: continuum/branches/continuum-1.3.x/continuum-webapp/src/main/resources/org/apache/maven/continuum/web/action/BuildDefinitionAction.properties
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-1.3.x/continuum-webapp/src/main/resources/org/apache/maven/continuum/web/action/BuildDefinitionAction.properties?rev=1101669&r1=1101668&r2=1101669&view=diff
==============================================================================
--- continuum/branches/continuum-1.3.x/continuum-webapp/src/main/resources/org/apache/maven/continuum/web/action/BuildDefinitionAction.properties (original)
+++ continuum/branches/continuum-1.3.x/continuum-webapp/src/main/resources/org/apache/maven/continuum/web/action/BuildDefinitionAction.properties Tue May 10 22:46:21 2011
@@ -17,4 +17,7 @@
 # under the License.
 #
 
-buildDefinition.buildFile.required = Build file is required and cannot contain spaces only
+buildDefinition.buildFile.required = Build file is required and cannot contain spaces only.
+buildDefinition.buildFile.invalid = Build file contains invalid characters.
+buildDefinition.goals.invalid = Goals contains invalid characters.
+buildDefinition.arguments.invalid = Arguments contains invalid characters. 

Modified: continuum/branches/continuum-1.3.x/continuum-webapp/src/main/resources/org/apache/maven/continuum/web/action/ProjectEditAction-projectSave-validation.xml
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-1.3.x/continuum-webapp/src/main/resources/org/apache/maven/continuum/web/action/ProjectEditAction-projectSave-validation.xml?rev=1101669&r1=1101668&r2=1101669&view=diff
==============================================================================
--- continuum/branches/continuum-1.3.x/continuum-webapp/src/main/resources/org/apache/maven/continuum/web/action/ProjectEditAction-projectSave-validation.xml (original)
+++ continuum/branches/continuum-1.3.x/continuum-webapp/src/main/resources/org/apache/maven/continuum/web/action/ProjectEditAction-projectSave-validation.xml Tue May 10 22:46:21 2011
@@ -26,15 +26,37 @@
     <field-validator type="requiredstring">
       <message key="projectEdit.name.required"/>
     </field-validator>
+    <field-validator type="regex">
+      <param name="trim">true</param>
+      <param name="expression"><![CDATA[[a-zA-Z0-9_.\s:-]*]]></param>
+      <message key="projectEdit.name.invalid"/>
+    </field-validator>
   </field>
   <field name="version">
     <field-validator type="requiredstring">
       <message key="projectEdit.version.required"/>
     </field-validator>
+    <field-validator type="regex">
+      <param name="trim">true</param>
+      <param name="expression"><![CDATA[[a-zA-Z0-9.-]*]]></param>
+      <message key="projectEdit.version.invalid"/>
+    </field-validator>
   </field>
   <field name="scmUrl">
     <field-validator type="requiredstring">
       <message key="projectEdit.scmUrl.required"/>
     </field-validator>
+    <field-validator type="regex">
+      <param name="trim">true</param>
+      <param name="expression"><![CDATA[[a-zA-Z0-9_.:@\\/|#~=\[\]-]*]]></param>
+      <message key="projectEdit.scmUrl.invalid"/>
+    </field-validator>
+  </field>
+  <field name="scmTag">
+    <field-validator type="regex">
+      <param name="trim">true</param>
+      <param name="expression"><![CDATA[[a-zA-Z0-9_.:@\\/|#~=\[\]-]*]]></param>
+      <message key="projectEdit.scmTag.invalid"/>
+    </field-validator>
   </field>
 </validators>

Modified: continuum/branches/continuum-1.3.x/continuum-webapp/src/main/resources/org/apache/maven/continuum/web/action/ProjectEditAction.properties
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-1.3.x/continuum-webapp/src/main/resources/org/apache/maven/continuum/web/action/ProjectEditAction.properties?rev=1101669&r1=1101668&r2=1101669&view=diff
==============================================================================
--- continuum/branches/continuum-1.3.x/continuum-webapp/src/main/resources/org/apache/maven/continuum/web/action/ProjectEditAction.properties (original)
+++ continuum/branches/continuum-1.3.x/continuum-webapp/src/main/resources/org/apache/maven/continuum/web/action/ProjectEditAction.properties Tue May 10 22:46:21 2011
@@ -17,6 +17,10 @@
 # under the License.
 #
 
-projectEdit.name.required = Project Name is required
-projectEdit.version.required = version is required
-projectEdit.scmUrl.required = scmUrl is required
+projectEdit.name.required = Project Name is required.
+projectEdit.name.invalid = Name contains invalid characters.
+projectEdit.version.required = Version is required.
+projectEdit.version.invalid = Version contains invalid characters.
+projectEdit.scmUrl.required = Scm Url is required.
+projectEdit.scmUrl.invalid = Scm Url contains invalid characters.
+projectEdit.scmTag.invalid = Scm Tag contains invalid characters.
\ No newline at end of file

Modified: continuum/branches/continuum-1.3.x/continuum-webapp/src/main/resources/org/apache/maven/continuum/web/action/ProjectGroupAction-saveProjectGroup-validation.xml
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-1.3.x/continuum-webapp/src/main/resources/org/apache/maven/continuum/web/action/ProjectGroupAction-saveProjectGroup-validation.xml?rev=1101669&r1=1101668&r2=1101669&view=diff
==============================================================================
--- continuum/branches/continuum-1.3.x/continuum-webapp/src/main/resources/org/apache/maven/continuum/web/action/ProjectGroupAction-saveProjectGroup-validation.xml (original)
+++ continuum/branches/continuum-1.3.x/continuum-webapp/src/main/resources/org/apache/maven/continuum/web/action/ProjectGroupAction-saveProjectGroup-validation.xml Tue May 10 22:46:21 2011
@@ -23,8 +23,12 @@
 
 <validators>
   <field name="name">
-    <field-validator type="required">
+    <field-validator type="requiredstring">
       <message key="projectGroup.name.required"/>
     </field-validator>
+    <field-validator type="regex">
+      <param name="expression"><![CDATA[[A-Za-z0-9_.\s\-]*]]></param>
+      <message key="projectGroup.name.invalid"/>
+    </field-validator>
   </field>
-</validators>
+</validators>
\ No newline at end of file

Modified: continuum/branches/continuum-1.3.x/continuum-webapp/src/main/resources/org/apache/maven/continuum/web/action/ProjectGroupAction.properties
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-1.3.x/continuum-webapp/src/main/resources/org/apache/maven/continuum/web/action/ProjectGroupAction.properties?rev=1101669&r1=1101668&r2=1101669&view=diff
==============================================================================
--- continuum/branches/continuum-1.3.x/continuum-webapp/src/main/resources/org/apache/maven/continuum/web/action/ProjectGroupAction.properties (original)
+++ continuum/branches/continuum-1.3.x/continuum-webapp/src/main/resources/org/apache/maven/continuum/web/action/ProjectGroupAction.properties Tue May 10 22:46:21 2011
@@ -18,3 +18,5 @@
 #
 
 projectGroup.name.required = Project Group Name is required
+projectGroup.name.invalid = Name contains invalid characters.
+

Modified: continuum/branches/continuum-1.3.x/continuum-webapp/src/main/resources/org/apache/maven/continuum/web/action/ScheduleAction-saveSchedule-validation.xml
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-1.3.x/continuum-webapp/src/main/resources/org/apache/maven/continuum/web/action/ScheduleAction-saveSchedule-validation.xml?rev=1101669&r1=1101668&r2=1101669&view=diff
==============================================================================
--- continuum/branches/continuum-1.3.x/continuum-webapp/src/main/resources/org/apache/maven/continuum/web/action/ScheduleAction-saveSchedule-validation.xml (original)
+++ continuum/branches/continuum-1.3.x/continuum-webapp/src/main/resources/org/apache/maven/continuum/web/action/ScheduleAction-saveSchedule-validation.xml Tue May 10 22:46:21 2011
@@ -26,10 +26,15 @@
     <field-validator type="requiredstring">
       <message key="schedule.name.required"/>
     </field-validator>
+    <field-validator type="regex">
+      <param name="trim">true</param>
+      <param name="expression"><![CDATA[[a-zA-Z0-9_.\s-]*]]></param>
+      <message key="schedule.name.invalid"/>
+    </field-validator>
   </field>
   <field name="description">
     <field-validator type="requiredstring">
-      <message key="schedule.version.required"/>
+      <message key="schedule.description.required"/>
     </field-validator>
   </field>
   <field name="maxJobExecutionTime">

Modified: continuum/branches/continuum-1.3.x/continuum-webapp/src/main/resources/org/apache/maven/continuum/web/action/ScheduleAction.properties
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-1.3.x/continuum-webapp/src/main/resources/org/apache/maven/continuum/web/action/ScheduleAction.properties?rev=1101669&r1=1101668&r2=1101669&view=diff
==============================================================================
--- continuum/branches/continuum-1.3.x/continuum-webapp/src/main/resources/org/apache/maven/continuum/web/action/ScheduleAction.properties (original)
+++ continuum/branches/continuum-1.3.x/continuum-webapp/src/main/resources/org/apache/maven/continuum/web/action/ScheduleAction.properties Tue May 10 22:46:21 2011
@@ -17,8 +17,9 @@
 # under the License.
 #
 
-schedule.name.required = Name is required and cannot contain spaces only
-schedule.version.required = Description is required and cannot contain spaces only
-schedule.maxJobExecutionTime.required = Maximum job execution time is required
-schedule.maxJobExecutionTime.invalid = Maximum job execution time must be an integer
-schedule.delay.invalid = Quiet period must be an integer 
+schedule.name.required = Name is required and cannot contain spaces only.
+schedule.name.invalid = Name contains invalid characters.
+schedule.description.required = Description is required and cannot contain spaces only.
+schedule.maxJobExecutionTime.required = Maximum job execution time is required.
+schedule.maxJobExecutionTime.invalid = Maximum job execution time must be an integer.
+schedule.delay.invalid = Quiet period must be an integer.

Modified: continuum/branches/continuum-1.3.x/continuum-webapp/src/main/resources/org/apache/maven/continuum/web/action/ScheduleAction_de.properties
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-1.3.x/continuum-webapp/src/main/resources/org/apache/maven/continuum/web/action/ScheduleAction_de.properties?rev=1101669&r1=1101668&r2=1101669&view=diff
==============================================================================
--- continuum/branches/continuum-1.3.x/continuum-webapp/src/main/resources/org/apache/maven/continuum/web/action/ScheduleAction_de.properties (original)
+++ continuum/branches/continuum-1.3.x/continuum-webapp/src/main/resources/org/apache/maven/continuum/web/action/ScheduleAction_de.properties Tue May 10 22:46:21 2011
@@ -18,7 +18,7 @@
 #
 
 schedule.name.required = Es mu\u00DF ein Name angegeben werden.
-schedule.version.required = Es mu\u00DF eine Beschreibung angegeben werden.
+schedule.description.required = Es mu\u00DF eine Beschreibung angegeben werden.
 schedule.maxJobExecutionTime.required = Es mu\u00DF eine maximale Ausf\u00FChrungszeit angegeben werden.
 schedule.maxJobExecutionTime.invalid = Es mu\u00DF eine Zahl f\u00FCr die maximale Ausf\u00FChrungszeit angegeben werden.
 schedule.delay.invalid = Es mu\u00DF eine Zahl f\u00FCr die Ruhezeit angegeben werden.

Modified: continuum/branches/continuum-1.3.x/continuum-webapp/src/main/resources/org/apache/maven/continuum/web/action/ScheduleAction_fr.properties
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-1.3.x/continuum-webapp/src/main/resources/org/apache/maven/continuum/web/action/ScheduleAction_fr.properties?rev=1101669&r1=1101668&r2=1101669&view=diff
==============================================================================
--- continuum/branches/continuum-1.3.x/continuum-webapp/src/main/resources/org/apache/maven/continuum/web/action/ScheduleAction_fr.properties (original)
+++ continuum/branches/continuum-1.3.x/continuum-webapp/src/main/resources/org/apache/maven/continuum/web/action/ScheduleAction_fr.properties Tue May 10 22:46:21 2011
@@ -18,7 +18,7 @@
 #
 
 schedule.name.required = le nom est obligatoire et ne peut pas contenir uniquement des espaces
-schedule.version.required = la description est obligatoire et ne peut pas contenir uniquement des espaces
+schedule.description.required = la description est obligatoire et ne peut pas contenir uniquement des espaces
 schedule.maxJobExecutionTime.required = le temp d''ex\u00e9cution du travail maximum est obligatoire
 schedule.maxJobExecutionTime.invalid = le temp d''ex\u00e9cution du travail maximum doit \u00eatre un entier
 schedule.delay.invalid = la p\u00e9riode d''attente doit \u00eatre un entier 

Modified: continuum/branches/continuum-1.3.x/continuum-webapp/src/main/resources/org/apache/maven/continuum/web/action/ScheduleAction_pt_BR.properties
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-1.3.x/continuum-webapp/src/main/resources/org/apache/maven/continuum/web/action/ScheduleAction_pt_BR.properties?rev=1101669&r1=1101668&r2=1101669&view=diff
==============================================================================
--- continuum/branches/continuum-1.3.x/continuum-webapp/src/main/resources/org/apache/maven/continuum/web/action/ScheduleAction_pt_BR.properties (original)
+++ continuum/branches/continuum-1.3.x/continuum-webapp/src/main/resources/org/apache/maven/continuum/web/action/ScheduleAction_pt_BR.properties Tue May 10 22:46:21 2011
@@ -20,4 +20,4 @@ schedule.delay.invalid=Per\u00EDodo de e
 schedule.maxJobExecutionTime.invalid=Tempo de execu\u00E7\u00E3o m\u00E1xima de um job deve ser um inteiro
 schedule.maxJobExecutionTime.required=Tempo de execu\u00E7\u00E3o m\u00E1xima de um job \u00E9 obrigat\u00F3rio
 schedule.name.required=Nome \u00E9 obrigat\u00F3rio e n\u00E3o pode conter somente espa\u00E7os
-schedule.version.required=Descri\u00E7\u00E3o \u00E9 obrigat\u00F3ria e n\u00E3o pode conter somente espa\u00E7os
+schedule.description.required=Descri\u00E7\u00E3o \u00E9 obrigat\u00F3ria e n\u00E3o pode conter somente espa\u00E7os

Modified: continuum/branches/continuum-1.3.x/continuum-webapp/src/main/resources/org/apache/maven/continuum/web/action/admin/BuildDefinitionTemplateAction-saveBuildDefinitionAsTemplate-validation.xml
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-1.3.x/continuum-webapp/src/main/resources/org/apache/maven/continuum/web/action/admin/BuildDefinitionTemplateAction-saveBuildDefinitionAsTemplate-validation.xml?rev=1101669&r1=1101668&r2=1101669&view=diff
==============================================================================
--- continuum/branches/continuum-1.3.x/continuum-webapp/src/main/resources/org/apache/maven/continuum/web/action/admin/BuildDefinitionTemplateAction-saveBuildDefinitionAsTemplate-validation.xml (original)
+++ continuum/branches/continuum-1.3.x/continuum-webapp/src/main/resources/org/apache/maven/continuum/web/action/admin/BuildDefinitionTemplateAction-saveBuildDefinitionAsTemplate-validation.xml Tue May 10 22:46:21 2011
@@ -24,12 +24,28 @@
 <validators>
   <field name="buildDefinition.buildFile">
     <field-validator type="requiredstring">
-      <message key="buildDefintion.buildFile.required"/>
+      <message key="buildDefinition.buildFile.required"/>
+    </field-validator>
+    <field-validator type="regex">
+      <param name="expression"><![CDATA[[A-Za-z0-9_.\-]*]]></param>
+      <message key="buildDefinition.buildFile.invalid"/>
     </field-validator>
   </field>
   <field name="buildDefinition.description">
     <field-validator type="requiredstring">
-      <message key="buildDefintion.description.required"/>
+      <message key="buildDefinition.description.required"/>
+    </field-validator>
+  </field>
+  <field name="buildDefinition.goals">
+    <field-validator type="regex">
+      <param name="expression"><![CDATA[[A-Za-z0-9_:\s\-]*]]></param>
+      <message key="buildDefinition.goals.invalid"/>
     </field-validator>
-  </field>  
+  </field>
+  <field name="buildDefinition.arguments">
+    <field-validator type="regex">
+      <param name="expression"><![CDATA[[A-Za-z0-9_.\\/=,":\s\-]*]]></param>
+      <message key="buildDefinition.arguments.invalid"/>
+    </field-validator>
+  </field>
 </validators>
\ No newline at end of file

Modified: continuum/branches/continuum-1.3.x/continuum-webapp/src/main/resources/org/apache/maven/continuum/web/action/admin/BuildDefinitionTemplateAction-saveBuildDefinitionTemplate-validation.xml
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-1.3.x/continuum-webapp/src/main/resources/org/apache/maven/continuum/web/action/admin/BuildDefinitionTemplateAction-saveBuildDefinitionTemplate-validation.xml?rev=1101669&r1=1101668&r2=1101669&view=diff
==============================================================================
--- continuum/branches/continuum-1.3.x/continuum-webapp/src/main/resources/org/apache/maven/continuum/web/action/admin/BuildDefinitionTemplateAction-saveBuildDefinitionTemplate-validation.xml (original)
+++ continuum/branches/continuum-1.3.x/continuum-webapp/src/main/resources/org/apache/maven/continuum/web/action/admin/BuildDefinitionTemplateAction-saveBuildDefinitionTemplate-validation.xml Tue May 10 22:46:21 2011
@@ -24,7 +24,11 @@
 <validators>
   <field name="buildDefinitionTemplate.name">
     <field-validator type="requiredstring">
-      <message key="buildDefintionTemplate.name.required"/>
+      <message key="buildDefinitionTemplate.name.required"/>
+    </field-validator>
+    <field-validator type="regex">
+      <param name="expression"><![CDATA[[A-Za-z0-9_.\s\-]*]]></param>
+      <message key="buildDefinitionTemplate.name.invalid"/>
     </field-validator>
   </field>
 </validators>
\ No newline at end of file

Modified: continuum/branches/continuum-1.3.x/continuum-webapp/src/main/resources/org/apache/maven/continuum/web/action/admin/BuildDefinitionTemplateAction.properties
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-1.3.x/continuum-webapp/src/main/resources/org/apache/maven/continuum/web/action/admin/BuildDefinitionTemplateAction.properties?rev=1101669&r1=1101668&r2=1101669&view=diff
==============================================================================
--- continuum/branches/continuum-1.3.x/continuum-webapp/src/main/resources/org/apache/maven/continuum/web/action/admin/BuildDefinitionTemplateAction.properties (original)
+++ continuum/branches/continuum-1.3.x/continuum-webapp/src/main/resources/org/apache/maven/continuum/web/action/admin/BuildDefinitionTemplateAction.properties Tue May 10 22:46:21 2011
@@ -16,7 +16,12 @@
 # specific language governing permissions and limitations
 # under the License.
 #
-buildDefintionTemplate.name.exists = Name already exists
-buildDefintionTemplate.name.required = Name is required
-buildDefintion.buildFile.required = BuildFile is required
-buildDefintion.description.required = Description is required
+
+buildDefinitionTemplate.name.exists = Name already exists
+buildDefinitionTemplate.name.required = Name is required
+buildDefinitionTemplate.name.invalid = Name contains invalid characters
+buildDefinition.buildFile.required = BuildFile is required
+buildDefinition.buildFile.invalid = BuildFile contains invalid characters
+buildDefinition.description.required = Description is required
+buildDefinition.goals.invalid = Goals contain invalid characters
+buildDefinition.arguments.invalid = Arguments contain invalid characters

Modified: continuum/branches/continuum-1.3.x/continuum-webapp/src/main/resources/org/apache/maven/continuum/web/action/admin/BuildDefinitionTemplateAction_de.properties
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-1.3.x/continuum-webapp/src/main/resources/org/apache/maven/continuum/web/action/admin/BuildDefinitionTemplateAction_de.properties?rev=1101669&r1=1101668&r2=1101669&view=diff
==============================================================================
--- continuum/branches/continuum-1.3.x/continuum-webapp/src/main/resources/org/apache/maven/continuum/web/action/admin/BuildDefinitionTemplateAction_de.properties (original)
+++ continuum/branches/continuum-1.3.x/continuum-webapp/src/main/resources/org/apache/maven/continuum/web/action/admin/BuildDefinitionTemplateAction_de.properties Tue May 10 22:46:21 2011
@@ -16,6 +16,6 @@
 # specific language governing permissions and limitations
 # under the License.
 #
-buildDefintionTemplate.name.required = Es mu\u00DF ein Name angegeben werden.
-buildDefintion.buildFile.required = Es mu\u00DF eine Projektdatei angegeben werden.
-buildDefintion.description.required = Es mu\u00DF eine Beschreibung angegeben werden.
+buildDefinitionTemplate.name.required = Es mu\u00DF ein Name angegeben werden.
+buildDefinition.buildFile.required = Es mu\u00DF eine Projektdatei angegeben werden.
+buildDefinition.description.required = Es mu\u00DF eine Beschreibung angegeben werden.

Modified: continuum/branches/continuum-1.3.x/continuum-webapp/src/main/resources/org/apache/maven/continuum/web/action/admin/BuildDefinitionTemplateAction_fr.properties
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-1.3.x/continuum-webapp/src/main/resources/org/apache/maven/continuum/web/action/admin/BuildDefinitionTemplateAction_fr.properties?rev=1101669&r1=1101668&r2=1101669&view=diff
==============================================================================
--- continuum/branches/continuum-1.3.x/continuum-webapp/src/main/resources/org/apache/maven/continuum/web/action/admin/BuildDefinitionTemplateAction_fr.properties (original)
+++ continuum/branches/continuum-1.3.x/continuum-webapp/src/main/resources/org/apache/maven/continuum/web/action/admin/BuildDefinitionTemplateAction_fr.properties Tue May 10 22:46:21 2011
@@ -16,6 +16,6 @@
 # specific language governing permissions and limitations
 # under the License.
 #
-buildDefintionTemplate.name.required = le nom est obligatoire
-buildDefintion.buildFile.required = le fichier de construction est obligatoire
-buildDefintion.description.required = la description est obligatoire
+buildDefinitionTemplate.name.required = le nom est obligatoire
+buildDefinition.buildFile.required = le fichier de construction est obligatoire
+buildDefinition.description.required = la description est obligatoire

Modified: continuum/branches/continuum-1.3.x/continuum-webapp/src/main/resources/org/apache/maven/continuum/web/action/admin/BuildDefinitionTemplateAction_pt_BR.properties
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-1.3.x/continuum-webapp/src/main/resources/org/apache/maven/continuum/web/action/admin/BuildDefinitionTemplateAction_pt_BR.properties?rev=1101669&r1=1101668&r2=1101669&view=diff
==============================================================================
--- continuum/branches/continuum-1.3.x/continuum-webapp/src/main/resources/org/apache/maven/continuum/web/action/admin/BuildDefinitionTemplateAction_pt_BR.properties (original)
+++ continuum/branches/continuum-1.3.x/continuum-webapp/src/main/resources/org/apache/maven/continuum/web/action/admin/BuildDefinitionTemplateAction_pt_BR.properties Tue May 10 22:46:21 2011
@@ -16,6 +16,6 @@
 # specific language governing permissions and limitations
 # under the License.
 #
-buildDefintionTemplate.name.required = Nome é obrigatório
-buildDefintion.buildFile.required = Arquivo de Build é obrigatório
-buildDefintion.description.required = Descrição é obrigatória
\ No newline at end of file
+buildDefinitionTemplate.name.required = Nome é obrigatório
+buildDefinition.buildFile.required = Arquivo de Build é obrigatório
+buildDefinition.description.required = Descrição é obrigatória
\ No newline at end of file

Modified: continuum/branches/continuum-1.3.x/continuum-webapp/src/main/resources/org/apache/maven/continuum/web/action/admin/BuildQueueAction-saveBuildQueue-validation.xml
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-1.3.x/continuum-webapp/src/main/resources/org/apache/maven/continuum/web/action/admin/BuildQueueAction-saveBuildQueue-validation.xml?rev=1101669&r1=1101668&r2=1101669&view=diff
==============================================================================
--- continuum/branches/continuum-1.3.x/continuum-webapp/src/main/resources/org/apache/maven/continuum/web/action/admin/BuildQueueAction-saveBuildQueue-validation.xml (original)
+++ continuum/branches/continuum-1.3.x/continuum-webapp/src/main/resources/org/apache/maven/continuum/web/action/admin/BuildQueueAction-saveBuildQueue-validation.xml Tue May 10 22:46:21 2011
@@ -26,5 +26,9 @@
     <field-validator type="requiredstring">
       <message key="buildqueue.name.required"/>
     </field-validator>
+    <field-validator type="regex">
+      <param name="expression"><![CDATA[[A-Za-z0-9_.\s\-]*]]></param>
+      <message key="buildqueue.name.invalid"/>
+    </field-validator>
   </field>
 </validators>

Modified: continuum/branches/continuum-1.3.x/continuum-webapp/src/main/resources/org/apache/maven/continuum/web/action/admin/BuildQueueAction.properties
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-1.3.x/continuum-webapp/src/main/resources/org/apache/maven/continuum/web/action/admin/BuildQueueAction.properties?rev=1101669&r1=1101668&r2=1101669&view=diff
==============================================================================
--- continuum/branches/continuum-1.3.x/continuum-webapp/src/main/resources/org/apache/maven/continuum/web/action/admin/BuildQueueAction.properties (original)
+++ continuum/branches/continuum-1.3.x/continuum-webapp/src/main/resources/org/apache/maven/continuum/web/action/admin/BuildQueueAction.properties Tue May 10 22:46:21 2011
@@ -18,3 +18,4 @@
 #
 
 buildqueue.name.required = You must define a name.
+buildqueue.name.invalid = Build queue name contains invalid characters.
\ No newline at end of file

Modified: continuum/branches/continuum-1.3.x/continuum-webapp/src/main/resources/org/apache/maven/continuum/web/action/admin/ConfigurationAction-configuration-validation.xml
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-1.3.x/continuum-webapp/src/main/resources/org/apache/maven/continuum/web/action/admin/ConfigurationAction-configuration-validation.xml?rev=1101669&r1=1101668&r2=1101669&view=diff
==============================================================================
--- continuum/branches/continuum-1.3.x/continuum-webapp/src/main/resources/org/apache/maven/continuum/web/action/admin/ConfigurationAction-configuration-validation.xml (original)
+++ continuum/branches/continuum-1.3.x/continuum-webapp/src/main/resources/org/apache/maven/continuum/web/action/admin/ConfigurationAction-configuration-validation.xml Tue May 10 22:46:21 2011
@@ -26,11 +26,19 @@
     <field-validator type="requiredstring">
       <message key="configuration.workingDirectory.required"/>
     </field-validator>
+    <field-validator type="regex">
+      <param name="expression"><![CDATA[[A-Za-z0-9_.:\\/\s\-]*]]></param>
+      <message key="configuration.workingDirectory.invalid"/>
+    </field-validator>
   </field>
   <field name="buildOutputDirectory">
     <field-validator type="requiredstring">
       <message key="configuration.buildOutputDirectory.required"/>
     </field-validator>
+    <field-validator type="regex">
+      <param name="expression"><![CDATA[[A-Za-z0-9_.:\\/\s\-]*]]></param>
+      <message key="configuration.buildOutputDirectory.invalid"/>
+    </field-validator>
   </field>
   <field name="baseUrl">
     <field-validator type="requiredstring" short-circuit="true">
@@ -40,4 +48,16 @@
       <message key="configuration.baseUrl.invalid"/>
     </field-validator>
   </field>
+  <field name="releaseOutputDirectory">
+    <field-validator type="regex">
+      <param name="expression"><![CDATA[[A-Za-z0-9_.:\\/\s\-]*]]></param>
+      <message key="configuration.releaseOutputDirectory.invalid"/>
+    </field-validator>
+  </field>
+  <field name="deploymentRepositoryDirectory">
+    <field-validator type="regex">
+      <param name="expression"><![CDATA[[A-Za-z0-9_.:\\/\s\-]*]]></param>
+      <message key="configuration.deploymentRepositoryDirectory.invalid"/>
+    </field-validator>
+  </field>
 </validators>

Modified: continuum/branches/continuum-1.3.x/continuum-webapp/src/main/resources/org/apache/maven/continuum/web/action/admin/ConfigurationAction.properties
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-1.3.x/continuum-webapp/src/main/resources/org/apache/maven/continuum/web/action/admin/ConfigurationAction.properties?rev=1101669&r1=1101668&r2=1101669&view=diff
==============================================================================
--- continuum/branches/continuum-1.3.x/continuum-webapp/src/main/resources/org/apache/maven/continuum/web/action/admin/ConfigurationAction.properties (original)
+++ continuum/branches/continuum-1.3.x/continuum-webapp/src/main/resources/org/apache/maven/continuum/web/action/admin/ConfigurationAction.properties Tue May 10 22:46:21 2011
@@ -18,6 +18,10 @@
 #
 
 configuration.workingDirectory.required = You must define a working directory.
+configuration.workingDirectory.invalid = Working directory contains invalid characters.
 configuration.buildOutputDirectory.required = You must define a build output directory.
+configuration.buildOutputDirectory.invalid = Build output directory contains invalid characters.
 configuration.baseUrl.required = You must define a URL.
-configuration.baseUrl.invalid = You must define a valid URL.
\ No newline at end of file
+configuration.baseUrl.invalid = You must define a valid URL.
+configuration.releaseOutputDirectory.invalid = Release output directory contains invalid characters.
+configuration.deploymentRepositoryDirectory.invalid = Deployment repository directory contains invalid characters.
\ No newline at end of file

Modified: continuum/branches/continuum-1.3.x/continuum-webapp/src/main/resources/org/apache/maven/continuum/web/action/admin/ConfigureAppearanceAction-validation.xml
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-1.3.x/continuum-webapp/src/main/resources/org/apache/maven/continuum/web/action/admin/ConfigureAppearanceAction-validation.xml?rev=1101669&r1=1101668&r2=1101669&view=diff
==============================================================================
--- continuum/branches/continuum-1.3.x/continuum-webapp/src/main/resources/org/apache/maven/continuum/web/action/admin/ConfigureAppearanceAction-validation.xml (original)
+++ continuum/branches/continuum-1.3.x/continuum-webapp/src/main/resources/org/apache/maven/continuum/web/action/admin/ConfigureAppearanceAction-validation.xml Tue May 10 22:46:21 2011
@@ -45,10 +45,18 @@
     <field-validator type="requiredstring">
       <message key="appearance.groupId.required"/>
     </field-validator>
+    <field-validator type="regex">
+      <param name="expression"><![CDATA[[A-Za-z0-9.]*]]></param>
+      <message key="appearance.groupId.invalid"/>
+    </field-validator>
   </field>
   <field name="companyPom.artifactId">
     <field-validator type="requiredstring">
       <message key="appearance.artifactId.required"/>
     </field-validator>
+    <field-validator type="regex">
+      <param name="expression"><![CDATA[[A-Za-z0-9\-]*]]></param>
+      <message key="appearance.artifactId.invalid"/>
+    </field-validator>
   </field>
 </validators>

Modified: continuum/branches/continuum-1.3.x/continuum-webapp/src/main/resources/org/apache/maven/continuum/web/action/admin/ConfigureAppearanceAction.properties
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-1.3.x/continuum-webapp/src/main/resources/org/apache/maven/continuum/web/action/admin/ConfigureAppearanceAction.properties?rev=1101669&r1=1101668&r2=1101669&view=diff
==============================================================================
--- continuum/branches/continuum-1.3.x/continuum-webapp/src/main/resources/org/apache/maven/continuum/web/action/admin/ConfigureAppearanceAction.properties (original)
+++ continuum/branches/continuum-1.3.x/continuum-webapp/src/main/resources/org/apache/maven/continuum/web/action/admin/ConfigureAppearanceAction.properties Tue May 10 22:46:21 2011
@@ -18,5 +18,7 @@
 #
 
 appearance.groupId.required = You must define a group identifier.
+appearance.groupId.invalid = Group identifier is invalid.
 appearance.artifactId.required = You must define an artifact identifier.
+appearance.artifactId.invalid = Artifact identifier is invalid.
 

Modified: continuum/branches/continuum-1.3.x/continuum-webapp/src/main/resources/org/apache/maven/continuum/web/action/admin/InstallationAction-saveInstallation-validation.xml
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-1.3.x/continuum-webapp/src/main/resources/org/apache/maven/continuum/web/action/admin/InstallationAction-saveInstallation-validation.xml?rev=1101669&r1=1101668&r2=1101669&view=diff
==============================================================================
--- continuum/branches/continuum-1.3.x/continuum-webapp/src/main/resources/org/apache/maven/continuum/web/action/admin/InstallationAction-saveInstallation-validation.xml (original)
+++ continuum/branches/continuum-1.3.x/continuum-webapp/src/main/resources/org/apache/maven/continuum/web/action/admin/InstallationAction-saveInstallation-validation.xml Tue May 10 22:46:21 2011
@@ -26,16 +26,27 @@
     <field-validator type="requiredstring">
       <message key="installation.name.required"/>
     </field-validator>
+    <field-validator type="regex">
+      <param name="expression"><![CDATA[[A-Za-z0-9_.\s\-]*]]></param>
+      <message key="installation.name.invalid"/>
+    </field-validator>
+  </field>
+  <field name="installation.varName">
+    <field-validator type="regex">
+      <param name="expression"><![CDATA[[A-Za-z][A-Za-z0-9_]*]]></param>
+      <message key="installation.varName.invalid"/>
+    </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="regex">
+      <param name="expression"><![CDATA[[A-Za-z0-9_.:=${}\\/\s\-]*]]></param>
+      <message key="installation.varValue.invalid"/>
+    </field-validator>
     <field-validator type="installationValidator">
       <message key="installation.varValue.version.failed"/>
     </field-validator>
-  </field>    
-    
+  </field>
 </validators>

Modified: continuum/branches/continuum-1.3.x/continuum-webapp/src/main/resources/org/apache/maven/continuum/web/action/admin/InstallationAction.properties
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-1.3.x/continuum-webapp/src/main/resources/org/apache/maven/continuum/web/action/admin/InstallationAction.properties?rev=1101669&r1=1101668&r2=1101669&view=diff
==============================================================================
--- continuum/branches/continuum-1.3.x/continuum-webapp/src/main/resources/org/apache/maven/continuum/web/action/admin/InstallationAction.properties (original)
+++ continuum/branches/continuum-1.3.x/continuum-webapp/src/main/resources/org/apache/maven/continuum/web/action/admin/InstallationAction.properties Tue May 10 22:46:21 2011
@@ -18,5 +18,8 @@
 #
 
 installation.name.required = You must define a name.
+installation.name.invalid = Installation name contains invalid characters.
 installation.varValue.required = You must define a value.
+installation.varValue.invalid = Installation value contains invalid characters.
 installation.varValue.version.failed = Failed to validate installation, check server log. 
+installation.varName.invalid = Environment variable name contains invalid characters.