Author: olamy
Date: Fri Sep 2 15:53:58 2011
New Revision: 1164589
URL: http://svn.apache.org/viewvc?rev=1164589&view=rev
Log:
[MRM-1506] api to configure RemoteRepository : move common attributes in an
AbstractRepository class
Added:
archiva/trunk/archiva-modules/archiva-base/archiva-repository-admin/src/main/java/org/apache/archiva/admin/repository/AbstractRepository.java
- copied, changed from r1164561,
archiva/trunk/archiva-modules/archiva-base/archiva-repository-admin/src/main/java/org/apache/archiva/admin/repository/remote/RemoteRepository.java
Modified:
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/main/java/org/apache/archiva/admin/repository/remote/RemoteRepository.java
Copied:
archiva/trunk/archiva-modules/archiva-base/archiva-repository-admin/src/main/java/org/apache/archiva/admin/repository/AbstractRepository.java
(from r1164561,
archiva/trunk/archiva-modules/archiva-base/archiva-repository-admin/src/main/java/org/apache/archiva/admin/repository/remote/RemoteRepository.java)
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-base/archiva-repository-admin/src/main/java/org/apache/archiva/admin/repository/AbstractRepository.java?p2=archiva/trunk/archiva-modules/archiva-base/archiva-repository-admin/src/main/java/org/apache/archiva/admin/repository/AbstractRepository.java&p1=archiva/trunk/archiva-modules/archiva-base/archiva-repository-admin/src/main/java/org/apache/archiva/admin/repository/remote/RemoteRepository.java&r1=1164561&r2=1164589&rev=1164589&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-base/archiva-repository-admin/src/main/java/org/apache/archiva/admin/repository/remote/RemoteRepository.java
(original)
+++
archiva/trunk/archiva-modules/archiva-base/archiva-repository-admin/src/main/java/org/apache/archiva/admin/repository/AbstractRepository.java
Fri Sep 2 15:53:58 2011
@@ -1,5 +1,4 @@
-package org.apache.archiva.admin.repository.remote;
-
+package org.apache.archiva.admin.repository;
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -21,56 +20,55 @@ package org.apache.archiva.admin.reposit
import java.io.Serializable;
-
-public class RemoteRepository
+/**
+ * @author Olivier Lamy
+ * @since 1.4
+ */
+public class AbstractRepository
implements Serializable
{
+
private String id;
private String name;
- private String url;
-
- private String layout;
+ private String layout = "default";
- public RemoteRepository()
+ public AbstractRepository()
{
// no op
}
- public RemoteRepository( String id, String name, String url, String layout
)
+ public AbstractRepository( String id, String name, String layout )
{
this.id = id;
this.name = name;
- this.url = url;
this.layout = layout;
}
-
public String getId()
{
- return this.id;
+ return id;
}
- public String getLayout()
+ public void setId( String id )
{
- return this.layout;
+ this.id = id;
}
public String getName()
{
- return this.name;
+ return name;
}
- public String getUrl()
+ public void setName( String name )
{
- return this.url;
+ this.name = name;
}
-
- public void setId( String id )
+ public String getLayout()
{
- this.id = id;
+ return layout;
}
public void setLayout( String layout )
@@ -78,16 +76,6 @@ public class RemoteRepository
this.layout = layout;
}
- public void setName( String name )
- {
- this.name = name;
- }
-
- public void setUrl( String url )
- {
- this.url = url;
- }
-
public int hashCode()
{
@@ -103,12 +91,12 @@ public class RemoteRepository
return true;
}
- if ( !( other instanceof RemoteRepository ) )
+ if ( !( other instanceof AbstractRepository ) )
{
return false;
}
- RemoteRepository that = (RemoteRepository) other;
+ AbstractRepository that = (AbstractRepository) other;
boolean result = true;
result = result && ( getId() == null ? that.getId() == null :
getId().equals( that.getId() ) );
return result;
@@ -117,7 +105,12 @@ public class RemoteRepository
@Override
public String toString()
{
- return "RemoteRepository{" + "id='" + id + '\'' + ", name='" + name +
'\'' + ", url='" + url + '\''
- + ", layout='" + layout + '\'' + '}';
+ final StringBuilder sb = new StringBuilder();
+ sb.append( "AbstractRepository" );
+ sb.append( "{id='" ).append( id ).append( '\'' );
+ sb.append( ", name='" ).append( name ).append( '\'' );
+ sb.append( ", layout='" ).append( layout ).append( '\'' );
+ sb.append( '}' );
+ return sb.toString();
}
-}
\ No newline at end of file
+}
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=1164589&r1=1164588&r2=1164589&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
Fri Sep 2 15:53:58 2011
@@ -19,22 +19,21 @@ package org.apache.archiva.admin.reposit
* under the License.
*/
+import org.apache.archiva.admin.repository.AbstractRepository;
+
import java.io.Serializable;
/**
+ * @author Olivier Lamy
* @since 1.4
*/
public class ManagedRepository
+ extends AbstractRepository
implements Serializable
{
- private String id;
-
- private String name;
private String location;
- private String layout = "default";
-
private boolean snapshots = false;
private boolean releases = true;
@@ -77,10 +76,9 @@ public class ManagedRepository
boolean releases, boolean blockRedeployments,
String cronExpression, String indexDir,
boolean scanned, int daysOlder, int
retentionCount, boolean deleteReleasedSnapshots )
{
- this.id = id;
- this.name = name;
+ super(id, name, layout);
+
this.location = location;
- this.layout = layout;
this.snapshots = snapshots;
this.releases = releases;
this.blockRedeployments = blockRedeployments;
@@ -92,21 +90,6 @@ public class ManagedRepository
this.deleteReleasedSnapshots = deleteReleasedSnapshots;
}
- public String getId()
- {
- return this.id;
- }
-
- public String getLayout()
- {
- return this.layout;
- }
-
- public String getName()
- {
- return this.name;
- }
-
public String getLocation()
{
return this.location;
@@ -126,20 +109,6 @@ public class ManagedRepository
return this.snapshots;
}
- public void setId( String id )
- {
- this.id = id;
- }
-
- public void setLayout( String layout )
- {
- this.layout = layout;
- }
-
- public void setName( String name )
- {
- this.name = name;
- }
public void setReleases( boolean releases )
{
@@ -237,40 +206,13 @@ public class ManagedRepository
this.deleteReleasedSnapshots = deleteReleasedSnapshots;
}
- public int hashCode()
- {
- int result = 17;
- result = 37 * result + ( id != null ? id.hashCode() : 0 );
- return result;
- }
-
- public boolean equals( Object other )
- {
- if ( this == other )
- {
- return true;
- }
-
- if ( !( other instanceof ManagedRepository ) )
- {
- return false;
- }
-
- ManagedRepository that = (ManagedRepository) other;
- boolean result = true;
- result = result && ( getId() == null ? that.getId() == null :
getId().equals( that.getId() ) );
- return result;
- }
@Override
public String toString()
{
final StringBuilder sb = new StringBuilder();
sb.append( "ManagedRepository" );
- sb.append( "{id='" ).append( id ).append( '\'' );
- sb.append( ", name='" ).append( name ).append( '\'' );
- sb.append( ", location='" ).append( location ).append( '\'' );
- sb.append( ", layout='" ).append( layout ).append( '\'' );
+ sb.append( "{location='" ).append( location ).append( '\'' );
sb.append( ", snapshots=" ).append( snapshots );
sb.append( ", releases=" ).append( releases );
sb.append( ", blockRedeployments=" ).append( blockRedeployments );
@@ -278,7 +220,11 @@ public class ManagedRepository
sb.append( ", stagingRepository=" ).append( stagingRepository );
sb.append( ", scanned=" ).append( scanned );
sb.append( ", indexDirectory='" ).append( indexDirectory ).append(
'\'' );
+ sb.append( ", daysOlder=" ).append( daysOlder );
+ sb.append( ", retentionCount=" ).append( retentionCount );
+ sb.append( ", deleteReleasedSnapshots=" ).append(
deleteReleasedSnapshots );
sb.append( '}' );
+ sb.append( super.toString() );
return sb.toString();
}
Modified:
archiva/trunk/archiva-modules/archiva-base/archiva-repository-admin/src/main/java/org/apache/archiva/admin/repository/remote/RemoteRepository.java
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-base/archiva-repository-admin/src/main/java/org/apache/archiva/admin/repository/remote/RemoteRepository.java?rev=1164589&r1=1164588&r2=1164589&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-base/archiva-repository-admin/src/main/java/org/apache/archiva/admin/repository/remote/RemoteRepository.java
(original)
+++
archiva/trunk/archiva-modules/archiva-base/archiva-repository-admin/src/main/java/org/apache/archiva/admin/repository/remote/RemoteRepository.java
Fri Sep 2 15:53:58 2011
@@ -19,105 +19,41 @@ package org.apache.archiva.admin.reposit
* under the License.
*/
-import java.io.Serializable;
+import org.apache.archiva.admin.repository.AbstractRepository;
+import java.io.Serializable;
+/**
+ * @author Olivier Lamy
+ * @since 1.4
+ */
public class RemoteRepository
+ extends AbstractRepository
implements Serializable
{
- private String id;
-
- private String name;
-
- private String url;
- private String layout;
+ private String location;
public RemoteRepository()
{
// no op
}
- public RemoteRepository( String id, String name, String url, String layout
)
+ public RemoteRepository( String id, String name, String location, String
layout )
{
- this.id = id;
- this.name = name;
- this.url = url;
- this.layout = layout;
+ super( id, name, layout );
+ this.location = location;
}
- public String getId()
- {
- return this.id;
- }
-
- public String getLayout()
- {
- return this.layout;
- }
-
- public String getName()
- {
- return this.name;
- }
-
- public String getUrl()
- {
- return this.url;
- }
-
-
- public void setId( String id )
- {
- this.id = id;
- }
-
- public void setLayout( String layout )
- {
- this.layout = layout;
- }
-
- public void setName( String name )
- {
- this.name = name;
- }
-
- public void setUrl( String url )
- {
- this.url = url;
- }
-
-
- public int hashCode()
- {
- int result = 17;
- result = 37 * result + ( id != null ? id.hashCode() : 0 );
- return result;
- }
-
- public boolean equals( Object other )
- {
- if ( this == other )
- {
- return true;
- }
-
- if ( !( other instanceof RemoteRepository ) )
- {
- return false;
- }
-
- RemoteRepository that = (RemoteRepository) other;
- boolean result = true;
- result = result && ( getId() == null ? that.getId() == null :
getId().equals( that.getId() ) );
- return result;
- }
-
@Override
public String toString()
{
- return "RemoteRepository{" + "id='" + id + '\'' + ", name='" + name +
'\'' + ", url='" + url + '\''
- + ", layout='" + layout + '\'' + '}';
+ final StringBuilder sb = new StringBuilder();
+ sb.append( "RemoteRepository" );
+ sb.append( "{location='" ).append( location ).append( '\'' );
+ sb.append( '}' );
+ sb.append( super.toString() );
+ return sb.toString();
}
}
\ No newline at end of file
