You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@continuum.apache.org by ct...@apache.org on 2011/05/12 12:28:26 UTC
svn commit: r1102234 - in /continuum/branches/continuum-1.3.x:
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...
Author: ctan
Date: Thu May 12 10:28:26 2011
New Revision: 1102234
URL: http://svn.apache.org/viewvc?rev=1102234&view=rev
Log:
merge -r1102231 from trunk
Modified:
continuum/branches/continuum-1.3.x/continuum-webapp/src/main/resources/org/apache/maven/continuum/web/action/BuildDefinitionAction-saveBuildDefinition-validation.xml
continuum/branches/continuum-1.3.x/continuum-webapp/src/main/resources/org/apache/maven/continuum/web/action/admin/BuildDefinitionTemplateAction-saveBuildDefinitionAsTemplate-validation.xml
continuum/branches/continuum-1.3.x/continuum-xmlrpc/continuum-xmlrpc-server/src/main/java/org/apache/maven/continuum/xmlrpc/server/ContinuumServiceImpl.java
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=1102234&r1=1102233&r2=1102234&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 Thu May 12 10:28:26 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/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=1102234&r1=1102233&r2=1102234&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 Thu May 12 10:28:26 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/branches/continuum-1.3.x/continuum-xmlrpc/continuum-xmlrpc-server/src/main/java/org/apache/maven/continuum/xmlrpc/server/ContinuumServiceImpl.java
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-1.3.x/continuum-xmlrpc/continuum-xmlrpc-server/src/main/java/org/apache/maven/continuum/xmlrpc/server/ContinuumServiceImpl.java?rev=1102234&r1=1102233&r2=1102234&view=diff
==============================================================================
--- continuum/branches/continuum-1.3.x/continuum-xmlrpc/continuum-xmlrpc-server/src/main/java/org/apache/maven/continuum/xmlrpc/server/ContinuumServiceImpl.java (original)
+++ continuum/branches/continuum-1.3.x/continuum-xmlrpc/continuum-xmlrpc-server/src/main/java/org/apache/maven/continuum/xmlrpc/server/ContinuumServiceImpl.java Thu May 12 10:28:26 2011
@@ -104,7 +104,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\\-]*";