From 6f20bd98c54ef5320f89d0cf37de87b07df09bf4 Mon Sep 17 00:00:00 2001 From: pfriese Date: Tue, 29 Jul 2008 13:38:42 +0000 Subject: [PATCH] Added logging. --- plugins/org.eclipse.xtext.util/META-INF/MANIFEST.MF | 6 +++--- .../src/org/eclipse/xtext/util/Files.java | 5 ++--- plugins/org.eclipse.xtext/META-INF/MANIFEST.MF | 4 ++-- plugins/org.eclipse.xtext/src/log4j.properties | 8 ++++++++ .../src/org/eclipse/xtext/EcoreUtil2.java | 6 +++--- .../AbstractAnnotationBasedValueConverterService.java | 5 ++--- .../eclipse/xtext/parser/antlr/AbstractAntlrParser.java | 5 ++--- .../reconstr/callbacks/WhitespacePreservingCallback.java | 1 - .../org/eclipse/xtext/xtextutil/impl/XtextutilUtil.java | 5 ++--- .../src/org/eclipse/xtext/GenerateAllTestGrammars.java | 6 +++--- 10 files changed, 27 insertions(+), 24 deletions(-) create mode 100644 plugins/org.eclipse.xtext/src/log4j.properties diff --git a/plugins/org.eclipse.xtext.util/META-INF/MANIFEST.MF b/plugins/org.eclipse.xtext.util/META-INF/MANIFEST.MF index 95d8d9c1a..c4624f81e 100644 --- a/plugins/org.eclipse.xtext.util/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.xtext.util/META-INF/MANIFEST.MF @@ -6,6 +6,6 @@ Bundle-Version: 1.0.0 Bundle-Vendor: itemis AG Bundle-RequiredExecutionEnvironment: J2SE-1.5 Export-Package: org.eclipse.xtext.util -Require-Bundle: org.apache.commons.logging;bundle-version="1.0.4", - org.eclipse.emf.ecore;bundle-version="2.3.2", - org.junit;bundle-version="3.8.2" +Require-Bundle: org.eclipse.emf.ecore;bundle-version="2.3.2", + org.junit;bundle-version="3.8.2", + org.eclipse.xtext.log4j;bundle-version="1.2.15" diff --git a/plugins/org.eclipse.xtext.util/src/org/eclipse/xtext/util/Files.java b/plugins/org.eclipse.xtext.util/src/org/eclipse/xtext/util/Files.java index 4c9751ad7..0a27ea0c6 100644 --- a/plugins/org.eclipse.xtext.util/src/org/eclipse/xtext/util/Files.java +++ b/plugins/org.eclipse.xtext.util/src/org/eclipse/xtext/util/Files.java @@ -14,8 +14,7 @@ import java.io.IOException; import java.io.InputStream; import java.util.List; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.apache.log4j.Logger; /** * @author Jan Köhnlein - Initial contribution and API @@ -23,7 +22,7 @@ import org.apache.commons.logging.LogFactory; */ public class Files { - private static Log log = LogFactory.getLog(Files.class); + private static Logger log = Logger.getLogger(Files.class); public static void copyFiles(String sourceDir, String targetDir, List files) { File target = new File(targetDir); diff --git a/plugins/org.eclipse.xtext/META-INF/MANIFEST.MF b/plugins/org.eclipse.xtext/META-INF/MANIFEST.MF index afde40e87..d658c39e2 100644 --- a/plugins/org.eclipse.xtext/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.xtext/META-INF/MANIFEST.MF @@ -27,9 +27,9 @@ Export-Package: org.eclipse.xtext, org.eclipse.xtext.util, org.eclipse.xtext.xtextutil, org.eclipse.xtext.xtextutil.util -Require-Bundle: org.eclipse.emf.ecore;visibility:=reexport, +Require-Bundle: org.eclipse.xtext.log4j;bundle-version="1.2.15", + org.eclipse.emf.ecore;visibility:=reexport, org.antlr;visibility:=reexport, - org.apache.commons.logging, org.openarchitectureware.util.stdlib, org.eclipse.emf.ecore.xmi;bundle-version="2.3.2";visibility:=reexport, org.eclipse.xtext.service;bundle-version="1.0.0";visibility:=reexport, diff --git a/plugins/org.eclipse.xtext/src/log4j.properties b/plugins/org.eclipse.xtext/src/log4j.properties new file mode 100644 index 000000000..850552edf --- /dev/null +++ b/plugins/org.eclipse.xtext/src/log4j.properties @@ -0,0 +1,8 @@ +log4j.rootLogger=debug, default + +log4j.appender.default=org.apache.log4j.ConsoleAppender +log4j.appender.default.layout=org.apache.log4j.PatternLayout +log4j.appender.default.layout.ConversionPattern=!!standalone!! %-4r [%t] %-5p %c %x - %m%n + +log4j.logger.org.eclipse.xtext.ui=WARN +log4j.logger.org.eclipse.xtext.reference.ui=DEBUG \ No newline at end of file diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/EcoreUtil2.java b/plugins/org.eclipse.xtext/src/org/eclipse/xtext/EcoreUtil2.java index d5f391057..1230e6a68 100644 --- a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/EcoreUtil2.java +++ b/plugins/org.eclipse.xtext/src/org/eclipse/xtext/EcoreUtil2.java @@ -4,8 +4,7 @@ import java.io.IOException; import java.util.ArrayList; import java.util.List; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.apache.log4j.Logger; import org.eclipse.emf.common.util.EList; import org.eclipse.emf.common.util.TreeIterator; import org.eclipse.emf.common.util.URI; @@ -19,7 +18,8 @@ import org.eclipse.xtext.resource.ClassloaderClasspathUriResolver; import org.eclipse.xtext.resource.XtextResourceSet; public class EcoreUtil2 extends EcoreUtil { - private static Log log = LogFactory.getLog(EcoreUtil2.class); + + private static Logger log = Logger.getLogger(EcoreUtil2.class); @SuppressWarnings("unchecked") public static T getContainerOfType(EObject ele, Class type) { diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/conversion/impl/AbstractAnnotationBasedValueConverterService.java b/plugins/org.eclipse.xtext/src/org/eclipse/xtext/conversion/impl/AbstractAnnotationBasedValueConverterService.java index 9fa4f71f5..fba175d3a 100644 --- a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/conversion/impl/AbstractAnnotationBasedValueConverterService.java +++ b/plugins/org.eclipse.xtext/src/org/eclipse/xtext/conversion/impl/AbstractAnnotationBasedValueConverterService.java @@ -4,15 +4,14 @@ import java.lang.reflect.Method; import java.util.HashMap; import java.util.Map; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.apache.log4j.Logger; import org.eclipse.xtext.conversion.IValueConverter; import org.eclipse.xtext.conversion.IValueConverterService; import org.eclipse.xtext.conversion.ValueConverter; public class AbstractAnnotationBasedValueConverterService implements IValueConverterService { - private Log log = LogFactory.getLog(AbstractAnnotationBasedValueConverterService.class); + private static Logger log = Logger.getLogger(AbstractAnnotationBasedValueConverterService.class); public final String toString(Object value, String lexerRule) { return getConverter(lexerRule).toString(value); diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/parser/antlr/AbstractAntlrParser.java b/plugins/org.eclipse.xtext/src/org/eclipse/xtext/parser/antlr/AbstractAntlrParser.java index f63f8292f..5ae5b4664 100644 --- a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/parser/antlr/AbstractAntlrParser.java +++ b/plugins/org.eclipse.xtext/src/org/eclipse/xtext/parser/antlr/AbstractAntlrParser.java @@ -19,8 +19,7 @@ import org.antlr.runtime.Parser; import org.antlr.runtime.RecognitionException; import org.antlr.runtime.Token; import org.antlr.runtime.TokenStream; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.apache.log4j.Logger; import org.eclipse.emf.common.util.EList; import org.eclipse.emf.common.util.URI; import org.eclipse.emf.common.util.WrappedException; @@ -45,7 +44,7 @@ import org.eclipse.xtext.util.Strings; public abstract class AbstractAntlrParser extends Parser { - private static Log log = LogFactory.getLog(AbstractAntlrParser.class); + private static Logger log = Logger.getLogger(AbstractAntlrParser.class); protected CompositeNode currentNode; diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/parsetree/reconstr/callbacks/WhitespacePreservingCallback.java b/plugins/org.eclipse.xtext/src/org/eclipse/xtext/parsetree/reconstr/callbacks/WhitespacePreservingCallback.java index dc0bc51b0..2eed61975 100644 --- a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/parsetree/reconstr/callbacks/WhitespacePreservingCallback.java +++ b/plugins/org.eclipse.xtext/src/org/eclipse/xtext/parsetree/reconstr/callbacks/WhitespacePreservingCallback.java @@ -16,7 +16,6 @@ import org.eclipse.xtext.parsetree.reconstr.IInstanceDescription; public class WhitespacePreservingCallback extends SimpleSerializingCallback { - // private final Log log = LogFactory.getLog(getClass()); private Map> numberOfOccurences = new HashMap>(); public WhitespacePreservingCallback(IValueConverterService converterService) { diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/xtextutil/impl/XtextutilUtil.java b/plugins/org.eclipse.xtext/src/org/eclipse/xtext/xtextutil/impl/XtextutilUtil.java index 253794ca9..11ae2466d 100644 --- a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/xtextutil/impl/XtextutilUtil.java +++ b/plugins/org.eclipse.xtext/src/org/eclipse/xtext/xtextutil/impl/XtextutilUtil.java @@ -1,14 +1,13 @@ package org.eclipse.xtext.xtextutil.impl; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.apache.log4j.Logger; import org.eclipse.xtext.AbstractMetamodelDeclaration; import org.eclipse.xtext.GeneratedMetamodel; import org.eclipse.xtext.xtextutil.MetaModel; public class XtextutilUtil { - private static Log log = LogFactory.getLog(XtextutilUtil.class); + private static Logger log = Logger.getLogger(XtextutilUtil.class); public static String alias(MetaModelImpl metaModelImpl) { AbstractMetamodelDeclaration declaration = metaModelImpl.getDeclaration(); diff --git a/tests/org.eclipse.xtext.generator.tests/src/org/eclipse/xtext/GenerateAllTestGrammars.java b/tests/org.eclipse.xtext.generator.tests/src/org/eclipse/xtext/GenerateAllTestGrammars.java index 95d0cd918..ec76780e6 100755 --- a/tests/org.eclipse.xtext.generator.tests/src/org/eclipse/xtext/GenerateAllTestGrammars.java +++ b/tests/org.eclipse.xtext.generator.tests/src/org/eclipse/xtext/GenerateAllTestGrammars.java @@ -8,8 +8,7 @@ *******************************************************************************/ package org.eclipse.xtext; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.apache.log4j.Logger; import org.eclipse.emf.common.util.URI; import org.eclipse.emf.ecore.resource.Resource; import org.eclipse.emf.ecore.resource.impl.ResourceSetImpl; @@ -34,7 +33,8 @@ import org.eclipse.xtext.testlanguages.TestLanguage; */ public class GenerateAllTestGrammars { private static String path = "./src-gen"; - private static Log log = LogFactory.getLog(GenerateAllTestGrammars.class); + + private static Logger log = Logger.getLogger(GenerateAllTestGrammars.class); public final static Class[] testclasses = new Class[] { AbstractTestLanguage.class,ConcreteTestLanguage.class,XtextGrammarTest.class, MetamodelRefTest.class, DummyLanguage.class, TestLanguage.class, SimpleReconstrTest.class, ComplexReconstrTest.class,