diff options
| author | Olivier Lamy <olamy@apache.org> | 2013-04-21 22:56:28 +0000 |
|---|---|---|
| committer | Olivier Lamy <olamy@apache.org> | 2013-04-21 22:56:28 +0000 |
| commit | 3b64d5dca9b008cfc38c89775bbbda17c6aa2597 (patch) | |
| tree | 0dd5ed4ab90f29de88ddb4f24cab777ce71b3d37 /archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src | |
| parent | 65f55af646269dae29b1213d4d5d54ac1d6bcec7 (diff) | |
| download | archiva-3b64d5dca9b008cfc38c89775bbbda17c6aa2597.tar.gz archiva-3b64d5dca9b008cfc38c89775bbbda17c6aa2597.zip | |
fix update/add for mergedIndexPath
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1470359 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src')
| -rw-r--r-- | archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/main/java/org/apache/archiva/admin/repository/group/DefaultRepositoryGroupAdmin.java | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/main/java/org/apache/archiva/admin/repository/group/DefaultRepositoryGroupAdmin.java b/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/main/java/org/apache/archiva/admin/repository/group/DefaultRepositoryGroupAdmin.java index 03b995146..047b8494b 100644 --- a/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/main/java/org/apache/archiva/admin/repository/group/DefaultRepositoryGroupAdmin.java +++ b/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/main/java/org/apache/archiva/admin/repository/group/DefaultRepositoryGroupAdmin.java @@ -45,7 +45,7 @@ import java.util.regex.Pattern; /** * @author Olivier Lamy */ -@Service( "repositoryGroupAdmin#default" ) +@Service("repositoryGroupAdmin#default") public class DefaultRepositoryGroupAdmin extends AbstractRepositoryAdmin implements RepositoryGroupAdmin @@ -67,7 +67,8 @@ public class DefaultRepositoryGroupAdmin for ( RepositoryGroupConfiguration repositoryGroupConfiguration : getArchivaConfiguration().getConfiguration().getRepositoryGroups() ) { repositoriesGroups.add( new RepositoryGroup( repositoryGroupConfiguration.getId(), new ArrayList<String>( - repositoryGroupConfiguration.getRepositories() ) ) ); + repositoryGroupConfiguration.getRepositories() ) ).mergedIndexPath( + repositoryGroupConfiguration.getMergedIndexPath() ) ); } return repositoriesGroups; @@ -95,6 +96,7 @@ public class DefaultRepositoryGroupAdmin RepositoryGroupConfiguration repositoryGroupConfiguration = new RepositoryGroupConfiguration(); repositoryGroupConfiguration.setId( repositoryGroup.getId() ); repositoryGroupConfiguration.setRepositories( repositoryGroup.getRepositories() ); + repositoryGroupConfiguration.setMergedIndexPath( repositoryGroup.getMergedIndexPath() ); Configuration configuration = getArchivaConfiguration().getConfiguration(); configuration.addRepositoryGroup( repositoryGroupConfiguration ); saveConfiguration( configuration ); @@ -138,6 +140,7 @@ public class DefaultRepositoryGroupAdmin configuration.removeRepositoryGroup( repositoryGroupConfiguration ); repositoryGroupConfiguration.setRepositories( repositoryGroup.getRepositories() ); + repositoryGroupConfiguration.setMergedIndexPath( repositoryGroup.getMergedIndexPath() ); configuration.addRepositoryGroup( repositoryGroupConfiguration ); saveConfiguration( configuration ); |