From 7d2ab0dd44d22aa9002a1d511c0403de96398aa3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lucas=20Ple=C3=9F?= Date: Sat, 3 Mar 2012 02:48:02 +0100 Subject: [PATCH] =?UTF-8?q?Test=20mit=20Ger=C3=A4ten=20wo=20der=20letzte?= =?UTF-8?q?=20Kanal=20512=20ist.=20Format=20des=20loggings=20angepasst.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/de/ctdo/bunti/dao/BuntiDevicesDAOImpl.java | 2 ++ .../src/main/java/de/ctdo/bunti/web/TestController.java | 8 +++++++- bunti_server/src/main/resources/log4j.properties | 6 ++---- 3 files changed, 11 insertions(+), 5 deletions(-) diff --git a/bunti_server/src/main/java/de/ctdo/bunti/dao/BuntiDevicesDAOImpl.java b/bunti_server/src/main/java/de/ctdo/bunti/dao/BuntiDevicesDAOImpl.java index c4cb960..69b7d99 100644 --- a/bunti_server/src/main/java/de/ctdo/bunti/dao/BuntiDevicesDAOImpl.java +++ b/bunti_server/src/main/java/de/ctdo/bunti/dao/BuntiDevicesDAOImpl.java @@ -29,6 +29,8 @@ public class BuntiDevicesDAOImpl implements BuntiDevicesDAO { devices.add(new Par56Spot(deviceID++, 16, "Par56 Lampe 4")); devices.add(new Strobe1500(deviceID++, 21, "Stroboskop 1")); + devices.add(new Par56Spot(deviceID++, 508, "Par56 Lampe 5")); + } diff --git a/bunti_server/src/main/java/de/ctdo/bunti/web/TestController.java b/bunti_server/src/main/java/de/ctdo/bunti/web/TestController.java index a773bf8..9bd9813 100644 --- a/bunti_server/src/main/java/de/ctdo/bunti/web/TestController.java +++ b/bunti_server/src/main/java/de/ctdo/bunti/web/TestController.java @@ -77,7 +77,13 @@ public class TestController { options.put("green", 78); options.put("blue", 255); buntiController.setDevice(3, options); - + + options.put("red", 55); + options.put("green", 44); + options.put("blue", 66); + options.put("mode", 22); + options.put("speed", 255); + buntiController.setDevice(5, options); ModelAndView mav = new ModelAndView("hello.jsp"); diff --git a/bunti_server/src/main/resources/log4j.properties b/bunti_server/src/main/resources/log4j.properties index 91132c2..77c96ac 100644 --- a/bunti_server/src/main/resources/log4j.properties +++ b/bunti_server/src/main/resources/log4j.properties @@ -4,14 +4,12 @@ log4j.appender.stdout=org.apache.log4j.ConsoleAppender log4j.appender.stdout.layout=org.apache.log4j.PatternLayout # Print the date in ISO 8601 format -log4j.appender.stdout.layout.ConversionPattern=%d [%t] %-5p %c - %m%n +#log4j.appender.stdout.layout.ConversionPattern=%d [%t] %-5p %c - %m%n +log4j.appender.stdout.layout.ConversionPattern=%d{HH:mm:ss,SSS} %-5p %c: %m log4j.appender.R=org.apache.log4j.RollingFileAppender log4j.appender.R.File=application.log - log4j.appender.R.MaxFileSize=100KB -# Keep one backup file log4j.appender.R.MaxBackupIndex=1 - log4j.appender.R.layout=org.apache.log4j.PatternLayout log4j.appender.R.layout.ConversionPattern=%p %t %c - %m%n