2 files changed, 11 insertions, 2 deletions
diff --git a/application/src/main/java/com/yahoo/application/Application.java b/application/src/main/java/com/yahoo/application/Application.java
index cc1b785ae0b..cfcce72487b 100644
--- a/application/src/main/java/com/yahoo/application/Application.java
+++ b/application/src/main/java/com/yahoo/application/Application.java
@@ -44,6 +44,13 @@ import java.util.*;
 @Beta
 public final class Application implements AutoCloseable {
 
+    /**
+     * This system property is set to "true" upon creation of an Application.
+     * This is useful for components which are created by dependendy injection which needs to modify
+     * their behavior to function without reliance on any processes outside the JVM.
+     */
+    public static final String vespaLocalProperty = "vespa.local";
+
     private final JDisc container;
     private final List<ContentCluster> contentClusters;
     private final Path path;
@@ -51,6 +58,7 @@ public final class Application implements AutoCloseable {
 
     // For internal use only
     Application(Path path, Networking networking, boolean deletePathWhenClosing) {
+        System.setProperty(vespaLocalProperty, "true");
         this.path = path;
         this.deletePathWhenClosing = deletePathWhenClosing;
         contentClusters = ContentCluster.fromPath(path);
diff --git a/application/src/main/java/com/yahoo/application/container/JDisc.java b/application/src/main/java/com/yahoo/application/container/JDisc.java
index 0c6caf9fdf9..dba16a0e3fe 100644
--- a/application/src/main/java/com/yahoo/application/container/JDisc.java
+++ b/application/src/main/java/com/yahoo/application/container/JDisc.java
@@ -23,6 +23,7 @@ import com.yahoo.jdisc.test.TestDriver;
 import com.yahoo.processing.handler.ProcessingHandler;
 import com.yahoo.search.handler.SearchHandler;
 
+import java.io.File;
 import java.nio.file.Path;
 
 /**
@@ -97,7 +98,7 @@ public final class JDisc implements AutoCloseable {
      * @param networking enabled or disabled
      * @return a new JDisc instance
      */
-    public static JDisc fromPath(final Path path, Networking networking) {
+    public static JDisc fromPath(Path path, Networking networking) {
         return new JDisc(path, false, networking, new ConfigModelRepo());
     }
 
@@ -105,7 +106,7 @@ public final class JDisc implements AutoCloseable {
      * Create a jDisc instance which is given a config model repo (in which (mock) content clusters
      * can be looked up).
      */
-    public static JDisc fromPath(final Path path, Networking networking, ConfigModelRepo configModelRepo) {
+    public static JDisc fromPath(Path path, Networking networking, ConfigModelRepo configModelRepo) {
         return new JDisc(path, false, networking, configModelRepo);
     }