Merge branch 'insomnia_2014' of codecrew.fi:codecrew/moya into insomnia_2014

code/moya-ear/pom.xml

@@ -56,11 +56,6 @@
 			<version>${moya.version}</version>
 			<type>war</type>
 		</dependency>
-		<dependency>
-			<groupId>org.slf4j</groupId>
-			<artifactId>slf4j-jdk14</artifactId>
-			<version>1.7.7</version>
-		</dependency>
 	</dependencies>
 
 

code/moya-parent/pom.xml

@@ -101,6 +101,17 @@
 			<type>jar</type>
 			<scope>test</scope>
 		</dependency>
+		<dependency>
+			<groupId>org.slf4j</groupId>
+			<artifactId>slf4j-api</artifactId>
+			<version>1.7.7</version>
+		</dependency>
+		<dependency>
+			<groupId>ch.qos.logback</groupId>
+			<artifactId>logback-classic</artifactId>
+			<version>1.1.2</version>
+			<scope>provided</scope>
+		</dependency>
 	</dependencies>
 
 	<parent>

code/moya-web/WebContent/WEB-INF/web.xml

@@ -7,24 +7,23 @@
 		<param-name>javax.faces.FACELETS_SKIP_COMMENTS</param-name>
 		<param-value>true</param-value>
 	</context-param>
-	
+
 	<context-param>
-        <param-name>primefaces.THEME</param-name>
-        <param-value>#{sessionHandler.theme}</param-value>
-  	</context-param>
-	
+		<param-name>primefaces.THEME</param-name>
+		<param-value>#{sessionHandler.theme}</param-value>
+	</context-param>
+
 	<!-- Asetetaan PROJECT_STAGE JNDI:llä, ja fallbackataan arvoon Development -->
 	<resource-ref>
 		<res-ref-name>jsf/ProjectStage</res-ref-name>
 		<res-type>java.lang.String</res-type>
 	</resource-ref>
-	
+
 	<context-param>
 		<param-name>javax.faces.PROJECT_STAGE</param-name>
 		<param-value>Development</param-value>
 	</context-param>
-	
-	
+
 	<filter>
 		<display-name>PrimefacesFileupload</display-name>
 		<filter-name>PrimefacesFileupload</filter-name>
@@ -44,19 +43,29 @@
 		<filter-name>HostnameFilter</filter-name>
 		<servlet-name>*</servlet-name>
 	</filter-mapping>
+
 	<servlet>
 		<servlet-name>Faces Servlet</servlet-name>
 		<servlet-class>javax.faces.webapp.FacesServlet</servlet-class>
 		<load-on-startup>1</load-on-startup>
 	</servlet>
-
-
-
 	<servlet-mapping>
 		<servlet-name>Faces Servlet</servlet-name>
 		<url-pattern>*.jsf</url-pattern>
 	</servlet-mapping>
-
+	
+	<!--
+	<servlet>
+		<servlet-name>ViewStatusMessages</servlet-name>
+		<servlet-class>ch.qos.logback.classic.ViewStatusMessagesServlet
+		</servlet-class>
+	</servlet>
+	<servlet-mapping>
+		<servlet-name>ViewStatusMessages</servlet-name>
+		<url-pattern>/logback</url-pattern>
+	</servlet-mapping>
+	-->
+	
 	<session-config>
 		<session-timeout>120</session-timeout>
 	</session-config>

glassfish/README.txt

+domain.xml settings:
+<jvm-options>-Dlog4j.configuration=file:///${com.sun.aas.instanceRoot}/config/bridged_logging.properties</jvm-options>
+<jvm-options>-Dlogback.configurationFile=file:///${com.sun.aas.instanceRoot}/config/logback.xml</jvm-options>

glassfish/domain_conf-files/bridged_logging.properties

+handlers = org.slf4j.bridge.SLF4JBridgeHandler
+com.sun.enterprise.server.logging.GFFileHandler.flushFrequency=1
+com.sun.enterprise.server.logging.GFFileHandler.file=${com.sun.aas.instanceRoot}/logs/server.log
+com.sun.enterprise.server.logging.GFFileHandler.rotationTimelimitInMinutes=0
+com.sun.enterprise.server.logging.GFFileHandler.logtoConsole=false
+com.sun.enterprise.server.logging.GFFileHandler.rotationLimitInBytes=2000000
+com.sun.enterprise.server.logging.GFFileHandler.alarms=false
+com.sun.enterprise.server.logging.GFFileHandler.formatter=com.sun.enterprise.server.logging.UniformLogFormatter
+com.sun.enterprise.server.logging.GFFileHandler.retainErrorsStasticsForHours=0

glassfish/domain_conf-files/logback.xml

+<?xml version="1.0" encoding="UTF-8"?>
+<configuration debug="true" scan="true">
+
+	<!-- <jmxConfigurator /> -->
+
+	<appender name="console" class="ch.qos.logback.core.ConsoleAppender">
+		<layout class="ch.qos.logback.classic.PatternLayout">
+			<Pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n</Pattern>
+		</layout>
+	</appender>
+
+	<!--
+	<appender name="FILE" class="ch.qos.logback.core.FileAppender">
+		<file>moya.log</file>
+		<layout class="ch.qos.logback.classic.PatternLayout">
+			<Pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n</Pattern>
+		</layout>
+	</appender>
+	-->
+
+	<logger name="fi.codecrew" level="TRACE" />
+
+	<root level="DEBUG">
+		<appender-ref ref="console" />
+		<!-- <appender-ref ref="FILE" /> -->
+	</root>
+
+</configuration>