Apache
/
archiva
mirror of https://github.com/apache/archiva.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

use location rather than url : better naming 

git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1162819 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Olivier Lamy 2011-08-29 14:02:39 +00:00
parent 6f4e720378
commit f2dbfdf0a8
3 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
archiva-modules/archiva-base/archiva-repository-admin/src/main/java/org/apache/archiva/admin/repository/managed/DefaultManagedRepositoryAdmin.java
View File

@ -112,7 +112,7 @@ public class DefaultManagedRepositoryAdmin
{ {
return return
addManagedRepository( managedRepository.getId(), managedRepository.getLayout(), managedRepository.getName(), addManagedRepository( managedRepository.getId(), managedRepository.getLayout(), managedRepository.getName(),
managedRepository.getUrl(), managedRepository.isBlockRedeployments(), managedRepository.getLocation(), managedRepository.isBlockRedeployments(),
managedRepository.isReleases(), managedRepository.isSnapshots(), needStageRepo, managedRepository.isReleases(), managedRepository.isSnapshots(), needStageRepo,
managedRepository.getCronExpression() ) != null; managedRepository.getCronExpression() ) != null;

16
archiva-modules/archiva-base/archiva-repository-admin/src/main/java/org/apache/archiva/admin/repository/managed/ManagedRepository.java
View File

@ -31,7 +31,7 @@ public class ManagedRepository
private String name; private String name;
private String url; private String location;
private String layout; private String layout;
@ -55,12 +55,12 @@ public class ManagedRepository
// no op // no op
} }
public ManagedRepository( String id, String name, String url, String layout, boolean snapshots, boolean releases, public ManagedRepository( String id, String name, String location, String layout, boolean snapshots, boolean releases,
boolean blockRedeployments, String cronExpression ) boolean blockRedeployments, String cronExpression )
{ {
this.id = id; this.id = id;
this.name = name; this.name = name;
this.url = url; this.location = location;
this.layout = layout; this.layout = layout;
this.snapshots = snapshots; this.snapshots = snapshots;
this.releases = releases; this.releases = releases;
@ -82,9 +82,9 @@ public class ManagedRepository
return this.name; return this.name;
} }
public String getUrl() public String getLocation()
{ {
return this.url; return this.location;
} }
@ -126,9 +126,9 @@ public class ManagedRepository
this.snapshots = snapshots; this.snapshots = snapshots;
} }
public void setUrl( String url ) public void setLocation( String location )
{ {
this.url = url; this.location = location;
} }
public boolean isBlockRedeployments() public boolean isBlockRedeployments()
@ -194,7 +194,7 @@ public class ManagedRepository
sb.append( "ManagedRepository" ); sb.append( "ManagedRepository" );
sb.append( "{id='" ).append( id ).append( '\'' ); sb.append( "{id='" ).append( id ).append( '\'' );
sb.append( ", name='" ).append( name ).append( '\'' ); sb.append( ", name='" ).append( name ).append( '\'' );
sb.append( ", url='" ).append( url ).append( '\'' ); sb.append( ", location='" ).append( location ).append( '\'' );
sb.append( ", layout='" ).append( layout ).append( '\'' ); sb.append( ", layout='" ).append( layout ).append( '\'' );
sb.append( ", snapshots=" ).append( snapshots ); sb.append( ", snapshots=" ).append( snapshots );
sb.append( ", releases=" ).append( releases ); sb.append( ", releases=" ).append( releases );

2
archiva-modules/archiva-base/archiva-repository-admin/src/test/java/org/apache/archiva/admin/repository/managed/ManagedRepositoryAdminTest.java
View File

@ -70,7 +70,7 @@ public class ManagedRepositoryAdminTest
ManagedRepository repo = new ManagedRepository(); ManagedRepository repo = new ManagedRepository();
repo.setId( "test-new-one" ); repo.setId( "test-new-one" );
repo.setName( "test repo" ); repo.setName( "test repo" );
repo.setUrl( APPSERVER_BASE_PATH + repo.getId() ); repo.setLocation( APPSERVER_BASE_PATH + repo.getId() );
managedRepositoryAdmin.addManagedRepository( repo, false ); managedRepositoryAdmin.addManagedRepository( repo, false );
repos = managedRepositoryAdmin.getManagedRepositories(); repos = managedRepositoryAdmin.getManagedRepositories();
assertNotNull( repos ); assertNotNull( repos );