FLUME-2050 Upgrade to Log4j 2
Project: http://git-wip-us.apache.org/repos/asf/flume/repo Commit: http://git-wip-us.apache.org/repos/asf/flume/commit/140ea5d2 Tree: http://git-wip-us.apache.org/repos/asf/flume/tree/140ea5d2 Diff: http://git-wip-us.apache.org/repos/asf/flume/diff/140ea5d2 Branch: refs/heads/trunk Commit: 140ea5d2808b7f6fce496e5e2d175821f302f25b Parents: e4312ad Author: Ralph Goers <[email protected]> Authored: Thu Nov 2 23:01:58 2017 -0700 Committer: Ralph Goers <[email protected]> Committed: Thu Nov 2 23:01:58 2017 -0700 ---------------------------------------------------------------------- conf/log4j.properties | 68 ---------------- conf/log4j2.xml | 56 +++++++++++++ flume-ng-auth/pom.xml | 19 ++++- flume-ng-channels/flume-file-channel/pom.xml | 28 ++++++- .../src/test/resources/log4j.properties | 25 ------ .../src/test/resources/log4j2.xml | 30 +++++++ flume-ng-channels/flume-jdbc-channel/pom.xml | 22 +++++- flume-ng-channels/flume-kafka-channel/pom.xml | 10 +++ .../src/test/resources/log4j.properties | 78 ------------------- .../src/test/resources/log4j2.xml | 72 +++++++++++++++++ .../flume-spillable-memory-channel/pom.xml | 22 +++++- flume-ng-clients/flume-ng-log4jappender/pom.xml | 1 + flume-ng-configuration/pom.xml | 19 ++++- flume-ng-core/pom.xml | 13 +++- .../src/test/resources/log4j.properties | 24 ------ flume-ng-core/src/test/resources/log4j2.xml | 31 ++++++++ flume-ng-dist/pom.xml | 12 +++ flume-ng-embedded-agent/pom.xml | 16 +++- .../src/test/resources/log4j.properties | 24 ------ .../src/test/resources/log4j2.xml | 31 ++++++++ .../flume-avro-source/pom.xml | 22 +++++- .../flume-thrift-source/pom.xml | 22 +++++- .../src/test/resources/log4j.properties | 25 ------ .../src/test/resources/log4j2.xml | 31 ++++++++ flume-ng-node/pom.xml | 18 +++-- .../src/test/resources/log4j.properties | 24 ------ flume-ng-node/src/test/resources/log4j2.xml | 31 ++++++++ flume-ng-sdk/pom.xml | 25 +++++- .../src/test/resources/log4j.properties | 24 ------ flume-ng-sdk/src/test/resources/log4j2.xml | 31 ++++++++ flume-ng-sinks/flume-dataset-sink/pom.xml | 22 +++++- flume-ng-sinks/flume-hdfs-sink/pom.xml | 22 +++++- .../src/test/resources/log4j.properties | 26 ------- .../src/test/resources/log4j2.xml | 33 ++++++++ .../metastore_db/README_DO_NOT_TOUCH_FILES.txt | 9 +++ .../flume-hive-sink/metastore_db/db.lck | Bin 0 -> 38 bytes .../flume-hive-sink/metastore_db/dbex.lck | Bin 0 -> 4 bytes .../log/README_DO_NOT_TOUCH_FILES.txt | 8 ++ .../flume-hive-sink/metastore_db/log/log.ctrl | Bin 0 -> 48 bytes .../flume-hive-sink/metastore_db/log/log10.dat | Bin 0 -> 1048658 bytes .../flume-hive-sink/metastore_db/log/log11.dat | Bin 0 -> 1048576 bytes .../metastore_db/log/logmirror.ctrl | Bin 0 -> 48 bytes .../seg0/README_DO_NOT_TOUCH_FILES.txt | 8 ++ .../flume-hive-sink/metastore_db/seg0/c10.dat | Bin 0 -> 8192 bytes .../flume-hive-sink/metastore_db/seg0/c101.dat | Bin 0 -> 16384 bytes .../flume-hive-sink/metastore_db/seg0/c111.dat | Bin 0 -> 20480 bytes .../flume-hive-sink/metastore_db/seg0/c121.dat | Bin 0 -> 16384 bytes .../flume-hive-sink/metastore_db/seg0/c130.dat | Bin 0 -> 16384 bytes .../flume-hive-sink/metastore_db/seg0/c141.dat | Bin 0 -> 8192 bytes .../flume-hive-sink/metastore_db/seg0/c150.dat | Bin 0 -> 28672 bytes .../flume-hive-sink/metastore_db/seg0/c161.dat | Bin 0 -> 20480 bytes .../flume-hive-sink/metastore_db/seg0/c171.dat | Bin 0 -> 20480 bytes .../flume-hive-sink/metastore_db/seg0/c180.dat | Bin 0 -> 73728 bytes .../flume-hive-sink/metastore_db/seg0/c191.dat | Bin 0 -> 16384 bytes .../flume-hive-sink/metastore_db/seg0/c1a1.dat | Bin 0 -> 16384 bytes .../flume-hive-sink/metastore_db/seg0/c1b1.dat | Bin 0 -> 16384 bytes .../flume-hive-sink/metastore_db/seg0/c1c0.dat | Bin 0 -> 8192 bytes .../flume-hive-sink/metastore_db/seg0/c1d1.dat | Bin 0 -> 8192 bytes .../flume-hive-sink/metastore_db/seg0/c1e0.dat | Bin 0 -> 8192 bytes .../flume-hive-sink/metastore_db/seg0/c1f1.dat | Bin 0 -> 8192 bytes .../flume-hive-sink/metastore_db/seg0/c20.dat | Bin 0 -> 102400 bytes .../flume-hive-sink/metastore_db/seg0/c200.dat | Bin 0 -> 16384 bytes .../flume-hive-sink/metastore_db/seg0/c211.dat | Bin 0 -> 8192 bytes .../flume-hive-sink/metastore_db/seg0/c221.dat | Bin 0 -> 8192 bytes .../flume-hive-sink/metastore_db/seg0/c230.dat | Bin 0 -> 319488 bytes .../flume-hive-sink/metastore_db/seg0/c241.dat | Bin 0 -> 8192 bytes .../flume-hive-sink/metastore_db/seg0/c251.dat | Bin 0 -> 20480 bytes .../flume-hive-sink/metastore_db/seg0/c260.dat | Bin 0 -> 8192 bytes .../flume-hive-sink/metastore_db/seg0/c271.dat | Bin 0 -> 8192 bytes .../flume-hive-sink/metastore_db/seg0/c281.dat | Bin 0 -> 8192 bytes .../flume-hive-sink/metastore_db/seg0/c290.dat | Bin 0 -> 8192 bytes .../flume-hive-sink/metastore_db/seg0/c2a1.dat | Bin 0 -> 8192 bytes .../flume-hive-sink/metastore_db/seg0/c2b1.dat | Bin 0 -> 8192 bytes .../flume-hive-sink/metastore_db/seg0/c2c1.dat | Bin 0 -> 8192 bytes .../flume-hive-sink/metastore_db/seg0/c2d0.dat | Bin 0 -> 8192 bytes .../flume-hive-sink/metastore_db/seg0/c2e1.dat | Bin 0 -> 8192 bytes .../flume-hive-sink/metastore_db/seg0/c2f0.dat | Bin 0 -> 8192 bytes .../flume-hive-sink/metastore_db/seg0/c300.dat | Bin 0 -> 8192 bytes .../flume-hive-sink/metastore_db/seg0/c31.dat | Bin 0 -> 28672 bytes .../flume-hive-sink/metastore_db/seg0/c311.dat | Bin 0 -> 8192 bytes .../flume-hive-sink/metastore_db/seg0/c321.dat | Bin 0 -> 8192 bytes .../flume-hive-sink/metastore_db/seg0/c331.dat | Bin 0 -> 8192 bytes .../flume-hive-sink/metastore_db/seg0/c340.dat | Bin 0 -> 8192 bytes .../flume-hive-sink/metastore_db/seg0/c351.dat | Bin 0 -> 8192 bytes .../flume-hive-sink/metastore_db/seg0/c3570.dat | Bin 0 -> 8192 bytes .../flume-hive-sink/metastore_db/seg0/c3581.dat | Bin 0 -> 8192 bytes .../flume-hive-sink/metastore_db/seg0/c3590.dat | Bin 0 -> 8192 bytes .../flume-hive-sink/metastore_db/seg0/c35a1.dat | Bin 0 -> 8192 bytes .../flume-hive-sink/metastore_db/seg0/c35b0.dat | Bin 0 -> 8192 bytes .../flume-hive-sink/metastore_db/seg0/c35c0.dat | Bin 0 -> 8192 bytes .../flume-hive-sink/metastore_db/seg0/c35d0.dat | Bin 0 -> 8192 bytes .../flume-hive-sink/metastore_db/seg0/c35e1.dat | Bin 0 -> 8192 bytes .../flume-hive-sink/metastore_db/seg0/c35f1.dat | Bin 0 -> 8192 bytes .../flume-hive-sink/metastore_db/seg0/c3600.dat | Bin 0 -> 8192 bytes .../flume-hive-sink/metastore_db/seg0/c361.dat | Bin 0 -> 8192 bytes .../flume-hive-sink/metastore_db/seg0/c3610.dat | Bin 0 -> 8192 bytes .../flume-hive-sink/metastore_db/seg0/c3621.dat | Bin 0 -> 8192 bytes .../flume-hive-sink/metastore_db/seg0/c3630.dat | Bin 0 -> 8192 bytes .../flume-hive-sink/metastore_db/seg0/c371.dat | Bin 0 -> 8192 bytes .../flume-hive-sink/metastore_db/seg0/c380.dat | Bin 0 -> 8192 bytes .../flume-hive-sink/metastore_db/seg0/c391.dat | Bin 0 -> 8192 bytes .../flume-hive-sink/metastore_db/seg0/c3a1.dat | Bin 0 -> 8192 bytes .../flume-hive-sink/metastore_db/seg0/c3b1.dat | Bin 0 -> 8192 bytes .../flume-hive-sink/metastore_db/seg0/c3c0.dat | Bin 0 -> 8192 bytes .../flume-hive-sink/metastore_db/seg0/c3d1.dat | Bin 0 -> 8192 bytes .../flume-hive-sink/metastore_db/seg0/c3e1.dat | Bin 0 -> 8192 bytes .../flume-hive-sink/metastore_db/seg0/c3f1.dat | Bin 0 -> 8192 bytes .../flume-hive-sink/metastore_db/seg0/c400.dat | Bin 0 -> 8192 bytes .../flume-hive-sink/metastore_db/seg0/c41.dat | Bin 0 -> 69632 bytes .../flume-hive-sink/metastore_db/seg0/c411.dat | Bin 0 -> 8192 bytes .../flume-hive-sink/metastore_db/seg0/c421.dat | Bin 0 -> 8192 bytes .../flume-hive-sink/metastore_db/seg0/c430.dat | Bin 0 -> 8192 bytes .../flume-hive-sink/metastore_db/seg0/c441.dat | Bin 0 -> 8192 bytes .../flume-hive-sink/metastore_db/seg0/c451.dat | Bin 0 -> 8192 bytes .../flume-hive-sink/metastore_db/seg0/c461.dat | Bin 0 -> 8192 bytes .../flume-hive-sink/metastore_db/seg0/c470.dat | Bin 0 -> 8192 bytes .../flume-hive-sink/metastore_db/seg0/c481.dat | Bin 0 -> 8192 bytes .../flume-hive-sink/metastore_db/seg0/c51.dat | Bin 0 -> 28672 bytes .../flume-hive-sink/metastore_db/seg0/c560.dat | Bin 0 -> 98304 bytes .../flume-hive-sink/metastore_db/seg0/c571.dat | Bin 0 -> 8192 bytes .../flume-hive-sink/metastore_db/seg0/c580.dat | Bin 0 -> 65536 bytes .../flume-hive-sink/metastore_db/seg0/c591.dat | Bin 0 -> 8192 bytes .../flume-hive-sink/metastore_db/seg0/c5a1.dat | Bin 0 -> 8192 bytes .../flume-hive-sink/metastore_db/seg0/c5b1.dat | Bin 0 -> 8192 bytes .../flume-hive-sink/metastore_db/seg0/c5c0.dat | Bin 0 -> 16384 bytes .../flume-hive-sink/metastore_db/seg0/c5d1.dat | Bin 0 -> 8192 bytes .../flume-hive-sink/metastore_db/seg0/c5e0.dat | Bin 0 -> 98304 bytes .../flume-hive-sink/metastore_db/seg0/c5f1.dat | Bin 0 -> 8192 bytes .../flume-hive-sink/metastore_db/seg0/c60.dat | Bin 0 -> 16384 bytes .../flume-hive-sink/metastore_db/seg0/c600.dat | Bin 0 -> 131072 bytes .../flume-hive-sink/metastore_db/seg0/c611.dat | Bin 0 -> 8192 bytes .../flume-hive-sink/metastore_db/seg0/c620.dat | Bin 0 -> 8192 bytes .../flume-hive-sink/metastore_db/seg0/c631.dat | Bin 0 -> 8192 bytes .../flume-hive-sink/metastore_db/seg0/c640.dat | Bin 0 -> 98304 bytes .../flume-hive-sink/metastore_db/seg0/c651.dat | Bin 0 -> 8192 bytes .../flume-hive-sink/metastore_db/seg0/c660.dat | Bin 0 -> 8192 bytes .../flume-hive-sink/metastore_db/seg0/c671.dat | Bin 0 -> 8192 bytes .../flume-hive-sink/metastore_db/seg0/c680.dat | Bin 0 -> 8192 bytes .../flume-hive-sink/metastore_db/seg0/c691.dat | Bin 0 -> 8192 bytes .../flume-hive-sink/metastore_db/seg0/c6a0.dat | Bin 0 -> 65536 bytes .../flume-hive-sink/metastore_db/seg0/c6b1.dat | Bin 0 -> 8192 bytes .../flume-hive-sink/metastore_db/seg0/c6c0.dat | Bin 0 -> 12288 bytes .../flume-hive-sink/metastore_db/seg0/c6d1.dat | Bin 0 -> 8192 bytes .../flume-hive-sink/metastore_db/seg0/c6e0.dat | Bin 0 -> 98304 bytes .../flume-hive-sink/metastore_db/seg0/c6f1.dat | Bin 0 -> 8192 bytes .../flume-hive-sink/metastore_db/seg0/c700.dat | Bin 0 -> 65536 bytes .../flume-hive-sink/metastore_db/seg0/c71.dat | Bin 0 -> 16384 bytes .../flume-hive-sink/metastore_db/seg0/c711.dat | Bin 0 -> 8192 bytes .../flume-hive-sink/metastore_db/seg0/c720.dat | Bin 0 -> 8192 bytes .../flume-hive-sink/metastore_db/seg0/c731.dat | Bin 0 -> 8192 bytes .../flume-hive-sink/metastore_db/seg0/c740.dat | Bin 0 -> 98304 bytes .../flume-hive-sink/metastore_db/seg0/c751.dat | Bin 0 -> 8192 bytes .../flume-hive-sink/metastore_db/seg0/c760.dat | Bin 0 -> 8192 bytes .../flume-hive-sink/metastore_db/seg0/c771.dat | Bin 0 -> 8192 bytes .../flume-hive-sink/metastore_db/seg0/c780.dat | Bin 0 -> 8192 bytes .../flume-hive-sink/metastore_db/seg0/c791.dat | Bin 0 -> 8192 bytes .../flume-hive-sink/metastore_db/seg0/c7a0.dat | Bin 0 -> 98304 bytes .../flume-hive-sink/metastore_db/seg0/c7b1.dat | Bin 0 -> 8192 bytes .../flume-hive-sink/metastore_db/seg0/c7c0.dat | Bin 0 -> 98304 bytes .../flume-hive-sink/metastore_db/seg0/c7d1.dat | Bin 0 -> 8192 bytes .../flume-hive-sink/metastore_db/seg0/c7e1.dat | Bin 0 -> 8192 bytes .../flume-hive-sink/metastore_db/seg0/c7f1.dat | Bin 0 -> 8192 bytes .../flume-hive-sink/metastore_db/seg0/c801.dat | Bin 0 -> 8192 bytes .../flume-hive-sink/metastore_db/seg0/c81.dat | Bin 0 -> 8192 bytes .../flume-hive-sink/metastore_db/seg0/c811.dat | Bin 0 -> 8192 bytes .../flume-hive-sink/metastore_db/seg0/c821.dat | Bin 0 -> 8192 bytes .../flume-hive-sink/metastore_db/seg0/c831.dat | Bin 0 -> 8192 bytes .../flume-hive-sink/metastore_db/seg0/c841.dat | Bin 0 -> 8192 bytes .../flume-hive-sink/metastore_db/seg0/c851.dat | Bin 0 -> 8192 bytes .../flume-hive-sink/metastore_db/seg0/c861.dat | Bin 0 -> 8192 bytes .../flume-hive-sink/metastore_db/seg0/c871.dat | Bin 0 -> 8192 bytes .../flume-hive-sink/metastore_db/seg0/c881.dat | Bin 0 -> 8192 bytes .../flume-hive-sink/metastore_db/seg0/c891.dat | Bin 0 -> 8192 bytes .../flume-hive-sink/metastore_db/seg0/c8a1.dat | Bin 0 -> 8192 bytes .../flume-hive-sink/metastore_db/seg0/c8b1.dat | Bin 0 -> 8192 bytes .../flume-hive-sink/metastore_db/seg0/c8c1.dat | Bin 0 -> 8192 bytes .../flume-hive-sink/metastore_db/seg0/c8d1.dat | Bin 0 -> 8192 bytes .../flume-hive-sink/metastore_db/seg0/c8e1.dat | Bin 0 -> 8192 bytes .../flume-hive-sink/metastore_db/seg0/c8f1.dat | Bin 0 -> 8192 bytes .../flume-hive-sink/metastore_db/seg0/c90.dat | Bin 0 -> 86016 bytes .../flume-hive-sink/metastore_db/seg0/c901.dat | Bin 0 -> 8192 bytes .../flume-hive-sink/metastore_db/seg0/c910.dat | Bin 0 -> 12288 bytes .../flume-hive-sink/metastore_db/seg0/c921.dat | Bin 0 -> 8192 bytes .../flume-hive-sink/metastore_db/seg0/c930.dat | Bin 0 -> 8192 bytes .../flume-hive-sink/metastore_db/seg0/c941.dat | Bin 0 -> 8192 bytes .../flume-hive-sink/metastore_db/seg0/c950.dat | Bin 0 -> 98304 bytes .../flume-hive-sink/metastore_db/seg0/c961.dat | Bin 0 -> 8192 bytes .../flume-hive-sink/metastore_db/seg0/c970.dat | Bin 0 -> 12288 bytes .../flume-hive-sink/metastore_db/seg0/c981.dat | Bin 0 -> 8192 bytes .../flume-hive-sink/metastore_db/seg0/c991.dat | Bin 0 -> 65536 bytes .../flume-hive-sink/metastore_db/seg0/c9a1.dat | Bin 0 -> 8192 bytes .../flume-hive-sink/metastore_db/seg0/c9b1.dat | Bin 0 -> 8192 bytes .../flume-hive-sink/metastore_db/seg0/c9c1.dat | Bin 0 -> 8192 bytes .../flume-hive-sink/metastore_db/seg0/c9d1.dat | Bin 0 -> 8192 bytes .../flume-hive-sink/metastore_db/seg0/c9e1.dat | Bin 0 -> 8192 bytes .../flume-hive-sink/metastore_db/seg0/c9f0.dat | Bin 0 -> 8192 bytes .../flume-hive-sink/metastore_db/seg0/ca01.dat | Bin 0 -> 8192 bytes .../flume-hive-sink/metastore_db/seg0/ca1.dat | Bin 0 -> 69632 bytes .../flume-hive-sink/metastore_db/seg0/ca10.dat | Bin 0 -> 8192 bytes .../flume-hive-sink/metastore_db/seg0/ca21.dat | Bin 0 -> 8192 bytes .../flume-hive-sink/metastore_db/seg0/ca30.dat | Bin 0 -> 8192 bytes .../flume-hive-sink/metastore_db/seg0/ca41.dat | Bin 0 -> 8192 bytes .../flume-hive-sink/metastore_db/seg0/ca51.dat | Bin 0 -> 8192 bytes .../flume-hive-sink/metastore_db/seg0/ca60.dat | Bin 0 -> 8192 bytes .../flume-hive-sink/metastore_db/seg0/ca71.dat | Bin 0 -> 8192 bytes .../flume-hive-sink/metastore_db/seg0/ca81.dat | Bin 0 -> 65536 bytes .../flume-hive-sink/metastore_db/seg0/ca90.dat | Bin 0 -> 65536 bytes .../flume-hive-sink/metastore_db/seg0/caa1.dat | Bin 0 -> 8192 bytes .../flume-hive-sink/metastore_db/seg0/cab0.dat | Bin 0 -> 65536 bytes .../flume-hive-sink/metastore_db/seg0/cac1.dat | Bin 0 -> 8192 bytes .../flume-hive-sink/metastore_db/seg0/cad1.dat | Bin 0 -> 8192 bytes .../flume-hive-sink/metastore_db/seg0/cae1.dat | Bin 0 -> 8192 bytes .../flume-hive-sink/metastore_db/seg0/caf1.dat | Bin 0 -> 8192 bytes .../flume-hive-sink/metastore_db/seg0/cb01.dat | Bin 0 -> 8192 bytes .../flume-hive-sink/metastore_db/seg0/cb1.dat | Bin 0 -> 16384 bytes .../flume-hive-sink/metastore_db/seg0/cb11.dat | Bin 0 -> 8192 bytes .../flume-hive-sink/metastore_db/seg0/cb20.dat | Bin 0 -> 8192 bytes .../flume-hive-sink/metastore_db/seg0/cb31.dat | Bin 0 -> 8192 bytes .../flume-hive-sink/metastore_db/seg0/cb41.dat | Bin 0 -> 8192 bytes .../flume-hive-sink/metastore_db/seg0/cb51.dat | Bin 0 -> 65536 bytes .../flume-hive-sink/metastore_db/seg0/cb60.dat | Bin 0 -> 8192 bytes .../flume-hive-sink/metastore_db/seg0/cb71.dat | Bin 0 -> 8192 bytes .../flume-hive-sink/metastore_db/seg0/cb81.dat | Bin 0 -> 65536 bytes .../flume-hive-sink/metastore_db/seg0/cb91.dat | Bin 0 -> 8192 bytes .../flume-hive-sink/metastore_db/seg0/cba0.dat | Bin 0 -> 8192 bytes .../flume-hive-sink/metastore_db/seg0/cbb1.dat | Bin 0 -> 8192 bytes .../flume-hive-sink/metastore_db/seg0/cbc1.dat | Bin 0 -> 65536 bytes .../flume-hive-sink/metastore_db/seg0/cbd1.dat | Bin 0 -> 8192 bytes .../flume-hive-sink/metastore_db/seg0/cbe0.dat | Bin 0 -> 8192 bytes .../flume-hive-sink/metastore_db/seg0/cbf1.dat | Bin 0 -> 8192 bytes .../flume-hive-sink/metastore_db/seg0/cc0.dat | Bin 0 -> 8192 bytes .../flume-hive-sink/metastore_db/seg0/cc01.dat | Bin 0 -> 65536 bytes .../flume-hive-sink/metastore_db/seg0/cc11.dat | Bin 0 -> 8192 bytes .../flume-hive-sink/metastore_db/seg0/cc20.dat | Bin 0 -> 65536 bytes .../flume-hive-sink/metastore_db/seg0/cc31.dat | Bin 0 -> 8192 bytes .../flume-hive-sink/metastore_db/seg0/cc40.dat | Bin 0 -> 65536 bytes .../flume-hive-sink/metastore_db/seg0/cc51.dat | Bin 0 -> 8192 bytes .../flume-hive-sink/metastore_db/seg0/cc61.dat | Bin 0 -> 8192 bytes .../flume-hive-sink/metastore_db/seg0/cc71.dat | Bin 0 -> 8192 bytes .../flume-hive-sink/metastore_db/seg0/cc81.dat | Bin 0 -> 8192 bytes .../flume-hive-sink/metastore_db/seg0/cc90.dat | Bin 0 -> 8192 bytes .../flume-hive-sink/metastore_db/seg0/cca1.dat | Bin 0 -> 8192 bytes .../flume-hive-sink/metastore_db/seg0/ccb1.dat | Bin 0 -> 8192 bytes .../flume-hive-sink/metastore_db/seg0/ccc1.dat | Bin 0 -> 65536 bytes .../flume-hive-sink/metastore_db/seg0/cd1.dat | Bin 0 -> 8192 bytes .../flume-hive-sink/metastore_db/seg0/ce1.dat | Bin 0 -> 8192 bytes .../flume-hive-sink/metastore_db/seg0/cf0.dat | Bin 0 -> 24576 bytes .../flume-hive-sink/metastore_db/seg0/d2ef0.dat | Bin 0 -> 4096 bytes .../flume-hive-sink/metastore_db/seg0/d2f01.dat | Bin 0 -> 4096 bytes .../flume-hive-sink/metastore_db/seg0/d2f10.dat | Bin 0 -> 4096 bytes .../flume-hive-sink/metastore_db/seg0/d2f21.dat | Bin 0 -> 4096 bytes .../flume-hive-sink/metastore_db/seg0/d2f30.dat | Bin 0 -> 4096 bytes .../flume-hive-sink/metastore_db/seg0/d2f40.dat | Bin 0 -> 4096 bytes .../flume-hive-sink/metastore_db/seg0/d2f50.dat | Bin 0 -> 4096 bytes .../flume-hive-sink/metastore_db/seg0/d2f61.dat | Bin 0 -> 4096 bytes .../flume-hive-sink/metastore_db/seg0/d2f71.dat | Bin 0 -> 4096 bytes .../flume-hive-sink/metastore_db/seg0/d2f80.dat | Bin 0 -> 4096 bytes .../flume-hive-sink/metastore_db/seg0/d2f90.dat | Bin 0 -> 4096 bytes .../flume-hive-sink/metastore_db/seg0/d2fa1.dat | Bin 0 -> 4096 bytes .../flume-hive-sink/metastore_db/seg0/d2fb0.dat | Bin 0 -> 4096 bytes .../flume-hive-sink/metastore_db/seg0/d2fc0.dat | Bin 0 -> 4096 bytes .../flume-hive-sink/metastore_db/seg0/d2fd1.dat | Bin 0 -> 4096 bytes .../flume-hive-sink/metastore_db/seg0/d2fe0.dat | Bin 0 -> 4096 bytes .../flume-hive-sink/metastore_db/seg0/d2ff1.dat | Bin 0 -> 4096 bytes .../flume-hive-sink/metastore_db/seg0/d3000.dat | Bin 0 -> 4096 bytes .../flume-hive-sink/metastore_db/seg0/d3010.dat | Bin 0 -> 4096 bytes .../flume-hive-sink/metastore_db/seg0/d3020.dat | Bin 0 -> 4096 bytes .../flume-hive-sink/metastore_db/seg0/d3031.dat | Bin 0 -> 4096 bytes .../flume-hive-sink/metastore_db/seg0/d3041.dat | Bin 0 -> 4096 bytes .../flume-hive-sink/metastore_db/seg0/d3050.dat | Bin 0 -> 4096 bytes .../flume-hive-sink/metastore_db/seg0/d3060.dat | Bin 0 -> 4096 bytes .../flume-hive-sink/metastore_db/seg0/d3071.dat | Bin 0 -> 4096 bytes .../flume-hive-sink/metastore_db/seg0/d3080.dat | Bin 0 -> 4096 bytes .../flume-hive-sink/metastore_db/seg0/d3090.dat | Bin 0 -> 4096 bytes .../flume-hive-sink/metastore_db/seg0/d30a1.dat | Bin 0 -> 4096 bytes .../flume-hive-sink/metastore_db/seg0/d30b0.dat | Bin 0 -> 4096 bytes .../flume-hive-sink/metastore_db/seg0/d30c1.dat | Bin 0 -> 4096 bytes .../flume-hive-sink/metastore_db/seg0/d30d0.dat | Bin 0 -> 4096 bytes .../flume-hive-sink/metastore_db/seg0/d30e0.dat | Bin 0 -> 4096 bytes .../flume-hive-sink/metastore_db/seg0/d30f0.dat | Bin 0 -> 4096 bytes .../flume-hive-sink/metastore_db/seg0/d3101.dat | Bin 0 -> 4096 bytes .../flume-hive-sink/metastore_db/seg0/d3111.dat | Bin 0 -> 4096 bytes .../flume-hive-sink/metastore_db/seg0/d3120.dat | Bin 0 -> 4096 bytes .../flume-hive-sink/metastore_db/seg0/d3130.dat | Bin 0 -> 4096 bytes .../flume-hive-sink/metastore_db/seg0/d3141.dat | Bin 0 -> 4096 bytes .../flume-hive-sink/metastore_db/seg0/d3150.dat | Bin 0 -> 4096 bytes .../flume-hive-sink/metastore_db/seg0/d3160.dat | Bin 0 -> 4096 bytes .../flume-hive-sink/metastore_db/seg0/d3171.dat | Bin 0 -> 4096 bytes .../flume-hive-sink/metastore_db/seg0/d3180.dat | Bin 0 -> 4096 bytes .../flume-hive-sink/metastore_db/seg0/d3191.dat | Bin 0 -> 4096 bytes .../flume-hive-sink/metastore_db/seg0/d31a0.dat | Bin 0 -> 4096 bytes .../flume-hive-sink/metastore_db/seg0/d31b0.dat | Bin 0 -> 4096 bytes .../flume-hive-sink/metastore_db/seg0/d31c0.dat | Bin 0 -> 4096 bytes .../flume-hive-sink/metastore_db/seg0/d31d1.dat | Bin 0 -> 4096 bytes .../flume-hive-sink/metastore_db/seg0/d31e1.dat | Bin 0 -> 4096 bytes .../flume-hive-sink/metastore_db/seg0/d31f0.dat | Bin 0 -> 4096 bytes .../flume-hive-sink/metastore_db/seg0/d3200.dat | Bin 0 -> 4096 bytes .../flume-hive-sink/metastore_db/seg0/d3211.dat | Bin 0 -> 4096 bytes .../flume-hive-sink/metastore_db/seg0/d3220.dat | Bin 0 -> 4096 bytes .../flume-hive-sink/metastore_db/seg0/d3230.dat | Bin 0 -> 4096 bytes .../flume-hive-sink/metastore_db/seg0/d3241.dat | Bin 0 -> 4096 bytes .../flume-hive-sink/metastore_db/seg0/d3250.dat | Bin 0 -> 4096 bytes .../flume-hive-sink/metastore_db/seg0/d3261.dat | Bin 0 -> 4096 bytes .../flume-hive-sink/metastore_db/seg0/d3270.dat | Bin 0 -> 4096 bytes .../flume-hive-sink/metastore_db/seg0/d3280.dat | Bin 0 -> 4096 bytes .../flume-hive-sink/metastore_db/seg0/d3290.dat | Bin 0 -> 4096 bytes .../flume-hive-sink/metastore_db/seg0/d32a1.dat | Bin 0 -> 4096 bytes .../flume-hive-sink/metastore_db/seg0/d32b1.dat | Bin 0 -> 4096 bytes .../flume-hive-sink/metastore_db/seg0/d32c0.dat | Bin 0 -> 4096 bytes .../flume-hive-sink/metastore_db/seg0/d32d0.dat | Bin 0 -> 4096 bytes .../flume-hive-sink/metastore_db/seg0/d32e1.dat | Bin 0 -> 4096 bytes .../flume-hive-sink/metastore_db/seg0/d32f0.dat | Bin 0 -> 4096 bytes .../flume-hive-sink/metastore_db/seg0/d3300.dat | Bin 0 -> 4096 bytes .../flume-hive-sink/metastore_db/seg0/d3311.dat | Bin 0 -> 4096 bytes .../flume-hive-sink/metastore_db/seg0/d3320.dat | Bin 0 -> 4096 bytes .../flume-hive-sink/metastore_db/seg0/d3331.dat | Bin 0 -> 4096 bytes .../flume-hive-sink/metastore_db/seg0/d3340.dat | Bin 0 -> 4096 bytes .../flume-hive-sink/metastore_db/seg0/d3350.dat | Bin 0 -> 4096 bytes .../flume-hive-sink/metastore_db/seg0/d3360.dat | Bin 0 -> 4096 bytes .../flume-hive-sink/metastore_db/seg0/d3371.dat | Bin 0 -> 4096 bytes .../flume-hive-sink/metastore_db/seg0/d3381.dat | Bin 0 -> 4096 bytes .../flume-hive-sink/metastore_db/seg0/d3390.dat | Bin 0 -> 4096 bytes .../flume-hive-sink/metastore_db/seg0/d33a0.dat | Bin 0 -> 4096 bytes .../flume-hive-sink/metastore_db/seg0/d33b1.dat | Bin 0 -> 4096 bytes .../flume-hive-sink/metastore_db/seg0/d33c0.dat | Bin 0 -> 4096 bytes .../flume-hive-sink/metastore_db/seg0/d33d0.dat | Bin 0 -> 4096 bytes .../flume-hive-sink/metastore_db/seg0/d33e1.dat | Bin 0 -> 4096 bytes .../flume-hive-sink/metastore_db/seg0/d33f0.dat | Bin 0 -> 4096 bytes .../flume-hive-sink/metastore_db/seg0/d3401.dat | Bin 0 -> 4096 bytes .../flume-hive-sink/metastore_db/seg0/d3410.dat | Bin 0 -> 4096 bytes .../flume-hive-sink/metastore_db/seg0/d3420.dat | Bin 0 -> 4096 bytes .../flume-hive-sink/metastore_db/seg0/d3430.dat | Bin 0 -> 4096 bytes .../flume-hive-sink/metastore_db/seg0/d3441.dat | Bin 0 -> 4096 bytes .../flume-hive-sink/metastore_db/seg0/d3451.dat | Bin 0 -> 4096 bytes .../flume-hive-sink/metastore_db/seg0/d3460.dat | Bin 0 -> 4096 bytes .../flume-hive-sink/metastore_db/seg0/d3470.dat | Bin 0 -> 4096 bytes .../flume-hive-sink/metastore_db/seg0/d3481.dat | Bin 0 -> 4096 bytes .../flume-hive-sink/metastore_db/seg0/d3490.dat | Bin 0 -> 4096 bytes .../flume-hive-sink/metastore_db/seg0/d34a0.dat | Bin 0 -> 4096 bytes .../flume-hive-sink/metastore_db/seg0/d34b1.dat | Bin 0 -> 4096 bytes .../flume-hive-sink/metastore_db/seg0/d34c0.dat | Bin 0 -> 4096 bytes .../flume-hive-sink/metastore_db/seg0/d34d1.dat | Bin 0 -> 4096 bytes .../flume-hive-sink/metastore_db/seg0/d34e0.dat | Bin 0 -> 4096 bytes .../flume-hive-sink/metastore_db/seg0/d34f0.dat | Bin 0 -> 4096 bytes .../flume-hive-sink/metastore_db/seg0/d3500.dat | Bin 0 -> 4096 bytes .../flume-hive-sink/metastore_db/seg0/d3511.dat | Bin 0 -> 4096 bytes .../flume-hive-sink/metastore_db/seg0/d3521.dat | Bin 0 -> 4096 bytes .../flume-hive-sink/metastore_db/seg0/d3530.dat | Bin 0 -> 4096 bytes .../flume-hive-sink/metastore_db/seg0/d3540.dat | Bin 0 -> 4096 bytes .../flume-hive-sink/metastore_db/seg0/d3551.dat | Bin 0 -> 4096 bytes .../flume-hive-sink/metastore_db/seg0/d3560.dat | Bin 0 -> 4096 bytes .../metastore_db/service.properties | 23 ++++++ flume-ng-sinks/flume-hive-sink/pom.xml | 22 +++++- .../src/test/resources/log4j.properties | 26 ------- .../src/test/resources/log4j2.xml | 33 ++++++++ flume-ng-sinks/flume-http-sink/pom.xml | 21 ++++- .../org/apache/flume/sink/http/HttpSink.java | 5 +- .../src/test/resources/log4j.properties | 28 ------- .../src/test/resources/log4j2.xml | 30 +++++++ flume-ng-sinks/flume-irc-sink/pom.xml | 22 +++++- .../flume-ng-elasticsearch-sink/pom.xml | 22 +++++- .../src/test/resources/log4j.properties | 25 ------ .../src/test/resources/log4j2.xml | 31 ++++++++ flume-ng-sinks/flume-ng-hbase-sink/pom.xml | 22 +++++- flume-ng-sinks/flume-ng-kafka-sink/pom.xml | 24 ++++++ .../src/test/resources/log4j.properties | 78 ------------------- .../src/test/resources/log4j2.xml | 72 +++++++++++++++++ .../flume-ng-morphline-solr-sink/pom.xml | 37 +++++++-- .../src/test/resources/log4j.properties | 34 -------- .../src/test/resources/log4j2.xml | 38 +++++++++ flume-ng-sources/flume-jms-source/pom.xml | 22 +++++- flume-ng-sources/flume-kafka-source/pom.xml | 6 ++ .../src/test/resources/log4j.properties | 25 ------ .../src/test/resources/log4j2.xml | 31 ++++++++ flume-ng-sources/flume-scribe-source/pom.xml | 22 +++++- .../src/test/resources/log4j.properties | 33 -------- .../src/test/resources/log4j2.xml | 37 +++++++++ flume-ng-tests/pom.xml | 24 +++++- .../src/test/resources/log4j.properties | 25 ------ flume-ng-tests/src/test/resources/log4j2.xml | 31 ++++++++ pom.xml | 45 +++++------ 381 files changed, 1203 insertions(+), 673 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/flume/blob/140ea5d2/conf/log4j.properties ---------------------------------------------------------------------- diff --git a/conf/log4j.properties b/conf/log4j.properties deleted file mode 100644 index c948bff..0000000 --- a/conf/log4j.properties +++ /dev/null @@ -1,68 +0,0 @@ -# -# Licensed to the Apache Software Foundation (ASF) under one -# or more contributor license agreements. See the NOTICE file -# distributed with this work for additional information -# regarding copyright ownership. The ASF licenses this file -# to you under the Apache License, Version 2.0 (the -# "License"); you may not use this file except in compliance -# with the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, -# software distributed under the License is distributed on an -# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the License for the -# specific language governing permissions and limitations -# under the License. -# - -# Define some default values that can be overridden by system properties. -# -# For testing, it may also be convenient to specify -# -Dflume.root.logger=DEBUG,console when launching flume. - -#flume.root.logger=DEBUG,console -flume.root.logger=INFO,LOGFILE -flume.log.dir=./logs -flume.log.file=flume.log - -log4j.logger.org.apache.flume.lifecycle = INFO -log4j.logger.org.jboss = WARN -log4j.logger.org.mortbay = INFO -log4j.logger.org.apache.avro.ipc.NettyTransceiver = WARN -log4j.logger.org.apache.hadoop = INFO -log4j.logger.org.apache.hadoop.hive = ERROR - -# Define the root logger to the system property "flume.root.logger". -log4j.rootLogger=${flume.root.logger} - - -# Stock log4j rolling file appender -# Default log rotation configuration -log4j.appender.LOGFILE=org.apache.log4j.RollingFileAppender -log4j.appender.LOGFILE.MaxFileSize=100MB -log4j.appender.LOGFILE.MaxBackupIndex=10 -log4j.appender.LOGFILE.File=${flume.log.dir}/${flume.log.file} -log4j.appender.LOGFILE.layout=org.apache.log4j.PatternLayout -log4j.appender.LOGFILE.layout.ConversionPattern=%d{dd MMM yyyy HH:mm:ss,SSS} %-5p [%t] (%C.%M:%L) %x - %m%n - - -# Warning: If you enable the following appender it will fill up your disk if you don't have a cleanup job! -# This uses the updated rolling file appender from log4j-extras that supports a reliable time-based rolling policy. -# See http://logging.apache.org/log4j/companions/extras/apidocs/org/apache/log4j/rolling/TimeBasedRollingPolicy.html -# Add "DAILY" to flume.root.logger above if you want to use this -log4j.appender.DAILY=org.apache.log4j.rolling.RollingFileAppender -log4j.appender.DAILY.rollingPolicy=org.apache.log4j.rolling.TimeBasedRollingPolicy -log4j.appender.DAILY.rollingPolicy.ActiveFileName=${flume.log.dir}/${flume.log.file} -log4j.appender.DAILY.rollingPolicy.FileNamePattern=${flume.log.dir}/${flume.log.file}.%d{yyyy-MM-dd} -log4j.appender.DAILY.layout=org.apache.log4j.PatternLayout -log4j.appender.DAILY.layout.ConversionPattern=%d{dd MMM yyyy HH:mm:ss,SSS} %-5p [%t] (%C.%M:%L) %x - %m%n - - -# console -# Add "console" to flume.root.logger above if you want to use this -log4j.appender.console=org.apache.log4j.ConsoleAppender -log4j.appender.console.target=System.err -log4j.appender.console.layout=org.apache.log4j.PatternLayout -log4j.appender.console.layout.ConversionPattern=%d (%t) [%p - %l] %m%n http://git-wip-us.apache.org/repos/asf/flume/blob/140ea5d2/conf/log4j2.xml ---------------------------------------------------------------------- diff --git a/conf/log4j2.xml b/conf/log4j2.xml new file mode 100644 index 0000000..5bc76cb --- /dev/null +++ b/conf/log4j2.xml @@ -0,0 +1,56 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + Licensed to the Apache Software Foundation (ASF) under one or more + contributor license agreements. See the NOTICE file distributed with + this work for additional information regarding copyright ownership. + The ASF licenses this file to You under the Apache License, Version 2.0 + (the "License"); you may not use this file except in compliance with + the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + +--> +<Configuration status="ERROR"> + <Properties> + <Property name="LOG_DIR">./logs</Property> + </Properties> + <Appenders> + <Console name="Console" target="SYSTEM_OUT"> + <PatternLayout pattern="%d (%t) [%p - %l] %m%n" /> + </Console> + <RollingFile name="LogFile" fileName="${LOG_DIR}/flume.log" filePattern="${LOG_DIR}/archive/flume.log.%d{yyyyMMdd}-%i"> + <PatternLayout pattern="%d{dd MMM yyyy HH:mm:ss,SSS} %-5p [%t] (%C.%M:%L) %x - %m%n" /> + <Policies> + <!-- Roll every night at midnight or when the file reaches 100MB --> + <SizeBasedTriggeringPolicy size="100 MB"/> + <CronTriggeringPolicy schedule="0 0 0 * * ?"/> + </Policies> + <DefaultRolloverStrategy min="1" max="20"> + <Delete basePath="${LOG_DIR}/archive"> + <!-- Nested conditions: the inner condition is only evaluated on files for which the outer conditions are true. --> + <IfFileName glob="flume.log.*"> + <!-- Only allow 1 GB of files to accumulate --> + <IfAccumulatedFileSize exceeds="1 GB"/> + </IfFileName> + </Delete> + </DefaultRolloverStrategy> + </RollingFile> + </Appenders> + + <Loggers> + <Logger name="org.apache.flume.lifecycle" level="info"/> + <Logger name="org.jboss" level="WARN"/> + <Logger name="org.apache.avro.ipc.NettyTransceiver" level="WARN"/> + <Logger name="org.apache.hadoop" level="INFO"/> + <Logger name="org.apache.hadoop.hive" level="ERROR"/> + <Root level="INFO"> + <AppenderRef ref="LogFile" /> + </Root> + </Loggers> +</Configuration> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/flume/blob/140ea5d2/flume-ng-auth/pom.xml ---------------------------------------------------------------------- diff --git a/flume-ng-auth/pom.xml b/flume-ng-auth/pom.xml index c7c682f..c74df09 100644 --- a/flume-ng-auth/pom.xml +++ b/flume-ng-auth/pom.xml @@ -57,8 +57,23 @@ limitations under the License. </dependency> <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-log4j12</artifactId> + <groupId>org.apache.logging.log4j</groupId> + <artifactId>log4j-api</artifactId> + </dependency> + + <dependency> + <groupId>org.apache.logging.log4j</groupId> + <artifactId>log4j-core</artifactId> + </dependency> + + <dependency> + <groupId>org.apache.logging.log4j</groupId> + <artifactId>log4j-slf4j-impl</artifactId> + </dependency> + + <dependency> + <groupId>org.apache.logging.log4j</groupId> + <artifactId>log4j-1.2-api</artifactId> </dependency> <dependency> http://git-wip-us.apache.org/repos/asf/flume/blob/140ea5d2/flume-ng-channels/flume-file-channel/pom.xml ---------------------------------------------------------------------- diff --git a/flume-ng-channels/flume-file-channel/pom.xml b/flume-ng-channels/flume-file-channel/pom.xml index 05da84d..6e580c9 100644 --- a/flume-ng-channels/flume-file-channel/pom.xml +++ b/flume-ng-channels/flume-file-channel/pom.xml @@ -91,8 +91,32 @@ </dependency> <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-log4j12</artifactId> + <groupId>org.apache.logging.log4j</groupId> + <artifactId>log4j-api</artifactId> + <scope>test</scope> + </dependency> + + <dependency> + <groupId>org.apache.logging.log4j</groupId> + <artifactId>log4j-core</artifactId> + <scope>test</scope> + </dependency> + + <dependency> + <groupId>org.apache.logging.log4j</groupId> + <artifactId>log4j-jcl</artifactId> + <scope>test</scope> + </dependency> + + <dependency> + <groupId>org.apache.logging.log4j</groupId> + <artifactId>log4j-slf4j-impl</artifactId> + <scope>test</scope> + </dependency> + + <dependency> + <groupId>org.apache.logging.log4j</groupId> + <artifactId>log4j-1.2-api</artifactId> <scope>test</scope> </dependency> http://git-wip-us.apache.org/repos/asf/flume/blob/140ea5d2/flume-ng-channels/flume-file-channel/src/test/resources/log4j.properties ---------------------------------------------------------------------- diff --git a/flume-ng-channels/flume-file-channel/src/test/resources/log4j.properties b/flume-ng-channels/flume-file-channel/src/test/resources/log4j.properties deleted file mode 100644 index 739ecc8..0000000 --- a/flume-ng-channels/flume-file-channel/src/test/resources/log4j.properties +++ /dev/null @@ -1,25 +0,0 @@ -# Licensed to the Apache Software Foundation (ASF) under one -# or more contributor license agreements. See the NOTICE file -# distributed with this work for additional information -# regarding copyright ownership. The ASF licenses this file -# to you under the Apache License, Version 2.0 (the -# "License"); you may not use this file except in compliance -# with the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, -# software distributed under the License is distributed on an -# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the License for the -# specific language governing permissions and limitations -# under the License. - - -log4j.rootLogger = INFO, out - -log4j.appender.out = org.apache.log4j.ConsoleAppender -log4j.appender.out.layout = org.apache.log4j.PatternLayout -log4j.appender.out.layout.ConversionPattern = %d (%t) [%p - %l] %m%n - -log4j.logger.org.apache.flume = DEBUG http://git-wip-us.apache.org/repos/asf/flume/blob/140ea5d2/flume-ng-channels/flume-file-channel/src/test/resources/log4j2.xml ---------------------------------------------------------------------- diff --git a/flume-ng-channels/flume-file-channel/src/test/resources/log4j2.xml b/flume-ng-channels/flume-file-channel/src/test/resources/log4j2.xml new file mode 100644 index 0000000..2aa49a4 --- /dev/null +++ b/flume-ng-channels/flume-file-channel/src/test/resources/log4j2.xml @@ -0,0 +1,30 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + Licensed to the Apache Software Foundation (ASF) under one or more + contributor license agreements. See the NOTICE file distributed with + this work for additional information regarding copyright ownership. + The ASF licenses this file to You under the Apache License, Version 2.0 + (the "License"); you may not use this file except in compliance with + the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + +--> +<Configuration status="OFF"> + <Appenders> + <Console name="Console" target="SYSTEM_OUT"> + <PatternLayout pattern="%d (%t) [%p - %l] %m%n" /> + </Console> + </Appenders> + <Loggers> + <Root level="INFO"> + <AppenderRef ref="Console" /> + </Root> + </Loggers> +</Configuration> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/flume/blob/140ea5d2/flume-ng-channels/flume-jdbc-channel/pom.xml ---------------------------------------------------------------------- diff --git a/flume-ng-channels/flume-jdbc-channel/pom.xml b/flume-ng-channels/flume-jdbc-channel/pom.xml index 7370aa4..16479a4 100644 --- a/flume-ng-channels/flume-jdbc-channel/pom.xml +++ b/flume-ng-channels/flume-jdbc-channel/pom.xml @@ -74,8 +74,26 @@ limitations under the License. <artifactId>derby</artifactId> </dependency> <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-log4j12</artifactId> + <groupId>org.apache.logging.log4j</groupId> + <artifactId>log4j-api</artifactId> + <scope>test</scope> + </dependency> + + <dependency> + <groupId>org.apache.logging.log4j</groupId> + <artifactId>log4j-core</artifactId> + <scope>test</scope> + </dependency> + + <dependency> + <groupId>org.apache.logging.log4j</groupId> + <artifactId>log4j-slf4j-impl</artifactId> + <scope>test</scope> + </dependency> + + <dependency> + <groupId>org.apache.logging.log4j</groupId> + <artifactId>log4j-1.2-api</artifactId> <scope>test</scope> </dependency> </dependencies> http://git-wip-us.apache.org/repos/asf/flume/blob/140ea5d2/flume-ng-channels/flume-kafka-channel/pom.xml ---------------------------------------------------------------------- diff --git a/flume-ng-channels/flume-kafka-channel/pom.xml b/flume-ng-channels/flume-kafka-channel/pom.xml index 6d513dc..912b04b 100644 --- a/flume-ng-channels/flume-kafka-channel/pom.xml +++ b/flume-ng-channels/flume-kafka-channel/pom.xml @@ -46,6 +46,16 @@ limitations under the License. <groupId>org.apache.kafka</groupId> <artifactId>kafka_2.10</artifactId> <version>${kafka.version}</version> + <exclusions> + <exclusion> + <groupId>log4j</groupId> + <artifactId>log4j</artifactId> + </exclusion> + <exclusion> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-log4j12</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>org.apache.kafka</groupId> http://git-wip-us.apache.org/repos/asf/flume/blob/140ea5d2/flume-ng-channels/flume-kafka-channel/src/test/resources/log4j.properties ---------------------------------------------------------------------- diff --git a/flume-ng-channels/flume-kafka-channel/src/test/resources/log4j.properties b/flume-ng-channels/flume-kafka-channel/src/test/resources/log4j.properties deleted file mode 100644 index b86600b..0000000 --- a/flume-ng-channels/flume-kafka-channel/src/test/resources/log4j.properties +++ /dev/null @@ -1,78 +0,0 @@ -# Licensed to the Apache Software Foundation (ASF) under one or more -# contributor license agreements. See the NOTICE file distributed with -# this work for additional information regarding copyright ownership. -# The ASF licenses this file to You under the Apache License, Version 2.0 -# (the "License"); you may not use this file except in compliance with -# the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -kafka.logs.dir=target/logs - -log4j.rootLogger=INFO, stdout - -log4j.appender.stdout=org.apache.log4j.ConsoleAppender -log4j.appender.stdout.layout=org.apache.log4j.PatternLayout -log4j.appender.stdout.layout.ConversionPattern=[%d] %p %m (%c)%n - -log4j.appender.kafkaAppender=org.apache.log4j.DailyRollingFileAppender -log4j.appender.kafkaAppender.DatePattern='.'yyyy-MM-dd-HH -log4j.appender.kafkaAppender.File=${kafka.logs.dir}/server.log -log4j.appender.kafkaAppender.layout=org.apache.log4j.PatternLayout -log4j.appender.kafkaAppender.layout.ConversionPattern=[%d] %p %m (%c)%n - -log4j.appender.stateChangeAppender=org.apache.log4j.DailyRollingFileAppender -log4j.appender.stateChangeAppender.DatePattern='.'yyyy-MM-dd-HH -log4j.appender.stateChangeAppender.File=${kafka.logs.dir}/state-change.log -log4j.appender.stateChangeAppender.layout=org.apache.log4j.PatternLayout -log4j.appender.stateChangeAppender.layout.ConversionPattern=[%d] %p %m (%c)%n - -log4j.appender.requestAppender=org.apache.log4j.DailyRollingFileAppender -log4j.appender.requestAppender.DatePattern='.'yyyy-MM-dd-HH -log4j.appender.requestAppender.File=${kafka.logs.dir}/kafka-request.log -log4j.appender.requestAppender.layout=org.apache.log4j.PatternLayout -log4j.appender.requestAppender.layout.ConversionPattern=[%d] %p %m (%c)%n - -log4j.appender.cleanerAppender=org.apache.log4j.DailyRollingFileAppender -log4j.appender.cleanerAppender.DatePattern='.'yyyy-MM-dd-HH -log4j.appender.cleanerAppender.File=${kafka.logs.dir}/log-cleaner.log -log4j.appender.cleanerAppender.layout=org.apache.log4j.PatternLayout -log4j.appender.cleanerAppender.layout.ConversionPattern=[%d] %p %m (%c)%n - -log4j.appender.controllerAppender=org.apache.log4j.DailyRollingFileAppender -log4j.appender.controllerAppender.DatePattern='.'yyyy-MM-dd-HH -log4j.appender.controllerAppender.File=${kafka.logs.dir}/controller.log -log4j.appender.controllerAppender.layout=org.apache.log4j.PatternLayout -log4j.appender.controllerAppender.layout.ConversionPattern=[%d] %p %m (%c)%n - -# Turn on all our debugging info -#log4j.logger.kafka.producer.async.DefaultEventHandler=DEBUG, kafkaAppender -#log4j.logger.kafka.client.ClientUtils=DEBUG, kafkaAppender -#log4j.logger.kafka.perf=DEBUG, kafkaAppender -#log4j.logger.kafka.perf.ProducerPerformance$ProducerThread=DEBUG, kafkaAppender -#log4j.logger.org.I0Itec.zkclient.ZkClient=DEBUG -log4j.logger.kafka=INFO, kafkaAppender - -log4j.logger.kafka.network.RequestChannel$=WARN, requestAppender -log4j.additivity.kafka.network.RequestChannel$=false - -#log4j.logger.kafka.network.Processor=TRACE, requestAppender -#log4j.logger.kafka.server.KafkaApis=TRACE, requestAppender -#log4j.additivity.kafka.server.KafkaApis=false -log4j.logger.kafka.request.logger=WARN, requestAppender -log4j.additivity.kafka.request.logger=false - -log4j.logger.kafka.controller=TRACE, controllerAppender -log4j.additivity.kafka.controller=false - -log4j.logger.kafka.log.LogCleaner=INFO, cleanerAppender -log4j.additivity.kafka.log.LogCleaner=false - -log4j.logger.state.change.logger=TRACE, stateChangeAppender -log4j.additivity.state.change.logger=false http://git-wip-us.apache.org/repos/asf/flume/blob/140ea5d2/flume-ng-channels/flume-kafka-channel/src/test/resources/log4j2.xml ---------------------------------------------------------------------- diff --git a/flume-ng-channels/flume-kafka-channel/src/test/resources/log4j2.xml b/flume-ng-channels/flume-kafka-channel/src/test/resources/log4j2.xml new file mode 100644 index 0000000..1263a38 --- /dev/null +++ b/flume-ng-channels/flume-kafka-channel/src/test/resources/log4j2.xml @@ -0,0 +1,72 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + Licensed to the Apache Software Foundation (ASF) under one or more + contributor license agreements. See the NOTICE file distributed with + this work for additional information regarding copyright ownership. + The ASF licenses this file to You under the Apache License, Version 2.0 + (the "License"); you may not use this file except in compliance with + the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + +--> +<Configuration status="OFF"> + <Properties> + <Property name="kafka.logs.dir">target/logs</Property> + </Properties> + <Appenders> + <Console name="Console" target="SYSTEM_OUT"> + <PatternLayout pattern="%d (%t) [%p - %l] %m%n" /> + </Console> + <RollingFile name="kafka" fileName="${kafka.logs.dir}/server.log"> + <PatternLayout pattern="[%d] %p %m (%c)%n" /> + <CronTriggeringPolicy schedule="0 0 0 * * ?"/> + </RollingFile> + <RollingFile name="stateChange" fileName="${kafka.logs.dir}/state-change.log"> + <PatternLayout pattern="[%d] %p %m (%c)%n" /> + <CronTriggeringPolicy schedule="0 0 0 * * ?"/> + </RollingFile> + <RollingFile name="request" fileName="${kafka.logs.dir}/kafka-request.log"> + <PatternLayout pattern="[%d] %p %m (%c)%n" /> + <CronTriggeringPolicy schedule="0 0 0 * * ?"/> + </RollingFile> + <RollingFile name="cleaner" fileName="${kafka.logs.dir}/log-cleaner.log"> + <PatternLayout pattern="[%d] %p %m (%c)%n" /> + <CronTriggeringPolicy schedule="0 0 0 * * ?"/> + </RollingFile> + <RollingFile name="controller" fileName="${kafka.logs.dir}/controller.log"> + <PatternLayout pattern="[%d] %p %m (%c)%n" /> + <CronTriggeringPolicy schedule="0 0 0 * * ?"/> + </RollingFile> + </Appenders> + + <Loggers> + <Logger name="kafka" level="info"> + <AppenderRef ref="kafka"/> + </Logger> + <Logger name="kafka.network.RequestChannel.*" level="WARN" additivity="false"> + <AppenderRef ref="request"/> + </Logger> + <Logger name="kafka.request.logger" level="WARN" additivity="false"> + <AppenderRef ref="request"/> + </Logger> + <Logger name="kafka.controller" level="TRACE" additivity="false"> + <AppenderRef ref="controller"/> + </Logger> + <Logger name="kafka.log.cleaner" level="INFO" additivity="false"> + <AppenderRef ref="cleaner"/> + </Logger> + <Logger name="state.change.logger" level="TRACE" additivity="false"> + <AppenderRef ref="stateChange"/> + </Logger> + <Root level="INFO"> + <AppenderRef ref="Console" /> + </Root> + </Loggers> +</Configuration> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/flume/blob/140ea5d2/flume-ng-channels/flume-spillable-memory-channel/pom.xml ---------------------------------------------------------------------- diff --git a/flume-ng-channels/flume-spillable-memory-channel/pom.xml b/flume-ng-channels/flume-spillable-memory-channel/pom.xml index e2ea393..29a3819 100644 --- a/flume-ng-channels/flume-spillable-memory-channel/pom.xml +++ b/flume-ng-channels/flume-spillable-memory-channel/pom.xml @@ -97,8 +97,26 @@ </dependency> <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-log4j12</artifactId> + <groupId>org.apache.logging.log4j</groupId> + <artifactId>log4j-api</artifactId> + <scope>test</scope> + </dependency> + + <dependency> + <groupId>org.apache.logging.log4j</groupId> + <artifactId>log4j-core</artifactId> + <scope>test</scope> + </dependency> + + <dependency> + <groupId>org.apache.logging.log4j</groupId> + <artifactId>log4j-slf4j-impl</artifactId> + <scope>test</scope> + </dependency> + + <dependency> + <groupId>org.apache.logging.log4j</groupId> + <artifactId>log4j-1.2-api</artifactId> <scope>test</scope> </dependency> http://git-wip-us.apache.org/repos/asf/flume/blob/140ea5d2/flume-ng-clients/flume-ng-log4jappender/pom.xml ---------------------------------------------------------------------- diff --git a/flume-ng-clients/flume-ng-log4jappender/pom.xml b/flume-ng-clients/flume-ng-log4jappender/pom.xml index 3731814..fc894f2 100644 --- a/flume-ng-clients/flume-ng-log4jappender/pom.xml +++ b/flume-ng-clients/flume-ng-log4jappender/pom.xml @@ -67,6 +67,7 @@ limitations under the License. <dependency> <groupId>log4j</groupId> <artifactId>log4j</artifactId> + <version>1.2.17</version> </dependency> <dependency> http://git-wip-us.apache.org/repos/asf/flume/blob/140ea5d2/flume-ng-configuration/pom.xml ---------------------------------------------------------------------- diff --git a/flume-ng-configuration/pom.xml b/flume-ng-configuration/pom.xml index 6a30840..e431fc8 100644 --- a/flume-ng-configuration/pom.xml +++ b/flume-ng-configuration/pom.xml @@ -48,8 +48,23 @@ limitations under the License. </dependency> <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-log4j12</artifactId> + <groupId>org.apache.logging.log4j</groupId> + <artifactId>log4j-api</artifactId> + </dependency> + + <dependency> + <groupId>org.apache.logging.log4j</groupId> + <artifactId>log4j-core</artifactId> + </dependency> + + <dependency> + <groupId>org.apache.logging.log4j</groupId> + <artifactId>log4j-slf4j-impl</artifactId> + </dependency> + + <dependency> + <groupId>org.apache.logging.log4j</groupId> + <artifactId>log4j-1.2-api</artifactId> </dependency> <dependency> http://git-wip-us.apache.org/repos/asf/flume/blob/140ea5d2/flume-ng-core/pom.xml ---------------------------------------------------------------------- diff --git a/flume-ng-core/pom.xml b/flume-ng-core/pom.xml index 44d9ef6..3d72aba 100644 --- a/flume-ng-core/pom.xml +++ b/flume-ng-core/pom.xml @@ -301,13 +301,18 @@ limitations under the License. </dependency> <dependency> - <groupId>log4j</groupId> - <artifactId>log4j</artifactId> + <groupId>org.apache.logging.log4j</groupId> + <artifactId>log4j-api</artifactId> </dependency> <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-log4j12</artifactId> + <groupId>org.apache.logging.log4j</groupId> + <artifactId>log4j-1.2-api</artifactId> + </dependency> + + <dependency> + <groupId>org.apache.logging.log4j</groupId> + <artifactId>log4j-core</artifactId> </dependency> <dependency> http://git-wip-us.apache.org/repos/asf/flume/blob/140ea5d2/flume-ng-core/src/test/resources/log4j.properties ---------------------------------------------------------------------- diff --git a/flume-ng-core/src/test/resources/log4j.properties b/flume-ng-core/src/test/resources/log4j.properties deleted file mode 100644 index 361158d..0000000 --- a/flume-ng-core/src/test/resources/log4j.properties +++ /dev/null @@ -1,24 +0,0 @@ -# Licensed to the Apache Software Foundation (ASF) under one -# or more contributor license agreements. See the NOTICE file -# distributed with this work for additional information -# regarding copyright ownership. The ASF licenses this file -# to you under the Apache License, Version 2.0 (the -# "License"); you may not use this file except in compliance -# with the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, -# software distributed under the License is distributed on an -# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the License for the -# specific language governing permissions and limitations -# under the License. - -log4j.rootLogger = INFO, out - -log4j.appender.out = org.apache.log4j.ConsoleAppender -log4j.appender.out.layout = org.apache.log4j.PatternLayout -log4j.appender.out.layout.ConversionPattern = %d (%t) [%p - %l] %m%n - -log4j.logger.org.apache.flume = DEBUG http://git-wip-us.apache.org/repos/asf/flume/blob/140ea5d2/flume-ng-core/src/test/resources/log4j2.xml ---------------------------------------------------------------------- diff --git a/flume-ng-core/src/test/resources/log4j2.xml b/flume-ng-core/src/test/resources/log4j2.xml new file mode 100644 index 0000000..5676916 --- /dev/null +++ b/flume-ng-core/src/test/resources/log4j2.xml @@ -0,0 +1,31 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + Licensed to the Apache Software Foundation (ASF) under one or more + contributor license agreements. See the NOTICE file distributed with + this work for additional information regarding copyright ownership. + The ASF licenses this file to You under the Apache License, Version 2.0 + (the "License"); you may not use this file except in compliance with + the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + +--> +<Configuration status="OFF"> + <Appenders> + <Console name="Console" target="SYSTEM_OUT"> + <PatternLayout pattern="%d (%t) [%p - %l] %m%n" /> + </Console> + </Appenders> + <Loggers> + <Logger name="org.apache.flume" level="DEBUG"/> + <Root level="DEBUG"> + <AppenderRef ref="Console" /> + </Root> + </Loggers> +</Configuration> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/flume/blob/140ea5d2/flume-ng-dist/pom.xml ---------------------------------------------------------------------- diff --git a/flume-ng-dist/pom.xml b/flume-ng-dist/pom.xml index 330118e..b3b6faa 100644 --- a/flume-ng-dist/pom.xml +++ b/flume-ng-dist/pom.xml @@ -199,11 +199,23 @@ <dependency> <groupId>org.apache.flume.flume-ng-clients</groupId> <artifactId>flume-ng-log4jappender</artifactId> + <exclusions> + <exclusion> + <groupId>log4j</groupId> + <artifactId>log4j</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>org.apache.flume.flume-ng-clients</groupId> <artifactId>flume-ng-log4jappender</artifactId> <classifier>jar-with-dependencies</classifier> + <exclusions> + <exclusion> + <groupId>log4j</groupId> + <artifactId>log4j</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>org.apache.flume</groupId> http://git-wip-us.apache.org/repos/asf/flume/blob/140ea5d2/flume-ng-embedded-agent/pom.xml ---------------------------------------------------------------------- diff --git a/flume-ng-embedded-agent/pom.xml b/flume-ng-embedded-agent/pom.xml index 1d65768..a99f129 100644 --- a/flume-ng-embedded-agent/pom.xml +++ b/flume-ng-embedded-agent/pom.xml @@ -69,13 +69,25 @@ limitations under the License. </dependency> <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-log4j12</artifactId> + <groupId>org.apache.logging.log4j</groupId> + <artifactId>log4j-1.2-api</artifactId> <!-- only used for tests --> <optional>true</optional> </dependency> <dependency> + <groupId>org.apache.logging.log4j</groupId> + <artifactId>log4j-api</artifactId> + <optional>true</optional> + </dependency> + + <dependency> + <groupId>org.apache.logging.log4j</groupId> + <artifactId>log4j-core</artifactId> + <optional>true</optional> + </dependency> + + <dependency> <groupId>org.mockito</groupId> <artifactId>mockito-all</artifactId> <scope>test</scope> http://git-wip-us.apache.org/repos/asf/flume/blob/140ea5d2/flume-ng-embedded-agent/src/test/resources/log4j.properties ---------------------------------------------------------------------- diff --git a/flume-ng-embedded-agent/src/test/resources/log4j.properties b/flume-ng-embedded-agent/src/test/resources/log4j.properties deleted file mode 100644 index 361158d..0000000 --- a/flume-ng-embedded-agent/src/test/resources/log4j.properties +++ /dev/null @@ -1,24 +0,0 @@ -# Licensed to the Apache Software Foundation (ASF) under one -# or more contributor license agreements. See the NOTICE file -# distributed with this work for additional information -# regarding copyright ownership. The ASF licenses this file -# to you under the Apache License, Version 2.0 (the -# "License"); you may not use this file except in compliance -# with the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, -# software distributed under the License is distributed on an -# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the License for the -# specific language governing permissions and limitations -# under the License. - -log4j.rootLogger = INFO, out - -log4j.appender.out = org.apache.log4j.ConsoleAppender -log4j.appender.out.layout = org.apache.log4j.PatternLayout -log4j.appender.out.layout.ConversionPattern = %d (%t) [%p - %l] %m%n - -log4j.logger.org.apache.flume = DEBUG http://git-wip-us.apache.org/repos/asf/flume/blob/140ea5d2/flume-ng-embedded-agent/src/test/resources/log4j2.xml ---------------------------------------------------------------------- diff --git a/flume-ng-embedded-agent/src/test/resources/log4j2.xml b/flume-ng-embedded-agent/src/test/resources/log4j2.xml new file mode 100644 index 0000000..fbc44b4 --- /dev/null +++ b/flume-ng-embedded-agent/src/test/resources/log4j2.xml @@ -0,0 +1,31 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + Licensed to the Apache Software Foundation (ASF) under one or more + contributor license agreements. See the NOTICE file distributed with + this work for additional information regarding copyright ownership. + The ASF licenses this file to You under the Apache License, Version 2.0 + (the "License"); you may not use this file except in compliance with + the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + +--> +<Configuration status="OFF"> + <Appenders> + <Console name="Console" target="SYSTEM_OUT"> + <PatternLayout pattern="%d (%t) [%p - %l] %m%n" /> + </Console> + </Appenders> + <Loggers> + <Logger name="org.apache.flume" level="DEBUG"/> + <Root level="INFO"> + <AppenderRef ref="Console" /> + </Root> + </Loggers> +</Configuration> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/flume/blob/140ea5d2/flume-ng-legacy-sources/flume-avro-source/pom.xml ---------------------------------------------------------------------- diff --git a/flume-ng-legacy-sources/flume-avro-source/pom.xml b/flume-ng-legacy-sources/flume-avro-source/pom.xml index e9cfab7..c5fb68e 100644 --- a/flume-ng-legacy-sources/flume-avro-source/pom.xml +++ b/flume-ng-legacy-sources/flume-avro-source/pom.xml @@ -115,8 +115,26 @@ limitations under the License. </dependency> <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-log4j12</artifactId> + <groupId>org.apache.logging.log4j</groupId> + <artifactId>log4j-api</artifactId> + <scope>test</scope> + </dependency> + + <dependency> + <groupId>org.apache.logging.log4j</groupId> + <artifactId>log4j-core</artifactId> + <scope>test</scope> + </dependency> + + <dependency> + <groupId>org.apache.logging.log4j</groupId> + <artifactId>log4j-slf4j-impl</artifactId> + <scope>test</scope> + </dependency> + + <dependency> + <groupId>org.apache.logging.log4j</groupId> + <artifactId>log4j-1.2-api</artifactId> <scope>test</scope> </dependency> http://git-wip-us.apache.org/repos/asf/flume/blob/140ea5d2/flume-ng-legacy-sources/flume-thrift-source/pom.xml ---------------------------------------------------------------------- diff --git a/flume-ng-legacy-sources/flume-thrift-source/pom.xml b/flume-ng-legacy-sources/flume-thrift-source/pom.xml index 194e41e..ce84145 100644 --- a/flume-ng-legacy-sources/flume-thrift-source/pom.xml +++ b/flume-ng-legacy-sources/flume-thrift-source/pom.xml @@ -150,8 +150,26 @@ limitations under the License. </dependency> <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-log4j12</artifactId> + <groupId>org.apache.logging.log4j</groupId> + <artifactId>log4j-api</artifactId> + <scope>test</scope> + </dependency> + + <dependency> + <groupId>org.apache.logging.log4j</groupId> + <artifactId>log4j-core</artifactId> + <scope>test</scope> + </dependency> + + <dependency> + <groupId>org.apache.logging.log4j</groupId> + <artifactId>log4j-slf4j-impl</artifactId> + <scope>test</scope> + </dependency> + + <dependency> + <groupId>org.apache.logging.log4j</groupId> + <artifactId>log4j-1.2-api</artifactId> <scope>test</scope> </dependency> http://git-wip-us.apache.org/repos/asf/flume/blob/140ea5d2/flume-ng-legacy-sources/flume-thrift-source/src/test/resources/log4j.properties ---------------------------------------------------------------------- diff --git a/flume-ng-legacy-sources/flume-thrift-source/src/test/resources/log4j.properties b/flume-ng-legacy-sources/flume-thrift-source/src/test/resources/log4j.properties deleted file mode 100644 index 9036aca..0000000 --- a/flume-ng-legacy-sources/flume-thrift-source/src/test/resources/log4j.properties +++ /dev/null @@ -1,25 +0,0 @@ -# Licensed to the Apache Software Foundation (ASF) under one -# or more contributor license agreements. See the NOTICE file -# distributed with this work for additional information -# regarding copyright ownership. The ASF licenses this file -# to you under the Apache License, Version 2.0 (the -# "License"); you may not use this file except in compliance -# with the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, -# software distributed under the License is distributed on an -# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the License for the -# specific language governing permissions and limitations -# under the License. - - -log4j.rootLogger = DEBUG, out - -log4j.appender.out = org.apache.log4j.ConsoleAppender -log4j.appender.out.layout = org.apache.log4j.PatternLayout -log4j.appender.out.layout.ConversionPattern = %d (%t) [%p - %l] %m%n - -log4j.logger.org.apache.flume = DEBUG http://git-wip-us.apache.org/repos/asf/flume/blob/140ea5d2/flume-ng-legacy-sources/flume-thrift-source/src/test/resources/log4j2.xml ---------------------------------------------------------------------- diff --git a/flume-ng-legacy-sources/flume-thrift-source/src/test/resources/log4j2.xml b/flume-ng-legacy-sources/flume-thrift-source/src/test/resources/log4j2.xml new file mode 100644 index 0000000..5676916 --- /dev/null +++ b/flume-ng-legacy-sources/flume-thrift-source/src/test/resources/log4j2.xml @@ -0,0 +1,31 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + Licensed to the Apache Software Foundation (ASF) under one or more + contributor license agreements. See the NOTICE file distributed with + this work for additional information regarding copyright ownership. + The ASF licenses this file to You under the Apache License, Version 2.0 + (the "License"); you may not use this file except in compliance with + the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + +--> +<Configuration status="OFF"> + <Appenders> + <Console name="Console" target="SYSTEM_OUT"> + <PatternLayout pattern="%d (%t) [%p - %l] %m%n" /> + </Console> + </Appenders> + <Loggers> + <Logger name="org.apache.flume" level="DEBUG"/> + <Root level="DEBUG"> + <AppenderRef ref="Console" /> + </Root> + </Loggers> +</Configuration> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/flume/blob/140ea5d2/flume-ng-node/pom.xml ---------------------------------------------------------------------- diff --git a/flume-ng-node/pom.xml b/flume-ng-node/pom.xml index 6cf5364..83faadd 100644 --- a/flume-ng-node/pom.xml +++ b/flume-ng-node/pom.xml @@ -103,18 +103,18 @@ </dependency> <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-log4j12</artifactId> + <groupId>org.apache.logging.log4j</groupId> + <artifactId>log4j-1.2-api</artifactId> </dependency> <dependency> - <groupId>log4j</groupId> - <artifactId>log4j</artifactId> + <groupId>org.apache.logging.log4j</groupId> + <artifactId>log4j-api</artifactId> </dependency> <dependency> - <groupId>log4j</groupId> - <artifactId>apache-log4j-extras</artifactId> + <groupId>org.apache.logging.log4j</groupId> + <artifactId>log4j-core</artifactId> </dependency> <dependency> @@ -153,6 +153,12 @@ <dependency> <groupId>org.apache.curator</groupId> <artifactId>curator-framework</artifactId> + <exclusions> + <exclusion> + <groupId>log4j</groupId> + <artifactId>log4j</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> http://git-wip-us.apache.org/repos/asf/flume/blob/140ea5d2/flume-ng-node/src/test/resources/log4j.properties ---------------------------------------------------------------------- diff --git a/flume-ng-node/src/test/resources/log4j.properties b/flume-ng-node/src/test/resources/log4j.properties deleted file mode 100644 index 5d38311..0000000 --- a/flume-ng-node/src/test/resources/log4j.properties +++ /dev/null @@ -1,24 +0,0 @@ -# Licensed to the Apache Software Foundation (ASF) under one -# or more contributor license agreements. See the NOTICE file -# distributed with this work for additional information -# regarding copyright ownership. The ASF licenses this file -# to you under the Apache License, Version 2.0 (the -# "License"); you may not use this file except in compliance -# with the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, -# software distributed under the License is distributed on an -# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the License for the -# specific language governing permissions and limitations -# under the License. - -log4j.rootCategory = INFO, out - -log4j.appender.out = org.apache.log4j.ConsoleAppender -log4j.appender.out.layout = org.apache.log4j.PatternLayout -log4j.appender.out.layout.ConversionPattern = %d (%t) [%p - %l] %m%n - -log4j.logger.org.apache.flume = DEBUG http://git-wip-us.apache.org/repos/asf/flume/blob/140ea5d2/flume-ng-node/src/test/resources/log4j2.xml ---------------------------------------------------------------------- diff --git a/flume-ng-node/src/test/resources/log4j2.xml b/flume-ng-node/src/test/resources/log4j2.xml new file mode 100644 index 0000000..fbc44b4 --- /dev/null +++ b/flume-ng-node/src/test/resources/log4j2.xml @@ -0,0 +1,31 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + Licensed to the Apache Software Foundation (ASF) under one or more + contributor license agreements. See the NOTICE file distributed with + this work for additional information regarding copyright ownership. + The ASF licenses this file to You under the Apache License, Version 2.0 + (the "License"); you may not use this file except in compliance with + the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + +--> +<Configuration status="OFF"> + <Appenders> + <Console name="Console" target="SYSTEM_OUT"> + <PatternLayout pattern="%d (%t) [%p - %l] %m%n" /> + </Console> + </Appenders> + <Loggers> + <Logger name="org.apache.flume" level="DEBUG"/> + <Root level="INFO"> + <AppenderRef ref="Console" /> + </Root> + </Loggers> +</Configuration> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/flume/blob/140ea5d2/flume-ng-sdk/pom.xml ---------------------------------------------------------------------- diff --git a/flume-ng-sdk/pom.xml b/flume-ng-sdk/pom.xml index fdad52b..658abce 100644 --- a/flume-ng-sdk/pom.xml +++ b/flume-ng-sdk/pom.xml @@ -203,10 +203,27 @@ limitations under the License. </dependency> <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-log4j12</artifactId> - <!-- only used for tests --> - <optional>true</optional> + <groupId>org.apache.logging.log4j</groupId> + <artifactId>log4j-api</artifactId> + <scope>test</scope> + </dependency> + + <dependency> + <groupId>org.apache.logging.log4j</groupId> + <artifactId>log4j-core</artifactId> + <scope>test</scope> + </dependency> + + <dependency> + <groupId>org.apache.logging.log4j</groupId> + <artifactId>log4j-slf4j-impl</artifactId> + <scope>test</scope> + </dependency> + + <dependency> + <groupId>org.apache.logging.log4j</groupId> + <artifactId>log4j-1.2-api</artifactId> + <scope>test</scope> </dependency> <dependency> http://git-wip-us.apache.org/repos/asf/flume/blob/140ea5d2/flume-ng-sdk/src/test/resources/log4j.properties ---------------------------------------------------------------------- diff --git a/flume-ng-sdk/src/test/resources/log4j.properties b/flume-ng-sdk/src/test/resources/log4j.properties deleted file mode 100644 index 361158d..0000000 --- a/flume-ng-sdk/src/test/resources/log4j.properties +++ /dev/null @@ -1,24 +0,0 @@ -# Licensed to the Apache Software Foundation (ASF) under one -# or more contributor license agreements. See the NOTICE file -# distributed with this work for additional information -# regarding copyright ownership. The ASF licenses this file -# to you under the Apache License, Version 2.0 (the -# "License"); you may not use this file except in compliance -# with the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, -# software distributed under the License is distributed on an -# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the License for the -# specific language governing permissions and limitations -# under the License. - -log4j.rootLogger = INFO, out - -log4j.appender.out = org.apache.log4j.ConsoleAppender -log4j.appender.out.layout = org.apache.log4j.PatternLayout -log4j.appender.out.layout.ConversionPattern = %d (%t) [%p - %l] %m%n - -log4j.logger.org.apache.flume = DEBUG http://git-wip-us.apache.org/repos/asf/flume/blob/140ea5d2/flume-ng-sdk/src/test/resources/log4j2.xml ---------------------------------------------------------------------- diff --git a/flume-ng-sdk/src/test/resources/log4j2.xml b/flume-ng-sdk/src/test/resources/log4j2.xml new file mode 100644 index 0000000..fbc44b4 --- /dev/null +++ b/flume-ng-sdk/src/test/resources/log4j2.xml @@ -0,0 +1,31 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + Licensed to the Apache Software Foundation (ASF) under one or more + contributor license agreements. See the NOTICE file distributed with + this work for additional information regarding copyright ownership. + The ASF licenses this file to You under the Apache License, Version 2.0 + (the "License"); you may not use this file except in compliance with + the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + +--> +<Configuration status="OFF"> + <Appenders> + <Console name="Console" target="SYSTEM_OUT"> + <PatternLayout pattern="%d (%t) [%p - %l] %m%n" /> + </Console> + </Appenders> + <Loggers> + <Logger name="org.apache.flume" level="DEBUG"/> + <Root level="INFO"> + <AppenderRef ref="Console" /> + </Root> + </Loggers> +</Configuration> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/flume/blob/140ea5d2/flume-ng-sinks/flume-dataset-sink/pom.xml ---------------------------------------------------------------------- diff --git a/flume-ng-sinks/flume-dataset-sink/pom.xml b/flume-ng-sinks/flume-dataset-sink/pom.xml index 1b0c325..e11deb4 100644 --- a/flume-ng-sinks/flume-dataset-sink/pom.xml +++ b/flume-ng-sinks/flume-dataset-sink/pom.xml @@ -128,8 +128,26 @@ limitations under the License. </dependency> <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-log4j12</artifactId> + <groupId>org.apache.logging.log4j</groupId> + <artifactId>log4j-api</artifactId> + <scope>test</scope> + </dependency> + + <dependency> + <groupId>org.apache.logging.log4j</groupId> + <artifactId>log4j-core</artifactId> + <scope>test</scope> + </dependency> + + <dependency> + <groupId>org.apache.logging.log4j</groupId> + <artifactId>log4j-slf4j-impl</artifactId> + <scope>test</scope> + </dependency> + + <dependency> + <groupId>org.apache.logging.log4j</groupId> + <artifactId>log4j-1.2-api</artifactId> <scope>test</scope> </dependency> http://git-wip-us.apache.org/repos/asf/flume/blob/140ea5d2/flume-ng-sinks/flume-hdfs-sink/pom.xml ---------------------------------------------------------------------- diff --git a/flume-ng-sinks/flume-hdfs-sink/pom.xml b/flume-ng-sinks/flume-hdfs-sink/pom.xml index f821be2..70157d2 100644 --- a/flume-ng-sinks/flume-hdfs-sink/pom.xml +++ b/flume-ng-sinks/flume-hdfs-sink/pom.xml @@ -73,8 +73,26 @@ limitations under the License. </dependency> <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-log4j12</artifactId> + <groupId>org.apache.logging.log4j</groupId> + <artifactId>log4j-api</artifactId> + <scope>test</scope> + </dependency> + + <dependency> + <groupId>org.apache.logging.log4j</groupId> + <artifactId>log4j-core</artifactId> + <scope>test</scope> + </dependency> + + <dependency> + <groupId>org.apache.logging.log4j</groupId> + <artifactId>log4j-slf4j-impl</artifactId> + <scope>test</scope> + </dependency> + + <dependency> + <groupId>org.apache.logging.log4j</groupId> + <artifactId>log4j-1.2-api</artifactId> <scope>test</scope> </dependency> http://git-wip-us.apache.org/repos/asf/flume/blob/140ea5d2/flume-ng-sinks/flume-hdfs-sink/src/test/resources/log4j.properties ---------------------------------------------------------------------- diff --git a/flume-ng-sinks/flume-hdfs-sink/src/test/resources/log4j.properties b/flume-ng-sinks/flume-hdfs-sink/src/test/resources/log4j.properties deleted file mode 100644 index 252b5ea..0000000 --- a/flume-ng-sinks/flume-hdfs-sink/src/test/resources/log4j.properties +++ /dev/null @@ -1,26 +0,0 @@ -# Licensed to the Apache Software Foundation (ASF) under one -# or more contributor license agreements. See the NOTICE file -# distributed with this work for additional information -# regarding copyright ownership. The ASF licenses this file -# to you under the Apache License, Version 2.0 (the -# "License"); you may not use this file except in compliance -# with the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, -# software distributed under the License is distributed on an -# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the License for the -# specific language governing permissions and limitations -# under the License. - -log4j.rootLogger = INFO, out - -log4j.appender.out = org.apache.log4j.ConsoleAppender -log4j.appender.out.layout = org.apache.log4j.PatternLayout -log4j.appender.out.layout.ConversionPattern = %d (%t) [%p - %l] %m%n - -log4j.logger.org.apache.flume = DEBUG -log4j.logger.org.apache.hadoop = WARN -log4j.logger.org.mortbay = WARN http://git-wip-us.apache.org/repos/asf/flume/blob/140ea5d2/flume-ng-sinks/flume-hdfs-sink/src/test/resources/log4j2.xml ---------------------------------------------------------------------- diff --git a/flume-ng-sinks/flume-hdfs-sink/src/test/resources/log4j2.xml b/flume-ng-sinks/flume-hdfs-sink/src/test/resources/log4j2.xml new file mode 100644 index 0000000..91a23f8 --- /dev/null +++ b/flume-ng-sinks/flume-hdfs-sink/src/test/resources/log4j2.xml @@ -0,0 +1,33 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + Licensed to the Apache Software Foundation (ASF) under one or more + contributor license agreements. See the NOTICE file distributed with + this work for additional information regarding copyright ownership. + The ASF licenses this file to You under the Apache License, Version 2.0 + (the "License"); you may not use this file except in compliance with + the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + +--> +<Configuration status="OFF"> + <Appenders> + <Console name="Console" target="SYSTEM_OUT"> + <PatternLayout pattern="%d (%t) [%p - %l] %m%n" /> + </Console> + </Appenders> + <Loggers> + <Logger name="org.apache.flume" level="DEBUG"/> + <Logger name="org.apache.hadoop" level="WARN"/> + <Logger name="org.mortbay" level="WARN"/> + <Root level="INFO"> + <AppenderRef ref="Console" /> + </Root> + </Loggers> +</Configuration> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/flume/blob/140ea5d2/flume-ng-sinks/flume-hive-sink/metastore_db/README_DO_NOT_TOUCH_FILES.txt ---------------------------------------------------------------------- diff --git a/flume-ng-sinks/flume-hive-sink/metastore_db/README_DO_NOT_TOUCH_FILES.txt b/flume-ng-sinks/flume-hive-sink/metastore_db/README_DO_NOT_TOUCH_FILES.txt new file mode 100644 index 0000000..a4bc145 --- /dev/null +++ b/flume-ng-sinks/flume-hive-sink/metastore_db/README_DO_NOT_TOUCH_FILES.txt @@ -0,0 +1,9 @@ + +# ************************************************************************* +# *** DO NOT TOUCH FILES IN THIS DIRECTORY! *** +# *** FILES IN THIS DIRECTORY AND SUBDIRECTORIES CONSTITUTE A DERBY *** +# *** DATABASE, WHICH INCLUDES THE DATA (USER AND SYSTEM) AND THE *** +# *** FILES NECESSARY FOR DATABASE RECOVERY. *** +# *** EDITING, ADDING, OR DELETING ANY OF THESE FILES MAY CAUSE DATA *** +# *** CORRUPTION AND LEAVE THE DATABASE IN A NON-RECOVERABLE STATE. *** +# ************************************************************************* \ No newline at end of file http://git-wip-us.apache.org/repos/asf/flume/blob/140ea5d2/flume-ng-sinks/flume-hive-sink/metastore_db/db.lck ---------------------------------------------------------------------- diff --git a/flume-ng-sinks/flume-hive-sink/metastore_db/db.lck b/flume-ng-sinks/flume-hive-sink/metastore_db/db.lck new file mode 100644 index 0000000..da31320 Binary files /dev/null and b/flume-ng-sinks/flume-hive-sink/metastore_db/db.lck differ http://git-wip-us.apache.org/repos/asf/flume/blob/140ea5d2/flume-ng-sinks/flume-hive-sink/metastore_db/dbex.lck ---------------------------------------------------------------------- diff --git a/flume-ng-sinks/flume-hive-sink/metastore_db/dbex.lck b/flume-ng-sinks/flume-hive-sink/metastore_db/dbex.lck new file mode 100644 index 0000000..720d64f Binary files /dev/null and b/flume-ng-sinks/flume-hive-sink/metastore_db/dbex.lck differ http://git-wip-us.apache.org/repos/asf/flume/blob/140ea5d2/flume-ng-sinks/flume-hive-sink/metastore_db/log/README_DO_NOT_TOUCH_FILES.txt ---------------------------------------------------------------------- diff --git a/flume-ng-sinks/flume-hive-sink/metastore_db/log/README_DO_NOT_TOUCH_FILES.txt b/flume-ng-sinks/flume-hive-sink/metastore_db/log/README_DO_NOT_TOUCH_FILES.txt new file mode 100644 index 0000000..56df292 --- /dev/null +++ b/flume-ng-sinks/flume-hive-sink/metastore_db/log/README_DO_NOT_TOUCH_FILES.txt @@ -0,0 +1,8 @@ + +# ************************************************************************* +# *** DO NOT TOUCH FILES IN THIS DIRECTORY! *** +# *** FILES IN THIS DIRECTORY ARE USED BY THE DERBY DATABASE RECOVERY *** +# *** SYSTEM. EDITING, ADDING, OR DELETING FILES IN THIS DIRECTORY *** +# *** WILL CAUSE THE DERBY RECOVERY SYSTEM TO FAIL, LEADING TO *** +# *** NON-RECOVERABLE CORRUPT DATABASES. *** +# ************************************************************************* \ No newline at end of file http://git-wip-us.apache.org/repos/asf/flume/blob/140ea5d2/flume-ng-sinks/flume-hive-sink/metastore_db/log/log.ctrl ---------------------------------------------------------------------- diff --git a/flume-ng-sinks/flume-hive-sink/metastore_db/log/log.ctrl b/flume-ng-sinks/flume-hive-sink/metastore_db/log/log.ctrl new file mode 100644 index 0000000..21f6d28 Binary files /dev/null and b/flume-ng-sinks/flume-hive-sink/metastore_db/log/log.ctrl differ http://git-wip-us.apache.org/repos/asf/flume/blob/140ea5d2/flume-ng-sinks/flume-hive-sink/metastore_db/log/log10.dat ---------------------------------------------------------------------- diff --git a/flume-ng-sinks/flume-hive-sink/metastore_db/log/log10.dat b/flume-ng-sinks/flume-hive-sink/metastore_db/log/log10.dat new file mode 100644 index 0000000..7e17daf Binary files /dev/null and b/flume-ng-sinks/flume-hive-sink/metastore_db/log/log10.dat differ http://git-wip-us.apache.org/repos/asf/flume/blob/140ea5d2/flume-ng-sinks/flume-hive-sink/metastore_db/log/log11.dat ---------------------------------------------------------------------- diff --git a/flume-ng-sinks/flume-hive-sink/metastore_db/log/log11.dat b/flume-ng-sinks/flume-hive-sink/metastore_db/log/log11.dat new file mode 100644 index 0000000..b5c53f9 Binary files /dev/null and b/flume-ng-sinks/flume-hive-sink/metastore_db/log/log11.dat differ http://git-wip-us.apache.org/repos/asf/flume/blob/140ea5d2/flume-ng-sinks/flume-hive-sink/metastore_db/log/logmirror.ctrl ---------------------------------------------------------------------- diff --git a/flume-ng-sinks/flume-hive-sink/metastore_db/log/logmirror.ctrl b/flume-ng-sinks/flume-hive-sink/metastore_db/log/logmirror.ctrl new file mode 100644 index 0000000..21f6d28 Binary files /dev/null and b/flume-ng-sinks/flume-hive-sink/metastore_db/log/logmirror.ctrl differ http://git-wip-us.apache.org/repos/asf/flume/blob/140ea5d2/flume-ng-sinks/flume-hive-sink/metastore_db/seg0/README_DO_NOT_TOUCH_FILES.txt ---------------------------------------------------------------------- diff --git a/flume-ng-sinks/flume-hive-sink/metastore_db/seg0/README_DO_NOT_TOUCH_FILES.txt b/flume-ng-sinks/flume-hive-sink/metastore_db/seg0/README_DO_NOT_TOUCH_FILES.txt new file mode 100644 index 0000000..2bdad06 --- /dev/null +++ b/flume-ng-sinks/flume-hive-sink/metastore_db/seg0/README_DO_NOT_TOUCH_FILES.txt @@ -0,0 +1,8 @@ + +# ************************************************************************* +# *** DO NOT TOUCH FILES IN THIS DIRECTORY! *** +# *** FILES IN THIS DIRECTORY ARE USED BY THE DERBY DATABASE TO STORE *** +# *** USER AND SYSTEM DATA. EDITING, ADDING, OR DELETING FILES IN THIS *** +# *** DIRECTORY WILL CORRUPT THE ASSOCIATED DERBY DATABASE AND MAKE *** +# *** IT NON-RECOVERABLE. *** +# ************************************************************************* \ No newline at end of file http://git-wip-us.apache.org/repos/asf/flume/blob/140ea5d2/flume-ng-sinks/flume-hive-sink/metastore_db/seg0/c10.dat ---------------------------------------------------------------------- diff --git a/flume-ng-sinks/flume-hive-sink/metastore_db/seg0/c10.dat b/flume-ng-sinks/flume-hive-sink/metastore_db/seg0/c10.dat new file mode 100644 index 0000000..85b00ab Binary files /dev/null and b/flume-ng-sinks/flume-hive-sink/metastore_db/seg0/c10.dat differ http://git-wip-us.apache.org/repos/asf/flume/blob/140ea5d2/flume-ng-sinks/flume-hive-sink/metastore_db/seg0/c101.dat ---------------------------------------------------------------------- diff --git a/flume-ng-sinks/flume-hive-sink/metastore_db/seg0/c101.dat b/flume-ng-sinks/flume-hive-sink/metastore_db/seg0/c101.dat new file mode 100644 index 0000000..17704ab Binary files /dev/null and b/flume-ng-sinks/flume-hive-sink/metastore_db/seg0/c101.dat differ http://git-wip-us.apache.org/repos/asf/flume/blob/140ea5d2/flume-ng-sinks/flume-hive-sink/metastore_db/seg0/c111.dat ---------------------------------------------------------------------- diff --git a/flume-ng-sinks/flume-hive-sink/metastore_db/seg0/c111.dat b/flume-ng-sinks/flume-hive-sink/metastore_db/seg0/c111.dat new file mode 100644 index 0000000..dc06539 Binary files /dev/null and b/flume-ng-sinks/flume-hive-sink/metastore_db/seg0/c111.dat differ
