16 files changed, 11 insertions, 86 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index dc9fa40b121..4f7d7a0c0bb 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -152,7 +152,6 @@ add_subdirectory(vespaclient-core)
 add_subdirectory(vespaclient-java)
 add_subdirectory(vespa-feed-client)
 add_subdirectory(vespa-feed-client-cli)
-add_subdirectory(vespa_feed_perf)
 add_subdirectory(vespajlib)
 add_subdirectory(vespalib)
 add_subdirectory(vespalog)
diff --git a/dist/vespa.spec b/dist/vespa.spec
index 8cfe63dda7d..333ec7b57fc 100644
--- a/dist/vespa.spec
+++ b/dist/vespa.spec
@@ -617,7 +617,6 @@ fi
 %{_prefix}/lib/jars/searchlib.jar
 %{_prefix}/lib/jars/service-monitor-jar-with-dependencies.jar
 %{_prefix}/lib/jars/tenant-cd-api-jar-with-dependencies.jar
-%{_prefix}/lib/jars/vespa_feed_perf-jar-with-dependencies.jar
 %{_prefix}/lib/jars/vespa-osgi-testrunner-jar-with-dependencies.jar
 %{_prefix}/lib/jars/vespa-testrunner-components.jar
 %{_prefix}/lib/jars/vespa-testrunner-components-jar-with-dependencies.jar
diff --git a/pom.xml b/pom.xml
index d0277bcce69..6b91704c4e5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -136,7 +136,6 @@
         <module>vespa-maven-plugin</module>
         <module>vespa-osgi-testrunner</module>
         <module>vespa-testrunner-components</module>
-        <module>vespa_feed_perf</module>
         <module>vespa-3party-bundles</module>
         <module>vespajlib</module>
         <module>vespalog</module>
diff --git a/vespa_feed_perf/.gitignore b/vespa_feed_perf/.gitignore
deleted file mode 100644
index 12251442258..00000000000
--- a/vespa_feed_perf/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-/target
-/pom.xml.build
diff --git a/vespa_feed_perf/CMakeLists.txt b/vespa_feed_perf/CMakeLists.txt
deleted file mode 100644
index e7339795fcd..00000000000
--- a/vespa_feed_perf/CMakeLists.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-# Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-install_jar(vespa_feed_perf-jar-with-dependencies.jar)
-
-vespa_install_script(src/main/sh/vespa-feed-perf vespa-feed-perf bin)
diff --git a/vespa_feed_perf/OWNERS b/vespa_feed_perf/OWNERS
deleted file mode 100644
index 9dc0c2d970d..00000000000
--- a/vespa_feed_perf/OWNERS
+++ /dev/null
@@ -1 +0,0 @@
-baldersheim
diff --git a/vespa_feed_perf/README b/vespa_feed_perf/README
deleted file mode 100644
index cbe56b24496..00000000000
--- a/vespa_feed_perf/README
+++ /dev/null
@@ -1 +0,0 @@
-Feeder using MessageBus for testing.
diff --git a/vespa_feed_perf/pom.xml b/vespa_feed_perf/pom.xml
deleted file mode 100644
index a6d43039e58..00000000000
--- a/vespa_feed_perf/pom.xml
+++ /dev/null
@@ -1,74 +0,0 @@
-<?xml version="1.0"?>
-<!-- Copyright Yahoo. 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">
-
-    <!-- This module is used in 4 tests:
-         interpolated_lookup.rb, match_phase_degradation_test.rb reportcoverage.rb slow_query.rb
-         TODO: Remove usage and remove this module -->
-
-    <modelVersion>4.0.0</modelVersion>
-    <parent>
-        <groupId>com.yahoo.vespa</groupId>
-        <artifactId>parent</artifactId>
-        <version>8-SNAPSHOT</version>
-        <relativePath>../parent/pom.xml</relativePath>
-    </parent>
-    <artifactId>vespa_feed_perf</artifactId>
-    <version>8-SNAPSHOT</version>
-    <packaging>jar</packaging>
-    <name>${project.artifactId}</name>
-    <dependencies>
-        <dependency>
-            <groupId>commons-cli</groupId>
-            <artifactId>commons-cli</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>com.yahoo.vespa</groupId>
-            <artifactId>documentapi</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>com.yahoo.vespa</groupId>
-            <artifactId>messagebus</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-    </dependencies>
-    <build>
-        <resources>
-            <resource>
-                <directory>src/test/resources</directory>
-                <filtering>false</filtering>
-            </resource>
-        </resources>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-shade-plugin</artifactId>
-                <configuration>
-                    <finalName>${project.artifactId}-jar-with-dependencies</finalName>
-                    <createDependencyReducedPom>false</createDependencyReducedPom>
-                    <transformers>
-                        <transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
-                            <mainClass>com.yahoo.vespa.feed.perf.SimpleFeeder</mainClass>
-                        </transformer>
-                    </transformers>
-                </configuration>
-                <executions>
-                    <execution>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>shade</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-    </build>
-</project>
diff --git a/vespaclient-java/CMakeLists.txt b/vespaclient-java/CMakeLists.txt
index 242743a06e7..2af1bbe55cd 100644
--- a/vespaclient-java/CMakeLists.txt
+++ b/vespaclient-java/CMakeLists.txt
@@ -11,3 +11,4 @@ vespa_install_script(src/main/sh/vespa-feeder.sh vespa-feeder bin)
 vespa_install_script(src/main/sh/vespa-get.sh vespa-get bin)
 vespa_install_script(src/main/sh/vespa-visit.sh vespa-visit bin)
 vespa_install_script(src/main/sh/vespa-visit-target.sh vespa-visit-target bin)
+vespa_install_script(src/main/sh/vespa-feed-perf vespa-feed-perf bin)
diff --git a/vespa_feed_perf/src/main/java/com/yahoo/vespa/feed/perf/FeederParams.java b/vespaclient-java/src/main/java/com/yahoo/vespa/feed/perf/FeederParams.java
index 0ecc4198e46..0ecc4198e46 100644
--- a/vespa_feed_perf/src/main/java/com/yahoo/vespa/feed/perf/FeederParams.java
+++ b/vespaclient-java/src/main/java/com/yahoo/vespa/feed/perf/FeederParams.java
diff --git a/vespa_feed_perf/src/main/java/com/yahoo/vespa/feed/perf/SimpleFeeder.java b/vespaclient-java/src/main/java/com/yahoo/vespa/feed/perf/SimpleFeeder.java
index c40e2c21561..c40e2c21561 100644
--- a/vespa_feed_perf/src/main/java/com/yahoo/vespa/feed/perf/SimpleFeeder.java
+++ b/vespaclient-java/src/main/java/com/yahoo/vespa/feed/perf/SimpleFeeder.java
diff --git a/vespa_feed_perf/src/main/sh/vespa-feed-perf b/vespaclient-java/src/main/sh/vespa-feed-perf
index f8d94df3929..bdee1142a2d 100755
--- a/vespa_feed_perf/src/main/sh/vespa-feed-perf
+++ b/vespaclient-java/src/main/sh/vespa-feed-perf
@@ -77,4 +77,13 @@ export ROOT
 
 # END environment bootstrap section
 
-exec java -XX:+UseParallelGC -XX:ParallelGCThreads=4 -jar ${VESPA_HOME}/lib/jars/vespa_feed_perf-jar-with-dependencies.jar "$@"
+export VESPA_LOG_TARGET=file:/dev/null
+export MALLOC_ARENA_MAX=1 # Does not need fast allocation
+java \
+-server -enableassertions \
+-XX:ThreadStackSize=512 \
+-XX:MaxJavaStackTraceDepth=1000000 \
+-Djava.library.path=${VESPA_HOME}/libexec64/native:${VESPA_HOME}/lib64 \
+-XX:MaxDirectMemorySize=64m -Djava.awt.headless=true \
+-Xms128m -Xmx1024m $(getJavaOptionsIPV46) \
+-cp ${VESPA_HOME}/lib/jars/vespaclient-java-jar-with-dependencies.jar com.yahoo.vespa.feed.perf.SimpleFeeder "$@"
diff --git a/vespa_feed_perf/src/test/java/com/yahoo/vespa/feed/perf/FeederParamsTest.java b/vespaclient-java/src/test/java/com/yahoo/vespa/perf/FeederParamsTest.java
index fbb38083aad..fbb38083aad 100644
--- a/vespa_feed_perf/src/test/java/com/yahoo/vespa/feed/perf/FeederParamsTest.java
+++ b/vespaclient-java/src/test/java/com/yahoo/vespa/perf/FeederParamsTest.java
diff --git a/vespa_feed_perf/src/test/java/com/yahoo/vespa/feed/perf/SimpleFeederTest.java b/vespaclient-java/src/test/java/com/yahoo/vespa/perf/SimpleFeederTest.java
index 5380796086a..5380796086a 100644
--- a/vespa_feed_perf/src/test/java/com/yahoo/vespa/feed/perf/SimpleFeederTest.java
+++ b/vespaclient-java/src/test/java/com/yahoo/vespa/perf/SimpleFeederTest.java
diff --git a/vespa_feed_perf/src/test/java/com/yahoo/vespa/feed/perf/SimpleServer.java b/vespaclient-java/src/test/java/com/yahoo/vespa/perf/SimpleServer.java
index a458a59f997..a458a59f997 100644
--- a/vespa_feed_perf/src/test/java/com/yahoo/vespa/feed/perf/SimpleServer.java
+++ b/vespaclient-java/src/test/java/com/yahoo/vespa/perf/SimpleServer.java
diff --git a/vespa_feed_perf/src/test/resources/documentmanager.cfg b/vespaclient-java/src/test/resources/documentmanager.cfg
index 2bd7a3c6080..2bd7a3c6080 100644
--- a/vespa_feed_perf/src/test/resources/documentmanager.cfg
+++ b/vespaclient-java/src/test/resources/documentmanager.cfg