Apache
/
archiva
mirror of https://github.com/apache/archiva.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

don't write configuration to ~/.m2/archiva.xml 

git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1162658 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Brett Porter 2011-08-29 07:07:07 +00:00
parent 66d063c736
commit a2ca0a36fb
2 changed files with 23 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
archiva-modules/archiva-web/archiva-rest/archiva-rest-services/pom.xml
View File

@ -213,6 +213,7 @@
<configuration> <configuration>
<systemPropertyVariables> <systemPropertyVariables>
<plexus.home>${project.build.outputDirectory}</plexus.home> <plexus.home>${project.build.outputDirectory}</plexus.home>
<appserver.base>${basedir}/target/appserver-base</appserver.base>
</systemPropertyVariables> </systemPropertyVariables>
</configuration> </configuration>
</plugin> </plugin>

22
archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/resources/META-INF/spring-context-test.xml
View File

@ -34,4 +34,26 @@
</props> </props>
</property> </property>
</bean> </bean>
<!-- wire up more basic configuration so it doesn't overwrite any config files -->
<bean name="archivaConfiguration#default" class="org.apache.maven.archiva.configuration.DefaultArchivaConfiguration">
<property name="registry" ref="registry#default"/>
</bean>
<alias name="archivaConfiguration#default" alias="archivaConfiguration"/>
<bean name="registry#default" 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> </beans>