Upload patched camel-jetty-2.4.0.1 that fixes concurrency bug (will be officially released with Camel 2.5.0)
See also https://issues.apache.org/activemq/browse/CAMEL-2986
This commit is contained in:
parent
cf2e013bfb
commit
e7b45e51e9
14 changed files with 167 additions and 7 deletions
|
|
@ -16,7 +16,7 @@ import org.scalatest.junit.JUnitSuite
|
|||
/**
|
||||
* @author Martin Krasser
|
||||
*/
|
||||
@Ignore
|
||||
@Ignore // do not run concurrency test by default
|
||||
class HttpConcurrencyTest extends JUnitSuite {
|
||||
import HttpConcurrencyTest._
|
||||
|
||||
|
|
@ -86,6 +86,7 @@ object HttpConcurrencyTest {
|
|||
|
||||
class HttpServerActor(balancer: ActorRef) extends Actor with Consumer {
|
||||
def endpointUri = "jetty:http://0.0.0.0:8855/echo"
|
||||
var counter = 0
|
||||
|
||||
def receive = {
|
||||
case msg => balancer forward msg
|
||||
|
|
@ -94,11 +95,7 @@ object HttpConcurrencyTest {
|
|||
|
||||
class HttpServerWorker extends Actor {
|
||||
protected def receive = {
|
||||
case msg => {
|
||||
// slow processing
|
||||
Thread.sleep(100)
|
||||
self.reply(msg)
|
||||
}
|
||||
case msg => self.reply(msg)
|
||||
}
|
||||
}
|
||||
}
|
||||
Binary file not shown.
|
|
@ -0,0 +1 @@
|
|||
607f775c6b2ec1954fe60717875aefea
|
||||
|
|
@ -0,0 +1 @@
|
|||
ee377a85bf07b2afb3a98157f926ebdb47a5e88c
|
||||
Binary file not shown.
|
|
@ -0,0 +1 @@
|
|||
ba1be87b58c03e8ae6f890ca87c74b5b
|
||||
|
|
@ -0,0 +1 @@
|
|||
aaa96009d7e151f89703b4d932fc73ebcf9bc973
|
||||
|
|
@ -0,0 +1,144 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!--
|
||||
Licensed to the Apache Software Foundation (ASF) under one or more
|
||||
contributor license agreements. See the NOTICE file distributed with
|
||||
this work for additional information regarding copyright ownership.
|
||||
The ASF licenses this file to You under the Apache License, Version 2.0
|
||||
(the "License"); you may not use this file except in compliance with
|
||||
the License. You may obtain a copy of the License at
|
||||
|
||||
http://www.apache.org/licenses/LICENSE-2.0
|
||||
|
||||
Unless required by applicable law or agreed to in writing, software
|
||||
distributed under the License is distributed on an "AS IS" BASIS,
|
||||
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
See the License for the specific language governing permissions and
|
||||
limitations under the License.
|
||||
-->
|
||||
<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/maven-v4_0_0.xsd">
|
||||
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
|
||||
<parent>
|
||||
<groupId>org.apache.camel</groupId>
|
||||
<artifactId>camel-parent</artifactId>
|
||||
<version>2.4.0</version>
|
||||
</parent>
|
||||
|
||||
<artifactId>camel-jetty</artifactId>
|
||||
<packaging>bundle</packaging>
|
||||
<name>Camel :: Jetty</name>
|
||||
<description>Camel Jetty support</description>
|
||||
<version>2.4.0.1</version>
|
||||
|
||||
<properties>
|
||||
<camel.osgi.export.pkg>org.apache.camel.component.jetty.*</camel.osgi.export.pkg>
|
||||
</properties>
|
||||
|
||||
<dependencies>
|
||||
|
||||
<dependency>
|
||||
<groupId>org.apache.camel</groupId>
|
||||
<artifactId>camel-core</artifactId>
|
||||
<version>2.4.0</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.apache.camel</groupId>
|
||||
<artifactId>camel-http</artifactId>
|
||||
<version>2.4.0</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.eclipse.jetty</groupId>
|
||||
<artifactId>jetty-server</artifactId>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.eclipse.jetty</groupId>
|
||||
<artifactId>jetty-security</artifactId>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.eclipse.jetty</groupId>
|
||||
<artifactId>jetty-servlet</artifactId>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.eclipse.jetty</groupId>
|
||||
<artifactId>jetty-servlets</artifactId>
|
||||
<version>${jetty-version}</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.eclipse.jetty</groupId>
|
||||
<artifactId>jetty-client</artifactId>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.eclipse.jetty</groupId>
|
||||
<artifactId>jetty-jmx</artifactId>
|
||||
<version>${jetty-version}</version>
|
||||
</dependency>
|
||||
<!-- testing -->
|
||||
<dependency>
|
||||
<groupId>org.apache.camel</groupId>
|
||||
<artifactId>camel-test</artifactId>
|
||||
<version>2.4.0</version>
|
||||
<scope>test</scope>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.apache.camel</groupId>
|
||||
<artifactId>camel-spring</artifactId>
|
||||
<version>2.4.0</version>
|
||||
<scope>test</scope>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>javax.mail</groupId>
|
||||
<artifactId>mail</artifactId>
|
||||
<version>${javax-mail-version}</version>
|
||||
<scope>test</scope>
|
||||
</dependency>
|
||||
<!-- to allow Spring annotations (jmx) to be tested -->
|
||||
<dependency>
|
||||
<groupId>org.springframework</groupId>
|
||||
<artifactId>spring-context</artifactId>
|
||||
<optional>true</optional>
|
||||
<scope>test</scope>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.springframework</groupId>
|
||||
<artifactId>spring-aop</artifactId>
|
||||
<optional>true</optional>
|
||||
<scope>test</scope>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.springframework</groupId>
|
||||
<artifactId>spring-test</artifactId>
|
||||
<optional>true</optional>
|
||||
<scope>test</scope>
|
||||
</dependency>
|
||||
|
||||
<dependency>
|
||||
<groupId>junit</groupId>
|
||||
<artifactId>junit</artifactId>
|
||||
<scope>test</scope>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>log4j</groupId>
|
||||
<artifactId>log4j</artifactId>
|
||||
<scope>test</scope>
|
||||
</dependency>
|
||||
</dependencies>
|
||||
|
||||
<build>
|
||||
<plugins>
|
||||
<!-- use per test fork mode to avoid side effects -->
|
||||
<plugin>
|
||||
<artifactId>maven-surefire-plugin</artifactId>
|
||||
<configuration>
|
||||
<forkMode>pertest</forkMode>
|
||||
<excludes>
|
||||
<!-- TODO FIXME ASAP -->
|
||||
<!-- need to fix this issue when we rewrite the stream cache-->
|
||||
<exclude>**/*XXXTest.*</exclude>
|
||||
</excludes>
|
||||
</configuration>
|
||||
</plugin>
|
||||
</plugins>
|
||||
</build>
|
||||
|
||||
</project>
|
||||
|
|
@ -0,0 +1 @@
|
|||
fba57baa166195ac2b2a013c3cc6d3f1
|
||||
|
|
@ -0,0 +1 @@
|
|||
c41ff483ac35754c1d41b1823561935849b362ed
|
||||
|
|
@ -0,0 +1,11 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?><metadata>
|
||||
<groupId>org.apache.camel</groupId>
|
||||
<artifactId>camel-jetty</artifactId>
|
||||
<version>2.4.0.1</version>
|
||||
<versioning>
|
||||
<versions>
|
||||
<version>2.4.0.1</version>
|
||||
</versions>
|
||||
<lastUpdated>20100723102939</lastUpdated>
|
||||
</versioning>
|
||||
</metadata>
|
||||
|
|
@ -0,0 +1 @@
|
|||
34f1efbcb11f7251390994d8f81598b2
|
||||
|
|
@ -0,0 +1 @@
|
|||
2e1bb47c5a8c19f98b70e5e6af450861933deacc
|
||||
|
|
@ -637,7 +637,7 @@ class AkkaParentProject(info: ProjectInfo) extends DefaultProject(info) {
|
|||
</dependency>
|
||||
<dependency org="org.apache.geronimo.specs" name="geronimo-servlet_2.5_spec" rev="1.1.1">
|
||||
</dependency>
|
||||
<dependency org="org.apache.camel" name="camel-jetty" rev={CAMEL_VERSION}>
|
||||
<dependency org="org.apache.camel" name="camel-jetty" rev="2.4.0.1">
|
||||
<exclude module="geronimo-servlet_2.4_spec"/>
|
||||
</dependency>
|
||||
<dependency org="org.apache.camel" name="camel-jms" rev={CAMEL_VERSION}>
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue