Author: olamy
Date: Sun Apr 21 22:56:28 2013
New Revision: 1470359
URL: http://svn.apache.org/r1470359
Log:
fix update/add for mergedIndexPath
Modified:
archiva/trunk/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-api/src/main/java/org/apache/archiva/admin/model/beans/RepositoryGroup.java
archiva/trunk/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/main/java/org/apache/archiva/admin/repository/group/DefaultRepositoryGroupAdmin.java
archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultRepositoryGroupService.java
Modified:
archiva/trunk/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-api/src/main/java/org/apache/archiva/admin/model/beans/RepositoryGroup.java
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-api/src/main/java/org/apache/archiva/admin/model/beans/RepositoryGroup.java?rev=1470359&r1=1470358&r2=1470359&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-api/src/main/java/org/apache/archiva/admin/model/beans/RepositoryGroup.java
(original)
+++
archiva/trunk/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-api/src/main/java/org/apache/archiva/admin/model/beans/RepositoryGroup.java
Sun Apr 21 22:56:28 2013
@@ -122,6 +122,22 @@ public class RepositoryGroup
this.repositories = repositories;
}
+ public String getMergedIndexPath()
+ {
+ return mergedIndexPath;
+ }
+
+ public void setMergedIndexPath( String mergedIndexPath )
+ {
+ this.mergedIndexPath = mergedIndexPath;
+ }
+
+ public RepositoryGroup mergedIndexPath( String mergedIndexPath )
+ {
+ this.mergedIndexPath = mergedIndexPath;
+ return this;
+ }
+
public boolean equals( Object other )
{
if ( this == other )
Modified:
archiva/trunk/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/main/java/org/apache/archiva/admin/repository/group/DefaultRepositoryGroupAdmin.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/group/DefaultRepositoryGroupAdmin.java?rev=1470359&r1=1470358&r2=1470359&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/main/java/org/apache/archiva/admin/repository/group/DefaultRepositoryGroupAdmin.java
(original)
+++
archiva/trunk/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/main/java/org/apache/archiva/admin/repository/group/DefaultRepositoryGroupAdmin.java
Sun Apr 21 22:56:28 2013
@@ -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 );
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultRepositoryGroupService.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/DefaultRepositoryGroupService.java?rev=1470359&r1=1470358&r2=1470359&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultRepositoryGroupService.java
(original)
+++
archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultRepositoryGroupService.java
Sun Apr 21 22:56:28 2013
@@ -51,8 +51,8 @@ public class DefaultRepositoryGroupServi
new ArrayList<RepositoryGroup>(
repositoryGroupAdmin.getRepositoriesGroups().size() );
for ( org.apache.archiva.admin.model.beans.RepositoryGroup
repoGroup : repositoryGroupAdmin.getRepositoriesGroups() )
{
- repositoriesGroups.add(
- new RepositoryGroup( repoGroup.getId(), new
ArrayList<String>( repoGroup.getRepositories() ) ) );
+ repositoriesGroups.add( new RepositoryGroup(
repoGroup.getId(), new ArrayList<String>(
+ repoGroup.getRepositories() ) ).mergedIndexPath(
repoGroup.getMergedIndexPath() ) );
}
return repositoriesGroups;
}
@@ -82,7 +82,8 @@ public class DefaultRepositoryGroupServi
{
return repositoryGroupAdmin.addRepositoryGroup(
new org.apache.archiva.admin.model.beans.RepositoryGroup(
repoGroup.getId(), new ArrayList<String>(
- repoGroup.getRepositories() ) ), getAuditInformation() );
+ repoGroup.getRepositories() ) ).mergedIndexPath(
repoGroup.getMergedIndexPath() ),
+ getAuditInformation() );
}
catch ( RepositoryAdminException e )
{
@@ -97,7 +98,8 @@ public class DefaultRepositoryGroupServi
{
return repositoryGroupAdmin.updateRepositoryGroup(
new org.apache.archiva.admin.model.beans.RepositoryGroup(
repoGroup.getId(), new ArrayList<String>(
- repoGroup.getRepositories() ) ), getAuditInformation() );
+ repoGroup.getRepositories() ) ).mergedIndexPath(
repoGroup.getMergedIndexPath() ),
+ getAuditInformation() );
}
catch ( RepositoryAdminException e )
{
