Author: brett Date: Tue Sep 11 18:29:08 2007 New Revision: 574751 URL: http://svn.apache.org/viewvc?rev=574751&view=rev Log: [MRM-462] re-instate directory construction
Modified: maven/archiva/branches/MRM-462/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/repositories/ConfigureRepositoryAction.java maven/archiva/branches/MRM-462/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/admin/repositories/ConfigureRepositoryActionTest.java Modified: maven/archiva/branches/MRM-462/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/repositories/ConfigureRepositoryAction.java URL: http://svn.apache.org/viewvc/maven/archiva/branches/MRM-462/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/repositories/ConfigureRepositoryAction.java?rev=574751&r1=574750&r2=574751&view=diff ============================================================================== --- maven/archiva/branches/MRM-462/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/repositories/ConfigureRepositoryAction.java (original) +++ maven/archiva/branches/MRM-462/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/repositories/ConfigureRepositoryAction.java Tue Sep 11 18:29:08 2007 @@ -300,26 +300,14 @@ private void addRepository( AdminRepositoryConfiguration repository, Configuration configuration ) throws IOException, RoleManagerException { - // Fix the URL entry (could possibly be a filesystem path) -/* TODO! reinstate - String rawUrlEntry = repository.getUrl(); - if ( !rawUrlEntry.startsWith( "http://" ) ) + // Normalize the path + File file = new File( repository.getLocation() ); + repository.setLocation( file.getCanonicalPath() ); + if ( !file.exists() ) { - repository.setUrl( PathUtil.toUrl( rawUrlEntry ) ); + file.mkdirs(); + // TODO: error handling when this fails, or is not a directory! } - - if ( repository.isManaged() ) - { - // Normalize the path - File file = new File( repository.getDirectory() ); - repository.setDirectory( file.getCanonicalPath() ); - if ( !file.exists() ) - { - file.mkdirs(); - // TODO: error handling when this fails, or is not a directory! - } - } -*/ // TODO! others configuration.addManagedRepository( repository ); Modified: maven/archiva/branches/MRM-462/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/admin/repositories/ConfigureRepositoryActionTest.java URL: http://svn.apache.org/viewvc/maven/archiva/branches/MRM-462/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/admin/repositories/ConfigureRepositoryActionTest.java?rev=574751&r1=574750&r2=574751&view=diff ============================================================================== --- maven/archiva/branches/MRM-462/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/admin/repositories/ConfigureRepositoryActionTest.java (original) +++ maven/archiva/branches/MRM-462/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/admin/repositories/ConfigureRepositoryActionTest.java Tue Sep 11 18:29:08 2007 @@ -228,7 +228,7 @@ { repository.setId( REPO_ID ); repository.setName( "repo name" ); - repository.setLocation( "location" ); + repository.setLocation( getTestFile( "location" ).getAbsolutePath() ); repository.setLayout( "default" ); repository.setRefreshCronExpression( "* 0/5 * * * ?" ); repository.setDaysOlder( 31 );