Revert "Bratseth/search container deprecations"

2 files changed, 20 insertions, 1 deletions

diff --git a/container-core/src/main/java/com/yahoo/container/Container.java b/container-core/src/main/java/com/yahoo/container/Container.java
index 031d4a26d05..e84c8b340a4 100755
--- a/container-core/src/main/java/com/yahoo/container/Container.java
+++ b/container-core/src/main/java/com/yahoo/container/Container.java
@@ -3,11 +3,13 @@ package com.yahoo.container;
 
 import com.yahoo.component.AbstractComponent;
 import com.yahoo.component.provider.ComponentRegistry;
+import com.yahoo.container.core.config.BundleLoader;
 import com.yahoo.filedistribution.fileacquirer.FileAcquirer;
 import com.yahoo.filedistribution.fileacquirer.FileAcquirerFactory;
 import com.yahoo.jdisc.handler.RequestHandler;
 import com.yahoo.jdisc.service.ClientProvider;
 import com.yahoo.jdisc.service.ServerProvider;
+import com.yahoo.osgi.Osgi;
 import com.yahoo.vespa.config.ConfigTransformer;
 import com.yahoo.vespa.config.UrlDownloader;
 
@@ -32,6 +34,8 @@ public class Container {
     private volatile FileAcquirer fileAcquirer;
     private volatile UrlDownloader urlDownloader;
 
+    private volatile BundleLoader bundleLoader;
+
     private static Logger logger = Logger.getLogger(Container.class.getName());
 
     // TODO: Make this final again.
@@ -39,6 +43,12 @@ public class Container {
 
     public static Container get() { return instance; }
 
+    /** @deprecated do not use */
+    @Deprecated // TODO: Remove
+    public void setOsgi(Osgi osgi) {
+        bundleLoader = new BundleLoader(osgi);
+    }
+
     public void shutdown() {
         if (fileAcquirer != null)
             fileAcquirer.shutdown();
@@ -51,6 +61,14 @@ public class Container {
         return fileAcquirer;
     }
 
+    /** @deprecated do not use */
+    @Deprecated // TODO: Remove
+    public BundleLoader getBundleLoader() {
+        if (bundleLoader == null)
+            bundleLoader = new BundleLoader(null);
+        return bundleLoader;
+    }
+
     /**
      * Hack. For internal use only, will be removed later
      *
diff --git a/container-core/src/main/resources/configdefinitions/qr.def b/container-core/src/main/resources/configdefinitions/qr.def
index fe44b04e9d5..ddf12fd32f5 100644
--- a/container-core/src/main/resources/configdefinitions/qr.def
+++ b/container-core/src/main/resources/configdefinitions/qr.def
@@ -2,7 +2,8 @@
 namespace=container
 
 ### All params must be flagged as 'restart' because this config is manually
-### retrieved by ConfiguredApplication.start to init the rpc server
+### retrieved by ConfiguredApplication.start to init the rpc server in
+### com.yahoo.container.Server.
 
 ## filedistributor rpc configuration
 filedistributor.configid reference default="" restart