From 96abf2265d29696475dee489945cf86c30d41c49 Mon Sep 17 00:00:00 2001
From: "Christian P. MOMON" <christian.momon@devinsy.fr>
Date: Thu, 22 Sep 2016 00:01:05 +0200
Subject: [PATCH] Added configuration resources.

---
 resources/conf/log4j.properties     | 26 +++++++++++++
 resources/conf/model_of_context.xml | 57 +++++++++++++++++++++++++++++
 2 files changed, 83 insertions(+)
 create mode 100644 resources/conf/log4j.properties
 create mode 100644 resources/conf/model_of_context.xml

diff --git a/resources/conf/log4j.properties b/resources/conf/log4j.properties
new file mode 100644
index 0000000..21fb741
--- /dev/null
+++ b/resources/conf/log4j.properties
@@ -0,0 +1,26 @@
+# Log information (priority setting : DEBUG < INFO < WARN < ERROR)
+# ################
+log4j.rootLogger                			= INFO, Kiss4web-Writer, CONSOLE
+
+log4j.logger.fr.devinsy.kiss4web			= DEBUG
+log4j.logger.fr.devinsy.xidyn				= INFO
+log4j.logger.fr.devinsy.xidyn.Presenter		= INFO
+log4j.logger.fr.devinsy.xidyn.FilePresenter	= INFO
+
+
+
+#--
+log4j.appender.CONSOLE=org.apache.log4j.ConsoleAppender
+log4j.appender.CONSOLE.layout=org.apache.log4j.PatternLayout
+log4j.appender.CONSOLE.layout.ConversionPattern  = %d{ISO8601} - Kiss4web [%-5p] %34.34c.%25M - %m%n
+
+
+#--
+log4j.appender.Kiss4web-Writer                           = org.apache.log4j.RollingFileAppender
+log4j.appender.Kiss4web-Writer.File                      = /services/Kiss4web-demo/kiss4web.log
+log4j.appender.Kiss4web-Writer.MaxFileSize               = 100000KB
+log4j.appender.Kiss4web-Writer.MaxBackupIndex            = 100
+log4j.appender.Kiss4web-Writer.layout                    = org.apache.log4j.PatternLayout
+log4j.appender.Kiss4web-Writer.layout.ConversionPattern  = %d{ISO8601} - Kiss4web [%-5p] %-50c.%30M - %m%n
+
+
diff --git a/resources/conf/model_of_context.xml b/resources/conf/model_of_context.xml
new file mode 100644
index 0000000..6c5b24c
--- /dev/null
+++ b/resources/conf/model_of_context.xml
@@ -0,0 +1,57 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+        Kiss4web App environment configuration
+        =======================================
+
+    The configuration of App is done using JNDI in the context.xml file.
+    
+    * Configure Kiss4web in Eclipse
+    
+    1) copy the META-INF/model_of_content.xml file to META-INF/content.xml
+    
+    2) edit environment settings in META-INF/content.xml
+    
+    3) DO NEVER COMMIT META-INF/content.xml  (right button > Team > Ignore)
+    
+    To ensure that Eclipse take well the library changes:
+        - Server tab > Stop
+        - Server tab > Server > Right button > Clean
+        - Server tab > Server > Right button > Clean Tomcat Directory
+
+
+    * Configure App in Tomcat
+    
+    1) copy the META-INF/model_of_content.xml file to $CATALINA_BASE/conf/[engine]/[localhost]/content.xml
+    
+    2) edit environment settings in $CATALINA_BASE/conf/[engine]/[localhost]/content.xml
+    
+    To ensure that Eclipse take well the library changes:
+        - Server tab > Stop
+        - Server tab > Server > Right button > Clean
+        - Server tab > Server > Right button > Clean Tomcat Directory
+
+        TARGET: DEVELOPMENT ENVIRONMENT
+
+    This file is located in the META-INF folder to define the configuration of an development environment.
+
+-->
+<Context>
+
+    <!-- Name the environment. -->
+    <Environment name="kiss4web.environment.name" value="DEV" type="java.lang.String" override="true"/>
+
+
+    <!-- Name the environment. -->
+    <Environment name="kiss4web.website.name" value="DEV" type="java.lang.String" override="true"/>
+
+    <!-- Define the website URL.
+     Some features need the domain name of the website (link in RSS, link in email...).
+     As the war could be behind a proxy server, this value must be defined in the environment configuration.
+     -->
+    <Environment name="kiss4web.website.url" value="http://localhost:8080/" type="java.lang.String" override="true"/>
+
+
+    <!-- Define where is the log4file. -->
+    <Environment name="kiss4web.log4j.path" value="WEB-INF/log4j.properties" type="java.lang.String" override="true"/>
+
+</Context>
\ No newline at end of file