Repository: camel Updated Branches: refs/heads/master bc77989c9 -> c59ef7317
CAMEL-9908: Removing jetty 8 Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/228c03e0 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/228c03e0 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/228c03e0 Branch: refs/heads/master Commit: 228c03e0b5a12819a5338e8b4411fbf4efc655bc Parents: bc77989 Author: Claus Ibsen <davscl...@apache.org> Authored: Wed Apr 27 08:41:59 2016 +0200 Committer: Claus Ibsen <davscl...@apache.org> Committed: Wed Apr 27 08:41:59 2016 +0200 ---------------------------------------------------------------------- tests/camel-performance/README.md | 9 +++++++++ tests/camel-performance/README.txt | 10 ---------- tests/camel-performance/pom.xml | 8 ++++---- .../test/perf/XPathBasedRoutingPerformanceTest.java | 2 +- .../esb/AbstractBaseEsbPerformanceIntegrationTest.java | 12 +++--------- 5 files changed, 17 insertions(+), 24 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/228c03e0/tests/camel-performance/README.md ---------------------------------------------------------------------- diff --git a/tests/camel-performance/README.md b/tests/camel-performance/README.md new file mode 100644 index 0000000..6422846 --- /dev/null +++ b/tests/camel-performance/README.md @@ -0,0 +1,9 @@ +Camel Performance Tests +----------------------- + +## Overview + +This module is where you should add performance tests. + +All tests should be disabled by default to not run on the CI server because +we expect performance test are time and CPU consuming. \ No newline at end of file http://git-wip-us.apache.org/repos/asf/camel/blob/228c03e0/tests/camel-performance/README.txt ---------------------------------------------------------------------- diff --git a/tests/camel-performance/README.txt b/tests/camel-performance/README.txt deleted file mode 100644 index 597310b..0000000 --- a/tests/camel-performance/README.txt +++ /dev/null @@ -1,10 +0,0 @@ -============================================================================= - Camel Performance Tests -============================================================================= - -Overview --------------------------------------------------------------------------- - - This module is where you should add performance tests. -All tests should be disabled by default to not run on the CI server because -we expect performance test are time and CPU consuming. \ No newline at end of file http://git-wip-us.apache.org/repos/asf/camel/blob/228c03e0/tests/camel-performance/pom.xml ---------------------------------------------------------------------- diff --git a/tests/camel-performance/pom.xml b/tests/camel-performance/pom.xml index 4349c9f..5d85aec 100644 --- a/tests/camel-performance/pom.xml +++ b/tests/camel-performance/pom.xml @@ -106,25 +106,25 @@ <dependency> <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-server</artifactId> - <version>${jetty8-version}</version> + <version>${jetty9-version}</version> <scope>test</scope> </dependency> <dependency> <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-servlet</artifactId> - <version>${jetty8-version}</version> + <version>${jetty9-version}</version> <scope>test</scope> </dependency> <dependency> <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-util</artifactId> - <version>${jetty8-version}</version> + <version>${jetty9-version}</version> <scope>test</scope> </dependency> <dependency> <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-io</artifactId> - <version>${jetty8-version}</version> + <version>${jetty9-version}</version> <scope>test</scope> </dependency> <dependency> http://git-wip-us.apache.org/repos/asf/camel/blob/228c03e0/tests/camel-performance/src/test/java/org/apache/camel/test/perf/XPathBasedRoutingPerformanceTest.java ---------------------------------------------------------------------- diff --git a/tests/camel-performance/src/test/java/org/apache/camel/test/perf/XPathBasedRoutingPerformanceTest.java b/tests/camel-performance/src/test/java/org/apache/camel/test/perf/XPathBasedRoutingPerformanceTest.java index b6e561b..a290738 100644 --- a/tests/camel-performance/src/test/java/org/apache/camel/test/perf/XPathBasedRoutingPerformanceTest.java +++ b/tests/camel-performance/src/test/java/org/apache/camel/test/perf/XPathBasedRoutingPerformanceTest.java @@ -56,7 +56,7 @@ public class XPathBasedRoutingPerformanceTest extends AbstractBasePerformanceTes execute(count); assertMockEndpointsSatisfied(); - log.warn("Ran {} tests in {} ms", count, watch.taken()); + log.warn("Ran {} tests in {}ms", count, watch.taken()); } @Override http://git-wip-us.apache.org/repos/asf/camel/blob/228c03e0/tests/camel-performance/src/test/java/org/apache/camel/test/perf/esb/AbstractBaseEsbPerformanceIntegrationTest.java ---------------------------------------------------------------------- diff --git a/tests/camel-performance/src/test/java/org/apache/camel/test/perf/esb/AbstractBaseEsbPerformanceIntegrationTest.java b/tests/camel-performance/src/test/java/org/apache/camel/test/perf/esb/AbstractBaseEsbPerformanceIntegrationTest.java index 04d3464..940837e 100644 --- a/tests/camel-performance/src/test/java/org/apache/camel/test/perf/esb/AbstractBaseEsbPerformanceIntegrationTest.java +++ b/tests/camel-performance/src/test/java/org/apache/camel/test/perf/esb/AbstractBaseEsbPerformanceIntegrationTest.java @@ -24,10 +24,9 @@ import org.apache.camel.test.blueprint.CamelBlueprintTestSupport; import org.apache.commons.io.IOUtils; import org.eclipse.jetty.server.Connector; import org.eclipse.jetty.server.Server; -import org.eclipse.jetty.server.nio.SelectChannelConnector; +import org.eclipse.jetty.server.ServerConnector; import org.eclipse.jetty.servlet.ServletContextHandler; import org.eclipse.jetty.servlet.ServletHolder; -import org.eclipse.jetty.util.thread.QueuedThreadPool; import org.junit.After; import org.junit.Before; @@ -40,14 +39,9 @@ public abstract class AbstractBaseEsbPerformanceIntegrationTest extends CamelBlu @Before @Override public void setUp() throws Exception { - server = new Server(); + server = new Server(9000); - SelectChannelConnector connector0 = new SelectChannelConnector(); - connector0.setPort(9000); - connector0.setThreadPool(new QueuedThreadPool(20)); - connector0.setMaxIdleTime(30000); - connector0.setAcceptors(2); - connector0.setStatsOn(false); + ServerConnector connector0 = new ServerConnector(server); connector0.setReuseAddress(true); server.setConnectors(new Connector[]{connector0});
