Return-Path: 
 <commits-return-6392-apmail-continuum-commits-archive=continuum.apache.org@continuum.apache.org>
X-Original-To: apmail-continuum-commits-archive@www.apache.org
Delivered-To: apmail-continuum-commits-archive@www.apache.org
Received: from mail.apache.org (hermes.apache.org [140.211.11.3])
	by minotaur.apache.org (Postfix) with SMTP id 7219B5C48
	for <apmail-continuum-commits-archive@www.apache.org>;
 Thu, 12 May 2011 10:20:52 +0000 (UTC)
Received: (qmail 61942 invoked by uid 500); 12 May 2011 10:20:52 -0000
Delivered-To: apmail-continuum-commits-archive@continuum.apache.org
Received: (qmail 61884 invoked by uid 500); 12 May 2011 10:20:51 -0000
Mailing-List: contact commits-help@continuum.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:commits-help@continuum.apache.org>
List-Unsubscribe: <mailto:commits-unsubscribe@continuum.apache.org>
List-Post: <mailto:commits@continuum.apache.org>
List-Id: <commits.continuum.apache.org>
Reply-To: dev@continuum.apache.org
Delivered-To: mailing list commits@continuum.apache.org
Received: (qmail 61877 invoked by uid 99); 12 May 2011 10:20:51 -0000
Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230)
    by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 12 May 2011 10:20:51 +0000
X-ASF-Spam-Status: No, hits=-2000.0 required=5.0
	tests=ALL_TRUSTED
X-Spam-Check-By: apache.org
Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4)
    by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 12 May 2011 10:20:49 +0000
Received: by eris.apache.org (Postfix, from userid 65534)
	id C45E02388901; Thu, 12 May 2011 10:20:27 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r1102231 - in /continuum/trunk:
 continuum-webapp/src/main/resources/org/apache/maven/continuum/web/action/
 continuum-webapp/src/main/resources/org/apache/maven/continuum/web/action/admin/
 continuum-xmlrpc/continuum-xmlrpc-server/src/main/ja...
Date: Thu, 12 May 2011 10:20:27 -0000
To: commits@continuum.apache.org
From: ctan@apache.org
X-Mailer: svnmailer-1.0.8
Message-Id: <20110512102027.C45E02388901@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org

Author: ctan
Date: Thu May 12 10:20:27 2011
New Revision: 1102231

URL: http://svn.apache.org/viewvc?rev=1102231&view=rev
Log:
[CONTINUUM-2620]
- added ${} in the allowed characters of build definition arguments

Modified:
    continuum/trunk/continuum-webapp/src/main/resources/org/apache/maven/continuum/web/action/BuildDefinitionAction-saveBuildDefinition-validation.xml
    continuum/trunk/continuum-webapp/src/main/resources/org/apache/maven/continuum/web/action/admin/BuildDefinitionTemplateAction-saveBuildDefinitionAsTemplate-validation.xml
    continuum/trunk/continuum-xmlrpc/continuum-xmlrpc-server/src/main/java/org/apache/maven/continuum/xmlrpc/server/ContinuumServiceImpl.java

Modified: continuum/trunk/continuum-webapp/src/main/resources/org/apache/maven/continuum/web/action/BuildDefinitionAction-saveBuildDefinition-validation.xml
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/main/resources/org/apache/maven/continuum/web/action/BuildDefinitionAction-saveBuildDefinition-validation.xml?rev=1102231&r1=1102230&r2=1102231&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp/src/main/resources/org/apache/maven/continuum/web/action/BuildDefinitionAction-saveBuildDefinition-validation.xml (original)
+++ continuum/trunk/continuum-webapp/src/main/resources/org/apache/maven/continuum/web/action/BuildDefinitionAction-saveBuildDefinition-validation.xml Thu May 12 10:20:27 2011
@@ -42,7 +42,7 @@
   <field name="arguments">
     <field-validator type="regex">
       <param name="trim">true</param>
-      <param name="expression"><![CDATA[[A-Za-z0-9_.\\/=,":\s\-]*]]></param>
+      <param name="expression"><![CDATA[[A-Za-z0-9_${}.\\/=,":\s\-]*]]></param>
       <message key="buildDefinition.arguments.invalid"/>
     </field-validator>
   </field>

Modified: continuum/trunk/continuum-webapp/src/main/resources/org/apache/maven/continuum/web/action/admin/BuildDefinitionTemplateAction-saveBuildDefinitionAsTemplate-validation.xml
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/main/resources/org/apache/maven/continuum/web/action/admin/BuildDefinitionTemplateAction-saveBuildDefinitionAsTemplate-validation.xml?rev=1102231&r1=1102230&r2=1102231&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp/src/main/resources/org/apache/maven/continuum/web/action/admin/BuildDefinitionTemplateAction-saveBuildDefinitionAsTemplate-validation.xml (original)
+++ continuum/trunk/continuum-webapp/src/main/resources/org/apache/maven/continuum/web/action/admin/BuildDefinitionTemplateAction-saveBuildDefinitionAsTemplate-validation.xml Thu May 12 10:20:27 2011
@@ -44,7 +44,7 @@
   </field>
   <field name="buildDefinition.arguments">
     <field-validator type="regex">
-      <param name="expression"><![CDATA[[A-Za-z0-9_.\\/=,":\s\-]*]]></param>
+      <param name="expression"><![CDATA[[A-Za-z0-9_${}.\\/=,":\s\-]*]]></param>
       <message key="buildDefinition.arguments.invalid"/>
     </field-validator>
   </field>

Modified: continuum/trunk/continuum-xmlrpc/continuum-xmlrpc-server/src/main/java/org/apache/maven/continuum/xmlrpc/server/ContinuumServiceImpl.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-xmlrpc/continuum-xmlrpc-server/src/main/java/org/apache/maven/continuum/xmlrpc/server/ContinuumServiceImpl.java?rev=1102231&r1=1102230&r2=1102231&view=diff
==============================================================================
--- continuum/trunk/continuum-xmlrpc/continuum-xmlrpc-server/src/main/java/org/apache/maven/continuum/xmlrpc/server/ContinuumServiceImpl.java (original)
+++ continuum/trunk/continuum-xmlrpc/continuum-xmlrpc-server/src/main/java/org/apache/maven/continuum/xmlrpc/server/ContinuumServiceImpl.java Thu May 12 10:20:27 2011
@@ -125,7 +125,7 @@ public class ContinuumServiceImpl
 
     private static final String REPOSITORY_LAYOUT_VALID_EXPRESSION = "default|legacy";
 
-    private static final String BUILD_DEFINITION_ARGUMENTS_VALID_EXPRESSION = "[A-Za-z0-9_./=,\":\\s\\\\-]*";
+    private static final String BUILD_DEFINITION_ARGUMENTS_VALID_EXPRESSION = "[A-Za-z0-9_./=,${}\":\\s\\\\-]*";
 
     private static final String BUILD_DEFINITION_GOALS_VALID_EXPRESSION = "[A-Za-z0-9_:\\s\\-]*";