[1/2] git commit: Updated the spring.schemas files after Camel 2.12.3 release
Repository: camel
Updated Branches:
refs/heads/camel-2.11.x 27f00bef2 -> 94ce91742
refs/heads/camel-2.12.x f121cf980 -> 308e952fc
Updated the spring.schemas files after Camel 2.12.3 release
Conflicts:
components/camel-cxf/src/main/resources/META-INF/spring.schemas
components/camel-spring-integration/src/main/resources/META-INF/spring.schemas
components/camel-spring-security/src/main/resources/META-INF/spring.schemas
components/camel-spring/src/main/resources/META-INF/spring.schemas
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/308e952f
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/308e952f
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/308e952f
Branch: refs/heads/camel-2.12.x
Commit: 308e952fcb350e9c8ef352a765f02f688271d1b1
Parents: f121cf9
Author: Willem Jiang
Authored: Wed Feb 26 11:11:39 2014 +0800
Committer: Willem Jiang
Committed: Wed Feb 26 11:25:57 2014 +0800
--
.../src/main/resources/META-INF/spring.schemas | 11 ++
.../src/main/resources/META-INF/spring.schemas | 13 +++-
.../src/main/resources/META-INF/spring.schemas | 13 +++-
.../src/main/resources/META-INF/spring.schemas | 22
4 files changed, 57 insertions(+), 2 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/camel/blob/308e952f/components/camel-cxf/src/main/resources/META-INF/spring.schemas
--
diff --git a/components/camel-cxf/src/main/resources/META-INF/spring.schemas
b/components/camel-cxf/src/main/resources/META-INF/spring.schemas
index 174a9cc..ed3db86 100644
--- a/components/camel-cxf/src/main/resources/META-INF/spring.schemas
+++ b/components/camel-cxf/src/main/resources/META-INF/spring.schemas
@@ -50,12 +50,23 @@
http\://camel.apache.org/schema/cxf/camel-cxf-2.9.3.xsd=schema/cxfEndpoint.xsd
http\://camel.apache.org/schema/cxf/camel-cxf-2.9.4.xsd=schema/cxfEndpoint.xsd
http\://camel.apache.org/schema/cxf/camel-cxf-2.9.5.xsd=schema/cxfEndpoint.xsd
http\://camel.apache.org/schema/cxf/camel-cxf-2.9.6.xsd=schema/cxfEndpoint.xsd
+http\://camel.apache.org/schema/cxf/camel-cxf-2.9.7.xsd=schema/cxfEndpoint.xsd
+http\://camel.apache.org/schema/cxf/camel-cxf-2.9.8.xsd=schema/cxfEndpoint.xsd
http\://camel.apache.org/schema/cxf/camel-cxf-2.10.0.xsd=schema/cxfEndpoint.xsd
http\://camel.apache.org/schema/cxf/camel-cxf-2.10.1.xsd=schema/cxfEndpoint.xsd
http\://camel.apache.org/schema/cxf/camel-cxf-2.10.2.xsd=schema/cxfEndpoint.xsd
http\://camel.apache.org/schema/cxf/camel-cxf-2.10.3.xsd=schema/cxfEndpoint.xsd
http\://camel.apache.org/schema/cxf/camel-cxf-2.10.4.xsd=schema/cxfEndpoint.xsd
+http\://camel.apache.org/schema/cxf/camel-cxf-2.10.5.xsd=schema/cxfEndpoint.xsd
+http\://camel.apache.org/schema/cxf/camel-cxf-2.10.6.xsd=schema/cxfEndpoint.xsd
+http\://camel.apache.org/schema/cxf/camel-cxf-2.10.7.xsd=schema/cxfEndpoint.xsd
http\://camel.apache.org/schema/cxf/camel-cxf-2.11.0.xsd=schema/cxfEndpoint.xsd
+http\://camel.apache.org/schema/cxf/camel-cxf-2.11.1.xsd=schema/cxfEndpoint.xsd
+http\://camel.apache.org/schema/cxf/camel-cxf-2.11.2.xsd=schema/cxfEndpoint.xsd
+http\://camel.apache.org/schema/cxf/camel-cxf-2.11.3.xsd=schema/cxfEndpoint.xsd
+http\://camel.apache.org/schema/cxf/camel-cxf-2.11.4.xsd=schema/cxfEndpoint.xsd
http\://camel.apache.org/schema/cxf/camel-cxf-2.12.0.xsd=schema/cxfEndpoint.xsd
http\://camel.apache.org/schema/cxf/camel-cxf-2.12.1.xsd=schema/cxfEndpoint.xsd
+http\://camel.apache.org/schema/cxf/camel-cxf-2.12.2.xsd=schema/cxfEndpoint.xsd
+http\://camel.apache.org/schema/cxf/camel-cxf-2.12.3.xsd=schema/cxfEndpoint.xsd
http\://camel.apache.org/schema/cxf/camel-cxf-${project.version}.xsd=schema/cxfEndpoint.xsd
http://git-wip-us.apache.org/repos/asf/camel/blob/308e952f/components/camel-spring-integration/src/main/resources/META-INF/spring.schemas
--
diff --git
a/components/camel-spring-integration/src/main/resources/META-INF/spring.schemas
b/components/camel-spring-integration/src/main/resources/META-INF/spring.schemas
index b582797..ff679ef 100644
---
a/components/camel-spring-integration/src/main/resources/META-INF/spring.schemas
+++
b/components/camel-spring-integration/src/main/resources/META-INF/spring.schemas
@@ -47,12 +47,23 @@
http\://camel.apache.org/schema/spring/integration/camel-spring-integration-2.9.
http\://camel.apache.org/schema/spring/integration/camel-spring-integration-2.9.4.xsd=schema/camel-spring-integration.xsd
http\://camel.apache.org/schema/spring/integration/camel-spring-integration-2.9.5.xsd=schema/camel-spring-integration.xsd
http\://camel.apache.org/schema/spring/integration/camel-spring-integration-2.9.6.xsd=schema/
[2/2] git commit: Updated the spring.schemas files after Camel 2.12.3 release
Updated the spring.schemas files after Camel 2.12.3 release
Conflicts:
components/camel-cxf/src/main/resources/META-INF/spring.schemas
components/camel-spring-integration/src/main/resources/META-INF/spring.schemas
components/camel-spring-security/src/main/resources/META-INF/spring.schemas
components/camel-spring/src/main/resources/META-INF/spring.schemas
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/94ce9174
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/94ce9174
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/94ce9174
Branch: refs/heads/camel-2.11.x
Commit: 94ce917421faa6339f99ad0123e32a1f8c800f67
Parents: 27f00be
Author: Willem Jiang
Authored: Wed Feb 26 11:11:39 2014 +0800
Committer: Willem Jiang
Committed: Wed Feb 26 11:28:18 2014 +0800
--
.../src/main/resources/META-INF/spring.schemas| 7 +++
.../src/main/resources/META-INF/spring.schemas| 9 -
.../src/main/resources/META-INF/spring.schemas| 9 -
.../src/main/resources/META-INF/spring.schemas| 14 ++
4 files changed, 37 insertions(+), 2 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/camel/blob/94ce9174/components/camel-cxf/src/main/resources/META-INF/spring.schemas
--
diff --git a/components/camel-cxf/src/main/resources/META-INF/spring.schemas
b/components/camel-cxf/src/main/resources/META-INF/spring.schemas
index dfebd78..3fcdab3 100644
--- a/components/camel-cxf/src/main/resources/META-INF/spring.schemas
+++ b/components/camel-cxf/src/main/resources/META-INF/spring.schemas
@@ -50,12 +50,19 @@
http\://camel.apache.org/schema/cxf/camel-cxf-2.9.3.xsd=schema/cxfEndpoint.xsd
http\://camel.apache.org/schema/cxf/camel-cxf-2.9.4.xsd=schema/cxfEndpoint.xsd
http\://camel.apache.org/schema/cxf/camel-cxf-2.9.5.xsd=schema/cxfEndpoint.xsd
http\://camel.apache.org/schema/cxf/camel-cxf-2.9.6.xsd=schema/cxfEndpoint.xsd
+http\://camel.apache.org/schema/cxf/camel-cxf-2.9.7.xsd=schema/cxfEndpoint.xsd
+http\://camel.apache.org/schema/cxf/camel-cxf-2.9.8.xsd=schema/cxfEndpoint.xsd
http\://camel.apache.org/schema/cxf/camel-cxf-2.10.0.xsd=schema/cxfEndpoint.xsd
http\://camel.apache.org/schema/cxf/camel-cxf-2.10.1.xsd=schema/cxfEndpoint.xsd
http\://camel.apache.org/schema/cxf/camel-cxf-2.10.2.xsd=schema/cxfEndpoint.xsd
http\://camel.apache.org/schema/cxf/camel-cxf-2.10.3.xsd=schema/cxfEndpoint.xsd
http\://camel.apache.org/schema/cxf/camel-cxf-2.10.4.xsd=schema/cxfEndpoint.xsd
+http\://camel.apache.org/schema/cxf/camel-cxf-2.10.5.xsd=schema/cxfEndpoint.xsd
+http\://camel.apache.org/schema/cxf/camel-cxf-2.10.6.xsd=schema/cxfEndpoint.xsd
+http\://camel.apache.org/schema/cxf/camel-cxf-2.10.7.xsd=schema/cxfEndpoint.xsd
http\://camel.apache.org/schema/cxf/camel-cxf-2.11.0.xsd=schema/cxfEndpoint.xsd
http\://camel.apache.org/schema/cxf/camel-cxf-2.11.1.xsd=schema/cxfEndpoint.xsd
http\://camel.apache.org/schema/cxf/camel-cxf-2.11.2.xsd=schema/cxfEndpoint.xsd
+http\://camel.apache.org/schema/cxf/camel-cxf-2.11.3.xsd=schema/cxfEndpoint.xsd
+http\://camel.apache.org/schema/cxf/camel-cxf-2.11.4.xsd=schema/cxfEndpoint.xsd
http\://camel.apache.org/schema/cxf/camel-cxf-${project.version}.xsd=schema/cxfEndpoint.xsd
http://git-wip-us.apache.org/repos/asf/camel/blob/94ce9174/components/camel-spring-integration/src/main/resources/META-INF/spring.schemas
--
diff --git
a/components/camel-spring-integration/src/main/resources/META-INF/spring.schemas
b/components/camel-spring-integration/src/main/resources/META-INF/spring.schemas
index cacf13e..d4ce8b6 100644
---
a/components/camel-spring-integration/src/main/resources/META-INF/spring.schemas
+++
b/components/camel-spring-integration/src/main/resources/META-INF/spring.schemas
@@ -47,12 +47,19 @@
http\://camel.apache.org/schema/spring/integration/camel-spring-integration-2.9.
http\://camel.apache.org/schema/spring/integration/camel-spring-integration-2.9.4.xsd=schema/camel-spring-integration.xsd
http\://camel.apache.org/schema/spring/integration/camel-spring-integration-2.9.5.xsd=schema/camel-spring-integration.xsd
http\://camel.apache.org/schema/spring/integration/camel-spring-integration-2.9.6.xsd=schema/camel-spring-integration.xsd
+http\://camel.apache.org/schema/spring/integration/camel-spring-integration-2.9.7.xsd=schema/camel-spring-integration.xsd
+http\://camel.apache.org/schema/spring/integration/camel-spring-integration-2.9.8.xsd=schema/camel-spring-integration.xsd
http\://camel.apache.org/schema/spring/integration/camel-spring-integration-2.10.0.xsd=schema/camel-spring-integration.xsd
http\://camel.apache.org/schema/spring/integratio
git commit: Updated the spring.schemas files after Camel 2.12.3 release
Repository: camel
Updated Branches:
refs/heads/master a6c4057a7 -> 4c20035bd
Updated the spring.schemas files after Camel 2.12.3 release
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/4c20035b
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/4c20035b
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/4c20035b
Branch: refs/heads/master
Commit: 4c20035bdc6225647e721b7dd5517e1b64a47790
Parents: a6c4057
Author: Willem Jiang
Authored: Wed Feb 26 11:11:39 2014 +0800
Committer: Willem Jiang
Committed: Wed Feb 26 11:11:39 2014 +0800
--
.../src/main/resources/META-INF/spring.schemas | 13 ++
.../src/main/resources/META-INF/spring.schemas | 13 ++
.../src/main/resources/META-INF/spring.schemas | 13 ++
.../src/main/resources/META-INF/spring.schemas | 26
4 files changed, 65 insertions(+)
--
http://git-wip-us.apache.org/repos/asf/camel/blob/4c20035b/components/camel-cxf/src/main/resources/META-INF/spring.schemas
--
diff --git a/components/camel-cxf/src/main/resources/META-INF/spring.schemas
b/components/camel-cxf/src/main/resources/META-INF/spring.schemas
index 11a1e7d..ed3db86 100644
--- a/components/camel-cxf/src/main/resources/META-INF/spring.schemas
+++ b/components/camel-cxf/src/main/resources/META-INF/spring.schemas
@@ -50,10 +50,23 @@
http\://camel.apache.org/schema/cxf/camel-cxf-2.9.3.xsd=schema/cxfEndpoint.xsd
http\://camel.apache.org/schema/cxf/camel-cxf-2.9.4.xsd=schema/cxfEndpoint.xsd
http\://camel.apache.org/schema/cxf/camel-cxf-2.9.5.xsd=schema/cxfEndpoint.xsd
http\://camel.apache.org/schema/cxf/camel-cxf-2.9.6.xsd=schema/cxfEndpoint.xsd
+http\://camel.apache.org/schema/cxf/camel-cxf-2.9.7.xsd=schema/cxfEndpoint.xsd
+http\://camel.apache.org/schema/cxf/camel-cxf-2.9.8.xsd=schema/cxfEndpoint.xsd
http\://camel.apache.org/schema/cxf/camel-cxf-2.10.0.xsd=schema/cxfEndpoint.xsd
http\://camel.apache.org/schema/cxf/camel-cxf-2.10.1.xsd=schema/cxfEndpoint.xsd
http\://camel.apache.org/schema/cxf/camel-cxf-2.10.2.xsd=schema/cxfEndpoint.xsd
http\://camel.apache.org/schema/cxf/camel-cxf-2.10.3.xsd=schema/cxfEndpoint.xsd
http\://camel.apache.org/schema/cxf/camel-cxf-2.10.4.xsd=schema/cxfEndpoint.xsd
+http\://camel.apache.org/schema/cxf/camel-cxf-2.10.5.xsd=schema/cxfEndpoint.xsd
+http\://camel.apache.org/schema/cxf/camel-cxf-2.10.6.xsd=schema/cxfEndpoint.xsd
+http\://camel.apache.org/schema/cxf/camel-cxf-2.10.7.xsd=schema/cxfEndpoint.xsd
http\://camel.apache.org/schema/cxf/camel-cxf-2.11.0.xsd=schema/cxfEndpoint.xsd
+http\://camel.apache.org/schema/cxf/camel-cxf-2.11.1.xsd=schema/cxfEndpoint.xsd
+http\://camel.apache.org/schema/cxf/camel-cxf-2.11.2.xsd=schema/cxfEndpoint.xsd
+http\://camel.apache.org/schema/cxf/camel-cxf-2.11.3.xsd=schema/cxfEndpoint.xsd
+http\://camel.apache.org/schema/cxf/camel-cxf-2.11.4.xsd=schema/cxfEndpoint.xsd
+http\://camel.apache.org/schema/cxf/camel-cxf-2.12.0.xsd=schema/cxfEndpoint.xsd
+http\://camel.apache.org/schema/cxf/camel-cxf-2.12.1.xsd=schema/cxfEndpoint.xsd
+http\://camel.apache.org/schema/cxf/camel-cxf-2.12.2.xsd=schema/cxfEndpoint.xsd
+http\://camel.apache.org/schema/cxf/camel-cxf-2.12.3.xsd=schema/cxfEndpoint.xsd
http\://camel.apache.org/schema/cxf/camel-cxf-${project.version}.xsd=schema/cxfEndpoint.xsd
http://git-wip-us.apache.org/repos/asf/camel/blob/4c20035b/components/camel-spring-integration/src/main/resources/META-INF/spring.schemas
--
diff --git
a/components/camel-spring-integration/src/main/resources/META-INF/spring.schemas
b/components/camel-spring-integration/src/main/resources/META-INF/spring.schemas
index a2b304b..ba8b2ee 100644
---
a/components/camel-spring-integration/src/main/resources/META-INF/spring.schemas
+++
b/components/camel-spring-integration/src/main/resources/META-INF/spring.schemas
@@ -47,10 +47,23 @@
http\://camel.apache.org/schema/spring/integration/camel-spring-integration-2.9.
http\://camel.apache.org/schema/spring/integration/camel-spring-integration-2.9.4.xsd=schema/camel-spring-integration.xsd
http\://camel.apache.org/schema/spring/integration/camel-spring-integration-2.9.5.xsd=schema/camel-spring-integration.xsd
http\://camel.apache.org/schema/spring/integration/camel-spring-integration-2.9.6.xsd=schema/camel-spring-integration.xsd
+http\://camel.apache.org/schema/spring/integration/camel-spring-integration-2.9.7.xsd=schema/camel-spring-integration.xsd
+http\://camel.apache.org/schema/spring/integration/camel-spring-integration-2.9.8.xsd=schema/camel-spring-integration.xsd
http\://camel.apache.org/schema/spring/integration/camel-spring-integration-2.10.0.xsd=schema/camel-spring-integration.xsd
http\://cam
[2/2] git commit: CAMEL-7178 Create JAX-RS MessageBodyWriter and Reader which will work with Camel data format with thanks to Sergey
CAMEL-7178 Create JAX-RS MessageBodyWriter and Reader which will work with
Camel data format with thanks to Sergey
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/a6c4057a
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/a6c4057a
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/a6c4057a
Branch: refs/heads/master
Commit: a6c4057a7ba3d8d2e2024081a75646a42730dc52
Parents: b2b9626
Author: Willem Jiang
Authored: Wed Feb 26 10:47:34 2014 +0800
Committer: Willem Jiang
Committed: Wed Feb 26 10:47:34 2014 +0800
--
.../component/cxf/jaxrs/DataFormatProvider.java | 121 +
.../cxf/jaxrs/DataFormatProviderTest.java | 130 +++
2 files changed, 251 insertions(+)
--
http://git-wip-us.apache.org/repos/asf/camel/blob/a6c4057a/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/jaxrs/DataFormatProvider.java
--
diff --git
a/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/jaxrs/DataFormatProvider.java
b/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/jaxrs/DataFormatProvider.java
new file mode 100644
index 000..73ef59a
--- /dev/null
+++
b/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/jaxrs/DataFormatProvider.java
@@ -0,0 +1,121 @@
+/**
+ * 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.cxf.jaxrs;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.lang.annotation.Annotation;
+import java.lang.reflect.Type;
+import java.util.HashMap;
+import java.util.Map;
+
+import javax.ws.rs.BadRequestException;
+import javax.ws.rs.InternalServerErrorException;
+import javax.ws.rs.WebApplicationException;
+import javax.ws.rs.core.MediaType;
+import javax.ws.rs.core.MultivaluedMap;
+import javax.ws.rs.ext.MessageBodyReader;
+import javax.ws.rs.ext.MessageBodyWriter;
+
+import org.apache.camel.spi.DataFormat;
+import org.apache.cxf.jaxrs.utils.JAXRSUtils;
+
+public class DataFormatProvider implements MessageBodyWriter,
MessageBodyReader {
+
+private Map formats = new HashMap();
+
+@Override
+public boolean isReadable(Class cls, Type type, Annotation[] anns,
MediaType mt) {
+return getDataFormat(mt) != null;
+}
+
+@Override
+public boolean isWriteable(Class cls, Type type, Annotation[] anns,
MediaType mt) {
+return getDataFormat(mt) != null;
+}
+
+@Override
+public T readFrom(Class cls, Type type, Annotation[] anns, MediaType mt,
+ MultivaluedMap headers, InputStream is)
throws IOException,
+WebApplicationException {
+DataFormat format = getValidDataFormat(mt);
+try {
+@SuppressWarnings("unchecked")
+T result = (T)format.unmarshal(null, is);
+return result;
+} catch (Exception ex) {
+throw new BadRequestException(ex);
+}
+}
+
+@Override
+public long getSize(T obj, Class cls, Type type, Annotation[] anns,
MediaType mt) {
+return -1;
+}
+
+@Override
+public void writeTo(T obj, Class cls, Type type, Annotation[] anns,
MediaType mt,
+MultivaluedMap headers, OutputStream
os) throws IOException,
+WebApplicationException {
+DataFormat format = getValidDataFormat(mt);
+try {
+format.marshal(null, obj, os);
+} catch (Exception ex) {
+throw new InternalServerErrorException(ex);
+}
+
+}
+
+public void setFormat(DataFormat format) {
+setFormat(MediaType.WILDCARD, format);
+}
+
+public void setFormat(String mediaType, DataFormat format) {
+formats.put(mediaType, format);
+}
+
+public void setFormats(Map formats) {
+this.formats.putAll(formats);
+}
+
+private DataFormat getValidDataFormat(MediaType mt) {
+DataFormat format = getDataFormat(mt);
+if (format == null)
[1/2] git commit: CAMEL-7207 Removed the unused import in CxfRsSpringEndpointTest
Repository: camel Updated Branches: refs/heads/master 18c23fa82 -> a6c4057a7 CAMEL-7207 Removed the unused import in CxfRsSpringEndpointTest Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/b2b9626d Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/b2b9626d Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/b2b9626d Branch: refs/heads/master Commit: b2b9626d524da1df6a063ac2dbe982ec9f0a056e Parents: 18c23fa Author: Willem Jiang Authored: Wed Feb 26 10:46:29 2014 +0800 Committer: Willem Jiang Committed: Wed Feb 26 10:46:29 2014 +0800 -- .../apache/camel/component/cxf/jaxrs/CxfRsSpringEndpointTest.java | 2 -- 1 file changed, 2 deletions(-) -- http://git-wip-us.apache.org/repos/asf/camel/blob/b2b9626d/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/jaxrs/CxfRsSpringEndpointTest.java -- 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 d80441e..a84fc20 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 @@ -19,12 +19,10 @@ package org.apache.camel.component.cxf.jaxrs; import java.util.Map; import org.apache.camel.component.cxf.jaxrs.testbean.CustomerService; -import org.apache.camel.component.cxf.spring.AbstractCxfBeanDefinitionParser; 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.context.support.AbstractXmlApplicationContext; import org.springframework.context.support.ClassPathXmlApplicationContext;
[5/5] git commit: CAMEL-7213 NIOConverter need to call flip() when we put something into the buffer
CAMEL-7213 NIOConverter need to call flip() when we put something into the
buffer
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/27f00bef
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/27f00bef
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/27f00bef
Branch: refs/heads/camel-2.11.x
Commit: 27f00bef24ecbf055ec0ce26b07de6a61046e41b
Parents: daafa49
Author: Willem Jiang
Authored: Mon Feb 17 14:29:46 2014 +0800
Committer: Willem Jiang
Committed: Wed Feb 26 10:32:37 2014 +0800
--
.../java/org/apache/camel/converter/NIOConverter.java | 5 +
.../java/org/apache/camel/converter/NIOConverterTest.java | 10 --
2 files changed, 5 insertions(+), 10 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/camel/blob/27f00bef/camel-core/src/main/java/org/apache/camel/converter/NIOConverter.java
--
diff --git
a/camel-core/src/main/java/org/apache/camel/converter/NIOConverter.java
b/camel-core/src/main/java/org/apache/camel/converter/NIOConverter.java
index 26f489c..408babe 100644
--- a/camel-core/src/main/java/org/apache/camel/converter/NIOConverter.java
+++ b/camel-core/src/main/java/org/apache/camel/converter/NIOConverter.java
@@ -107,6 +107,7 @@ public final class NIOConverter {
public static ByteBuffer toByteBuffer(Short value) {
ByteBuffer buf = ByteBuffer.allocate(2);
buf.putShort(value);
+buf.flip();
return buf;
}
@@ -114,6 +115,7 @@ public final class NIOConverter {
public static ByteBuffer toByteBuffer(Integer value) {
ByteBuffer buf = ByteBuffer.allocate(4);
buf.putInt(value);
+buf.flip();
return buf;
}
@@ -121,6 +123,7 @@ public final class NIOConverter {
public static ByteBuffer toByteBuffer(Long value) {
ByteBuffer buf = ByteBuffer.allocate(8);
buf.putLong(value);
+buf.flip();
return buf;
}
@@ -128,6 +131,7 @@ public final class NIOConverter {
public static ByteBuffer toByteBuffer(Float value) {
ByteBuffer buf = ByteBuffer.allocate(4);
buf.putFloat(value);
+buf.flip();
return buf;
}
@@ -135,6 +139,7 @@ public final class NIOConverter {
public static ByteBuffer toByteBuffer(Double value) {
ByteBuffer buf = ByteBuffer.allocate(8);
buf.putDouble(value);
+buf.flip();
return buf;
}
http://git-wip-us.apache.org/repos/asf/camel/blob/27f00bef/camel-core/src/test/java/org/apache/camel/converter/NIOConverterTest.java
--
diff --git
a/camel-core/src/test/java/org/apache/camel/converter/NIOConverterTest.java
b/camel-core/src/test/java/org/apache/camel/converter/NIOConverterTest.java
index f1be12b..8e02529 100644
--- a/camel-core/src/test/java/org/apache/camel/converter/NIOConverterTest.java
+++ b/camel-core/src/test/java/org/apache/camel/converter/NIOConverterTest.java
@@ -92,40 +92,30 @@ public class NIOConverterTest extends ContextTestSupport {
public void testToByteBufferShort() {
ByteBuffer bb = NIOConverter.toByteBuffer(Short.valueOf("2"));
assertNotNull(bb);
-
-bb.position(0);
assertEquals(2, bb.getShort());
}
public void testToByteBufferInteger() {
ByteBuffer bb = NIOConverter.toByteBuffer(Integer.valueOf("2"));
assertNotNull(bb);
-
-bb.position(0);
assertEquals(2, bb.getInt());
}
public void testToByteBufferLong() {
ByteBuffer bb = NIOConverter.toByteBuffer(Long.valueOf("2"));
assertNotNull(bb);
-
-bb.position(0);
assertEquals(2, bb.getLong());
}
public void testToByteBufferDouble() {
ByteBuffer bb = NIOConverter.toByteBuffer(Double.valueOf("2"));
assertNotNull(bb);
-
-bb.position(0);
assertEquals(2.0d, bb.getDouble());
}
public void testToByteBufferFloat() {
ByteBuffer bb = NIOConverter.toByteBuffer(Float.valueOf("2"));
assertNotNull(bb);
-
-bb.position(0);
assertEquals(2.0f, bb.getFloat());
}
[1/5] git commit: CAMEL-7241 Fixed the ByteBuffer to String conversion issue
Repository: camel
Updated Branches:
refs/heads/camel-2.11.x 06734f1d3 -> 27f00bef2
refs/heads/camel-2.12.x b493aa973 -> f121cf980
CAMEL-7241 Fixed the ByteBuffer to String conversion issue
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/f121cf98
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/f121cf98
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/f121cf98
Branch: refs/heads/camel-2.12.x
Commit: f121cf9809cdbf900d53343221d0d81076b209b4
Parents: b493aa9
Author: Willem Jiang
Authored: Wed Feb 26 10:11:58 2014 +0800
Committer: Willem Jiang
Committed: Wed Feb 26 10:20:19 2014 +0800
--
.../java/org/apache/camel/converter/NIOConverter.java | 2 +-
.../org/apache/camel/converter/NIOConverterTest.java | 14 ++
2 files changed, 15 insertions(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/camel/blob/f121cf98/camel-core/src/main/java/org/apache/camel/converter/NIOConverter.java
--
diff --git
a/camel-core/src/main/java/org/apache/camel/converter/NIOConverter.java
b/camel-core/src/main/java/org/apache/camel/converter/NIOConverter.java
index 41273b6..e1cf6d6 100644
--- a/camel-core/src/main/java/org/apache/camel/converter/NIOConverter.java
+++ b/camel-core/src/main/java/org/apache/camel/converter/NIOConverter.java
@@ -54,7 +54,7 @@ public final class NIOConverter {
@Converter
public static String toString(ByteBuffer buffer, Exchange exchange) throws
IOException {
-return IOConverter.toString(buffer.array(), exchange);
+return IOConverter.toString(toByteArray(buffer), exchange);
}
@Converter
http://git-wip-us.apache.org/repos/asf/camel/blob/f121cf98/camel-core/src/test/java/org/apache/camel/converter/NIOConverterTest.java
--
diff --git
a/camel-core/src/test/java/org/apache/camel/converter/NIOConverterTest.java
b/camel-core/src/test/java/org/apache/camel/converter/NIOConverterTest.java
index bcd423b..8e02529 100644
--- a/camel-core/src/test/java/org/apache/camel/converter/NIOConverterTest.java
+++ b/camel-core/src/test/java/org/apache/camel/converter/NIOConverterTest.java
@@ -55,6 +55,20 @@ public class NIOConverterTest extends ContextTestSupport {
assertNotNull(out);
assertEquals("Hello", out);
}
+
+/**
+ * ToString need to deal the array size issue as ToByteArray does
+ */
+public void testByteBufferToStringConversion() throws Exception {
+String str = "123456789";
+ByteBuffer buffer = ByteBuffer.allocate(16);
+buffer.put(str.getBytes());
+buffer.flip();
+
+String out = NIOConverter.toString(buffer, null);
+assertEquals(str, out);
+}
+
public void testToByteBuffer() {
ByteBuffer bb = NIOConverter.toByteBuffer("Hello".getBytes());
[2/5] git commit: CAMEL-7241 Fixed the ByteBuffer to String conversion issue
CAMEL-7241 Fixed the ByteBuffer to String conversion issue
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/06292ae0
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/06292ae0
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/06292ae0
Branch: refs/heads/camel-2.11.x
Commit: 06292ae0a983087ad688e7ee623a8268068759b8
Parents: 06734f1
Author: Willem Jiang
Authored: Wed Feb 26 10:11:58 2014 +0800
Committer: Willem Jiang
Committed: Wed Feb 26 10:20:29 2014 +0800
--
.../java/org/apache/camel/converter/NIOConverter.java | 2 +-
.../org/apache/camel/converter/NIOConverterTest.java | 14 ++
2 files changed, 15 insertions(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/camel/blob/06292ae0/camel-core/src/main/java/org/apache/camel/converter/NIOConverter.java
--
diff --git
a/camel-core/src/main/java/org/apache/camel/converter/NIOConverter.java
b/camel-core/src/main/java/org/apache/camel/converter/NIOConverter.java
index 376cbea..42df28d 100644
--- a/camel-core/src/main/java/org/apache/camel/converter/NIOConverter.java
+++ b/camel-core/src/main/java/org/apache/camel/converter/NIOConverter.java
@@ -52,7 +52,7 @@ public final class NIOConverter {
@Converter
public static String toString(ByteBuffer buffer, Exchange exchange) throws
IOException {
-return IOConverter.toString(buffer.array(), exchange);
+return IOConverter.toString(toByteArray(buffer), exchange);
}
@Converter
http://git-wip-us.apache.org/repos/asf/camel/blob/06292ae0/camel-core/src/test/java/org/apache/camel/converter/NIOConverterTest.java
--
diff --git
a/camel-core/src/test/java/org/apache/camel/converter/NIOConverterTest.java
b/camel-core/src/test/java/org/apache/camel/converter/NIOConverterTest.java
index 78a571f..3d85e5e 100644
--- a/camel-core/src/test/java/org/apache/camel/converter/NIOConverterTest.java
+++ b/camel-core/src/test/java/org/apache/camel/converter/NIOConverterTest.java
@@ -41,6 +41,20 @@ public class NIOConverterTest extends ContextTestSupport {
assertNotNull(out);
assertEquals("Hello", out);
}
+
+/**
+ * ToString need to deal the array size issue as ToByteArray does
+ */
+public void testByteBufferToStringConversion() throws Exception {
+String str = "123456789";
+ByteBuffer buffer = ByteBuffer.allocate(16);
+buffer.put(str.getBytes());
+buffer.flip();
+
+String out = NIOConverter.toString(buffer, null);
+assertEquals(str, out);
+}
+
public void testToByteBuffer() {
ByteBuffer bb = NIOConverter.toByteBuffer("Hello".getBytes());
[4/5] git commit: CAMEL-7209 Fixed the unit test failure of XmlConverterTest
CAMEL-7209 Fixed the unit test failure of XmlConverterTest
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/daafa49d
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/daafa49d
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/daafa49d
Branch: refs/heads/camel-2.11.x
Commit: daafa49d4958cbb0f5624511ade7db76e3bcb170
Parents: 285dc7a
Author: Willem Jiang
Authored: Mon Feb 17 14:07:14 2014 +0800
Committer: Willem Jiang
Committed: Wed Feb 26 10:32:21 2014 +0800
--
.../src/main/java/org/apache/camel/converter/NIOConverter.java | 1 +
1 file changed, 1 insertion(+)
--
http://git-wip-us.apache.org/repos/asf/camel/blob/daafa49d/camel-core/src/main/java/org/apache/camel/converter/NIOConverter.java
--
diff --git
a/camel-core/src/main/java/org/apache/camel/converter/NIOConverter.java
b/camel-core/src/main/java/org/apache/camel/converter/NIOConverter.java
index d0f86e7..26f489c 100644
--- a/camel-core/src/main/java/org/apache/camel/converter/NIOConverter.java
+++ b/camel-core/src/main/java/org/apache/camel/converter/NIOConverter.java
@@ -99,6 +99,7 @@ public final class NIOConverter {
bytes = value.getBytes();
}
buf.put(bytes);
+buf.flip();
return buf;
}
[3/5] git commit: CAMEL-7209 Fixed the issue that NIOConverter.toByteArray return bad data with thanks to Radek
CAMEL-7209 Fixed the issue that NIOConverter.toByteArray return bad data with
thanks to Radek
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/285dc7aa
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/285dc7aa
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/285dc7aa
Branch: refs/heads/camel-2.11.x
Commit: 285dc7aa1c5427922aace33aa96fa5d298563347
Parents: 06292ae
Author: Willem Jiang
Authored: Mon Feb 17 13:24:25 2014 +0800
Committer: Willem Jiang
Committed: Wed Feb 26 10:32:06 2014 +0800
--
.../java/org/apache/camel/converter/NIOConverter.java | 4 +++-
.../org/apache/camel/converter/NIOConverterTest.java | 14 ++
2 files changed, 17 insertions(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/camel/blob/285dc7aa/camel-core/src/main/java/org/apache/camel/converter/NIOConverter.java
--
diff --git
a/camel-core/src/main/java/org/apache/camel/converter/NIOConverter.java
b/camel-core/src/main/java/org/apache/camel/converter/NIOConverter.java
index 42df28d..d0f86e7 100644
--- a/camel-core/src/main/java/org/apache/camel/converter/NIOConverter.java
+++ b/camel-core/src/main/java/org/apache/camel/converter/NIOConverter.java
@@ -47,7 +47,9 @@ public final class NIOConverter {
@Converter
public static byte[] toByteArray(ByteBuffer buffer) {
-return buffer.array();
+byte[] bArray = new byte[buffer.limit()];
+buffer.get(bArray);
+return bArray;
}
@Converter
http://git-wip-us.apache.org/repos/asf/camel/blob/285dc7aa/camel-core/src/test/java/org/apache/camel/converter/NIOConverterTest.java
--
diff --git
a/camel-core/src/test/java/org/apache/camel/converter/NIOConverterTest.java
b/camel-core/src/test/java/org/apache/camel/converter/NIOConverterTest.java
index 3d85e5e..f1be12b 100644
--- a/camel-core/src/test/java/org/apache/camel/converter/NIOConverterTest.java
+++ b/camel-core/src/test/java/org/apache/camel/converter/NIOConverterTest.java
@@ -34,6 +34,20 @@ public class NIOConverterTest extends ContextTestSupport {
assertNotNull(out);
assertEquals(5, out.length);
}
+
+/**
+ * Test if returned array size is only to limit of ByteBuffer.
+ *
+ * If byteBuffer capacity is bigger that limit, we MUST return data only
to the limit.
+ */
+public void testToByteArrayBigBuffer() {
+ByteBuffer bb = ByteBuffer.allocate(100);
+bb.put("Hello".getBytes());
+bb.flip();
+byte[] out = NIOConverter.toByteArray(bb);
+assertNotNull(out);
+assertEquals(5, out.length);
+}
public void testToString() throws Exception {
ByteBuffer bb = ByteBuffer.wrap("Hello".getBytes());
git commit: CAMEL-7241 Fixed the ByteBuffer to String conversion issue
Repository: camel
Updated Branches:
refs/heads/master 92200b5f8 -> 18c23fa82
CAMEL-7241 Fixed the ByteBuffer to String conversion issue
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/18c23fa8
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/18c23fa8
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/18c23fa8
Branch: refs/heads/master
Commit: 18c23fa82a7e7ccb5593de1a070c9a562c8083e1
Parents: 92200b5
Author: Willem Jiang
Authored: Wed Feb 26 10:11:58 2014 +0800
Committer: Willem Jiang
Committed: Wed Feb 26 10:11:58 2014 +0800
--
.../java/org/apache/camel/converter/NIOConverter.java | 2 +-
.../org/apache/camel/converter/NIOConverterTest.java | 14 ++
2 files changed, 15 insertions(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/camel/blob/18c23fa8/camel-core/src/main/java/org/apache/camel/converter/NIOConverter.java
--
diff --git
a/camel-core/src/main/java/org/apache/camel/converter/NIOConverter.java
b/camel-core/src/main/java/org/apache/camel/converter/NIOConverter.java
index 41273b6..e1cf6d6 100644
--- a/camel-core/src/main/java/org/apache/camel/converter/NIOConverter.java
+++ b/camel-core/src/main/java/org/apache/camel/converter/NIOConverter.java
@@ -54,7 +54,7 @@ public final class NIOConverter {
@Converter
public static String toString(ByteBuffer buffer, Exchange exchange) throws
IOException {
-return IOConverter.toString(buffer.array(), exchange);
+return IOConverter.toString(toByteArray(buffer), exchange);
}
@Converter
http://git-wip-us.apache.org/repos/asf/camel/blob/18c23fa8/camel-core/src/test/java/org/apache/camel/converter/NIOConverterTest.java
--
diff --git
a/camel-core/src/test/java/org/apache/camel/converter/NIOConverterTest.java
b/camel-core/src/test/java/org/apache/camel/converter/NIOConverterTest.java
index bcd423b..8e02529 100644
--- a/camel-core/src/test/java/org/apache/camel/converter/NIOConverterTest.java
+++ b/camel-core/src/test/java/org/apache/camel/converter/NIOConverterTest.java
@@ -55,6 +55,20 @@ public class NIOConverterTest extends ContextTestSupport {
assertNotNull(out);
assertEquals("Hello", out);
}
+
+/**
+ * ToString need to deal the array size issue as ToByteArray does
+ */
+public void testByteBufferToStringConversion() throws Exception {
+String str = "123456789";
+ByteBuffer buffer = ByteBuffer.allocate(16);
+buffer.put(str.getBytes());
+buffer.flip();
+
+String out = NIOConverter.toString(buffer, null);
+assertEquals(str, out);
+}
+
public void testToByteBuffer() {
ByteBuffer bb = NIOConverter.toByteBuffer("Hello".getBytes());
svn commit: r899208 - in /websites/production/camel/content: ./ 2014/02/26/ cache/
Author: buildbot
Date: Wed Feb 26 01:21:48 2014
New Revision: 899208
Log:
Production update by buildbot for camel
Added:
websites/production/camel/content/2014/02/26/
websites/production/camel/content/2014/02/26/apache-camel-2123-released.html
websites/production/camel/content/cache/main.pageCache (with props)
Modified:
websites/production/camel/content/book-component-appendix.html
websites/production/camel/content/book-in-one-page.html
websites/production/camel/content/book-tutorials.html
websites/production/camel/content/camel-30-ideas.html
websites/production/camel/content/camel-jmx.html
websites/production/camel/content/cxf.html
websites/production/camel/content/index.html
websites/production/camel/content/news.html
websites/production/camel/content/scala-dsl-eip.html
websites/production/camel/content/tutorial-axis-camel.html
websites/production/camel/content/tutorial-jmsremoting.html
websites/production/camel/content/user-guide.html
Added:
websites/production/camel/content/2014/02/26/apache-camel-2123-released.html
==
---
websites/production/camel/content/2014/02/26/apache-camel-2123-released.html
(added)
+++
websites/production/camel/content/2014/02/26/apache-camel-2123-released.html
Wed Feb 26 01:21:48 2014
@@ -0,0 +1,147 @@
+http://www.w3.org/TR/html4/loose.dtd";>
+
+
+
+
+
+
+
+
+
+
+
+
+ .maincontent { overflow:hidden; }
+
+
+
+
+
+
+Apache Camel: Apache Camel 2.12.3 released
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+http://camel.apache.org/";>Camel
+http://www.apache.org";>Apache
+
+
+
+
+
+
+Apache
Camel > 2014 > 02 > 26 > Apache Camel 2.12.3 released
+
+
+Download
| JavaDoc | Source | Forums | Support
+
+
+
+
+
+
+
+The Camel community announces the
immediate availability of the new patch release Camel 2.12.3. This release
contains a total of 140 fixes applied in the past 3 months by the community on
the Camel 2.12.x maintenance branch.The artifacts are published and
ready for you to http://camel.apache.org/download.html";>download either from the
Apache mirrors or from the Central Maven repository. For more details please
take a look at the https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12311211&version=12325593";>release
notes.Many thanks to all who made this release possible.On
behalf of the Camel PMC,Willem
+
+
+
+
+
+OverviewHomeDownloadGetting StartedFAQDocumentationUser
GuideManualBooksTutorialsExamplesCookbookArchitectureEnterprise
Integration PatternsDSLComponentsData FormatLanguagesSecuritySecurity AdvisoriesSearchhttp://www.google.com/cse";>
+
+
+
+
+
+
+
+http://www.google.com/coop/cse/brand?form=cse-search-box&lang=en";>CommunitySupportContributingDiscussion ForumsMailing ListsUser StoriesNewsArticlesSiteTeamhttp://camel-extra.googlecode.com/"; rel="nofollow">Camel
ExtraDevelopersDeveloper Guideshape="rect" href="source.html">Sourcehref="building.html">Buildinghref="javadoc.html">JavaDochref="irc-room.html">IRC Roomid="Navigation-ApacheSoftwareFoundation">Apache Software Foundationclass="alternate">href="http://www.apache.org/licenses/";>Licenseclass="external-link"
>href="http://www.apache.org/foundation/sponsorship.html";>Sponsorship shape="rect" class="external-link"
>href="http://www.apache.org/foundation/thanks.html";>Thanksshape="rect" class="external-link"
>href="http://www.apache.org/security/";>Security
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+Privacy Policy -
+(https://cwiki.apache.org/confluence/pages/editpage.action?pageId=39621183";>edit
page)
+(https://cwiki.apache.org/confluence/pages/viewpage.action?pageId=39621183&showComments=true&showCommentArea=true#addcomment";>add
comment)
+
+
+
+
+
+
+
+© 2004-2011 The Apache Software Foundation.
+
+Apache Camel, Camel, Apache, the Apache feather logo, and the Apache Camel
project logo are trademarks of The Apache Software Foundation. All other marks
mentioned may be trademarks or registered trademarks of their respective owners.
+
+http://hiramchirino.com";>Graphic Design By Hiram
+
+
+
+
+
+ var _gaq = _gaq || [];
+ _gaq.push(['_setAccount', 'UA-25976253-1']);
+ _gaq.push(['_trackPageview']);
+
+ (function() {
+var ga = document.createElement('script'); ga.type = 'text/javascript';
ga.async = true;
+ga.src = ('https:' == document.location.protocol ? 'https://ssl' :
'http://www') + '.google-
[CONF] Apache Camel > Apache Camel 2.12.3 released
willem jiang wrote a blog post: Apache Camel 2.12.3 released The Camel community announces the immediate availability of the new patch release Camel 2.12.3. This release contains a total of 140 fixes applied in the past 3 months by the community on the Camel 2.12.x maintenance branch. The artifacts are published and ready for you to download either from the Apache mirrors or from the Central Maven repository. For more details please take a look at the release notes. Many thanks to all who made this release possible. On behalf of the Camel PMC, Willem View Online · Like Stop watching space · Manage Notifications This message was sent by Atlassian Confluence 5.0.3, Team Collaboration Software
svn commit: r899205 - /websites/production/camel/content/cache/main.pageCache
Author: ningjiang Date: Wed Feb 26 00:49:10 2014 New Revision: 899205 Log: Reexport the whole Apache Camel websit Removed: websites/production/camel/content/cache/main.pageCache
git commit: We don't allow for file appending when using either tempPrefix ord tempFileName
Repository: camel
Updated Branches:
refs/heads/camel-2.12.x 5b555aaa0 -> b493aa973
We don't allow for file appending when using either tempPrefix ord tempFileName
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/b493aa97
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/b493aa97
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/b493aa97
Branch: refs/heads/camel-2.12.x
Commit: b493aa9730ebab1e7cc0d33cd65b90f68839e2e9
Parents: 5b555aa
Author: Jonathan Anstey
Authored: Tue Feb 25 14:38:30 2014 -0330
Committer: Jonathan Anstey
Committed: Tue Feb 25 14:39:05 2014 -0330
--
.../java/org/apache/camel/component/file/FileEndpoint.java | 6 +++---
.../component/file/FileProducerTempFileExistsIssueTest.java | 9 -
2 files changed, 11 insertions(+), 4 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/camel/blob/b493aa97/camel-core/src/main/java/org/apache/camel/component/file/FileEndpoint.java
--
diff --git
a/camel-core/src/main/java/org/apache/camel/component/file/FileEndpoint.java
b/camel-core/src/main/java/org/apache/camel/component/file/FileEndpoint.java
index a3d1256..21f7fdb 100644
--- a/camel-core/src/main/java/org/apache/camel/component/file/FileEndpoint.java
+++ b/camel-core/src/main/java/org/apache/camel/component/file/FileEndpoint.java
@@ -101,9 +101,9 @@ public class FileEndpoint extends GenericFileEndpoint
{
public GenericFileProducer createProducer() throws Exception {
ObjectHelper.notNull(operations, "operations");
-// you cannot use temp prefix and file exists append
-if (getFileExist() == GenericFileExist.Append && getTempPrefix() !=
null) {
-throw new IllegalArgumentException("You cannot set both
fileExist=Append and tempPrefix options");
+// you cannot use temp file and file exists append
+if (getFileExist() == GenericFileExist.Append && ((getTempPrefix() !=
null) || (getTempFileName() != null))) {
+throw new IllegalArgumentException("You cannot set both
fileExist=Append and tempPrefix/tempFileName options");
}
// ensure fileExist and moveExisting is configured correctly if in use
http://git-wip-us.apache.org/repos/asf/camel/blob/b493aa97/camel-core/src/test/java/org/apache/camel/component/file/FileProducerTempFileExistsIssueTest.java
--
diff --git
a/camel-core/src/test/java/org/apache/camel/component/file/FileProducerTempFileExistsIssueTest.java
b/camel-core/src/test/java/org/apache/camel/component/file/FileProducerTempFileExistsIssueTest.java
index 972583c..fe1ebd5 100644
---
a/camel-core/src/test/java/org/apache/camel/component/file/FileProducerTempFileExistsIssueTest.java
+++
b/camel-core/src/test/java/org/apache/camel/component/file/FileProducerTempFileExistsIssueTest.java
@@ -43,7 +43,14 @@ public class FileProducerTempFileExistsIssueTest extends
ContextTestSupport {
context.getEndpoint("file://target/tempprefix?fileExist=Append&tempPrefix=foo").createProducer();
fail("Should have thrown exception");
} catch (IllegalArgumentException e) {
-assertEquals("You cannot set both fileExist=Append and tempPrefix
options", e.getMessage());
+assertEquals("You cannot set both fileExist=Append and
tempPrefix/tempFileName options", e.getMessage());
+}
+
+try {
+
context.getEndpoint("file://target/tempprefix?fileExist=Append&tempFileName=foo").createProducer();
+fail("Should have thrown exception");
+} catch (IllegalArgumentException e) {
+assertEquals("You cannot set both fileExist=Append and
tempPrefix/tempFileName options", e.getMessage());
}
}
git commit: We don't allow for file appending when using either tempPrefix ord tempFileName
Repository: camel
Updated Branches:
refs/heads/master 77bbb6e27 -> 92200b5f8
We don't allow for file appending when using either tempPrefix ord tempFileName
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/92200b5f
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/92200b5f
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/92200b5f
Branch: refs/heads/master
Commit: 92200b5f8c9c312b7b0797db308a9ed6318cb0fa
Parents: 77bbb6e
Author: Jonathan Anstey
Authored: Tue Feb 25 14:38:30 2014 -0330
Committer: Jonathan Anstey
Committed: Tue Feb 25 14:38:30 2014 -0330
--
.../java/org/apache/camel/component/file/FileEndpoint.java | 6 +++---
.../component/file/FileProducerTempFileExistsIssueTest.java | 9 -
2 files changed, 11 insertions(+), 4 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/camel/blob/92200b5f/camel-core/src/main/java/org/apache/camel/component/file/FileEndpoint.java
--
diff --git
a/camel-core/src/main/java/org/apache/camel/component/file/FileEndpoint.java
b/camel-core/src/main/java/org/apache/camel/component/file/FileEndpoint.java
index a3d1256..21f7fdb 100644
--- a/camel-core/src/main/java/org/apache/camel/component/file/FileEndpoint.java
+++ b/camel-core/src/main/java/org/apache/camel/component/file/FileEndpoint.java
@@ -101,9 +101,9 @@ public class FileEndpoint extends GenericFileEndpoint
{
public GenericFileProducer createProducer() throws Exception {
ObjectHelper.notNull(operations, "operations");
-// you cannot use temp prefix and file exists append
-if (getFileExist() == GenericFileExist.Append && getTempPrefix() !=
null) {
-throw new IllegalArgumentException("You cannot set both
fileExist=Append and tempPrefix options");
+// you cannot use temp file and file exists append
+if (getFileExist() == GenericFileExist.Append && ((getTempPrefix() !=
null) || (getTempFileName() != null))) {
+throw new IllegalArgumentException("You cannot set both
fileExist=Append and tempPrefix/tempFileName options");
}
// ensure fileExist and moveExisting is configured correctly if in use
http://git-wip-us.apache.org/repos/asf/camel/blob/92200b5f/camel-core/src/test/java/org/apache/camel/component/file/FileProducerTempFileExistsIssueTest.java
--
diff --git
a/camel-core/src/test/java/org/apache/camel/component/file/FileProducerTempFileExistsIssueTest.java
b/camel-core/src/test/java/org/apache/camel/component/file/FileProducerTempFileExistsIssueTest.java
index 972583c..fe1ebd5 100644
---
a/camel-core/src/test/java/org/apache/camel/component/file/FileProducerTempFileExistsIssueTest.java
+++
b/camel-core/src/test/java/org/apache/camel/component/file/FileProducerTempFileExistsIssueTest.java
@@ -43,7 +43,14 @@ public class FileProducerTempFileExistsIssueTest extends
ContextTestSupport {
context.getEndpoint("file://target/tempprefix?fileExist=Append&tempPrefix=foo").createProducer();
fail("Should have thrown exception");
} catch (IllegalArgumentException e) {
-assertEquals("You cannot set both fileExist=Append and tempPrefix
options", e.getMessage());
+assertEquals("You cannot set both fileExist=Append and
tempPrefix/tempFileName options", e.getMessage());
+}
+
+try {
+
context.getEndpoint("file://target/tempprefix?fileExist=Append&tempFileName=foo").createProducer();
+fail("Should have thrown exception");
+} catch (IllegalArgumentException e) {
+assertEquals("You cannot set both fileExist=Append and
tempPrefix/tempFileName options", e.getMessage());
}
}
git commit: [CAMEL-7240] ThreadsProcessor now resolves RejectedPolicy from the referenced ThreadPoolProfile.
Repository: camel
Updated Branches:
refs/heads/master 2b7161c74 -> 77bbb6e27
[CAMEL-7240] ThreadsProcessor now resolves RejectedPolicy from the referenced
ThreadPoolProfile.
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/77bbb6e2
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/77bbb6e2
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/77bbb6e2
Branch: refs/heads/master
Commit: 77bbb6e2783cb552fb735ce6caeb711bec8eb472
Parents: 2b7161c
Author: Henryk Konsek
Authored: Tue Feb 25 17:53:36 2014 +0100
Committer: Henryk Konsek
Committed: Tue Feb 25 17:53:36 2014 +0100
--
.../java/org/apache/camel/model/ThreadsDefinition.java | 12 +++-
1 file changed, 11 insertions(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/camel/blob/77bbb6e2/camel-core/src/main/java/org/apache/camel/model/ThreadsDefinition.java
--
diff --git
a/camel-core/src/main/java/org/apache/camel/model/ThreadsDefinition.java
b/camel-core/src/main/java/org/apache/camel/model/ThreadsDefinition.java
index 5b725f7..6de5417 100644
--- a/camel-core/src/main/java/org/apache/camel/model/ThreadsDefinition.java
+++ b/camel-core/src/main/java/org/apache/camel/model/ThreadsDefinition.java
@@ -104,7 +104,7 @@ public class ThreadsDefinition extends
OutputDefinition imple
} else {
thread.setCallerRunsWhenRejected(getCallerRunsWhenRejected());
}
-thread.setRejectedPolicy(getRejectedPolicy());
+thread.setRejectedPolicy(resolveRejectedPolicy(routeContext));
List pipe = new ArrayList(2);
pipe.add(thread);
@@ -119,6 +119,16 @@ public class ThreadsDefinition extends
OutputDefinition imple
};
}
+protected ThreadPoolRejectedPolicy resolveRejectedPolicy(RouteContext
routeContext) {
+if (getExecutorServiceRef() != null && getRejectedPolicy() == null) {
+ThreadPoolProfile threadPoolProfile =
routeContext.getCamelContext().getExecutorServiceManager().getThreadPoolProfile(getExecutorServiceRef());
+if (threadPoolProfile != null) {
+return threadPoolProfile.getRejectedPolicy();
+}
+}
+return getRejectedPolicy();
+}
+
@Override
public String getLabel() {
return "threads";
git commit: Merged pull request #102. Added missing closing single quote and bracket. Thanks Blondacz for contribution.
Repository: camel
Updated Branches:
refs/heads/master 91e60d54b -> 2b7161c74
Merged pull request #102. Added missing closing single quote and bracket.
Thanks Blondacz for contribution.
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/2b7161c7
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/2b7161c7
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/2b7161c7
Branch: refs/heads/master
Commit: 2b7161c7433b75f58de987ff6d04ec00b91706f8
Parents: 91e60d5
Author: Henryk Konsek
Authored: Tue Feb 25 17:10:57 2014 +0100
Committer: Henryk Konsek
Committed: Tue Feb 25 17:10:57 2014 +0100
--
.../java/org/apache/camel/example/restlet/jdbc/MyRouteConfig.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/camel/blob/2b7161c7/examples/camel-example-restlet-jdbc/src/main/java/org/apache/camel/example/restlet/jdbc/MyRouteConfig.java
--
diff --git
a/examples/camel-example-restlet-jdbc/src/main/java/org/apache/camel/example/restlet/jdbc/MyRouteConfig.java
b/examples/camel-example-restlet-jdbc/src/main/java/org/apache/camel/example/restlet/jdbc/MyRouteConfig.java
index 8808029..689e909 100644
---
a/examples/camel-example-restlet-jdbc/src/main/java/org/apache/camel/example/restlet/jdbc/MyRouteConfig.java
+++
b/examples/camel-example-restlet-jdbc/src/main/java/org/apache/camel/example/restlet/jdbc/MyRouteConfig.java
@@ -24,7 +24,7 @@ public class MyRouteConfig extends RouteBuilder {
@Override
public void configure() {
from("restlet:/persons?restletMethod=POST")
-.setBody(simple("insert into person(firstName, lastName)
values('${header.firstName}','${header.lastName}"))
+.setBody(simple("insert into person(firstName, lastName)
values('${header.firstName}','${header.lastName}')"))
.to("jdbc:dataSource")
.setBody(simple("select * from person where id in (select
max(id) from person)"))
.to("jdbc:dataSource");
svn commit: r899164 [4/6] - in /websites/production/camel/content: ./ 2010/05/26/ 2014/02/ 2014/02/25/ cache/
Modified: websites/production/camel/content/book-tutorials.html == --- websites/production/camel/content/book-tutorials.html (original) +++ websites/production/camel/content/book-tutorials.html Tue Feb 25 15:22:16 2014 @@ -166,11 +166,11 @@ While not actual tutorials you might fin This tutorial aims to guide the reader through the stages of creating a project which uses Camel to facilitate the routing of messages from a JMS queue to a http://www.springramework.org"; rel="nofollow">Spring service. The route works in a synchronous fashion returning a response to the client. /**/ +/*]]>*/ Tutorial on Spring Remoting with JMSPrefacePrerequisitesDistributionAboutCreate the Camel Project Update the POM with Dependencies Writing the Server @@ -2511,11 +2511,11 @@ So we completed the last piece in the pi /**/ +/*]]>*/ Tutorial using Axis 1.4 with Apache Camel PrerequisitesDistributionIntroductionSetting up the project to run Axis Maven 2wsdlConfiguring AxisRunning the Example Added: websites/production/camel/content/cache/main.pageCache == Binary file - no diff available. Propchange: websites/production/camel/content/cache/main.pageCache -- svn:mime-type = application/octet-stream Modified: websites/production/camel/content/camel-230-release.html == --- websites/production/camel/content/camel-230-release.html (original) +++ websites/production/camel/content/camel-230-release.html Tue Feb 25 15:22:16 2014 @@ -105,7 +105,7 @@ camel-nagios for sending passive checks to http://nagios.org"; rel="nofollow">Nagiosproperties for using property placeholders to resolve endpoint uris.camel-gae extensions gauth component for implementing http://code.google.com/apis/accounts/docs/OAuth.html"; rel="nofollow">OAuth consumers.glogin component for programmatic login to Google App Engine applications from Java clients. - camel-hawtdb as persistent store for the Aggregator EIP.camel-netty for working with TCP and UDP protocols using Java NIO based capabilities offered by the JBoss Netty.camel-exec for executing system commandscamel-bean-validator performs bean validation of the message body using the Java Bean Validation API (http://jcp.org/en/jsr/detail?id=303"; rel="nofollow">JSR 303).camel-spring-security support to integrate the http://static.springsource.org/spring-security/site/index.html"; rel="nofollow">spring security with Camel.camel-crypto using Camel cryptographic endpoints and Java's Cryptographic extension it is easy to create Digital Signatures for Exchanges.camel-eclipse for using Camel with Eclipse RCP. + camel-hawtdb as persistent store for the Aggregator EIP.camel-netty for working with TCP and UDP protocols using Java NIO based capabilities offered by the JBoss Netty.camel-exec for executing system commandscamel-bean-validator performs bean validation of the message body using the Java Bean Validation API (http://jcp.org/en/jsr/detail?id=303"; rel="nofollow">JSR 303).camel-spring-security support to integrate the http://static.springsource.org/spring-security/site/index.html"; rel="nofollow">spring security with Camel.camel-crypto using Camel cryptographic endpoints and Java's Cryptographic extension it is > easy to create Digital Signatures for href="exchange.html">Exchanges. href="camel-eclipse.html">camel-eclipse for using Camel with Eclipse > RCP. New DSL Modified: websites/production/camel/content/camel-30-ideas.html == --- websites/production/camel/content/camel-30-ideas.html (original) +++ websites/production/camel/content/camel-30-ideas.html Tue Feb 25 15:22:16 2014 @@ -109,11 +109,11 @@ /*
svn commit: r899164 [1/6] - in /websites/production/camel/content: ./ 2010/05/26/ 2014/02/ 2014/02/25/ cache/
Author: buildbot
Date: Tue Feb 25 15:22:16 2014
New Revision: 899164
Log:
Production update by buildbot for camel
Added:
websites/production/camel/content/2014/02/
websites/production/camel/content/2014/02/25/
websites/production/camel/content/2014/02/25/apache-camel-2114-released.html
websites/production/camel/content/cache/main.pageCache (with props)
Modified:
websites/production/camel/content/2010/05/26/camel-230-released.html
websites/production/camel/content/book-architecture.html
websites/production/camel/content/book-component-appendix.html
websites/production/camel/content/book-in-one-page.html
websites/production/camel/content/book-tutorials.html
websites/production/camel/content/camel-230-release.html
websites/production/camel/content/camel-30-ideas.html
websites/production/camel/content/camel-jmx.html
websites/production/camel/content/component-list-grouped.html
websites/production/camel/content/component-list.html
websites/production/camel/content/component.html
websites/production/camel/content/components.html
websites/production/camel/content/cxf.html
websites/production/camel/content/index.html
websites/production/camel/content/news.html
websites/production/camel/content/scala-dsl-eip.html
websites/production/camel/content/siteindex.html
websites/production/camel/content/sitemap.html
websites/production/camel/content/transport.html
websites/production/camel/content/tutorial-axis-camel.html
websites/production/camel/content/tutorial-jmsremoting.html
websites/production/camel/content/uris.html
websites/production/camel/content/user-guide.html
websites/production/camel/content/xml-reference.html
Modified: websites/production/camel/content/2010/05/26/camel-230-released.html
==
--- websites/production/camel/content/2010/05/26/camel-230-released.html
(original)
+++ websites/production/camel/content/2010/05/26/camel-230-released.html Tue
Feb 25 15:22:16 2014
@@ -85,7 +85,7 @@
Also notable is the number of new components added to this release:
camel-nagios for
sending passive checks to http://nagios.org"; rel="nofollow">Nagiosproperties for using property placeholders
to resolve endpoint uris.camel-gae extensions
gauth component
for implementing http://code.google.com/apis/accounts/docs/OAuth.html";
rel="nofollow">OAuth consumers.glogin component for programmatic login to
Google App Engine applications from Java clients.
- camel-hawtdb
as persistent store for the Aggregator EIP.camel-netty for working with TCP and UDP
protocols using Java NIO based capabilities offered by the JBoss
Netty.camel-exec for
executing system commandscamel-bean-validator performs bean
validation of the message body using the Java Bean Validation API (http://jcp.org/en/jsr/detail?id=303";
rel="nofollow">JSR 303).camel-spring-security support to
integrate the http://static.springsource.org/spring-security/site/index.html";
rel="nofollow">spring security with Camel.camel-crypto using Camel
cryptographic endpoints and Java's Cryptographic extension it is easy to create
Digital Signatures for Exchanges.camel-eclipse for using Camel with
Eclipse RCP.
+ camel-hawtdb
as persistent store for the Aggregator EIP.camel-netty for working with TCP and UDP
protocols using Java NIO based capabilities offered by the JBoss
Netty.camel-exec for
executing system commandscamel-bean-validator performs bean
validation of the message body using the Java Bean Validation API (http://jcp.org/en/jsr/detail?id=303";
rel="nofollow">JSR 303).camel-spring-security support to
integrate the http://static.springsource.org/spring-security/site/index.html";
rel="nofollow">spring security with Camel.camel-crypto using Camel
cryptographic endpoints and Java's Cryptographic extension it is easy to create
Digital Signatures for Exchanges.camel-eclipse for using Camel with
Eclipse RCP.
As usual, a lot of fixes and enhancement of the 90+ Components
Added:
websites/production/camel/content/2014/02/25/apache-camel-2114-released.html
==
---
websites/production/camel/content/2014/02/25/apache-camel-2114-released.html
(added)
+++
websites/production/camel/content/2014/02/25/apache-camel-2114-released.html
Tue Feb 25 15:22:16 2014
@@ -0,0 +1,147 @@
+http://www.w3.org/TR/html4/loose.dtd";>
+
+
+
+
+
+
+
+
+
+
+
+
+ .maincontent { overflow:hidden; }
+
+
+
+
+
+
+Apache Camel: Apache Camel 2.11.4 Released
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+http://camel.apache.org/";>Camel
+http://www.apache.org";>Apache
+
+
+
+
+
+
+Apache
Camel > 2014 > 02 > 25 > Apache Camel 2.11.4 Released
+
[CONF] Apache Camel > Apache Camel 2.11.4 Released
Hadrian Zbarcea wrote a blog post: Apache Camel 2.11.4 Released The Camel community announces the immediate availability of the new patch release Camel 2.11.4. Coming some 4 weeks after the 2.11.3 release, this 2.11.4 path release contains a total of 26 fixes applied in the past month by the community on the Camel 2.11.x maintenance branch. The artifacts are published and ready for you to download either from the Apache mirrors or from the Central Maven repository. For more details please take a look at the release notes. Many thanks to all who made this release possible. On behalf of the Camel PMC,Hadrian View Online · Like Stop watching space · Manage Notifications This message was sent by Atlassian Confluence 5.0.3, Team Collaboration Software
svn commit: r899162 - /websites/production/camel/content/cache/main.pageCache
Author: hadrian Date: Tue Feb 25 15:12:49 2014 New Revision: 899162 Log: Force publish the site after announcement of camel 2.11.4 Removed: websites/production/camel/content/cache/main.pageCache
svn commit: r899143 - in /websites/production/camel/content: amqp.html cache/main.pageCache
Author: buildbot Date: Tue Feb 25 13:18:53 2014 New Revision: 899143 Log: Production update by buildbot for camel Modified: websites/production/camel/content/amqp.html websites/production/camel/content/cache/main.pageCache Modified: websites/production/camel/content/amqp.html == --- websites/production/camel/content/amqp.html (original) +++ websites/production/camel/content/amqp.html Tue Feb 25 13:18:53 2014 @@ -85,37 +85,17 @@ -AMQP - - -Available as of Camel X.X - -The amqp: component supports the http://www.amqp.org/"; rel="nofollow">AMQP protocol using the Client API of the http://qpid.apache.org/";>Qpid project. - -Maven users will need to add the following dependency to their pom.xml for this component: - -AMQP
Available as of Camel X.X
The amqp: component supports the http://www.amqp.org/"; rel="nofollow">AMQP protocol using the Client API of the http://qpid.apache.org/";>Qpid project. In case you want to use AMQP with RabbitMQ you might also be interested in the Camel RabbitMQ component.
Maven users will need to add the following dependency to their
pom.xmlfor this component:+