diff options
| author | Brett Porter <brett@apache.org> | 2011-11-14 05:01:18 +0000 |
|---|---|---|
| committer | Brett Porter <brett@apache.org> | 2011-11-14 05:01:18 +0000 |
| commit | 9b4e61dee76a9e4108b820dc27cddb8286d1ba1c (patch) | |
| tree | 566bb6e6e8404267c85d11ee07d2e35111259a17 | |
| parent | 292066e3bbe2fd8d8dfbc54ba703577f90a25248 (diff) | |
| download | archiva-9b4e61dee76a9e4108b820dc27cddb8286d1ba1c.tar.gz archiva-9b4e61dee76a9e4108b820dc27cddb8286d1ba1c.zip | |
alter again to store cache files in a different directory
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1201601 13f79535-47bb-0310-9956-ffa450edef68
2 files changed, 2 insertions, 16 deletions
diff --git a/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-archetype/src/main/resources/archetype-resources/pom.xml b/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-archetype/src/main/resources/archetype-resources/pom.xml index 08c3752ed..9ce039c2f 100644 --- a/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-archetype/src/main/resources/archetype-resources/pom.xml +++ b/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-archetype/src/main/resources/archetype-resources/pom.xml @@ -148,10 +148,11 @@ <configuration> <systemPropertyVariables> <appserver.base>${project.build.directory}/appserver-base</appserver.base> - <archiva.user.configFileName>${basedir}/target/archiva.xml</archiva.user.configFileName> + <archiva.user.configFileName>${project.build.directory}/archiva.xml</archiva.user.configFileName> <test.resources.path>${project.build.testOutputDirectory}</test.resources.path> <redback.jdbc.url>jdbc:derby:memory:users-test;create=true</redback.jdbc.url> <redback.jdbc.driver.name>org.apache.derby.jdbc.EmbeddedDriver</redback.jdbc.driver.name> + <java.io.tmpdir>${project.build.directory}/temp</java.io.tmpdir> </systemPropertyVariables> </configuration> </plugin> diff --git a/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-archetype/src/main/resources/archetype-resources/src/test/resources/spring-context.xml b/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-archetype/src/main/resources/archetype-resources/src/test/resources/spring-context.xml index 57b2c54c2..e042a41fd 100644 --- a/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-archetype/src/main/resources/archetype-resources/src/test/resources/spring-context.xml +++ b/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-archetype/src/main/resources/archetype-resources/src/test/resources/spring-context.xml @@ -29,21 +29,6 @@ <context:annotation-config/> <context:component-scan base-package="$package"/> - <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.archiva.base" config-at="org.apache.archiva"/> - </configuration> - ]]> - </value> - </property> - </bean> - <bean id="jcr-config" class="org.apache.archiva.metadata.repository.jcr.ArchivaJcrRepositoryConfig" factory-method="create"> <constructor-arg value="${appserver.base}/conf/foo.xml"/> <constructor-arg value="${appserver.base}/data/jcr"/> |