From cdde1e9a15fc90bd1dad41d74d720325b1a3d1fd Mon Sep 17 00:00:00 2001
From: Jon Bratseth <bratseth@oath.com>
Date: Wed, 19 Dec 2018 15:55:59 +0100
Subject: Revert "Merge pull request #7974 from
 vespa-engine/revert-7973-bratseth/search-container-deprecations"

This reverts commit 5767288d80e85940e675f7dd157f2b6c1d2ceeb5, reversing
changes made to 37de7ac33454363489156e06597bffb3422756dc.
---
 .../main/java/com/yahoo/container/jdisc/ConfiguredApplication.java    | 4 ----
 1 file changed, 4 deletions(-)

(limited to 'container-disc')

diff --git a/container-disc/src/main/java/com/yahoo/container/jdisc/ConfiguredApplication.java b/container-disc/src/main/java/com/yahoo/container/jdisc/ConfiguredApplication.java
index 1cb4e1d4555..eae121604e4 100644
--- a/container-disc/src/main/java/com/yahoo/container/jdisc/ConfiguredApplication.java
+++ b/container-disc/src/main/java/com/yahoo/container/jdisc/ConfiguredApplication.java
@@ -39,7 +39,6 @@ import com.yahoo.jrt.slobrok.api.SlobrokList;
 import com.yahoo.log.LogLevel;
 import com.yahoo.log.LogSetup;
 import com.yahoo.net.HostName;
-import com.yahoo.osgi.OsgiImpl;
 import com.yahoo.vespa.config.ConfigKey;
 import com.yahoo.yolean.Exceptions;
 
@@ -115,7 +114,6 @@ public final class ConfiguredApplication implements Application {
 
     }
 
-    @SuppressWarnings("deprecation") // TODO: Remove when the Container line below is removed
     @Inject
     public ConfiguredApplication(ContainerActivator activator,
                                  OsgiFramework osgiFramework,
@@ -127,7 +125,6 @@ public final class ConfiguredApplication implements Application {
         this.subscriberFactory = subscriberFactory;
         this.configId = System.getProperty("config.id");
         this.restrictedOsgiFramework = new DisableOsgiFramework(new RestrictedBundleContext(osgiFramework.bundleContext()));
-        Container.get().setOsgi(new OsgiImpl(osgiFramework)); // TODO: Remove, not necessary
 
         applicationWithLegacySetup = new ContainerDiscApplication(configId);
     }
@@ -192,7 +189,6 @@ public final class ConfiguredApplication implements Application {
         try {
             Container.get().setupFileAcquirer(config.filedistributor());
             Container.get().setupUrlDownloader();
-            com.yahoo.container.Server.get().initialize(config);
         } catch (Exception e) {
             log.log(LogLevel.ERROR, "Caught exception when initializing server. Exiting.", e);
             Runtime.getRuntime().halt(1);
-- 
cgit v1.2.3