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 2011/05/21 09:49:25 UTC
svn commit: r1125645 - in
/archiva/trunk/archiva-modules/archiva-base/archiva-configuration/src:
main/java/org/apache/maven/archiva/configuration/
test/java/org/apache/maven/archiva/configuration/ test/resources/
Author: olamy
Date: Sat May 21 07:49:25 2011
New Revision: 1125645
URL: http://svn.apache.org/viewvc?rev=1125645&view=rev
Log:
[MRM-1473] removing plexus-spring use
fix unit tests in archiva-configuration
Modified:
archiva/trunk/archiva-modules/archiva-base/archiva-configuration/src/main/java/org/apache/maven/archiva/configuration/DefaultArchivaConfiguration.java
archiva/trunk/archiva-modules/archiva-base/archiva-configuration/src/test/java/org/apache/maven/archiva/configuration/ArchivaConfigurationTest.java
archiva/trunk/archiva-modules/archiva-base/archiva-configuration/src/test/resources/spring-context.xml
Modified: archiva/trunk/archiva-modules/archiva-base/archiva-configuration/src/main/java/org/apache/maven/archiva/configuration/DefaultArchivaConfiguration.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-base/archiva-configuration/src/main/java/org/apache/maven/archiva/configuration/DefaultArchivaConfiguration.java?rev=1125645&r1=1125644&r2=1125645&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-base/archiva-configuration/src/main/java/org/apache/maven/archiva/configuration/DefaultArchivaConfiguration.java (original)
+++ archiva/trunk/archiva-modules/archiva-base/archiva-configuration/src/main/java/org/apache/maven/archiva/configuration/DefaultArchivaConfiguration.java Sat May 21 07:49:25 2011
@@ -540,8 +540,12 @@ public class DefaultArchivaConfiguration
// 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(
@@ -551,6 +555,11 @@ public class DefaultArchivaConfiguration
}
}
+ // 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();
Modified: archiva/trunk/archiva-modules/archiva-base/archiva-configuration/src/test/java/org/apache/maven/archiva/configuration/ArchivaConfigurationTest.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-base/archiva-configuration/src/test/java/org/apache/maven/archiva/configuration/ArchivaConfigurationTest.java?rev=1125645&r1=1125644&r2=1125645&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-base/archiva-configuration/src/test/java/org/apache/maven/archiva/configuration/ArchivaConfigurationTest.java (original)
+++ archiva/trunk/archiva-modules/archiva-base/archiva-configuration/src/test/java/org/apache/maven/archiva/configuration/ArchivaConfigurationTest.java Sat May 21 07:49:25 2011
@@ -351,7 +351,7 @@ public class ArchivaConfigurationTest
assertFalse( userFile.exists() );
ArchivaConfiguration archivaConfiguration =
- (ArchivaConfiguration) lookup( ArchivaConfiguration.class, "test-save-user" );
+ (ArchivaConfiguration) lookup( ArchivaConfiguration.class, "test-save-user-defaults" );
archivaConfiguration.reload();
@@ -366,8 +366,8 @@ public class ArchivaConfigurationTest
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();
@@ -414,7 +414,7 @@ public class ArchivaConfigurationTest
FileUtils.writeStringToFile( baseFile, "<configuration/>", null );
ArchivaConfiguration archivaConfiguration =
- (ArchivaConfiguration) lookup( ArchivaConfiguration.class, "test-save-user" );
+ (ArchivaConfiguration) lookup( ArchivaConfiguration.class, "test-save-user-fallback" );
archivaConfiguration.reload();
@@ -796,6 +796,8 @@ public class ArchivaConfigurationTest
ArchivaConfiguration archivaConfiguration =
(ArchivaConfiguration) lookup( ArchivaConfiguration.class, "test-remove-central" );
+ archivaConfiguration.reload();
+
Configuration configuration = archivaConfiguration.getConfiguration();
RepositoryGroupConfiguration repositoryGroup =
Modified: archiva/trunk/archiva-modules/archiva-base/archiva-configuration/src/test/resources/spring-context.xml
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-base/archiva-configuration/src/test/resources/spring-context.xml?rev=1125645&r1=1125644&r2=1125645&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-base/archiva-configuration/src/test/resources/spring-context.xml (original)
+++ archiva/trunk/archiva-modules/archiva-base/archiva-configuration/src/test/resources/spring-context.xml Sat May 21 07:49:25 2011
@@ -128,6 +128,44 @@
</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>
@@ -137,9 +175,9 @@
<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>
]]>