Author: brett
Date: Sat Feb 1 23:34:03 2014
New Revision: 1563511
URL: http://svn.apache.org/r1563511
Log:
update repository group deletion so cancel works after Struts upgrade
Modified:
archiva/branches/archiva-1.3.x/archiva-modules/archiva-web/archiva-webapp-test/src/test/java/org/apache/archiva/web/test/CSRFSecurityTest.java
archiva/branches/archiva-1.3.x/archiva-modules/archiva-web/archiva-webapp-test/src/test/java/org/apache/archiva/web/test/VirtualRepositoryTest.java
archiva/branches/archiva-1.3.x/archiva-modules/archiva-web/archiva-webapp-test/src/test/java/org/apache/archiva/web/test/parent/AbstractRepositoryTest.java
archiva/branches/archiva-1.3.x/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/repositories/DeleteRepositoryGroupAction.java
archiva/branches/archiva-1.3.x/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/deleteRepositoryGroup.jsp
Modified:
archiva/branches/archiva-1.3.x/archiva-modules/archiva-web/archiva-webapp-test/src/test/java/org/apache/archiva/web/test/CSRFSecurityTest.java
URL:
http://svn.apache.org/viewvc/archiva/branches/archiva-1.3.x/archiva-modules/archiva-web/archiva-webapp-test/src/test/java/org/apache/archiva/web/test/CSRFSecurityTest.java?rev=1563511&r1=1563510&r2=1563511&view=diff
==============================================================================
---
archiva/branches/archiva-1.3.x/archiva-modules/archiva-web/archiva-webapp-test/src/test/java/org/apache/archiva/web/test/CSRFSecurityTest.java
(original)
+++
archiva/branches/archiva-1.3.x/archiva-modules/archiva-web/archiva-webapp-test/src/test/java/org/apache/archiva/web/test/CSRFSecurityTest.java
Sat Feb 1 23:34:03 2014
@@ -65,7 +65,7 @@ public class CSRFSecurityTest
public void testCSRFDeleteRepositoryGroup()
{
getSelenium().open( baseUrl );
- getSelenium().open( baseUrl +
"/admin/deleteRepositoryGroup.action?repoGroupId=test&method%3Adelete=Confirm"
);
+ getSelenium().open( baseUrl +
"/admin/deleteRepositoryGroup.action?repoGroupId=test" );
assertTextPresent( "Security Alert - Invalid Token Found" );
assertTextPresent( "Possible CSRF attack detected! Invalid token found
in the request." );
}
Modified:
archiva/branches/archiva-1.3.x/archiva-modules/archiva-web/archiva-webapp-test/src/test/java/org/apache/archiva/web/test/VirtualRepositoryTest.java
URL:
http://svn.apache.org/viewvc/archiva/branches/archiva-1.3.x/archiva-modules/archiva-web/archiva-webapp-test/src/test/java/org/apache/archiva/web/test/VirtualRepositoryTest.java?rev=1563511&r1=1563510&r2=1563511&view=diff
==============================================================================
---
archiva/branches/archiva-1.3.x/archiva-modules/archiva-web/archiva-webapp-test/src/test/java/org/apache/archiva/web/test/VirtualRepositoryTest.java
(original)
+++
archiva/branches/archiva-1.3.x/archiva-modules/archiva-web/archiva-webapp-test/src/test/java/org/apache/archiva/web/test/VirtualRepositoryTest.java
Sat Feb 1 23:34:03 2014
@@ -45,10 +45,15 @@ public class VirtualRepositoryTest
{
addRepositoryGroup( "testing" );
//assertAddedRepositoryLink( "testing" );
- Assert.assertEquals( getSelenium().getText(
"//div[@id='contentArea']/div[2]/div/div[1]/p[1]" ), "testing" );
- }
-
- @Test(dependsOnMethods = { "testAddRepositoryGroupValidValue" } )
+ assertRepositoryGroup( "testing" );
+ }
+
+ private void assertRepositoryGroup( String group )
+ {
+ Assert.assertEquals( getSelenium().getText(
"//div[@id='contentArea']/div[2]/div/div[1]/p[1]" ), group );
+ }
+
+ @Test(dependsOnMethods = { "testAddRepositoryGroupValidValue" } )
public void testAddRepositoryToRepositoryGroup()
{
addRepositoryToRepositoryGroup( "testing", "internal" );
@@ -68,13 +73,23 @@ public class VirtualRepositoryTest
}
@Test(dependsOnMethods = { "testDeleteRepositoryOfRepositoryGroup" } )
- public void testDeleteRepositoryGroup()
+ public void testCancelDeleteRepositoryGroup()
{
assertRepositoryGroupsPage();
+ attemptDeleteRepositoryGroup( "testing" );
+ clickButtonWithValue( "Cancel" );
+ assertTextNotPresent( "No Repository Groups Defined." );
+ assertRepositoryGroup( "testing" );
+ }
+
+ @Test(dependsOnMethods = { "testCancelDeleteRepositoryGroup" } )
+ public void testDeleteRepositoryGroup()
+ {
+ assertRepositoryGroupsPage();
deleteRepositoryGroup( "testing" );
assertTextPresent( "No Repository Groups Defined." );
}
-
+
/*@Test(dependsOnMethods = { "testAddRepositoryToRepositoryGroup" } )
public void testCheckRepositoryGroup()
{
Modified:
archiva/branches/archiva-1.3.x/archiva-modules/archiva-web/archiva-webapp-test/src/test/java/org/apache/archiva/web/test/parent/AbstractRepositoryTest.java
URL:
http://svn.apache.org/viewvc/archiva/branches/archiva-1.3.x/archiva-modules/archiva-web/archiva-webapp-test/src/test/java/org/apache/archiva/web/test/parent/AbstractRepositoryTest.java?rev=1563511&r1=1563510&r2=1563511&view=diff
==============================================================================
---
archiva/branches/archiva-1.3.x/archiva-modules/archiva-web/archiva-webapp-test/src/test/java/org/apache/archiva/web/test/parent/AbstractRepositoryTest.java
(original)
+++
archiva/branches/archiva-1.3.x/archiva-modules/archiva-web/archiva-webapp-test/src/test/java/org/apache/archiva/web/test/parent/AbstractRepositoryTest.java
Sat Feb 1 23:34:03 2014
@@ -116,13 +116,18 @@ public abstract class AbstractRepository
public void deleteRepositoryGroup( String repositoryName )
{
- getSelenium().click(
"xpath=//div[@id='contentArea']/div[2]/div/div[1]/div/a/img" );
- waitPage();
- assertDeleteRepositoryGroupPage( repositoryName );
+ attemptDeleteRepositoryGroup( repositoryName );
clickButtonWithValue( "Confirm" );
}
-
- ///////////////////////////////
+
+ protected void attemptDeleteRepositoryGroup( String repositoryName )
+ {
+ getSelenium().click(
"xpath=//div[@id='contentArea']/div[2]/div/div[1]/div/a/img" );
+ waitPage();
+ assertDeleteRepositoryGroupPage( repositoryName );
+ }
+
+ ///////////////////////////////
// proxy connectors
///////////////////////////////
public void goToProxyConnectorsPage()
Modified:
archiva/branches/archiva-1.3.x/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/repositories/DeleteRepositoryGroupAction.java
URL:
http://svn.apache.org/viewvc/archiva/branches/archiva-1.3.x/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/repositories/DeleteRepositoryGroupAction.java?rev=1563511&r1=1563510&r2=1563511&view=diff
==============================================================================
---
archiva/branches/archiva-1.3.x/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/repositories/DeleteRepositoryGroupAction.java
(original)
+++
archiva/branches/archiva-1.3.x/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/repositories/DeleteRepositoryGroupAction.java
Sat Feb 1 23:34:03 2014
@@ -34,19 +34,12 @@ import org.apache.maven.archiva.reposito
*/
public class DeleteRepositoryGroupAction
extends AbstractRepositoriesAdminAction
- implements Preparable
{
private RepositoryGroupConfiguration repositoryGroup;
private String repoGroupId;
-
- public void prepare()
- {
- if ( StringUtils.isNotBlank( repoGroupId ) )
- {
- this.repositoryGroup =
archivaConfiguration.getConfiguration().findRepositoryGroupById( repoGroupId );
- }
- }
+
+ private boolean cancel;
public String confirmDelete()
{
@@ -55,12 +48,21 @@ public class DeleteRepositoryGroupAction
addActionError( "Unable to delete repository group: repository id
was blank." );
return ERROR;
}
+ else
+ {
+ this.repositoryGroup =
archivaConfiguration.getConfiguration().findRepositoryGroupById( repoGroupId );
+ }
return INPUT;
}
public String delete()
{
+ if ( cancel )
+ {
+ return SUCCESS;
+ }
+
Configuration config = archivaConfiguration.getConfiguration();
RepositoryGroupConfiguration group = config.findRepositoryGroupById(
repoGroupId );
@@ -94,4 +96,9 @@ public class DeleteRepositoryGroupAction
{
this.repoGroupId = repoGroupId;
}
+
+ public void setCancel( String cancel )
+ {
+ this.cancel = StringUtils.isNotBlank( cancel );
+ }
}
Modified:
archiva/branches/archiva-1.3.x/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/deleteRepositoryGroup.jsp
URL:
http://svn.apache.org/viewvc/archiva/branches/archiva-1.3.x/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/deleteRepositoryGroup.jsp?rev=1563511&r1=1563510&r2=1563511&view=diff
==============================================================================
---
archiva/branches/archiva-1.3.x/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/deleteRepositoryGroup.jsp
(original)
+++
archiva/branches/archiva-1.3.x/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/deleteRepositoryGroup.jsp
Sat Feb 1 23:34:03 2014
@@ -57,8 +57,8 @@
<s:hidden name="repoGroupId"/>
<div class="buttons">
<s:token/>
- <s:submit value="Confirm" method="delete"/>
- <s:submit value="Cancel" method="execute"/>
+ <s:submit value="Confirm" />
+ <s:submit value="Cancel" name="cancel"/>
</div>
</s:form>
</div>
