You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@archiva.apache.org by jd...@apache.org on 2008/05/20 14:33:13 UTC
svn commit: r658219 - in
/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src:
main/java/org/apache/maven/archiva/web/action/admin/repositories/
test/java/org/apache/maven/archiva/web/action/admin/repositories/
Author: jdumay
Date: Tue May 20 05:33:13 2008
New Revision: 658219
URL: http://svn.apache.org/viewvc?rev=658219&view=rev
Log:
MRM-752 - Trim URL in Remote Repositories
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/repositories/AddRemoteRepositoryAction.java
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/admin/repositories/AddRemoteRepositoryActionTest.java
Modified: archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/repositories/AddRemoteRepositoryAction.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/repositories/AddRemoteRepositoryAction.java?rev=658219&r1=658218&r2=658219&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/repositories/AddRemoteRepositoryAction.java (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/repositories/AddRemoteRepositoryAction.java Tue May 20 05:33:13 2008
@@ -59,6 +59,9 @@
{
Configuration configuration = archivaConfiguration.getConfiguration();
+ //MRM-752 - url needs trimming
+ repository.setUrl(repository.getUrl().trim());
+
// Save the repository configuration.
String result;
try
Modified: archiva/trunk/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/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/admin/repositories/AddRemoteRepositoryActionTest.java?rev=658219&r1=658218&r2=658219&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/admin/repositories/AddRemoteRepositoryActionTest.java (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/admin/repositories/AddRemoteRepositoryActionTest.java Tue May 20 05:33:13 2008
@@ -102,11 +102,15 @@
action.prepare();
RemoteRepositoryConfiguration repository = action.getRepository();
populateRepository( repository );
+
+ assertEquals("url ", repository.getUrl());
String status = action.commit();
assertEquals( Action.SUCCESS, status );
assertEquals( Collections.singletonList( repository ), configuration.getRemoteRepositories() );
+
+ assertEquals("url", repository.getUrl());
archivaConfigurationControl.verify();
}
@@ -115,7 +119,7 @@
{
repository.setId( REPO_ID );
repository.setName( "repo name" );
- repository.setUrl( "url" );
+ repository.setUrl( "url " );
repository.setLayout( "default" );
}