diff options
3 files changed, 0 insertions, 7 deletions
diff --git a/config-application-package/src/main/java/com/yahoo/config/model/application/provider/AppSubDirs.java b/config-application-package/src/main/java/com/yahoo/config/model/application/provider/AppSubDirs.java index f64c36cdf3f..32054b1ad9a 100644 --- a/config-application-package/src/main/java/com/yahoo/config/model/application/provider/AppSubDirs.java +++ b/config-application-package/src/main/java/com/yahoo/config/model/application/provider/AppSubDirs.java @@ -14,7 +14,6 @@ import java.io.File; public class AppSubDirs { final Tuple2<File, String> root; - final Tuple2<File, String> templates; public final Tuple2<File, String> rules; final Tuple2<File, String> searchchains; final Tuple2<File, String> docprocchains; @@ -24,7 +23,6 @@ public class AppSubDirs { public AppSubDirs(File root) { this.root = new Tuple2<>(root, root.getName()); - templates = createTuple(ApplicationPackage.TEMPLATES_DIR); rules = createTuple(ApplicationPackage.RULES_DIR.getRelative()); searchchains = createTuple(ApplicationPackage.SEARCHCHAINS_DIR); docprocchains = createTuple(ApplicationPackage.DOCPROCCHAINS_DIR); diff --git a/config-model-api/src/main/java/com/yahoo/config/application/api/ApplicationPackage.java b/config-model-api/src/main/java/com/yahoo/config/application/api/ApplicationPackage.java index eae0d7d5ee1..c2f6dbcbf4b 100644 --- a/config-model-api/src/main/java/com/yahoo/config/application/api/ApplicationPackage.java +++ b/config-model-api/src/main/java/com/yahoo/config/application/api/ApplicationPackage.java @@ -48,7 +48,6 @@ public interface ApplicationPackage { Path SEARCH_DEFINITIONS_DIR = Path.fromString("searchdefinitions"); String COMPONENT_DIR = "components"; - String TEMPLATES_DIR = "templates"; String SEARCHCHAINS_DIR = "search/chains"; String DOCPROCCHAINS_DIR = "docproc/chains"; String PROCESSORCHAINS_DIR = "processor/chains"; diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/deploy/ZooKeeperClient.java b/configserver/src/main/java/com/yahoo/vespa/config/server/deploy/ZooKeeperClient.java index c9c6ef4b428..68704eeb66a 100644 --- a/configserver/src/main/java/com/yahoo/vespa/config/server/deploy/ZooKeeperClient.java +++ b/configserver/src/main/java/com/yahoo/vespa/config/server/deploy/ZooKeeperClient.java @@ -180,10 +180,6 @@ public class ZooKeeperClient { getZooKeeperAppPath(ConfigCurator.USERAPP_ZK_SUBPATH)); writeFile(app.getFile(Path.fromString(ApplicationPackage.VALIDATION_OVERRIDES.getName())), getZooKeeperAppPath(ConfigCurator.USERAPP_ZK_SUBPATH)); - - writeDir(app.getFile(Path.fromString(ApplicationPackage.TEMPLATES_DIR)), - getZooKeeperAppPath(ConfigCurator.USERAPP_ZK_SUBPATH), - true); writeDir(app.getFile(ApplicationPackage.RULES_DIR), getZooKeeperAppPath(ConfigCurator.USERAPP_ZK_SUBPATH).append(ApplicationPackage.RULES_DIR), srFilter, true); |