diff --git a/framework/dependencies.yml b/framework/dependencies.yml index 4785f7a1de..949a123ffb 100644 --- a/framework/dependencies.yml +++ b/framework/dependencies.yml @@ -19,7 +19,7 @@ require: &allDependencies - com.google.code.gson -> gson 2.8.9 - com.jamonapi -> jamon 2.82 - com.ning -> async-http-client 1.9.40 - - commons-beanutils 1.9.4 + - commons-beanutils 1.9.4 - commons-codec 1.15 - org.apache.commons -> commons-email 1.5 - commons-fileupload 1.4 @@ -71,7 +71,6 @@ require: &allDependencies - io.netty -> netty 3.10.6.Final - org.postgresql -> postgresql 42.3.1 - org.slf4j -> slf4j-api 1.7.33 - - org.slf4j -> slf4j-log4j12 1.7.33 - org.apache.logging.log4j -> log4j-slf4j-impl 2.17.1 - org.yaml -> snakeyaml 1.30 - net.spy -> spymemcached 2.12.3 @@ -92,7 +91,7 @@ repositories: type: local artifact: "${play.path}/framework/lib/[artifact]-[revision].jar" contains: *allDependencies - + - playCoreCrud: type: local artifact: "${play.path}/modules/crud" @@ -104,16 +103,16 @@ repositories: artifact: "${play.path}/modules/secure" contains: - play -> secure $version - + - playCoreDocviewer: type: local artifact: "${play.path}/modules/docviewer" contains: - play -> docviewer $version - - playModules: + - playModules: type: chain - using: + using: - playLocalModules: type: local descriptor: "${play.path}/modules/[module]-[revision]/conf/dependencies.yml" @@ -123,7 +122,7 @@ repositories: type: http descriptor: "https://www.playframework.com/modules/repo/[module]/[revision]/dependencies.yml" artifact: "https://www.playframework.com/modules/[module]-[revision].zip" - + contains: - play -> * diff --git a/framework/lib/slf4j-api-1.7.32.jar b/framework/lib/slf4j-api-1.7.32.jar deleted file mode 100644 index b16a0785b6..0000000000 Binary files a/framework/lib/slf4j-api-1.7.32.jar and /dev/null differ diff --git a/framework/lib/slf4j-log4j12-1.7.33.jar b/framework/lib/slf4j-log4j12-1.7.33.jar deleted file mode 100644 index 808eea16ff..0000000000 Binary files a/framework/lib/slf4j-log4j12-1.7.33.jar and /dev/null differ diff --git a/framework/test-src/play/LoggerTest.java b/framework/test-src/play/LoggerTest.java index e97e30af32..09f062d487 100755 --- a/framework/test-src/play/LoggerTest.java +++ b/framework/test-src/play/LoggerTest.java @@ -79,7 +79,8 @@ public void tearDown() throws Exception { @Test public void testInitWithPropertiesForDefaultRoot() { //given - Play.configuration.put(APPLICATION_LOG_PATH_PROPERTYNAME, Play.applicationPath.getAbsoluteFile() + "/test-src/play/testlog4j.properties"); + Play.configuration.put(APPLICATION_LOG_PATH_PROPERTYNAME, Play.applicationPath.getAbsolutePath() + "/test-src/play/testlog4j.properties"); + Logger.log4j = null; init(); //when @@ -94,7 +95,7 @@ public void testInitWithPropertiesForDefaultRoot() { @Test public void testInitWithPropertiesForCustom() { //given - Play.configuration.put(APPLICATION_LOG_PATH_PROPERTYNAME, Play.applicationPath.getAbsoluteFile() + "/test-src/play/testlog4j.properties"); + Play.configuration.put(APPLICATION_LOG_PATH_PROPERTYNAME, Play.applicationPath.getAbsolutePath() + "/test-src/play/testlog4j.properties"); Logger.log4j = null; init(); //when @@ -109,7 +110,7 @@ public void testInitWithPropertiesForCustom() { @Test public void testInitWithPropertiesForPlay() { //given - Play.configuration.put(APPLICATION_LOG_PATH_PROPERTYNAME, Play.applicationPath.getAbsoluteFile() + "/test-src/play/testlog4j.properties"); + Play.configuration.put(APPLICATION_LOG_PATH_PROPERTYNAME, Play.applicationPath.getAbsolutePath() + "/test-src/play/testlog4j.properties"); Logger.log4j = null; init(); //when @@ -126,7 +127,7 @@ public void testInitWithPropertiesForPlay() { @Test public void testInitWithXMLForCustom() { //given - Play.configuration.put(APPLICATION_LOG_PATH_PROPERTYNAME, Play.applicationPath.getAbsoluteFile() + "/test-src/play/testlog4j.xml"); + Play.configuration.put(APPLICATION_LOG_PATH_PROPERTYNAME, Play.applicationPath.getAbsolutePath() + "/test-src/play/testlog4j.xml"); Logger.log4j = null; init(); //when @@ -141,7 +142,7 @@ public void testInitWithXMLForCustom() { @Test public void testInitWithXMLForPlay() { //given - Play.configuration.put(APPLICATION_LOG_PATH_PROPERTYNAME, Play.applicationPath.getAbsoluteFile() + "/test-src/play/testlog4j.xml"); + Play.configuration.put(APPLICATION_LOG_PATH_PROPERTYNAME, Play.applicationPath.getAbsolutePath() + "/test-src/play/testlog4j.xml"); Logger.log4j = null; init(); //when @@ -155,9 +156,16 @@ private void init() { @Override public URL getLog4jConf() { try { + System.out.println(Play.configuration.getProperty(APPLICATION_LOG_PATH_PROPERTYNAME)); + + File f = new File(Play.configuration.getProperty(APPLICATION_LOG_PATH_PROPERTYNAME)); + System.out.println("f="+ f.getAbsolutePath()); + System.out.println("f="+ f.toURI()); + System.out.println("f="+ f.toURI().toURL()); + return new File(Play.configuration.getProperty(APPLICATION_LOG_PATH_PROPERTYNAME)).toURI().toURL(); } catch (MalformedURLException ignored) { - + System.out.println("e="+ e.getMessage()); } return super.getLog4jConf(); } diff --git a/framework/test-src/play/testlog4j.properties b/framework/test-src/play/testlog4j.properties index 4cb01b92f4..ef18fd79ec 100755 --- a/framework/test-src/play/testlog4j.properties +++ b/framework/test-src/play/testlog4j.properties @@ -1,16 +1,17 @@ -# appender Console -appender.console.type = Console -appender.console.name = STDOUT -appender.console.layout.type = PatternLayout -appender.console.layout.pattern = %d [%t] %p %c - %m%n -appender.console.filter.threshold.type = ThresholdFilter -appender.console.filter.threshold.level = INFO -# play logger -logger.app.name = play -logger.app.level = INFO -# play logger -logger.custom.name = logtest.properties -logger.custom.level = WARN -# root logger -rootLogger.level = DEBUG -rootLogger.appenderRef.console.ref = STDOUT \ No newline at end of file +# appender Console +appender.console.type = Console +appender.console.name = STDOUT +appender.console.layout.type = PatternLayout +appender.console.layout.pattern = %d [%t] %p %c - %m%n +appender.console.filter.threshold.type = ThresholdFilter +appender.console.filter.threshold.level = INFO +# play logger +logger.app.name = play +logger.app.level = INFO +# play logger +logger.custom.name = logtest.properties +logger.custom.level = WARN +# root logger +rootLogger.level = DEBUG +rootLogger.appenderRef.console.ref = STDOUT + diff --git a/framework/test-src/play/testlog4j.xml b/framework/test-src/play/testlog4j.xml index 2c267f6ee2..8c67108e9f 100755 --- a/framework/test-src/play/testlog4j.xml +++ b/framework/test-src/play/testlog4j.xml @@ -1,23 +1,23 @@ - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + + + + + + + + + + + + + + + + +