summaryrefslogtreecommitdiffstats
path: root/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src
diff options
context:
space:
mode:
authorOlivier Lamy <olamy@apache.org>2013-02-13 23:53:27 +0000
committerOlivier Lamy <olamy@apache.org>2013-02-13 23:53:27 +0000
commit7711abea0d4ae0659353eda78b47b6ec49c207eb (patch)
tree9cc3256460254c90437a3db871a9e9c4cc490e74 /archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src
parentf5f2a56e534ba03c5d6d4d42c7e866f176d1fcda (diff)
downloadarchiva-7711abea0d4ae0659353eda78b47b6ec49c207eb.tar.gz
archiva-7711abea0d4ae0659353eda78b47b6ec49c207eb.zip
reload field in case of configuration change
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1445993 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/runtime/DefaultRedbackRuntimeConfigurationAdmin.java15
1 files changed, 11 insertions, 4 deletions
diff --git a/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/main/java/org/apache/archiva/admin/repository/runtime/DefaultRedbackRuntimeConfigurationAdmin.java b/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/main/java/org/apache/archiva/admin/repository/runtime/DefaultRedbackRuntimeConfigurationAdmin.java
index cf12b6877..52a97753d 100644
--- a/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/main/java/org/apache/archiva/admin/repository/runtime/DefaultRedbackRuntimeConfigurationAdmin.java
+++ b/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/main/java/org/apache/archiva/admin/repository/runtime/DefaultRedbackRuntimeConfigurationAdmin.java
@@ -26,6 +26,8 @@ import org.apache.archiva.admin.model.beans.RedbackRuntimeConfiguration;
import org.apache.archiva.admin.model.runtime.RedbackRuntimeConfigurationAdmin;
import org.apache.archiva.configuration.ArchivaConfiguration;
import org.apache.archiva.configuration.Configuration;
+import org.apache.archiva.configuration.ConfigurationEvent;
+import org.apache.archiva.configuration.ConfigurationListener;
import org.apache.archiva.configuration.IndeterminateConfigurationException;
import org.apache.archiva.redback.components.cache.Cache;
import org.apache.archiva.redback.components.registry.RegistryException;
@@ -53,7 +55,7 @@ import java.util.Set;
*/
@Service( "userConfiguration#archiva" )
public class DefaultRedbackRuntimeConfigurationAdmin
- implements RedbackRuntimeConfigurationAdmin, UserConfiguration
+ implements RedbackRuntimeConfigurationAdmin, UserConfiguration, ConfigurationListener
{
protected Logger log = LoggerFactory.getLogger( getClass() );
@@ -230,7 +232,7 @@ public class DefaultRedbackRuntimeConfigurationAdmin
public RedbackRuntimeConfiguration getRedbackRuntimeConfiguration()
{
- return build( archivaConfiguration.getConfiguration().getRedbackRuntimeConfiguration() );
+ return build( archivaConfiguration.getConfiguration().getRedbackRuntimeConfiguration(), false );
}
public void updateRedbackRuntimeConfiguration( RedbackRuntimeConfiguration redbackRuntimeConfiguration )
@@ -256,9 +258,9 @@ public class DefaultRedbackRuntimeConfigurationAdmin
}
private RedbackRuntimeConfiguration build(
- org.apache.archiva.configuration.RedbackRuntimeConfiguration runtimeConfiguration )
+ org.apache.archiva.configuration.RedbackRuntimeConfiguration runtimeConfiguration, boolean force )
{
- if ( this.currentRedbackRuntimeConfiguration != null )
+ if ( this.currentRedbackRuntimeConfiguration != null && !force )
{
return this.currentRedbackRuntimeConfiguration;
}
@@ -626,4 +628,9 @@ public class DefaultRedbackRuntimeConfigurationAdmin
return keysSet;
}
+
+ public void configurationEvent( ConfigurationEvent event )
+ {
+ build( archivaConfiguration.getConfiguration().getRedbackRuntimeConfiguration(), true );
+ }
}