diff options
author | Jon Bratseth <bratseth@oath.com> | 2018-12-02 06:20:33 -0800 |
---|---|---|
committer | Jon Bratseth <bratseth@oath.com> | 2018-12-02 06:20:33 -0800 |
commit | 4d45743e389a03777ad5120745740cf2a7327efd (patch) | |
tree | 6e1c7650f90cada1a209388bb548130df3cb18a4 /standalone-container/src/main/java/com/yahoo/container/standalone/StandaloneContainerApplication.java | |
parent | 3d7da2d3d5d93231fa0351a6b716f9dea7ba2b81 (diff) |
Revert "Merge pull request #7837 from vespa-engine/revert-7836-bratseth/remove-unused-rpc-server-take-3"
This reverts commit 0c39992b60e6103a85fa00362df74930a660e51c, reversing
changes made to a8277a3a486f7fd174e562bf174cfa72aede9cee.
Diffstat (limited to 'standalone-container/src/main/java/com/yahoo/container/standalone/StandaloneContainerApplication.java')
-rw-r--r-- | standalone-container/src/main/java/com/yahoo/container/standalone/StandaloneContainerApplication.java | 5 |
1 files changed, 4 insertions, 1 deletions
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..a61e9fc56b8 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"; @@ -311,7 +314,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 +325,5 @@ public class StandaloneContainerApplication implements Application { } return Optional.ofNullable(System.getProperty(name)); // for unit testing } + } |