Author: echatellier Date: 2014-08-28 16:42:30 +0200 (Thu, 28 Aug 2014) New Revision: 597 Url: http://forge.codelutin.com/projects/faxtomail/repository/revisions/597 Log: Proper fix for log4j2 detection Modified: trunk/faxtomail-service/src/test/java/com/franciaflex/faxtomail/services/service/AbstractFaxToMailServiceTest.java trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/RunFaxToMail.java trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/FaxToMailApplicationListener.java trunk/pom.xml Modified: trunk/faxtomail-service/src/test/java/com/franciaflex/faxtomail/services/service/AbstractFaxToMailServiceTest.java =================================================================== --- trunk/faxtomail-service/src/test/java/com/franciaflex/faxtomail/services/service/AbstractFaxToMailServiceTest.java 2014-08-26 13:33:58 UTC (rev 596) +++ trunk/faxtomail-service/src/test/java/com/franciaflex/faxtomail/services/service/AbstractFaxToMailServiceTest.java 2014-08-28 14:42:30 UTC (rev 597) @@ -67,11 +67,6 @@ protected FaxToMailUser currentUser; - static { - // TODO as of 20140812, hibernate fails to detect log4j 2.0, force slf4j - System.setProperty("org.jboss.logging.provider", "slf4j"); - } - protected Map<String, String> getDatabaseConfiguration(String dataBase) { Map<String, String> hibernateH2Config = new HashMap<String, String>(); Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/RunFaxToMail.java =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/RunFaxToMail.java 2014-08-26 13:33:58 UTC (rev 596) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/RunFaxToMail.java 2014-08-28 14:42:30 UTC (rev 597) @@ -58,9 +58,6 @@ log.info("Starting FaxToMail with arguments: " + Arrays.toString(args)); } - // TODO as of 20140812, hibernate fails to detect log4j 2.0, force slf4j - System.setProperty("org.jboss.logging.provider", "slf4j"); - // Create configuration FaxToMailConfiguration config = new FaxToMailConfiguration("faxToMail.properties", args); Modified: trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/FaxToMailApplicationListener.java =================================================================== --- trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/FaxToMailApplicationListener.java 2014-08-26 13:33:58 UTC (rev 596) +++ trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/FaxToMailApplicationListener.java 2014-08-28 14:42:30 UTC (rev 597) @@ -61,9 +61,6 @@ log.info("init FaxToMail web ui"); } - // TODO as of 20140812, hibernate fails to detect log4j 2.0, force slf4j - System.setProperty("org.jboss.logging.provider", "slf4j"); - log.debug("scheduler launched"); ServletContext sc = sce.getServletContext(); Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2014-08-26 13:33:58 UTC (rev 596) +++ trunk/pom.xml 2014-08-28 14:42:30 UTC (rev 597) @@ -234,8 +234,16 @@ </exclusion> </exclusions> </dependency> - + + <!-- Temp update for log4j 2 detection --> <dependency> + <groupId>org.jboss.logging</groupId> + <artifactId>jboss-logging</artifactId> + <version>3.2.0.Beta1</version> + <scope>runtime</scope> + </dependency> + + <dependency> <groupId>com.mchange</groupId> <artifactId>c3p0</artifactId> <version>0.9.5-pre8</version>