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

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 08c3752ed911b13dc254d8ec90a54ec12b65c8b0..9ce039c2f8643f20cbedde9eb1ed48382799fba2 100644 (file)
--- 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 57b2c54c2c97cce8d9661d34f8c65dfe1fcc316c..e042a41fd702c125366c7b386b820ae6e474da90 100644 (file)
--- 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"/>