Remove duplicate code from ex-3.1
Ex3.2 back out solution
Move log4j properties