Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEd Willink2020-01-26 12:48:37 +0000
committerEd Willink2020-02-26 13:32:32 +0000
commitbc0dc0a1aa7d2531a7a6b5189dd733cfe3609d99 (patch)
treec685e9f9750716c9ef5b852f6fc29cda6f43656a
parent3fba3fb7006c2649e7b6e93c6b509ee8b40a9f32 (diff)
downloadorg.eclipse.qvtd-ewillink/559532.tar.gz
org.eclipse.qvtd-ewillink/559532.tar.xz
org.eclipse.qvtd-ewillink/559532.zip
[559532] wip using slf4j rather than log4jewillink/559532
-rw-r--r--doc/org.eclipse.qvtd.doc.minioclcs.xtext.ui/META-INF/MANIFEST.MF2
-rw-r--r--doc/org.eclipse.qvtd.doc.minioclcs.xtext.ui/src-gen/org/eclipse/qvtd/doc/minioclcs/xtext/ui/internal/XtextActivator.java41
-rw-r--r--doc/org.eclipse.qvtd.doc.minioclcs.xtext/META-INF/MANIFEST.MF2
-rw-r--r--plugins/org.eclipse.qvt/META-INF/MANIFEST.MF2
-rw-r--r--plugins/org.eclipse.qvtd.cs2as.build/META-INF/MANIFEST.MF2
-rw-r--r--plugins/org.eclipse.qvtd.cs2as.compiler/META-INF/MANIFEST.MF2
-rw-r--r--plugins/org.eclipse.qvtd.cs2as.compiler/src/org/eclipse/qvtd/cs2as/compiler/internal/OCL2QVTm.java2
-rw-r--r--plugins/org.eclipse.qvtd.debug.ui/META-INF/MANIFEST.MF2
-rw-r--r--plugins/org.eclipse.qvtd.debug.ui/src/org/eclipse/qvtd/debug/ui/QVTdDebugUIPlugin.java5
-rw-r--r--plugins/org.eclipse.qvtd.debug.ui/src/org/eclipse/qvtd/debug/ui/actions/QVTiDebugImages.java7
-rw-r--r--plugins/org.eclipse.qvtd.debug.ui/src/org/eclipse/qvtd/debug/ui/launching/AbstractMainTab.java7
-rw-r--r--plugins/org.eclipse.qvtd.pivot.qvtimperative/META-INF/MANIFEST.MF2
-rw-r--r--plugins/org.eclipse.qvtd.xtext.qvtbase.ui/META-INF/MANIFEST.MF2
-rw-r--r--plugins/org.eclipse.qvtd.xtext.qvtbase.ui/src-gen/org/eclipse/qvtd/xtext/qvtbase/ui/internal/QVTbaseActivator.java5
-rw-r--r--plugins/org.eclipse.qvtd.xtext.qvtbase.ui/src/org/eclipse/qvtd/xtext/qvtbase/ui/QVTdProjectHelper.java5
-rw-r--r--plugins/org.eclipse.qvtd.xtext.qvtbase.ui/src/org/eclipse/qvtd/xtext/qvtbase/ui/builder/QVTdBuilder.java5
-rw-r--r--plugins/org.eclipse.qvtd.xtext.qvtbase.ui/src/org/eclipse/qvtd/xtext/qvtbase/ui/commands/ToggleQVTdNatureCommand.java5
-rw-r--r--plugins/org.eclipse.qvtd.xtext.qvtbase/META-INF/MANIFEST.MF2
-rw-r--r--plugins/org.eclipse.qvtd.xtext.qvtcore.ui/META-INF/MANIFEST.MF2
-rw-r--r--plugins/org.eclipse.qvtd.xtext.qvtcore.ui/src-gen/org/eclipse/qvtd/xtext/qvtcore/ui/internal/QVTcoreActivator.java5
-rw-r--r--plugins/org.eclipse.qvtd.xtext.qvtcore/META-INF/MANIFEST.MF2
-rw-r--r--plugins/org.eclipse.qvtd.xtext.qvtimperative.ui/META-INF/MANIFEST.MF2
-rw-r--r--plugins/org.eclipse.qvtd.xtext.qvtimperative.ui/src-gen/org/eclipse/qvtd/xtext/qvtimperative/ui/internal/QVTimperativeActivator.java5
-rw-r--r--plugins/org.eclipse.qvtd.xtext.qvtimperative/META-INF/MANIFEST.MF2
-rw-r--r--plugins/org.eclipse.qvtd.xtext.qvtrelation.ui/META-INF/MANIFEST.MF2
-rw-r--r--plugins/org.eclipse.qvtd.xtext.qvtrelation.ui/src-gen/org/eclipse/qvtd/xtext/qvtrelation/ui/internal/QVTrelationActivator.java5
-rw-r--r--plugins/org.eclipse.qvtd.xtext.qvtrelation/META-INF/MANIFEST.MF2
-rw-r--r--plugins/org.eclipse.qvtd.xtext.qvtrelation/src/org/eclipse/qvtd/xtext/qvtrelation/as2cs/QVTrelationDeclarationVisitor.java5
-rw-r--r--plugins/org.eclipse.qvtd.xtext.qvtrelation/src/org/eclipse/qvtd/xtext/qvtrelation/as2cs/QVTrelationExpressionVisitor.java5
-rw-r--r--releng/org.eclipse.qvtd.build/META-INF/MANIFEST.MF2
-rw-r--r--releng/org.eclipse.qvtd.build/src/org/eclipse/qvtd/build/utilities/CompileQVTrTransformation.java5
31 files changed, 80 insertions, 64 deletions
diff --git a/doc/org.eclipse.qvtd.doc.minioclcs.xtext.ui/META-INF/MANIFEST.MF b/doc/org.eclipse.qvtd.doc.minioclcs.xtext.ui/META-INF/MANIFEST.MF
index dcbba43e6..01ddd2b98 100644
--- a/doc/org.eclipse.qvtd.doc.minioclcs.xtext.ui/META-INF/MANIFEST.MF
+++ b/doc/org.eclipse.qvtd.doc.minioclcs.xtext.ui/META-INF/MANIFEST.MF
@@ -18,7 +18,7 @@ Require-Bundle: org.eclipse.compare;bundle-version="[3.5.0,4.0.0)",
org.eclipse.qvtd.doc.minioclcs.xtext.ide;bundle-version="[0.20.0,1.0.0)",
org.eclipse.ui,
org.eclipse.ui.editors
-Import-Package: org.apache.log4j
+Import-Package: org.slf4j;version="[1.7.2,2.0.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Export-Package: org.eclipse.qvtd.doc.minioclcs.xtext.ui.internal,
org.eclipse.qvtd.doc.ui;x-internal:=true,
diff --git a/doc/org.eclipse.qvtd.doc.minioclcs.xtext.ui/src-gen/org/eclipse/qvtd/doc/minioclcs/xtext/ui/internal/XtextActivator.java b/doc/org.eclipse.qvtd.doc.minioclcs.xtext.ui/src-gen/org/eclipse/qvtd/doc/minioclcs/xtext/ui/internal/XtextActivator.java
index 859773093..51938ad33 100644
--- a/doc/org.eclipse.qvtd.doc.minioclcs.xtext.ui/src-gen/org/eclipse/qvtd/doc/minioclcs/xtext/ui/internal/XtextActivator.java
+++ b/doc/org.eclipse.qvtd.doc.minioclcs.xtext.ui/src-gen/org/eclipse/qvtd/doc/minioclcs/xtext/ui/internal/XtextActivator.java
@@ -13,51 +13,54 @@
*/
package org.eclipse.qvtd.doc.minioclcs.xtext.ui.internal;
-import com.google.common.collect.Maps;
-import com.google.inject.Guice;
-import com.google.inject.Injector;
import java.util.Collections;
import java.util.Map;
-import org.apache.log4j.Logger;
+
import org.eclipse.qvtd.doc.MiniOCLCSRuntimeModule;
import org.eclipse.qvtd.doc.ui.MiniOCLCSUiModule;
import org.eclipse.ui.plugin.AbstractUIPlugin;
import org.eclipse.xtext.ui.shared.SharedStateModule;
import org.eclipse.xtext.util.Modules2;
import org.osgi.framework.BundleContext;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.google.common.collect.Maps;
+import com.google.inject.Guice;
+import com.google.inject.Injector;
/**
* This class was generated. Customizations should only happen in a newly
- * introduced subclass.
+ * introduced subclass.
*/
public class XtextActivator extends AbstractUIPlugin {
public static final String PLUGIN_ID = "org.eclipse.qvtd.doc.minioclcs.xtext.ui";
public static final String ORG_ECLIPSE_QVTD_DOC_MINIOCLCS = "org.eclipse.qvtd.doc.MiniOCLCS";
-
- private static final Logger logger = Logger.getLogger(XtextActivator.class);
-
+
+ private static final Logger logger = LoggerFactory.getLogger(XtextActivator.class);
+
private static XtextActivator INSTANCE;
-
+
private Map<String, Injector> injectors = Collections.synchronizedMap(Maps.<String, Injector> newHashMapWithExpectedSize(1));
-
+
@Override
public void start(BundleContext context) throws Exception {
super.start(context);
INSTANCE = this;
}
-
+
@Override
public void stop(BundleContext context) throws Exception {
injectors.clear();
INSTANCE = null;
super.stop(context);
}
-
+
public static XtextActivator getInstance() {
return INSTANCE;
}
-
+
public Injector getInjector(String language) {
synchronized (injectors) {
Injector injector = injectors.get(language);
@@ -67,7 +70,7 @@ public class XtextActivator extends AbstractUIPlugin {
return injector;
}
}
-
+
protected Injector createInjector(String language) {
try {
com.google.inject.Module runtimeModule = getRuntimeModule(language);
@@ -81,24 +84,24 @@ public class XtextActivator extends AbstractUIPlugin {
throw new RuntimeException("Failed to create injector for " + language, e);
}
}
-
+
protected com.google.inject.Module getRuntimeModule(String grammar) {
if (ORG_ECLIPSE_QVTD_DOC_MINIOCLCS.equals(grammar)) {
return new MiniOCLCSRuntimeModule();
}
throw new IllegalArgumentException(grammar);
}
-
+
protected com.google.inject.Module getUiModule(String grammar) {
if (ORG_ECLIPSE_QVTD_DOC_MINIOCLCS.equals(grammar)) {
return new MiniOCLCSUiModule(this);
}
throw new IllegalArgumentException(grammar);
}
-
+
protected com.google.inject.Module getSharedStateModule() {
return new SharedStateModule();
}
-
-
+
+
}
diff --git a/doc/org.eclipse.qvtd.doc.minioclcs.xtext/META-INF/MANIFEST.MF b/doc/org.eclipse.qvtd.doc.minioclcs.xtext/META-INF/MANIFEST.MF
index f76c659a1..ae4813a75 100644
--- a/doc/org.eclipse.qvtd.doc.minioclcs.xtext/META-INF/MANIFEST.MF
+++ b/doc/org.eclipse.qvtd.doc.minioclcs.xtext/META-INF/MANIFEST.MF
@@ -32,5 +32,5 @@ Export-Package: org.eclipse.qvtd.doc,
org.eclipse.qvtd.doc.serializer,
org.eclipse.qvtd.doc.services,
org.eclipse.qvtd.doc.validation
-Import-Package: org.apache.log4j
+Import-Package: org.slf4j;version="[1.7.2,2.0.0)"
Automatic-Module-Name: org.eclipse.qvtd.doc.minioclcs.xtext
diff --git a/plugins/org.eclipse.qvt/META-INF/MANIFEST.MF b/plugins/org.eclipse.qvt/META-INF/MANIFEST.MF
index 089d393f4..a8e1603da 100644
--- a/plugins/org.eclipse.qvt/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.qvt/META-INF/MANIFEST.MF
@@ -9,6 +9,6 @@ Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.5.0,4.0.0)",
org.eclipse.uml2.uml.resources;bundle-version="[3.0.0,6.0.0)",
org.eclipse.ocl.pivot;bundle-version="[1.1.0,2.0.0)"
-Import-Package: org.apache.log4j
+Import-Package: org.slf4j;version="[1.7.2,2.0.0)"
Automatic-Module-Name: org.eclipse.qvt
Export-Package: org.eclipse.qvt.tools
diff --git a/plugins/org.eclipse.qvtd.cs2as.build/META-INF/MANIFEST.MF b/plugins/org.eclipse.qvtd.cs2as.build/META-INF/MANIFEST.MF
index 234a1167b..bf188d378 100644
--- a/plugins/org.eclipse.qvtd.cs2as.build/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.qvtd.cs2as.build/META-INF/MANIFEST.MF
@@ -19,4 +19,4 @@ Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Bundle-Vendor: %providerName
Automatic-Module-Name: org.eclipse.qvtd.cs2as.build
Import-Package: org.apache.commons.logging,
- org.apache.log4j
+ org.slf4j;version="[1.7.2,2.0.0)"
diff --git a/plugins/org.eclipse.qvtd.cs2as.compiler/META-INF/MANIFEST.MF b/plugins/org.eclipse.qvtd.cs2as.compiler/META-INF/MANIFEST.MF
index 735c46bd9..323890f91 100644
--- a/plugins/org.eclipse.qvtd.cs2as.compiler/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.qvtd.cs2as.compiler/META-INF/MANIFEST.MF
@@ -17,5 +17,5 @@ Require-Bundle: org.eclipse.ocl.xtext.completeocl;bundle-version="[1.11.0,1.12.0
org.eclipse.qvtd.compiler;bundle-version="[0.20.0,1.0.0)"
Bundle-ActivationPolicy: lazy
Import-Package: org.apache.commons.logging,
- org.apache.log4j
+ org.slf4j;version="[1.7.2,2.0.0)"
Automatic-Module-Name: org.eclipse.qvtd.cs2as.compiler
diff --git a/plugins/org.eclipse.qvtd.cs2as.compiler/src/org/eclipse/qvtd/cs2as/compiler/internal/OCL2QVTm.java b/plugins/org.eclipse.qvtd.cs2as.compiler/src/org/eclipse/qvtd/cs2as/compiler/internal/OCL2QVTm.java
index 6d947fe34..b731befde 100644
--- a/plugins/org.eclipse.qvtd.cs2as.compiler/src/org/eclipse/qvtd/cs2as/compiler/internal/OCL2QVTm.java
+++ b/plugins/org.eclipse.qvtd.cs2as.compiler/src/org/eclipse/qvtd/cs2as/compiler/internal/OCL2QVTm.java
@@ -80,7 +80,7 @@ import org.eclipse.qvtd.pivot.qvtcore.RealizedVariable;
public class OCL2QVTm {
- // private @NonNull Logger logger = Logger.getLogger(getClass().getName());
+ // private @NonNull Logger logger = LoggerFactory.getLogger(getClass().getName());
private @NonNull EnvironmentFactory envFact;
private @NonNull String traceabilityPropName;
// private @Nullable Map<?,?> saveOptions;
diff --git a/plugins/org.eclipse.qvtd.debug.ui/META-INF/MANIFEST.MF b/plugins/org.eclipse.qvtd.debug.ui/META-INF/MANIFEST.MF
index 9e677ec06..ec898c31b 100644
--- a/plugins/org.eclipse.qvtd.debug.ui/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.qvtd.debug.ui/META-INF/MANIFEST.MF
@@ -23,7 +23,7 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.5.0,4.0.0)",
org.eclipse.qvtd.xtext.qvtrelation;bundle-version="[0.20.0,1.0.0)"
Bundle-Activator: org.eclipse.qvtd.debug.ui.QVTdDebugUIPlugin
Bundle-ActivationPolicy: lazy
-Import-Package: org.apache.log4j,
+Import-Package: org.slf4j;version="[1.7.2,2.0.0)",
org.eclipse.qvtd.umlx.compiler
Export-Package: org.eclipse.qvtd.debug.ui,
org.eclipse.qvtd.debug.ui.actions,
diff --git a/plugins/org.eclipse.qvtd.debug.ui/src/org/eclipse/qvtd/debug/ui/QVTdDebugUIPlugin.java b/plugins/org.eclipse.qvtd.debug.ui/src/org/eclipse/qvtd/debug/ui/QVTdDebugUIPlugin.java
index 37d97bf7a..d85e656d6 100644
--- a/plugins/org.eclipse.qvtd.debug.ui/src/org/eclipse/qvtd/debug/ui/QVTdDebugUIPlugin.java
+++ b/plugins/org.eclipse.qvtd.debug.ui/src/org/eclipse/qvtd/debug/ui/QVTdDebugUIPlugin.java
@@ -13,7 +13,8 @@ package org.eclipse.qvtd.debug.ui;
import java.net.URL;
import java.util.Collections;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.FileLocator;
import org.eclipse.core.runtime.IStatus;
@@ -51,7 +52,7 @@ public class QVTdDebugUIPlugin extends AbstractUIPlugin {
// The shared instance
private static QVTdDebugUIPlugin plugin;
- private static final Logger logger = Logger.getLogger(QVTdDebugUIPlugin.class);
+ private static final Logger logger = LoggerFactory.getLogger(QVTdDebugUIPlugin.class);
protected ImageRegistry imageDescriptorRegistry;
diff --git a/plugins/org.eclipse.qvtd.debug.ui/src/org/eclipse/qvtd/debug/ui/actions/QVTiDebugImages.java b/plugins/org.eclipse.qvtd.debug.ui/src/org/eclipse/qvtd/debug/ui/actions/QVTiDebugImages.java
index db08a487f..47a6ce0f8 100644
--- a/plugins/org.eclipse.qvtd.debug.ui/src/org/eclipse/qvtd/debug/ui/actions/QVTiDebugImages.java
+++ b/plugins/org.eclipse.qvtd.debug.ui/src/org/eclipse/qvtd/debug/ui/actions/QVTiDebugImages.java
@@ -11,18 +11,19 @@
*******************************************************************************/
package org.eclipse.qvtd.debug.ui.actions;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.eclipse.jface.resource.ImageRegistry;
import org.eclipse.qvtd.debug.ui.QVTdDebugUIPlugin;
import org.eclipse.swt.graphics.Image;
public class QVTiDebugImages
{
- private static final Logger logger = Logger.getLogger(QVTiDebugImages.class);
+ private static final Logger logger = LoggerFactory.getLogger(QVTiDebugImages.class);
public static final String TRANSFORMATION = "Transformation"; //$NON-NLS-1$
public static final String MAPPING = "Mapping"; //$NON-NLS-1$
-
+
private static ImageRegistry fgImageRegistry = QVTdDebugUIPlugin.getDefault().getImageRegistry();
protected QVTiDebugImages() {
diff --git a/plugins/org.eclipse.qvtd.debug.ui/src/org/eclipse/qvtd/debug/ui/launching/AbstractMainTab.java b/plugins/org.eclipse.qvtd.debug.ui/src/org/eclipse/qvtd/debug/ui/launching/AbstractMainTab.java
index 7438d1fa8..c67401ebb 100644
--- a/plugins/org.eclipse.qvtd.debug.ui/src/org/eclipse/qvtd/debug/ui/launching/AbstractMainTab.java
+++ b/plugins/org.eclipse.qvtd.debug.ui/src/org/eclipse/qvtd/debug/ui/launching/AbstractMainTab.java
@@ -11,7 +11,8 @@
*******************************************************************************/
package org.eclipse.qvtd.debug.ui.launching;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.eclipse.core.resources.IFile;
import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.IAdaptable;
@@ -34,10 +35,10 @@ import org.eclipse.ui.part.FileEditorInput;
public abstract class AbstractMainTab extends AbstractLaunchConfigurationTab
{
- private static final Logger logger = Logger.getLogger(AbstractMainTab.class);
+ private static final Logger logger = LoggerFactory.getLogger(AbstractMainTab.class);
protected @Nullable OCLInternal ocl; // FIXME Add a dispose() when not visible for a long time
-
+
@Override
public void dispose() {
OCL ocl2 = ocl;
diff --git a/plugins/org.eclipse.qvtd.pivot.qvtimperative/META-INF/MANIFEST.MF b/plugins/org.eclipse.qvtd.pivot.qvtimperative/META-INF/MANIFEST.MF
index 8a453012a..1a733bbcf 100644
--- a/plugins/org.eclipse.qvtd.pivot.qvtimperative/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.qvtd.pivot.qvtimperative/META-INF/MANIFEST.MF
@@ -25,5 +25,5 @@ Require-Bundle: org.eclipse.core.resources;bundle-version="[3.5.0,4.0.0)",
Bundle-ActivationPolicy: lazy
Import-Package: com.google.inject,
com.google.common.collect,
- org.apache.log4j;version="1.2.15"
+ org.slf4j;version="[1.7.2,2.0.0)"
Automatic-Module-Name: org.eclipse.qvtd.pivot.qvtimperative
diff --git a/plugins/org.eclipse.qvtd.xtext.qvtbase.ui/META-INF/MANIFEST.MF b/plugins/org.eclipse.qvtd.xtext.qvtbase.ui/META-INF/MANIFEST.MF
index 6b49d8002..21f0136ce 100644
--- a/plugins/org.eclipse.qvtd.xtext.qvtbase.ui/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.qvtd.xtext.qvtbase.ui/META-INF/MANIFEST.MF
@@ -23,6 +23,6 @@ Export-Package: org.eclipse.qvtd.xtext.qvtbase.ui,
org.eclipse.qvtd.xtext.qvtbase.ui.outline,
org.eclipse.qvtd.xtext.qvtbase.ui.quickfix
Bundle-ActivationPolicy: lazy
-Import-Package: org.apache.log4j;version="1.2.15"
+Import-Package: org.slf4j;version="[1.7.2,2.0.0)"
Bundle-Activator: org.eclipse.qvtd.xtext.qvtbase.ui.internal.QVTbaseActivator
Automatic-Module-Name: org.eclipse.qvtd.xtext.qvtbase.ui
diff --git a/plugins/org.eclipse.qvtd.xtext.qvtbase.ui/src-gen/org/eclipse/qvtd/xtext/qvtbase/ui/internal/QVTbaseActivator.java b/plugins/org.eclipse.qvtd.xtext.qvtbase.ui/src-gen/org/eclipse/qvtd/xtext/qvtbase/ui/internal/QVTbaseActivator.java
index a4708972a..e87e3e6ef 100644
--- a/plugins/org.eclipse.qvtd.xtext.qvtbase.ui/src-gen/org/eclipse/qvtd/xtext/qvtbase/ui/internal/QVTbaseActivator.java
+++ b/plugins/org.eclipse.qvtd.xtext.qvtbase.ui/src-gen/org/eclipse/qvtd/xtext/qvtbase/ui/internal/QVTbaseActivator.java
@@ -13,7 +13,8 @@ package org.eclipse.qvtd.xtext.qvtbase.ui.internal;
import java.util.Collections;
import java.util.Map;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.eclipse.ui.plugin.AbstractUIPlugin;
import org.eclipse.xtext.ui.shared.SharedStateModule;
import org.eclipse.xtext.util.Modules2;
@@ -32,7 +33,7 @@ public class QVTbaseActivator extends AbstractUIPlugin {
public static final String ORG_ECLIPSE_QVTD_XTEXT_QVTBASE_QVTBASE = "org.eclipse.qvtd.xtext.qvtbase.QVTbase";
- private static final Logger logger = Logger.getLogger(QVTbaseActivator.class);
+ private static final Logger logger = LoggerFactory.getLogger(QVTbaseActivator.class);
private static QVTbaseActivator INSTANCE;
diff --git a/plugins/org.eclipse.qvtd.xtext.qvtbase.ui/src/org/eclipse/qvtd/xtext/qvtbase/ui/QVTdProjectHelper.java b/plugins/org.eclipse.qvtd.xtext.qvtbase.ui/src/org/eclipse/qvtd/xtext/qvtbase/ui/QVTdProjectHelper.java
index b27246a25..61a99071d 100644
--- a/plugins/org.eclipse.qvtd.xtext.qvtbase.ui/src/org/eclipse/qvtd/xtext/qvtbase/ui/QVTdProjectHelper.java
+++ b/plugins/org.eclipse.qvtd.xtext.qvtbase.ui/src/org/eclipse/qvtd/xtext/qvtbase/ui/QVTdProjectHelper.java
@@ -10,7 +10,8 @@
*******************************************************************************/
package org.eclipse.qvtd.xtext.qvtbase.ui;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.eclipse.core.resources.ICommand;
import org.eclipse.core.resources.IProject;
import org.eclipse.core.runtime.CoreException;
@@ -22,7 +23,7 @@ public class QVTdProjectHelper {
public static final String NATURE_ID = "org.eclipse.qvtd.xtext.qvtbase.ui.qvtdnature"; //$NON-NLS-1$
public static final String BUILDER_ID = "org.eclipse.qvtd.xtext.qvtbase.ui.qvtdbuilder"; //$NON-NLS-1$
- private static final Logger log = Logger.getLogger(QVTdProjectHelper.class);
+ private static final Logger log = LoggerFactory.getLogger(QVTdProjectHelper.class);
public static boolean hasNature(IProject project) {
try {
diff --git a/plugins/org.eclipse.qvtd.xtext.qvtbase.ui/src/org/eclipse/qvtd/xtext/qvtbase/ui/builder/QVTdBuilder.java b/plugins/org.eclipse.qvtd.xtext.qvtbase.ui/src/org/eclipse/qvtd/xtext/qvtbase/ui/builder/QVTdBuilder.java
index 720ca776d..4789fe19a 100644
--- a/plugins/org.eclipse.qvtd.xtext.qvtbase.ui/src/org/eclipse/qvtd/xtext/qvtbase/ui/builder/QVTdBuilder.java
+++ b/plugins/org.eclipse.qvtd.xtext.qvtbase.ui/src/org/eclipse/qvtd/xtext/qvtbase/ui/builder/QVTdBuilder.java
@@ -12,7 +12,8 @@ package org.eclipse.qvtd.xtext.qvtbase.ui.builder;
import java.util.Map;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.eclipse.core.resources.IFile;
import org.eclipse.core.resources.IProject;
import org.eclipse.core.runtime.CoreException;
@@ -61,7 +62,7 @@ public class QVTdBuilder extends AbstractValidatingBuilder
}
}
- private static final Logger log = Logger.getLogger(QVTdBuilder.class);
+ private static final Logger log = LoggerFactory.getLogger(QVTdBuilder.class);
public static final String BUILDER_ID = QVTdProjectHelper.BUILDER_ID;
public static void deleteMarkers(@NonNull IProject project, @Nullable Map<String, String> arguments) throws CoreException {
diff --git a/plugins/org.eclipse.qvtd.xtext.qvtbase.ui/src/org/eclipse/qvtd/xtext/qvtbase/ui/commands/ToggleQVTdNatureCommand.java b/plugins/org.eclipse.qvtd.xtext.qvtbase.ui/src/org/eclipse/qvtd/xtext/qvtbase/ui/commands/ToggleQVTdNatureCommand.java
index df298eacf..6db84faf1 100644
--- a/plugins/org.eclipse.qvtd.xtext.qvtbase.ui/src/org/eclipse/qvtd/xtext/qvtbase/ui/commands/ToggleQVTdNatureCommand.java
+++ b/plugins/org.eclipse.qvtd.xtext.qvtbase.ui/src/org/eclipse/qvtd/xtext/qvtbase/ui/commands/ToggleQVTdNatureCommand.java
@@ -12,7 +12,8 @@ package org.eclipse.qvtd.xtext.qvtbase.ui.commands;
import java.util.Iterator;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.eclipse.core.commands.AbstractHandler;
import org.eclipse.core.commands.ExecutionEvent;
import org.eclipse.core.commands.ExecutionException;
@@ -33,7 +34,7 @@ import org.eclipse.ui.handlers.HandlerUtil;
*/
public class ToggleQVTdNatureCommand extends AbstractHandler implements ToggleNatureCommand
{
- private static final Logger log = Logger.getLogger(ToggleQVTdNatureCommand.class);
+ private static final Logger log = LoggerFactory.getLogger(ToggleQVTdNatureCommand.class);
@Override
public Object execute(ExecutionEvent event) throws ExecutionException {
diff --git a/plugins/org.eclipse.qvtd.xtext.qvtbase/META-INF/MANIFEST.MF b/plugins/org.eclipse.qvtd.xtext.qvtbase/META-INF/MANIFEST.MF
index 781cc452e..176ec3442 100644
--- a/plugins/org.eclipse.qvtd.xtext.qvtbase/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.qvtd.xtext.qvtbase/META-INF/MANIFEST.MF
@@ -28,5 +28,5 @@ Export-Package: org.eclipse.qvtd.xtext.qvtbase,
org.eclipse.qvtd.xtext.qvtbasecs,
org.eclipse.qvtd.xtext.qvtbasecs.impl,
org.eclipse.qvtd.xtext.qvtbasecs.util
-Import-Package: org.apache.log4j
+Import-Package: org.slf4j;version="[1.7.2,2.0.0)"
Automatic-Module-Name: org.eclipse.qvtd.xtext.qvtbase
diff --git a/plugins/org.eclipse.qvtd.xtext.qvtcore.ui/META-INF/MANIFEST.MF b/plugins/org.eclipse.qvtd.xtext.qvtcore.ui/META-INF/MANIFEST.MF
index 7e2e4ac70..21e0467ed 100644
--- a/plugins/org.eclipse.qvtd.xtext.qvtcore.ui/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.qvtd.xtext.qvtcore.ui/META-INF/MANIFEST.MF
@@ -18,7 +18,7 @@ Export-Package: org.eclipse.qvtd.xtext.qvtcore.ui,
Require-Bundle: org.eclipse.xtext.builder;bundle-version="[2.10.0,3.0.0)",
org.eclipse.qvtd.xtext.qvtcore;bundle-version="[0.20.0,1.0.0)";visibility:=reexport,
org.eclipse.qvtd.xtext.qvtbase.ui;bundle-version="[0.20.0,1.0.0)";visibility:=reexport
-Import-Package: org.apache.log4j
+Import-Package: org.slf4j;version="[1.7.2,2.0.0)"
Bundle-Activator: org.eclipse.qvtd.xtext.qvtcore.ui.internal.QVTcoreActivator
Bundle-Vendor: %providerName
Automatic-Module-Name: org.eclipse.qvtd.xtext.qvtcore.ui
diff --git a/plugins/org.eclipse.qvtd.xtext.qvtcore.ui/src-gen/org/eclipse/qvtd/xtext/qvtcore/ui/internal/QVTcoreActivator.java b/plugins/org.eclipse.qvtd.xtext.qvtcore.ui/src-gen/org/eclipse/qvtd/xtext/qvtcore/ui/internal/QVTcoreActivator.java
index 68a5e50a6..63859bbe0 100644
--- a/plugins/org.eclipse.qvtd.xtext.qvtcore.ui/src-gen/org/eclipse/qvtd/xtext/qvtcore/ui/internal/QVTcoreActivator.java
+++ b/plugins/org.eclipse.qvtd.xtext.qvtcore.ui/src-gen/org/eclipse/qvtd/xtext/qvtcore/ui/internal/QVTcoreActivator.java
@@ -13,7 +13,8 @@ package org.eclipse.qvtd.xtext.qvtcore.ui.internal;
import java.util.Collections;
import java.util.Map;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.eclipse.ui.plugin.AbstractUIPlugin;
import org.eclipse.xtext.ui.shared.SharedStateModule;
import org.eclipse.xtext.util.Modules2;
@@ -32,7 +33,7 @@ public class QVTcoreActivator extends AbstractUIPlugin {
public static final String ORG_ECLIPSE_QVTD_XTEXT_QVTCORE_QVTCORE = "org.eclipse.qvtd.xtext.qvtcore.QVTcore";
- private static final Logger logger = Logger.getLogger(QVTcoreActivator.class);
+ private static final Logger logger = LoggerFactory.getLogger(QVTcoreActivator.class);
private static QVTcoreActivator INSTANCE;
diff --git a/plugins/org.eclipse.qvtd.xtext.qvtcore/META-INF/MANIFEST.MF b/plugins/org.eclipse.qvtd.xtext.qvtcore/META-INF/MANIFEST.MF
index f0a958d94..2cd69a875 100644
--- a/plugins/org.eclipse.qvtd.xtext.qvtcore/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.qvtd.xtext.qvtcore/META-INF/MANIFEST.MF
@@ -27,5 +27,5 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.5.0,4.0.0)",
org.eclipse.qvtd.pivot.qvtcore;bundle-version="[0.20.0,1.0.0)";visibility:=reexport,
org.eclipse.qvtd.xtext.qvtbase;bundle-version="[0.20.0,1.0.0)";visibility:=reexport
Bundle-Activator: org.eclipse.qvtd.xtext.qvtcore.utilities.QVTcorePlugin$Implementation
-Import-Package: org.apache.log4j
+Import-Package: org.slf4j;version="[1.7.2,2.0.0)"
Automatic-Module-Name: org.eclipse.qvtd.xtext.qvtcore
diff --git a/plugins/org.eclipse.qvtd.xtext.qvtimperative.ui/META-INF/MANIFEST.MF b/plugins/org.eclipse.qvtd.xtext.qvtimperative.ui/META-INF/MANIFEST.MF
index 6b36a5b88..45c4274a1 100644
--- a/plugins/org.eclipse.qvtd.xtext.qvtimperative.ui/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.qvtd.xtext.qvtimperative.ui/META-INF/MANIFEST.MF
@@ -18,7 +18,7 @@ Export-Package: org.eclipse.qvtd.xtext.qvtimperative.ui,
Require-Bundle: org.eclipse.xtext.builder;bundle-version="[2.10.0,3.0.0)",
org.eclipse.qvtd.xtext.qvtimperative;bundle-version="[0.20.0,1.0.0)";visibility:=reexport,
org.eclipse.qvtd.xtext.qvtbase.ui;bundle-version="[0.20.0,1.0.0)";visibility:=reexport
-Import-Package: org.apache.log4j
+Import-Package: org.slf4j;version="[1.7.2,2.0.0)"
Bundle-Activator: org.eclipse.qvtd.xtext.qvtimperative.ui.internal.QVTimperativeActivator
Bundle-Vendor: %providerName
Automatic-Module-Name: org.eclipse.qvtd.xtext.qvtimperative.ui
diff --git a/plugins/org.eclipse.qvtd.xtext.qvtimperative.ui/src-gen/org/eclipse/qvtd/xtext/qvtimperative/ui/internal/QVTimperativeActivator.java b/plugins/org.eclipse.qvtd.xtext.qvtimperative.ui/src-gen/org/eclipse/qvtd/xtext/qvtimperative/ui/internal/QVTimperativeActivator.java
index ff049e54d..72c016981 100644
--- a/plugins/org.eclipse.qvtd.xtext.qvtimperative.ui/src-gen/org/eclipse/qvtd/xtext/qvtimperative/ui/internal/QVTimperativeActivator.java
+++ b/plugins/org.eclipse.qvtd.xtext.qvtimperative.ui/src-gen/org/eclipse/qvtd/xtext/qvtimperative/ui/internal/QVTimperativeActivator.java
@@ -13,7 +13,8 @@ package org.eclipse.qvtd.xtext.qvtimperative.ui.internal;
import java.util.Collections;
import java.util.Map;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.eclipse.ui.plugin.AbstractUIPlugin;
import org.eclipse.xtext.ui.shared.SharedStateModule;
import org.eclipse.xtext.util.Modules2;
@@ -32,7 +33,7 @@ public class QVTimperativeActivator extends AbstractUIPlugin {
public static final String ORG_ECLIPSE_QVTD_XTEXT_QVTIMPERATIVE_QVTIMPERATIVE = "org.eclipse.qvtd.xtext.qvtimperative.QVTimperative";
- private static final Logger logger = Logger.getLogger(QVTimperativeActivator.class);
+ private static final Logger logger = LoggerFactory.getLogger(QVTimperativeActivator.class);
private static QVTimperativeActivator INSTANCE;
diff --git a/plugins/org.eclipse.qvtd.xtext.qvtimperative/META-INF/MANIFEST.MF b/plugins/org.eclipse.qvtd.xtext.qvtimperative/META-INF/MANIFEST.MF
index 158d3e38a..63303404c 100644
--- a/plugins/org.eclipse.qvtd.xtext.qvtimperative/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.qvtd.xtext.qvtimperative/META-INF/MANIFEST.MF
@@ -27,5 +27,5 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.5.0,4.0.0)",
org.eclipse.xtext;bundle-version="[2.10.0,3.0.0)",
org.eclipse.qvtd.pivot.qvtimperative;bundle-version="[0.20.0,1.0.0)";visibility:=reexport,
org.eclipse.qvtd.xtext.qvtbase;bundle-version="[0.20.0,1.0.0)";visibility:=reexport
-Import-Package: org.apache.log4j
+Import-Package: org.slf4j;version="[1.7.2,2.0.0)"
Automatic-Module-Name: org.eclipse.qvtd.xtext.qvtimperative
diff --git a/plugins/org.eclipse.qvtd.xtext.qvtrelation.ui/META-INF/MANIFEST.MF b/plugins/org.eclipse.qvtd.xtext.qvtrelation.ui/META-INF/MANIFEST.MF
index 80df45e29..d72896eb8 100644
--- a/plugins/org.eclipse.qvtd.xtext.qvtrelation.ui/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.qvtd.xtext.qvtrelation.ui/META-INF/MANIFEST.MF
@@ -18,7 +18,7 @@ Export-Package: org.eclipse.qvtd.xtext.qvtrelation.ui,
Require-Bundle: org.eclipse.xtext.builder;bundle-version="[2.10.0,3.0.0)",
org.eclipse.qvtd.xtext.qvtbase.ui;bundle-version="[0.20.0,1.0.0)";visibility:=reexport,
org.eclipse.qvtd.xtext.qvtrelation;bundle-version="[0.20.0,1.0.0)";visibility:=reexport
-Import-Package: org.apache.log4j
+Import-Package: org.slf4j;version="[1.7.2,2.0.0)"
Bundle-Activator: org.eclipse.qvtd.xtext.qvtrelation.ui.internal.QVTrelationActivator
Bundle-Vendor: %providerName
Automatic-Module-Name: org.eclipse.qvtd.xtext.qvtrelation.ui
diff --git a/plugins/org.eclipse.qvtd.xtext.qvtrelation.ui/src-gen/org/eclipse/qvtd/xtext/qvtrelation/ui/internal/QVTrelationActivator.java b/plugins/org.eclipse.qvtd.xtext.qvtrelation.ui/src-gen/org/eclipse/qvtd/xtext/qvtrelation/ui/internal/QVTrelationActivator.java
index d81770063..2119faa59 100644
--- a/plugins/org.eclipse.qvtd.xtext.qvtrelation.ui/src-gen/org/eclipse/qvtd/xtext/qvtrelation/ui/internal/QVTrelationActivator.java
+++ b/plugins/org.eclipse.qvtd.xtext.qvtrelation.ui/src-gen/org/eclipse/qvtd/xtext/qvtrelation/ui/internal/QVTrelationActivator.java
@@ -13,7 +13,8 @@ package org.eclipse.qvtd.xtext.qvtrelation.ui.internal;
import java.util.Collections;
import java.util.Map;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.eclipse.ui.plugin.AbstractUIPlugin;
import org.eclipse.xtext.ui.shared.SharedStateModule;
import org.eclipse.xtext.util.Modules2;
@@ -32,7 +33,7 @@ public class QVTrelationActivator extends AbstractUIPlugin {
public static final String ORG_ECLIPSE_QVTD_XTEXT_QVTRELATION_QVTRELATION = "org.eclipse.qvtd.xtext.qvtrelation.QVTrelation";
- private static final Logger logger = Logger.getLogger(QVTrelationActivator.class);
+ private static final Logger logger = LoggerFactory.getLogger(QVTrelationActivator.class);
private static QVTrelationActivator INSTANCE;
diff --git a/plugins/org.eclipse.qvtd.xtext.qvtrelation/META-INF/MANIFEST.MF b/plugins/org.eclipse.qvtd.xtext.qvtrelation/META-INF/MANIFEST.MF
index 963946635..c38786668 100644
--- a/plugins/org.eclipse.qvtd.xtext.qvtrelation/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.qvtd.xtext.qvtrelation/META-INF/MANIFEST.MF
@@ -27,5 +27,5 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.5.0,4.0.0)",
org.eclipse.xtext;bundle-version="[2.10.0,3.0.0)",
org.eclipse.qvtd.pivot.qvtrelation;bundle-version="[0.20.0,1.0.0)";visibility:=reexport,
org.eclipse.qvtd.xtext.qvtbase;bundle-version="[0.20.0,1.0.0)";visibility:=reexport
-Import-Package: org.apache.log4j
+Import-Package: org.slf4j;version="[1.7.2,2.0.0)"
Automatic-Module-Name: org.eclipse.qvtd.xtext.qvtrelation
diff --git a/plugins/org.eclipse.qvtd.xtext.qvtrelation/src/org/eclipse/qvtd/xtext/qvtrelation/as2cs/QVTrelationDeclarationVisitor.java b/plugins/org.eclipse.qvtd.xtext.qvtrelation/src/org/eclipse/qvtd/xtext/qvtrelation/as2cs/QVTrelationDeclarationVisitor.java
index f3782efaa..b1494ab3b 100644
--- a/plugins/org.eclipse.qvtd.xtext.qvtrelation/src/org/eclipse/qvtd/xtext/qvtrelation/as2cs/QVTrelationDeclarationVisitor.java
+++ b/plugins/org.eclipse.qvtd.xtext.qvtrelation/src/org/eclipse/qvtd/xtext/qvtrelation/as2cs/QVTrelationDeclarationVisitor.java
@@ -14,7 +14,8 @@ import java.util.ArrayList;
import java.util.List;
import java.util.Map;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.eclipse.emf.common.notify.Adapter;
import org.eclipse.emf.common.util.URI;
import org.eclipse.emf.ecore.EClass;
@@ -125,7 +126,7 @@ import com.google.common.collect.Lists;
public class QVTrelationDeclarationVisitor extends QVTbaseDeclarationVisitor implements QVTrelationVisitor<ElementCS>
{
- private static final Logger logger = Logger.getLogger(QVTrelationDeclarationVisitor.class);
+ private static final Logger logger = LoggerFactory.getLogger(QVTrelationDeclarationVisitor.class);
public static @Nullable PathNameCS createPathNameCS(@Nullable List<? extends @NonNull NamedElement> csPath) {
PathNameCS csPathName = null;
diff --git a/plugins/org.eclipse.qvtd.xtext.qvtrelation/src/org/eclipse/qvtd/xtext/qvtrelation/as2cs/QVTrelationExpressionVisitor.java b/plugins/org.eclipse.qvtd.xtext.qvtrelation/src/org/eclipse/qvtd/xtext/qvtrelation/as2cs/QVTrelationExpressionVisitor.java
index 03d2aebed..9e5816d3d 100644
--- a/plugins/org.eclipse.qvtd.xtext.qvtrelation/src/org/eclipse/qvtd/xtext/qvtrelation/as2cs/QVTrelationExpressionVisitor.java
+++ b/plugins/org.eclipse.qvtd.xtext.qvtrelation/src/org/eclipse/qvtd/xtext/qvtrelation/as2cs/QVTrelationExpressionVisitor.java
@@ -13,7 +13,8 @@ package org.eclipse.qvtd.xtext.qvtrelation.as2cs;
import java.util.ArrayList;
import java.util.List;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.eclipse.jdt.annotation.NonNull;
import org.eclipse.jdt.annotation.Nullable;
import org.eclipse.ocl.pivot.Namespace;
@@ -34,7 +35,7 @@ import org.eclipse.ocl.xtext.essentialocl.as2cs.EssentialOCLExpressionVisitor;
public class QVTrelationExpressionVisitor extends EssentialOCLExpressionVisitor
{
- public static final Logger logger = Logger.getLogger(QVTrelationExpressionVisitor.class);
+ public static final Logger logger = LoggerFactory.getLogger(QVTrelationExpressionVisitor.class);
public QVTrelationExpressionVisitor(@NonNull AS2CSConversion context, @Nullable Namespace scope) {
super(context, scope);
diff --git a/releng/org.eclipse.qvtd.build/META-INF/MANIFEST.MF b/releng/org.eclipse.qvtd.build/META-INF/MANIFEST.MF
index 959af8199..8d2225ac3 100644
--- a/releng/org.eclipse.qvtd.build/META-INF/MANIFEST.MF
+++ b/releng/org.eclipse.qvtd.build/META-INF/MANIFEST.MF
@@ -23,7 +23,7 @@ Require-Bundle: org.eclipse.core.resources,
org.eclipse.qvtd.xtext.qvtrelation.tests;bundle-version="[0.20.0,1.0.0)",
org.eclipse.ocl.examples.autogen;bundle-version="[1.4.0,2.0.0)"
Import-Package: org.apache.commons.logging,
- org.apache.log4j
+ org.slf4j;version="[1.7.2,2.0.0)"
Bundle-Vendor: %providerName
Export-Package: org.eclipse.qvtd.build.modelspecs,
org.eclipse.qvtd.build.mwe2;x-internal:=true,
diff --git a/releng/org.eclipse.qvtd.build/src/org/eclipse/qvtd/build/utilities/CompileQVTrTransformation.java b/releng/org.eclipse.qvtd.build/src/org/eclipse/qvtd/build/utilities/CompileQVTrTransformation.java
index e6a524210..e4d329b28 100644
--- a/releng/org.eclipse.qvtd.build/src/org/eclipse/qvtd/build/utilities/CompileQVTrTransformation.java
+++ b/releng/org.eclipse.qvtd.build/src/org/eclipse/qvtd/build/utilities/CompileQVTrTransformation.java
@@ -14,7 +14,8 @@ import java.io.File;
import java.io.IOException;
import java.util.ArrayList;
import java.util.List;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.eclipse.emf.codegen.ecore.genmodel.GenPackage;
import org.eclipse.emf.common.EMFPlugin;
import org.eclipse.emf.common.util.URI;
@@ -88,7 +89,7 @@ public class CompileQVTrTransformation extends AbstractWorkflowComponent
}
}
- private Logger log = Logger.getLogger(getClass());
+ private Logger log = LoggerFactory.getLogger(getClass());
private String qvtrModel = null;
private String copyright = null;

Back to the top