diff options
author | Jon Bratseth <bratseth@oath.com> | 2018-12-01 12:31:24 -0800 |
---|---|---|
committer | Jon Bratseth <bratseth@oath.com> | 2018-12-01 12:31:24 -0800 |
commit | 872994569344340f13519c92324bf177fc666ac9 (patch) | |
tree | fd859c0a38ed68300c743b54ee5ab41a986e273f /standalone-container/src/main/java/com/yahoo/application | |
parent | ce9f57d123d835cc698adf2febe4aae47128031d (diff) |
Revert "Merge pull request #7835 from vespa-engine/revert-7833-bratseth/remove-unused-rpc-server-take-2"
This reverts commit ce9f57d123d835cc698adf2febe4aae47128031d, reversing
changes made to c2af67b3d11da53655a0750d2e288b584c7b938c.
Diffstat (limited to 'standalone-container/src/main/java/com/yahoo/application')
2 files changed, 4 insertions, 0 deletions
diff --git a/standalone-container/src/main/java/com/yahoo/application/container/impl/ClassLoaderOsgiFramework.java b/standalone-container/src/main/java/com/yahoo/application/container/impl/ClassLoaderOsgiFramework.java index 8d4126a01e3..08a70db7562 100644 --- a/standalone-container/src/main/java/com/yahoo/application/container/impl/ClassLoaderOsgiFramework.java +++ b/standalone-container/src/main/java/com/yahoo/application/container/impl/ClassLoaderOsgiFramework.java @@ -50,6 +50,7 @@ import java.util.jar.JarFile; * @author ollivir */ public final class ClassLoaderOsgiFramework implements OsgiFramework { + private BundleContextImpl bundleContextImpl = new BundleContextImpl(); private SystemBundleImpl systemBundleImpl = new SystemBundleImpl(); private BundleWiringImpl bundleWiringImpl = new BundleWiringImpl(); @@ -566,4 +567,5 @@ public final class ClassLoaderOsgiFramework implements OsgiFramework { throw new UnsupportedOperationException(); } } + } diff --git a/standalone-container/src/main/java/com/yahoo/application/container/impl/StandaloneContainerRunner.java b/standalone-container/src/main/java/com/yahoo/application/container/impl/StandaloneContainerRunner.java index a0fee3265df..8b07a4d4ef8 100644 --- a/standalone-container/src/main/java/com/yahoo/application/container/impl/StandaloneContainerRunner.java +++ b/standalone-container/src/main/java/com/yahoo/application/container/impl/StandaloneContainerRunner.java @@ -12,6 +12,7 @@ import java.nio.file.Path; * @author ollivir */ public class StandaloneContainerRunner { + public static Path createApplicationPackage(String servicesXml) { try { return createApplicationDirectory(servicesXml); @@ -31,4 +32,5 @@ public class StandaloneContainerRunner { Files.write(servicesXmlFile, Utf8.toBytes(content)); return applicationDir; } + } |