Apache
/
archiva
mirror of https://github.com/apache/archiva.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Eliminating duplicate repositories from showing up after the conversion. 

git-svn-id: https://svn.apache.org/repos/asf/maven/archiva/trunk@583630 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Joakim Erdfelt 2007-10-10 22:15:51 +00:00
parent e799f29dc2
commit 54207afb87
1 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
archiva-base/archiva-configuration/src/main/java/org/apache/maven/archiva/configuration/DefaultArchivaConfiguration.java
View File

@ -88,7 +88,7 @@ public class DefaultArchivaConfiguration
* Configuration Listeners we've registered. * Configuration Listeners we've registered.
*/ */
private Set<ConfigurationListener> listeners = new HashSet<ConfigurationListener>(); private Set<ConfigurationListener> listeners = new HashSet<ConfigurationListener>();
/** /**
* Registry Listeners we've registered. * Registry Listeners we've registered.
*/ */
@ -153,6 +153,9 @@ public class DefaultArchivaConfiguration
config.addRemoteRepository( repo ); config.addRemoteRepository( repo );
} }
} }
// Prevent duplicate repositories from showing up.
config.getRepositories().clear();
} }
// Normalize the order fields in the proxy connectors. // Normalize the order fields in the proxy connectors.
@ -255,7 +258,7 @@ public class DefaultArchivaConfiguration
new ConfigurationRegistryWriter().write( configuration, section ); new ConfigurationRegistryWriter().write( configuration, section );
section.save(); section.save();
triggerEvent( ConfigurationEvent.SAVED ); triggerEvent( ConfigurationEvent.SAVED );
this.configuration = processExpressions( configuration ); this.configuration = processExpressions( configuration );
@ -278,8 +281,8 @@ public class DefaultArchivaConfiguration
try try
{ {
( (Initializable) registry ).initialize(); ( (Initializable) registry ).initialize();
for ( RegistryListener regListener: registryListeners ) for ( RegistryListener regListener : registryListeners )
{ {
addRegistryChangeListener( regListener ); addRegistryChangeListener( regListener );
} }
@ -288,7 +291,7 @@ public class DefaultArchivaConfiguration
{ {
throw new RegistryException( "Unable to reinitialize configuration: " + e.getMessage(), e ); throw new RegistryException( "Unable to reinitialize configuration: " + e.getMessage(), e );
} }
triggerEvent( ConfigurationEvent.SAVED ); triggerEvent( ConfigurationEvent.SAVED );
return registry.getSection( KEY + ".user" ); return registry.getSection( KEY + ".user" );
@ -329,7 +332,7 @@ public class DefaultArchivaConfiguration
listeners.remove( listener ); listeners.remove( listener );
} }
public void addChangeListener( RegistryListener listener ) public void addChangeListener( RegistryListener listener )
{ {
addRegistryChangeListener( listener ); addRegistryChangeListener( listener );
@ -352,7 +355,6 @@ public class DefaultArchivaConfiguration
} }
} }
public void initialize() public void initialize()
throws InitializationException throws InitializationException
{ {