continuum-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From batkin...@apache.org
Subject svn commit: r1491143 - in /continuum/trunk: continuum-webapp-test/src/test/resources/ continuum-webapp/src/main/resources/org/apache/maven/continuum/web/action/ continuum-webapp/src/main/resources/org/apache/maven/continuum/web/action/admin/ continuum-...
Date Sun, 09 Jun 2013 05:51:10 GMT
Author: batkinson
Date: Sun Jun  9 05:51:10 2013
New Revision: 1491143

URL: http://svn.apache.org/r1491143
Log:
[CONTINUUM-2702] Cannot add an argument to remove a profile (-P!profile)

Modified:
    continuum/trunk/continuum-webapp-test/src/test/resources/testng.properties
    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
    continuum/trunk/continuum-xmlrpc/continuum-xmlrpc-server/src/test/java/org/apache/continuum/xmlrpc/server/ContinuumServiceImplTest.java

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=1491143&r1=1491142&r2=1491143&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp-test/src/test/resources/testng.properties (original)
+++ continuum/trunk/continuum-webapp-test/src/test/resources/testng.properties Sun Jun  9
05:51:10 2013
@@ -214,7 +214,7 @@ BUILD_DEFINITION_PROJECT_GROUP_DESCRIPTI
 
 BUILD_DEFINITION_POM_NAME=pom.xml
 BUILD_DEFINITION_GOALS=test
-BUILD_DEFINITION_ARGUMENTS=--batch-mode --non-recursive
+BUILD_DEFINITION_ARGUMENTS=--batch-mode --non-recursive -P!dev
 BUILD_DEFINITION_DESCRIPTION=Maven Build Definition Description
 
 BUILD_DEFINITION_ANT_PROJECT_NAME=Build Definition Test Ant Project

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=1491143&r1=1491142&r2=1491143&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
Sun Jun  9 05:51:10 2013
@@ -46,7 +46,7 @@
   <field name="arguments">
     <field-validator type="regex">
       <param name="trim">true</param>
-      <param name="regex"><![CDATA[[A-Za-z0-9_${}.\\/=,":\s\-]*]]></param>
+      <param name="regex"><![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=1491143&r1=1491142&r2=1491143&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
Sun Jun  9 05:51:10 2013
@@ -48,7 +48,7 @@
   </field>
   <field name="buildDefinition.arguments">
     <field-validator type="regex">
-      <param name="regex"><![CDATA[[A-Za-z0-9_${}.\\/=,":\s\-]*]]></param>
+      <param name="regex"><![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=1491143&r1=1491142&r2=1491143&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
Sun Jun  9 05:51:10 2013
@@ -120,7 +120,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\\-]*";
 

Modified: continuum/trunk/continuum-xmlrpc/continuum-xmlrpc-server/src/test/java/org/apache/continuum/xmlrpc/server/ContinuumServiceImplTest.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-xmlrpc/continuum-xmlrpc-server/src/test/java/org/apache/continuum/xmlrpc/server/ContinuumServiceImplTest.java?rev=1491143&r1=1491142&r2=1491143&view=diff
==============================================================================
--- continuum/trunk/continuum-xmlrpc/continuum-xmlrpc-server/src/test/java/org/apache/continuum/xmlrpc/server/ContinuumServiceImplTest.java
(original)
+++ continuum/trunk/continuum-xmlrpc/continuum-xmlrpc-server/src/test/java/org/apache/continuum/xmlrpc/server/ContinuumServiceImplTest.java
Sun Jun  9 05:51:10 2013
@@ -561,7 +561,7 @@ public class ContinuumServiceImplTest
     private BuildDefinition createBuildDefinition()
     {
         BuildDefinition buildDef = new BuildDefinition();
-        buildDef.setArguments( "--batch-mode" );
+        buildDef.setArguments( "--batch-mode -P!dev" );
         buildDef.setBuildFile( "pom.xml" );
         buildDef.setType( "maven2" );
         buildDef.setBuildFresh( false );



Mime
View raw message