Added Web Logger Configurer from https://github.com/la-team/light-log…

…ging-configurer
la-team · Sep 13, 2014 · e21d07e · e21d07e
1 parent d515c1d
commit e21d07e
Show file tree

Hide file tree

Showing 7 changed files with 42 additions and 13 deletions.
diff --git a/lightadmin-core/pom.xml b/lightadmin-core/pom.xml
@@ -26,7 +26,7 @@
             <name>The Apache Software License, Version 2.0</name>
             <url>http://www.apache.org/licenses/LICENSE-2.0</url>
             <comments>
-                Copyright 2010-2014 the original author or authors.
+                Copyright 2012-2014 the original author or authors.
 
                 Licensed under the Apache License, Version 2.0 (the "License");
                 you may not use this file except in compliance with the License.

diff --git a/lightadmin-core/src/main/resources/META-INF/resources/images/ukraine-peace.png b/lightadmin-core/src/main/resources/META-INF/resources/images/ukraine-peace.png
diff --git a/...dmin-core/src/main/resources/META-INF/resources/views/includes/common-scripts-include.jsp b/...dmin-core/src/main/resources/META-INF/resources/views/includes/common-scripts-include.jsp
@@ -75,6 +75,10 @@
     $(function () {
         $.ajaxSetup({ cache: false });
 
+        $("#support-ukraine").click(function() {
+            document.location.href = "http://wings-phoenix.org.ua/en/donate-instructions";
+        });
+
         $("a.not-implemented").click(function () {
             jAlert('Sorry mate, but this feature is not yet implemented.', 'Coming soon...');
         });

diff --git a/...dmin-core/src/main/resources/META-INF/resources/views/sections/top-navigation-section.jsp b/...dmin-core/src/main/resources/META-INF/resources/views/sections/top-navigation-section.jsp
@@ -45,6 +45,7 @@
             </div>
 
             <div class="userNav">
+                <img id="support-ukraine" style="height: 20px;position: relative;top: 8px;left: 25px; cursor: pointer;" title="Support Ukraine" src="<light:url value='/images/ukraine-peace.png'/>">
                 <iframe allowtransparency="true" frameborder="0" scrolling="no"
                         src="https://platform.twitter.com/widgets/tweet_button.html?lang=en&url=http%3A%2F%2Flightadmin.org&related=lightadm_team&text=%23LightAdmin%20-%20Pluggable%20%23CRUD%20administration%20UI%20library%20for%20%23SpringBoot%20on%20top%20of%20%23SpringData,%20%23JPA%20and%20%23REST"
                         style="width:130px; height:20px; position: relative; right: -35px; top: 8px;"></iframe>

diff --git a/lightadmin-demo/pom.xml b/lightadmin-demo/pom.xml
@@ -22,7 +22,10 @@
         <spring.version>4.1.0.RELEASE</spring.version>
         <hibernate.version>4.3.6.Final</hibernate.version>
         <logback.version>1.1.2</logback.version>
+
         <lightadmin.version>1.0.1.BUILD-SNAPSHOT</lightadmin.version>
+        <light-logging-configurer.version>1.0.0.BUILD-SNAPSHOT</light-logging-configurer.version>
+
         <hibernate-jpa-2.1-api.version>1.0.0.Final</hibernate-jpa-2.1-api.version>
         <hibernate-validator.version>5.0.3.Final</hibernate-validator.version>
         <validation-api.version>1.1.0.Final</validation-api.version>
@@ -39,6 +42,11 @@
             <artifactId>lightadmin</artifactId>
             <version>${lightadmin.version}</version>
         </dependency>
+        <dependency>
+            <groupId>org.lightadmin</groupId>
+            <artifactId>light-logging-configurer</artifactId>
+            <version>${light-logging-configurer.version}</version>
+        </dependency>
 
         <dependency>
             <groupId>org.springframework</groupId>

diff --git a/lightadmin-demo/src/main/resources/logback.xml b/lightadmin-demo/src/main/resources/logback.xml
@@ -1,22 +1,28 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <configuration>
 
-	<appender name="console" class="ch.qos.logback.core.ConsoleAppender">
-		<encoder>
+    <appender name="console" class="ch.qos.logback.core.ConsoleAppender">
+        <encoder>
             <charset>utf-8</charset>
-			<pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n</pattern>
-		</encoder>
-	</appender>
+            <pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n</pattern>
+        </encoder>
+    </appender>
 
-	<logger name="org.lightadmin.core" level="info" />
-	<logger name="org.lightadmin.demo" level="info" />
+    <appender name="MessageSendingAppender" class="org.lightadmin.logging.configurer.logback.MessageSendingAppender"/>
 
-	<logger name="org.springframework" level="warn" />
+    <logger name="org.lightadmin.core" level="info"/>
+    <logger name="org.lightadmin.demo" level="info"/>
 
-	<logger name="org.hibernate" level="warn" />
+    <logger name="org.springframework" level="warn"/>
 
-	<root level="warn">
-		<appender-ref ref="console" />
-	</root>
+    <logger name="org.hibernate" level="warn"/>
+
+    <contextListener class="ch.qos.logback.classic.jul.LevelChangePropagator">
+        <resetJUL>true</resetJUL>
+    </contextListener>
+
+    <root level="WARN">
+        <appender-ref ref="MessageSendingAppender"/>
+    </root>
 
 </configuration>
diff --git a/lightadmin-demo/src/main/webapp/WEB-INF/web.xml b/lightadmin-demo/src/main/webapp/WEB-INF/web.xml
@@ -7,6 +7,16 @@
 
     <description>LightAdmin - Administration framework for Java web applications. [DEMO]</description>
 
+    <context-param>
+        <param-name>light:configurer:base-url</param-name>
+        <param-value>/logger</param-value>
+    </context-param>
+
+    <context-param>
+        <param-name>light:configurer:back-to-site-url</param-name>
+        <param-value>http://lightadmin.org</param-value>
+    </context-param>
+
     <context-param>
         <param-name>light:administration:base-url</param-name>
         <param-value>/admin</param-value>