From f72ff88c460fd60f3f73bf6327c7bed39b4c3de8 Mon Sep 17 00:00:00 2001 From: olivier lamy Date: Tue, 15 Aug 2017 21:12:08 +1000 Subject: [PATCH] fixing some directories Signed-off-by: olivier lamy --- .../default-repository/.indexer/_0.cfe | Bin 0 -> 299 bytes .../default-repository/.indexer/_0.cfs | Bin 0 -> 1053 bytes .../default-repository/.indexer/_0.si | Bin 0 -> 364 bytes .../default-repository/.indexer/segments_2 | Bin 0 -> 136 bytes .../default-repository/.indexer/write.lock | 0 .../archiva-web/archiva-webapp/pom.xml | 9 ++++++--- .../archiva-webapp/src/main/resources/log4j2.xml | 6 ------ .../{tomcat => }/auto-admin-creation.properties | 0 .../src/test/{jetty => }/jetty-env.xml | 0 .../src/test/{tomcat => }/log4j2-test.xml | 0 10 files changed, 6 insertions(+), 9 deletions(-) create mode 100644 archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/repositories/default-repository/.indexer/_0.cfe create mode 100644 archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/repositories/default-repository/.indexer/_0.cfs create mode 100644 archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/repositories/default-repository/.indexer/_0.si create mode 100644 archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/repositories/default-repository/.indexer/segments_2 create mode 100644 archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/repositories/default-repository/.indexer/write.lock rename archiva-modules/archiva-web/archiva-webapp/src/test/{tomcat => }/auto-admin-creation.properties (100%) rename archiva-modules/archiva-web/archiva-webapp/src/test/{jetty => }/jetty-env.xml (100%) rename archiva-modules/archiva-web/archiva-webapp/src/test/{tomcat => }/log4j2-test.xml (100%) diff --git a/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/repositories/default-repository/.indexer/_0.cfe b/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/repositories/default-repository/.indexer/_0.cfe new file mode 100644 index 0000000000000000000000000000000000000000..4ece53663cb89b93fd499454b7d15a237ec12968 GIT binary patch literal 299 zcmcD&o+B>qQ<|KbmuhO@oS$2eUz(TVnpaYknOe*M1fuDRpCdUvUL_v+zC+CL^*07i z{&<-3cmutZ{A7?SAkc$Q40$N>C7HQU@i|cX2#S0`KG+rp2F3)aydR5RURer+!?+GA zXw9ORmQn!~deQ<|KbmuhO@oS$2eUz(TVl30?+00g4xik~AnJzgaq`MyKU@bxzad!TAb znCgK1;*!j~^y2WM%#ze1m;7XGTDV}U;|-V;6q%G+SlQS)IJvlac=`AR1cih}M8(7< zB&DQfWaZ=!XiRDN0QZNiE7PcF9aG0m?F=y9~)1up^~m z)}lHRYzD}9Jo+0LnZ>#MQY%V}J@ZmhE0`D=nB#027#SFu9x*dAGBP2_Au&OQ0znV5 zAMS68<;N3ZK&OGU;Bg8AvT5zpz05$S2|~SQ?3WJ;5L{7(thHc$^Jb7%Sy-q9m*f|v zrnqIM=A;z6B^H-}eF}67Bf4W4fZhlC-3o{qqL7W;ndx{BWTY@^{J;#t7eOFx%x=LU zK>Ju37@3(LF@dZw2ZaR?_#)e)D&i0ZQZ9qb;ZW~my1Su)k%@tcN$LYP15zw;@EGbD z)Rd$amjtC2WDc@R6eWCpQ%e$4aD_3%#Xz#=KM?REn`RfWdL_s-A(+d- zf$f=>299)0_cC$0xCT21c?N{|2Qe@(Gk^>P0Vdgi)FQB6SW0#SMtfq3UK*I{SOQBYR-=#J4s8Zq!;I literal 0 HcmV?d00001 diff --git a/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/repositories/default-repository/.indexer/_0.si b/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/repositories/default-repository/.indexer/_0.si new file mode 100644 index 0000000000000000000000000000000000000000..84e9c5aaff79dbb4d5f1fc45519b4f1b486392be GIT binary patch literal 364 zcmcD&o+B>oQ<|KbmuhMdoSL4SnpfhPmzK}Kz`!V)uJ}2U)8kd*k?%Xi3}1f(iZQT4 zF$+imBNtPCF^6wrvVwoGLIihKVp*bIS!!NNevy!WQDSmVs)BQVQ9*uDVo7Fx9uHKy zs2IrMG}N=uGl(}dGUSH{=K?i?Ww?w?^?<^%PB3+-~wug+Qe>X0JKTZj1#1_ zxFj*RfY;E}z{uRv(7?pf+}x0vE#5#cIW3hHNEK&7IK_* k%1tcM%gs+o<#KWj4v7yAaCLP#pfULcD9k`$j*L_q0IMi%y#N3J literal 0 HcmV?d00001 diff --git a/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/repositories/default-repository/.indexer/segments_2 b/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/repositories/default-repository/.indexer/segments_2 new file mode 100644 index 0000000000000000000000000000000000000000..3d64213c63f60d8c64f70bd168e87406f5ab44fc GIT binary patch literal 136 zcmcD&o+HjtoSL4SnpaZHz`(#Jny&aclGEc=;*sw=#0+15XEb7EWdTZn04oqPf-q2s sDc*n)P3<=hpVH*iyi`+@|4;zZ1Y^T!kQf8Q0gcHoAS?!kgn;Xc0FWy*_W%F@ literal 0 HcmV?d00001 diff --git a/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/repositories/default-repository/.indexer/write.lock b/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/repositories/default-repository/.indexer/write.lock new file mode 100644 index 000000000..e69de29bb 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 @@ /archiva - ${basedir}/src/test/jetty/jetty-env.xml - + ${basedir}/src/test/jetty-env.xml plexus.home @@ -921,7 +920,7 @@ derby.system.home - ${archivaAppServerBase}/logs + ${archivaAppServerBase}/database java.io.tmpdir @@ -955,6 +954,10 @@ archiva.repositorySessionFactory.id ${archiva.repositorySessionFactory.id} + + log4j.configurationFile + ${basedir}/src/test/log4j2-test.xml + AsyncLoggerConfig.WaitStrategy Block 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 @@ - - - - - - --> 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 similarity index 100% rename from archiva-modules/archiva-web/archiva-webapp/src/test/tomcat/auto-admin-creation.properties rename to 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 similarity index 100% rename from archiva-modules/archiva-web/archiva-webapp/src/test/jetty/jetty-env.xml rename to 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 similarity index 100% rename from archiva-modules/archiva-web/archiva-webapp/src/test/tomcat/log4j2-test.xml rename to archiva-modules/archiva-web/archiva-webapp/src/test/log4j2-test.xml -- 2.39.5