Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHenrik Rentz-Reichert2012-02-02 05:09:22 -0500
committerHenrik Rentz-Reichert2012-02-02 05:09:22 -0500
commit0de5eb081f268c234947d86994102fa3a8ce864a (patch)
tree58bbb67c81c4d2d1c41909d92e6d1fc820f187a3 /plugins/org.eclipse.etrice.logging
parentb55690aca6ad5d17e699e809af481d1ffd04191e (diff)
parentcfe46b9799947e484ed42a2eefded0db55d43904 (diff)
downloadorg.eclipse.etrice-0de5eb081f268c234947d86994102fa3a8ce864a.tar.gz
org.eclipse.etrice-0de5eb081f268c234947d86994102fa3a8ce864a.tar.xz
org.eclipse.etrice-0de5eb081f268c234947d86994102fa3a8ce864a.zip
Merge remote branch 'refs/remotes/origin/master'
Conflicts: plugins/org.eclipse.etrice.generator.c/src/org/eclipse/etrice/generator/c/gen/ActorClassGen.xtend plugins/org.eclipse.etrice.generator.c/xtend-gen/org/eclipse/etrice/generator/c/gen/ActorClassGen.java plugins/org.eclipse.etrice.generator.java/xtend-gen/org/eclipse/etrice/generator/java/gen/ActorClassGen.java plugins/org.eclipse.etrice.generator.java/xtend-gen/org/eclipse/etrice/generator/java/gen/StateMachineGen.java plugins/org.eclipse.etrice.generator/xtend-gen/org/eclipse/etrice/generator/extensions/RoomExtensions.java
Diffstat (limited to 'plugins/org.eclipse.etrice.logging')
-rw-r--r--plugins/org.eclipse.etrice.logging/META-INF/MANIFEST.MF16
-rw-r--r--plugins/org.eclipse.etrice.logging/bin/log4j.properties14
2 files changed, 15 insertions, 15 deletions
diff --git a/plugins/org.eclipse.etrice.logging/META-INF/MANIFEST.MF b/plugins/org.eclipse.etrice.logging/META-INF/MANIFEST.MF
index fac3d56d1..033ea19e4 100644
--- a/plugins/org.eclipse.etrice.logging/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.etrice.logging/META-INF/MANIFEST.MF
@@ -1,8 +1,8 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: eTrice Logging Fragment
-Bundle-SymbolicName: org.eclipse.etrice.logging
-Bundle-Version: 0.1.0.qualifier
-Bundle-Vendor: eTrice (Incubation)
-Fragment-Host: org.apache.log4j;bundle-version="1.2.15"
-Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: eTrice Logging Fragment
+Bundle-SymbolicName: org.eclipse.etrice.logging
+Bundle-Version: 0.1.0.qualifier
+Bundle-Vendor: eTrice (Incubation)
+Fragment-Host: org.apache.log4j;bundle-version="1.2.15"
+Bundle-RequiredExecutionEnvironment: JavaSE-1.6
diff --git a/plugins/org.eclipse.etrice.logging/bin/log4j.properties b/plugins/org.eclipse.etrice.logging/bin/log4j.properties
index 711e8bc45..4bb6f37ad 100644
--- a/plugins/org.eclipse.etrice.logging/bin/log4j.properties
+++ b/plugins/org.eclipse.etrice.logging/bin/log4j.properties
@@ -1,7 +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
+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

Back to the top