aboutsummaryrefslogtreecommitdiffstats
path: root/container-core/src/main/java/com/yahoo/container/Container.java
diff options
context:
space:
mode:
Diffstat (limited to 'container-core/src/main/java/com/yahoo/container/Container.java')
-rwxr-xr-xcontainer-core/src/main/java/com/yahoo/container/Container.java18
1 files changed, 0 insertions, 18 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
*