Merge pull request #34 from stritti/develop

Develop

Author: stritti

.editorconfig

@@ -0,0 +1,34 @@
+# This file is for unifying the coding style for different editors and IDEs
+# EditorConfig is awesome: http://EditorConfig.org
+
+root = true
+
+[*.java]
+indent_style = space
+indent_size = 3
+end_of_line = lf
+charset = utf-8
+trim_trailing_whitespace = true
+insert_final_newline = true
+
+[*.{js,css}]
+indent_style = tab
+end_of_line = lf
+charset = utf-8
+trim_trailing_whitespace = true
+insert_final_newline = true
+
+[*.jsp]
+charset = utf-8
+indent_style = space
+indent_size = 3
+end_of_line = lf
+insert_final_newline = true
+trim_trailing_whitespace = true
+
+[*.json]
+indent_style = space
+indent_size = 2
+
+[*.md]
+trim_trailing_whitespace = false

.gitignore

@@ -11,3 +11,6 @@ log4js-site/build/
 /log4js-servlet/nbproject/
 /log4js/nbproject/private/
 log4js/.cache/
+log4js-servlet/out/
+.idea/
+.gradle/

.travis.yml

@@ -25,13 +25,22 @@ before_script:
 script:
 - grunt --gruntfile "Gruntfile.js" build
 deploy:
-  provider: releases
-  api_key:
-    secure: iKdorqXgiTH3RcLLNj8Q4AoRWxpYA6yT7YDYKnuORz3tcAvHrIBmt+ff6h5zsn2JVGkFamc0njfYdrOfLdc4+cQQfQVq80OhJJnkIQ0WgOtG0yt+yVHKb8lWBGr9P0lMvvBuROsuxGl9jPcgkUTtuvxHoJ3T24WlLDGXJSWdCzw=
-  file_glob: true
-  file: target/*.zip
-  skip_cleanup: true
-  on:
-    repo: stritti/log4js
-    branch: master
-    tags: true
+  - provider: npm
+    email: [email protected]
+    api_key:
+      secure: NQyGsxZKqApzTxBjsXMI/2drQcCF8s38iuofEL/wbATWC9Y9ggfI6oyd/tqqyYrgouBoSqHPSOEP4ghe381yrO9jlnJMiwzmLqVivZAAe4x2DI3nrlaz+AFcvTpf/36T4LFevTP3Lh6LoVGRrKnfRCjQzfBv0hYOLtjNCc/zjeU=
+    file_glob: true
+    file: target/*.zip
+    skip_cleanup: true
+    on:
+      tags: true
+      repo: stritti/log4js
+  - provider: releases
+    api_key:
+      secure: iKdorqXgiTH3RcLLNj8Q4AoRWxpYA6yT7YDYKnuORz3tcAvHrIBmt+ff6h5zsn2JVGkFamc0njfYdrOfLdc4+cQQfQVq80OhJJnkIQ0WgOtG0yt+yVHKb8lWBGr9P0lMvvBuROsuxGl9jPcgkUTtuvxHoJ3T24WlLDGXJSWdCzw=
+    file_glob: true
+    file: target/*.zip
+    skip_cleanup: true
+    on:
+      repo: stritti/log4js
+      tags: true

CHANGELOG.txt

@@ -6,7 +6,7 @@
 Log4js
 ======
 
-Log4js - The Logging Framework for JavaScript
+Log4js - The Logging Framework for JavaScript with no runtime dependencies 
 
 ## Usage
 
@@ -33,6 +33,21 @@ consoleLog.trace('I was traced!')
 Within sources there is a more detailed [example](log4js/src/main/example/index.html).
 
 ## Development
+
+The project is seperated in modules. Core JavaScript module is located in subdirectory `log4js` 
+
+### Structure
+````
+├───log4js: Main JavaScript Log4js module 
+├───log4js-servlet: Java Servlet to collect AJAX-Logs serverside
+├───log4js-solr: configuration to collect logs using Apache SOLR
+├───log4js-site: (outdated) project documentation
+ 
+````
+
+### Log4js
+> Main JavaScript module
+
 To build the JavaScript library we use [npm](https://www.npmjs.com/) and [grunt](https://gruntjs.com/). 
 
 ````
@@ -45,9 +60,19 @@ Include then the `target/log4js.min.js` file in your project.
 
 More details in the [Wiki](https://github.com/stritti/log4js/wiki/Development)
 
+### Log4js Servlet
+
+The servlet is Java based project which is compiled using `maven`.
+
+### Log4js SOLR
+
+For more details see [README.md](log4js-solr/README.md) in the subdirectory [log4js-solr](log4js-solr)
+
+### Log4js Site
+
 ## Contribution
 
-Pull Requests are very welcome.
+[Pull Requests](https://github.com/stritti/log4js/pulls) are very welcome.
 
 ## Other JavaScript Logger
 There are a lot other projects which are started logging in JavaScript: