335872: Removed the now obsolete MavenConsoleService

12 files changed, 20 insertions, 87 deletions

diff --git a/org.eclipse.m2e.core.ui/OSGI-INF/mavenconsole.xml b/org.eclipse.m2e.core.ui/OSGI-INF/mavenconsole.xml
deleted file mode 100644
index d5170752..00000000
--- a/org.eclipse.m2e.core.ui/OSGI-INF/mavenconsole.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" name="org.eclipse.m2e.core.internal.console.MavenConsoleService">
-   <implementation class="org.eclipse.m2e.core.ui.internal.console.MavenConsoleService"/>
-   <service>
-      <provide interface="org.eclipse.m2e.core.core.MavenConsole"/>
-   </service>
-</scr:component>
diff --git a/org.eclipse.m2e.core.ui/build.properties b/org.eclipse.m2e.core.ui/build.properties
index 48b033fc..519c0f8f 100644
--- a/org.eclipse.m2e.core.ui/build.properties
+++ b/org.eclipse.m2e.core.ui/build.properties
@@ -2,7 +2,6 @@ source.. = src/
 output.. = target/classes/
 bin.includes = META-INF/,\
                .,\
-               OSGI-INF/,\
                plugin.xml,\
                plugin.properties,\
                icons/,\
diff --git a/org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/M2EUIPluginActivator.java b/org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/M2EUIPluginActivator.java
index a3d3f724..9e35c90c 100644
--- a/org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/M2EUIPluginActivator.java
+++ b/org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/M2EUIPluginActivator.java
@@ -68,7 +68,7 @@ public class M2EUIPluginActivator extends AbstractUIPlugin {
     return imageDescriptorFromPlugin(IMavenConstants.PLUGIN_ID, path);
   }
 
-  public synchronized MavenConsoleImpl getMavenConsoleImpl() {
+  public synchronized MavenConsoleImpl getMavenConsole() {
     if(console == null) {
       console = new MavenConsoleImpl(MavenImages.M2);
     }
diff --git a/org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/actions/MavenConsoleRemoveAction.java b/org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/actions/MavenConsoleRemoveAction.java
index 26baaf4f..f1a9b852 100644
--- a/org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/actions/MavenConsoleRemoveAction.java
+++ b/org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/actions/MavenConsoleRemoveAction.java
@@ -25,7 +25,7 @@ public class MavenConsoleRemoveAction extends Action {
   }
 
   public void run() {
-    M2EUIPluginActivator.getDefault().getMavenConsoleImpl().closeConsole();
+    M2EUIPluginActivator.getDefault().getMavenConsole().closeConsole();
   }
 
 }
diff --git a/org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/actions/OpenMavenConsoleAction.java b/org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/actions/OpenMavenConsoleAction.java
index 52fc283b..108eca9a 100644
--- a/org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/actions/OpenMavenConsoleAction.java
+++ b/org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/actions/OpenMavenConsoleAction.java
@@ -22,7 +22,7 @@ import org.eclipse.m2e.core.ui.internal.M2EUIPluginActivator;
 public class OpenMavenConsoleAction extends Action {
   
   public void run() {
-    M2EUIPluginActivator.getDefault().getMavenConsoleImpl().showConsole();
+    M2EUIPluginActivator.getDefault().getMavenConsole().showConsole();
   }
 
 }
diff --git a/org.eclipse.m2e.core/src/org/eclipse/m2e/core/core/MavenConsole.java b/org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/console/MavenConsole.java
index 14182b46..b2e7f5cf 100644
--- a/org.eclipse.m2e.core/src/org/eclipse/m2e/core/core/MavenConsole.java
+++ b/org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/console/MavenConsole.java
@@ -9,7 +9,7 @@
  *      Sonatype, Inc. - initial API and implementation
  *******************************************************************************/
 
-package org.eclipse.m2e.core.core;
+package org.eclipse.m2e.core.ui.internal.console;
 
 /**
  * Maven Console
@@ -18,8 +18,6 @@ package org.eclipse.m2e.core.core;
  * @noimplement This interface is not intended to be implemented by clients.
  */
 public interface MavenConsole {
-  boolean wasInitialized();
-
   void logMessage(String msg);
 
   void logError(String msg);
diff --git a/org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/console/MavenConsoleFactory.java b/org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/console/MavenConsoleFactory.java
index 570bad80..698ae936 100644
--- a/org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/console/MavenConsoleFactory.java
+++ b/org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/console/MavenConsoleFactory.java
@@ -25,7 +25,7 @@ import org.eclipse.ui.console.IConsoleFactory;
 public class MavenConsoleFactory implements IConsoleFactory {
 
   public void openConsole() {
-    M2EUIPluginActivator.getDefault().getMavenConsoleImpl().showConsole();
+    M2EUIPluginActivator.getDefault().getMavenConsole().showConsole();
   }
 
 }
diff --git a/org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/console/MavenConsoleImpl.java b/org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/console/MavenConsoleImpl.java
index a3f6dfa6..3317ca62 100644
--- a/org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/console/MavenConsoleImpl.java
+++ b/org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/console/MavenConsoleImpl.java
@@ -43,7 +43,7 @@ import com.ibm.icu.util.ULocale;
  * 
  * @author Dmitri Maximovich
  */
-public class MavenConsoleImpl extends IOConsole implements IPropertyChangeListener {
+public class MavenConsoleImpl extends IOConsole implements MavenConsole, IPropertyChangeListener {
 
   private boolean initialized = false;
 
diff --git a/org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/console/MavenConsoleService.java b/org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/console/MavenConsoleService.java
deleted file mode 100644
index 98de0ff8..00000000
--- a/org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/console/MavenConsoleService.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008-2010 Sonatype, Inc.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *      Sonatype, Inc. - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.m2e.core.ui.internal.console;
-
-import org.eclipse.m2e.core.core.MavenConsole;
-import org.eclipse.m2e.core.ui.internal.M2EUIPluginActivator;
-
-
-public class MavenConsoleService implements MavenConsole {
-  public void logMessage(String msg) {
-    M2EUIPluginActivator.getDefault().getMavenConsoleImpl().logMessage(msg);
-  }
-
-  public void logError(String msg) {
-    M2EUIPluginActivator.getDefault().getMavenConsoleImpl().logError(msg);
-  }
-
-  public boolean wasInitialized() {
-    return M2EUIPluginActivator.getDefault().hasMavenConsoleImpl();
-  }
-}
diff --git a/org.eclipse.m2e.core/src/org/eclipse/m2e/core/MavenPlugin.java b/org.eclipse.m2e.core/src/org/eclipse/m2e/core/MavenPlugin.java
index 9b92fc0c..58db3ee4 100644
--- a/org.eclipse.m2e.core/src/org/eclipse/m2e/core/MavenPlugin.java
+++ b/org.eclipse.m2e.core/src/org/eclipse/m2e/core/MavenPlugin.java
@@ -15,7 +15,6 @@ import java.io.File;
 
 import org.osgi.framework.BundleContext;
 import org.osgi.framework.Constants;
-import org.osgi.framework.ServiceReference;
 import org.osgi.framework.Version;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -52,7 +51,6 @@ import org.sonatype.aether.RepositorySystem;
 import org.eclipse.m2e.core.archetype.ArchetypeCatalogFactory;
 import org.eclipse.m2e.core.archetype.ArchetypeManager;
 import org.eclipse.m2e.core.core.IMavenConstants;
-import org.eclipse.m2e.core.core.MavenConsole;
 import org.eclipse.m2e.core.embedder.IMaven;
 import org.eclipse.m2e.core.embedder.IMavenConfiguration;
 import org.eclipse.m2e.core.embedder.MavenModelManager;
@@ -299,33 +297,6 @@ public class MavenPlugin extends Plugin {
     return this.indexManager;
   }
 
-  @SuppressWarnings({"unchecked", "rawtypes"})
-  public MavenConsole getConsole() {
-    // TODO this leaks service references
-    MavenConsole console = null;
-    ServiceReference serviceReference = bundleContext.getServiceReference(MavenConsole.class.getName());
-    if(serviceReference != null) {
-      console = (MavenConsole) bundleContext.getService(serviceReference);
-    }
-    if(console == null) {
-      final Logger log = LoggerFactory.getLogger(MavenConsole.class);
-      console = new MavenConsole() {
-        public void logMessage(String msg) {
-          log.info(msg);
-        }
-
-        public void logError(String msg) {
-          log.error(msg);
-        }
-
-        public boolean wasInitialized() {
-          return true;
-        }
-      };
-    }
-    return console;
-  }
-
   public MavenRuntimeManager getMavenRuntimeManager() {
     return this.runtimeManager;
   }
diff --git a/org.eclipse.m2e.logback.appender/META-INF/MANIFEST.MF b/org.eclipse.m2e.logback.appender/META-INF/MANIFEST.MF
index d8c76ad8..47f2a950 100644
--- a/org.eclipse.m2e.logback.appender/META-INF/MANIFEST.MF
+++ b/org.eclipse.m2e.logback.appender/META-INF/MANIFEST.MF
@@ -8,4 +8,6 @@ Bundle-RequiredExecutionEnvironment: J2SE-1.5,
 Fragment-Host: ch.qos.logback.classic
 Export-Package: org.eclipse.m2e.logback.appender
 Require-Bundle: org.eclipse.core.runtime,
- org.eclipse.m2e.core;bundle-version="0.13.0"
+ org.eclipse.jface,
+ org.eclipse.ui.console,
+ org.eclipse.m2e.core.ui;bundle-version="0.13.0"
diff --git a/org.eclipse.m2e.logback.appender/src/main/java/org/eclipse/m2e/logback/appender/MavenConsoleAppender.java b/org.eclipse.m2e.logback.appender/src/main/java/org/eclipse/m2e/logback/appender/MavenConsoleAppender.java
index 100e2bb2..6363074f 100644
--- a/org.eclipse.m2e.logback.appender/src/main/java/org/eclipse/m2e/logback/appender/MavenConsoleAppender.java
+++ b/org.eclipse.m2e.logback.appender/src/main/java/org/eclipse/m2e/logback/appender/MavenConsoleAppender.java
@@ -19,14 +19,14 @@ import ch.qos.logback.core.UnsynchronizedAppenderBase;
 
 import org.eclipse.core.runtime.Platform;
 
-import org.eclipse.m2e.core.MavenPlugin;
-import org.eclipse.m2e.core.core.MavenConsole;
+import org.eclipse.m2e.core.ui.internal.M2EUIPluginActivator;
+import org.eclipse.m2e.core.ui.internal.console.MavenConsole;
 
 
 public class MavenConsoleAppender extends UnsynchronizedAppenderBase<ILoggingEvent> {
-  private static final String M2E_CORE_BUNDLE_ID = "org.eclipse.m2e.core"; //$NON-NLS-1$
+  private static final String M2E_CORE_UI_BUNDLE_ID = "org.eclipse.m2e.core.ui"; //$NON-NLS-1$
 
-  private Bundle m2eCoreBundle;
+  private Bundle m2eCoreUIBundle;
 
   @Override
   protected void append(ILoggingEvent logEvent) {
@@ -34,11 +34,11 @@ public class MavenConsoleAppender extends UnsynchronizedAppenderBase<ILoggingEve
       return;
     }
 
-    MavenConsole mavenConsole = MavenPlugin.getDefault().getConsole();
-    if(!mavenConsole.wasInitialized()) {
+    if(!M2EUIPluginActivator.getDefault().hasMavenConsoleImpl()) {
       return;
     }
 
+    MavenConsole mavenConsole = M2EUIPluginActivator.getDefault().getMavenConsole();
     if(logEvent.getLevel().levelInt == Level.ERROR_INT) {
       mavenConsole.logError(logEvent.toString());
     } else {
@@ -47,14 +47,14 @@ public class MavenConsoleAppender extends UnsynchronizedAppenderBase<ILoggingEve
   }
 
   private boolean isActive() {
-    if(m2eCoreBundle == null) {
-      m2eCoreBundle = Platform.getBundle(M2E_CORE_BUNDLE_ID);
-      if(m2eCoreBundle == null) {
-        System.out.println("Could not find " + M2E_CORE_BUNDLE_ID + " bundle.");
+    if(m2eCoreUIBundle == null) {
+      m2eCoreUIBundle = Platform.getBundle(M2E_CORE_UI_BUNDLE_ID);
+      if(m2eCoreUIBundle == null) {
+        System.out.println("Could not find " + M2E_CORE_UI_BUNDLE_ID + " bundle.");
         return false;
       }
     }
 
-    return m2eCoreBundle.getState() == Bundle.ACTIVE;
+    return m2eCoreUIBundle.getState() == Bundle.ACTIVE;
   }
 }