You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@archiva.apache.org by br...@apache.org on 2014/02/02 04:15:04 UTC
svn commit: r1563560 - in
/archiva/branches/archiva-1.3.x/archiva-modules/archiva-web/archiva-webapp/src:
main/java/org/apache/maven/archiva/web/action/admin/connectors/proxy/
main/java/org/apache/maven/archiva/web/action/admin/repositories/
main/resou...
Author: brett
Date: Sun Feb 2 03:15:01 2014
New Revision: 1563560
URL: http://svn.apache.org/r1563560
Log:
fix some compile issues from tests
Modified:
archiva/branches/archiva-1.3.x/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/connectors/proxy/EditProxyConnectorAction.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/resources/struts.xml
archiva/branches/archiva-1.3.x/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/admin/repositories/DeleteManagedRepositoryActionTest.java
archiva/branches/archiva-1.3.x/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/admin/repositories/DeleteRepositoryGroupActionTest.java
Modified: archiva/branches/archiva-1.3.x/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/connectors/proxy/EditProxyConnectorAction.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/connectors/proxy/EditProxyConnectorAction.java?rev=1563560&r1=1563559&r2=1563560&view=diff
==============================================================================
--- archiva/branches/archiva-1.3.x/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/connectors/proxy/EditProxyConnectorAction.java (original)
+++ archiva/branches/archiva-1.3.x/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/connectors/proxy/EditProxyConnectorAction.java Sun Feb 2 03:15:01 2014
@@ -42,9 +42,16 @@ public class EditProxyConnectorAction
*/
private String target;
- public String input()
+ @Override
+ public void prepare()
{
+ super.prepare();
+
connector = findProxyConnector( source, target );
+ }
+
+ public String input()
+ {
if ( connector == null )
{
addActionError( "Unable to edit non existant proxy connector with source [" + source + "] and target ["
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=1563560&r1=1563559&r2=1563560&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 Sun Feb 2 03:15:01 2014
@@ -34,12 +34,21 @@ import org.apache.maven.archiva.reposito
*/
public class DeleteRepositoryGroupAction
extends AbstractRepositoriesAdminAction
+ implements Preparable
{
private RepositoryGroupConfiguration repositoryGroup;
private String repoGroupId;
private boolean cancel;
+
+ public void prepare()
+ {
+ if ( StringUtils.isNotBlank( repoGroupId ) )
+ {
+ this.repositoryGroup = archivaConfiguration.getConfiguration().findRepositoryGroupById( repoGroupId );
+ }
+ }
public String confirmDelete()
{
@@ -48,10 +57,6 @@ public class DeleteRepositoryGroupAction
addActionError( "Unable to delete repository group: repository id was blank." );
return ERROR;
}
- else
- {
- this.repositoryGroup = archivaConfiguration.getConfiguration().findRepositoryGroupById( repoGroupId );
- }
return INPUT;
}
Modified: archiva/branches/archiva-1.3.x/archiva-modules/archiva-web/archiva-webapp/src/main/resources/struts.xml
URL: http://svn.apache.org/viewvc/archiva/branches/archiva-1.3.x/archiva-modules/archiva-web/archiva-webapp/src/main/resources/struts.xml?rev=1563560&r1=1563559&r2=1563560&view=diff
==============================================================================
--- archiva/branches/archiva-1.3.x/archiva-modules/archiva-web/archiva-webapp/src/main/resources/struts.xml (original)
+++ archiva/branches/archiva-1.3.x/archiva-modules/archiva-web/archiva-webapp/src/main/resources/struts.xml Sun Feb 2 03:15:01 2014
@@ -429,9 +429,7 @@
<action name="editProxyConnector" class="editProxyConnectorAction" method="input">
<result name="input">/WEB-INF/jsp/admin/editProxyConnector.jsp</result>
<result name="success" type="redirectAction">proxyConnectors</result>
- <interceptor-ref name="configuredArchivaStack">
- <param name="params.acceptParamNames">\w+((\.\w+)|(\[\d+\])|(\(\d+\))|(\['[-\w]+'\])|(\('\w+'\)))*</param>
- </interceptor-ref>
+ <interceptor-ref name="configuredPrepareParamsStack" />
</action>
<action name="editProxyConnector_*" class="editProxyConnectorAction" method="{1}">
Modified: archiva/branches/archiva-1.3.x/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/admin/repositories/DeleteManagedRepositoryActionTest.java
URL: http://svn.apache.org/viewvc/archiva/branches/archiva-1.3.x/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/admin/repositories/DeleteManagedRepositoryActionTest.java?rev=1563560&r1=1563559&r2=1563560&view=diff
==============================================================================
--- archiva/branches/archiva-1.3.x/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/admin/repositories/DeleteManagedRepositoryActionTest.java (original)
+++ archiva/branches/archiva-1.3.x/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/admin/repositories/DeleteManagedRepositoryActionTest.java Sun Feb 2 03:15:01 2014
@@ -147,7 +147,7 @@ public class DeleteManagedRepositoryActi
auditLogsDaoControl.expectAndReturn( auditLogsDao.saveAuditLogs( new ArchivaAuditLogs() ), null );
auditLogsDaoControl.replay();
- String status = action.deleteEntry();
+ String status = action.delete();
auditLogsDaoControl.verify();
@@ -167,8 +167,9 @@ public class DeleteManagedRepositoryActi
auditLogsDaoControl.expectAndReturn( auditLogsDao.saveAuditLogs( new ArchivaAuditLogs() ), null );
auditLogsDaoControl.replay();
-
- String status = action.deleteContents();
+
+ action.setDeleteContents( Boolean.TRUE.toString() );
+ String status = action.delete();
auditLogsDaoControl.verify();
@@ -193,8 +194,9 @@ public class DeleteManagedRepositoryActi
auditLogsDaoControl.expectAndReturn( auditLogsDao.saveAuditLogs( new ArchivaAuditLogs() ), null );
auditLogsDaoControl.replay();
-
- String status = action.deleteContents();
+
+ action.setDeleteContents( Boolean.TRUE.toString() );
+ String status = action.delete();
auditLogsDaoControl.verify();
assertEquals( Action.SUCCESS, status );
@@ -235,8 +237,9 @@ public class DeleteManagedRepositoryActi
auditLogsDaoControl.expectAndReturn( auditLogsDao.saveAuditLogs( new ArchivaAuditLogs() ), null );
auditLogsDaoControl.replay();
-
- String status = action.deleteContents();
+
+ action.setDeleteContents( Boolean.TRUE.toString() );
+ String status = action.delete();
assertEquals( Action.SUCCESS, status );
auditLogsDaoControl.verify();
Modified: archiva/branches/archiva-1.3.x/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/admin/repositories/DeleteRepositoryGroupActionTest.java
URL: http://svn.apache.org/viewvc/archiva/branches/archiva-1.3.x/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/admin/repositories/DeleteRepositoryGroupActionTest.java?rev=1563560&r1=1563559&r2=1563560&view=diff
==============================================================================
--- archiva/branches/archiva-1.3.x/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/admin/repositories/DeleteRepositoryGroupActionTest.java (original)
+++ archiva/branches/archiva-1.3.x/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/admin/repositories/DeleteRepositoryGroupActionTest.java Sun Feb 2 03:15:01 2014
@@ -33,8 +33,6 @@ import com.opensymphony.xwork2.Action;
/**
* DeleteRepositoryGroupActionTest
- *
- * @version
*/
public class DeleteRepositoryGroupActionTest
extends PlexusInSpringTestCase