diff options
| author | olivier lamy <olamy@apache.org> | 2017-08-15 21:12:08 +1000 |
|---|---|---|
| committer | olivier lamy <olamy@apache.org> | 2017-08-15 21:12:08 +1000 |
| commit | f72ff88c460fd60f3f73bf6327c7bed39b4c3de8 (patch) | |
| tree | 77f9b1bc4779297e7fbd07f1d89624e181b0a8f5 /archiva-modules/archiva-web | |
| parent | 2351414ee6698951bef41e8dee63b09a9754cf3f (diff) | |
| download | archiva-f72ff88c460fd60f3f73bf6327c7bed39b4c3de8.tar.gz archiva-f72ff88c460fd60f3f73bf6327c7bed39b4c3de8.zip | |
fixing some directories
Signed-off-by: olivier lamy <olamy@apache.org>
Diffstat (limited to 'archiva-modules/archiva-web')
| -rw-r--r-- | archiva-modules/archiva-web/archiva-webapp/pom.xml | 9 | ||||
| -rw-r--r-- | archiva-modules/archiva-web/archiva-webapp/src/main/resources/log4j2.xml | 6 | ||||
| -rw-r--r-- | archiva-modules/archiva-web/archiva-webapp/src/test/auto-admin-creation.properties (renamed from archiva-modules/archiva-web/archiva-webapp/src/test/tomcat/auto-admin-creation.properties) | 0 | ||||
| -rw-r--r-- | archiva-modules/archiva-web/archiva-webapp/src/test/jetty-env.xml (renamed from archiva-modules/archiva-web/archiva-webapp/src/test/jetty/jetty-env.xml) | 0 | ||||
| -rw-r--r-- | archiva-modules/archiva-web/archiva-webapp/src/test/log4j2-test.xml (renamed from archiva-modules/archiva-web/archiva-webapp/src/test/tomcat/log4j2-test.xml) | 0 |
5 files changed, 6 insertions, 9 deletions
diff --git a/archiva-modules/archiva-web/archiva-webapp/pom.xml b/archiva-modules/archiva-web/archiva-webapp/pom.xml index ce0cda9f8..13678bfd1 100644 --- a/archiva-modules/archiva-web/archiva-webapp/pom.xml +++ b/archiva-modules/archiva-web/archiva-webapp/pom.xml @@ -904,8 +904,7 @@ <webApp> <contextPath>/archiva</contextPath> </webApp> - <jettyXml>${basedir}/src/test/jetty/jetty-env.xml</jettyXml> - + <jettyXml>${basedir}/src/test/jetty-env.xml</jettyXml> <systemProperties> <systemProperty> <name>plexus.home</name> @@ -921,7 +920,7 @@ </systemProperty> <systemProperty> <name>derby.system.home</name> - <value>${archivaAppServerBase}/logs</value> + <value>${archivaAppServerBase}/database</value> </systemProperty> <systemProperty> <name>java.io.tmpdir</name> @@ -956,6 +955,10 @@ <value>${archiva.repositorySessionFactory.id}</value> </systemProperty> <systemProperty> + <name>log4j.configurationFile</name> + <value>${basedir}/src/test/log4j2-test.xml</value> + </systemProperty> + <systemProperty> <name>AsyncLoggerConfig.WaitStrategy</name> <value>Block</value> </systemProperty> diff --git a/archiva-modules/archiva-web/archiva-webapp/src/main/resources/log4j2.xml b/archiva-modules/archiva-web/archiva-webapp/src/main/resources/log4j2.xml index f22ee0691..5496e442a 100644 --- a/archiva-modules/archiva-web/archiva-webapp/src/main/resources/log4j2.xml +++ b/archiva-modules/archiva-web/archiva-webapp/src/main/resources/log4j2.xml @@ -78,12 +78,6 @@ <logger name="org.quartz" level="info"/> - <logger name="org.apache.jasper" level="info"/> - - <logger name="com.opensymphony.xwork2" level="info"/> - - <logger name="org.apache.struts2" level="info"/> - --> <!-- WebDav objects --> diff --git a/archiva-modules/archiva-web/archiva-webapp/src/test/tomcat/auto-admin-creation.properties b/archiva-modules/archiva-web/archiva-webapp/src/test/auto-admin-creation.properties index 7c8c5815b..7c8c5815b 100644 --- a/archiva-modules/archiva-web/archiva-webapp/src/test/tomcat/auto-admin-creation.properties +++ b/archiva-modules/archiva-web/archiva-webapp/src/test/auto-admin-creation.properties diff --git a/archiva-modules/archiva-web/archiva-webapp/src/test/jetty/jetty-env.xml b/archiva-modules/archiva-web/archiva-webapp/src/test/jetty-env.xml index bed63bfa3..bed63bfa3 100644 --- a/archiva-modules/archiva-web/archiva-webapp/src/test/jetty/jetty-env.xml +++ b/archiva-modules/archiva-web/archiva-webapp/src/test/jetty-env.xml diff --git a/archiva-modules/archiva-web/archiva-webapp/src/test/tomcat/log4j2-test.xml b/archiva-modules/archiva-web/archiva-webapp/src/test/log4j2-test.xml index 55668911a..55668911a 100644 --- a/archiva-modules/archiva-web/archiva-webapp/src/test/tomcat/log4j2-test.xml +++ b/archiva-modules/archiva-web/archiva-webapp/src/test/log4j2-test.xml |