diff options
| author | gjoranv <gv@verizonmedia.com> | 2020-07-14 01:29:46 +0200 |
|---|---|---|
| committer | gjoranv <gv@verizonmedia.com> | 2020-07-14 01:35:42 +0200 |
| commit | 94bf4cb3406dd21abc3fe90badf3ae5a7e77a1e5 (patch) | |
| tree | 66f0686e627cd50d4ac24b08497c042352d8c214 /config-model/src/main/java | |
| parent | 9131a39a9872b79c853c2c881c1c1b905428eda0 (diff) | |
Use absoluteBundlePath everywhere platform bundles are installed.
Diffstat (limited to 'config-model/src/main/java')
| -rw-r--r-- | config-model/src/main/java/com/yahoo/vespa/model/container/ApplicationContainerCluster.java | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/container/ApplicationContainerCluster.java b/config-model/src/main/java/com/yahoo/vespa/model/container/ApplicationContainerCluster.java index 04fe77d9e05..c7adfd0a882 100644 --- a/config-model/src/main/java/com/yahoo/vespa/model/container/ApplicationContainerCluster.java +++ b/config-model/src/main/java/com/yahoo/vespa/model/container/ApplicationContainerCluster.java @@ -29,6 +29,7 @@ import com.yahoo.vespa.model.container.component.Handler; import com.yahoo.vespa.model.container.component.Servlet; import com.yahoo.vespa.model.container.jersey.Jersey2Servlet; import com.yahoo.vespa.model.container.jersey.RestApi; +import com.yahoo.vespa.model.container.xml.BundleMapper; import com.yahoo.vespa.model.utils.FileSender; import java.nio.file.Paths; @@ -135,11 +136,11 @@ public final class ApplicationContainerCluster extends ContainerCluster<Applicat private void addTestrunnerComponentsIfTester(DeployState deployState) { if (deployState.isHosted() && deployState.getProperties().applicationId().instance().isTester()) { - addPlatformBundle(Paths.get(Defaults.getDefaults().underVespaHome("lib/jars/vespa-testrunner-components-jar-with-dependencies.jar"))); - addPlatformBundle(Paths.get(Defaults.getDefaults().underVespaHome("lib/jars/vespa-osgi-testrunner-jar-with-dependencies.jar"))); - addPlatformBundle(Paths.get(Defaults.getDefaults().underVespaHome("lib/jars/tenant-cd-api-jar-with-dependencies.jar"))); + addPlatformBundle(BundleMapper.absoluteBundlePath("vespa-testrunner-components")); + addPlatformBundle(BundleMapper.absoluteBundlePath("vespa-osgi-testrunner")); + addPlatformBundle(BundleMapper.absoluteBundlePath("tenant-cd-api")); if(deployState.zone().system().isPublic()) { - addPlatformBundle(Paths.get(Defaults.getDefaults().underVespaHome("lib/jars/cloud-tenant-cd-jar-with-dependencies.jar"))); + addPlatformBundle(BundleMapper.absoluteBundlePath("cloud-tenant-cd")); } } } |