Modified: archiva/branches/MRM-124/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/admin/repositories/AddManagedRepositoryActionTest.java URL: http://svn.apache.org/viewvc/archiva/branches/MRM-124/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/admin/repositories/AddManagedRepositoryActionTest.java?rev=706118&r1=706117&r2=706118&view=diff ============================================================================== --- archiva/branches/MRM-124/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/admin/repositories/AddManagedRepositoryActionTest.java (original) +++ archiva/branches/MRM-124/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/admin/repositories/AddManagedRepositoryActionTest.java Sun Oct 19 21:17:16 2008 @@ -19,15 +19,15 @@ * under the License. */ -import com.opensymphony.xwork.Action; +import com.opensymphony.xwork2.Action; import org.apache.commons.io.FileUtils; import org.apache.maven.archiva.configuration.ArchivaConfiguration; import org.apache.maven.archiva.configuration.Configuration; import org.apache.maven.archiva.configuration.ManagedRepositoryConfiguration; import org.apache.maven.archiva.security.ArchivaRoleConstants; import org.codehaus.plexus.redback.role.RoleManager; -import org.codehaus.plexus.redback.xwork.interceptor.SecureActionBundle; -import org.codehaus.plexus.redback.xwork.interceptor.SecureActionException; +import org.codehaus.plexus.redback.struts2.interceptor.SecureActionBundle; +import org.codehaus.plexus.redback.struts2.interceptor.SecureActionException; import org.codehaus.plexus.spring.PlexusInSpringTestCase; import org.easymock.MockControl; @@ -63,6 +63,7 @@ return AbstractManagedRepositoriesAction.class.getName().replace( '.', '/' ) + "Test.xml"; } + @Override protected void setUp() throws Exception {
Modified: archiva/branches/MRM-124/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/admin/repositories/AddRemoteRepositoryActionTest.java URL: http://svn.apache.org/viewvc/archiva/branches/MRM-124/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/admin/repositories/AddRemoteRepositoryActionTest.java?rev=706118&r1=706117&r2=706118&view=diff ============================================================================== --- archiva/branches/MRM-124/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/admin/repositories/AddRemoteRepositoryActionTest.java (original) +++ archiva/branches/MRM-124/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/admin/repositories/AddRemoteRepositoryActionTest.java Sun Oct 19 21:17:16 2008 @@ -19,12 +19,12 @@ * under the License. */ -import com.opensymphony.xwork.Action; +import com.opensymphony.xwork2.Action; import org.apache.maven.archiva.configuration.ArchivaConfiguration; import org.apache.maven.archiva.configuration.Configuration; import org.apache.maven.archiva.configuration.RemoteRepositoryConfiguration; -import org.codehaus.plexus.redback.xwork.interceptor.SecureActionBundle; -import org.codehaus.plexus.redback.xwork.interceptor.SecureActionException; +import org.codehaus.plexus.redback.struts2.interceptor.SecureActionBundle; +import org.codehaus.plexus.redback.struts2.interceptor.SecureActionException; import org.codehaus.plexus.spring.PlexusInSpringTestCase; import org.easymock.MockControl; Modified: archiva/branches/MRM-124/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/MRM-124/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/admin/repositories/DeleteManagedRepositoryActionTest.java?rev=706118&r1=706117&r2=706118&view=diff ============================================================================== --- archiva/branches/MRM-124/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/admin/repositories/DeleteManagedRepositoryActionTest.java (original) +++ archiva/branches/MRM-124/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/admin/repositories/DeleteManagedRepositoryActionTest.java Sun Oct 19 21:17:16 2008 @@ -19,7 +19,7 @@ * under the License. */ -import com.opensymphony.xwork.Action; +import com.opensymphony.xwork2.Action; import org.apache.maven.archiva.configuration.ArchivaConfiguration; import org.apache.maven.archiva.configuration.Configuration; import org.apache.maven.archiva.configuration.IndeterminateConfigurationException; @@ -31,8 +31,8 @@ import org.apache.maven.archiva.security.ArchivaRoleConstants; import org.codehaus.plexus.redback.role.RoleManager; import org.codehaus.plexus.redback.role.RoleManagerException; -import org.codehaus.plexus.redback.xwork.interceptor.SecureActionBundle; -import org.codehaus.plexus.redback.xwork.interceptor.SecureActionException; +import org.codehaus.plexus.redback.struts2.interceptor.SecureActionBundle; +import org.codehaus.plexus.redback.struts2.interceptor.SecureActionException; import org.codehaus.plexus.registry.RegistryException; import org.codehaus.plexus.spring.PlexusInSpringTestCase; import org.easymock.MockControl; Modified: archiva/branches/MRM-124/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/admin/repositories/DeleteRemoteRepositoryActionTest.java URL: http://svn.apache.org/viewvc/archiva/branches/MRM-124/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/admin/repositories/DeleteRemoteRepositoryActionTest.java?rev=706118&r1=706117&r2=706118&view=diff ============================================================================== --- archiva/branches/MRM-124/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/admin/repositories/DeleteRemoteRepositoryActionTest.java (original) +++ archiva/branches/MRM-124/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/admin/repositories/DeleteRemoteRepositoryActionTest.java Sun Oct 19 21:17:16 2008 @@ -19,7 +19,7 @@ * under the License. */ -import com.opensymphony.xwork.Action; +import com.opensymphony.xwork2.Action; import org.apache.maven.archiva.configuration.ArchivaConfiguration; import org.apache.maven.archiva.configuration.Configuration; import org.apache.maven.archiva.configuration.IndeterminateConfigurationException; Modified: archiva/branches/MRM-124/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/MRM-124/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/admin/repositories/DeleteRepositoryGroupActionTest.java?rev=706118&r1=706117&r2=706118&view=diff ============================================================================== --- archiva/branches/MRM-124/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/admin/repositories/DeleteRepositoryGroupActionTest.java (original) +++ archiva/branches/MRM-124/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/admin/repositories/DeleteRepositoryGroupActionTest.java Sun Oct 19 21:17:16 2008 @@ -21,12 +21,12 @@ import java.util.Collections; -import com.opensymphony.xwork.Action; +import com.opensymphony.xwork2.Action; import org.apache.maven.archiva.configuration.ArchivaConfiguration; import org.apache.maven.archiva.configuration.Configuration; import org.apache.maven.archiva.configuration.RepositoryGroupConfiguration; -import org.codehaus.plexus.redback.xwork.interceptor.SecureActionBundle; -import org.codehaus.plexus.redback.xwork.interceptor.SecureActionException; +import org.codehaus.plexus.redback.struts2.interceptor.SecureActionBundle; +import org.codehaus.plexus.redback.struts2.interceptor.SecureActionException; import org.codehaus.plexus.spring.PlexusInSpringTestCase; import org.easymock.MockControl; Modified: archiva/branches/MRM-124/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/admin/repositories/EditManagedRepositoryActionTest.java URL: http://svn.apache.org/viewvc/archiva/branches/MRM-124/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/admin/repositories/EditManagedRepositoryActionTest.java?rev=706118&r1=706117&r2=706118&view=diff ============================================================================== --- archiva/branches/MRM-124/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/admin/repositories/EditManagedRepositoryActionTest.java (original) +++ archiva/branches/MRM-124/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/admin/repositories/EditManagedRepositoryActionTest.java Sun Oct 19 21:17:16 2008 @@ -19,14 +19,14 @@ * under the License. */ -import com.opensymphony.xwork.Action; +import com.opensymphony.xwork2.Action; import org.apache.maven.archiva.configuration.ArchivaConfiguration; import org.apache.maven.archiva.configuration.Configuration; import org.apache.maven.archiva.configuration.ManagedRepositoryConfiguration; import org.apache.maven.archiva.security.ArchivaRoleConstants; import org.codehaus.plexus.redback.role.RoleManager; -import org.codehaus.plexus.redback.xwork.interceptor.SecureActionBundle; -import org.codehaus.plexus.redback.xwork.interceptor.SecureActionException; +import org.codehaus.plexus.redback.struts2.interceptor.SecureActionBundle; +import org.codehaus.plexus.redback.struts2.interceptor.SecureActionException; import org.codehaus.plexus.spring.PlexusInSpringTestCase; import org.easymock.MockControl; Modified: archiva/branches/MRM-124/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/admin/repositories/EditRemoteRepositoryActionTest.java URL: http://svn.apache.org/viewvc/archiva/branches/MRM-124/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/admin/repositories/EditRemoteRepositoryActionTest.java?rev=706118&r1=706117&r2=706118&view=diff ============================================================================== --- archiva/branches/MRM-124/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/admin/repositories/EditRemoteRepositoryActionTest.java (original) +++ archiva/branches/MRM-124/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/admin/repositories/EditRemoteRepositoryActionTest.java Sun Oct 19 21:17:16 2008 @@ -19,12 +19,12 @@ * under the License. */ -import com.opensymphony.xwork.Action; +import com.opensymphony.xwork2.Action; import org.apache.maven.archiva.configuration.ArchivaConfiguration; import org.apache.maven.archiva.configuration.Configuration; import org.apache.maven.archiva.configuration.RemoteRepositoryConfiguration; -import org.codehaus.plexus.redback.xwork.interceptor.SecureActionBundle; -import org.codehaus.plexus.redback.xwork.interceptor.SecureActionException; +import org.codehaus.plexus.redback.struts2.interceptor.SecureActionBundle; +import org.codehaus.plexus.redback.struts2.interceptor.SecureActionException; import org.codehaus.plexus.spring.PlexusInSpringTestCase; import org.easymock.MockControl; Modified: archiva/branches/MRM-124/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/admin/repositories/RepositoriesActionTest.java URL: http://svn.apache.org/viewvc/archiva/branches/MRM-124/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/admin/repositories/RepositoriesActionTest.java?rev=706118&r1=706117&r2=706118&view=diff ============================================================================== --- archiva/branches/MRM-124/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/admin/repositories/RepositoriesActionTest.java (original) +++ archiva/branches/MRM-124/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/admin/repositories/RepositoriesActionTest.java Sun Oct 19 21:17:16 2008 @@ -21,9 +21,9 @@ import com.meterware.servletunit.ServletRunner; import com.meterware.servletunit.ServletUnitClient; -import com.opensymphony.xwork.Action; -import org.codehaus.plexus.redback.xwork.interceptor.SecureActionBundle; -import org.codehaus.plexus.redback.xwork.interceptor.SecureActionException; +import com.opensymphony.xwork2.Action; +import org.codehaus.plexus.redback.struts2.interceptor.SecureActionBundle; +import org.codehaus.plexus.redback.struts2.interceptor.SecureActionException; import org.codehaus.plexus.spring.PlexusInSpringTestCase; /** Modified: archiva/branches/MRM-124/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/admin/repositories/RepositoryGroupsActionTest.java URL: http://svn.apache.org/viewvc/archiva/branches/MRM-124/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/admin/repositories/RepositoryGroupsActionTest.java?rev=706118&r1=706117&r2=706118&view=diff ============================================================================== --- archiva/branches/MRM-124/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/admin/repositories/RepositoryGroupsActionTest.java (original) +++ archiva/branches/MRM-124/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/admin/repositories/RepositoryGroupsActionTest.java Sun Oct 19 21:17:16 2008 @@ -25,14 +25,14 @@ import org.apache.maven.archiva.configuration.Configuration; import org.apache.maven.archiva.configuration.ManagedRepositoryConfiguration; import org.apache.maven.archiva.configuration.RepositoryGroupConfiguration; -import org.codehaus.plexus.redback.xwork.interceptor.SecureActionBundle; -import org.codehaus.plexus.redback.xwork.interceptor.SecureActionException; +import org.codehaus.plexus.redback.struts2.interceptor.SecureActionBundle; +import org.codehaus.plexus.redback.struts2.interceptor.SecureActionException; import org.codehaus.plexus.spring.PlexusInSpringTestCase; import org.easymock.MockControl; import com.meterware.servletunit.ServletRunner; import com.meterware.servletunit.ServletUnitClient; -import com.opensymphony.xwork.Action; +import com.opensymphony.xwork2.Action; /** * RepositoryGroupsActionTest Modified: archiva/branches/MRM-124/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/admin/repositories/SortRepositoriesActionTest.java URL: http://svn.apache.org/viewvc/archiva/branches/MRM-124/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/admin/repositories/SortRepositoriesActionTest.java?rev=706118&r1=706117&r2=706118&view=diff ============================================================================== --- archiva/branches/MRM-124/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/admin/repositories/SortRepositoriesActionTest.java (original) +++ archiva/branches/MRM-124/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/admin/repositories/SortRepositoriesActionTest.java Sun Oct 19 21:17:16 2008 @@ -22,12 +22,12 @@ import org.apache.maven.archiva.configuration.ArchivaConfiguration; import org.apache.maven.archiva.configuration.Configuration; import org.apache.maven.archiva.configuration.RepositoryGroupConfiguration; -import org.codehaus.plexus.redback.xwork.interceptor.SecureActionBundle; -import org.codehaus.plexus.redback.xwork.interceptor.SecureActionException; +import org.codehaus.plexus.redback.struts2.interceptor.SecureActionBundle; +import org.codehaus.plexus.redback.struts2.interceptor.SecureActionException; import org.codehaus.plexus.spring.PlexusInSpringTestCase; import org.easymock.MockControl; -import com.opensymphony.xwork.Action; +import com.opensymphony.xwork2.Action; /** * SortRepositoriesActionTest Modified: archiva/branches/MRM-124/archiva-modules/archiva-web/archiva-webapp/src/test/resources/org/apache/maven/archiva/web/action/admin/repositories/AbstractManagedRepositoriesActionTest.xml URL: http://svn.apache.org/viewvc/archiva/branches/MRM-124/archiva-modules/archiva-web/archiva-webapp/src/test/resources/org/apache/maven/archiva/web/action/admin/repositories/AbstractManagedRepositoriesActionTest.xml?rev=706118&r1=706117&r2=706118&view=diff ============================================================================== --- archiva/branches/MRM-124/archiva-modules/archiva-web/archiva-webapp/src/test/resources/org/apache/maven/archiva/web/action/admin/repositories/AbstractManagedRepositoriesActionTest.xml (original) +++ archiva/branches/MRM-124/archiva-modules/archiva-web/archiva-webapp/src/test/resources/org/apache/maven/archiva/web/action/admin/repositories/AbstractManagedRepositoriesActionTest.xml Sun Oct 19 21:17:16 2008 @@ -26,7 +26,7 @@ </component> <component> - <role>com.opensymphony.xwork.Action</role> + <role>com.opensymphony.xwork2.Action</role> <role-hint>addManagedRepositoryAction</role-hint> <implementation>org.apache.maven.archiva.web.action.admin.repositories.AddManagedRepositoryAction</implementation> <instantiation-strategy>per-lookup</instantiation-strategy> @@ -34,7 +34,7 @@ </component> <component> - <role>com.opensymphony.xwork.Action</role> + <role>com.opensymphony.xwork2.Action</role> <role-hint>deleteManagedRepositoryAction</role-hint> <implementation>org.apache.maven.archiva.web.action.admin.repositories.DeleteManagedRepositoryAction</implementation> <instantiation-strategy>per-lookup</instantiation-strategy> @@ -48,7 +48,7 @@ </component> <component> - <role>com.opensymphony.xwork.Action</role> + <role>com.opensymphony.xwork2.Action</role> <role-hint>editManagedRepositoryAction</role-hint> <implementation>org.apache.maven.archiva.web.action.admin.repositories.EditManagedRepositoryAction</implementation> <instantiation-strategy>per-lookup</instantiation-strategy> Modified: archiva/branches/MRM-124/archiva-modules/archiva-web/archiva-webapp/src/test/resources/org/apache/maven/archiva/web/action/admin/repositories/DeleteManagedRepositoryActionTest.xml URL: http://svn.apache.org/viewvc/archiva/branches/MRM-124/archiva-modules/archiva-web/archiva-webapp/src/test/resources/org/apache/maven/archiva/web/action/admin/repositories/DeleteManagedRepositoryActionTest.xml?rev=706118&r1=706117&r2=706118&view=diff ============================================================================== --- archiva/branches/MRM-124/archiva-modules/archiva-web/archiva-webapp/src/test/resources/org/apache/maven/archiva/web/action/admin/repositories/DeleteManagedRepositoryActionTest.xml (original) +++ archiva/branches/MRM-124/archiva-modules/archiva-web/archiva-webapp/src/test/resources/org/apache/maven/archiva/web/action/admin/repositories/DeleteManagedRepositoryActionTest.xml Sun Oct 19 21:17:16 2008 @@ -30,7 +30,7 @@ <implementation>org.apache.maven.archiva.web.action.admin.repositories.RoleManagerStub</implementation> </component> <component> - <role>com.opensymphony.xwork.Action</role> + <role>com.opensymphony.xwork2.Action</role> <role-hint>deleteManagedRepositoryAction</role-hint> <implementation>org.apache.maven.archiva.web.action.admin.repositories.DeleteManagedRepositoryAction</implementation> <instantiation-strategy>per-lookup</instantiation-strategy> Modified: archiva/branches/MRM-124/archiva-modules/archiva-web/archiva-webapp/src/test/resources/org/apache/maven/archiva/web/action/admin/repositories/RepositoriesActionTest.xml URL: http://svn.apache.org/viewvc/archiva/branches/MRM-124/archiva-modules/archiva-web/archiva-webapp/src/test/resources/org/apache/maven/archiva/web/action/admin/repositories/RepositoriesActionTest.xml?rev=706118&r1=706117&r2=706118&view=diff ============================================================================== --- archiva/branches/MRM-124/archiva-modules/archiva-web/archiva-webapp/src/test/resources/org/apache/maven/archiva/web/action/admin/repositories/RepositoriesActionTest.xml (original) +++ archiva/branches/MRM-124/archiva-modules/archiva-web/archiva-webapp/src/test/resources/org/apache/maven/archiva/web/action/admin/repositories/RepositoriesActionTest.xml Sun Oct 19 21:17:16 2008 @@ -25,7 +25,7 @@ <lifecycle-handler>basic</lifecycle-handler> </component> <component> - <role>com.opensymphony.xwork.Action</role> + <role>com.opensymphony.xwork2.Action</role> <role-hint>repositoriesAction</role-hint> <implementation>org.apache.maven.archiva.web.action.admin.repositories.RepositoriesAction</implementation> <instantiation-strategy>per-lookup</instantiation-strategy> Modified: archiva/branches/MRM-124/archiva-modules/archiva-web/archiva-webdav/pom.xml URL: http://svn.apache.org/viewvc/archiva/branches/MRM-124/archiva-modules/archiva-web/archiva-webdav/pom.xml?rev=706118&r1=706117&r2=706118&view=diff ============================================================================== --- archiva/branches/MRM-124/archiva-modules/archiva-web/archiva-webdav/pom.xml (original) +++ archiva/branches/MRM-124/archiva-modules/archiva-web/archiva-webdav/pom.xml Sun Oct 19 21:17:16 2008 @@ -81,7 +81,7 @@ </dependency> <dependency> <groupId>org.codehaus.redback</groupId> - <artifactId>redback-xwork-integration</artifactId> + <artifactId>redback-struts2-integration</artifactId> </dependency> <dependency> <groupId>org.codehaus.redback</groupId> Modified: archiva/branches/MRM-124/archiva-modules/archiva-web/archiva-webdav/src/main/java/org/apache/maven/archiva/webdav/ArchivaDavResource.java URL: http://svn.apache.org/viewvc/archiva/branches/MRM-124/archiva-modules/archiva-web/archiva-webdav/src/main/java/org/apache/maven/archiva/webdav/ArchivaDavResource.java?rev=706118&r1=706117&r2=706118&view=diff ============================================================================== --- archiva/branches/MRM-124/archiva-modules/archiva-web/archiva-webdav/src/main/java/org/apache/maven/archiva/webdav/ArchivaDavResource.java (original) +++ archiva/branches/MRM-124/archiva-modules/archiva-web/archiva-webdav/src/main/java/org/apache/maven/archiva/webdav/ArchivaDavResource.java Sun Oct 19 21:17:16 2008 @@ -64,7 +64,7 @@ import org.joda.time.format.DateTimeFormatter; import org.joda.time.format.ISODateTimeFormat; -import com.opensymphony.xwork.ActionContext; +import com.opensymphony.xwork2.ActionContext; /** * @author <a href="mailto:[EMAIL PROTECTED]">James William Dumay</a> Portions from the Apache Jackrabbit Project Modified: archiva/branches/MRM-124/archiva-modules/archiva-web/archiva-webdav/src/main/java/org/apache/maven/archiva/webdav/ArchivaDavResourceFactory.java URL: http://svn.apache.org/viewvc/archiva/branches/MRM-124/archiva-modules/archiva-web/archiva-webdav/src/main/java/org/apache/maven/archiva/webdav/ArchivaDavResourceFactory.java?rev=706118&r1=706117&r2=706118&view=diff ============================================================================== --- archiva/branches/MRM-124/archiva-modules/archiva-web/archiva-webdav/src/main/java/org/apache/maven/archiva/webdav/ArchivaDavResourceFactory.java (original) +++ archiva/branches/MRM-124/archiva-modules/archiva-web/archiva-webdav/src/main/java/org/apache/maven/archiva/webdav/ArchivaDavResourceFactory.java Sun Oct 19 21:17:16 2008 @@ -85,12 +85,12 @@ import org.codehaus.plexus.redback.policy.MustChangePasswordException; import org.codehaus.plexus.redback.system.SecuritySession; import org.codehaus.plexus.redback.system.SecuritySystemConstants; -import org.codehaus.plexus.redback.xwork.filter.authentication.HttpAuthenticator; +import org.codehaus.plexus.redback.struts2.filter.authentication.HttpAuthenticator; import org.codehaus.plexus.util.xml.pull.XmlPullParserException; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import com.opensymphony.xwork.ActionContext; +import com.opensymphony.xwork2.ActionContext; /** * @author <a href="mailto:[EMAIL PROTECTED]">James William Dumay</a> Modified: archiva/branches/MRM-124/archiva-modules/archiva-web/archiva-webdav/src/main/java/org/apache/maven/archiva/webdav/ArchivaDavSessionProvider.java URL: http://svn.apache.org/viewvc/archiva/branches/MRM-124/archiva-modules/archiva-web/archiva-webdav/src/main/java/org/apache/maven/archiva/webdav/ArchivaDavSessionProvider.java?rev=706118&r1=706117&r2=706118&view=diff ============================================================================== --- archiva/branches/MRM-124/archiva-modules/archiva-web/archiva-webdav/src/main/java/org/apache/maven/archiva/webdav/ArchivaDavSessionProvider.java (original) +++ archiva/branches/MRM-124/archiva-modules/archiva-web/archiva-webdav/src/main/java/org/apache/maven/archiva/webdav/ArchivaDavSessionProvider.java Sun Oct 19 21:17:16 2008 @@ -32,7 +32,7 @@ import org.codehaus.plexus.redback.authorization.UnauthorizedException; import org.codehaus.plexus.redback.policy.MustChangePasswordException; import org.codehaus.plexus.redback.policy.AccountLockedException; -import org.codehaus.plexus.redback.xwork.filter.authentication.HttpAuthenticator; +import org.codehaus.plexus.redback.struts2.filter.authentication.HttpAuthenticator; import org.slf4j.Logger; import org.slf4j.LoggerFactory; Modified: archiva/branches/MRM-124/archiva-modules/archiva-web/archiva-webdav/src/main/java/org/apache/maven/archiva/webdav/RepositoryServlet.java URL: http://svn.apache.org/viewvc/archiva/branches/MRM-124/archiva-modules/archiva-web/archiva-webdav/src/main/java/org/apache/maven/archiva/webdav/RepositoryServlet.java?rev=706118&r1=706117&r2=706118&view=diff ============================================================================== --- archiva/branches/MRM-124/archiva-modules/archiva-web/archiva-webdav/src/main/java/org/apache/maven/archiva/webdav/RepositoryServlet.java (original) +++ archiva/branches/MRM-124/archiva-modules/archiva-web/archiva-webdav/src/main/java/org/apache/maven/archiva/webdav/RepositoryServlet.java Sun Oct 19 21:17:16 2008 @@ -46,7 +46,7 @@ import org.apache.maven.archiva.configuration.ManagedRepositoryConfiguration; import org.apache.maven.archiva.security.ArchivaXworkUser; import org.apache.maven.archiva.security.ServletAuthenticator; -import org.codehaus.plexus.redback.xwork.filter.authentication.HttpAuthenticator; +import org.codehaus.plexus.redback.struts2.filter.authentication.HttpAuthenticator; import org.codehaus.plexus.spring.PlexusToSpringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; Modified: archiva/branches/MRM-124/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/maven/archiva/webdav/ArchivaDavSessionProviderTest.java URL: http://svn.apache.org/viewvc/archiva/branches/MRM-124/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/maven/archiva/webdav/ArchivaDavSessionProviderTest.java?rev=706118&r1=706117&r2=706118&view=diff ============================================================================== --- archiva/branches/MRM-124/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/maven/archiva/webdav/ArchivaDavSessionProviderTest.java (original) +++ archiva/branches/MRM-124/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/maven/archiva/webdav/ArchivaDavSessionProviderTest.java Sun Oct 19 21:17:16 2008 @@ -46,7 +46,7 @@ import org.codehaus.plexus.redback.policy.MustChangePasswordException; import org.codehaus.plexus.redback.system.SecuritySession; import org.codehaus.plexus.redback.users.User; -import org.codehaus.plexus.redback.xwork.filter.authentication.HttpAuthenticator; +import org.codehaus.plexus.redback.struts2.filter.authentication.HttpAuthenticator; public class ArchivaDavSessionProviderTest extends TestCase { Modified: archiva/branches/MRM-124/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/maven/archiva/webdav/RepositoryServletSecurityTest.java URL: http://svn.apache.org/viewvc/archiva/branches/MRM-124/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/maven/archiva/webdav/RepositoryServletSecurityTest.java?rev=706118&r1=706117&r2=706118&view=diff ============================================================================== --- archiva/branches/MRM-124/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/maven/archiva/webdav/RepositoryServletSecurityTest.java (original) +++ archiva/branches/MRM-124/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/maven/archiva/webdav/RepositoryServletSecurityTest.java Sun Oct 19 21:17:16 2008 @@ -40,8 +40,8 @@ import org.codehaus.plexus.redback.authorization.UnauthorizedException; import org.codehaus.plexus.redback.system.DefaultSecuritySession; import org.codehaus.plexus.redback.system.SecuritySession; -import org.codehaus.plexus.redback.xwork.filter.authentication.HttpAuthenticator; -import org.codehaus.plexus.redback.xwork.filter.authentication.basic.HttpBasicAuthentication; +import org.codehaus.plexus.redback.struts2.filter.authentication.HttpAuthenticator; +import org.codehaus.plexus.redback.struts2.filter.authentication.basic.HttpBasicAuthentication; import org.codehaus.plexus.spring.PlexusInSpringTestCase; import org.easymock.MockControl; import org.easymock.classextension.MockClassControl; Modified: archiva/branches/MRM-124/archiva-modules/archiva-web/archiva-webdav/src/test/resources/org/apache/maven/archiva/webdav/RepositoryServletTest.xml URL: http://svn.apache.org/viewvc/archiva/branches/MRM-124/archiva-modules/archiva-web/archiva-webdav/src/test/resources/org/apache/maven/archiva/webdav/RepositoryServletTest.xml?rev=706118&r1=706117&r2=706118&view=diff ============================================================================== --- archiva/branches/MRM-124/archiva-modules/archiva-web/archiva-webdav/src/test/resources/org/apache/maven/archiva/webdav/RepositoryServletTest.xml (original) +++ archiva/branches/MRM-124/archiva-modules/archiva-web/archiva-webdav/src/test/resources/org/apache/maven/archiva/webdav/RepositoryServletTest.xml Sun Oct 19 21:17:16 2008 @@ -144,7 +144,7 @@ <field-name>mimeTypes</field-name> </requirement> <requirement> - <role>org.codehaus.plexus.redback.xwork.filter.authentication.HttpAuthenticator</role> + <role>org.codehaus.plexus.redback.struts2.filter.authentication.HttpAuthenticator</role> <role-hint>basic</role-hint> <field-name>httpAuth</field-name> </requirement> Modified: archiva/branches/MRM-124/pom.xml URL: http://svn.apache.org/viewvc/archiva/branches/MRM-124/pom.xml?rev=706118&r1=706117&r2=706118&view=diff ============================================================================== --- archiva/branches/MRM-124/pom.xml (original) +++ archiva/branches/MRM-124/pom.xml Sun Oct 19 21:17:16 2008 @@ -64,7 +64,7 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-enforcer-plugin</artifactId> - <version>1.0-alpha-3</version> + <version>1.0-alpha-4</version> <executions> <execution> <goals> @@ -83,6 +83,7 @@ <exclude>ant:ant-optional</exclude> <!-- exclude>org.apache.maven.wagon:wagon-http-lightweight</exclude --> <exclude>xom:xom</exclude> + <exclude>org.codehaus.plexus:plexus-xwork-integration</exclude> </excludes> </bannedDependencies> </rules> @@ -410,7 +411,7 @@ <dependency> <groupId>org.codehaus.plexus</groupId> <artifactId>plexus-spring</artifactId> - <version>1.0</version> + <version>1.2</version> <exclusions> <exclusion> <groupId>org.codehaus.plexus</groupId> @@ -653,6 +654,9 @@ </exclusion> </exclusions> </dependency> + + <!-- redback --> + <dependency> <groupId>org.codehaus.redback</groupId> <artifactId>redback-rbac-memory</artifactId> @@ -660,8 +664,8 @@ <scope>test</scope> <exclusions> <exclusion> - <groupId>org.codehaus.plexus</groupId> - <artifactId>plexus-container-default</artifactId> + <groupId>commons-logging</groupId> + <artifactId>commons-logging</artifactId> </exclusion> </exclusions> </dependency> @@ -672,8 +676,8 @@ <scope>test</scope> <exclusions> <exclusion> - <groupId>org.codehaus.plexus</groupId> - <artifactId>plexus-container-default</artifactId> + <groupId>commons-logging</groupId> + <artifactId>commons-logging</artifactId> </exclusion> </exclusions> </dependency> @@ -684,8 +688,8 @@ <scope>test</scope> <exclusions> <exclusion> - <groupId>org.codehaus.plexus</groupId> - <artifactId>plexus-container-default</artifactId> + <groupId>commons-logging</groupId> + <artifactId>commons-logging</artifactId> </exclusion> </exclusions> </dependency> @@ -695,8 +699,8 @@ <version>${redback.version}</version> <exclusions> <exclusion> - <groupId>org.codehaus.plexus</groupId> - <artifactId>plexus-container-default</artifactId> + <groupId>commons-logging</groupId> + <artifactId>commons-logging</artifactId> </exclusion> </exclusions> </dependency> @@ -706,8 +710,8 @@ <version>${redback.version}</version> <exclusions> <exclusion> - <groupId>org.codehaus.plexus</groupId> - <artifactId>plexus-container-default</artifactId> + <groupId>commons-logging</groupId> + <artifactId>commons-logging</artifactId> </exclusion> </exclusions> </dependency> @@ -717,8 +721,8 @@ <version>${redback.version}</version> <exclusions> <exclusion> - <groupId>org.codehaus.plexus</groupId> - <artifactId>plexus-container-default</artifactId> + <groupId>commons-logging</groupId> + <artifactId>commons-logging</artifactId> </exclusion> </exclusions> </dependency> @@ -728,25 +732,25 @@ <version>${redback.version}</version> <exclusions> <exclusion> - <groupId>org.codehaus.plexus</groupId> - <artifactId>plexus-container-default</artifactId> + <groupId>commons-logging</groupId> + <artifactId>commons-logging</artifactId> </exclusion> </exclusions> </dependency> <dependency> <groupId>org.codehaus.redback</groupId> - <artifactId>redback-taglib</artifactId> + <artifactId>redback-struts2-taglib</artifactId> <version>${redback.version}</version> <exclusions> <exclusion> - <groupId>org.codehaus.plexus</groupId> - <artifactId>plexus-container-default</artifactId> + <groupId>commons-logging</groupId> + <artifactId>commons-logging</artifactId> </exclusion> </exclusions> </dependency> <dependency> <groupId>org.codehaus.redback</groupId> - <artifactId>redback-xwork-content</artifactId> + <artifactId>redback-struts2-content</artifactId> <version>${redback.version}</version> <type>war</type> <exclusions> @@ -754,11 +758,15 @@ <groupId>classworlds</groupId> <artifactId>classworlds</artifactId> </exclusion> + <exclusion> + <groupId>commons-logging</groupId> + <artifactId>commons-logging</artifactId> + </exclusion> </exclusions> </dependency> <dependency> <groupId>org.codehaus.redback</groupId> - <artifactId>redback-xwork-integration</artifactId> + <artifactId>redback-struts2-integration</artifactId> <version>${redback.version}</version> <exclusions> <exclusion> @@ -772,13 +780,12 @@ <exclusion> <groupId>commons-logging</groupId> <artifactId>commons-logging</artifactId> - </exclusion> - <exclusion> - <groupId>org.codehaus.plexus</groupId> - <artifactId>plexus-container-default</artifactId> - </exclusion> + </exclusion> </exclusions> </dependency> + + <!-- redback --> + <dependency> <groupId>org.codehaus.plexus.registry</groupId> <artifactId>plexus-registry-api</artifactId> @@ -870,9 +877,20 @@ <version>${wagon.version}</version> </dependency> <dependency> - <groupId>com.opensymphony</groupId> - <artifactId>webwork</artifactId> - <version>2.2.6</version> + <groupId>org.apache.struts</groupId> + <artifactId>struts2-core</artifactId> + <version>2.0.11.2</version> + <exclusions> + <exclusion> + <groupId>commons-logging</groupId> + <artifactId>commons-logging</artifactId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>org.apache.struts</groupId> + <artifactId>struts2-spring-plugin</artifactId> + <version>2.0.11.2</version> <exclusions> <exclusion> <groupId>commons-logging</groupId> @@ -930,7 +948,7 @@ <dependency> <groupId>org.springframework</groupId> <artifactId>spring-context</artifactId> - <version>2.5.1</version> + <version>2.5.5</version> <exclusions> <exclusion> <groupId>commons-logging</groupId> @@ -941,7 +959,18 @@ <dependency> <groupId>org.springframework</groupId> <artifactId>spring-web</artifactId> - <version>2.5.1</version> + <version>2.5.5</version> + <exclusions> + <exclusion> + <groupId>commons-logging</groupId> + <artifactId>commons-logging</artifactId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>org.springframework</groupId> + <artifactId>spring-beans</artifactId> + <version>2.5.5</version> <exclusions> <exclusion> <groupId>commons-logging</groupId> @@ -995,17 +1024,6 @@ </exclusions> </dependency> <dependency> - <groupId>org.codehaus.plexus</groupId> - <artifactId>plexus-xwork-integration</artifactId> - <version>1.0-alpha-7</version> - <exclusions> - <exclusion> - <groupId>velocity</groupId> - <artifactId>velocity-dep</artifactId> - </exclusion> - </exclusions> - </dependency> - <dependency> <groupId>net.sf.ehcache</groupId> <artifactId>ehcache</artifactId> <version>1.3.0</version> @@ -1021,7 +1039,7 @@ <properties> <maven.version>2.0.8</maven.version> <wagon.version>1.0-beta-4</wagon.version> - <redback.version>1.1.1</redback.version> + <redback.version>1.2-SNAPSHOT</redback.version> <jetty.version>6.1.6</jetty.version> <binder.version>0.8.1</binder.version> </properties>
