diff options
author | Jon Bratseth <bratseth@oath.com> | 2018-12-01 09:46:53 -0800 |
---|---|---|
committer | Jon Bratseth <bratseth@oath.com> | 2018-12-01 09:46:53 -0800 |
commit | 52ffc1448e54da3a23b60f867241248e81df9888 (patch) | |
tree | fd859c0a38ed68300c743b54ee5ab41a986e273f | |
parent | 08ca40bdeabdebebf1e1a86b75bea3f4ffd2a235 (diff) |
Bind required configs
5 files changed, 18 insertions, 1 deletions
diff --git a/standalone-container/pom.xml b/standalone-container/pom.xml index 73d05d35df7..8e88a0fa21a 100644 --- a/standalone-container/pom.xml +++ b/standalone-container/pom.xml @@ -57,6 +57,12 @@ </dependency> <dependency> <groupId>com.yahoo.vespa</groupId> + <artifactId>configdefinitions</artifactId> + <version>${project.version}</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>com.yahoo.vespa</groupId> <artifactId>zkfacade</artifactId> <version>${project.version}</version> <scope>provided</scope> 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; } + } diff --git a/standalone-container/src/main/java/com/yahoo/container/standalone/LocalFileDb.java b/standalone-container/src/main/java/com/yahoo/container/standalone/LocalFileDb.java index 4bbe9986d90..4d968914dfa 100644 --- a/standalone-container/src/main/java/com/yahoo/container/standalone/LocalFileDb.java +++ b/standalone-container/src/main/java/com/yahoo/container/standalone/LocalFileDb.java @@ -24,6 +24,7 @@ import java.util.stream.Collectors; * @author ollivir */ public class LocalFileDb implements FileAcquirer, FileRegistry { + private static final Constructor<FileReference> fileReferenceConstructor = createFileReferenceConstructor(); private final Map<FileReference, File> fileReferenceToFile = new HashMap<>(); @@ -94,4 +95,5 @@ public class LocalFileDb implements FileAcquirer, FileRegistry { throw new IllegalStateException(ex); } } + } diff --git a/standalone-container/src/main/java/com/yahoo/container/standalone/StandaloneContainerApplication.java b/standalone-container/src/main/java/com/yahoo/container/standalone/StandaloneContainerApplication.java index c1550abcf1a..c632b9e154c 100644 --- a/standalone-container/src/main/java/com/yahoo/container/standalone/StandaloneContainerApplication.java +++ b/standalone-container/src/main/java/com/yahoo/container/standalone/StandaloneContainerApplication.java @@ -9,6 +9,7 @@ import com.google.inject.Key; import com.google.inject.ProvisionException; import com.google.inject.name.Named; import com.google.inject.name.Names; +import com.yahoo.cloud.config.SlobroksConfig; import com.yahoo.collections.Pair; import com.yahoo.config.application.api.ApplicationPackage; import com.yahoo.config.application.api.DeployLogger; @@ -23,6 +24,7 @@ import com.yahoo.config.model.builder.xml.XmlHelper; import com.yahoo.config.model.deploy.DeployProperties; import com.yahoo.config.model.deploy.DeployState; import com.yahoo.config.provision.Zone; +import com.yahoo.container.QrConfig; import com.yahoo.container.di.config.SubscriberFactory; import com.yahoo.container.jdisc.ConfiguredApplication; import com.yahoo.io.IOUtils; @@ -57,6 +59,7 @@ import static com.yahoo.collections.CollectionUtil.first; * @author ollivir */ public class StandaloneContainerApplication implements Application { + public static final String PACKAGE_NAME = "standalone_jdisc_container"; public static final String APPLICATION_LOCATION_INSTALL_VARIABLE = PACKAGE_NAME + ".app_location"; public static final String DEPLOYMENT_PROFILE_INSTALL_VARIABLE = PACKAGE_NAME + ".deployment_profile"; @@ -124,6 +127,8 @@ public class StandaloneContainerApplication implements Application { @Override public void configure() { bind(SubscriberFactory.class).toInstance(new StandaloneSubscriberFactory(modelRoot)); + bind(SlobroksConfig.class).toInstance(new SlobroksConfig(new SlobroksConfig.Builder())); + bind(QrConfig.class).toInstance(new QrConfig(new QrConfig.Builder())); } }); @@ -311,7 +316,6 @@ public class StandaloneContainerApplication implements Application { } } - @SuppressWarnings("deprecation") // TODO: what is the not-deprecated way? private static void initializeContainerModel(ContainerModel containerModel, ConfigModelRepo configModelRepo) { containerModel.initialize(configModelRepo); } @@ -323,4 +327,5 @@ public class StandaloneContainerApplication implements Application { } return Optional.ofNullable(System.getProperty(name)); // for unit testing } + } |