You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@archiva.apache.org by br...@apache.org on 2007/08/03 16:48:18 UTC
svn commit: r562488 - in
/maven/archiva/trunk/archiva-base/archiva-configuration/src:
main/java/org/apache/maven/archiva/configuration/DefaultArchivaConfiguration.java
test/java/org/apache/maven/archiva/configuration/ArchivaConfigurationTest.java
Author: brett
Date: Fri Aug 3 07:48:18 2007
New Revision: 562488
URL: http://svn.apache.org/viewvc?view=rev&rev=562488
Log:
[MRM-430] revert configuration if it failed to save
Modified:
maven/archiva/trunk/archiva-base/archiva-configuration/src/main/java/org/apache/maven/archiva/configuration/DefaultArchivaConfiguration.java
maven/archiva/trunk/archiva-base/archiva-configuration/src/test/java/org/apache/maven/archiva/configuration/ArchivaConfigurationTest.java
Modified: maven/archiva/trunk/archiva-base/archiva-configuration/src/main/java/org/apache/maven/archiva/configuration/DefaultArchivaConfiguration.java
URL: http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-base/archiva-configuration/src/main/java/org/apache/maven/archiva/configuration/DefaultArchivaConfiguration.java?view=diff&rev=562488&r1=562487&r2=562488
==============================================================================
--- maven/archiva/trunk/archiva-base/archiva-configuration/src/main/java/org/apache/maven/archiva/configuration/DefaultArchivaConfiguration.java (original)
+++ maven/archiva/trunk/archiva-base/archiva-configuration/src/main/java/org/apache/maven/archiva/configuration/DefaultArchivaConfiguration.java Fri Aug 3 07:48:18 2007
@@ -28,7 +28,6 @@
import org.codehaus.plexus.registry.Registry;
import org.codehaus.plexus.registry.RegistryException;
import org.codehaus.plexus.registry.RegistryListener;
-import org.codehaus.plexus.registry.commons.CommonsConfigurationRegistry;
import org.codehaus.plexus.util.StringUtils;
import java.io.File;
@@ -148,6 +147,8 @@
}
else if ( registry.getSection( KEY + ".base" ) != null )
{
+ this.configuration = null;
+
throw new IndeterminateConfigurationException(
"Configuration can not be saved when it is loaded from two sources" );
}
@@ -174,7 +175,7 @@
try
{
- ( (CommonsConfigurationRegistry) registry ).initialize();
+ ( (Initializable) registry ).initialize();
}
catch ( InitializationException e )
{
Modified: maven/archiva/trunk/archiva-base/archiva-configuration/src/test/java/org/apache/maven/archiva/configuration/ArchivaConfigurationTest.java
URL: http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-base/archiva-configuration/src/test/java/org/apache/maven/archiva/configuration/ArchivaConfigurationTest.java?view=diff&rev=562488&r1=562487&r2=562488
==============================================================================
--- maven/archiva/trunk/archiva-base/archiva-configuration/src/test/java/org/apache/maven/archiva/configuration/ArchivaConfigurationTest.java (original)
+++ maven/archiva/trunk/archiva-base/archiva-configuration/src/test/java/org/apache/maven/archiva/configuration/ArchivaConfigurationTest.java Fri Aug 3 07:48:18 2007
@@ -308,9 +308,9 @@
ArchivaConfiguration archivaConfiguration =
(ArchivaConfiguration) lookup( ArchivaConfiguration.class.getName(), "test-save-user" );
- Configuration configuration = new Configuration();
- configuration.setWebapp( new WebappConfiguration() );
- configuration.getWebapp().setUi( new UserInterfaceOptions() );
+ Configuration configuration = archivaConfiguration.getConfiguration();
+ assertTrue( "check value", configuration.getWebapp().getUi().isAppletFindEnabled() );
+
configuration.getWebapp().getUi().setAppletFindEnabled( false );
try
@@ -320,7 +320,9 @@
}
catch ( IndeterminateConfigurationException e )
{
- assertTrue( true );
+ // check it was reverted
+ configuration = archivaConfiguration.getConfiguration();
+ assertTrue( "check value", configuration.getWebapp().getUi().isAppletFindEnabled() );
}
}