// UPDATE: Upgrading to commons-configuration 1.4 breaks half the unit tests. 2007-10-11 (joakime)
String contents = "<configuration />";
+
+ String fileLocation = userConfigFilename;
+
if ( !writeFile( "user configuration", userConfigFilename, contents ) )
{
+ fileLocation = altConfigFilename;
if ( !writeFile( "alternative configuration", altConfigFilename, contents ) )
{
throw new RegistryException(
}
}
+ // olamy hackish I know :-)
+ contents = "<configuration><xml fileName=\"" + fileLocation +"\" config-forceCreate=\"true\" config-name=\"org.apache.maven.archiva.user\"/>"
+ + "</configuration>";
+
+
( (CommonsConfigurationRegistry) registry ).setProperties( contents );
( (CommonsConfigurationRegistry) registry ).initialize();
assertFalse( userFile.exists() );
ArchivaConfiguration archivaConfiguration =
- (ArchivaConfiguration) lookup( ArchivaConfiguration.class, "test-save-user" );
+ (ArchivaConfiguration) lookup( ArchivaConfiguration.class, "test-save-user-defaults" );
archivaConfiguration.reload();
archivaConfiguration.addListener( listener );
listener.configurationEvent( new ConfigurationEvent( ConfigurationEvent.SAVED ) );
- // once from default creation, and again from manual call to save
- control.setVoidCallable( 2 );
+
+ control.setVoidCallable( 1 );
control.replay();
FileUtils.writeStringToFile( baseFile, "<configuration/>", null );
ArchivaConfiguration archivaConfiguration =
- (ArchivaConfiguration) lookup( ArchivaConfiguration.class, "test-save-user" );
+ (ArchivaConfiguration) lookup( ArchivaConfiguration.class, "test-save-user-fallback" );
archivaConfiguration.reload();
ArchivaConfiguration archivaConfiguration =
(ArchivaConfiguration) lookup( ArchivaConfiguration.class, "test-remove-central" );
+ archivaConfiguration.reload();
+
Configuration configuration = archivaConfiguration.getConfiguration();
RepositoryGroupConfiguration repositoryGroup =
</property>
</bean>
+ <bean name="archivaConfiguration#test-save-user-defaults" class="org.apache.maven.archiva.configuration.DefaultArchivaConfiguration">
+ <property name="registry" ref="registry#test-save-user-defaults"/>
+ </bean>
+
+ <bean name="registry#test-save-user-defaults" class="org.codehaus.redback.components.registry.commons.CommonsConfigurationRegistry">
+ <property name="properties">
+ <value>
+ <![CDATA[
+ <configuration>
+ <xml fileName="${basedir}/target/test/test-file-user.xml" config-optional="true" config-forceCreate="true"
+ config-name="org.apache.maven.archiva.user" config-at="org.apache.maven.archiva"/>
+ <xml fileName="${basedir}/target/test/test-file.xml" config-optional="true" config-forceCreate="false"
+ config-name="org.apache.maven.archiva.base" config-at="org.apache.maven.archiva"/>
+ </configuration>
+ ]]>
+ </value>
+ </property>
+ </bean>
+
+ <bean name="archivaConfiguration#test-save-user-fallback" class="org.apache.maven.archiva.configuration.DefaultArchivaConfiguration">
+ <property name="registry" ref="registry#test-save-user-fallback"/>
+ </bean>
+
+ <bean name="registry#test-save-user-fallback" class="org.codehaus.redback.components.registry.commons.CommonsConfigurationRegistry">
+ <property name="properties">
+ <value>
+ <![CDATA[
+ <configuration>
+ <xml fileName="${basedir}/target/test/test-file-user.xml" config-optional="true" config-forceCreate="false"
+ config-name="org.apache.maven.archiva.user" config-at="org.apache.maven.archiva"/>
+ <xml fileName="${basedir}/target/test/test-file.xml" config-optional="true" config-forceCreate="true"
+ config-name="org.apache.maven.archiva.base" config-at="org.apache.maven.archiva"/>
+ </configuration>
+ ]]>
+ </value>
+ </property>
+ </bean>
+
<bean name="archivaConfiguration#test-save-user" class="org.apache.maven.archiva.configuration.DefaultArchivaConfiguration">
<property name="registry" ref="registry#test-save-user"/>
</bean>
<value>
<![CDATA[
<configuration>
- <xml fileName="${basedir}/target/test/test-file-user.xml" config-optional="true" config-forceCreate="false"
+ <xml fileName="${basedir}/target/test/test-file-user.xml" config-optional="true" config-forceCreate="true"
config-name="org.apache.maven.archiva.user" config-at="org.apache.maven.archiva"/>
- <xml fileName="${basedir}/target/test/test-file.xml" config-optional="true" config-forceCreate="true"
+ <xml fileName="${basedir}/target/test/test-file.xml" config-optional="true" config-forceCreate="false"
config-name="org.apache.maven.archiva.base" config-at="org.apache.maven.archiva"/>
</configuration>
]]>