Modified: archiva/branches/archiva-1.3.x/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/proxyConnectors.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/proxyConnectors.jsp?rev=1561667&r1=1561666&r2=1561667&view=diff ============================================================================== --- archiva/branches/archiva-1.3.x/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/proxyConnectors.jsp (original) +++ archiva/branches/archiva-1.3.x/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/proxyConnectors.jsp Mon Jan 27 13:24:23 2014 @@ -129,8 +129,8 @@ <s:url id="deleteProxyConnectorUrl" action="deleteProxyConnector" method="confirmDelete"> <s:param name="source" value="%{#attr.connector.sourceRepoId}"/> <s:param name="target" value="%{#attr.connector.targetRepoId}"/> - <s:param name="struts.token.name">struts.token</s:param> - <s:param name="struts.token"><s:property value="struts.token"/></s:param> + <s:param name="struts.token.name">token</s:param> + <s:param name="token"><s:property value="token"/></s:param> </s:url> <s:url id="enableProxyConnectorUrl" action="enableProxyConnector" method="confirmEnable"> <s:param name="source" value="%{#attr.connector.sourceRepoId}"/> @@ -139,8 +139,8 @@ <s:url id="disableProxyConnectorUrl" action="disableProxyConnector" method="confirmDisable"> <s:param name="source" value="%{#attr.connector.sourceRepoId}"/> <s:param name="target" value="%{#attr.connector.targetRepoId}"/> - <s:param name="struts.token.name">struts.token</s:param> - <s:param name="struts.token"><s:property value="struts.token"/></s:param> + <s:param name="struts.token.name">token</s:param> + <s:param name="token"><s:property value="token"/></s:param> </s:url> <c:if test="${connector.disabled}"> <s:a href="%{enableProxyConnectorUrl}" title="Enable Proxy Connector">
Modified: archiva/branches/archiva-1.3.x/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/repositories.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/repositories.jsp?rev=1561667&r1=1561666&r2=1561667&view=diff ============================================================================== --- archiva/branches/archiva-1.3.x/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/repositories.jsp (original) +++ archiva/branches/archiva-1.3.x/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/repositories.jsp Mon Jan 27 13:24:23 2014 @@ -105,8 +105,8 @@ <s:token/> <s:url id="deleteRepositoryUrl" encode="true" action="confirmDeleteRepository"> <s:param name="repoid" value="%{#attr.repository.id}"/> - <s:param name="struts.token.name">struts.token</s:param> - <s:param name="struts.token"><s:property value="struts.token"/></s:param> + <s:param name="struts.token.name">token</s:param> + <s:param name="token"><s:property value="token"/></s:param> </s:url> <s:a href="%{editRepositoryUrl}"> <img src="<c:url value="/images/icons/edit.png" />" alt="" width="16" height="16"/> @@ -320,8 +320,8 @@ <s:token/> <s:url id="deleteRepositoryUrl" encode="true" action="confirmDeleteRemoteRepository"> <s:param name="repoid" value="%{#attr.repository.id}"/> - <s:param name="struts.token.name">struts.token</s:param> - <s:param name="struts.token"><s:property value="struts.token"/></s:param> + <s:param name="struts.token.name">token</s:param> + <s:param name="token"><s:property value="token"/></s:param> </s:url> <s:a href="%{deleteRepositoryUrl}"> <img src="<c:url value="/images/icons/delete.gif" />" alt="" width="16" height="16"/> Modified: archiva/branches/archiva-1.3.x/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/repositoryGroups.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/repositoryGroups.jsp?rev=1561667&r1=1561666&r2=1561667&view=diff ============================================================================== --- archiva/branches/archiva-1.3.x/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/repositoryGroups.jsp (original) +++ archiva/branches/archiva-1.3.x/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/repositoryGroups.jsp Mon Jan 27 13:24:23 2014 @@ -75,8 +75,8 @@ <s:token/> <s:url id="deleteRepositoryGroupUrl" action="confirmDeleteRepositoryGroup"> <s:param name="repoGroupId" value="%{#attr.repositoryGroup.key}" /> - <s:param name="struts.token.name">struts.token</s:param> - <s:param name="struts.token"><s:property value="struts.token"/></s:param> + <s:param name="struts.token.name">token</s:param> + <s:param name="token"><s:property value="token"/></s:param> </s:url> <s:a href="%{deleteRepositoryGroupUrl}" cssClass="delete"> <img src="${iconDeleteUrl}"/> Modified: archiva/branches/archiva-1.3.x/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/repositoryScanning.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/repositoryScanning.jsp?rev=1561667&r1=1561666&r2=1561667&view=diff ============================================================================== --- archiva/branches/archiva-1.3.x/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/repositoryScanning.jsp (original) +++ archiva/branches/archiva-1.3.x/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/repositoryScanning.jsp Mon Jan 27 13:24:23 2014 @@ -41,8 +41,8 @@ <c:url var="iconDeleteUrl" value="/images/icons/delete.gif" /> <c:url var="iconCreateUrl" value="/images/icons/create.png" /> -<s:url id="removeFiletypePatternUrl" action="repositoryScanning" method="removeFiletypePattern"/> -<s:url id="addFiletypePatternUrl" action="repositoryScanning" method="addFiletypePattern"/> +<s:url id="removeFiletypePatternUrl" action="repositoryScanning_removeFiletypePattern"/> +<s:url id="addFiletypePatternUrl" action="repositoryScanning_addFiletypePattern"/> <script type="text/javascript"> <!-- @@ -154,7 +154,7 @@ <c:otherwise> <%-- Display the consumers. --%> - <s:form method="post" action="repositoryScanning!updateKnownConsumers" + <s:form method="post" action="repositoryScanning_updateKnownConsumers" namespace="/admin" validate="false" theme="simple"> <s:token/> <table class="consumers"> Modified: archiva/branches/archiva-1.3.x/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/deleteArtifact.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/deleteArtifact.jsp?rev=1561667&r1=1561666&r2=1561667&view=diff ============================================================================== --- archiva/branches/archiva-1.3.x/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/deleteArtifact.jsp (original) +++ archiva/branches/archiva-1.3.x/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/deleteArtifact.jsp Mon Jan 27 13:24:23 2014 @@ -47,7 +47,7 @@ </s:if> <div id="contentArea"> - <s:form action="deleteArtifact!doDelete" namespace="/" method="post" validate="true"> + <s:form action="deleteArtifact_submit" namespace="/" method="post" validate="true"> <%@ include file="/WEB-INF/jsp/include/deleteArtifactForm.jspf" %> <s:token/> <s:submit/> Modified: archiva/branches/archiva-1.3.x/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/include/deleteArtifactForm.jspf URL: http://svn.apache.org/viewvc/archiva/branches/archiva-1.3.x/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/include/deleteArtifactForm.jspf?rev=1561667&r1=1561666&r2=1561667&view=diff ============================================================================== --- archiva/branches/archiva-1.3.x/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/include/deleteArtifactForm.jspf (original) +++ archiva/branches/archiva-1.3.x/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/include/deleteArtifactForm.jspf Mon Jan 27 13:24:23 2014 @@ -21,8 +21,8 @@ <%@ taglib prefix="s" uri="/struts-tags" %> <%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"; %> -<s:textfield name="groupId" label="Group Id" size="50" required="true"/> -<s:textfield name="artifactId" label="Artifact Id" size="50" required="true"/> -<s:textfield name="version" label="Version" size="50" required="true"/> +<s:textfield name="groupId" label="Group Id" size="50" requiredLabel="true"/> +<s:textfield name="artifactId" label="Artifact Id" size="50" requiredLabel="true"/> +<s:textfield name="version" label="Version" size="50" requiredLabel="true"/> <s:select name="repositoryId" list="managedRepos" label="Repository Id"/> \ No newline at end of file Modified: archiva/branches/archiva-1.3.x/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/include/uploadForm.jspf URL: http://svn.apache.org/viewvc/archiva/branches/archiva-1.3.x/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/include/uploadForm.jspf?rev=1561667&r1=1561666&r2=1561667&view=diff ============================================================================== --- archiva/branches/archiva-1.3.x/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/include/uploadForm.jspf (original) +++ archiva/branches/archiva-1.3.x/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/include/uploadForm.jspf Mon Jan 27 13:24:23 2014 @@ -23,14 +23,14 @@ <%@ taglib prefix="s" uri="/struts-tags" %> <%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"; %> -<s:textfield name="groupId" label="Group Id" size="50" required="true"/> -<s:textfield name="artifactId" label="Artifact Id" size="50" required="true"/> -<s:textfield name="version" label="Version" size="50" required="true"/> -<s:textfield name="packaging" label="Packaging" size="50" required="true"/> -<s:textfield name="classifier" label="Classifier" size="50" required="false"/> +<s:textfield name="groupId" label="Group Id" size="50" requiredLabel="true"/> +<s:textfield name="artifactId" label="Artifact Id" size="50" requiredLabel="true"/> +<s:textfield name="version" label="Version" size="50" requiredLabel="true"/> +<s:textfield name="packaging" label="Packaging" size="50" requiredLabel="true"/> +<s:textfield name="classifier" label="Classifier" size="50" requiredLabel="false"/> <s:checkbox name="generatePom" value="generatePom" label="Generate Maven 2 POM"/> -<s:file name="artifact" label="Artifact File" required="true"/> +<s:file name="artifact" label="Artifact File" requiredLabel="true"/> <s:file name="pom" label="POM File"/> <s:select name="repositoryId" list="managedRepoIdList" label="Repository Id"/> Modified: archiva/branches/archiva-1.3.x/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/reports/auditLogReport.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/reports/auditLogReport.jsp?rev=1561667&r1=1561666&r2=1561667&view=diff ============================================================================== --- archiva/branches/archiva-1.3.x/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/reports/auditLogReport.jsp (original) +++ archiva/branches/archiva-1.3.x/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/reports/auditLogReport.jsp Mon Jan 27 13:24:23 2014 @@ -25,7 +25,7 @@ <head> <title>Audit Log Report</title> - <s:head theme="ajax" /> + <s:head /> <link rel="stylesheet" href="<c:url value='/css/no-theme/jquery-ui-1.7.2.custom.css'/>" type="text/css" /> <script type="text/javascript" src="<c:url value='/js/jquery-1.3.2.min.js'/>"></script> Modified: archiva/branches/archiva-1.3.x/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/reports/pickReport.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/reports/pickReport.jsp?rev=1561667&r1=1561666&r2=1561667&view=diff ============================================================================== --- archiva/branches/archiva-1.3.x/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/reports/pickReport.jsp (original) +++ archiva/branches/archiva-1.3.x/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/reports/pickReport.jsp Mon Jan 27 13:24:23 2014 @@ -25,7 +25,7 @@ <head> <title>Reports</title> - <s:head theme="ajax" /> + <s:head /> <link rel="stylesheet" href="<c:url value='/css/no-theme/jquery-ui-1.7.2.custom.css'/>" type="text/css" /> <script type="text/javascript" src="<c:url value='/js/jquery-1.3.2.min.js'/>"></script> Modified: archiva/branches/archiva-1.3.x/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/upload.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/upload.jsp?rev=1561667&r1=1561666&r2=1561667&view=diff ============================================================================== --- archiva/branches/archiva-1.3.x/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/upload.jsp (original) +++ archiva/branches/archiva-1.3.x/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/upload.jsp Mon Jan 27 13:24:23 2014 @@ -37,7 +37,7 @@ <s:actionerror/> <s:actionmessage/> - <s:form action="upload!doUpload" method="post" enctype="multipart/form-data" validate="true"> + <s:form action="upload_submit" method="post" enctype="multipart/form-data" validate="true"> <%@ include file="/WEB-INF/jsp/include/uploadForm.jspf" %> <s:submit/> </s:form> Modified: archiva/branches/archiva-1.3.x/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/web.xml URL: http://svn.apache.org/viewvc/archiva/branches/archiva-1.3.x/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/web.xml?rev=1561667&r1=1561666&r2=1561667&view=diff ============================================================================== --- archiva/branches/archiva-1.3.x/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/web.xml (original) +++ archiva/branches/archiva-1.3.x/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/web.xml Mon Jan 27 13:24:23 2014 @@ -24,24 +24,22 @@ <display-name>Apache Archiva</display-name> - <filter> - <filter-name>webwork-cleanup</filter-name> - <filter-class>org.apache.struts2.dispatcher.ActionContextCleanUp</filter-class> - </filter> + <filter> + <filter-name>struts-prepare</filter-name> + <filter-class>org.apache.struts2.dispatcher.ng.filter.StrutsPrepareFilter</filter-class> + </filter> + + <filter> + <filter-name>sitemesh</filter-name> + <filter-class>com.opensymphony.sitemesh.webapp.SiteMeshFilter</filter-class> + </filter> + + <filter> + <filter-name>struts-execute</filter-name> + <filter-class>org.apache.struts2.dispatcher.ng.filter.StrutsExecuteFilter</filter-class> + </filter> - <filter> - <filter-name>sitemesh</filter-name> - <filter-class> - com.opensymphony.module.sitemesh.filter.PageFilter - </filter-class> - </filter> - - <filter> - <filter-name>webwork</filter-name> - <filter-class>org.apache.struts2.dispatcher.FilterDispatcher</filter-class> - </filter> - - <filter> + <filter> <filter-name>encodingFilter</filter-name> <filter-class>org.springframework.web.filter.CharacterEncodingFilter</filter-class> <init-param> @@ -61,7 +59,7 @@ <!-- this must be before the sitemesh filter --> <filter-mapping> - <filter-name>webwork-cleanup</filter-name> + <filter-name>struts-prepare</filter-name> <url-pattern>/*</url-pattern> </filter-mapping> @@ -71,7 +69,7 @@ </filter-mapping> <filter-mapping> - <filter-name>webwork</filter-name> + <filter-name>struts-execute</filter-name> <url-pattern>/*</url-pattern> </filter-mapping> @@ -86,8 +84,11 @@ org.apache.maven.archiva.web.startup.ArchivaStartup </listener-class> </listener> + <listener> + <listener-class>org.apache.struts2.dispatcher.ng.listener.StrutsListener</listener-class> + </listener> - <context-param> + <context-param> <param-name>contextClass</param-name> <param-value> org.codehaus.plexus.spring.PlexusWebApplicationContext Added: archiva/branches/archiva-1.3.x/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/archiva-applet.jar URL: http://svn.apache.org/viewvc/archiva/branches/archiva-1.3.x/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/archiva-applet.jar?rev=1561667&view=auto ============================================================================== Files archiva/branches/archiva-1.3.x/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/archiva-applet.jar (added) and archiva/branches/archiva-1.3.x/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/archiva-applet.jar Mon Jan 27 13:24:23 2014 differ Modified: archiva/branches/archiva-1.3.x/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/admin/appearance/EditOrganizationInfoActionTest.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/appearance/EditOrganizationInfoActionTest.java?rev=1561667&r1=1561666&r2=1561667&view=diff ============================================================================== --- archiva/branches/archiva-1.3.x/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/admin/appearance/EditOrganizationInfoActionTest.java (original) +++ archiva/branches/archiva-1.3.x/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/admin/appearance/EditOrganizationInfoActionTest.java Mon Jan 27 13:24:23 2014 @@ -20,47 +20,12 @@ package org.apache.maven.archiva.web.act */ import com.opensymphony.xwork2.Action; -import com.opensymphony.xwork2.ObjectFactory; -import com.opensymphony.xwork2.validator.ActionValidatorManager; -import com.opensymphony.xwork2.validator.ActionValidatorManagerFactory; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; import org.apache.maven.archiva.configuration.OrganisationInformation; -import org.apache.maven.archiva.web.validator.utils.ValidatorUtil; /** */ public class EditOrganizationInfoActionTest extends AbstractOrganizationInfoActionTest { - private static final String EMPTY_STRING = ""; - - // valid inputs - private static final String ORGANISATION_NAME_VALID_INPUT = "abcXYZ0129. _/\\~ :?!&=-"; - - private static final String ORGANISATION_URL_VALID_INPUT = "file://home/user/abcXYZ0129._/\\~:?!&=-<> ~+[ ]'\""; - - private static final String ORGANISATION_LOGO_VALID_INPUT = "file://home/user/abcXYZ0129._/\\~:?!&=-<> ~+[ ]'\""; - - // invalid inputs - private static final String ORGANISATION_NAME_INVALID_INPUT = "<>~+[ ]'\""; - - private static final String ORGANISATION_URL_INVALID_INPUT = "/home/user/abcXYZ0129._/\\~:?!&=-<> ~+[ ]'\""; - - private static final String ORGANISATION_LOGO_INVALID_INPUT = "/home/user/abcXYZ0129._/\\~:?!&=-<> ~+[ ]'\""; - - // testing requisite - private ActionValidatorManager actionValidatorManager; - - @Override - public void setUp() throws Exception - { - super.setUp(); - ObjectFactory.setObjectFactory(new ObjectFactory()); - actionValidatorManager = ActionValidatorManagerFactory.getInstance(); - } - public void testOrganisationInfoSaves() throws Exception { @@ -91,109 +56,6 @@ public class EditOrganizationInfoActionT assertEquals("URL1", orginfo.getUrl()); } - public void testStruts2ValidationFrameworkWithNullInputs() throws Exception - { - // prep - action = getAction(); - populateOrganisationValues(action, null, null, null); - - // test - actionValidatorManager.validate(action, EMPTY_STRING); - - // verify - assertTrue(action.hasFieldErrors()); - - Map<String, List<String>> fieldErrors = action.getFieldErrors(); - - // make an expected field error object - Map<String, List<String>> expectedFieldErrors = new HashMap<String, List<String>>(); - - // populate - List<String> expectedErrorMessages = new ArrayList<String>(); - expectedErrorMessages.add("You must enter a name"); - expectedFieldErrors.put("organisationName", expectedErrorMessages); - - ValidatorUtil.assertFieldErrors(expectedFieldErrors, fieldErrors); - } - - public void testStruts2ValidationFrameworkWithBlankInputs() throws Exception - { - // prep - action = getAction(); - populateOrganisationValues(action, EMPTY_STRING, EMPTY_STRING, EMPTY_STRING); - - // test - actionValidatorManager.validate(action, EMPTY_STRING); - - // verify - assertTrue(action.hasFieldErrors()); - - Map<String, List<String>> fieldErrors = action.getFieldErrors(); - - // make an expected field error object - Map<String, List<String>> expectedFieldErrors = new HashMap<String, List<String>>(); - - // populate - List<String> expectedErrorMessages = new ArrayList<String>(); - expectedErrorMessages.add("You must enter a name"); - expectedFieldErrors.put("organisationName", expectedErrorMessages); - - ValidatorUtil.assertFieldErrors(expectedFieldErrors, fieldErrors); - } - - public void testStruts2ValidationFrameworkWithInvalidInputs() throws Exception - { - // prep - action = getAction(); - populateOrganisationValues(action, ORGANISATION_NAME_INVALID_INPUT, ORGANISATION_URL_INVALID_INPUT, ORGANISATION_LOGO_INVALID_INPUT); - - // test - actionValidatorManager.validate(action, EMPTY_STRING); - - // verify - assertTrue(action.hasFieldErrors()); - - Map<String, List<String>> fieldErrors = action.getFieldErrors(); - - // make an expected field error object - Map<String, List<String>> expectedFieldErrors = new HashMap<String, List<String>>(); - - // populate - List<String> expectedErrorMessages = new ArrayList<String>(); - expectedErrorMessages.add("Organisation name must only contain alphanumeric characters, white-spaces(' '), equals(=), question-marks(?), exclamation-points(!), ampersands(&), forward-slashes(/), back-slashes(\\), underscores(_), dots(.), colons(:), tildes(~), and dashes(-)."); - expectedFieldErrors.put("organisationName", expectedErrorMessages); - - expectedErrorMessages = new ArrayList<String>(); - expectedErrorMessages.add("You must enter a URL"); - expectedFieldErrors.put("organisationUrl", expectedErrorMessages); - - expectedErrorMessages = new ArrayList<String>(); - expectedErrorMessages.add("You must enter a URL"); - expectedFieldErrors.put("organisationLogo", expectedErrorMessages); - - ValidatorUtil.assertFieldErrors(expectedFieldErrors, fieldErrors); - } - - public void testStruts2ValidationFrameworkWithValidInputs() throws Exception - { - // prep - action = getAction(); - populateOrganisationValues(action, ORGANISATION_NAME_VALID_INPUT, ORGANISATION_URL_VALID_INPUT, ORGANISATION_LOGO_VALID_INPUT); - - // test - actionValidatorManager.validate(action, EMPTY_STRING); - - // verify - assertFalse(action.hasFieldErrors()); - } - - private void populateOrganisationValues(AbstractAppearanceAction abstractAppearanceAction , String name, String url, String logo) - { - abstractAppearanceAction.setOrganisationName(name); - abstractAppearanceAction.setOrganisationUrl(url); - abstractAppearanceAction.setOrganisationLogo(logo); - } - @Override protected AbstractAppearanceAction getAction() { Modified: archiva/branches/archiva-1.3.x/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/admin/database/DatabaseActionTest.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/database/DatabaseActionTest.java?rev=1561667&r1=1561666&r2=1561667&view=diff ============================================================================== --- archiva/branches/archiva-1.3.x/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/admin/database/DatabaseActionTest.java (original) +++ archiva/branches/archiva-1.3.x/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/admin/database/DatabaseActionTest.java Mon Jan 27 13:24:23 2014 @@ -20,19 +20,21 @@ package org.apache.maven.archiva.web.act */ import java.util.ArrayList; +import java.util.HashMap; import java.util.List; +import com.opensymphony.xwork2.ActionContext; +import junit.framework.TestCase; import org.apache.maven.archiva.configuration.ArchivaConfiguration; import org.apache.maven.archiva.configuration.Configuration; import org.apache.maven.archiva.configuration.DatabaseScanningConfiguration; -import org.codehaus.plexus.spring.PlexusInSpringTestCase; import org.easymock.MockControl; /** * DatabaseActionTest */ public class DatabaseActionTest - extends PlexusInSpringTestCase + extends TestCase { private DatabaseAction action; @@ -45,7 +47,7 @@ public class DatabaseActionTest protected void setUp() throws Exception { - super.setUp(); + ActionContext.setContext( new ActionContext( new HashMap<String, Object>() ) ); archivaConfigControl = MockControl.createControl( ArchivaConfiguration.class ); archivaConfig = (ArchivaConfiguration) archivaConfigControl.getMock(); @@ -77,12 +79,6 @@ public class DatabaseActionTest action.setArchivaConfiguration( archivaConfig ); } - protected void tearDown() - throws Exception - { - super.tearDown(); - } - public void testUpdateUnprocessedConsumers() throws Exception { Modified: archiva/branches/archiva-1.3.x/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/admin/repositories/AbstractManagedRepositoryActionTest.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/AbstractManagedRepositoryActionTest.java?rev=1561667&r1=1561666&r2=1561667&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/AbstractManagedRepositoryActionTest.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/AbstractManagedRepositoryActionTest.java Mon Jan 27 13:24:23 2014 @@ -19,59 +19,17 @@ package org.apache.maven.archiva.web.act * under the License. */ -import com.opensymphony.xwork2.ObjectFactory; -import com.opensymphony.xwork2.validator.ActionValidatorManager; -import com.opensymphony.xwork2.validator.ActionValidatorManagerFactory; import java.io.File; + import org.apache.maven.archiva.configuration.ManagedRepositoryConfiguration; import org.codehaus.plexus.spring.PlexusInSpringTestCase; public abstract class AbstractManagedRepositoryActionTest extends PlexusInSpringTestCase { - protected static final String EMPTY_STRING = ""; - - // valid inputs; validation testing - protected static final String REPOSITORY_ID_VALID_INPUT = "abcXYZ0129._-"; - - protected static final String REPOSITORY_LOCATION_VALID_INPUT = "abcXYZ0129._/\\~:?!&=-"; - - protected static final String REPOSITORY_INDEX_DIR_VALID_INPUT = "abcXYZ0129._/\\~:?!&=-"; - - protected static final String REPOSITORY_NAME_VALID_INPUT = "abcXYZ 0129.)/ _(-"; - - protected static final int REPOSITORY_RETENTION_COUNT_VALID_INPUT = 1; - - protected static final int REPOSITORY_DAYS_OLDER_VALID_INPUT = 1; - - // invalid inputs; validation testing - protected static final String REPOSITORY_ID_INVALID_INPUT = "<> \\/~+[ ]'\""; - - protected static final String REPOSITORY_LOCATION_INVALID_INPUT = "<> ~+[ ]'\""; - - protected static final String REPOSITORY_INDEX_DIR_INVALID_INPUT = "<> ~+[ ]'\""; - - protected static final String REPOSITORY_NAME_INVALID_INPUT = "<>\\~+[]'\""; - - protected static final int REPOSITORY_RETENTION_COUNT_INVALID_INPUT = 101; - - protected static final int REPOSITORY_DAYS_OLDER_INVALID_INPUT = -1; - - // testing requisite; validation testing - protected ActionValidatorManager actionValidatorManager; - protected static final String REPO_ID = "repo-ident"; protected File location; - @Override - protected void setUp() throws Exception - { - super.setUp(); - - ObjectFactory.setObjectFactory(new ObjectFactory()); - actionValidatorManager = ActionValidatorManagerFactory.getInstance(); - } - protected void populateRepository( ManagedRepositoryConfiguration repository ) { repository.setId( REPO_ID ); @@ -86,32 +44,4 @@ public abstract class AbstractManagedRep repository.setScanned( false ); repository.setDeleteReleasedSnapshots( true ); } - - protected ManagedRepositoryConfiguration createManagedRepositoryConfiguration(String id, String name, String location, String indexDir, int daysOlder, int retentionCount) - { - ManagedRepositoryConfiguration managedRepositoryConfiguration = new ManagedRepositoryConfiguration(); - - managedRepositoryConfiguration.setId(id); - managedRepositoryConfiguration.setName(name); - managedRepositoryConfiguration.setLocation(location); - managedRepositoryConfiguration.setIndexDir(indexDir); - managedRepositoryConfiguration.setDaysOlder(daysOlder); - managedRepositoryConfiguration.setRetentionCount(retentionCount); - - return managedRepositoryConfiguration; - } - - // over-loaded - // for simulating empty/null form purposes; excluding primitive data-typed values - protected ManagedRepositoryConfiguration createManagedRepositoryConfiguration(String id, String name, String location, String indexDir) - { - ManagedRepositoryConfiguration managedRepositoryConfiguration = new ManagedRepositoryConfiguration(); - - managedRepositoryConfiguration.setId(id); - managedRepositoryConfiguration.setName(name); - managedRepositoryConfiguration.setLocation(location); - managedRepositoryConfiguration.setIndexDir(indexDir); - - return managedRepositoryConfiguration; - } } Modified: archiva/branches/archiva-1.3.x/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/archiva-1.3.x/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/admin/repositories/AddManagedRepositoryActionTest.java?rev=1561667&r1=1561666&r2=1561667&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/AddManagedRepositoryActionTest.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/AddManagedRepositoryActionTest.java Mon Jan 27 13:24:23 2014 @@ -32,12 +32,7 @@ import org.codehaus.redback.integration. import org.codehaus.redback.integration.interceptor.SecureActionException; import org.easymock.MockControl; -import java.util.ArrayList; import java.util.Collections; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import org.apache.maven.archiva.web.validator.utils.ValidatorUtil; /** * AddManagedRepositoryActionTest @@ -190,131 +185,5 @@ public class AddManagedRepositoryActionT assertEquals( AddManagedRepositoryAction.CONFIRM, status ); } - public void testStruts2ValidationFrameworkWithNullInputs() throws Exception - { - // prep - // 0 is the default value for primitive int; null for objects - ManagedRepositoryConfiguration managedRepositoryConfiguration = createManagedRepositoryConfiguration(null, null, null, null); - action.setRepository(managedRepositoryConfiguration); - - // test - actionValidatorManager.validate(action, EMPTY_STRING); - - // verify - assertTrue(action.hasFieldErrors()); - - Map<String, List<String>> fieldErrors = action.getFieldErrors(); - - // make an expected field error object - Map<String, List<String>> expectedFieldErrors = new HashMap<String, List<String>>(); - - // populate - List<String> expectedErrorMessages = new ArrayList<String>(); - expectedErrorMessages.add("You must enter a repository identifier."); - expectedFieldErrors.put("repository.id", expectedErrorMessages); - - expectedErrorMessages = new ArrayList<String>(); - expectedErrorMessages.add("You must enter a directory."); - expectedFieldErrors.put("repository.location", expectedErrorMessages); - - expectedErrorMessages = new ArrayList<String>(); - expectedErrorMessages.add("You must enter a repository name."); - expectedFieldErrors.put("repository.name", expectedErrorMessages); - - ValidatorUtil.assertFieldErrors(expectedFieldErrors, fieldErrors); - } - - public void testStruts2ValidationFrameworkWithBlankInputs() throws Exception - { - // prep - // 0 is the default value for primitive int - ManagedRepositoryConfiguration managedRepositoryConfiguration = createManagedRepositoryConfiguration(EMPTY_STRING, EMPTY_STRING, EMPTY_STRING, EMPTY_STRING); - action.setRepository(managedRepositoryConfiguration); - - // test - actionValidatorManager.validate(action, EMPTY_STRING); - - // verify - assertTrue(action.hasFieldErrors()); - - Map<String, List<String>> fieldErrors = action.getFieldErrors(); - - // make an expected field error object - Map<String, List<String>> expectedFieldErrors = new HashMap<String, List<String>>(); - - // populate - List<String> expectedErrorMessages = new ArrayList<String>(); - expectedErrorMessages.add("You must enter a repository identifier."); - expectedFieldErrors.put("repository.id", expectedErrorMessages); - - expectedErrorMessages = new ArrayList<String>(); - expectedErrorMessages.add("You must enter a directory."); - expectedFieldErrors.put("repository.location", expectedErrorMessages); - - expectedErrorMessages = new ArrayList<String>(); - expectedErrorMessages.add("You must enter a repository name."); - expectedFieldErrors.put("repository.name", expectedErrorMessages); - - ValidatorUtil.assertFieldErrors(expectedFieldErrors, fieldErrors); - } - - public void testStruts2ValidationFrameworkWithInvalidInputs() throws Exception - { - // prep - ManagedRepositoryConfiguration managedRepositoryConfiguration = createManagedRepositoryConfiguration(REPOSITORY_ID_INVALID_INPUT, REPOSITORY_NAME_INVALID_INPUT, REPOSITORY_LOCATION_INVALID_INPUT, REPOSITORY_INDEX_DIR_INVALID_INPUT, REPOSITORY_DAYS_OLDER_INVALID_INPUT, REPOSITORY_RETENTION_COUNT_INVALID_INPUT); - action.setRepository(managedRepositoryConfiguration); - - // test - actionValidatorManager.validate(action, EMPTY_STRING); - - // verify - assertTrue(action.hasFieldErrors()); - - Map<String, List<String>> fieldErrors = action.getFieldErrors(); - - // make an expected field error object - Map<String, List<String>> expectedFieldErrors = new HashMap<String, List<String>>(); - - // populate - List<String> expectedErrorMessages = new ArrayList<String>(); - expectedErrorMessages.add("Identifier must only contain alphanumeric characters, underscores(_), dots(.), and dashes(-)."); - expectedFieldErrors.put("repository.id", expectedErrorMessages); - - expectedErrorMessages = new ArrayList<String>(); - expectedErrorMessages.add("Directory must only contain alphanumeric characters, equals(=), question-marks(?), exclamation-points(!), ampersands(&), forward-slashes(/), back-slashes(\\), underscores(_), dots(.), colons(:), tildes(~), and dashes(-)."); - expectedFieldErrors.put("repository.location", expectedErrorMessages); - - expectedErrorMessages = new ArrayList<String>(); - expectedErrorMessages.add("Repository Name must only contain alphanumeric characters, white-spaces(' '), forward-slashes(/), open-parenthesis('('), close-parenthesis(')'), underscores(_), dots(.), and dashes(-)."); - expectedFieldErrors.put("repository.name", expectedErrorMessages); - - expectedErrorMessages = new ArrayList<String>(); - expectedErrorMessages.add("Index directory must only contain alphanumeric characters, equals(=), question-marks(?), exclamation-points(!), ampersands(&), forward-slashes(/), back-slashes(\\), underscores(_), dots(.), colons(:), tildes(~), and dashes(-)."); - expectedFieldErrors.put("repository.indexDir", expectedErrorMessages); - - expectedErrorMessages = new ArrayList<String>(); - expectedErrorMessages.add("Repository Purge By Retention Count needs to be between 1 and 100."); - expectedFieldErrors.put("repository.retentionCount", expectedErrorMessages); - - expectedErrorMessages = new ArrayList<String>(); - expectedErrorMessages.add("Repository Purge By Days Older Than needs to be larger than 0."); - expectedFieldErrors.put("repository.daysOlder", expectedErrorMessages); - - ValidatorUtil.assertFieldErrors(expectedFieldErrors, fieldErrors); - } - - public void testStruts2ValidationFrameworkWithValidInputs() throws Exception - { - // prep - ManagedRepositoryConfiguration managedRepositoryConfiguration = createManagedRepositoryConfiguration(REPOSITORY_ID_VALID_INPUT, REPOSITORY_NAME_VALID_INPUT, REPOSITORY_LOCATION_VALID_INPUT, REPOSITORY_INDEX_DIR_VALID_INPUT, REPOSITORY_DAYS_OLDER_VALID_INPUT, REPOSITORY_RETENTION_COUNT_VALID_INPUT); - action.setRepository(managedRepositoryConfiguration); - - // test - actionValidatorManager.validate(action, EMPTY_STRING); - - // verify - assertFalse(action.hasFieldErrors()); - } - // TODO: test errors during add, other actions } Modified: archiva/branches/archiva-1.3.x/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/archiva-1.3.x/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/admin/repositories/EditManagedRepositoryActionTest.java?rev=1561667&r1=1561666&r2=1561667&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/EditManagedRepositoryActionTest.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/EditManagedRepositoryActionTest.java Mon Jan 27 13:24:23 2014 @@ -20,9 +20,6 @@ package org.apache.maven.archiva.web.act */ import com.opensymphony.xwork2.Action; -import com.opensymphony.xwork2.ObjectFactory; -import com.opensymphony.xwork2.validator.ActionValidatorManager; -import com.opensymphony.xwork2.validator.ActionValidatorManagerFactory; import org.apache.maven.archiva.configuration.ArchivaConfiguration; import org.apache.maven.archiva.configuration.Configuration; import org.apache.maven.archiva.configuration.ManagedRepositoryConfiguration; @@ -36,7 +33,6 @@ import org.apache.maven.archiva.security import org.codehaus.plexus.redback.role.RoleManager; import org.codehaus.redback.integration.interceptor.SecureActionBundle; import org.codehaus.redback.integration.interceptor.SecureActionException; -import org.codehaus.plexus.spring.PlexusInSpringTestCase; import org.easymock.MockControl; import java.io.File; @@ -44,11 +40,7 @@ import java.io.IOException; import java.util.ArrayList; import java.util.Collections; import java.util.Date; -import java.util.HashMap; import java.util.List; -import java.util.Map; - -import org.apache.maven.archiva.web.validator.utils.ValidatorUtil; /** * EditManagedRepositoryActionTest @@ -263,150 +255,6 @@ public class EditManagedRepositoryAction auditLogsDaoControl.verify(); } - public void testStruts2ValidationFrameworkWithNullInputs() - throws Exception - { - // prep - // 0 is the default value for primitive int; null for objects - ManagedRepositoryConfiguration managedRepositoryConfiguration = - createManagedRepositoryConfiguration( null, null, null, null ); - action.setRepository( managedRepositoryConfiguration ); - - // test - actionValidatorManager.validate( action, EMPTY_STRING ); - - // verify - assertTrue( action.hasFieldErrors() ); - - Map<String, List<String>> fieldErrors = action.getFieldErrors(); - - // make an expected field error object - Map<String, List<String>> expectedFieldErrors = new HashMap<String, List<String>>(); - - // populate - List<String> expectedErrorMessages = new ArrayList<String>(); - expectedErrorMessages.add( "You must enter a repository identifier." ); - expectedFieldErrors.put( "repository.id", expectedErrorMessages ); - - expectedErrorMessages = new ArrayList<String>(); - expectedErrorMessages.add( "You must enter a directory." ); - expectedFieldErrors.put( "repository.location", expectedErrorMessages ); - - expectedErrorMessages = new ArrayList<String>(); - expectedErrorMessages.add( "You must enter a repository name." ); - expectedFieldErrors.put( "repository.name", expectedErrorMessages ); - - ValidatorUtil.assertFieldErrors( expectedFieldErrors, fieldErrors ); - } - - public void testStruts2ValidationFrameworkWithBlankInputs() - throws Exception - { - // prep - // 0 is the default value for primitive int - ManagedRepositoryConfiguration managedRepositoryConfiguration = - createManagedRepositoryConfiguration( EMPTY_STRING, EMPTY_STRING, EMPTY_STRING, EMPTY_STRING ); - action.setRepository( managedRepositoryConfiguration ); - - // test - actionValidatorManager.validate( action, EMPTY_STRING ); - - // verify - assertTrue( action.hasFieldErrors() ); - - Map<String, List<String>> fieldErrors = action.getFieldErrors(); - - // make an expected field error object - Map<String, List<String>> expectedFieldErrors = new HashMap<String, List<String>>(); - - // populate - List<String> expectedErrorMessages = new ArrayList<String>(); - expectedErrorMessages.add( "You must enter a repository identifier." ); - expectedFieldErrors.put( "repository.id", expectedErrorMessages ); - - expectedErrorMessages = new ArrayList<String>(); - expectedErrorMessages.add( "You must enter a directory." ); - expectedFieldErrors.put( "repository.location", expectedErrorMessages ); - - expectedErrorMessages = new ArrayList<String>(); - expectedErrorMessages.add( "You must enter a repository name." ); - expectedFieldErrors.put( "repository.name", expectedErrorMessages ); - - ValidatorUtil.assertFieldErrors( expectedFieldErrors, fieldErrors ); - } - - public void testStruts2ValidationFrameworkWithInvalidInputs() - throws Exception - { - // prep - ManagedRepositoryConfiguration managedRepositoryConfiguration = - createManagedRepositoryConfiguration( REPOSITORY_ID_INVALID_INPUT, REPOSITORY_NAME_INVALID_INPUT, - REPOSITORY_LOCATION_INVALID_INPUT, REPOSITORY_INDEX_DIR_INVALID_INPUT, - REPOSITORY_DAYS_OLDER_INVALID_INPUT, - REPOSITORY_RETENTION_COUNT_INVALID_INPUT ); - action.setRepository( managedRepositoryConfiguration ); - - // test - actionValidatorManager.validate( action, EMPTY_STRING ); - - // verify - assertTrue( action.hasFieldErrors() ); - - Map<String, List<String>> fieldErrors = action.getFieldErrors(); - - // make an expected field error object - Map<String, List<String>> expectedFieldErrors = new HashMap<String, List<String>>(); - - // populate - List<String> expectedErrorMessages = new ArrayList<String>(); - expectedErrorMessages.add( - "Identifier must only contain alphanumeric characters, underscores(_), dots(.), and dashes(-)." ); - expectedFieldErrors.put( "repository.id", expectedErrorMessages ); - - expectedErrorMessages = new ArrayList<String>(); - expectedErrorMessages.add( - "Directory must only contain alphanumeric characters, equals(=), question-marks(?), exclamation-points(!), ampersands(&), forward-slashes(/), back-slashes(\\), underscores(_), dots(.), colons(:), tildes(~), and dashes(-)." ); - expectedFieldErrors.put( "repository.location", expectedErrorMessages ); - - expectedErrorMessages = new ArrayList<String>(); - expectedErrorMessages.add( - "Repository Name must only contain alphanumeric characters, white-spaces(' '), forward-slashes(/), open-parenthesis('('), close-parenthesis(')'), underscores(_), dots(.), and dashes(-)." ); - expectedFieldErrors.put( "repository.name", expectedErrorMessages ); - - expectedErrorMessages = new ArrayList<String>(); - expectedErrorMessages.add( - "Index directory must only contain alphanumeric characters, equals(=), question-marks(?), exclamation-points(!), ampersands(&), forward-slashes(/), back-slashes(\\), underscores(_), dots(.), colons(:), tildes(~), and dashes(-)." ); - expectedFieldErrors.put( "repository.indexDir", expectedErrorMessages ); - - expectedErrorMessages = new ArrayList<String>(); - expectedErrorMessages.add( "Repository Purge By Retention Count needs to be between 1 and 100." ); - expectedFieldErrors.put( "repository.retentionCount", expectedErrorMessages ); - - expectedErrorMessages = new ArrayList<String>(); - expectedErrorMessages.add( "Repository Purge By Days Older Than needs to be larger than 0." ); - expectedFieldErrors.put( "repository.daysOlder", expectedErrorMessages ); - - ValidatorUtil.assertFieldErrors( expectedFieldErrors, fieldErrors ); - } - - public void testStruts2ValidationFrameworkWithValidInputs() - throws Exception - { - // prep - ManagedRepositoryConfiguration managedRepositoryConfiguration = - createManagedRepositoryConfiguration( REPOSITORY_ID_VALID_INPUT, REPOSITORY_NAME_VALID_INPUT, - REPOSITORY_LOCATION_VALID_INPUT, REPOSITORY_INDEX_DIR_VALID_INPUT, - REPOSITORY_DAYS_OLDER_VALID_INPUT, - REPOSITORY_RETENTION_COUNT_VALID_INPUT ); - action.setRepository( managedRepositoryConfiguration ); - - // test - actionValidatorManager.validate( action, EMPTY_STRING ); - - // verify - assertFalse( action.hasFieldErrors() ); - } - private void assertRepositoryEquals( ManagedRepositoryConfiguration expectedRepository, ManagedRepositoryConfiguration actualRepository ) throws IOException Modified: archiva/branches/archiva-1.3.x/archiva-modules/archiva-web/archiva-webdav/pom.xml URL: http://svn.apache.org/viewvc/archiva/branches/archiva-1.3.x/archiva-modules/archiva-web/archiva-webdav/pom.xml?rev=1561667&r1=1561666&r2=1561667&view=diff ============================================================================== --- archiva/branches/archiva-1.3.x/archiva-modules/archiva-web/archiva-webdav/pom.xml (original) +++ archiva/branches/archiva-1.3.x/archiva-modules/archiva-web/archiva-webdav/pom.xml Mon Jan 27 13:24:23 2014 @@ -76,10 +76,6 @@ <scope>provided</scope> </dependency> <dependency> - <groupId>org.codehaus.plexus</groupId> - <artifactId>plexus-spring</artifactId> - </dependency> - <dependency> <groupId>org.apache.maven</groupId> <artifactId>maven-model</artifactId> </dependency> Modified: archiva/branches/archiva-1.3.x/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-security/pom.xml URL: http://svn.apache.org/viewvc/archiva/branches/archiva-1.3.x/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-security/pom.xml?rev=1561667&r1=1561666&r2=1561667&view=diff ============================================================================== --- archiva/branches/archiva-1.3.x/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-security/pom.xml (original) +++ archiva/branches/archiva-1.3.x/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-security/pom.xml Mon Jan 27 13:24:23 2014 @@ -51,18 +51,6 @@ <artifactId>spring-context</artifactId> </dependency> <dependency> - <groupId>org.codehaus.plexus</groupId> - <artifactId>plexus-spring</artifactId> - <scope>test</scope> - </dependency> - <!-- use spring for the unit tests? - <dependency> - <groupId>org.springframework</groupId> - <artifactId>spring-test</artifactId> - <scope>test</scope> - </dependency> - --> - <dependency> <groupId>org.codehaus.redback</groupId> <artifactId>redback-authorization-rbac</artifactId> <scope>test</scope> Modified: archiva/branches/archiva-1.3.x/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-services/pom.xml URL: http://svn.apache.org/viewvc/archiva/branches/archiva-1.3.x/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-services/pom.xml?rev=1561667&r1=1561666&r2=1561667&view=diff ============================================================================== --- archiva/branches/archiva-1.3.x/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-services/pom.xml (original) +++ archiva/branches/archiva-1.3.x/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-services/pom.xml Mon Jan 27 13:24:23 2014 @@ -59,11 +59,6 @@ <artifactId>archiva-security</artifactId> </dependency> <dependency> - <groupId>org.codehaus.plexus</groupId> - <artifactId>plexus-spring</artifactId> - <scope>test</scope> - </dependency> - <dependency> <groupId>org.slf4j</groupId> <artifactId>slf4j-simple</artifactId> <scope>test</scope> Modified: archiva/branches/archiva-1.3.x/pom.xml URL: http://svn.apache.org/viewvc/archiva/branches/archiva-1.3.x/pom.xml?rev=1561667&r1=1561666&r2=1561667&view=diff ============================================================================== --- archiva/branches/archiva-1.3.x/pom.xml (original) +++ archiva/branches/archiva-1.3.x/pom.xml Mon Jan 27 13:24:23 2014 @@ -86,6 +86,7 @@ <exclude>xom:xom</exclude> <exclude>org.codehaus.plexus:plexus-xwork-integration</exclude> <exclude>plexus:plexus-utils</exclude> + <exclude>org.codehaus.plexus:plexus-spring</exclude> </excludes> </bannedDependencies> </rules> @@ -449,15 +450,9 @@ <version>1.3.7-SNAPSHOT</version> </dependency> <dependency> - <groupId>org.codehaus.plexus</groupId> + <groupId>org.codehaus.redback</groupId> <artifactId>plexus-spring</artifactId> - <version>1.2</version> - <exclusions> - <exclusion> - <groupId>org.codehaus.plexus</groupId> - <artifactId>plexus-container-default</artifactId> - </exclusion> - </exclusions> + <version>${redback.version}</version> </dependency> <dependency> <groupId>stax</groupId> @@ -882,7 +877,7 @@ <dependency> <groupId>opensymphony</groupId> <artifactId>sitemesh</artifactId> - <version>2.2.1</version> + <version>2.4.2</version> </dependency> <dependency> <groupId>org.slf4j</groupId> @@ -942,7 +937,7 @@ <dependency> <groupId>org.apache.struts</groupId> <artifactId>struts2-core</artifactId> - <version>2.0.14</version> + <version>${struts.version}</version> <exclusions> <exclusion> <groupId>commons-logging</groupId> @@ -953,7 +948,7 @@ <dependency> <groupId>org.apache.struts</groupId> <artifactId>struts2-spring-plugin</artifactId> - <version>2.0.14</version> + <version>${struts.version}</version> <exclusions> <exclusion> <groupId>commons-logging</groupId> @@ -962,6 +957,11 @@ </exclusions> </dependency> <dependency> + <groupId>org.apache.struts</groupId> + <artifactId>struts2-sitemesh-plugin</artifactId> + <version>${struts.version}</version> + </dependency> + <dependency> <groupId>xmlunit</groupId> <artifactId>xmlunit</artifactId> <version>1.0</version> @@ -1020,7 +1020,7 @@ </dependency> <dependency> <groupId>org.springframework</groupId> - <artifactId>spring-web</artifactId> + <artifactId>spring-core</artifactId> <version>${spring.version}</version> <exclusions> <exclusion> @@ -1031,7 +1031,7 @@ </dependency> <dependency> <groupId>org.springframework</groupId> - <artifactId>spring-beans</artifactId> + <artifactId>spring-web</artifactId> <version>${spring.version}</version> <exclusions> <exclusion> @@ -1040,11 +1040,10 @@ </exclusion> </exclusions> </dependency> - <!-- use spring test in xmlrpc? <dependency> <groupId>org.springframework</groupId> - <artifactId>spring-test</artifactId> - <version>2.5.1</version> + <artifactId>spring-beans</artifactId> + <version>${spring.version}</version> <exclusions> <exclusion> <groupId>commons-logging</groupId> @@ -1052,7 +1051,6 @@ </exclusion> </exclusions> </dependency> - --> <dependency> <groupId>org.apache.maven</groupId> <artifactId>maven-artifact</artifactId> @@ -1101,7 +1099,8 @@ <properties> <maven.version>2.0.8</maven.version> <wagon.version>1.0-beta-5</wagon.version> - <redback.version>1.2.9</redback.version> + <redback.version>1.3-M3</redback.version> + <struts.version>2.3.16</struts.version> <jetty.version>6.1.19</jetty.version> <slf4j.version>1.5.8</slf4j.version> <binder.version>0.9</binder.version>
