Author: brett
Date: Sat Oct 1 17:25:28 2011
New Revision: 1178047
URL: http://svn.apache.org/viewvc?rev=1178047&view=rev
Log:
validation for repository group addition
Added:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/resources/org/apache/archiva/web/action/admin/repositories/RepositoryGroupsAction-addRepositoryGroup-validation.xml
- copied, changed from r1178014,
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/resources/org/apache/archiva/web/action/admin/repositories/AddManagedRepositoryAction-validation.xml
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/VirtualRepositoryTest.java
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/parent/AbstractRepositoryTest.java
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/archiva/web/action/admin/repositories/RepositoryGroupsAction.java
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/repositoryGroups.jsp
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/VirtualRepositoryTest.java
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/VirtualRepositoryTest.java?rev=1178047&r1=1178046&r2=1178047&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/VirtualRepositoryTest.java
(original)
+++
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/VirtualRepositoryTest.java
Sat Oct 1 17:25:28 2011
@@ -27,18 +27,17 @@ import org.testng.Assert;
public class VirtualRepositoryTest
extends AbstractRepositoryTest
{
- // FIXME: says repositoryGroup id cannot be empty
- @Test( enabled = false )
+ @Test
public void testAddRepositoryGroupNullValue()
{
- addRepositoryGroup( " " );
+ addRepositoryGroup( " ", false );
assertTextPresent( "Identifier field is required." );
}
@Test( dependsOnMethods = { "testWithCorrectUsernamePassword" } )
public void testAddRepositoryGroupValidValue()
{
- addRepositoryGroup( "testing" );
+ addRepositoryGroup( "testing", true );
Assert.assertEquals( getSelenium().getText(
"//div[@id='contentArea']/div[2]/div/div[1]/p[1]" ), "testing" );
}
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/parent/AbstractRepositoryTest.java
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/parent/AbstractRepositoryTest.java?rev=1178047&r1=1178046&r2=1178047&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/parent/AbstractRepositoryTest.java
(original)
+++
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/parent/AbstractRepositoryTest.java
Sat Oct 1 17:25:28 2011
@@ -73,11 +73,11 @@ public abstract class AbstractRepository
assertButtonWithValuePresent( "Cancel" );
}
- public void addRepositoryGroup( String repoGroupName )
+ public void addRepositoryGroup( String repoGroupName, boolean wait )
{
goToRepositoryGroupsPage();
setFieldValue( "repositoryGroup.id", repoGroupName );
- clickButtonWithValue( "Add Group" );
+ clickButtonWithValue( "Add Group", wait );
}
public void addRepositoryToRepositoryGroup( String repositoryGroupName,
String repositoryName )
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/archiva/web/action/admin/repositories/RepositoryGroupsAction.java
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/archiva/web/action/admin/repositories/RepositoryGroupsAction.java?rev=1178047&r1=1178046&r2=1178047&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/archiva/web/action/admin/repositories/RepositoryGroupsAction.java
(original)
+++
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/archiva/web/action/admin/repositories/RepositoryGroupsAction.java
Sat Oct 1 17:25:28 2011
@@ -65,8 +65,6 @@ public class RepositoryGroupsAction
*/
private String baseUrl;
- private static final Pattern REPO_GROUP_ID_PATTERN = Pattern.compile(
"[A-Za-z0-9\\._\\-]+" );
-
public void setServletRequest( HttpServletRequest request )
{
this.baseUrl = ContextUtils.getBaseURL( request, "repository" );
Copied:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/resources/org/apache/archiva/web/action/admin/repositories/RepositoryGroupsAction-addRepositoryGroup-validation.xml
(from r1178014,
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/resources/org/apache/archiva/web/action/admin/repositories/AddManagedRepositoryAction-validation.xml)
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/resources/org/apache/archiva/web/action/admin/repositories/RepositoryGroupsAction-addRepositoryGroup-validation.xml?p2=archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/resources/org/apache/archiva/web/action/admin/repositories/RepositoryGroupsAction-addRepositoryGroup-validation.xml&p1=archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/resources/org/apache/archiva/web/action/admin/repositories/AddManagedRepositoryAction-validation.xml&r1=1178014&r2=1178047&rev=1178047&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/resources/org/apache/archiva/web/action/admin/repositories/AddManagedRepositoryAction-validation.xml
(original)
+++
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/resources/org/apache/archiva/web/action/admin/repositories/RepositoryGroupsAction-addRepositoryGroup-validation.xml
Sat Oct 1 17:25:28 2011
@@ -22,9 +22,9 @@
"http://www.opensymphony.com/xwork/xwork-validator-1.0.2.dtd";>
<validators>
- <field name="repository.id">
+ <field name="repositoryGroup.id">
<field-validator type="requiredstring">
- <message>You must enter a repository identifier.</message>
+ <message>Identifier field is required.</message>
</field-validator>
<field-validator type="regex">
<param name="trim">true</param>
@@ -32,45 +32,4 @@
<message>Identifier must only contain alphanumeric characters,
underscores(_), dots(.), and dashes(-).</message>
</field-validator>
</field>
- <field name="repository.location">
- <field-validator type="requiredstring">
- <message>You must enter a directory.</message>
- </field-validator>
- <field-validator type="regex">
- <param name="trim">true</param>
- <param name="expression">^[-a-zA-Z0-9._/~:?!&=\\]+$</param>
- <message>Directory must only contain alphanumeric characters,
equals(=), question-marks(?), exclamation-points(!), ampersands(&),
forward-slashes(/), back-slashes(\), underscores(_), dots(.), colons(:),
tildes(~), and dashes(-).</message>
- </field-validator>
- </field>
- <field name="repository.indexDirectory">
- <!-- no requiredstring validation, because there was none before(being
consistent). -->
- <field-validator type="regex">
- <param name="trim">true</param>
- <param name="expression">^[-a-zA-Z0-9._/~:?!&=\\]*$</param>
- <message>Index directory must only contain alphanumeric characters,
equals(=), question-marks(?), exclamation-points(!), ampersands(&),
forward-slashes(/), back-slashes(\), underscores(_), dots(.), colons(:),
tildes(~), and dashes(-).</message>
- </field-validator>
- </field>
- <field name="repository.name">
- <field-validator type="requiredstring">
- <message>You must enter a repository name.</message>
- </field-validator>
- <field-validator type="regex">
- <param name="trim">true</param>
- <param name="expression">^([a-zA-Z0-9.)/_(-]|\s)+$</param>
- <message>Repository Name must only contain alphanumeric characters,
white-spaces(' '), forward-slashes(/), open-parenthesis('('),
close-parenthesis(')'), underscores(_), dots(.), and dashes(-).</message>
- </field-validator>
- </field>
- <field name="repository.retentionCount">
- <field-validator type="int">
- <param name="min">1</param>
- <param name="max">100</param>
- <message>Repository Purge By Retention Count needs to be between ${min}
and ${max}.</message>
- </field-validator>
- </field>
- <field name="repository.daysOlder">
- <field-validator type="int">
- <param name="min">0</param>
- <message>Repository Purge By Days Older Than needs to be larger than
${min}.</message>
- </field-validator>
- </field>
</validators>
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/repositoryGroups.jsp
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/repositoryGroups.jsp?rev=1178047&r1=1178046&r2=1178047&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/repositoryGroups.jsp
(original)
+++
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/repositoryGroups.jsp
Sat Oct 1 17:25:28 2011
@@ -47,11 +47,10 @@
<div align="right">
<redback:ifAnyAuthorized permissions="archiva-manage-configuration">
- <s:form action="addRepositoryGroup" namespace="/admin">
- <span class="label">Identifier<span style="color:red">*</span>:</span>
- <s:textfield size="10" label="Identifier" theme="simple"
name="repositoryGroup.id"/>
+ <s:form name="addRepositoryGroup" action="addRepositoryGroup"
namespace="/admin" validate="true">
+ <s:textfield size="10" label="Identifier" name="repositoryGroup.id"/>
<s:token/>
- <s:submit value="Add Group" theme="simple" cssClass="button"/>
+ <s:submit value="Add Group" cssClass="button"/>
</s:form>
</redback:ifAnyAuthorized>
</div>
