Author: olamy
Date: Thu Sep 15 08:58:52 2011
New Revision: 1171014
URL: http://svn.apache.org/viewvc?rev=1171014&view=rev
Log:
[MRM-1490] REST services add missing fields when creating a managed repository
Modified:
archiva/trunk/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/main/java/org/apache/archiva/admin/repository/managed/DefaultManagedRepositoryAdmin.java
archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-api/src/main/java/org/apache/archiva/rest/api/model/ManagedRepository.java
archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultManagedRepositoriesService.java
Modified:
archiva/trunk/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/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/archiva-repository-admin-default/src/main/java/org/apache/archiva/admin/repository/managed/DefaultManagedRepositoryAdmin.java?rev=1171014&r1=1171013&r2=1171014&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/main/java/org/apache/archiva/admin/repository/managed/DefaultManagedRepositoryAdmin.java
(original)
+++
archiva/trunk/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/main/java/org/apache/archiva/admin/repository/managed/DefaultManagedRepositoryAdmin.java
Thu Sep 15 08:58:52 2011
@@ -215,6 +215,7 @@ public class DefaultManagedRepositoryAdm
repository.setDaysOlder( daysOlder );
repository.setRetentionCount( retentionCount );
repository.setDeleteReleasedSnapshots( deteleReleasedSnapshots );
+ repository.setIndexDir( indexDir );
try
{
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-api/src/main/java/org/apache/archiva/rest/api/model/ManagedRepository.java
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-api/src/main/java/org/apache/archiva/rest/api/model/ManagedRepository.java?rev=1171014&r1=1171013&r2=1171014&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-api/src/main/java/org/apache/archiva/rest/api/model/ManagedRepository.java
(original)
+++
archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-api/src/main/java/org/apache/archiva/rest/api/model/ManagedRepository.java
Thu Sep 15 08:58:52 2011
@@ -50,7 +50,21 @@ public class ManagedRepository
private boolean resetStats;
- private boolean scanned =false;
+ private boolean scanned = false;
+
+ /**
+ * default model value
+ */
+ private int daysOlder = 100;
+
+ /**
+ * default model value
+ */
+ private int retentionCount = 2;
+
+ private boolean deleteReleasedSnapshots;
+
+ private String indexDirectory;
public ManagedRepository()
{
@@ -186,6 +200,46 @@ public class ManagedRepository
this.scanned = scanned;
}
+ public String getIndexDirectory()
+ {
+ return indexDirectory;
+ }
+
+ public void setIndexDirectory( String indexDirectory )
+ {
+ this.indexDirectory = indexDirectory;
+ }
+
+ public int getDaysOlder()
+ {
+ return daysOlder;
+ }
+
+ public void setDaysOlder( int daysOlder )
+ {
+ this.daysOlder = daysOlder;
+ }
+
+ public int getRetentionCount()
+ {
+ return retentionCount;
+ }
+
+ public void setRetentionCount( int retentionCount )
+ {
+ this.retentionCount = retentionCount;
+ }
+
+ public boolean isDeleteReleasedSnapshots()
+ {
+ return deleteReleasedSnapshots;
+ }
+
+ public void setDeleteReleasedSnapshots( boolean deleteReleasedSnapshots )
+ {
+ this.deleteReleasedSnapshots = deleteReleasedSnapshots;
+ }
+
public int hashCode()
{
int result = 17;
@@ -227,6 +281,7 @@ public class ManagedRepository
sb.append( ", cronExpression='" ).append( cronExpression ).append(
'\'' );
sb.append( ", resetStats=" ).append( resetStats );
sb.append( ", scanned=" ).append( scanned );
+ sb.append( ", indexDirectory='" ).append( indexDirectory ).append(
'\'' );
sb.append( '}' );
return sb.toString();
}
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultManagedRepositoriesService.java
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultManagedRepositoriesService.java?rev=1171014&r1=1171013&r2=1171014&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultManagedRepositoriesService.java
(original)
+++
archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultManagedRepositoriesService.java
Thu Sep 15 08:58:52 2011
@@ -119,6 +119,10 @@ public class DefaultManagedRepositoriesS
repo.setName( managedRepository.getName() );
repo.setReleases( managedRepository.isReleases() );
repo.setSnapshots( managedRepository.isSnapshots() );
+ repo.setIndexDirectory( managedRepository.getIndexDirectory() );
+ repo.setDaysOlder( managedRepository.getDaysOlder() );
+ repo.setDeleteReleasedSnapshots(
managedRepository.isDeleteReleasedSnapshots() );
+ repo.setRetentionCount( managedRepository.getRetentionCount() );
try
{
return managedRepositoryAdmin.addManagedRepository( repo,
managedRepository.isStageRepoNeeded(),
