Author: olamy
Date: Tue Sep 13 14:07:24 2011
New Revision: 1170189
URL: http://svn.apache.org/viewvc?rev=1170189&view=rev
Log:
get RID of file ~/.m2/archiva.xml created during tests with a new sysprops to
use for tests
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-consumers/archiva-core-consumers/pom.xml
archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/test/resources/META-INF/spring-context.xml
archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/test/resources/spring-context-cleanup-released-snapshots.xml
archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/test/resources/spring-context-purge-consumer-test.xml
archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/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=1170189&r1=1170188&r2=1170189&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
Tue Sep 13 14:07:24 2011
@@ -94,7 +94,6 @@ public class DefaultArchivaConfiguration
/**
* Plexus registry to read the configuration from.
- *
*/
@Inject
@Named( value = "commons-configuration" )
@@ -495,7 +494,6 @@ public class DefaultArchivaConfiguration
}
}
-
new ConfigurationRegistryWriter().write( configuration, section );
section.save();
@@ -537,9 +535,8 @@ public class DefaultArchivaConfiguration
}
// olamy hackish I know :-)
- contents = "<configuration><xml fileName=\"" + fileLocation +"\"
config-forceCreate=\"true\" config-name=\"org.apache.maven.archiva.user\"/>"
- + "</configuration>";
-
+ contents = "<configuration><xml fileName=\"" + fileLocation
+ + "\" config-forceCreate=\"true\"
config-name=\"org.apache.maven.archiva.user\"/>" + "</configuration>";
( (CommonsConfigurationRegistry) registry ).setProperties( contents );
@@ -655,7 +652,15 @@ public class DefaultArchivaConfiguration
{
ExpressionEvaluator expressionEvaluator = new
DefaultExpressionEvaluator();
expressionEvaluator.addExpressionSource( new
SystemPropertyExpressionSource() );
- userConfigFilename = expressionEvaluator.expand(
userConfigFilename );
+ String userConfigFileNameSysProps = System.getProperty(
"archiva.user.configFileName" );
+ if ( StringUtils.isNotBlank( userConfigFileNameSysProps ) )
+ {
+ userConfigFilename = userConfigFileNameSysProps;
+ }
+ else
+ {
+ userConfigFilename = expressionEvaluator.expand(
userConfigFilename );
+ }
altConfigFilename = expressionEvaluator.expand( altConfigFilename
);
loadConfiguration();
}
@@ -720,8 +725,6 @@ public class DefaultArchivaConfiguration
c.setRefreshCronExpression( unescapeCronExpression(
c.getRefreshCronExpression() ) );
}
-
-
return config;
}
Modified:
archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/pom.xml
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/pom.xml?rev=1170189&r1=1170188&r2=1170189&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/pom.xml
(original)
+++
archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/pom.xml
Tue Sep 13 14:07:24 2011
@@ -115,6 +115,7 @@
<appserver.base>${basedir}/target/appserver-base</appserver.base>
<plexus.home>${project.build.outputDirectory}</plexus.home>
<java.io.tmpdir>${project.build.outputDirectory}</java.io.tmpdir>
+
<archiva.user.configFileName>${basedir}/target/archiva.xml</archiva.user.configFileName>
</systemPropertyVariables>
</configuration>
</plugin>
Modified:
archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/test/resources/META-INF/spring-context.xml
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/test/resources/META-INF/spring-context.xml?rev=1170189&r1=1170188&r2=1170189&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/test/resources/META-INF/spring-context.xml
(original)
+++
archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/test/resources/META-INF/spring-context.xml
Tue Sep 13 14:07:24 2011
@@ -38,4 +38,19 @@
</property>
</bean>
+ <bean name="commons-configuration"
class="org.codehaus.redback.components.registry.commons.CommonsConfigurationRegistry">
+ <property name="properties">
+ <value>
+ <![CDATA[
+ <configuration>
+ <system/>
+ <xml fileName="${appserver.base}/conf/archiva.xml"
config-forceCreate="true"
+ config-optional="true"
+ config-name="org.apache.maven.archiva.base"
config-at="org.apache.maven.archiva"/>
+ </configuration>
+ ]]>
+ </value>
+ </property>
+ </bean>
+
</beans>
\ No newline at end of file
Modified:
archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/test/resources/spring-context-cleanup-released-snapshots.xml
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/test/resources/spring-context-cleanup-released-snapshots.xml?rev=1170189&r1=1170188&r2=1170189&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/test/resources/spring-context-cleanup-released-snapshots.xml
(original)
+++
archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/test/resources/spring-context-cleanup-released-snapshots.xml
Tue Sep 13 14:07:24 2011
@@ -50,5 +50,19 @@
<property name="archivaConfiguration"
ref="archivaConfiguration#cleanup-released-snapshots"/>
</bean>
+ <bean name="commons-configuration"
class="org.codehaus.redback.components.registry.commons.CommonsConfigurationRegistry">
+ <property name="properties">
+ <value>
+ <![CDATA[
+ <configuration>
+ <system/>
+ <xml fileName="${appserver.base}/conf/archiva.xml"
config-forceCreate="true"
+ config-optional="true"
+ config-name="org.apache.maven.archiva.base"
config-at="org.apache.maven.archiva"/>
+ </configuration>
+ ]]>
+ </value>
+ </property>
+ </bean>
</beans>
\ No newline at end of file
Modified:
archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/test/resources/spring-context-purge-consumer-test.xml
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/test/resources/spring-context-purge-consumer-test.xml?rev=1170189&r1=1170188&r2=1170189&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/test/resources/spring-context-purge-consumer-test.xml
(original)
+++
archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/test/resources/spring-context-purge-consumer-test.xml
Tue Sep 13 14:07:24 2011
@@ -100,5 +100,20 @@
<property name="archivaConfiguration" ref="archivaConfiguration#days-old"/>
</bean>
+ <bean name="commons-configuration"
class="org.codehaus.redback.components.registry.commons.CommonsConfigurationRegistry">
+ <property name="properties">
+ <value>
+ <![CDATA[
+ <configuration>
+ <system/>
+ <xml fileName="${appserver.base}/conf/archiva.xml"
config-forceCreate="true"
+ config-optional="true"
+ config-name="org.apache.maven.archiva.base"
config-at="org.apache.maven.archiva"/>
+ </configuration>
+ ]]>
+ </value>
+ </property>
+ </bean>
+
</beans>
\ No newline at end of file
Modified:
archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/test/resources/spring-context.xml
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/test/resources/spring-context.xml?rev=1170189&r1=1170188&r2=1170189&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/test/resources/spring-context.xml
(original)
+++
archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/test/resources/spring-context.xml
Tue Sep 13 14:07:24 2011
@@ -29,4 +29,19 @@
<context:annotation-config/>
<context:component-scan
base-package="org.apache.archiva.metadata.repository"/>
+ <bean name="commons-configuration"
class="org.codehaus.redback.components.registry.commons.CommonsConfigurationRegistry">
+ <property name="properties">
+ <value>
+ <![CDATA[
+ <configuration>
+ <system/>
+ <xml fileName="${appserver.base}/conf/archiva.xml"
config-forceCreate="true"
+ config-optional="true"
+ config-name="org.apache.maven.archiva.base"
config-at="org.apache.maven.archiva"/>
+ </configuration>
+ ]]>
+ </value>
+ </property>
+ </bean>
+
</beans>
\ No newline at end of file
