You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@continuum.apache.org by br...@apache.org on 2012/11/21 12:47:35 UTC
svn commit: r1412068 - in /continuum/trunk: continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/ continuum-webapp/src/main/resources/org/apache/maven/continuum/web/action/ continuum-xmlrpc/continuum-xmlrpc-server/src/main/java/org/apach...

Author: brett
Date: Wed Nov 21 11:47:34 2012
New Revision: 1412068

URL: http://svn.apache.org/viewvc?rev=1412068&view=rev
Log:
[CONTINUUM-2691] validation of build file for Ant build definitions is too strict

Allow / and \

Modified:
    continuum/trunk/continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/BuildDefinitionTest.java
    continuum/trunk/continuum-webapp/src/main/resources/org/apache/maven/continuum/web/action/BuildDefinitionAction-saveBuildDefinition-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-test/src/test/testng/org/apache/continuum/web/test/BuildDefinitionTest.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/BuildDefinitionTest.java?rev=1412068&r1=1412067&r2=1412068&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/BuildDefinitionTest.java (original)
+++ continuum/trunk/continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/BuildDefinitionTest.java Wed Nov 21 11:47:34 2012
@@ -288,15 +288,13 @@ public class BuildDefinitionTest
                                      false, ANT_PROJECT_TYPE );
     }
 
-    // TODO: needs to be fixed
-    @Test(enabled = false)
     public void testAddNotDefaultProjectBuildDefinitionAntWithPathBuildFile()
         throws Exception
     {
         goToProjectInformationPage( projectGroupName, antProjectName );
         clickLinkWithXPath( "//input[contains(@id,'buildDefinition')]" );
-        addEditGroupBuildDefinition( null, "Quartz/build.xml", "package", "", "build file with path", false, false,
-                                     false, ANT_PROJECT_TYPE );
+        addEditGroupBuildDefinition( null, "Quartz/path\\build.xml", "package", "", "build file with path", false,
+                                     false, false, ANT_PROJECT_TYPE );
     }
 
     // TODO: needs to be fixed

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=1412068&r1=1412067&r2=1412068&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 Wed Nov 21 11:47:34 2012
@@ -28,7 +28,7 @@
     </field-validator>
     <field-validator type="regex">
       <param name="trim">true</param>
-      <param name="expression"><![CDATA[[A-Za-z0-9_.\-]*]]></param>
+      <param name="expression"><![CDATA[[A-Za-z0-9_.\-/\\]*]]></param>
       <message key="buildDefinition.buildFile.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=1412068&r1=1412067&r2=1412068&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 Wed Nov 21 11:47:34 2012
@@ -128,7 +128,7 @@ public class ContinuumServiceImpl
 
     private static final String BUILD_DEFINITION_GOALS_VALID_EXPRESSION = "[A-Za-z0-9_:\\s\\-]*";
 
-    private static final String BUILD_DEFINITION_BUILD_FILE_VALID_EXPRESSION = "[A-Za-z0-9_.\\-]*";
+    private static final String BUILD_DEFINITION_BUILD_FILE_VALID_EXPRESSION = "[A-Za-z0-9_.\\-/\\\\]*";
 
     private static final String INSTALLATION_VARNAME_VALID_EXPRESSION = "[A-Za-z][A-Za-z0-9_]*";