[camel] 02/02: Upgrade Swagger Parser to version 1.0.36
This is an automated email from the ASF dual-hosted git repository. acosentino pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/camel.git commit 9f2e14d0a3b21525cfe0bfb1fb7ba2c7ad3ac00b Author: Andrea Cosentino AuthorDate: Tue May 29 08:10:51 2018 +0200 Upgrade Swagger Parser to version 1.0.36 --- parent/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/parent/pom.xml b/parent/pom.xml index 81543a9..e8bb968 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -671,7 +671,7 @@ 15.0 1.3.12_2 1.5.20 -1.0.35 +1.0.36 20.0 2.2.10 1.0.1 -- To stop receiving notification emails like this one, please contact acosent...@apache.org.
[camel] branch master updated (d54a3b4 -> 9f2e14d)
This is an automated email from the ASF dual-hosted git repository. acosentino pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/camel.git. from d54a3b4 Upgrade Chronicle Core to version 1.15.2 new 91e8c2a Upgrade Swagger to version 1.5.20 new 9f2e14d Upgrade Swagger Parser to version 1.0.36 The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: parent/pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -- To stop receiving notification emails like this one, please contact acosent...@apache.org.
[camel] 01/02: Upgrade Swagger to version 1.5.20
This is an automated email from the ASF dual-hosted git repository. acosentino pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/camel.git commit 91e8c2a0e93d96bf428cd599b9903fbddad520b4 Author: Andrea Cosentino AuthorDate: Tue May 29 08:02:54 2018 +0200 Upgrade Swagger to version 1.5.20 --- parent/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/parent/pom.xml b/parent/pom.xml index 7e8efc3..81543a9 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -670,7 +670,7 @@ 1.3.12 15.0 1.3.12_2 -1.5.19 +1.5.20 1.0.35 20.0 2.2.10 -- To stop receiving notification emails like this one, please contact acosent...@apache.org.
[camel] branch master updated: Upgrade Chronicle Core to version 1.15.2
This is an automated email from the ASF dual-hosted git repository. acosentino pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/camel.git The following commit(s) were added to refs/heads/master by this push: new d54a3b4 Upgrade Chronicle Core to version 1.15.2 d54a3b4 is described below commit d54a3b4c5c5234575e66f342a193b0bfd2d754a2 Author: Andrea Cosentino AuthorDate: Tue May 29 07:43:17 2018 +0200 Upgrade Chronicle Core to version 1.15.2 --- parent/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/parent/pom.xml b/parent/pom.xml index 2b6da67..7e8efc3 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -120,7 +120,7 @@ 3.2.6_1 3.2.6 1.15.2 -1.15.1 +1.15.2 1.13.27 2.4.17 1.15.2 -- To stop receiving notification emails like this one, please contact acosent...@apache.org.
[camel] branch master updated: Correct typo
This is an automated email from the ASF dual-hosted git repository.
ningjiang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/master by this push:
new 75f7cca Correct typo
75f7cca is described below
commit 75f7cca0fb4172c0407b41bd67a2a9bc0820c8fb
Author: Felix Schumacher
AuthorDate: Mon May 28 21:01:43 2018 +0200
Correct typo
---
.../java/org/apache/camel/component/cxf/CxfProducer.java | 12 ++--
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git
a/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfProducer.java
b/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfProducer.java
index eef9047..58e58e7 100644
---
a/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfProducer.java
+++
b/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfProducer.java
@@ -287,15 +287,15 @@ public class CxfProducer extends DefaultProducer
implements AsyncProcessor {
boi = boi.getUnwrappedOperation();
}
}
-int experctMessagePartsSize = boi.getInput().getMessageParts().size();
+int expectMessagePartsSize = boi.getInput().getMessageParts().size();
-if (parameters.length < experctMessagePartsSize) {
+if (parameters.length < expectMessagePartsSize) {
throw new IllegalArgumentException("Get the wrong parameter size
to invoke the out service, Expect size "
- + experctMessagePartsSize + ",
Parameter size " + parameters.length
+ + expectMessagePartsSize + ",
Parameter size " + parameters.length
+ ". Please check if the
message body matches the CXFEndpoint POJO Dataformat request.");
}
-if (parameters.length > experctMessagePartsSize) {
+if (parameters.length > expectMessagePartsSize) {
// need to check the holder parameters
int holdersSize = 0;
for (Object parameter : parameters) {
@@ -313,9 +313,9 @@ public class CxfProducer extends DefaultProducer implements
AsyncProcessor {
}
}
-if (holdersSize + experctMessagePartsSize + soapHeadersSize <
parameters.length) {
+if (holdersSize + expectMessagePartsSize + soapHeadersSize <
parameters.length) {
throw new IllegalArgumentException("Get the wrong parameter
size to invoke the out service, Expect size "
- + (experctMessagePartsSize
+ holdersSize + soapHeadersSize) + ", Parameter size " + parameters.length
+ + (expectMessagePartsSize +
holdersSize + soapHeadersSize) + ", Parameter size " + parameters.length
+ ". Please check if the
message body matches the CXFEndpoint POJO Dataformat request.");
}
}
--
To stop receiving notification emails like this one, please contact
ningji...@apache.org.
[camel] branch master updated: Fixed doc link in camel-http
This is an automated email from the ASF dual-hosted git repository. aldettinger pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/camel.git The following commit(s) were added to refs/heads/master by this push: new 66f2304 Fixed doc link in camel-http 66f2304 is described below commit 66f2304a8989721b0d64625a591df54c1a9829c0 Author: aldettinger AuthorDate: Mon May 28 18:05:33 2018 +0200 Fixed doc link in camel-http --- components/camel-http/src/main/docs/http-component.adoc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components/camel-http/src/main/docs/http-component.adoc b/components/camel-http/src/main/docs/http-component.adoc index a4436a9..3267e4c 100644 --- a/components/camel-http/src/main/docs/http-component.adoc +++ b/components/camel-http/src/main/docs/http-component.adoc @@ -318,7 +318,7 @@ HttpServletRequest response = exchange.getIn().getBody(HttpServletResponse.class === Using client timeout - SO_TIMEOUT See the unit test in -http://svn.apache.org/viewvc?view=rev&revision=781775[this link] +https://github.com/apache/camel/blob/master/components/camel-jetty9/src/test/java/org/apache/camel/component/jetty/HttpProducerSOTimeoutTest.java[this link] === More Examples -- To stop receiving notification emails like this one, please contact aldettin...@apache.org.
[camel] 02/02: Fixed CS
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
commit f9f76c0d59548ab8d810c14298e30302b2cf1c21
Author: Andrea Cosentino
AuthorDate: Mon May 28 17:58:30 2018 +0200
Fixed CS
---
.../cache/CaffeineCacheProducerMultiOperationSameCacheTest.java| 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git
a/components/camel-caffeine/src/test/java/org/apache/camel/component/caffeine/cache/CaffeineCacheProducerMultiOperationSameCacheTest.java
b/components/camel-caffeine/src/test/java/org/apache/camel/component/caffeine/cache/CaffeineCacheProducerMultiOperationSameCacheTest.java
index ac7456f..f1f5c71 100644
---
a/components/camel-caffeine/src/test/java/org/apache/camel/component/caffeine/cache/CaffeineCacheProducerMultiOperationSameCacheTest.java
+++
b/components/camel-caffeine/src/test/java/org/apache/camel/component/caffeine/cache/CaffeineCacheProducerMultiOperationSameCacheTest.java
@@ -51,7 +51,8 @@ public class CaffeineCacheProducerMultiOperationSameCacheTest
extends CaffeineCa
protected RouteBuilder createRouteBuilder() throws Exception {
return new RouteBuilder() {
public void configure() {
-
from("direct://start").toF("caffeine-cache://%s?cache=#cache&action=PUT&key=1",
"test").toF("caffeine-cache://%s?cache=#cache&key=1&action=GET",
"test").to("log:org.apache.camel.component.caffeine?level=INFO&showAll=true&multiline=true").log("Test!
${body}")
+
from("direct://start").toF("caffeine-cache://%s?cache=#cache&action=PUT&key=1",
"test")
+.toF("caffeine-cache://%s?cache=#cache&key=1&action=GET",
"test").to("log:org.apache.camel.component.caffeine?level=INFO&showAll=true&multiline=true").log("Test!
${body}")
.to("mock:result");
}
};
--
To stop receiving notification emails like this one, please contact
acosent...@apache.org.
[camel] branch master updated (574f39c -> f9f76c0)
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git.
from 574f39c CAMEL-12541: Test object reference and no need for version
check anymore
new c60da1c CAMEL-12536 - Add a little unit test to show operations on
the same cache
new f9f76c0 Fixed CS
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
...eCacheProducerMultiOperationSameCacheTest.java} | 28 ++
1 file changed, 12 insertions(+), 16 deletions(-)
copy
components/camel-caffeine/src/test/java/org/apache/camel/component/caffeine/cache/{CaffeineCacheStatsCounterProducerTest.java
=> CaffeineCacheProducerMultiOperationSameCacheTest.java} (64%)
--
To stop receiving notification emails like this one, please contact
acosent...@apache.org.
[camel] 01/02: CAMEL-12536 - Add a little unit test to show operations on the same cache
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
commit c60da1cbc58113e1fda4a85e5a3bc7552dfdc38c
Author: Andrea Cosentino
AuthorDate: Mon May 28 17:56:51 2018 +0200
CAMEL-12536 - Add a little unit test to show operations on the same cache
---
...neCacheProducerMultiOperationSameCacheTest.java | 59 ++
1 file changed, 59 insertions(+)
diff --git
a/components/camel-caffeine/src/test/java/org/apache/camel/component/caffeine/cache/CaffeineCacheProducerMultiOperationSameCacheTest.java
b/components/camel-caffeine/src/test/java/org/apache/camel/component/caffeine/cache/CaffeineCacheProducerMultiOperationSameCacheTest.java
new file mode 100644
index 000..ac7456f
--- /dev/null
+++
b/components/camel-caffeine/src/test/java/org/apache/camel/component/caffeine/cache/CaffeineCacheProducerMultiOperationSameCacheTest.java
@@ -0,0 +1,59 @@
+/**
+ * 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.
+ */
+package org.apache.camel.component.caffeine.cache;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.component.caffeine.CaffeineConstants;
+import org.apache.camel.component.mock.MockEndpoint;
+import org.junit.Test;
+
+public class CaffeineCacheProducerMultiOperationSameCacheTest extends
CaffeineCacheTestSupport {
+
+@Test
+public void testSameCachePutAndGet() throws Exception {
+final Map map = new HashMap<>();
+map.put("1", "1");
+
+fluentTemplate().withBody("1").to("direct://start").send();
+
+MockEndpoint mock1 = getMockEndpoint("mock:result");
+mock1.expectedMinimumMessageCount(1);
+mock1.expectedHeaderReceived(CaffeineConstants.ACTION_HAS_RESULT,
true);
+mock1.expectedHeaderReceived(CaffeineConstants.ACTION_SUCCEEDED, true);
+assertEquals("1", mock1.getExchanges().get(0).getIn().getBody());
+
+assertMockEndpointsSatisfied();
+}
+
+
+//
+// Route
+//
+
+@Override
+protected RouteBuilder createRouteBuilder() throws Exception {
+return new RouteBuilder() {
+public void configure() {
+
from("direct://start").toF("caffeine-cache://%s?cache=#cache&action=PUT&key=1",
"test").toF("caffeine-cache://%s?cache=#cache&key=1&action=GET",
"test").to("log:org.apache.camel.component.caffeine?level=INFO&showAll=true&multiline=true").log("Test!
${body}")
+.to("mock:result");
+}
+};
+}
+}
--
To stop receiving notification emails like this one, please contact
acosent...@apache.org.
[camel] branch master updated (edaa076 -> 574f39c)
This is an automated email from the ASF dual-hosted git repository. ningjiang pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/camel.git. from edaa076 Upgrade Batik to version 1.10 new c798d64 CAMEL-12541: Use configured bean instead of creating a new new c12137f CAMEL-12541: In order to make CxfRsProducer cache works properly new 574f39c CAMEL-12541: Test object reference and no need for version check anymore The 3 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: .../component/cxf/jaxrs/CxfRsSpringEndpoint.java | 16 +- .../cxf/jaxrs/CxfRsSpringEndpointTest.java | 53 +--- .../cxf/jaxrs/CxfRsSpringEndpointBeans-2.6.xml | 57 -- .../cxf/jaxrs/CxfRsSpringEndpointBeans.xml | 17 +-- 4 files changed, 72 insertions(+), 71 deletions(-) delete mode 100644 components/camel-cxf/src/test/resources/org/apache/camel/component/cxf/jaxrs/CxfRsSpringEndpointBeans-2.6.xml -- To stop receiving notification emails like this one, please contact ningji...@apache.org.
[camel] 01/03: CAMEL-12541: Use configured bean instead of creating a new
This is an automated email from the ASF dual-hosted git repository.
ningjiang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
commit c798d642603479ebfaead918ca64af32a9a932c5
Author: Willian Antunes
AuthorDate: Sun May 27 13:20:53 2018 -0300
CAMEL-12541: Use configured bean instead of creating a new
When the endpoint is created the bean is always available and is used
for the consumer approach (newJAXRSServerFactoryBean). Now the same
behavior is used for producer approach (newJAXRSClientFactoryBean).
---
.../component/cxf/jaxrs/CxfRsSpringEndpoint.java | 3 +-
.../cxf/jaxrs/CxfRsSpringEndpointTest.java | 51 --
2 files changed, 50 insertions(+), 4 deletions(-)
diff --git
a/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/jaxrs/CxfRsSpringEndpoint.java
b/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/jaxrs/CxfRsSpringEndpoint.java
index 954d984..bd51da1 100644
---
a/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/jaxrs/CxfRsSpringEndpoint.java
+++
b/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/jaxrs/CxfRsSpringEndpoint.java
@@ -69,7 +69,8 @@ public class CxfRsSpringEndpoint extends CxfRsEndpoint
implements BeanIdAware {
@Override
protected JAXRSClientFactoryBean newJAXRSClientFactoryBean() {
-return new SpringJAXRSClientFactoryBean();
+checkBeanType(bean, JAXRSClientFactoryBean.class);
+return (JAXRSClientFactoryBean)bean;
}
@Override
diff --git
a/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/jaxrs/CxfRsSpringEndpointTest.java
b/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/jaxrs/CxfRsSpringEndpointTest.java
index 977d7dc..08ed017 100644
---
a/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/jaxrs/CxfRsSpringEndpointTest.java
+++
b/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/jaxrs/CxfRsSpringEndpointTest.java
@@ -24,11 +24,18 @@ import
org.apache.camel.component.cxf.spring.SpringJAXRSServerFactoryBean;
import org.apache.camel.test.spring.CamelSpringTestSupport;
import org.apache.cxf.version.Version;
import org.junit.Test;
+import org.springframework.beans.factory.support.BeanDefinitionBuilder;
+import org.springframework.beans.factory.support.DefaultListableBeanFactory;
import org.springframework.context.support.AbstractXmlApplicationContext;
import org.springframework.context.support.ClassPathXmlApplicationContext;
public class CxfRsSpringEndpointTest extends CamelSpringTestSupport {
+private static final String BEAN_SERVICE_ENDPOINT_NAME = "serviceEndpoint";
+private static final String BEAN_SERVICE_ADDRESS =
"http://localhost/programmatically";;
+private static final String BEAN_SERVICE_USERNAME =
"BEAN_SERVICE_USERNAME";
+private static final String BEAN_SERVICE_PASSWORD =
"BEAN_SERVICE_PASSWORD";
+
@Test
public void testCreateCxfRsServerFactoryBean() {
CxfRsEndpoint endpoint =
resolveMandatoryEndpoint("cxfrs://bean://rsServer", CxfRsEndpoint.class);
@@ -62,13 +69,51 @@ public class CxfRsSpringEndpointTest extends
CamelSpringTestSupport {
}
+@Test
+public void testCreateCxfRsClientFactoryBeanProgrammatically() {
+
+CxfRsEndpoint endpoint = resolveMandatoryEndpoint("cxfrs://bean://" +
BEAN_SERVICE_ENDPOINT_NAME, CxfRsEndpoint.class);
+SpringJAXRSClientFactoryBean cfb =
(SpringJAXRSClientFactoryBean)endpoint.createJAXRSClientFactoryBean();
+
+assertEquals("Got the wrong address", BEAN_SERVICE_ADDRESS,
cfb.getAddress());
+assertNotNull("Service class must not be null", cfb.getServiceClass());
+assertEquals("Got the wrong ServiceClass", CustomerService.class,
cfb.getServiceClass());
+assertEquals("Got the wrong username", BEAN_SERVICE_USERNAME,
cfb.getUsername());
+assertEquals("Got the wrong password", BEAN_SERVICE_PASSWORD,
cfb.getPassword());
+}
+
+public static SpringJAXRSClientFactoryBean serviceEndpoint() {
+
+SpringJAXRSClientFactoryBean clientFactoryBean = new
SpringJAXRSClientFactoryBean();
+clientFactoryBean.setAddress(BEAN_SERVICE_ADDRESS);
+clientFactoryBean.setServiceClass(CustomerService.class);
+clientFactoryBean.setUsername(BEAN_SERVICE_USERNAME);
+clientFactoryBean.setPassword(BEAN_SERVICE_PASSWORD);
+
+return clientFactoryBean;
+}
+
@Override
protected AbstractXmlApplicationContext createApplicationContext() {
String version = Version.getCurrentVersion();
+
+ClassPathXmlApplicationContext applicationContext = null;
+
if (version.startsWith("2") && (version.contains("2.5") ||
version.contains("2.4"))) {
-return new ClassPathXmlApplicationContext(new
String("org/apache/camel/component/cxf/jaxrs
[camel] 03/03: CAMEL-12541: Test object reference and no need for version check anymore
This is an automated email from the ASF dual-hosted git repository.
ningjiang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 574f39c491ea5afa490119b9de4deffd87296046
Author: Willian Antunes
AuthorDate: Mon May 28 09:01:51 2018 -0300
CAMEL-12541: Test object reference and no need for version check anymore
Version check was removed as we already move to 2.6.x
---
.../cxf/jaxrs/CxfRsSpringEndpointTest.java | 16 ++
.../cxf/jaxrs/CxfRsSpringEndpointBeans-2.6.xml | 57 --
.../cxf/jaxrs/CxfRsSpringEndpointBeans.xml | 17 +--
3 files changed, 17 insertions(+), 73 deletions(-)
diff --git
a/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/jaxrs/CxfRsSpringEndpointTest.java
b/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/jaxrs/CxfRsSpringEndpointTest.java
index 08ed017..5e1c109 100644
---
a/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/jaxrs/CxfRsSpringEndpointTest.java
+++
b/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/jaxrs/CxfRsSpringEndpointTest.java
@@ -22,7 +22,6 @@ import
org.apache.camel.component.cxf.jaxrs.testbean.CustomerService;
import org.apache.camel.component.cxf.spring.SpringJAXRSClientFactoryBean;
import org.apache.camel.component.cxf.spring.SpringJAXRSServerFactoryBean;
import org.apache.camel.test.spring.CamelSpringTestSupport;
-import org.apache.cxf.version.Version;
import org.junit.Test;
import org.springframework.beans.factory.support.BeanDefinitionBuilder;
import org.springframework.beans.factory.support.DefaultListableBeanFactory;
@@ -75,11 +74,12 @@ public class CxfRsSpringEndpointTest extends
CamelSpringTestSupport {
CxfRsEndpoint endpoint = resolveMandatoryEndpoint("cxfrs://bean://" +
BEAN_SERVICE_ENDPOINT_NAME, CxfRsEndpoint.class);
SpringJAXRSClientFactoryBean cfb =
(SpringJAXRSClientFactoryBean)endpoint.createJAXRSClientFactoryBean();
+assertNotSame("Got the same object but must be different",
super.applicationContext.getBean(BEAN_SERVICE_ENDPOINT_NAME), cfb);
assertEquals("Got the wrong address", BEAN_SERVICE_ADDRESS,
cfb.getAddress());
assertNotNull("Service class must not be null", cfb.getServiceClass());
assertEquals("Got the wrong ServiceClass", CustomerService.class,
cfb.getServiceClass());
assertEquals("Got the wrong username", BEAN_SERVICE_USERNAME,
cfb.getUsername());
-assertEquals("Got the wrong password", BEAN_SERVICE_PASSWORD,
cfb.getPassword());
+assertEquals("Got the wrong password", BEAN_SERVICE_PASSWORD,
cfb.getPassword());
}
public static SpringJAXRSClientFactoryBean serviceEndpoint() {
@@ -94,17 +94,9 @@ public class CxfRsSpringEndpointTest extends
CamelSpringTestSupport {
}
@Override
-protected AbstractXmlApplicationContext createApplicationContext() {
-String version = Version.getCurrentVersion();
-
-ClassPathXmlApplicationContext applicationContext = null;
-
-if (version.startsWith("2") && (version.contains("2.5") ||
version.contains("2.4"))) {
-applicationContext = new ClassPathXmlApplicationContext(new
String("org/apache/camel/component/cxf/jaxrs/CxfRsSpringEndpointBeans.xml"));
-} else {
-applicationContext = new ClassPathXmlApplicationContext(new
String("org/apache/camel/component/cxf/jaxrs/CxfRsSpringEndpointBeans-2.6.xml"));
-}
+protected AbstractXmlApplicationContext createApplicationContext() {
+ClassPathXmlApplicationContext applicationContext = new
ClassPathXmlApplicationContext(new
String("org/apache/camel/component/cxf/jaxrs/CxfRsSpringEndpointBeans.xml"));
emulateBeanRegistrationProgrammatically(applicationContext);
return applicationContext;
diff --git
a/components/camel-cxf/src/test/resources/org/apache/camel/component/cxf/jaxrs/CxfRsSpringEndpointBeans-2.6.xml
b/components/camel-cxf/src/test/resources/org/apache/camel/component/cxf/jaxrs/CxfRsSpringEndpointBeans-2.6.xml
deleted file mode 100644
index 8b0ca34..000
---
a/components/camel-cxf/src/test/resources/org/apache/camel/component/cxf/jaxrs/CxfRsSpringEndpointBeans-2.6.xml
+++ /dev/null
@@ -1,57 +0,0 @@
-
-
-http://www.springframework.org/schema/beans";
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
- xmlns:cxf="http://camel.apache.org/schema/cxf";
- xsi:schemaLocation="
- http://www.springframework.org/schema/beans
http://www.springframework.org/schema/beans/spring-beans.xsd
- http://camel.apache.org/schema/cxf
http://camel.apache.org/schema/cxf/camel-cxf.xsd
- http://camel.apache.org/schema/spring
http://camel.apache.org/schema/spring/camel-spring.xsd";>
-
-
- http://localhost:9000/router";
-
serviceClass="org.apache.camel.compo
[camel] 02/03: CAMEL-12541: In order to make CxfRsProducer cache works properly
This is an automated email from the ASF dual-hosted git repository.
ningjiang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
commit c12137f10418390ad94030742fee10d9c0aea8e7
Author: Willian Antunes
AuthorDate: Sun May 27 16:43:08 2018 -0300
CAMEL-12541: In order to make CxfRsProducer cache works properly
---
.../camel/component/cxf/jaxrs/CxfRsSpringEndpoint.java| 15 +--
1 file changed, 13 insertions(+), 2 deletions(-)
diff --git
a/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/jaxrs/CxfRsSpringEndpoint.java
b/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/jaxrs/CxfRsSpringEndpoint.java
index bd51da1..46b235a 100644
---
a/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/jaxrs/CxfRsSpringEndpoint.java
+++
b/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/jaxrs/CxfRsSpringEndpoint.java
@@ -25,6 +25,7 @@ import org.apache.cxf.jaxrs.AbstractJAXRSFactoryBean;
import org.apache.cxf.jaxrs.JAXRSServerFactoryBean;
import org.apache.cxf.jaxrs.client.JAXRSClientFactoryBean;
import org.springframework.context.ApplicationContext;
+import org.springframework.util.ReflectionUtils;
public class CxfRsSpringEndpoint extends CxfRsEndpoint implements BeanIdAware {
private AbstractJAXRSFactoryBean bean;
@@ -70,7 +71,7 @@ public class CxfRsSpringEndpoint extends CxfRsEndpoint
implements BeanIdAware {
@Override
protected JAXRSClientFactoryBean newJAXRSClientFactoryBean() {
checkBeanType(bean, JAXRSClientFactoryBean.class);
-return (JAXRSClientFactoryBean)bean;
+return newInstanceWithCommonProperties();
}
@Override
@@ -89,4 +90,14 @@ public class CxfRsSpringEndpoint extends CxfRsEndpoint
implements BeanIdAware {
public void setBeanId(String id) {
this.beanId = id;
}
-}
+
+private JAXRSClientFactoryBean newInstanceWithCommonProperties() {
+SpringJAXRSClientFactoryBean cfb = new SpringJAXRSClientFactoryBean();
+
+if (bean instanceof SpringJAXRSClientFactoryBean) {
+ReflectionUtils.shallowCopyFieldState(bean, cfb);
+}
+
+return cfb;
+}
+}
\ No newline at end of file
--
To stop receiving notification emails like this one, please contact
ningji...@apache.org.
[camel] branch master updated: Upgrade Batik to version 1.10
This is an automated email from the ASF dual-hosted git repository. acosentino pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/camel.git The following commit(s) were added to refs/heads/master by this push: new edaa076 Upgrade Batik to version 1.10 edaa076 is described below commit edaa076d6c72be319b7d1984ef067eb9a73d8d55 Author: Andrea Cosentino AuthorDate: Mon May 28 11:20:49 2018 +0200 Upgrade Batik to version 1.10 --- parent/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/parent/pom.xml b/parent/pom.xml index d6d02e0..2b6da67 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -728,7 +728,7 @@ 2.3.3 2.6.0 2.1_1 -1.9.1 +1.10 1.2_5 3.1.3 3.1.3_1 -- To stop receiving notification emails like this one, please contact acosent...@apache.org.
[camel] branch master updated: Upgrade Flink to version 1.5.0
This is an automated email from the ASF dual-hosted git repository. acosentino pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/camel.git The following commit(s) were added to refs/heads/master by this push: new e45747d Upgrade Flink to version 1.5.0 e45747d is described below commit e45747d1b8b8c20ac00663a29ddb0e3db982d8ae Author: Andrea Cosentino AuthorDate: Mon May 28 10:09:21 2018 +0200 Upgrade Flink to version 1.5.0 --- parent/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/parent/pom.xml b/parent/pom.xml index 751f2ec..d6d02e0 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -230,7 +230,7 @@ 3.0.2 2.0.3 3.4.3 -1.4.2 +1.5.0 2.2_1 2.2 1.1.1 -- To stop receiving notification emails like this one, please contact acosent...@apache.org.
svn commit: r27131 - /release/camel/apache-camel/2.21.1/
Author: zregvart Date: Mon May 28 07:35:47 2018 New Revision: 27131 Log: Restore 2.21.1 release Added: release/camel/apache-camel/2.21.1/ - copied from r26707, release/camel/apache-camel/2.21.1/
