summaryrefslogtreecommitdiffstats
path: root/config-model-api
diff options
context:
space:
mode:
authorJon Bratseth <bratseth@yahoo-inc.com>2018-01-11 13:32:09 +0100
committerJon Bratseth <bratseth@yahoo-inc.com>2018-01-11 13:32:09 +0100
commit7e2e38d17a51d0ca93dc74b8e7e0d34c5eeb19af (patch)
tree4815e7f8df0e9620045289385236ea0106ae2ea2 /config-model-api
parent58c0e6c1115950aa479217b9c97c74f0ebd0ec01 (diff)
Use constant tensor files WIP
Diffstat (limited to 'config-model-api')
-rw-r--r--config-model-api/src/main/java/com/yahoo/config/application/api/ApplicationPackage.java6
-rw-r--r--config-model-api/src/main/java/com/yahoo/config/application/api/ComponentInfo.java3
2 files changed, 5 insertions, 4 deletions
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 7506c884715..aca7b595249 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
@@ -4,7 +4,6 @@ package com.yahoo.config.application.api;
import com.yahoo.config.provision.AllocatedHosts;
import com.yahoo.config.provision.Version;
import com.yahoo.config.provision.Zone;
-import com.yahoo.path.Path;
import com.yahoo.io.IOUtils;
import com.yahoo.io.reader.NamedReader;
import com.yahoo.path.Path;
@@ -42,7 +41,7 @@ import java.util.jar.JarFile;
*/
public interface ApplicationPackage {
- // Caution!! If you add something here it must probably also be added to ZooKeeperClient.feedZKAppPkg
+ // Caution!! If you add something here it must probably also be added to ZooKeeperClient.write(applicationPackage)
String HOSTS = "hosts.xml";
String SERVICES = "services.xml";
@@ -54,6 +53,7 @@ public interface ApplicationPackage {
String DOCPROCCHAINS_DIR = "docproc/chains";
String PROCESSORCHAINS_DIR = "processor/chains";
String ROUTINGTABLES_DIR = "routing/tables";
+ String MODELS_DIR = "models";
// NOTE: this directory is created in serverdb during deploy, and should not exist in the original user application
/** Do not use */
@@ -271,7 +271,7 @@ public interface ApplicationPackage {
*
* @return A new application package instance pointing to a new location
*/
- default ApplicationPackage preprocess(Zone zone, RuleConfigDeriver ruleConfigDeriver, DeployLogger logger)
+ default ApplicationPackage preprocess(Zone zone, RuleConfigDeriver ruleConfigDeriver, DeployLogger logger)
throws IOException, TransformerException, ParserConfigurationException, SAXException {
throw new UnsupportedOperationException("This application package does not support preprocessing");
}
diff --git a/config-model-api/src/main/java/com/yahoo/config/application/api/ComponentInfo.java b/config-model-api/src/main/java/com/yahoo/config/application/api/ComponentInfo.java
index fc6f09cef24..3dd10054d13 100644
--- a/config-model-api/src/main/java/com/yahoo/config/application/api/ComponentInfo.java
+++ b/config-model-api/src/main/java/com/yahoo/config/application/api/ComponentInfo.java
@@ -4,9 +4,10 @@ package com.yahoo.config.application.api;
/**
* Describes a component residing in the components directory.
- * <p>TODO: add support for component versions.</p>
+ *
* @author tonytv
*/
+// TODO: add support for component versions.
public class ComponentInfo {
final String pathRelativeToAppDir;