diff options
author | Henrik Rentz-Reichert | 2012-02-27 16:03:29 +0000 |
---|---|---|
committer | Henrik Rentz-Reichert | 2012-02-27 16:03:29 +0000 |
commit | 9b63ec1b9654dd00d644ceb94f664df3e61d6c4e (patch) | |
tree | 3607453cd83d3e2963fd2a415a84289931d29e22 /plugins/org.eclipse.etrice.logging | |
parent | 1b19f7079ee48921ad2fb0169eb73d537f9eab1e (diff) | |
parent | fa4a03389b5596fbaa65d5acb0e198013c1820a8 (diff) | |
download | org.eclipse.etrice-9b63ec1b9654dd00d644ceb94f664df3e61d6c4e.tar.gz org.eclipse.etrice-9b63ec1b9654dd00d644ceb94f664df3e61d6c4e.tar.xz org.eclipse.etrice-9b63ec1b9654dd00d644ceb94f664df3e61d6c4e.zip |
Merge remote branch 'refs/remotes/origin/master'
Conflicts:
plugins/org.eclipse.etrice.generator.c/xtend-gen/org/eclipse/etrice/generator/c/gen/ActorClassGen.java
plugins/org.eclipse.etrice.generator.c/xtend-gen/org/eclipse/etrice/generator/c/gen/ProtocolClassGen.java
plugins/org.eclipse.etrice.generator/xtend-gen/org/eclipse/etrice/generator/generic/GenericProtocolClassGenerator.java
Diffstat (limited to 'plugins/org.eclipse.etrice.logging')
-rw-r--r-- | plugins/org.eclipse.etrice.logging/bin/log4j.properties | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/plugins/org.eclipse.etrice.logging/bin/log4j.properties b/plugins/org.eclipse.etrice.logging/bin/log4j.properties new file mode 100644 index 000000000..4bb6f37ad --- /dev/null +++ b/plugins/org.eclipse.etrice.logging/bin/log4j.properties @@ -0,0 +1,7 @@ +log4j.rootCategory=INFO, S
+
+log4j.logger.org.eclipse.xtext=INFO
+
+log4j.appender.S = org.apache.log4j.ConsoleAppender
+log4j.appender.S.layout = org.apache.log4j.PatternLayout
+log4j.appender.S.layout.ConversionPattern = %d{yyyy-MM-dd HH:mm:ss} %c{1} [%p] %m%n
|