diff options
author | Jon Bratseth <bratseth@oath.com> | 2018-12-19 15:55:59 +0100 |
---|---|---|
committer | gjoranv <gv@oath.com> | 2019-01-21 15:09:30 +0100 |
commit | cdde1e9a15fc90bd1dad41d74d720325b1a3d1fd (patch) | |
tree | 9c755982943fd8cbe5a20ae1f6c88cfbb27abeda /container-core | |
parent | b743451d1ff4d3cc2846fccc819c1fa82156db97 (diff) |
Revert "Merge pull request #7974 from vespa-engine/revert-7973-bratseth/search-container-deprecations"
This reverts commit 5767288d80e85940e675f7dd157f2b6c1d2ceeb5, reversing
changes made to 37de7ac33454363489156e06597bffb3422756dc.
Diffstat (limited to 'container-core')
-rwxr-xr-x | container-core/src/main/java/com/yahoo/container/Container.java | 18 | ||||
-rw-r--r-- | container-core/src/main/resources/configdefinitions/qr.def | 3 |
2 files changed, 1 insertions, 20 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 e84c8b340a4..031d4a26d05 100755 --- a/container-core/src/main/java/com/yahoo/container/Container.java +++ b/container-core/src/main/java/com/yahoo/container/Container.java @@ -3,13 +3,11 @@ 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; @@ -34,8 +32,6 @@ 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. @@ -43,12 +39,6 @@ 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(); @@ -61,14 +51,6 @@ 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 ddf12fd32f5..fe44b04e9d5 100644 --- a/container-core/src/main/resources/configdefinitions/qr.def +++ b/container-core/src/main/resources/configdefinitions/qr.def @@ -2,8 +2,7 @@ namespace=container ### All params must be flagged as 'restart' because this config is manually -### retrieved by ConfiguredApplication.start to init the rpc server in -### com.yahoo.container.Server. +### retrieved by ConfiguredApplication.start to init the rpc server ## filedistributor rpc configuration filedistributor.configid reference default="" restart |