Merge pull request #16565 from vespa-engine/gjoranv/merge-processing-into-core

Gjoranv/merge processing into core

97 files changed, 906 insertions, 1011 deletions

diff --git a/CMakeLists.txt b/CMakeLists.txt
index db673c9184c..eae4cb338eb 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -113,7 +113,6 @@ add_subdirectory(orchestrator)
 add_subdirectory(persistence)
 add_subdirectory(persistencetypes)
 add_subdirectory(predicate-search)
-add_subdirectory(processing)
 add_subdirectory(searchcommon)
 add_subdirectory(searchcore)
 add_subdirectory(searchcorespi)
diff --git a/config-model/pom.xml b/config-model/pom.xml
index 0d499399de8..8d587c2ec8c 100644
--- a/config-model/pom.xml
+++ b/config-model/pom.xml
@@ -225,12 +225,6 @@
     </dependency>
     <dependency>
       <groupId>com.yahoo.vespa</groupId>
-      <artifactId>processing</artifactId>
-      <version>${project.version}</version>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.yahoo.vespa</groupId>
       <artifactId>docproc</artifactId>
       <version>${project.version}</version>
       <scope>provided</scope>
diff --git a/container-core/OWNERS b/container-core/OWNERS
index d2719284202..ba027370393 100644
--- a/container-core/OWNERS
+++ b/container-core/OWNERS
@@ -1,2 +1,3 @@
 bjorncs
+bratseth
 gjoranv
diff --git a/container-core/README.md b/container-core/README.md
index 84f7943e2fa..a65e82c7ec5 100644
--- a/container-core/README.md
+++ b/container-core/README.md
@@ -1,4 +1,4 @@
 <!-- Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -->
 # Container core
 
-This module contains various core classes for JDisc container.
+This module contains core classes for JDisc container. 
diff --git a/container-core/abi-spec.json b/container-core/abi-spec.json
index 46b7a852afd..d549ba1098d 100644
--- a/container-core/abi-spec.json
+++ b/container-core/abi-spec.json
@@ -1,4 +1,138 @@
 {
+  "com.yahoo.component.chain.Chain": {
+    "superClass": "java.lang.Object",
+    "interfaces": [],
+    "attributes": [
+      "public"
+    ],
+    "methods": [
+      "public void <init>(java.lang.String, java.util.List)",
+      "public void <init>(com.yahoo.component.ComponentId, java.util.List)",
+      "public void <init>(java.util.List)",
+      "public varargs void <init>(com.yahoo.component.chain.ChainedComponent[])",
+      "public varargs void <init>(java.lang.String, com.yahoo.component.chain.ChainedComponent[])",
+      "public varargs void <init>(com.yahoo.component.ComponentId, com.yahoo.component.chain.ChainedComponent[])",
+      "public void <init>(com.yahoo.component.ComponentId, java.util.Collection, java.util.Collection)",
+      "public com.yahoo.component.ComponentId getId()",
+      "public java.util.List components()",
+      "public java.lang.String toString()",
+      "public boolean equals(java.lang.Object)",
+      "public int hashCode()"
+    ],
+    "fields": []
+  },
+  "com.yahoo.component.chain.ChainedComponent": {
+    "superClass": "com.yahoo.component.AbstractComponent",
+    "interfaces": [],
+    "attributes": [
+      "public",
+      "abstract"
+    ],
+    "methods": [
+      "public void <init>(com.yahoo.component.ComponentId)",
+      "protected void <init>()",
+      "public void initDependencies(com.yahoo.component.chain.dependencies.Dependencies)",
+      "public com.yahoo.component.chain.dependencies.Dependencies getDependencies()",
+      "protected com.yahoo.component.chain.dependencies.Dependencies getDefaultAnnotatedDependencies()",
+      "protected com.yahoo.component.chain.dependencies.Dependencies getAnnotatedDependencies(java.lang.Class, java.lang.Class, java.lang.Class)"
+    ],
+    "fields": []
+  },
+  "com.yahoo.component.chain.ChainsConfigurer": {
+    "superClass": "java.lang.Object",
+    "interfaces": [],
+    "attributes": [
+      "public"
+    ],
+    "methods": [
+      "public void <init>()",
+      "public static void prepareChainRegistry(com.yahoo.component.provider.ComponentRegistry, com.yahoo.component.chain.model.ChainsModel, com.yahoo.component.provider.ComponentRegistry)"
+    ],
+    "fields": []
+  },
+  "com.yahoo.component.chain.Phase": {
+    "superClass": "java.lang.Object",
+    "interfaces": [],
+    "attributes": [
+      "public"
+    ],
+    "methods": [
+      "public void <init>(java.lang.String, java.util.Set, java.util.Set)",
+      "public void <init>(java.lang.String, com.yahoo.component.chain.dependencies.Dependencies)",
+      "public java.lang.String getName()",
+      "public java.util.Set before()",
+      "public java.util.Set after()",
+      "public com.yahoo.component.chain.Phase union(com.yahoo.component.chain.Phase)"
+    ],
+    "fields": [
+      "public final com.yahoo.component.chain.dependencies.Dependencies dependencies"
+    ]
+  },
+  "com.yahoo.component.chain.dependencies.After": {
+    "superClass": "java.lang.Object",
+    "interfaces": [
+      "java.lang.annotation.Annotation"
+    ],
+    "attributes": [
+      "public",
+      "interface",
+      "abstract",
+      "annotation"
+    ],
+    "methods": [
+      "public abstract java.lang.String[] value()"
+    ],
+    "fields": []
+  },
+  "com.yahoo.component.chain.dependencies.Before": {
+    "superClass": "java.lang.Object",
+    "interfaces": [
+      "java.lang.annotation.Annotation"
+    ],
+    "attributes": [
+      "public",
+      "interface",
+      "abstract",
+      "annotation"
+    ],
+    "methods": [
+      "public abstract java.lang.String[] value()"
+    ],
+    "fields": []
+  },
+  "com.yahoo.component.chain.dependencies.Dependencies": {
+    "superClass": "java.lang.Object",
+    "interfaces": [],
+    "attributes": [
+      "public"
+    ],
+    "methods": [
+      "public void <init>(java.util.Collection, java.util.Collection, java.util.Collection)",
+      "public static com.yahoo.component.chain.dependencies.Dependencies emptyDependencies()",
+      "public com.yahoo.component.chain.dependencies.Dependencies union(com.yahoo.component.chain.dependencies.Dependencies)",
+      "public java.lang.String toString()",
+      "public java.util.Set provides()",
+      "public java.util.Set before()",
+      "public java.util.Set after()"
+    ],
+    "fields": []
+  },
+  "com.yahoo.component.chain.dependencies.Provides": {
+    "superClass": "java.lang.Object",
+    "interfaces": [
+      "java.lang.annotation.Annotation"
+    ],
+    "attributes": [
+      "public",
+      "interface",
+      "abstract",
+      "annotation"
+    ],
+    "methods": [
+      "public abstract java.lang.String[] value()"
+    ],
+    "fields": []
+  },
   "com.yahoo.container.handler.AccessLogRequestHandler": {
     "superClass": "com.yahoo.container.jdisc.ThreadedHttpRequestHandler",
     "interfaces": [],
@@ -726,6 +860,238 @@
     ],
     "fields": []
   },
+  "com.yahoo.processing.IllegalInputException": {
+    "superClass": "java.lang.IllegalArgumentException",
+    "interfaces": [],
+    "attributes": [
+      "public"
+    ],
+    "methods": [
+      "public void <init>(java.lang.String)",
+      "public void <init>(java.lang.Throwable)",
+      "public void <init>(java.lang.String, java.lang.Throwable)"
+    ],
+    "fields": []
+  },
+  "com.yahoo.processing.Processor": {
+    "superClass": "com.yahoo.component.chain.ChainedComponent",
+    "interfaces": [],
+    "attributes": [
+      "public",
+      "abstract"
+    ],
+    "methods": [
+      "public void <init>()",
+      "public abstract com.yahoo.processing.Response process(com.yahoo.processing.Request, com.yahoo.processing.execution.Execution)"
+    ],
+    "fields": []
+  },
+  "com.yahoo.processing.Request": {
+    "superClass": "com.yahoo.component.provider.FreezableClass",
+    "interfaces": [
+      "java.lang.Cloneable"
+    ],
+    "attributes": [
+      "public"
+    ],
+    "methods": [
+      "public void <init>()",
+      "public void <init>(com.yahoo.processing.request.Properties)",
+      "public com.yahoo.processing.request.Properties properties()",
+      "public java.util.List errors()",
+      "public com.yahoo.processing.Request clone()",
+      "public bridge synthetic com.yahoo.component.provider.FreezableClass clone()",
+      "public bridge synthetic java.lang.Object clone()"
+    ],
+    "fields": [
+      "public static final com.yahoo.processing.request.CompoundName CHAIN",
+      "public static final com.yahoo.processing.request.CompoundName JDISC_REQUEST"
+    ]
+  },
+  "com.yahoo.processing.Response": {
+    "superClass": "com.yahoo.component.provider.ListenableFreezableClass",
+    "interfaces": [],
+    "attributes": [
+      "public"
+    ],
+    "methods": [
+      "public void <init>(com.yahoo.processing.Request)",
+      "public void <init>(com.yahoo.processing.response.DataList)",
+      "public void <init>(com.yahoo.processing.Request, com.yahoo.processing.request.ErrorMessage)",
+      "public void mergeWith(com.yahoo.processing.Response)",
+      "public com.yahoo.processing.response.DataList data()",
+      "public static com.google.common.util.concurrent.ListenableFuture recursiveComplete(com.yahoo.processing.response.DataList)"
+    ],
+    "fields": []
+  },
+  "com.yahoo.processing.execution.AsyncExecution": {
+    "superClass": "java.lang.Object",
+    "interfaces": [],
+    "attributes": [
+      "public"
+    ],
+    "methods": [
+      "public void <init>(com.yahoo.processing.Processor, com.yahoo.processing.execution.Execution)",
+      "public void <init>(com.yahoo.component.chain.Chain, com.yahoo.processing.execution.Execution)",
+      "public void <init>(com.yahoo.processing.execution.Execution)",
+      "public com.yahoo.processing.response.FutureResponse process(com.yahoo.processing.Request)",
+      "public static java.util.List waitForAll(java.util.Collection, long)"
+    ],
+    "fields": []
+  },
+  "com.yahoo.processing.execution.Execution$Environment": {
+    "superClass": "java.lang.Object",
+    "interfaces": [],
+    "attributes": [
+      "public"
+    ],
+    "methods": [
+      "public static com.yahoo.processing.execution.Execution$Environment createEmpty()",
+      "public com.yahoo.processing.execution.Execution$Environment nested()",
+      "public void <init>(com.yahoo.processing.execution.chain.ChainRegistry)",
+      "public com.yahoo.processing.execution.chain.ChainRegistry chainRegistry()"
+    ],
+    "fields": []
+  },
+  "com.yahoo.processing.execution.Execution$Trace$Level": {
+    "superClass": "java.lang.Enum",
+    "interfaces": [],
+    "attributes": [
+      "public",
+      "final",
+      "enum"
+    ],
+    "methods": [
+      "public static com.yahoo.processing.execution.Execution$Trace$Level[] values()",
+      "public static com.yahoo.processing.execution.Execution$Trace$Level valueOf(java.lang.String)",
+      "public int value()",
+      "public boolean includes(int)"
+    ],
+    "fields": [
+      "public static final enum com.yahoo.processing.execution.Execution$Trace$Level Step",
+      "public static final enum com.yahoo.processing.execution.Execution$Trace$Level Timestamp",
+      "public static final enum com.yahoo.processing.execution.Execution$Trace$Level Dependencies"
+    ]
+  },
+  "com.yahoo.processing.execution.Execution$Trace$LogValue": {
+    "superClass": "java.lang.Object",
+    "interfaces": [],
+    "attributes": [
+      "public"
+    ],
+    "methods": [
+      "public void <init>(java.lang.String, java.lang.String)",
+      "public java.lang.String getKey()",
+      "public java.lang.String getValue()",
+      "public java.lang.String toString()"
+    ],
+    "fields": []
+  },
+  "com.yahoo.processing.execution.Execution$Trace": {
+    "superClass": "java.lang.Object",
+    "interfaces": [],
+    "attributes": [
+      "public"
+    ],
+    "methods": [
+      "public static com.yahoo.processing.execution.Execution$Trace createRoot(int)",
+      "public com.yahoo.processing.execution.Execution$Trace createChild()",
+      "public int getTraceLevel()",
+      "public void setTraceLevel(int)",
+      "public void setForceTimestamps(boolean)",
+      "public boolean getForceTimestamps()",
+      "public void trace(java.lang.String, int)",
+      "public void trace(java.lang.Object, int)",
+      "public void logValue(java.lang.String, java.lang.String)",
+      "public java.util.Iterator logValueIterator()",
+      "public com.yahoo.yolean.trace.TraceVisitor accept(com.yahoo.yolean.trace.TraceVisitor)",
+      "public void setProperty(java.lang.String, java.lang.Object)",
+      "public java.lang.Object getProperty(java.lang.String)",
+      "public com.yahoo.yolean.trace.TraceNode traceNode()",
+      "public java.lang.String toString()"
+    ],
+    "fields": []
+  },
+  "com.yahoo.processing.execution.Execution": {
+    "superClass": "java.lang.Object",
+    "interfaces": [],
+    "attributes": [
+      "public"
+    ],
+    "methods": [
+      "public void <init>(com.yahoo.processing.Processor, com.yahoo.processing.execution.Execution)",
+      "public static com.yahoo.processing.execution.Execution createRoot(com.yahoo.processing.Processor, int, com.yahoo.processing.execution.Execution$Environment)",
+      "public static com.yahoo.processing.execution.Execution createRoot(com.yahoo.component.chain.Chain, int, com.yahoo.processing.execution.Execution$Environment)",
+      "public void <init>(com.yahoo.component.chain.Chain, com.yahoo.processing.execution.Execution)",
+      "public void <init>(com.yahoo.processing.execution.Execution)",
+      "protected void <init>(com.yahoo.component.chain.Chain, int, com.yahoo.processing.execution.Execution$Trace, com.yahoo.processing.execution.Execution$Environment)",
+      "public com.yahoo.processing.Response process(com.yahoo.processing.Request)",
+      "protected int nextIndex()",
+      "protected void onInvoking(com.yahoo.processing.Request, com.yahoo.processing.Processor)",
+      "protected void onReturning(com.yahoo.processing.Request, com.yahoo.processing.Processor, com.yahoo.processing.Response)",
+      "protected void previousProcessor()",
+      "protected void nextProcessor()",
+      "protected com.yahoo.processing.Processor next()",
+      "public com.yahoo.component.chain.Chain chain()",
+      "protected com.yahoo.processing.Response defaultResponse(com.yahoo.processing.Request)",
+      "public java.lang.String toString()",
+      "public com.yahoo.processing.execution.Execution$Trace trace()",
+      "public com.yahoo.processing.execution.Execution$Environment environment()"
+    ],
+    "fields": []
+  },
+  "com.yahoo.processing.execution.ExecutionWithResponse": {
+    "superClass": "com.yahoo.processing.execution.Execution",
+    "interfaces": [],
+    "attributes": [
+      "public"
+    ],
+    "methods": [
+      "public void <init>(com.yahoo.component.chain.Chain, com.yahoo.processing.Response, com.yahoo.processing.execution.Execution)",
+      "protected com.yahoo.processing.Response defaultResponse(com.yahoo.processing.Request)"
+    ],
+    "fields": []
+  },
+  "com.yahoo.processing.execution.ResponseReceiver": {
+    "superClass": "java.lang.Object",
+    "interfaces": [],
+    "attributes": [
+      "public",
+      "interface",
+      "abstract"
+    ],
+    "methods": [
+      "public abstract void setResponse(com.yahoo.processing.Response)"
+    ],
+    "fields": []
+  },
+  "com.yahoo.processing.execution.RunnableExecution": {
+    "superClass": "java.lang.Object",
+    "interfaces": [
+      "java.lang.Runnable"
+    ],
+    "attributes": [
+      "public"
+    ],
+    "methods": [
+      "public void <init>(com.yahoo.processing.Request, com.yahoo.processing.execution.Execution)",
+      "public void run()",
+      "public com.yahoo.processing.Response getResponse()",
+      "public java.lang.Throwable getException()"
+    ],
+    "fields": []
+  },
+  "com.yahoo.processing.execution.chain.ChainRegistry": {
+    "superClass": "com.yahoo.component.provider.ComponentRegistry",
+    "interfaces": [],
+    "attributes": [
+      "public"
+    ],
+    "methods": [
+      "public void <init>()"
+    ],
+    "fields": []
+  },
   "com.yahoo.processing.handler.AbstractProcessingHandler": {
     "superClass": "com.yahoo.container.jdisc.LoggingRequestHandler",
     "interfaces": [],
@@ -906,5 +1272,436 @@
       "public bridge synthetic java.lang.Object clone()"
     ],
     "fields": []
+  },
+  "com.yahoo.processing.request.CloneHelper": {
+    "superClass": "java.lang.Object",
+    "interfaces": [],
+    "attributes": [
+      "public"
+    ],
+    "methods": [
+      "public void <init>()",
+      "public final java.lang.Object clone(java.lang.Object)",
+      "protected java.lang.Object objectClone(java.lang.Object)",
+      "public java.util.Map cloneMap(java.util.Map)"
+    ],
+    "fields": []
+  },
+  "com.yahoo.processing.request.CompoundName": {
+    "superClass": "java.lang.Object",
+    "interfaces": [],
+    "attributes": [
+      "public",
+      "final"
+    ],
+    "methods": [
+      "public void <init>(java.lang.String)",
+      "public static varargs com.yahoo.processing.request.CompoundName fromComponents(java.lang.String[])",
+      "public void <init>(java.util.List)",
+      "public com.yahoo.processing.request.CompoundName append(java.lang.String)",
+      "public com.yahoo.processing.request.CompoundName append(com.yahoo.processing.request.CompoundName)",
+      "public varargs com.yahoo.processing.request.CompoundName prepend(java.lang.String[])",
+      "public java.lang.String last()",
+      "public java.lang.String first()",
+      "public com.yahoo.processing.request.CompoundName first(int)",
+      "public com.yahoo.processing.request.CompoundName rest()",
+      "public com.yahoo.processing.request.CompoundName rest(int)",
+      "public int size()",
+      "public java.lang.String get(int)",
+      "public com.yahoo.processing.request.CompoundName set(int, java.lang.String)",
+      "public boolean isCompound()",
+      "public boolean isEmpty()",
+      "public boolean hasPrefix(com.yahoo.processing.request.CompoundName)",
+      "public java.util.List asList()",
+      "public int hashCode()",
+      "public boolean equals(java.lang.Object)",
+      "public java.lang.String toString()",
+      "public java.lang.String getLowerCasedName()"
+    ],
+    "fields": [
+      "public static final com.yahoo.processing.request.CompoundName empty"
+    ]
+  },
+  "com.yahoo.processing.request.ErrorMessage": {
+    "superClass": "java.lang.Object",
+    "interfaces": [
+      "java.lang.Cloneable"
+    ],
+    "attributes": [
+      "public"
+    ],
+    "methods": [
+      "public void <init>(java.lang.String)",
+      "public void <init>(int, java.lang.String)",
+      "public void <init>(java.lang.String, java.lang.String)",
+      "public void <init>(int, java.lang.String, java.lang.String)",
+      "public void <init>(java.lang.String, java.lang.Throwable)",
+      "public void <init>(int, java.lang.String, java.lang.Throwable)",
+      "public void <init>(java.lang.String, java.lang.String, java.lang.Throwable)",
+      "public void <init>(int, java.lang.String, java.lang.String, java.lang.Throwable)",
+      "public int getCode()",
+      "public java.lang.String getMessage()",
+      "public java.lang.String getDetailedMessage()",
+      "public java.lang.Throwable getCause()",
+      "public java.lang.String toString()",
+      "public int hashCode()",
+      "public boolean equals(java.lang.Object)",
+      "public com.yahoo.processing.request.ErrorMessage clone()",
+      "public bridge synthetic java.lang.Object clone()"
+    ],
+    "fields": []
+  },
+  "com.yahoo.processing.request.Properties": {
+    "superClass": "java.lang.Object",
+    "interfaces": [
+      "java.lang.Cloneable"
+    ],
+    "attributes": [
+      "public"
+    ],
+    "methods": [
+      "public void <init>()",
+      "public com.yahoo.processing.request.Properties chain(com.yahoo.processing.request.Properties)",
+      "public com.yahoo.processing.request.Properties chained()",
+      "public final com.yahoo.processing.request.Properties getInstance(java.lang.Class)",
+      "public final java.util.Map listProperties()",
+      "public final java.util.Map listProperties(java.util.Map)",
+      "public final java.util.Map listProperties(com.yahoo.processing.request.CompoundName)",
+      "public final java.util.Map listProperties(java.lang.String)",
+      "public final java.util.Map listProperties(com.yahoo.processing.request.CompoundName, java.util.Map)",
+      "public final java.util.Map listProperties(java.lang.String, java.util.Map)",
+      "public java.util.Map listProperties(com.yahoo.processing.request.CompoundName, java.util.Map, com.yahoo.processing.request.Properties)",
+      "public final java.util.Map listProperties(java.lang.String, java.util.Map, com.yahoo.processing.request.Properties)",
+      "public java.lang.Object get(com.yahoo.processing.request.CompoundName, java.util.Map, com.yahoo.processing.request.Properties)",
+      "public final java.lang.Object get(java.lang.String, java.util.Map, com.yahoo.processing.request.Properties)",
+      "public final java.lang.Object get(com.yahoo.processing.request.CompoundName, java.util.Map)",
+      "public final java.lang.Object get(java.lang.String, java.util.Map)",
+      "public final java.lang.Object get(com.yahoo.processing.request.CompoundName)",
+      "public final java.lang.Object get(java.lang.String)",
+      "public final java.lang.Object get(com.yahoo.processing.request.CompoundName, java.lang.Object)",
+      "public final java.lang.Object get(java.lang.String, java.lang.Object)",
+      "public void set(com.yahoo.processing.request.CompoundName, java.lang.Object, java.util.Map)",
+      "public final void set(java.lang.String, java.lang.Object, java.util.Map)",
+      "public final void set(com.yahoo.processing.request.CompoundName, java.lang.Object)",
+      "public final void set(java.lang.String, java.lang.Object)",
+      "public void clearAll(com.yahoo.processing.request.CompoundName, java.util.Map)",
+      "public final void clearAll(java.lang.String, java.lang.Object, java.util.Map)",
+      "public final void clearAll(com.yahoo.processing.request.CompoundName)",
+      "public final void clearAll(java.lang.String)",
+      "public final boolean getBoolean(com.yahoo.processing.request.CompoundName)",
+      "public final boolean getBoolean(java.lang.String)",
+      "public final boolean getBoolean(com.yahoo.processing.request.CompoundName, boolean)",
+      "public final boolean getBoolean(java.lang.String, boolean)",
+      "protected final boolean asBoolean(java.lang.Object, boolean)",
+      "public final java.lang.String getString(com.yahoo.processing.request.CompoundName)",
+      "public final java.lang.String getString(java.lang.String)",
+      "public final java.lang.String getString(com.yahoo.processing.request.CompoundName, java.lang.String)",
+      "public final java.lang.String getString(java.lang.String, java.lang.String)",
+      "protected final java.lang.String asString(java.lang.Object, java.lang.String)",
+      "public final java.lang.Integer getInteger(com.yahoo.processing.request.CompoundName)",
+      "public final java.lang.Integer getInteger(java.lang.String)",
+      "public final java.lang.Integer getInteger(com.yahoo.processing.request.CompoundName, java.lang.Integer)",
+      "public final java.lang.Integer getInteger(java.lang.String, java.lang.Integer)",
+      "protected final java.lang.Integer asInteger(java.lang.Object, java.lang.Integer)",
+      "public final java.lang.Long getLong(com.yahoo.processing.request.CompoundName)",
+      "public final java.lang.Long getLong(java.lang.String)",
+      "public final java.lang.Long getLong(com.yahoo.processing.request.CompoundName, java.lang.Long)",
+      "public final java.lang.Long getLong(java.lang.String, java.lang.Long)",
+      "protected final java.lang.Long asLong(java.lang.Object, java.lang.Long)",
+      "public final java.lang.Double getDouble(com.yahoo.processing.request.CompoundName)",
+      "public final java.lang.Double getDouble(java.lang.String)",
+      "public final java.lang.Double getDouble(com.yahoo.processing.request.CompoundName, java.lang.Double)",
+      "public final java.lang.Double getDouble(java.lang.String, java.lang.Double)",
+      "protected final java.lang.Double asDouble(java.lang.Object, java.lang.Double)",
+      "public com.yahoo.processing.request.Properties clone()",
+      "public static java.util.Map cloneMap(java.util.Map)",
+      "public static java.lang.Object clone(java.lang.Object)",
+      "public bridge synthetic java.lang.Object clone()"
+    ],
+    "fields": []
+  },
+  "com.yahoo.processing.request.properties.PropertyMap": {
+    "superClass": "com.yahoo.processing.request.Properties",
+    "interfaces": [],
+    "attributes": [
+      "public"
+    ],
+    "methods": [
+      "public void <init>()",
+      "public void set(com.yahoo.processing.request.CompoundName, java.lang.Object, java.util.Map)",
+      "protected boolean shouldSet(com.yahoo.processing.request.CompoundName, java.lang.Object)",
+      "public java.lang.Object get(com.yahoo.processing.request.CompoundName, java.util.Map, com.yahoo.processing.request.Properties)",
+      "public com.yahoo.processing.request.properties.PropertyMap clone()",
+      "public java.util.Map listProperties(com.yahoo.processing.request.CompoundName, java.util.Map, com.yahoo.processing.request.Properties)",
+      "public bridge synthetic com.yahoo.processing.request.Properties clone()",
+      "public bridge synthetic java.lang.Object clone()"
+    ],
+    "fields": []
+  },
+  "com.yahoo.processing.request.properties.PublicCloneable": {
+    "superClass": "java.lang.Object",
+    "interfaces": [
+      "java.lang.Cloneable"
+    ],
+    "attributes": [
+      "public",
+      "interface",
+      "abstract"
+    ],
+    "methods": [
+      "public abstract java.lang.Object clone()"
+    ],
+    "fields": []
+  },
+  "com.yahoo.processing.response.AbstractData": {
+    "superClass": "com.yahoo.component.provider.ListenableFreezableClass",
+    "interfaces": [
+      "com.yahoo.processing.response.Data"
+    ],
+    "attributes": [
+      "public",
+      "abstract"
+    ],
+    "methods": [
+      "public void <init>(com.yahoo.processing.Request)",
+      "public com.yahoo.processing.Request request()"
+    ],
+    "fields": []
+  },
+  "com.yahoo.processing.response.AbstractDataList$DrainOnGetFuture": {
+    "superClass": "com.google.common.util.concurrent.AbstractFuture",
+    "interfaces": [],
+    "attributes": [
+      "public",
+      "final"
+    ],
+    "methods": [
+      "public void <init>(com.yahoo.processing.response.DataList)",
+      "public boolean cancel(boolean)",
+      "public boolean isCancelled()",
+      "public com.yahoo.processing.response.DataList get()",
+      "public com.yahoo.processing.response.DataList get(long, java.util.concurrent.TimeUnit)",
+      "public bridge synthetic java.lang.Object get()",
+      "public bridge synthetic java.lang.Object get(long, java.util.concurrent.TimeUnit)"
+    ],
+    "fields": []
+  },
+  "com.yahoo.processing.response.AbstractDataList": {
+    "superClass": "com.yahoo.component.provider.ListenableFreezableClass",
+    "interfaces": [
+      "com.yahoo.processing.response.DataList",
+      "com.yahoo.processing.response.Streamed",
+      "com.yahoo.processing.response.Ordered"
+    ],
+    "attributes": [
+      "public",
+      "abstract"
+    ],
+    "methods": [
+      "protected void <init>(com.yahoo.processing.Request)",
+      "protected void <init>(com.yahoo.processing.Request, com.yahoo.processing.response.IncomingData)",
+      "protected void <init>(com.yahoo.processing.Request, com.yahoo.processing.response.IncomingData, boolean, boolean)",
+      "public com.yahoo.processing.Request request()",
+      "public com.yahoo.processing.response.IncomingData incoming()",
+      "public com.google.common.util.concurrent.ListenableFuture complete()",
+      "public boolean isOrdered()",
+      "public boolean isStreamed()",
+      "public java.lang.String toString()"
+    ],
+    "fields": []
+  },
+  "com.yahoo.processing.response.ArrayDataList": {
+    "superClass": "com.yahoo.processing.response.AbstractDataList",
+    "interfaces": [],
+    "attributes": [
+      "public"
+    ],
+    "methods": [
+      "protected void <init>(com.yahoo.processing.Request)",
+      "protected void <init>(com.yahoo.processing.Request, com.yahoo.processing.response.IncomingData)",
+      "protected void <init>(com.yahoo.processing.Request, com.yahoo.processing.response.IncomingData, boolean, boolean)",
+      "public static com.yahoo.processing.response.ArrayDataList create(com.yahoo.processing.Request)",
+      "public static com.yahoo.processing.response.ArrayDataList createAsync(com.yahoo.processing.Request)",
+      "public static com.yahoo.processing.response.ArrayDataList createAsyncUnordered(com.yahoo.processing.Request)",
+      "public static com.yahoo.processing.response.ArrayDataList createAsyncNonstreamed(com.yahoo.processing.Request)",
+      "public com.yahoo.processing.response.Data add(com.yahoo.processing.response.Data)",
+      "public com.yahoo.processing.response.Data get(int)",
+      "public java.util.List asList()",
+      "public void addDataListener(java.lang.Runnable)",
+      "public void freeze()"
+    ],
+    "fields": []
+  },
+  "com.yahoo.processing.response.Data": {
+    "superClass": "java.lang.Object",
+    "interfaces": [
+      "com.yahoo.component.provider.ListenableFreezable"
+    ],
+    "attributes": [
+      "public",
+      "interface",
+      "abstract"
+    ],
+    "methods": [
+      "public abstract com.yahoo.processing.Request request()"
+    ],
+    "fields": []
+  },
+  "com.yahoo.processing.response.DataList": {
+    "superClass": "java.lang.Object",
+    "interfaces": [
+      "com.yahoo.processing.response.Data"
+    ],
+    "attributes": [
+      "public",
+      "interface",
+      "abstract"
+    ],
+    "methods": [
+      "public abstract com.yahoo.processing.response.Data add(com.yahoo.processing.response.Data)",
+      "public abstract com.yahoo.processing.response.Data get(int)",
+      "public abstract java.util.List asList()",
+      "public abstract com.yahoo.processing.response.IncomingData incoming()",
+      "public abstract com.google.common.util.concurrent.ListenableFuture complete()",
+      "public abstract void addDataListener(java.lang.Runnable)",
+      "public void close()"
+    ],
+    "fields": []
+  },
+  "com.yahoo.processing.response.DefaultIncomingData": {
+    "superClass": "java.lang.Object",
+    "interfaces": [
+      "com.yahoo.processing.response.IncomingData"
+    ],
+    "attributes": [
+      "public"
+    ],
+    "methods": [
+      "public void <init>()",
+      "public void <init>(com.yahoo.processing.response.DataList)",
+      "public final void assignOwner(com.yahoo.processing.response.DataList)",
+      "public com.yahoo.processing.response.DataList getOwner()",
+      "public com.google.common.util.concurrent.ListenableFuture completed()",
+      "public synchronized boolean isComplete()",
+      "public synchronized void addLast(com.yahoo.processing.response.Data)",
+      "public synchronized void add(com.yahoo.processing.response.Data)",
+      "public synchronized void addLast(java.util.List)",
+      "public synchronized void add(java.util.List)",
+      "public synchronized void markComplete()",
+      "public synchronized java.util.List drain()",
+      "public void addNewDataListener(java.lang.Runnable, java.util.concurrent.Executor)",
+      "public java.lang.String toString()"
+    ],
+    "fields": []
+  },
+  "com.yahoo.processing.response.FutureResponse": {
+    "superClass": "com.google.common.util.concurrent.ForwardingFuture",
+    "interfaces": [],
+    "attributes": [
+      "public"
+    ],
+    "methods": [
+      "public void <init>(java.util.concurrent.Callable, com.yahoo.processing.execution.Execution, com.yahoo.processing.Request)",
+      "public com.google.common.util.concurrent.ListenableFutureTask delegate()",
+      "public com.yahoo.processing.Response get()",
+      "public com.yahoo.processing.Response get(long, java.util.concurrent.TimeUnit)",
+      "public com.yahoo.processing.Request getRequest()",
+      "public bridge synthetic java.lang.Object get(long, java.util.concurrent.TimeUnit)",
+      "public bridge synthetic java.lang.Object get()",
+      "public bridge synthetic java.util.concurrent.Future delegate()",
+      "public bridge synthetic java.lang.Object delegate()"
+    ],
+    "fields": []
+  },
+  "com.yahoo.processing.response.IncomingData$NullIncomingData$ImmediateFuture": {
+    "superClass": "com.google.common.util.concurrent.AbstractFuture",
+    "interfaces": [],
+    "attributes": [
+      "public"
+    ],
+    "methods": [
+      "public void <init>(com.yahoo.processing.response.DataList)",
+      "public boolean cancel(boolean)",
+      "public boolean isCancelled()",
+      "public boolean isDone()",
+      "public com.yahoo.processing.response.DataList get()",
+      "public com.yahoo.processing.response.DataList get(long, java.util.concurrent.TimeUnit)",
+      "public bridge synthetic java.lang.Object get()",
+      "public bridge synthetic java.lang.Object get(long, java.util.concurrent.TimeUnit)"
+    ],
+    "fields": []
+  },
+  "com.yahoo.processing.response.IncomingData$NullIncomingData": {
+    "superClass": "java.lang.Object",
+    "interfaces": [
+      "com.yahoo.processing.response.IncomingData"
+    ],
+    "attributes": [
+      "public",
+      "final"
+    ],
+    "methods": [
+      "public void <init>(com.yahoo.processing.response.DataList)",
+      "public com.google.common.util.concurrent.ListenableFuture completed()",
+      "public com.yahoo.processing.response.DataList getOwner()",
+      "public boolean isComplete()",
+      "public void addLast(com.yahoo.processing.response.Data)",
+      "public void add(com.yahoo.processing.response.Data)",
+      "public void addLast(java.util.List)",
+      "public void add(java.util.List)",
+      "public void markComplete()",
+      "public java.util.List drain()",
+      "public void addNewDataListener(java.lang.Runnable, java.util.concurrent.Executor)",
+      "public java.lang.String toString()"
+    ],
+    "fields": []
+  },
+  "com.yahoo.processing.response.IncomingData": {
+    "superClass": "java.lang.Object",
+    "interfaces": [],
+    "attributes": [
+      "public",
+      "interface",
+      "abstract"
+    ],
+    "methods": [
+      "public abstract com.yahoo.processing.response.DataList getOwner()",
+      "public abstract com.google.common.util.concurrent.ListenableFuture completed()",
+      "public abstract boolean isComplete()",
+      "public abstract void addLast(com.yahoo.processing.response.Data)",
+      "public abstract void add(com.yahoo.processing.response.Data)",
+      "public abstract void addLast(java.util.List)",
+      "public abstract void add(java.util.List)",
+      "public abstract void markComplete()",
+      "public abstract java.util.List drain()",
+      "public abstract void addNewDataListener(java.lang.Runnable, java.util.concurrent.Executor)"
+    ],
+    "fields": []
+  },
+  "com.yahoo.processing.response.Ordered": {
+    "superClass": "java.lang.Object",
+    "interfaces": [],
+    "attributes": [
+      "public",
+      "interface",
+      "abstract"
+    ],
+    "methods": [
+      "public abstract boolean isOrdered()"
+    ],
+    "fields": []
+  },
+  "com.yahoo.processing.response.Streamed": {
+    "superClass": "java.lang.Object",
+    "interfaces": [],
+    "attributes": [
+      "public",
+      "interface",
+      "abstract"
+    ],
+    "methods": [
+      "public abstract boolean isStreamed()"
+    ],
+    "fields": []
   }
 }
\ No newline at end of file
diff --git a/container-core/pom.xml b/container-core/pom.xml
index 051b572b28f..138a68a7c0f 100644
--- a/container-core/pom.xml
+++ b/container-core/pom.xml
@@ -15,75 +15,8 @@
   <version>7-SNAPSHOT</version>
   <packaging>container-plugin</packaging>
   <dependencies>
-    <dependency>
-      <groupId>com.yahoo.vespa</groupId>
-      <artifactId>http-utils</artifactId>
-      <version>${project.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.httpcomponents</groupId>
-      <artifactId>httpclient</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>com.yahoo.vespa</groupId>
-      <artifactId>container-core-config</artifactId>
-      <version>${project.version}</version>
-      <scope>compile</scope>
-    </dependency>
 
-    <dependency>
-      <groupId>com.google.guava</groupId>
-      <artifactId>guava</artifactId>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <!-- TODO Vespa 8: stop providing org.json:json -->
-      <groupId>org.json</groupId>
-      <artifactId>json</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>com.yahoo.vespa</groupId>
-      <artifactId>defaults</artifactId>
-      <version>${project.version}</version>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>javax.servlet</groupId>
-      <artifactId>javax.servlet-api</artifactId>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>javax.xml.bind</groupId>
-      <artifactId>jaxb-api</artifactId>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.eclipse.jetty</groupId>
-      <artifactId>jetty-servlet</artifactId>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.yahoo.vespa</groupId>
-      <artifactId>component</artifactId>
-      <version>${project.version}</version>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.yahoo.vespa</groupId>
-      <artifactId>provided-dependencies</artifactId>
-      <version>${project.version}</version>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.yahoo.vespa</groupId>
-      <artifactId>processing</artifactId>
-      <version>${project.version}</version>
-    </dependency>
+    <!-- COMPILE scope -->
     <dependency>
       <groupId>com.yahoo.vespa</groupId>
       <artifactId>annotations</artifactId>
@@ -91,15 +24,13 @@
     </dependency>
     <dependency>
       <groupId>com.yahoo.vespa</groupId>
-      <artifactId>config-bundle</artifactId>
+      <artifactId>container-di</artifactId>
       <version>${project.version}</version>
-      <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>com.yahoo.vespa</groupId>
-      <artifactId>config</artifactId>
+      <artifactId>http-utils</artifactId>
       <version>${project.version}</version>
-      <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>com.yahoo.vespa</groupId>
@@ -152,7 +83,6 @@
         </exclusion>
       </exclusions>
     </dependency>
-
     <dependency>
       <groupId>com.yahoo.vespa</groupId>
       <artifactId>container-documentapi</artifactId>
@@ -163,7 +93,16 @@
       <artifactId>vdslib</artifactId>
       <version>${project.version}</version>
     </dependency>
-
+    <dependency>
+      <groupId>org.apache.httpcomponents</groupId>
+      <artifactId>httpclient</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>com.yahoo.vespa</groupId>
+      <artifactId>container-core-config</artifactId>
+      <version>${project.version}</version>
+      <scope>compile</scope>
+    </dependency>
     <dependency>
       <groupId>com.yahoo.vespa</groupId>
       <artifactId>vespajlib</artifactId>
@@ -206,11 +145,18 @@
       </exclusions>
     </dependency>
     <dependency>
-      <groupId>org.mockito</groupId>
-      <artifactId>mockito-core</artifactId>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
       <scope>test</scope>
     </dependency>
     <dependency>
+      <!-- TODO Vespa 8: stop providing org.json:json -->
+      <groupId>org.json</groupId>
+      <artifactId>json</artifactId>
+    </dependency>
+
+    <!-- PROVIDED scope -->
+    <dependency>
       <groupId>com.fasterxml.jackson.core</groupId>
       <artifactId>jackson-core</artifactId>
       <scope>provided</scope>
@@ -231,6 +177,69 @@
       <scope>provided</scope>
     </dependency>
     <dependency>
+      <groupId>com.google.guava</groupId>
+      <artifactId>guava</artifactId>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>com.yahoo.vespa</groupId>
+      <artifactId>component</artifactId>
+      <version>${project.version}</version>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>com.yahoo.vespa</groupId>
+      <artifactId>defaults</artifactId>
+      <version>${project.version}</version>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>com.yahoo.vespa</groupId>
+      <artifactId>jdisc_core</artifactId>
+      <version>${project.version}</version>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>com.yahoo.vespa</groupId>
+      <artifactId>jdisc_http_service</artifactId>
+      <version>${project.version}</version>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>javax.servlet</groupId>
+      <artifactId>javax.servlet-api</artifactId>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>javax.xml.bind</groupId>
+      <artifactId>jaxb-api</artifactId>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.eclipse.jetty</groupId>
+      <artifactId>jetty-servlet</artifactId>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>com.yahoo.vespa</groupId>
+      <artifactId>config-bundle</artifactId>
+      <version>${project.version}</version>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>com.yahoo.vespa</groupId>
+      <artifactId>config</artifactId>
+      <version>${project.version}</version>
+      <scope>provided</scope>
+    </dependency>
+
+    <!-- TEST scope -->
+    <dependency>
+      <groupId>org.mockito</groupId>
+      <artifactId>mockito-core</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
       <groupId>com.yahoo.vespa</groupId>
       <artifactId>testutil</artifactId>
       <version>${project.version}</version>
diff --git a/processing/src/main/java/com/yahoo/component/chain/Chain.java b/container-core/src/main/java/com/yahoo/component/chain/Chain.java
index 1c628f3dfa4..1c628f3dfa4 100644
--- a/processing/src/main/java/com/yahoo/component/chain/Chain.java
+++ b/container-core/src/main/java/com/yahoo/component/chain/Chain.java
diff --git a/processing/src/main/java/com/yahoo/component/chain/ChainedComponent.java b/container-core/src/main/java/com/yahoo/component/chain/ChainedComponent.java
index 7e0eb8b72ec..7e0eb8b72ec 100644
--- a/processing/src/main/java/com/yahoo/component/chain/ChainedComponent.java
+++ b/container-core/src/main/java/com/yahoo/component/chain/ChainedComponent.java
diff --git a/processing/src/main/java/com/yahoo/component/chain/ChainsConfigurer.java b/container-core/src/main/java/com/yahoo/component/chain/ChainsConfigurer.java
index 969c1c7d66a..969c1c7d66a 100644
--- a/processing/src/main/java/com/yahoo/component/chain/ChainsConfigurer.java
+++ b/container-core/src/main/java/com/yahoo/component/chain/ChainsConfigurer.java
diff --git a/processing/src/main/java/com/yahoo/component/chain/Phase.java b/container-core/src/main/java/com/yahoo/component/chain/Phase.java
index 64584450c23..64584450c23 100644
--- a/processing/src/main/java/com/yahoo/component/chain/Phase.java
+++ b/container-core/src/main/java/com/yahoo/component/chain/Phase.java
diff --git a/processing/src/main/java/com/yahoo/component/chain/dependencies/After.java b/container-core/src/main/java/com/yahoo/component/chain/dependencies/After.java
index be10c82d2e1..be10c82d2e1 100644
--- a/processing/src/main/java/com/yahoo/component/chain/dependencies/After.java
+++ b/container-core/src/main/java/com/yahoo/component/chain/dependencies/After.java
diff --git a/processing/src/main/java/com/yahoo/component/chain/dependencies/Before.java b/container-core/src/main/java/com/yahoo/component/chain/dependencies/Before.java
index 4542140c574..4542140c574 100644
--- a/processing/src/main/java/com/yahoo/component/chain/dependencies/Before.java
+++ b/container-core/src/main/java/com/yahoo/component/chain/dependencies/Before.java
diff --git a/processing/src/main/java/com/yahoo/component/chain/dependencies/Dependencies.java b/container-core/src/main/java/com/yahoo/component/chain/dependencies/Dependencies.java
index 2fd0dc9ea84..2fd0dc9ea84 100644
--- a/processing/src/main/java/com/yahoo/component/chain/dependencies/Dependencies.java
+++ b/container-core/src/main/java/com/yahoo/component/chain/dependencies/Dependencies.java
diff --git a/processing/src/main/java/com/yahoo/component/chain/dependencies/Provides.java b/container-core/src/main/java/com/yahoo/component/chain/dependencies/Provides.java
index b014681c469..b014681c469 100644
--- a/processing/src/main/java/com/yahoo/component/chain/dependencies/Provides.java
+++ b/container-core/src/main/java/com/yahoo/component/chain/dependencies/Provides.java
diff --git a/processing/src/main/java/com/yahoo/component/chain/dependencies/ordering/ChainBuilder.java b/container-core/src/main/java/com/yahoo/component/chain/dependencies/ordering/ChainBuilder.java
index beafe7d2b98..beafe7d2b98 100644
--- a/processing/src/main/java/com/yahoo/component/chain/dependencies/ordering/ChainBuilder.java
+++ b/container-core/src/main/java/com/yahoo/component/chain/dependencies/ordering/ChainBuilder.java
diff --git a/processing/src/main/java/com/yahoo/component/chain/dependencies/ordering/ComponentNameProvider.java b/container-core/src/main/java/com/yahoo/component/chain/dependencies/ordering/ComponentNameProvider.java
index b9e8f56d15c..b9e8f56d15c 100644
--- a/processing/src/main/java/com/yahoo/component/chain/dependencies/ordering/ComponentNameProvider.java
+++ b/container-core/src/main/java/com/yahoo/component/chain/dependencies/ordering/ComponentNameProvider.java
diff --git a/processing/src/main/java/com/yahoo/component/chain/dependencies/ordering/ComponentNode.java b/container-core/src/main/java/com/yahoo/component/chain/dependencies/ordering/ComponentNode.java
index 2bc81542d52..2bc81542d52 100644
--- a/processing/src/main/java/com/yahoo/component/chain/dependencies/ordering/ComponentNode.java
+++ b/container-core/src/main/java/com/yahoo/component/chain/dependencies/ordering/ComponentNode.java
diff --git a/processing/src/main/java/com/yahoo/component/chain/dependencies/ordering/ConflictingNodeTypeException.java b/container-core/src/main/java/com/yahoo/component/chain/dependencies/ordering/ConflictingNodeTypeException.java
index edf4a119e5c..edf4a119e5c 100644
--- a/processing/src/main/java/com/yahoo/component/chain/dependencies/ordering/ConflictingNodeTypeException.java
+++ b/container-core/src/main/java/com/yahoo/component/chain/dependencies/ordering/ConflictingNodeTypeException.java
diff --git a/processing/src/main/java/com/yahoo/component/chain/dependencies/ordering/CycleDependenciesException.java b/container-core/src/main/java/com/yahoo/component/chain/dependencies/ordering/CycleDependenciesException.java
index 40a78030c41..40a78030c41 100644
--- a/processing/src/main/java/com/yahoo/component/chain/dependencies/ordering/CycleDependenciesException.java
+++ b/container-core/src/main/java/com/yahoo/component/chain/dependencies/ordering/CycleDependenciesException.java
diff --git a/processing/src/main/java/com/yahoo/component/chain/dependencies/ordering/NameProvider.java b/container-core/src/main/java/com/yahoo/component/chain/dependencies/ordering/NameProvider.java
index 773b6d07035..773b6d07035 100644
--- a/processing/src/main/java/com/yahoo/component/chain/dependencies/ordering/NameProvider.java
+++ b/container-core/src/main/java/com/yahoo/component/chain/dependencies/ordering/NameProvider.java
diff --git a/processing/src/main/java/com/yahoo/component/chain/dependencies/ordering/Node.java b/container-core/src/main/java/com/yahoo/component/chain/dependencies/ordering/Node.java
index da652fde614..da652fde614 100644
--- a/processing/src/main/java/com/yahoo/component/chain/dependencies/ordering/Node.java
+++ b/container-core/src/main/java/com/yahoo/component/chain/dependencies/ordering/Node.java
diff --git a/processing/src/main/java/com/yahoo/component/chain/dependencies/ordering/OrderedReadyNodes.java b/container-core/src/main/java/com/yahoo/component/chain/dependencies/ordering/OrderedReadyNodes.java
index d8fb0d7f584..d8fb0d7f584 100644
--- a/processing/src/main/java/com/yahoo/component/chain/dependencies/ordering/OrderedReadyNodes.java
+++ b/container-core/src/main/java/com/yahoo/component/chain/dependencies/ordering/OrderedReadyNodes.java
diff --git a/processing/src/main/java/com/yahoo/component/chain/dependencies/ordering/PhaseNameProvider.java b/container-core/src/main/java/com/yahoo/component/chain/dependencies/ordering/PhaseNameProvider.java
index f99a9191150..f99a9191150 100644
--- a/processing/src/main/java/com/yahoo/component/chain/dependencies/ordering/PhaseNameProvider.java
+++ b/container-core/src/main/java/com/yahoo/component/chain/dependencies/ordering/PhaseNameProvider.java
diff --git a/processing/src/main/java/com/yahoo/component/chain/dependencies/package-info.java b/container-core/src/main/java/com/yahoo/component/chain/dependencies/package-info.java
index acb8e4b011f..acb8e4b011f 100644
--- a/processing/src/main/java/com/yahoo/component/chain/dependencies/package-info.java
+++ b/container-core/src/main/java/com/yahoo/component/chain/dependencies/package-info.java
diff --git a/processing/src/main/java/com/yahoo/component/chain/model/ChainSpecification.java b/container-core/src/main/java/com/yahoo/component/chain/model/ChainSpecification.java
index 53f5c5d1e06..53f5c5d1e06 100644
--- a/processing/src/main/java/com/yahoo/component/chain/model/ChainSpecification.java
+++ b/container-core/src/main/java/com/yahoo/component/chain/model/ChainSpecification.java
diff --git a/processing/src/main/java/com/yahoo/component/chain/model/ChainedComponentModel.java b/container-core/src/main/java/com/yahoo/component/chain/model/ChainedComponentModel.java
index 196c0046c47..196c0046c47 100644
--- a/processing/src/main/java/com/yahoo/component/chain/model/ChainedComponentModel.java
+++ b/container-core/src/main/java/com/yahoo/component/chain/model/ChainedComponentModel.java
diff --git a/processing/src/main/java/com/yahoo/component/chain/model/ChainsModel.java b/container-core/src/main/java/com/yahoo/component/chain/model/ChainsModel.java
index 08cb6b7ccfd..08cb6b7ccfd 100644
--- a/processing/src/main/java/com/yahoo/component/chain/model/ChainsModel.java
+++ b/container-core/src/main/java/com/yahoo/component/chain/model/ChainsModel.java
diff --git a/processing/src/main/java/com/yahoo/component/chain/model/ChainsModelBuilder.java b/container-core/src/main/java/com/yahoo/component/chain/model/ChainsModelBuilder.java
index 5f9f2daa177..5f9f2daa177 100644
--- a/processing/src/main/java/com/yahoo/component/chain/model/ChainsModelBuilder.java
+++ b/container-core/src/main/java/com/yahoo/component/chain/model/ChainsModelBuilder.java
diff --git a/processing/src/main/java/com/yahoo/component/chain/model/ComponentAdaptor.java b/container-core/src/main/java/com/yahoo/component/chain/model/ComponentAdaptor.java
index 2961768a7de..2961768a7de 100644
--- a/processing/src/main/java/com/yahoo/component/chain/model/ComponentAdaptor.java
+++ b/container-core/src/main/java/com/yahoo/component/chain/model/ComponentAdaptor.java
diff --git a/processing/src/main/java/com/yahoo/component/chain/model/Resolver.java b/container-core/src/main/java/com/yahoo/component/chain/model/Resolver.java
index 15acff0db0b..15acff0db0b 100644
--- a/processing/src/main/java/com/yahoo/component/chain/model/Resolver.java
+++ b/container-core/src/main/java/com/yahoo/component/chain/model/Resolver.java
diff --git a/processing/src/main/java/com/yahoo/component/chain/model/package-info.java b/container-core/src/main/java/com/yahoo/component/chain/model/package-info.java
index 3d84de24df8..3d84de24df8 100644
--- a/processing/src/main/java/com/yahoo/component/chain/model/package-info.java
+++ b/container-core/src/main/java/com/yahoo/component/chain/model/package-info.java
diff --git a/processing/src/main/java/com/yahoo/component/chain/package-info.java b/container-core/src/main/java/com/yahoo/component/chain/package-info.java
index bfa18cf331c..bfa18cf331c 100644
--- a/processing/src/main/java/com/yahoo/component/chain/package-info.java
+++ b/container-core/src/main/java/com/yahoo/component/chain/package-info.java
diff --git a/processing/src/main/java/com/yahoo/processing/IllegalInputException.java b/container-core/src/main/java/com/yahoo/processing/IllegalInputException.java
index 3f1605860ed..3f1605860ed 100644
--- a/processing/src/main/java/com/yahoo/processing/IllegalInputException.java
+++ b/container-core/src/main/java/com/yahoo/processing/IllegalInputException.java
diff --git a/processing/src/main/java/com/yahoo/processing/Processor.java b/container-core/src/main/java/com/yahoo/processing/Processor.java
index 359244ff9c9..359244ff9c9 100644
--- a/processing/src/main/java/com/yahoo/processing/Processor.java
+++ b/container-core/src/main/java/com/yahoo/processing/Processor.java
diff --git a/processing/src/main/java/com/yahoo/processing/Request.java b/container-core/src/main/java/com/yahoo/processing/Request.java
index d6607f136fb..d6607f136fb 100644
--- a/processing/src/main/java/com/yahoo/processing/Request.java
+++ b/container-core/src/main/java/com/yahoo/processing/Request.java
diff --git a/processing/src/main/java/com/yahoo/processing/Response.java b/container-core/src/main/java/com/yahoo/processing/Response.java
index 485513cd0cb..485513cd0cb 100644
--- a/processing/src/main/java/com/yahoo/processing/Response.java
+++ b/container-core/src/main/java/com/yahoo/processing/Response.java
diff --git a/processing/src/main/java/com/yahoo/processing/execution/AsyncExecution.java b/container-core/src/main/java/com/yahoo/processing/execution/AsyncExecution.java
index 2c40165f8e5..2c40165f8e5 100644
--- a/processing/src/main/java/com/yahoo/processing/execution/AsyncExecution.java
+++ b/container-core/src/main/java/com/yahoo/processing/execution/AsyncExecution.java
diff --git a/processing/src/main/java/com/yahoo/processing/execution/Execution.java b/container-core/src/main/java/com/yahoo/processing/execution/Execution.java
index 98bc3485084..98bc3485084 100644
--- a/processing/src/main/java/com/yahoo/processing/execution/Execution.java
+++ b/container-core/src/main/java/com/yahoo/processing/execution/Execution.java
diff --git a/processing/src/main/java/com/yahoo/processing/execution/ExecutionWithResponse.java b/container-core/src/main/java/com/yahoo/processing/execution/ExecutionWithResponse.java
index a95771c1202..a95771c1202 100644
--- a/processing/src/main/java/com/yahoo/processing/execution/ExecutionWithResponse.java
+++ b/container-core/src/main/java/com/yahoo/processing/execution/ExecutionWithResponse.java
diff --git a/processing/src/main/java/com/yahoo/processing/execution/ResponseReceiver.java b/container-core/src/main/java/com/yahoo/processing/execution/ResponseReceiver.java
index 053459166e6..053459166e6 100644
--- a/processing/src/main/java/com/yahoo/processing/execution/ResponseReceiver.java
+++ b/container-core/src/main/java/com/yahoo/processing/execution/ResponseReceiver.java
diff --git a/processing/src/main/java/com/yahoo/processing/execution/RunnableExecution.java b/container-core/src/main/java/com/yahoo/processing/execution/RunnableExecution.java
index e69cb8e48cd..e69cb8e48cd 100644
--- a/processing/src/main/java/com/yahoo/processing/execution/RunnableExecution.java
+++ b/container-core/src/main/java/com/yahoo/processing/execution/RunnableExecution.java
diff --git a/processing/src/main/java/com/yahoo/processing/execution/chain/ChainRegistry.java b/container-core/src/main/java/com/yahoo/processing/execution/chain/ChainRegistry.java
index dbf31de1b72..dbf31de1b72 100644
--- a/processing/src/main/java/com/yahoo/processing/execution/chain/ChainRegistry.java
+++ b/container-core/src/main/java/com/yahoo/processing/execution/chain/ChainRegistry.java
diff --git a/processing/src/main/java/com/yahoo/processing/execution/chain/package-info.java b/container-core/src/main/java/com/yahoo/processing/execution/chain/package-info.java
index 6d82609bc76..6d82609bc76 100644
--- a/processing/src/main/java/com/yahoo/processing/execution/chain/package-info.java
+++ b/container-core/src/main/java/com/yahoo/processing/execution/chain/package-info.java
diff --git a/processing/src/main/java/com/yahoo/processing/execution/package-info.java b/container-core/src/main/java/com/yahoo/processing/execution/package-info.java
index 6430aa32ae3..6430aa32ae3 100644
--- a/processing/src/main/java/com/yahoo/processing/execution/package-info.java
+++ b/container-core/src/main/java/com/yahoo/processing/execution/package-info.java
diff --git a/container-core/src/main/java/com/yahoo/processing/package-info.java b/container-core/src/main/java/com/yahoo/processing/package-info.java
new file mode 100644
index 00000000000..b39272d881a
--- /dev/null
+++ b/container-core/src/main/java/com/yahoo/processing/package-info.java
@@ -0,0 +1,22 @@
+// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+/**
+ * Java library for request-response data processing.
+ *
+ * This library defines request-response processing as an operation which
+ * accepts a Request and produces a Response containing Data by executing
+ * a Chain of processing components in a single worker thread using method
+ * calls for chaining, i.e a synchronous processing model.
+ * Data for the Response may optionally be produced asynchronously.
+ *
+ * The processing model can be implemented by subtyping in frameworks defining
+ * a processing model (with a richer, more specific API) for a particular domain.
+ */
+@ExportPackage
+@PublicApi package com.yahoo.processing;
+
+// TODO:
+// - Look through all instances where we pass executor and consider if we should allow the caller to decide the thread
+// - Should data listener use a typed interface rather than runnable`
+
+import com.yahoo.api.annotations.PublicApi;
+import com.yahoo.osgi.annotation.ExportPackage;
diff --git a/processing/src/main/java/com/yahoo/processing/request/CloneHelper.java b/container-core/src/main/java/com/yahoo/processing/request/CloneHelper.java
index 837ff3db295..837ff3db295 100644
--- a/processing/src/main/java/com/yahoo/processing/request/CloneHelper.java
+++ b/container-core/src/main/java/com/yahoo/processing/request/CloneHelper.java
diff --git a/processing/src/main/java/com/yahoo/processing/request/CompoundName.java b/container-core/src/main/java/com/yahoo/processing/request/CompoundName.java
index 432c7473c2b..432c7473c2b 100644
--- a/processing/src/main/java/com/yahoo/processing/request/CompoundName.java
+++ b/container-core/src/main/java/com/yahoo/processing/request/CompoundName.java
diff --git a/processing/src/main/java/com/yahoo/processing/request/ErrorMessage.java b/container-core/src/main/java/com/yahoo/processing/request/ErrorMessage.java
index 0ced664bfdc..0ced664bfdc 100644
--- a/processing/src/main/java/com/yahoo/processing/request/ErrorMessage.java
+++ b/container-core/src/main/java/com/yahoo/processing/request/ErrorMessage.java
diff --git a/processing/src/main/java/com/yahoo/processing/request/Properties.java b/container-core/src/main/java/com/yahoo/processing/request/Properties.java
index 9362de59203..9362de59203 100644
--- a/processing/src/main/java/com/yahoo/processing/request/Properties.java
+++ b/container-core/src/main/java/com/yahoo/processing/request/Properties.java
diff --git a/processing/src/main/java/com/yahoo/processing/request/package-info.java b/container-core/src/main/java/com/yahoo/processing/request/package-info.java
index 96e82294075..96e82294075 100644
--- a/processing/src/main/java/com/yahoo/processing/request/package-info.java
+++ b/container-core/src/main/java/com/yahoo/processing/request/package-info.java
diff --git a/processing/src/main/java/com/yahoo/processing/request/properties/PropertyMap.java b/container-core/src/main/java/com/yahoo/processing/request/properties/PropertyMap.java
index 54e5aae42cc..54e5aae42cc 100644
--- a/processing/src/main/java/com/yahoo/processing/request/properties/PropertyMap.java
+++ b/container-core/src/main/java/com/yahoo/processing/request/properties/PropertyMap.java
diff --git a/processing/src/main/java/com/yahoo/processing/request/properties/PublicCloneable.java b/container-core/src/main/java/com/yahoo/processing/request/properties/PublicCloneable.java
index 785c3f08fa8..785c3f08fa8 100644
--- a/processing/src/main/java/com/yahoo/processing/request/properties/PublicCloneable.java
+++ b/container-core/src/main/java/com/yahoo/processing/request/properties/PublicCloneable.java
diff --git a/processing/src/main/java/com/yahoo/processing/request/properties/package-info.java b/container-core/src/main/java/com/yahoo/processing/request/properties/package-info.java
index bc0feb08411..bc0feb08411 100644
--- a/processing/src/main/java/com/yahoo/processing/request/properties/package-info.java
+++ b/container-core/src/main/java/com/yahoo/processing/request/properties/package-info.java
diff --git a/processing/src/main/java/com/yahoo/processing/response/AbstractData.java b/container-core/src/main/java/com/yahoo/processing/response/AbstractData.java
index 341c6c800a5..341c6c800a5 100644
--- a/processing/src/main/java/com/yahoo/processing/response/AbstractData.java
+++ b/container-core/src/main/java/com/yahoo/processing/response/AbstractData.java
diff --git a/processing/src/main/java/com/yahoo/processing/response/AbstractDataList.java b/container-core/src/main/java/com/yahoo/processing/response/AbstractDataList.java
index 150d1e25d0a..150d1e25d0a 100644
--- a/processing/src/main/java/com/yahoo/processing/response/AbstractDataList.java
+++ b/container-core/src/main/java/com/yahoo/processing/response/AbstractDataList.java
diff --git a/processing/src/main/java/com/yahoo/processing/response/ArrayDataList.java b/container-core/src/main/java/com/yahoo/processing/response/ArrayDataList.java
index 8987b8998af..8987b8998af 100644
--- a/processing/src/main/java/com/yahoo/processing/response/ArrayDataList.java
+++ b/container-core/src/main/java/com/yahoo/processing/response/ArrayDataList.java
diff --git a/processing/src/main/java/com/yahoo/processing/response/Data.java b/container-core/src/main/java/com/yahoo/processing/response/Data.java
index ff48f1e86b6..ff48f1e86b6 100644
--- a/processing/src/main/java/com/yahoo/processing/response/Data.java
+++ b/container-core/src/main/java/com/yahoo/processing/response/Data.java
diff --git a/processing/src/main/java/com/yahoo/processing/response/DataList.java b/container-core/src/main/java/com/yahoo/processing/response/DataList.java
index ff67dd82aa7..ff67dd82aa7 100644
--- a/processing/src/main/java/com/yahoo/processing/response/DataList.java
+++ b/container-core/src/main/java/com/yahoo/processing/response/DataList.java
diff --git a/processing/src/main/java/com/yahoo/processing/response/DefaultIncomingData.java b/container-core/src/main/java/com/yahoo/processing/response/DefaultIncomingData.java
index c436f92f78b..c436f92f78b 100644
--- a/processing/src/main/java/com/yahoo/processing/response/DefaultIncomingData.java
+++ b/container-core/src/main/java/com/yahoo/processing/response/DefaultIncomingData.java
diff --git a/processing/src/main/java/com/yahoo/processing/response/FutureResponse.java b/container-core/src/main/java/com/yahoo/processing/response/FutureResponse.java
index 21877dfc8c3..21877dfc8c3 100644
--- a/processing/src/main/java/com/yahoo/processing/response/FutureResponse.java
+++ b/container-core/src/main/java/com/yahoo/processing/response/FutureResponse.java
diff --git a/processing/src/main/java/com/yahoo/processing/response/IncomingData.java b/container-core/src/main/java/com/yahoo/processing/response/IncomingData.java
index b8cdf8683bc..b8cdf8683bc 100644
--- a/processing/src/main/java/com/yahoo/processing/response/IncomingData.java
+++ b/container-core/src/main/java/com/yahoo/processing/response/IncomingData.java
diff --git a/processing/src/main/java/com/yahoo/processing/response/Ordered.java b/container-core/src/main/java/com/yahoo/processing/response/Ordered.java
index dc969f7acef..dc969f7acef 100644
--- a/processing/src/main/java/com/yahoo/processing/response/Ordered.java
+++ b/container-core/src/main/java/com/yahoo/processing/response/Ordered.java
diff --git a/processing/src/main/java/com/yahoo/processing/response/Streamed.java b/container-core/src/main/java/com/yahoo/processing/response/Streamed.java
index 2aae03104be..2aae03104be 100644
--- a/processing/src/main/java/com/yahoo/processing/response/Streamed.java
+++ b/container-core/src/main/java/com/yahoo/processing/response/Streamed.java
diff --git a/processing/src/main/java/com/yahoo/processing/response/package-info.java b/container-core/src/main/java/com/yahoo/processing/response/package-info.java
index 204b0e04393..204b0e04393 100644
--- a/processing/src/main/java/com/yahoo/processing/response/package-info.java
+++ b/container-core/src/main/java/com/yahoo/processing/response/package-info.java
diff --git a/processing/src/main/java/com/yahoo/processing/test/ProcessorLibrary.java b/container-core/src/main/java/com/yahoo/processing/test/ProcessorLibrary.java
index 5f6201c6f2d..5f6201c6f2d 100644
--- a/processing/src/main/java/com/yahoo/processing/test/ProcessorLibrary.java
+++ b/container-core/src/main/java/com/yahoo/processing/test/ProcessorLibrary.java
diff --git a/processing/src/main/java/com/yahoo/processing/test/Responses.java b/container-core/src/main/java/com/yahoo/processing/test/Responses.java
index cabce8fc109..cabce8fc109 100644
--- a/processing/src/main/java/com/yahoo/processing/test/Responses.java
+++ b/container-core/src/main/java/com/yahoo/processing/test/Responses.java
diff --git a/processing/src/main/resources/configdefinitions/container.core.chains.def b/container-core/src/main/resources/configdefinitions/container.core.chains.def
index 8520a8d6332..8520a8d6332 100644
--- a/processing/src/main/resources/configdefinitions/container.core.chains.def
+++ b/container-core/src/main/resources/configdefinitions/container.core.chains.def
diff --git a/processing/src/test/java/com/yahoo/component/chain/dependencies/ordering/ChainBuilderTest.java b/container-core/src/test/java/com/yahoo/component/chain/dependencies/ordering/ChainBuilderTest.java
index 07ac302f1f3..07ac302f1f3 100644
--- a/processing/src/test/java/com/yahoo/component/chain/dependencies/ordering/ChainBuilderTest.java
+++ b/container-core/src/test/java/com/yahoo/component/chain/dependencies/ordering/ChainBuilderTest.java
diff --git a/processing/src/test/java/com/yahoo/component/chain/dependencies/ordering/OrderedReadyNodesTest.java b/container-core/src/test/java/com/yahoo/component/chain/dependencies/ordering/OrderedReadyNodesTest.java
index 77729a99012..77729a99012 100644
--- a/processing/src/test/java/com/yahoo/component/chain/dependencies/ordering/OrderedReadyNodesTest.java
+++ b/container-core/src/test/java/com/yahoo/component/chain/dependencies/ordering/OrderedReadyNodesTest.java
diff --git a/processing/src/test/java/com/yahoo/component/chain/model/ChainsModelBuilderTest.java b/container-core/src/test/java/com/yahoo/component/chain/model/ChainsModelBuilderTest.java
index 7cef03bbb06..7cef03bbb06 100644
--- a/processing/src/test/java/com/yahoo/component/chain/model/ChainsModelBuilderTest.java
+++ b/container-core/src/test/java/com/yahoo/component/chain/model/ChainsModelBuilderTest.java
diff --git a/processing/src/test/java/com/yahoo/processing/ResponseTestCase.java b/container-core/src/test/java/com/yahoo/processing/ResponseTestCase.java
index 02c6049de49..02c6049de49 100644
--- a/processing/src/test/java/com/yahoo/processing/ResponseTestCase.java
+++ b/container-core/src/test/java/com/yahoo/processing/ResponseTestCase.java
diff --git a/processing/src/test/java/com/yahoo/processing/execution/test/AsyncExecutionTestCase.java b/container-core/src/test/java/com/yahoo/processing/execution/test/AsyncExecutionTestCase.java
index b821461fdc6..b821461fdc6 100644
--- a/processing/src/test/java/com/yahoo/processing/execution/test/AsyncExecutionTestCase.java
+++ b/container-core/src/test/java/com/yahoo/processing/execution/test/AsyncExecutionTestCase.java
diff --git a/processing/src/test/java/com/yahoo/processing/execution/test/ExecutionContextTestCase.java b/container-core/src/test/java/com/yahoo/processing/execution/test/ExecutionContextTestCase.java
index 9c4d4de47dc..9c4d4de47dc 100644
--- a/processing/src/test/java/com/yahoo/processing/execution/test/ExecutionContextTestCase.java
+++ b/container-core/src/test/java/com/yahoo/processing/execution/test/ExecutionContextTestCase.java
diff --git a/processing/src/test/java/com/yahoo/processing/execution/test/FutureDataTestCase.java b/container-core/src/test/java/com/yahoo/processing/execution/test/FutureDataTestCase.java
index c22e34515bf..c22e34515bf 100644
--- a/processing/src/test/java/com/yahoo/processing/execution/test/FutureDataTestCase.java
+++ b/container-core/src/test/java/com/yahoo/processing/execution/test/FutureDataTestCase.java
diff --git a/processing/src/test/java/com/yahoo/processing/execution/test/StreamingTestCase.java b/container-core/src/test/java/com/yahoo/processing/execution/test/StreamingTestCase.java
index 6ab37f54d7b..6ab37f54d7b 100644
--- a/processing/src/test/java/com/yahoo/processing/execution/test/StreamingTestCase.java
+++ b/container-core/src/test/java/com/yahoo/processing/execution/test/StreamingTestCase.java
diff --git a/processing/src/test/java/com/yahoo/processing/request/CompoundNameTestCase.java b/container-core/src/test/java/com/yahoo/processing/request/CompoundNameTestCase.java
index 382abe8d2ca..382abe8d2ca 100644
--- a/processing/src/test/java/com/yahoo/processing/request/CompoundNameTestCase.java
+++ b/container-core/src/test/java/com/yahoo/processing/request/CompoundNameTestCase.java
diff --git a/processing/src/test/java/com/yahoo/processing/request/test/CompoundNameBenchmark.java b/container-core/src/test/java/com/yahoo/processing/request/test/CompoundNameBenchmark.java
index 002b6bac4a8..002b6bac4a8 100644
--- a/processing/src/test/java/com/yahoo/processing/request/test/CompoundNameBenchmark.java
+++ b/container-core/src/test/java/com/yahoo/processing/request/test/CompoundNameBenchmark.java
diff --git a/processing/src/test/java/com/yahoo/processing/request/test/CompoundNameTestCase.java b/container-core/src/test/java/com/yahoo/processing/request/test/CompoundNameTestCase.java
index f5033565786..f5033565786 100644
--- a/processing/src/test/java/com/yahoo/processing/request/test/CompoundNameTestCase.java
+++ b/container-core/src/test/java/com/yahoo/processing/request/test/CompoundNameTestCase.java
diff --git a/processing/src/test/java/com/yahoo/processing/request/test/ErrorMessageTestCase.java b/container-core/src/test/java/com/yahoo/processing/request/test/ErrorMessageTestCase.java
index 70f4a7720ee..70f4a7720ee 100644
--- a/processing/src/test/java/com/yahoo/processing/request/test/ErrorMessageTestCase.java
+++ b/container-core/src/test/java/com/yahoo/processing/request/test/ErrorMessageTestCase.java
diff --git a/processing/src/test/java/com/yahoo/processing/request/test/PropertyMapTestCase.java b/container-core/src/test/java/com/yahoo/processing/request/test/PropertyMapTestCase.java
index 3c351d341d0..3c351d341d0 100644
--- a/processing/src/test/java/com/yahoo/processing/request/test/PropertyMapTestCase.java
+++ b/container-core/src/test/java/com/yahoo/processing/request/test/PropertyMapTestCase.java
diff --git a/processing/src/test/java/com/yahoo/processing/request/test/RequestTestCase.java b/container-core/src/test/java/com/yahoo/processing/request/test/RequestTestCase.java
index 032fdd71f88..032fdd71f88 100644
--- a/processing/src/test/java/com/yahoo/processing/request/test/RequestTestCase.java
+++ b/container-core/src/test/java/com/yahoo/processing/request/test/RequestTestCase.java
diff --git a/processing/src/test/java/com/yahoo/processing/test/DocumentationTestCase.java b/container-core/src/test/java/com/yahoo/processing/test/DocumentationTestCase.java
index ca8fb377f09..ca8fb377f09 100644
--- a/processing/src/test/java/com/yahoo/processing/test/DocumentationTestCase.java
+++ b/container-core/src/test/java/com/yahoo/processing/test/DocumentationTestCase.java
diff --git a/processing/src/test/java/com/yahoo/processing/test/ProcessingTestCase.java b/container-core/src/test/java/com/yahoo/processing/test/ProcessingTestCase.java
index 77c2ca7d10d..77c2ca7d10d 100644
--- a/processing/src/test/java/com/yahoo/processing/test/ProcessingTestCase.java
+++ b/container-core/src/test/java/com/yahoo/processing/test/ProcessingTestCase.java
diff --git a/processing/src/test/java/com/yahoo/processing/test/documentation/AsyncDataProcessingInitiator.java b/container-core/src/test/java/com/yahoo/processing/test/documentation/AsyncDataProcessingInitiator.java
index 0de20b962d7..0de20b962d7 100644
--- a/processing/src/test/java/com/yahoo/processing/test/documentation/AsyncDataProcessingInitiator.java
+++ b/container-core/src/test/java/com/yahoo/processing/test/documentation/AsyncDataProcessingInitiator.java
diff --git a/processing/src/test/java/com/yahoo/processing/test/documentation/AsyncDataProducer.java b/container-core/src/test/java/com/yahoo/processing/test/documentation/AsyncDataProducer.java
index c6c9c0d785b..c6c9c0d785b 100644
--- a/processing/src/test/java/com/yahoo/processing/test/documentation/AsyncDataProducer.java
+++ b/container-core/src/test/java/com/yahoo/processing/test/documentation/AsyncDataProducer.java
diff --git a/processing/src/test/java/com/yahoo/processing/test/documentation/ExampleProcessor.java b/container-core/src/test/java/com/yahoo/processing/test/documentation/ExampleProcessor.java
index 6a1e0cbdd58..6a1e0cbdd58 100644
--- a/processing/src/test/java/com/yahoo/processing/test/documentation/ExampleProcessor.java
+++ b/container-core/src/test/java/com/yahoo/processing/test/documentation/ExampleProcessor.java
diff --git a/processing/src/test/java/com/yahoo/processing/test/documentation/Federator.java b/container-core/src/test/java/com/yahoo/processing/test/documentation/Federator.java
index 079c4912fd9..079c4912fd9 100644
--- a/processing/src/test/java/com/yahoo/processing/test/documentation/Federator.java
+++ b/container-core/src/test/java/com/yahoo/processing/test/documentation/Federator.java
diff --git a/container-search-and-docproc/pom.xml b/container-search-and-docproc/pom.xml
index 04bf858ba3c..1663830a457 100644
--- a/container-search-and-docproc/pom.xml
+++ b/container-search-and-docproc/pom.xml
@@ -63,10 +63,6 @@
           <artifactId>component</artifactId>
         </exclusion>
         <exclusion>
-            <groupId>com.yahoo.vespa</groupId>
-            <artifactId>processing</artifactId>
-        </exclusion>
-        <exclusion>
           <groupId>com.yahoo.vespa</groupId>
           <artifactId>config</artifactId>
         </exclusion>
@@ -104,10 +100,6 @@
         </exclusion>
         <exclusion>
           <groupId>com.yahoo.vespa</groupId>
-          <artifactId>processing</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>com.yahoo.vespa</groupId>
           <artifactId>config</artifactId>
         </exclusion>
         <exclusion>
diff --git a/fat-model-dependencies/pom.xml b/fat-model-dependencies/pom.xml
index 2bdf36c5946..694f4b4d14f 100644
--- a/fat-model-dependencies/pom.xml
+++ b/fat-model-dependencies/pom.xml
@@ -156,11 +156,6 @@
     </dependency>
     <dependency>
       <groupId>com.yahoo.vespa</groupId>
-      <artifactId>processing</artifactId>
-      <version>${project.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>com.yahoo.vespa</groupId>
       <artifactId>docproc</artifactId>
       <version>${project.version}</version>
     </dependency>
diff --git a/pom.xml b/pom.xml
index 0fb42677931..2dcae38fe2d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -114,7 +114,6 @@
         <module>parent</module>
         <module>predicate-search</module>
         <module>predicate-search-core</module>
-        <module>processing</module>
         <module>provided-dependencies</module>
         <module>searchcore</module>
         <module>searchlib</module>
diff --git a/processing/.gitignore b/processing/.gitignore
deleted file mode 100644
index 3cc25b51fc4..00000000000
--- a/processing/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-/pom.xml.build
-/target
diff --git a/processing/CMakeLists.txt b/processing/CMakeLists.txt
deleted file mode 100644
index 7bb25e6a420..00000000000
--- a/processing/CMakeLists.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-# Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-install_config_definitions()
diff --git a/processing/OWNERS b/processing/OWNERS
deleted file mode 100644
index d36fc40ac9f..00000000000
--- a/processing/OWNERS
+++ /dev/null
@@ -1,3 +0,0 @@
-bratseth
-gjoranv
-
diff --git a/processing/README b/processing/README
deleted file mode 100644
index 8c422ed9101..00000000000
--- a/processing/README
+++ /dev/null
@@ -1,10 +0,0 @@
-Java library for request-response data processing.
-
-This library defines request-response processing as an operation which
-accepts a Request and produces a Response containing Data by executing
-a Chain of processing components in a single worker thread using method
-calls for chaining, i.e a synchronous processing model.
-Data for the Response may optionally be produced asynchronously.
-
-The processing model can be implemented by subtyping in frameworks defining
-a processing model (with a richer, more specific API) for a particular domain.
\ No newline at end of file
diff --git a/processing/abi-spec.json b/processing/abi-spec.json
deleted file mode 100644
index 1a28d053ed0..00000000000
--- a/processing/abi-spec.json
+++ /dev/null
@@ -1,799 +0,0 @@
-{
-  "com.yahoo.component.chain.Chain": {
-    "superClass": "java.lang.Object",
-    "interfaces": [],
-    "attributes": [
-      "public"
-    ],
-    "methods": [
-      "public void <init>(java.lang.String, java.util.List)",
-      "public void <init>(com.yahoo.component.ComponentId, java.util.List)",
-      "public void <init>(java.util.List)",
-      "public varargs void <init>(com.yahoo.component.chain.ChainedComponent[])",
-      "public varargs void <init>(java.lang.String, com.yahoo.component.chain.ChainedComponent[])",
-      "public varargs void <init>(com.yahoo.component.ComponentId, com.yahoo.component.chain.ChainedComponent[])",
-      "public void <init>(com.yahoo.component.ComponentId, java.util.Collection, java.util.Collection)",
-      "public com.yahoo.component.ComponentId getId()",
-      "public java.util.List components()",
-      "public java.lang.String toString()",
-      "public boolean equals(java.lang.Object)",
-      "public int hashCode()"
-    ],
-    "fields": []
-  },
-  "com.yahoo.component.chain.ChainedComponent": {
-    "superClass": "com.yahoo.component.AbstractComponent",
-    "interfaces": [],
-    "attributes": [
-      "public",
-      "abstract"
-    ],
-    "methods": [
-      "public void <init>(com.yahoo.component.ComponentId)",
-      "protected void <init>()",
-      "public void initDependencies(com.yahoo.component.chain.dependencies.Dependencies)",
-      "public com.yahoo.component.chain.dependencies.Dependencies getDependencies()",
-      "protected com.yahoo.component.chain.dependencies.Dependencies getDefaultAnnotatedDependencies()",
-      "protected com.yahoo.component.chain.dependencies.Dependencies getAnnotatedDependencies(java.lang.Class, java.lang.Class, java.lang.Class)"
-    ],
-    "fields": []
-  },
-  "com.yahoo.component.chain.ChainsConfigurer": {
-    "superClass": "java.lang.Object",
-    "interfaces": [],
-    "attributes": [
-      "public"
-    ],
-    "methods": [
-      "public void <init>()",
-      "public static void prepareChainRegistry(com.yahoo.component.provider.ComponentRegistry, com.yahoo.component.chain.model.ChainsModel, com.yahoo.component.provider.ComponentRegistry)"
-    ],
-    "fields": []
-  },
-  "com.yahoo.component.chain.Phase": {
-    "superClass": "java.lang.Object",
-    "interfaces": [],
-    "attributes": [
-      "public"
-    ],
-    "methods": [
-      "public void <init>(java.lang.String, java.util.Set, java.util.Set)",
-      "public void <init>(java.lang.String, com.yahoo.component.chain.dependencies.Dependencies)",
-      "public java.lang.String getName()",
-      "public java.util.Set before()",
-      "public java.util.Set after()",
-      "public com.yahoo.component.chain.Phase union(com.yahoo.component.chain.Phase)"
-    ],
-    "fields": [
-      "public final com.yahoo.component.chain.dependencies.Dependencies dependencies"
-    ]
-  },
-  "com.yahoo.component.chain.dependencies.After": {
-    "superClass": "java.lang.Object",
-    "interfaces": [
-      "java.lang.annotation.Annotation"
-    ],
-    "attributes": [
-      "public",
-      "interface",
-      "abstract",
-      "annotation"
-    ],
-    "methods": [
-      "public abstract java.lang.String[] value()"
-    ],
-    "fields": []
-  },
-  "com.yahoo.component.chain.dependencies.Before": {
-    "superClass": "java.lang.Object",
-    "interfaces": [
-      "java.lang.annotation.Annotation"
-    ],
-    "attributes": [
-      "public",
-      "interface",
-      "abstract",
-      "annotation"
-    ],
-    "methods": [
-      "public abstract java.lang.String[] value()"
-    ],
-    "fields": []
-  },
-  "com.yahoo.component.chain.dependencies.Dependencies": {
-    "superClass": "java.lang.Object",
-    "interfaces": [],
-    "attributes": [
-      "public"
-    ],
-    "methods": [
-      "public void <init>(java.util.Collection, java.util.Collection, java.util.Collection)",
-      "public static com.yahoo.component.chain.dependencies.Dependencies emptyDependencies()",
-      "public com.yahoo.component.chain.dependencies.Dependencies union(com.yahoo.component.chain.dependencies.Dependencies)",
-      "public java.lang.String toString()",
-      "public java.util.Set provides()",
-      "public java.util.Set before()",
-      "public java.util.Set after()"
-    ],
-    "fields": []
-  },
-  "com.yahoo.component.chain.dependencies.Provides": {
-    "superClass": "java.lang.Object",
-    "interfaces": [
-      "java.lang.annotation.Annotation"
-    ],
-    "attributes": [
-      "public",
-      "interface",
-      "abstract",
-      "annotation"
-    ],
-    "methods": [
-      "public abstract java.lang.String[] value()"
-    ],
-    "fields": []
-  },
-  "com.yahoo.processing.IllegalInputException": {
-    "superClass": "java.lang.IllegalArgumentException",
-    "interfaces": [],
-    "attributes": [
-      "public"
-    ],
-    "methods": [
-      "public void <init>(java.lang.String)",
-      "public void <init>(java.lang.Throwable)",
-      "public void <init>(java.lang.String, java.lang.Throwable)"
-    ],
-    "fields": []
-  },
-  "com.yahoo.processing.Processor": {
-    "superClass": "com.yahoo.component.chain.ChainedComponent",
-    "interfaces": [],
-    "attributes": [
-      "public",
-      "abstract"
-    ],
-    "methods": [
-      "public void <init>()",
-      "public abstract com.yahoo.processing.Response process(com.yahoo.processing.Request, com.yahoo.processing.execution.Execution)"
-    ],
-    "fields": []
-  },
-  "com.yahoo.processing.Request": {
-    "superClass": "com.yahoo.component.provider.FreezableClass",
-    "interfaces": [
-      "java.lang.Cloneable"
-    ],
-    "attributes": [
-      "public"
-    ],
-    "methods": [
-      "public void <init>()",
-      "public void <init>(com.yahoo.processing.request.Properties)",
-      "public com.yahoo.processing.request.Properties properties()",
-      "public java.util.List errors()",
-      "public com.yahoo.processing.Request clone()",
-      "public bridge synthetic com.yahoo.component.provider.FreezableClass clone()",
-      "public bridge synthetic java.lang.Object clone()"
-    ],
-    "fields": [
-      "public static final com.yahoo.processing.request.CompoundName CHAIN",
-      "public static final com.yahoo.processing.request.CompoundName JDISC_REQUEST"
-    ]
-  },
-  "com.yahoo.processing.Response": {
-    "superClass": "com.yahoo.component.provider.ListenableFreezableClass",
-    "interfaces": [],
-    "attributes": [
-      "public"
-    ],
-    "methods": [
-      "public void <init>(com.yahoo.processing.Request)",
-      "public void <init>(com.yahoo.processing.response.DataList)",
-      "public void <init>(com.yahoo.processing.Request, com.yahoo.processing.request.ErrorMessage)",
-      "public void mergeWith(com.yahoo.processing.Response)",
-      "public com.yahoo.processing.response.DataList data()",
-      "public static com.google.common.util.concurrent.ListenableFuture recursiveComplete(com.yahoo.processing.response.DataList)"
-    ],
-    "fields": []
-  },
-  "com.yahoo.processing.execution.AsyncExecution": {
-    "superClass": "java.lang.Object",
-    "interfaces": [],
-    "attributes": [
-      "public"
-    ],
-    "methods": [
-      "public void <init>(com.yahoo.processing.Processor, com.yahoo.processing.execution.Execution)",
-      "public void <init>(com.yahoo.component.chain.Chain, com.yahoo.processing.execution.Execution)",
-      "public void <init>(com.yahoo.processing.execution.Execution)",
-      "public com.yahoo.processing.response.FutureResponse process(com.yahoo.processing.Request)",
-      "public static java.util.List waitForAll(java.util.Collection, long)"
-    ],
-    "fields": []
-  },
-  "com.yahoo.processing.execution.Execution$Environment": {
-    "superClass": "java.lang.Object",
-    "interfaces": [],
-    "attributes": [
-      "public"
-    ],
-    "methods": [
-      "public static com.yahoo.processing.execution.Execution$Environment createEmpty()",
-      "public com.yahoo.processing.execution.Execution$Environment nested()",
-      "public void <init>(com.yahoo.processing.execution.chain.ChainRegistry)",
-      "public com.yahoo.processing.execution.chain.ChainRegistry chainRegistry()"
-    ],
-    "fields": []
-  },
-  "com.yahoo.processing.execution.Execution$Trace$Level": {
-    "superClass": "java.lang.Enum",
-    "interfaces": [],
-    "attributes": [
-      "public",
-      "final",
-      "enum"
-    ],
-    "methods": [
-      "public static com.yahoo.processing.execution.Execution$Trace$Level[] values()",
-      "public static com.yahoo.processing.execution.Execution$Trace$Level valueOf(java.lang.String)",
-      "public int value()",
-      "public boolean includes(int)"
-    ],
-    "fields": [
-      "public static final enum com.yahoo.processing.execution.Execution$Trace$Level Step",
-      "public static final enum com.yahoo.processing.execution.Execution$Trace$Level Timestamp",
-      "public static final enum com.yahoo.processing.execution.Execution$Trace$Level Dependencies"
-    ]
-  },
-  "com.yahoo.processing.execution.Execution$Trace$LogValue": {
-    "superClass": "java.lang.Object",
-    "interfaces": [],
-    "attributes": [
-      "public"
-    ],
-    "methods": [
-      "public void <init>(java.lang.String, java.lang.String)",
-      "public java.lang.String getKey()",
-      "public java.lang.String getValue()",
-      "public java.lang.String toString()"
-    ],
-    "fields": []
-  },
-  "com.yahoo.processing.execution.Execution$Trace": {
-    "superClass": "java.lang.Object",
-    "interfaces": [],
-    "attributes": [
-      "public"
-    ],
-    "methods": [
-      "public static com.yahoo.processing.execution.Execution$Trace createRoot(int)",
-      "public com.yahoo.processing.execution.Execution$Trace createChild()",
-      "public int getTraceLevel()",
-      "public void setTraceLevel(int)",
-      "public void setForceTimestamps(boolean)",
-      "public boolean getForceTimestamps()",
-      "public void trace(java.lang.String, int)",
-      "public void trace(java.lang.Object, int)",
-      "public void logValue(java.lang.String, java.lang.String)",
-      "public java.util.Iterator logValueIterator()",
-      "public com.yahoo.yolean.trace.TraceVisitor accept(com.yahoo.yolean.trace.TraceVisitor)",
-      "public void setProperty(java.lang.String, java.lang.Object)",
-      "public java.lang.Object getProperty(java.lang.String)",
-      "public com.yahoo.yolean.trace.TraceNode traceNode()",
-      "public java.lang.String toString()"
-    ],
-    "fields": []
-  },
-  "com.yahoo.processing.execution.Execution": {
-    "superClass": "java.lang.Object",
-    "interfaces": [],
-    "attributes": [
-      "public"
-    ],
-    "methods": [
-      "public void <init>(com.yahoo.processing.Processor, com.yahoo.processing.execution.Execution)",
-      "public static com.yahoo.processing.execution.Execution createRoot(com.yahoo.processing.Processor, int, com.yahoo.processing.execution.Execution$Environment)",
-      "public static com.yahoo.processing.execution.Execution createRoot(com.yahoo.component.chain.Chain, int, com.yahoo.processing.execution.Execution$Environment)",
-      "public void <init>(com.yahoo.component.chain.Chain, com.yahoo.processing.execution.Execution)",
-      "public void <init>(com.yahoo.processing.execution.Execution)",
-      "protected void <init>(com.yahoo.component.chain.Chain, int, com.yahoo.processing.execution.Execution$Trace, com.yahoo.processing.execution.Execution$Environment)",
-      "public com.yahoo.processing.Response process(com.yahoo.processing.Request)",
-      "protected int nextIndex()",
-      "protected void onInvoking(com.yahoo.processing.Request, com.yahoo.processing.Processor)",
-      "protected void onReturning(com.yahoo.processing.Request, com.yahoo.processing.Processor, com.yahoo.processing.Response)",
-      "protected void previousProcessor()",
-      "protected void nextProcessor()",
-      "protected com.yahoo.processing.Processor next()",
-      "public com.yahoo.component.chain.Chain chain()",
-      "protected com.yahoo.processing.Response defaultResponse(com.yahoo.processing.Request)",
-      "public java.lang.String toString()",
-      "public com.yahoo.processing.execution.Execution$Trace trace()",
-      "public com.yahoo.processing.execution.Execution$Environment environment()"
-    ],
-    "fields": []
-  },
-  "com.yahoo.processing.execution.ExecutionWithResponse": {
-    "superClass": "com.yahoo.processing.execution.Execution",
-    "interfaces": [],
-    "attributes": [
-      "public"
-    ],
-    "methods": [
-      "public void <init>(com.yahoo.component.chain.Chain, com.yahoo.processing.Response, com.yahoo.processing.execution.Execution)",
-      "protected com.yahoo.processing.Response defaultResponse(com.yahoo.processing.Request)"
-    ],
-    "fields": []
-  },
-  "com.yahoo.processing.execution.ResponseReceiver": {
-    "superClass": "java.lang.Object",
-    "interfaces": [],
-    "attributes": [
-      "public",
-      "interface",
-      "abstract"
-    ],
-    "methods": [
-      "public abstract void setResponse(com.yahoo.processing.Response)"
-    ],
-    "fields": []
-  },
-  "com.yahoo.processing.execution.RunnableExecution": {
-    "superClass": "java.lang.Object",
-    "interfaces": [
-      "java.lang.Runnable"
-    ],
-    "attributes": [
-      "public"
-    ],
-    "methods": [
-      "public void <init>(com.yahoo.processing.Request, com.yahoo.processing.execution.Execution)",
-      "public void run()",
-      "public com.yahoo.processing.Response getResponse()",
-      "public java.lang.Throwable getException()"
-    ],
-    "fields": []
-  },
-  "com.yahoo.processing.execution.chain.ChainRegistry": {
-    "superClass": "com.yahoo.component.provider.ComponentRegistry",
-    "interfaces": [],
-    "attributes": [
-      "public"
-    ],
-    "methods": [
-      "public void <init>()"
-    ],
-    "fields": []
-  },
-  "com.yahoo.processing.request.CloneHelper": {
-    "superClass": "java.lang.Object",
-    "interfaces": [],
-    "attributes": [
-      "public"
-    ],
-    "methods": [
-      "public void <init>()",
-      "public final java.lang.Object clone(java.lang.Object)",
-      "protected java.lang.Object objectClone(java.lang.Object)",
-      "public java.util.Map cloneMap(java.util.Map)"
-    ],
-    "fields": []
-  },
-  "com.yahoo.processing.request.CompoundName": {
-    "superClass": "java.lang.Object",
-    "interfaces": [],
-    "attributes": [
-      "public",
-      "final"
-    ],
-    "methods": [
-      "public void <init>(java.lang.String)",
-      "public static varargs com.yahoo.processing.request.CompoundName fromComponents(java.lang.String[])",
-      "public void <init>(java.util.List)",
-      "public com.yahoo.processing.request.CompoundName append(java.lang.String)",
-      "public com.yahoo.processing.request.CompoundName append(com.yahoo.processing.request.CompoundName)",
-      "public varargs com.yahoo.processing.request.CompoundName prepend(java.lang.String[])",
-      "public java.lang.String last()",
-      "public java.lang.String first()",
-      "public com.yahoo.processing.request.CompoundName first(int)",
-      "public com.yahoo.processing.request.CompoundName rest()",
-      "public com.yahoo.processing.request.CompoundName rest(int)",
-      "public int size()",
-      "public java.lang.String get(int)",
-      "public com.yahoo.processing.request.CompoundName set(int, java.lang.String)",
-      "public boolean isCompound()",
-      "public boolean isEmpty()",
-      "public boolean hasPrefix(com.yahoo.processing.request.CompoundName)",
-      "public java.util.List asList()",
-      "public int hashCode()",
-      "public boolean equals(java.lang.Object)",
-      "public java.lang.String toString()",
-      "public java.lang.String getLowerCasedName()"
-    ],
-    "fields": [
-      "public static final com.yahoo.processing.request.CompoundName empty"
-    ]
-  },
-  "com.yahoo.processing.request.ErrorMessage": {
-    "superClass": "java.lang.Object",
-    "interfaces": [
-      "java.lang.Cloneable"
-    ],
-    "attributes": [
-      "public"
-    ],
-    "methods": [
-      "public void <init>(java.lang.String)",
-      "public void <init>(int, java.lang.String)",
-      "public void <init>(java.lang.String, java.lang.String)",
-      "public void <init>(int, java.lang.String, java.lang.String)",
-      "public void <init>(java.lang.String, java.lang.Throwable)",
-      "public void <init>(int, java.lang.String, java.lang.Throwable)",
-      "public void <init>(java.lang.String, java.lang.String, java.lang.Throwable)",
-      "public void <init>(int, java.lang.String, java.lang.String, java.lang.Throwable)",
-      "public int getCode()",
-      "public java.lang.String getMessage()",
-      "public java.lang.String getDetailedMessage()",
-      "public java.lang.Throwable getCause()",
-      "public java.lang.String toString()",
-      "public int hashCode()",
-      "public boolean equals(java.lang.Object)",
-      "public com.yahoo.processing.request.ErrorMessage clone()",
-      "public bridge synthetic java.lang.Object clone()"
-    ],
-    "fields": []
-  },
-  "com.yahoo.processing.request.Properties": {
-    "superClass": "java.lang.Object",
-    "interfaces": [
-      "java.lang.Cloneable"
-    ],
-    "attributes": [
-      "public"
-    ],
-    "methods": [
-      "public void <init>()",
-      "public com.yahoo.processing.request.Properties chain(com.yahoo.processing.request.Properties)",
-      "public com.yahoo.processing.request.Properties chained()",
-      "public final com.yahoo.processing.request.Properties getInstance(java.lang.Class)",
-      "public final java.util.Map listProperties()",
-      "public final java.util.Map listProperties(java.util.Map)",
-      "public final java.util.Map listProperties(com.yahoo.processing.request.CompoundName)",
-      "public final java.util.Map listProperties(java.lang.String)",
-      "public final java.util.Map listProperties(com.yahoo.processing.request.CompoundName, java.util.Map)",
-      "public final java.util.Map listProperties(java.lang.String, java.util.Map)",
-      "public java.util.Map listProperties(com.yahoo.processing.request.CompoundName, java.util.Map, com.yahoo.processing.request.Properties)",
-      "public final java.util.Map listProperties(java.lang.String, java.util.Map, com.yahoo.processing.request.Properties)",
-      "public java.lang.Object get(com.yahoo.processing.request.CompoundName, java.util.Map, com.yahoo.processing.request.Properties)",
-      "public final java.lang.Object get(java.lang.String, java.util.Map, com.yahoo.processing.request.Properties)",
-      "public final java.lang.Object get(com.yahoo.processing.request.CompoundName, java.util.Map)",
-      "public final java.lang.Object get(java.lang.String, java.util.Map)",
-      "public final java.lang.Object get(com.yahoo.processing.request.CompoundName)",
-      "public final java.lang.Object get(java.lang.String)",
-      "public final java.lang.Object get(com.yahoo.processing.request.CompoundName, java.lang.Object)",
-      "public final java.lang.Object get(java.lang.String, java.lang.Object)",
-      "public void set(com.yahoo.processing.request.CompoundName, java.lang.Object, java.util.Map)",
-      "public final void set(java.lang.String, java.lang.Object, java.util.Map)",
-      "public final void set(com.yahoo.processing.request.CompoundName, java.lang.Object)",
-      "public final void set(java.lang.String, java.lang.Object)",
-      "public void clearAll(com.yahoo.processing.request.CompoundName, java.util.Map)",
-      "public final void clearAll(java.lang.String, java.lang.Object, java.util.Map)",
-      "public final void clearAll(com.yahoo.processing.request.CompoundName)",
-      "public final void clearAll(java.lang.String)",
-      "public final boolean getBoolean(com.yahoo.processing.request.CompoundName)",
-      "public final boolean getBoolean(java.lang.String)",
-      "public final boolean getBoolean(com.yahoo.processing.request.CompoundName, boolean)",
-      "public final boolean getBoolean(java.lang.String, boolean)",
-      "protected final boolean asBoolean(java.lang.Object, boolean)",
-      "public final java.lang.String getString(com.yahoo.processing.request.CompoundName)",
-      "public final java.lang.String getString(java.lang.String)",
-      "public final java.lang.String getString(com.yahoo.processing.request.CompoundName, java.lang.String)",
-      "public final java.lang.String getString(java.lang.String, java.lang.String)",
-      "protected final java.lang.String asString(java.lang.Object, java.lang.String)",
-      "public final java.lang.Integer getInteger(com.yahoo.processing.request.CompoundName)",
-      "public final java.lang.Integer getInteger(java.lang.String)",
-      "public final java.lang.Integer getInteger(com.yahoo.processing.request.CompoundName, java.lang.Integer)",
-      "public final java.lang.Integer getInteger(java.lang.String, java.lang.Integer)",
-      "protected final java.lang.Integer asInteger(java.lang.Object, java.lang.Integer)",
-      "public final java.lang.Long getLong(com.yahoo.processing.request.CompoundName)",
-      "public final java.lang.Long getLong(java.lang.String)",
-      "public final java.lang.Long getLong(com.yahoo.processing.request.CompoundName, java.lang.Long)",
-      "public final java.lang.Long getLong(java.lang.String, java.lang.Long)",
-      "protected final java.lang.Long asLong(java.lang.Object, java.lang.Long)",
-      "public final java.lang.Double getDouble(com.yahoo.processing.request.CompoundName)",
-      "public final java.lang.Double getDouble(java.lang.String)",
-      "public final java.lang.Double getDouble(com.yahoo.processing.request.CompoundName, java.lang.Double)",
-      "public final java.lang.Double getDouble(java.lang.String, java.lang.Double)",
-      "protected final java.lang.Double asDouble(java.lang.Object, java.lang.Double)",
-      "public com.yahoo.processing.request.Properties clone()",
-      "public static java.util.Map cloneMap(java.util.Map)",
-      "public static java.lang.Object clone(java.lang.Object)",
-      "public bridge synthetic java.lang.Object clone()"
-    ],
-    "fields": []
-  },
-  "com.yahoo.processing.request.properties.PropertyMap": {
-    "superClass": "com.yahoo.processing.request.Properties",
-    "interfaces": [],
-    "attributes": [
-      "public"
-    ],
-    "methods": [
-      "public void <init>()",
-      "public void set(com.yahoo.processing.request.CompoundName, java.lang.Object, java.util.Map)",
-      "protected boolean shouldSet(com.yahoo.processing.request.CompoundName, java.lang.Object)",
-      "public java.lang.Object get(com.yahoo.processing.request.CompoundName, java.util.Map, com.yahoo.processing.request.Properties)",
-      "public com.yahoo.processing.request.properties.PropertyMap clone()",
-      "public java.util.Map listProperties(com.yahoo.processing.request.CompoundName, java.util.Map, com.yahoo.processing.request.Properties)",
-      "public bridge synthetic com.yahoo.processing.request.Properties clone()",
-      "public bridge synthetic java.lang.Object clone()"
-    ],
-    "fields": []
-  },
-  "com.yahoo.processing.request.properties.PublicCloneable": {
-    "superClass": "java.lang.Object",
-    "interfaces": [
-      "java.lang.Cloneable"
-    ],
-    "attributes": [
-      "public",
-      "interface",
-      "abstract"
-    ],
-    "methods": [
-      "public abstract java.lang.Object clone()"
-    ],
-    "fields": []
-  },
-  "com.yahoo.processing.response.AbstractData": {
-    "superClass": "com.yahoo.component.provider.ListenableFreezableClass",
-    "interfaces": [
-      "com.yahoo.processing.response.Data"
-    ],
-    "attributes": [
-      "public",
-      "abstract"
-    ],
-    "methods": [
-      "public void <init>(com.yahoo.processing.Request)",
-      "public com.yahoo.processing.Request request()"
-    ],
-    "fields": []
-  },
-  "com.yahoo.processing.response.AbstractDataList$DrainOnGetFuture": {
-    "superClass": "com.google.common.util.concurrent.AbstractFuture",
-    "interfaces": [],
-    "attributes": [
-      "public",
-      "final"
-    ],
-    "methods": [
-      "public void <init>(com.yahoo.processing.response.DataList)",
-      "public boolean cancel(boolean)",
-      "public boolean isCancelled()",
-      "public com.yahoo.processing.response.DataList get()",
-      "public com.yahoo.processing.response.DataList get(long, java.util.concurrent.TimeUnit)",
-      "public bridge synthetic java.lang.Object get()",
-      "public bridge synthetic java.lang.Object get(long, java.util.concurrent.TimeUnit)"
-    ],
-    "fields": []
-  },
-  "com.yahoo.processing.response.AbstractDataList": {
-    "superClass": "com.yahoo.component.provider.ListenableFreezableClass",
-    "interfaces": [
-      "com.yahoo.processing.response.DataList",
-      "com.yahoo.processing.response.Streamed",
-      "com.yahoo.processing.response.Ordered"
-    ],
-    "attributes": [
-      "public",
-      "abstract"
-    ],
-    "methods": [
-      "protected void <init>(com.yahoo.processing.Request)",
-      "protected void <init>(com.yahoo.processing.Request, com.yahoo.processing.response.IncomingData)",
-      "protected void <init>(com.yahoo.processing.Request, com.yahoo.processing.response.IncomingData, boolean, boolean)",
-      "public com.yahoo.processing.Request request()",
-      "public com.yahoo.processing.response.IncomingData incoming()",
-      "public com.google.common.util.concurrent.ListenableFuture complete()",
-      "public boolean isOrdered()",
-      "public boolean isStreamed()",
-      "public java.lang.String toString()"
-    ],
-    "fields": []
-  },
-  "com.yahoo.processing.response.ArrayDataList": {
-    "superClass": "com.yahoo.processing.response.AbstractDataList",
-    "interfaces": [],
-    "attributes": [
-      "public"
-    ],
-    "methods": [
-      "protected void <init>(com.yahoo.processing.Request)",
-      "protected void <init>(com.yahoo.processing.Request, com.yahoo.processing.response.IncomingData)",
-      "protected void <init>(com.yahoo.processing.Request, com.yahoo.processing.response.IncomingData, boolean, boolean)",
-      "public static com.yahoo.processing.response.ArrayDataList create(com.yahoo.processing.Request)",
-      "public static com.yahoo.processing.response.ArrayDataList createAsync(com.yahoo.processing.Request)",
-      "public static com.yahoo.processing.response.ArrayDataList createAsyncUnordered(com.yahoo.processing.Request)",
-      "public static com.yahoo.processing.response.ArrayDataList createAsyncNonstreamed(com.yahoo.processing.Request)",
-      "public com.yahoo.processing.response.Data add(com.yahoo.processing.response.Data)",
-      "public com.yahoo.processing.response.Data get(int)",
-      "public java.util.List asList()",
-      "public void addDataListener(java.lang.Runnable)",
-      "public void freeze()"
-    ],
-    "fields": []
-  },
-  "com.yahoo.processing.response.Data": {
-    "superClass": "java.lang.Object",
-    "interfaces": [
-      "com.yahoo.component.provider.ListenableFreezable"
-    ],
-    "attributes": [
-      "public",
-      "interface",
-      "abstract"
-    ],
-    "methods": [
-      "public abstract com.yahoo.processing.Request request()"
-    ],
-    "fields": []
-  },
-  "com.yahoo.processing.response.DataList": {
-    "superClass": "java.lang.Object",
-    "interfaces": [
-      "com.yahoo.processing.response.Data"
-    ],
-    "attributes": [
-      "public",
-      "interface",
-      "abstract"
-    ],
-    "methods": [
-      "public abstract com.yahoo.processing.response.Data add(com.yahoo.processing.response.Data)",
-      "public abstract com.yahoo.processing.response.Data get(int)",
-      "public abstract java.util.List asList()",
-      "public abstract com.yahoo.processing.response.IncomingData incoming()",
-      "public abstract com.google.common.util.concurrent.ListenableFuture complete()",
-      "public abstract void addDataListener(java.lang.Runnable)",
-      "public void close()"
-    ],
-    "fields": []
-  },
-  "com.yahoo.processing.response.DefaultIncomingData": {
-    "superClass": "java.lang.Object",
-    "interfaces": [
-      "com.yahoo.processing.response.IncomingData"
-    ],
-    "attributes": [
-      "public"
-    ],
-    "methods": [
-      "public void <init>()",
-      "public void <init>(com.yahoo.processing.response.DataList)",
-      "public final void assignOwner(com.yahoo.processing.response.DataList)",
-      "public com.yahoo.processing.response.DataList getOwner()",
-      "public com.google.common.util.concurrent.ListenableFuture completed()",
-      "public synchronized boolean isComplete()",
-      "public synchronized void addLast(com.yahoo.processing.response.Data)",
-      "public synchronized void add(com.yahoo.processing.response.Data)",
-      "public synchronized void addLast(java.util.List)",
-      "public synchronized void add(java.util.List)",
-      "public synchronized void markComplete()",
-      "public synchronized java.util.List drain()",
-      "public void addNewDataListener(java.lang.Runnable, java.util.concurrent.Executor)",
-      "public java.lang.String toString()"
-    ],
-    "fields": []
-  },
-  "com.yahoo.processing.response.FutureResponse": {
-    "superClass": "com.google.common.util.concurrent.ForwardingFuture",
-    "interfaces": [],
-    "attributes": [
-      "public"
-    ],
-    "methods": [
-      "public void <init>(java.util.concurrent.Callable, com.yahoo.processing.execution.Execution, com.yahoo.processing.Request)",
-      "public com.google.common.util.concurrent.ListenableFutureTask delegate()",
-      "public com.yahoo.processing.Response get()",
-      "public com.yahoo.processing.Response get(long, java.util.concurrent.TimeUnit)",
-      "public com.yahoo.processing.Request getRequest()",
-      "public bridge synthetic java.lang.Object get(long, java.util.concurrent.TimeUnit)",
-      "public bridge synthetic java.lang.Object get()",
-      "public bridge synthetic java.util.concurrent.Future delegate()",
-      "public bridge synthetic java.lang.Object delegate()"
-    ],
-    "fields": []
-  },
-  "com.yahoo.processing.response.IncomingData$NullIncomingData$ImmediateFuture": {
-    "superClass": "com.google.common.util.concurrent.AbstractFuture",
-    "interfaces": [],
-    "attributes": [
-      "public"
-    ],
-    "methods": [
-      "public void <init>(com.yahoo.processing.response.DataList)",
-      "public boolean cancel(boolean)",
-      "public boolean isCancelled()",
-      "public boolean isDone()",
-      "public com.yahoo.processing.response.DataList get()",
-      "public com.yahoo.processing.response.DataList get(long, java.util.concurrent.TimeUnit)",
-      "public bridge synthetic java.lang.Object get()",
-      "public bridge synthetic java.lang.Object get(long, java.util.concurrent.TimeUnit)"
-    ],
-    "fields": []
-  },
-  "com.yahoo.processing.response.IncomingData$NullIncomingData": {
-    "superClass": "java.lang.Object",
-    "interfaces": [
-      "com.yahoo.processing.response.IncomingData"
-    ],
-    "attributes": [
-      "public",
-      "final"
-    ],
-    "methods": [
-      "public void <init>(com.yahoo.processing.response.DataList)",
-      "public com.google.common.util.concurrent.ListenableFuture completed()",
-      "public com.yahoo.processing.response.DataList getOwner()",
-      "public boolean isComplete()",
-      "public void addLast(com.yahoo.processing.response.Data)",
-      "public void add(com.yahoo.processing.response.Data)",
-      "public void addLast(java.util.List)",
-      "public void add(java.util.List)",
-      "public void markComplete()",
-      "public java.util.List drain()",
-      "public void addNewDataListener(java.lang.Runnable, java.util.concurrent.Executor)",
-      "public java.lang.String toString()"
-    ],
-    "fields": []
-  },
-  "com.yahoo.processing.response.IncomingData": {
-    "superClass": "java.lang.Object",
-    "interfaces": [],
-    "attributes": [
-      "public",
-      "interface",
-      "abstract"
-    ],
-    "methods": [
-      "public abstract com.yahoo.processing.response.DataList getOwner()",
-      "public abstract com.google.common.util.concurrent.ListenableFuture completed()",
-      "public abstract boolean isComplete()",
-      "public abstract void addLast(com.yahoo.processing.response.Data)",
-      "public abstract void add(com.yahoo.processing.response.Data)",
-      "public abstract void addLast(java.util.List)",
-      "public abstract void add(java.util.List)",
-      "public abstract void markComplete()",
-      "public abstract java.util.List drain()",
-      "public abstract void addNewDataListener(java.lang.Runnable, java.util.concurrent.Executor)"
-    ],
-    "fields": []
-  },
-  "com.yahoo.processing.response.Ordered": {
-    "superClass": "java.lang.Object",
-    "interfaces": [],
-    "attributes": [
-      "public",
-      "interface",
-      "abstract"
-    ],
-    "methods": [
-      "public abstract boolean isOrdered()"
-    ],
-    "fields": []
-  },
-  "com.yahoo.processing.response.Streamed": {
-    "superClass": "java.lang.Object",
-    "interfaces": [],
-    "attributes": [
-      "public",
-      "interface",
-      "abstract"
-    ],
-    "methods": [
-      "public abstract boolean isStreamed()"
-    ],
-    "fields": []
-  }
-}
\ No newline at end of file
diff --git a/processing/pom.xml b/processing/pom.xml
deleted file mode 100644
index 2e6be8a250a..00000000000
--- a/processing/pom.xml
+++ /dev/null
@@ -1,87 +0,0 @@
-<?xml version="1.0"?>
-<!-- Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -->
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
-                             http://maven.apache.org/xsd/maven-4.0.0.xsd">
-  <modelVersion>4.0.0</modelVersion>
-  <parent>
-    <groupId>com.yahoo.vespa</groupId>
-    <artifactId>parent</artifactId>
-    <version>7-SNAPSHOT</version>
-    <relativePath>../parent/pom.xml</relativePath>
-  </parent>
-  <artifactId>processing</artifactId>
-  <packaging>jar</packaging>
-  <version>7-SNAPSHOT</version>
-  <dependencies>
-
-    <!-- COMPILE scope -->
-    <dependency>
-      <groupId>com.yahoo.vespa</groupId>
-      <artifactId>annotations</artifactId>
-      <version>${project.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>com.yahoo.vespa</groupId>
-      <artifactId>container-di</artifactId>
-      <version>${project.version}</version>
-    </dependency>
-
-    <!-- PROVIDED scope -->
-    <dependency>
-      <groupId>com.yahoo.vespa</groupId>
-      <artifactId>provided-dependencies</artifactId>
-      <version>${project.version}</version>
-      <type>pom</type>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.yahoo.vespa</groupId>
-      <artifactId>component</artifactId>
-      <version>${project.version}</version>
-      <scope>provided</scope>
-    </dependency>
-
-
-    <!-- TEST scope -->
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <scope>test</scope>
-    </dependency>
-  </dependencies>
-  <build>
-    <plugins>
-      <plugin>
-         <groupId>org.apache.maven.plugins</groupId>
-         <artifactId>maven-compiler-plugin</artifactId>
-         <configuration>
-            <compilerArgs>
-              <arg>-Xlint:all</arg>
-              <arg>-Xlint:-rawtypes</arg>
-              <arg>-Xlint:-serial</arg>
-              <arg>-Xlint:-options</arg> <!-- TODO: Remove when on a version above Java 8 -->
-              <arg>-Werror</arg>
-            </compilerArgs>
-         </configuration>
-      </plugin>
-      <plugin>
-        <groupId>com.yahoo.vespa</groupId>
-        <artifactId>abi-check-plugin</artifactId>
-      </plugin>
-      <plugin>
-        <groupId>com.yahoo.vespa</groupId>
-        <artifactId>config-class-plugin</artifactId>
-        <version>${project.version}</version>
-        <executions>
-          <execution>
-            <goals>
-              <goal>config-gen</goal>
-            </goals>
-          </execution>
-        </executions>
-      </plugin>
-    </plugins>
-  </build>
-</project>
diff --git a/processing/src/main/java/com/yahoo/processing/package-info.java b/processing/src/main/java/com/yahoo/processing/package-info.java
deleted file mode 100644
index 969d7987981..00000000000
--- a/processing/src/main/java/com/yahoo/processing/package-info.java
+++ /dev/null
@@ -1,10 +0,0 @@
-// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-@ExportPackage
-@PublicApi package com.yahoo.processing;
-
-// TODO:
-// - Look through all instances where we pass executor and consider if we should allow the caller to decide the thread
-// - Should data listener use a typed interface rather than runnable`
-
-import com.yahoo.api.annotations.PublicApi;
-import com.yahoo.osgi.annotation.ExportPackage;