You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ni...@apache.org on 2014/09/17 05:04:50 UTC
[1/6] git commit: CAMEL-7633 Reenable the unit test
Repository: camel
Updated Branches:
refs/heads/camel-2.13.x 6df202851 -> ee02b82d6
refs/heads/camel-2.14.x 4d2b14c25 -> 547cee013
CAMEL-7633 Reenable the unit test
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/70523ac8
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/70523ac8
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/70523ac8
Branch: refs/heads/camel-2.14.x
Commit: 70523ac8f847fa2e488c28ab8881c0e13b3e1c0b
Parents: 4d2b14c
Author: Willem Jiang <wi...@gmail.com>
Authored: Tue Sep 16 23:07:38 2014 +0800
Committer: Willem Jiang <wi...@gmail.com>
Committed: Wed Sep 17 10:52:52 2014 +0800
----------------------------------------------------------------------
.../camel/component/restlet/RestletSetBodyTest.java | 16 +++++++---------
1 file changed, 7 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/70523ac8/components/camel-restlet/src/test/java/org/apache/camel/component/restlet/RestletSetBodyTest.java
----------------------------------------------------------------------
diff --git a/components/camel-restlet/src/test/java/org/apache/camel/component/restlet/RestletSetBodyTest.java b/components/camel-restlet/src/test/java/org/apache/camel/component/restlet/RestletSetBodyTest.java
index bd7d9c0..63eadd8 100644
--- a/components/camel-restlet/src/test/java/org/apache/camel/component/restlet/RestletSetBodyTest.java
+++ b/components/camel-restlet/src/test/java/org/apache/camel/component/restlet/RestletSetBodyTest.java
@@ -21,10 +21,9 @@ import java.io.InputStream;
import org.apache.camel.builder.RouteBuilder;
import org.apache.http.HttpResponse;
-import org.apache.http.client.HttpClient;
import org.apache.http.client.methods.HttpGet;
-import org.apache.http.impl.client.DefaultHttpClient;
-import org.junit.Ignore;
+import org.apache.http.impl.client.CloseableHttpClient;
+import org.apache.http.impl.client.HttpClientBuilder;
import org.junit.Test;
import org.restlet.data.MediaType;
import org.restlet.representation.InputRepresentation;
@@ -41,24 +40,23 @@ public class RestletSetBodyTest extends RestletTestSupport {
}
@Test
- @Ignore
public void testSetBodyRepresentation() throws Exception {
- HttpGet get = new HttpGet("http://0.0.0.0:" + portNum + "/images/123");
- HttpClient httpclient = new DefaultHttpClient();
+ HttpGet get = new HttpGet("http://0.0.0.0:" + "1234" + "/images/123");
+ CloseableHttpClient httpclient = HttpClientBuilder.create().build();
InputStream is = null;
try {
HttpResponse response = httpclient.execute(get);
assertEquals(200, response.getStatusLine().getStatusCode());
assertEquals("image/png", response.getEntity().getContentType().getValue());
is = response.getEntity().getContent();
- assertEquals("Get wrong available size", 10, is.available());
+ assertEquals("Get wrong available size", 10, response.getEntity().getContentLength());
byte[] buffer = new byte[10];
is.read(buffer);
for (int i = 0; i < 10; i++) {
assertEquals(i + 1, buffer[i]);
}
} finally {
- httpclient.getConnectionManager().shutdown();
+ httpclient.close();
if (is != null) {
is.close();
}
@@ -81,7 +79,7 @@ public class RestletSetBodyTest extends RestletTestSupport {
}
ByteArrayInputStream inputStream = new ByteArrayInputStream(image);
- from("restlet:http://0.0.0.0:" + portNum + "/images/{symbol}?restletMethods=get")
+ from("restlet:http://0.0.0.0:" + "1234" + "/images/{symbol}?restletMethods=get")
.setBody().constant(new InputRepresentation(inputStream, MediaType.IMAGE_PNG, 10));
}
};
[5/6] git commit: CAMEL-7830 RestLetHeaderFilterStrategy should
filter the header of "Transfer-Encoding"
Posted by ni...@apache.org.
CAMEL-7830 RestLetHeaderFilterStrategy should filter the header of "Transfer-Encoding"
Conflicts:
components/camel-restlet/src/test/java/org/apache/camel/component/restlet/RestletSetBodyTest.java
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/d1628b4b
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/d1628b4b
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/d1628b4b
Branch: refs/heads/camel-2.13.x
Commit: d1628b4bd59d5b6bb4187b0164e07026bbb065cd
Parents: aca61d1
Author: Willem Jiang <wi...@gmail.com>
Authored: Wed Sep 17 10:48:41 2014 +0800
Committer: Willem Jiang <wi...@gmail.com>
Committed: Wed Sep 17 10:56:53 2014 +0800
----------------------------------------------------------------------
.../component/restlet/RestletHeaderFilterStrategy.java | 5 +++++
.../camel/component/restlet/RestletSetBodyTest.java | 12 ++++++++++--
2 files changed, 15 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/d1628b4b/components/camel-restlet/src/main/java/org/apache/camel/component/restlet/RestletHeaderFilterStrategy.java
----------------------------------------------------------------------
diff --git a/components/camel-restlet/src/main/java/org/apache/camel/component/restlet/RestletHeaderFilterStrategy.java b/components/camel-restlet/src/main/java/org/apache/camel/component/restlet/RestletHeaderFilterStrategy.java
index 3a102c5..662328c 100644
--- a/components/camel-restlet/src/main/java/org/apache/camel/component/restlet/RestletHeaderFilterStrategy.java
+++ b/components/camel-restlet/src/main/java/org/apache/camel/component/restlet/RestletHeaderFilterStrategy.java
@@ -37,6 +37,11 @@ public class RestletHeaderFilterStrategy extends DefaultHeaderFilterStrategy {
// The "CamelAcceptContentType" header is not added to the outgoing HTTP
// headers but it will be going out as "Accept.
getOutFilter().add(Exchange.ACCEPT_CONTENT_TYPE);
+
+ // As we don't set the transfer_encoding protocol header for the restlet service
+ // we need to remove the transfer_encoding which could let the client wait forever
+ getOutFilter().add(Exchange.TRANSFER_ENCODING);
+ setCaseInsensitive(true);
}
}
http://git-wip-us.apache.org/repos/asf/camel/blob/d1628b4b/components/camel-restlet/src/test/java/org/apache/camel/component/restlet/RestletSetBodyTest.java
----------------------------------------------------------------------
diff --git a/components/camel-restlet/src/test/java/org/apache/camel/component/restlet/RestletSetBodyTest.java b/components/camel-restlet/src/test/java/org/apache/camel/component/restlet/RestletSetBodyTest.java
index 74906ff..be12f05 100644
--- a/components/camel-restlet/src/test/java/org/apache/camel/component/restlet/RestletSetBodyTest.java
+++ b/components/camel-restlet/src/test/java/org/apache/camel/component/restlet/RestletSetBodyTest.java
@@ -20,6 +20,7 @@ import java.io.ByteArrayInputStream;
import java.io.InputStream;
import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.test.AvailablePortFinder;
import org.apache.http.HttpResponse;
import org.apache.http.client.methods.HttpGet;
import org.apache.http.impl.client.CloseableHttpClient;
@@ -32,16 +33,18 @@ import org.restlet.representation.InputRepresentation;
* @version
*/
public class RestletSetBodyTest extends RestletTestSupport {
+ protected static int portNum2 = AvailablePortFinder.getNextAvailable(4000);
@Test
public void testSetBody() throws Exception {
String response = template.requestBody("restlet:http://0.0.0.0:" + portNum + "/stock/ORCL?restletMethod=get", null, String.class);
assertEquals("110", response);
+
}
@Test
public void testSetBodyRepresentation() throws Exception {
- HttpGet get = new HttpGet("http://0.0.0.0:" + "1234" + "/images/123");
+ HttpGet get = new HttpGet("http://0.0.0.0:" + portNum + "/images/123");
CloseableHttpClient httpclient = HttpClientBuilder.create().build();
InputStream is = null;
try {
@@ -70,7 +73,12 @@ public class RestletSetBodyTest extends RestletTestSupport {
@Override
public void configure() throws Exception {
from("restlet:http://0.0.0.0:" + portNum + "/stock/{symbol}?restletMethods=get")
+ .to("http://127.0.0.1:" + portNum2 + "/test?bridgeEndpoint=true")
+ //.removeHeader("Transfer-Encoding")
.setBody().constant("110");
+
+ from("jetty:http://0.0.0.0:" + portNum2 + "/test").setBody().constant("response is back");
+
// create ByteArrayRepresentation for response
byte[] image = new byte[10];
for (int i = 0; i < 10; i++) {
@@ -78,7 +86,7 @@ public class RestletSetBodyTest extends RestletTestSupport {
}
ByteArrayInputStream inputStream = new ByteArrayInputStream(image);
- from("restlet:http://0.0.0.0:" + "1234" + "/images/{symbol}?restletMethods=get")
+ from("restlet:http://0.0.0.0:" + portNum + "/images/{symbol}?restletMethods=get")
.setBody().constant(new InputRepresentation(inputStream, MediaType.IMAGE_PNG, 10));
}
};
[6/6] git commit: CAMEL-7053 remove the dependency of hibernat
Posted by ni...@apache.org.
CAMEL-7053 remove the dependency of hibernat
Conflicts:
components/camel-jpa/pom.xml
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/ee02b82d
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/ee02b82d
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/ee02b82d
Branch: refs/heads/camel-2.13.x
Commit: ee02b82d61af5cff753ee4f7ec7c45f7f212db13
Parents: d1628b4
Author: Willem Jiang <wi...@gmail.com>
Authored: Wed Sep 17 09:54:43 2014 +0800
Committer: Willem Jiang <wi...@gmail.com>
Committed: Wed Sep 17 11:03:46 2014 +0800
----------------------------------------------------------------------
components/camel-jpa/pom.xml | 9 +--------
.../processor/jpa/JpaRouteSkipLockedEntityTest.java | 11 +++++------
.../src/test/resources/META-INF/persistence.xml | 14 ++++++++------
.../processor/jpa/springJpaRouteSkipLockedTest.xml | 6 +++---
4 files changed, 17 insertions(+), 23 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/ee02b82d/components/camel-jpa/pom.xml
----------------------------------------------------------------------
diff --git a/components/camel-jpa/pom.xml b/components/camel-jpa/pom.xml
index e133fce..4912c73 100644
--- a/components/camel-jpa/pom.xml
+++ b/components/camel-jpa/pom.xml
@@ -65,7 +65,7 @@
<artifactId>geronimo-jpa_2.0_spec</artifactId>
<scope>provided</scope>
</dependency>
-
+
<!-- test dependencies -->
<dependency>
<groupId>org.apache.camel</groupId>
@@ -102,12 +102,6 @@
<artifactId>junit</artifactId>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>org.hibernate</groupId>
- <artifactId>hibernate-entitymanager</artifactId>
- <version>${hibernate-version}</version>
- <scope>test</scope>
- </dependency>
</dependencies>
<build>
@@ -119,7 +113,6 @@
<configuration>
<persistenceXmlFile>${project.basedir}/src/test/resources/META-INF/persistence.xml</persistenceXmlFile>
<includes>org/apache/camel/examples/*.class</includes>
- <excludes>org/apache/camel/examples/VersionedItem.class</excludes>
<addDefaultConstructor>true</addDefaultConstructor>
<enforcePropertyRestrictions>true</enforcePropertyRestrictions>
</configuration>
http://git-wip-us.apache.org/repos/asf/camel/blob/ee02b82d/components/camel-jpa/src/test/java/org/apache/camel/processor/jpa/JpaRouteSkipLockedEntityTest.java
----------------------------------------------------------------------
diff --git a/components/camel-jpa/src/test/java/org/apache/camel/processor/jpa/JpaRouteSkipLockedEntityTest.java b/components/camel-jpa/src/test/java/org/apache/camel/processor/jpa/JpaRouteSkipLockedEntityTest.java
index 3c95a06..c61d9b1 100644
--- a/components/camel-jpa/src/test/java/org/apache/camel/processor/jpa/JpaRouteSkipLockedEntityTest.java
+++ b/components/camel-jpa/src/test/java/org/apache/camel/processor/jpa/JpaRouteSkipLockedEntityTest.java
@@ -26,12 +26,13 @@ import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.examples.VersionedItem;
import org.apache.camel.spring.SpringRouteBuilder;
-import org.hibernate.engine.spi.SessionImplementor;
+import org.junit.Ignore;
import org.junit.Test;
/**
* @version
*/
+@Ignore("Need the fix of OPENJPA-2461")
public class JpaRouteSkipLockedEntityTest extends AbstractJpaTest {
protected static final String SELECT_ALL_STRING = "select x from " + VersionedItem.class.getName() + " x";
@@ -50,9 +51,9 @@ public class JpaRouteSkipLockedEntityTest extends AbstractJpaTest {
template.sendBody("jpa://" + VersionedItem.class.getName(), new VersionedItem("two"));
template.sendBody("jpa://" + VersionedItem.class.getName(), new VersionedItem("three"));
template.sendBody("jpa://" + VersionedItem.class.getName(), new VersionedItem("four"));
-
- this.context.startRoute("first");
+
this.context.startRoute("second");
+ this.context.startRoute("first");
assertMockEndpointsSatisfied();
@@ -93,7 +94,6 @@ public class JpaRouteSkipLockedEntityTest extends AbstractJpaTest {
try {
count++;
-
// if (count != 1) {
cond1.signal();
// }
@@ -116,8 +116,7 @@ public class JpaRouteSkipLockedEntityTest extends AbstractJpaTest {
public void setLockTimeout(int timeout) throws SQLException {
entityManager.getTransaction().begin();
- SessionImplementor session = entityManager.unwrap(SessionImplementor.class);
- Connection connection = session.connection();
+ Connection connection = (Connection)entityManager.unwrap(java.sql.Connection.class);
connection.createStatement().execute("CALL SYSCS_UTIL.SYSCS_SET_DATABASE_PROPERTY('derby.locks.waitTimeout', '" + timeout + "')");
entityManager.getTransaction().commit();
}
http://git-wip-us.apache.org/repos/asf/camel/blob/ee02b82d/components/camel-jpa/src/test/resources/META-INF/persistence.xml
----------------------------------------------------------------------
diff --git a/components/camel-jpa/src/test/resources/META-INF/persistence.xml b/components/camel-jpa/src/test/resources/META-INF/persistence.xml
index b6cdcdf..439adea 100644
--- a/components/camel-jpa/src/test/resources/META-INF/persistence.xml
+++ b/components/camel-jpa/src/test/resources/META-INF/persistence.xml
@@ -88,15 +88,17 @@
</persistence-unit>
<!-- END SNIPPET: e2 -->
- <persistence-unit name="hibernate" transaction-type="RESOURCE_LOCAL">
- <provider>org.hibernate.ejb.HibernatePersistence</provider>
+ <persistence-unit name="skipLockedEntiy" transaction-type="RESOURCE_LOCAL">
+ <provider>org.apache.openjpa.persistence.PersistenceProviderImpl</provider>
<class>org.apache.camel.examples.VersionedItem</class>
<properties>
- <property name="hibernate.connection.driver_class" value="org.apache.derby.jdbc.EmbeddedDriver" />
- <property name="hibernate.connection.url" value="jdbc:derby:target/hibernate;create=true" />
- <property name="hibernate.hbm2ddl.auto" value="create"/>
- </properties>
+ <property name="openjpa.ConnectionURL" value="jdbc:derby:target/derby;create=true"/>
+ <property name="openjpa.ConnectionDriverName" value="org.apache.derby.jdbc.EmbeddedDriver"/>
+ <property name="openjpa.jdbc.SynchronizeMappings" value="buildSchema"/>
+ <property name="openjpa.Log" value="DefaultLevel=WARN, Tool=INFO"/>
+ <property name="openjpa.Multithreaded" value="false"/>
+ </properties>
</persistence-unit>
</persistence>
http://git-wip-us.apache.org/repos/asf/camel/blob/ee02b82d/components/camel-jpa/src/test/resources/org/apache/camel/processor/jpa/springJpaRouteSkipLockedTest.xml
----------------------------------------------------------------------
diff --git a/components/camel-jpa/src/test/resources/org/apache/camel/processor/jpa/springJpaRouteSkipLockedTest.xml b/components/camel-jpa/src/test/resources/org/apache/camel/processor/jpa/springJpaRouteSkipLockedTest.xml
index 7cff3ee..1235f75 100644
--- a/components/camel-jpa/src/test/resources/org/apache/camel/processor/jpa/springJpaRouteSkipLockedTest.xml
+++ b/components/camel-jpa/src/test/resources/org/apache/camel/processor/jpa/springJpaRouteSkipLockedTest.xml
@@ -17,10 +17,10 @@
</bean>
<bean id="entityManagerFactory" class="org.springframework.orm.jpa.LocalEntityManagerFactoryBean">
- <property name="persistenceUnitName" value="hibernate" />
- <property name="jpaDialect">
+ <property name="persistenceUnitName" value="skipLockedEntiy"/>
+ <!--property name="jpaDialect">
<bean class="org.springframework.orm.jpa.vendor.HibernateJpaDialect" />
- </property>
+ </property-->
</bean>
<bean class="org.apache.camel.component.jpa.JpaComponent" id="jpa">
[4/6] git commit: CAMEL-7633 Reenable the unit test
Posted by ni...@apache.org.
CAMEL-7633 Reenable the unit test
Conflicts:
components/camel-restlet/src/test/java/org/apache/camel/component/restlet/RestletSetBodyTest.java
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/aca61d12
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/aca61d12
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/aca61d12
Branch: refs/heads/camel-2.13.x
Commit: aca61d12eba3c908cea3e89446c104abdf870a52
Parents: 6df2028
Author: Willem Jiang <wi...@gmail.com>
Authored: Tue Sep 16 23:07:38 2014 +0800
Committer: Willem Jiang <wi...@gmail.com>
Committed: Wed Sep 17 10:55:34 2014 +0800
----------------------------------------------------------------------
.../component/restlet/RestletSetBodyTest.java | 21 ++++++++++----------
1 file changed, 11 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/aca61d12/components/camel-restlet/src/test/java/org/apache/camel/component/restlet/RestletSetBodyTest.java
----------------------------------------------------------------------
diff --git a/components/camel-restlet/src/test/java/org/apache/camel/component/restlet/RestletSetBodyTest.java b/components/camel-restlet/src/test/java/org/apache/camel/component/restlet/RestletSetBodyTest.java
index a436ec5..74906ff 100644
--- a/components/camel-restlet/src/test/java/org/apache/camel/component/restlet/RestletSetBodyTest.java
+++ b/components/camel-restlet/src/test/java/org/apache/camel/component/restlet/RestletSetBodyTest.java
@@ -21,15 +21,15 @@ import java.io.InputStream;
import org.apache.camel.builder.RouteBuilder;
import org.apache.http.HttpResponse;
-import org.apache.http.client.HttpClient;
import org.apache.http.client.methods.HttpGet;
-import org.apache.http.impl.client.DefaultHttpClient;
+import org.apache.http.impl.client.CloseableHttpClient;
+import org.apache.http.impl.client.HttpClientBuilder;
import org.junit.Test;
import org.restlet.data.MediaType;
import org.restlet.representation.InputRepresentation;
/**
- * @version
+ * @version
*/
public class RestletSetBodyTest extends RestletTestSupport {
@@ -38,31 +38,31 @@ public class RestletSetBodyTest extends RestletTestSupport {
String response = template.requestBody("restlet:http://0.0.0.0:" + portNum + "/stock/ORCL?restletMethod=get", null, String.class);
assertEquals("110", response);
}
-
+
@Test
public void testSetBodyRepresentation() throws Exception {
- HttpGet get = new HttpGet("http://0.0.0.0:" + portNum + "/images/123");
- HttpClient httpclient = new DefaultHttpClient();
+ HttpGet get = new HttpGet("http://0.0.0.0:" + "1234" + "/images/123");
+ CloseableHttpClient httpclient = HttpClientBuilder.create().build();
InputStream is = null;
try {
HttpResponse response = httpclient.execute(get);
assertEquals(200, response.getStatusLine().getStatusCode());
assertEquals("image/png", response.getEntity().getContentType().getValue());
is = response.getEntity().getContent();
- assertEquals("Get wrong available size", 10, is.available());
+ assertEquals("Get wrong available size", 10, response.getEntity().getContentLength());
byte[] buffer = new byte[10];
is.read(buffer);
for (int i = 0; i < 10; i++) {
assertEquals(i + 1, buffer[i]);
}
} finally {
- httpclient.getConnectionManager().shutdown();
+ httpclient.close();
if (is != null) {
is.close();
}
}
}
-
+
@Override
protected RouteBuilder createRouteBuilder() throws Exception {
@@ -77,7 +77,8 @@ public class RestletSetBodyTest extends RestletTestSupport {
image[i] = (byte)(i + 1);
}
ByteArrayInputStream inputStream = new ByteArrayInputStream(image);
- from("restlet:http://0.0.0.0:" + portNum + "/images/{symbol}?restletMethods=get")
+
+ from("restlet:http://0.0.0.0:" + "1234" + "/images/{symbol}?restletMethods=get")
.setBody().constant(new InputRepresentation(inputStream, MediaType.IMAGE_PNG, 10));
}
};
[3/6] git commit: CAMEL-7830 RestLetHeaderFilterStrategy should
filter the header of "Transfer-Encoding"
Posted by ni...@apache.org.
CAMEL-7830 RestLetHeaderFilterStrategy should filter the header of "Transfer-Encoding"
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/547cee01
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/547cee01
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/547cee01
Branch: refs/heads/camel-2.14.x
Commit: 547cee013a2e69077ad910dcf336e62a4700a946
Parents: d2c0089
Author: Willem Jiang <wi...@gmail.com>
Authored: Wed Sep 17 10:48:41 2014 +0800
Committer: Willem Jiang <wi...@gmail.com>
Committed: Wed Sep 17 10:53:13 2014 +0800
----------------------------------------------------------------------
.../component/restlet/RestletHeaderFilterStrategy.java | 5 +++++
.../camel/component/restlet/RestletSetBodyTest.java | 11 +++++++++--
2 files changed, 14 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/547cee01/components/camel-restlet/src/main/java/org/apache/camel/component/restlet/RestletHeaderFilterStrategy.java
----------------------------------------------------------------------
diff --git a/components/camel-restlet/src/main/java/org/apache/camel/component/restlet/RestletHeaderFilterStrategy.java b/components/camel-restlet/src/main/java/org/apache/camel/component/restlet/RestletHeaderFilterStrategy.java
index 3a102c5..662328c 100644
--- a/components/camel-restlet/src/main/java/org/apache/camel/component/restlet/RestletHeaderFilterStrategy.java
+++ b/components/camel-restlet/src/main/java/org/apache/camel/component/restlet/RestletHeaderFilterStrategy.java
@@ -37,6 +37,11 @@ public class RestletHeaderFilterStrategy extends DefaultHeaderFilterStrategy {
// The "CamelAcceptContentType" header is not added to the outgoing HTTP
// headers but it will be going out as "Accept.
getOutFilter().add(Exchange.ACCEPT_CONTENT_TYPE);
+
+ // As we don't set the transfer_encoding protocol header for the restlet service
+ // we need to remove the transfer_encoding which could let the client wait forever
+ getOutFilter().add(Exchange.TRANSFER_ENCODING);
+ setCaseInsensitive(true);
}
}
http://git-wip-us.apache.org/repos/asf/camel/blob/547cee01/components/camel-restlet/src/test/java/org/apache/camel/component/restlet/RestletSetBodyTest.java
----------------------------------------------------------------------
diff --git a/components/camel-restlet/src/test/java/org/apache/camel/component/restlet/RestletSetBodyTest.java b/components/camel-restlet/src/test/java/org/apache/camel/component/restlet/RestletSetBodyTest.java
index 63eadd8..6ceb8b4 100644
--- a/components/camel-restlet/src/test/java/org/apache/camel/component/restlet/RestletSetBodyTest.java
+++ b/components/camel-restlet/src/test/java/org/apache/camel/component/restlet/RestletSetBodyTest.java
@@ -20,6 +20,7 @@ import java.io.ByteArrayInputStream;
import java.io.InputStream;
import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.test.AvailablePortFinder;
import org.apache.http.HttpResponse;
import org.apache.http.client.methods.HttpGet;
import org.apache.http.impl.client.CloseableHttpClient;
@@ -32,16 +33,18 @@ import org.restlet.representation.InputRepresentation;
* @version
*/
public class RestletSetBodyTest extends RestletTestSupport {
+ protected static int portNum2 = AvailablePortFinder.getNextAvailable(4000);
@Test
public void testSetBody() throws Exception {
String response = template.requestBody("restlet:http://0.0.0.0:" + portNum + "/stock/ORCL?restletMethod=get", null, String.class);
assertEquals("110", response);
+
}
@Test
public void testSetBodyRepresentation() throws Exception {
- HttpGet get = new HttpGet("http://0.0.0.0:" + "1234" + "/images/123");
+ HttpGet get = new HttpGet("http://0.0.0.0:" + portNum + "/images/123");
CloseableHttpClient httpclient = HttpClientBuilder.create().build();
InputStream is = null;
try {
@@ -70,7 +73,11 @@ public class RestletSetBodyTest extends RestletTestSupport {
@Override
public void configure() throws Exception {
from("restlet:http://0.0.0.0:" + portNum + "/stock/{symbol}?restletMethods=get")
+ .to("http://127.0.0.1:" + portNum2 + "/test?bridgeEndpoint=true")
+ //.removeHeader("Transfer-Encoding")
.setBody().constant("110");
+
+ from("jetty:http://0.0.0.0:" + portNum2 + "/test").setBody().constant("response is back");
// create ByteArrayRepresentation for response
byte[] image = new byte[10];
@@ -79,7 +86,7 @@ public class RestletSetBodyTest extends RestletTestSupport {
}
ByteArrayInputStream inputStream = new ByteArrayInputStream(image);
- from("restlet:http://0.0.0.0:" + "1234" + "/images/{symbol}?restletMethods=get")
+ from("restlet:http://0.0.0.0:" + portNum + "/images/{symbol}?restletMethods=get")
.setBody().constant(new InputRepresentation(inputStream, MediaType.IMAGE_PNG, 10));
}
};
[2/6] git commit: CAMEL-7053 remove the dependency of hibernat
Posted by ni...@apache.org.
CAMEL-7053 remove the dependency of hibernat
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/d2c00899
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/d2c00899
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/d2c00899
Branch: refs/heads/camel-2.14.x
Commit: d2c00899d8c1696a998608785c6e7162c840371f
Parents: 70523ac
Author: Willem Jiang <wi...@gmail.com>
Authored: Wed Sep 17 09:54:43 2014 +0800
Committer: Willem Jiang <wi...@gmail.com>
Committed: Wed Sep 17 10:53:04 2014 +0800
----------------------------------------------------------------------
components/camel-jpa/pom.xml | 6 ------
.../processor/jpa/JpaRouteSkipLockedEntityTest.java | 11 +++++------
.../src/test/resources/META-INF/persistence.xml | 14 ++++++++------
.../processor/jpa/springJpaRouteSkipLockedTest.xml | 6 +++---
4 files changed, 16 insertions(+), 21 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/d2c00899/components/camel-jpa/pom.xml
----------------------------------------------------------------------
diff --git a/components/camel-jpa/pom.xml b/components/camel-jpa/pom.xml
index bcd3a79..64f738c 100644
--- a/components/camel-jpa/pom.xml
+++ b/components/camel-jpa/pom.xml
@@ -102,11 +102,6 @@
<artifactId>junit</artifactId>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>org.hibernate</groupId>
- <artifactId>hibernate-entitymanager</artifactId>
- <scope>test</scope>
- </dependency>
</dependencies>
<build>
@@ -148,7 +143,6 @@
<configuration>
<persistenceXmlFile>${project.basedir}/src/test/resources/META-INF/persistence.xml</persistenceXmlFile>
<includes>org/apache/camel/examples/*.class</includes>
- <excludes>org/apache/camel/examples/VersionedItem.class</excludes>
<addDefaultConstructor>true</addDefaultConstructor>
<enforcePropertyRestrictions>true</enforcePropertyRestrictions>
</configuration>
http://git-wip-us.apache.org/repos/asf/camel/blob/d2c00899/components/camel-jpa/src/test/java/org/apache/camel/processor/jpa/JpaRouteSkipLockedEntityTest.java
----------------------------------------------------------------------
diff --git a/components/camel-jpa/src/test/java/org/apache/camel/processor/jpa/JpaRouteSkipLockedEntityTest.java b/components/camel-jpa/src/test/java/org/apache/camel/processor/jpa/JpaRouteSkipLockedEntityTest.java
index 3c95a06..c61d9b1 100644
--- a/components/camel-jpa/src/test/java/org/apache/camel/processor/jpa/JpaRouteSkipLockedEntityTest.java
+++ b/components/camel-jpa/src/test/java/org/apache/camel/processor/jpa/JpaRouteSkipLockedEntityTest.java
@@ -26,12 +26,13 @@ import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.examples.VersionedItem;
import org.apache.camel.spring.SpringRouteBuilder;
-import org.hibernate.engine.spi.SessionImplementor;
+import org.junit.Ignore;
import org.junit.Test;
/**
* @version
*/
+@Ignore("Need the fix of OPENJPA-2461")
public class JpaRouteSkipLockedEntityTest extends AbstractJpaTest {
protected static final String SELECT_ALL_STRING = "select x from " + VersionedItem.class.getName() + " x";
@@ -50,9 +51,9 @@ public class JpaRouteSkipLockedEntityTest extends AbstractJpaTest {
template.sendBody("jpa://" + VersionedItem.class.getName(), new VersionedItem("two"));
template.sendBody("jpa://" + VersionedItem.class.getName(), new VersionedItem("three"));
template.sendBody("jpa://" + VersionedItem.class.getName(), new VersionedItem("four"));
-
- this.context.startRoute("first");
+
this.context.startRoute("second");
+ this.context.startRoute("first");
assertMockEndpointsSatisfied();
@@ -93,7 +94,6 @@ public class JpaRouteSkipLockedEntityTest extends AbstractJpaTest {
try {
count++;
-
// if (count != 1) {
cond1.signal();
// }
@@ -116,8 +116,7 @@ public class JpaRouteSkipLockedEntityTest extends AbstractJpaTest {
public void setLockTimeout(int timeout) throws SQLException {
entityManager.getTransaction().begin();
- SessionImplementor session = entityManager.unwrap(SessionImplementor.class);
- Connection connection = session.connection();
+ Connection connection = (Connection)entityManager.unwrap(java.sql.Connection.class);
connection.createStatement().execute("CALL SYSCS_UTIL.SYSCS_SET_DATABASE_PROPERTY('derby.locks.waitTimeout', '" + timeout + "')");
entityManager.getTransaction().commit();
}
http://git-wip-us.apache.org/repos/asf/camel/blob/d2c00899/components/camel-jpa/src/test/resources/META-INF/persistence.xml
----------------------------------------------------------------------
diff --git a/components/camel-jpa/src/test/resources/META-INF/persistence.xml b/components/camel-jpa/src/test/resources/META-INF/persistence.xml
index b6cdcdf..439adea 100644
--- a/components/camel-jpa/src/test/resources/META-INF/persistence.xml
+++ b/components/camel-jpa/src/test/resources/META-INF/persistence.xml
@@ -88,15 +88,17 @@
</persistence-unit>
<!-- END SNIPPET: e2 -->
- <persistence-unit name="hibernate" transaction-type="RESOURCE_LOCAL">
- <provider>org.hibernate.ejb.HibernatePersistence</provider>
+ <persistence-unit name="skipLockedEntiy" transaction-type="RESOURCE_LOCAL">
+ <provider>org.apache.openjpa.persistence.PersistenceProviderImpl</provider>
<class>org.apache.camel.examples.VersionedItem</class>
<properties>
- <property name="hibernate.connection.driver_class" value="org.apache.derby.jdbc.EmbeddedDriver" />
- <property name="hibernate.connection.url" value="jdbc:derby:target/hibernate;create=true" />
- <property name="hibernate.hbm2ddl.auto" value="create"/>
- </properties>
+ <property name="openjpa.ConnectionURL" value="jdbc:derby:target/derby;create=true"/>
+ <property name="openjpa.ConnectionDriverName" value="org.apache.derby.jdbc.EmbeddedDriver"/>
+ <property name="openjpa.jdbc.SynchronizeMappings" value="buildSchema"/>
+ <property name="openjpa.Log" value="DefaultLevel=WARN, Tool=INFO"/>
+ <property name="openjpa.Multithreaded" value="false"/>
+ </properties>
</persistence-unit>
</persistence>
http://git-wip-us.apache.org/repos/asf/camel/blob/d2c00899/components/camel-jpa/src/test/resources/org/apache/camel/processor/jpa/springJpaRouteSkipLockedTest.xml
----------------------------------------------------------------------
diff --git a/components/camel-jpa/src/test/resources/org/apache/camel/processor/jpa/springJpaRouteSkipLockedTest.xml b/components/camel-jpa/src/test/resources/org/apache/camel/processor/jpa/springJpaRouteSkipLockedTest.xml
index 7cff3ee..1235f75 100644
--- a/components/camel-jpa/src/test/resources/org/apache/camel/processor/jpa/springJpaRouteSkipLockedTest.xml
+++ b/components/camel-jpa/src/test/resources/org/apache/camel/processor/jpa/springJpaRouteSkipLockedTest.xml
@@ -17,10 +17,10 @@
</bean>
<bean id="entityManagerFactory" class="org.springframework.orm.jpa.LocalEntityManagerFactoryBean">
- <property name="persistenceUnitName" value="hibernate" />
- <property name="jpaDialect">
+ <property name="persistenceUnitName" value="skipLockedEntiy"/>
+ <!--property name="jpaDialect">
<bean class="org.springframework.orm.jpa.vendor.HibernateJpaDialect" />
- </property>
+ </property-->
</bean>
<bean class="org.apache.camel.component.jpa.JpaComponent" id="jpa">