git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1170189 13f79535-47bb-0310-9956-ffa450edef68tags/archiva-1.4-M1
@@ -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; | |||
} | |||
@@ -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> |
@@ -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> |
@@ -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> |
@@ -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> |
@@ -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> |