You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@archiva.apache.org by ol...@apache.org on 2013/02/14 00:53:27 UTC
svn commit: r1445993 - in /archiva/trunk/archiva-modules:
archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/main/java/org/apache/archiva/admin/repository/runtime/
archiva-web/archiva-rest/archiva-rest-services/src/main/java/org...
Author: olamy
Date: Wed Feb 13 23:53:27 2013
New Revision: 1445993
URL: http://svn.apache.org/r1445993
Log:
reload field in case of configuration change
Modified:
archiva/trunk/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/main/java/org/apache/archiva/admin/repository/runtime/DefaultRedbackRuntimeConfigurationAdmin.java
archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultRedbackRuntimeConfigurationService.java
Modified: archiva/trunk/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/main/java/org/apache/archiva/admin/repository/runtime/DefaultRedbackRuntimeConfigurationAdmin.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/runtime/DefaultRedbackRuntimeConfigurationAdmin.java?rev=1445993&r1=1445992&r2=1445993&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/main/java/org/apache/archiva/admin/repository/runtime/DefaultRedbackRuntimeConfigurationAdmin.java (original)
+++ archiva/trunk/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/main/java/org/apache/archiva/admin/repository/runtime/DefaultRedbackRuntimeConfigurationAdmin.java Wed Feb 13 23:53:27 2013
@@ -26,6 +26,8 @@ import org.apache.archiva.admin.model.be
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 DefaultRedbackRuntimeConfig
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 DefaultRedbackRuntimeConfig
}
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 DefaultRedbackRuntimeConfig
return keysSet;
}
+
+ public void configurationEvent( ConfigurationEvent event )
+ {
+ build( archivaConfiguration.getConfiguration().getRedbackRuntimeConfiguration(), true );
+ }
}
Modified: archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultRedbackRuntimeConfigurationService.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/DefaultRedbackRuntimeConfigurationService.java?rev=1445993&r1=1445992&r2=1445993&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultRedbackRuntimeConfigurationService.java (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultRedbackRuntimeConfigurationService.java Wed Feb 13 23:53:27 2013
@@ -37,6 +37,7 @@ import org.apache.archiva.redback.users.
import org.apache.archiva.rest.api.model.UserManagerImplementationInformation;
import org.apache.archiva.rest.api.services.ArchivaRestServiceException;
import org.apache.archiva.rest.api.services.RedbackRuntimeConfigurationService;
+
import org.apache.commons.lang.StringUtils;
import org.springframework.context.ApplicationContext;
import org.springframework.stereotype.Service;
@@ -288,6 +289,7 @@ public class DefaultRedbackRuntimeConfig
}
return properties;
}
+
}