continuum-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From batkin...@apache.org
Subject svn commit: r1673109 - in /continuum/trunk: continuum-webapp-test/src/test/resources/ continuum-webapp/src/main/resources/org/apache/maven/continuum/web/action/
Date Mon, 13 Apr 2015 05:46:24 GMT
Author: batkinson
Date: Mon Apr 13 05:46:23 2015
New Revision: 1673109

URL: http://svn.apache.org/r1673109
Log:
[CONTINUUM-2749] Shell/Ant projects allow adding projects with obviously invalid scm urls

Modified:
    continuum/trunk/continuum-webapp-test/src/test/resources/testng.properties
    continuum/trunk/continuum-webapp/src/main/resources/org/apache/maven/continuum/web/action/AddProjectAction-addProject-validation.xml
    continuum/trunk/continuum-webapp/src/main/resources/org/apache/maven/continuum/web/action/AddProjectAction.properties

Modified: continuum/trunk/continuum-webapp-test/src/test/resources/testng.properties
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp-test/src/test/resources/testng.properties?rev=1673109&r1=1673108&r2=1673109&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp-test/src/test/resources/testng.properties (original)
+++ continuum/trunk/continuum-webapp-test/src/test/resources/testng.properties Mon Apr 13
05:46:23 2015
@@ -77,7 +77,7 @@ ANT_NAME=Sample Ant Project
 ANT_DESCRIPTION=This is a sample Ant Project used for testing
 ANT_VERSION=1.0.0-SNAPSHOT
 ANT_TAG=
-ANT_SCM_URL=${sampleProjectsUrl}/example-projects/ant/
+ANT_SCM_URL=scm:svn:${sampleProjectsUrl}/example-projects/ant/
 ANT_SCM_USERNAME=
 ANT_SCM_PASSWORD=
 
@@ -287,7 +287,7 @@ SHELL_NAME=Shell Project
 SHELL_DESCRIPTION=This is a sample Shell Project used for testing
 SHELL_VERSION=1.0.0-SNAPSHOT
 SHELL_TAG=
-SHELL_SCM_URL=${sampleProjectsUrl}/example-projects/shell/
+SHELL_SCM_URL=scm:svn:${sampleProjectsUrl}/example-projects/shell/
 SHELL_SCM_USERNAME=
 SHELL_SCM_PASSWORD=
 

Modified: continuum/trunk/continuum-webapp/src/main/resources/org/apache/maven/continuum/web/action/AddProjectAction-addProject-validation.xml
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/main/resources/org/apache/maven/continuum/web/action/AddProjectAction-addProject-validation.xml?rev=1673109&r1=1673108&r2=1673109&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp/src/main/resources/org/apache/maven/continuum/web/action/AddProjectAction-addProject-validation.xml
(original)
+++ continuum/trunk/continuum-webapp/src/main/resources/org/apache/maven/continuum/web/action/AddProjectAction-addProject-validation.xml
Mon Apr 13 05:46:23 2015
@@ -50,6 +50,10 @@
       <param name="regex"><![CDATA[[a-zA-Z0-9_.:${}#~=@\\/|\[\]-]*]]></param>
       <message key="addProject.scmUrl.invalid"/>
     </field-validator>
+    <field-validator type="regex">
+      <param name="regex"><![CDATA[scm[:][^:|]+[:|].+]]></param>
+      <message key="addProject.scmUrl.badformat"/>
+    </field-validator>
   </field>
   <field name="projectScmTag">
     <field-validator type="regex">

Modified: continuum/trunk/continuum-webapp/src/main/resources/org/apache/maven/continuum/web/action/AddProjectAction.properties
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/main/resources/org/apache/maven/continuum/web/action/AddProjectAction.properties?rev=1673109&r1=1673108&r2=1673109&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp/src/main/resources/org/apache/maven/continuum/web/action/AddProjectAction.properties
(original)
+++ continuum/trunk/continuum-webapp/src/main/resources/org/apache/maven/continuum/web/action/AddProjectAction.properties
Mon Apr 13 05:46:23 2015
@@ -23,5 +23,6 @@ addProject.version.required = Version is
 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.scmUrl.badformat = SCM Url must match pattern 'scm:<provider>:<provider_specific_info>'
 addProject.scmTag.invalid = SCM Tag contains invalid characters.
 addProject.projectGroup.required = Project Group is required and all projects must be in
a project group



Mime
View raw message