Author: olamy
Date: Mon Aug 29 14:02:39 2011
New Revision: 1162819
URL: http://svn.apache.org/viewvc?rev=1162819&view=rev
Log:
use location rather than url : better naming
Modified:
archiva/trunk/archiva-modules/archiva-base/archiva-repository-admin/src/main/java/org/apache/archiva/admin/repository/managed/DefaultManagedRepositoryAdmin.java
archiva/trunk/archiva-modules/archiva-base/archiva-repository-admin/src/main/java/org/apache/archiva/admin/repository/managed/ManagedRepository.java
archiva/trunk/archiva-modules/archiva-base/archiva-repository-admin/src/test/java/org/apache/archiva/admin/repository/managed/ManagedRepositoryAdminTest.java
Modified:
archiva/trunk/archiva-modules/archiva-base/archiva-repository-admin/src/main/java/org/apache/archiva/admin/repository/managed/DefaultManagedRepositoryAdmin.java
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-base/archiva-repository-admin/src/main/java/org/apache/archiva/admin/repository/managed/DefaultManagedRepositoryAdmin.java?rev=1162819&r1=1162818&r2=1162819&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-base/archiva-repository-admin/src/main/java/org/apache/archiva/admin/repository/managed/DefaultManagedRepositoryAdmin.java
(original)
+++
archiva/trunk/archiva-modules/archiva-base/archiva-repository-admin/src/main/java/org/apache/archiva/admin/repository/managed/DefaultManagedRepositoryAdmin.java
Mon Aug 29 14:02:39 2011
@@ -112,7 +112,7 @@ public class DefaultManagedRepositoryAdm
{
return
addManagedRepository( managedRepository.getId(),
managedRepository.getLayout(), managedRepository.getName(),
- managedRepository.getUrl(),
managedRepository.isBlockRedeployments(),
+ managedRepository.getLocation(),
managedRepository.isBlockRedeployments(),
managedRepository.isReleases(),
managedRepository.isSnapshots(), needStageRepo,
managedRepository.getCronExpression() ) !=
null;
Modified:
archiva/trunk/archiva-modules/archiva-base/archiva-repository-admin/src/main/java/org/apache/archiva/admin/repository/managed/ManagedRepository.java
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-base/archiva-repository-admin/src/main/java/org/apache/archiva/admin/repository/managed/ManagedRepository.java?rev=1162819&r1=1162818&r2=1162819&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-base/archiva-repository-admin/src/main/java/org/apache/archiva/admin/repository/managed/ManagedRepository.java
(original)
+++
archiva/trunk/archiva-modules/archiva-base/archiva-repository-admin/src/main/java/org/apache/archiva/admin/repository/managed/ManagedRepository.java
Mon Aug 29 14:02:39 2011
@@ -31,7 +31,7 @@ public class ManagedRepository
private String name;
- private String url;
+ private String location;
private String layout;
@@ -55,12 +55,12 @@ public class ManagedRepository
// 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 )
{
this.id = id;
this.name = name;
- this.url = url;
+ this.location = location;
this.layout = layout;
this.snapshots = snapshots;
this.releases = releases;
@@ -82,9 +82,9 @@ public class ManagedRepository
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;
}
- public void setUrl( String url )
+ public void setLocation( String location )
{
- this.url = url;
+ this.location = location;
}
public boolean isBlockRedeployments()
@@ -194,7 +194,7 @@ public class ManagedRepository
sb.append( "ManagedRepository" );
sb.append( "{id='" ).append( id ).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( ", snapshots=" ).append( snapshots );
sb.append( ", releases=" ).append( releases );
Modified:
archiva/trunk/archiva-modules/archiva-base/archiva-repository-admin/src/test/java/org/apache/archiva/admin/repository/managed/ManagedRepositoryAdminTest.java
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-base/archiva-repository-admin/src/test/java/org/apache/archiva/admin/repository/managed/ManagedRepositoryAdminTest.java?rev=1162819&r1=1162818&r2=1162819&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-base/archiva-repository-admin/src/test/java/org/apache/archiva/admin/repository/managed/ManagedRepositoryAdminTest.java
(original)
+++
archiva/trunk/archiva-modules/archiva-base/archiva-repository-admin/src/test/java/org/apache/archiva/admin/repository/managed/ManagedRepositoryAdminTest.java
Mon Aug 29 14:02:39 2011
@@ -70,7 +70,7 @@ public class ManagedRepositoryAdminTest
ManagedRepository repo = new ManagedRepository();
repo.setId( "test-new-one" );
repo.setName( "test repo" );
- repo.setUrl( APPSERVER_BASE_PATH + repo.getId() );
+ repo.setLocation( APPSERVER_BASE_PATH + repo.getId() );
managedRepositoryAdmin.addManagedRepository( repo, false );
repos = managedRepositoryAdmin.getManagedRepositories();
assertNotNull( repos );
