git commit: merged commit 247ced1dcb787db2faf325e253f9af8907581881 - Change to just generate an HTML manual
Updated Branches:
refs/heads/camel-2.11.x cc54c81f2 - f2f1d1d36
merged commit 247ced1dcb787db2faf325e253f9af8907581881 - Change to just
generate an HTML manual
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/f2f1d1d3
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/f2f1d1d3
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/f2f1d1d3
Branch: refs/heads/camel-2.11.x
Commit: f2f1d1d361db314f0b1349b85daf7df519bb6298
Parents: cc54c81
Author: Daniel Kulp dk...@apache.org
Authored: Fri Jun 28 14:29:00 2013 -0400
Committer: cmueller cmuel...@apache.org
Committed: Sun Jun 30 23:47:06 2013 +0200
--
apache-camel/src/main/descriptors/unix-bin.xml | 1 -
.../src/main/descriptors/windows-bin.xml| 1 -
tooling/camel-manual/pom.xml| 90 +++--
.../apache/camel/manual/ManualGenerator.java| 190 +++
tooling/maven/maven-html-to-pdf/pom.xml | 56 ---
.../org/apache/camel/maven/HtmlToPdfMojo.java | 342 ---
.../src/main/resources/META-INF/LICENSE.txt | 203 ---
.../src/main/resources/META-INF/NOTICE.txt | 12 -
tooling/maven/pom.xml | 1 -
9 files changed, 244 insertions(+), 652 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/camel/blob/f2f1d1d3/apache-camel/src/main/descriptors/unix-bin.xml
--
diff --git a/apache-camel/src/main/descriptors/unix-bin.xml
b/apache-camel/src/main/descriptors/unix-bin.xml
index 9972b11..ce0850e 100644
--- a/apache-camel/src/main/descriptors/unix-bin.xml
+++ b/apache-camel/src/main/descriptors/unix-bin.xml
@@ -60,7 +60,6 @@
directory${basedir}/../tooling/camel-manual/target/site/manual//directory
outputDirectory/doc/manual/outputDirectory
includes
-include*.pdf/include
include*.html/include
/includes
/fileSet
http://git-wip-us.apache.org/repos/asf/camel/blob/f2f1d1d3/apache-camel/src/main/descriptors/windows-bin.xml
--
diff --git a/apache-camel/src/main/descriptors/windows-bin.xml
b/apache-camel/src/main/descriptors/windows-bin.xml
index 2517c7d..d088456 100644
--- a/apache-camel/src/main/descriptors/windows-bin.xml
+++ b/apache-camel/src/main/descriptors/windows-bin.xml
@@ -60,7 +60,6 @@
directory${basedir}/../tooling/camel-manual/target/site/manual//directory
outputDirectory/doc/manual/outputDirectory
includes
-include*.pdf/include
include*.html/include
/includes
/fileSet
http://git-wip-us.apache.org/repos/asf/camel/blob/f2f1d1d3/tooling/camel-manual/pom.xml
--
diff --git a/tooling/camel-manual/pom.xml b/tooling/camel-manual/pom.xml
index 84066eb..1f38502 100644
--- a/tooling/camel-manual/pom.xml
+++ b/tooling/camel-manual/pom.xml
@@ -27,46 +27,65 @@
/parent
artifactIdcamel-manual/artifactId
- packagingpom/packaging
+ packagingjar/packaging
nameCamel :: Manual/name
descriptionThe Camel Manual which generates a HTML and PDF representation
of the manual./description
+ dependencies
+ dependency
+ groupIdorg.ccil.cowan.tagsoup/groupId
+ artifactIdtagsoup/artifactId
+ /dependency
+ /dependencies
+
build
plugins
- plugin
-groupIdorg.apache.camel/groupId
-artifactIdmaven-html-to-pdf/artifactId
-version${project.version}/version
-executions
- execution
-goals
- goalcompile/goal
-/goals
-phasecompile/phase
- /execution
-/executions
-configuration
- pagehttp://camel.apache.org/book-in-one-page.html/page
- contentDivClasswiki-content maincontent/contentDivClass
- head![CDATA[
- link href=file:${basedir}/src/styles/print.css
rel=stylesheet type=text/css /
- style type=text/css
-@page :left {
- @top-left {
-content: Apache Camel ${project.version} Developer's
Manual;
- }
-}
- /style
- ]]/head
- replaceToken![CDATA[
- h3 id=replaceme.*/h3
- ]]/replaceToken
- replaceValue![CDATA[
- h3Version ${project.version}/h3
- ]]/replaceValue
-
transformerFactoryClassNameorg.apache.xalan.xsltc.trax.TransformerFactoryImpl/transformerFactoryClassName
-/configuration
- /plugin
+plugin
+groupIdorg.codehaus.mojo/groupId
+artifactIdexec-maven-plugin/artifactId
+version1.2.1/version
+executions
git commit: merged commit f2f1d1d361db314f0b1349b85daf7df519bb6298 - Change to just generate an HTML manual
Updated Branches:
refs/heads/camel-2.10.x 31a58ba18 - 50bdeac60
merged commit f2f1d1d361db314f0b1349b85daf7df519bb6298 - Change to just
generate an HTML manual
Conflicts:
tooling/maven/maven-html-to-pdf/pom.xml
tooling/maven/maven-html-to-pdf/src/main/java/org/apache/camel/maven/HtmlToPdfMojo.java
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/50bdeac6
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/50bdeac6
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/50bdeac6
Branch: refs/heads/camel-2.10.x
Commit: 50bdeac603fc481ecd12cd5c94b70a85063c1fa6
Parents: 31a58ba
Author: Daniel Kulp dk...@apache.org
Authored: Fri Jun 28 14:29:00 2013 -0400
Committer: cmueller cmuel...@apache.org
Committed: Sun Jun 30 23:53:39 2013 +0200
--
apache-camel/src/main/descriptors/unix-bin.xml | 1 -
.../src/main/descriptors/windows-bin.xml| 1 -
tooling/camel-manual/pom.xml| 90 +++--
.../apache/camel/manual/ManualGenerator.java| 190 +++
tooling/maven/maven-html-to-pdf/pom.xml | 59
.../org/apache/camel/maven/HtmlToPdfMojo.java | 342 ---
.../src/main/resources/META-INF/LICENSE.txt | 203 ---
.../src/main/resources/META-INF/NOTICE.txt | 12 -
tooling/maven/pom.xml | 1 -
9 files changed, 244 insertions(+), 655 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/camel/blob/50bdeac6/apache-camel/src/main/descriptors/unix-bin.xml
--
diff --git a/apache-camel/src/main/descriptors/unix-bin.xml
b/apache-camel/src/main/descriptors/unix-bin.xml
index 9972b11..ce0850e 100644
--- a/apache-camel/src/main/descriptors/unix-bin.xml
+++ b/apache-camel/src/main/descriptors/unix-bin.xml
@@ -60,7 +60,6 @@
directory${basedir}/../tooling/camel-manual/target/site/manual//directory
outputDirectory/doc/manual/outputDirectory
includes
-include*.pdf/include
include*.html/include
/includes
/fileSet
http://git-wip-us.apache.org/repos/asf/camel/blob/50bdeac6/apache-camel/src/main/descriptors/windows-bin.xml
--
diff --git a/apache-camel/src/main/descriptors/windows-bin.xml
b/apache-camel/src/main/descriptors/windows-bin.xml
index 2517c7d..d088456 100644
--- a/apache-camel/src/main/descriptors/windows-bin.xml
+++ b/apache-camel/src/main/descriptors/windows-bin.xml
@@ -60,7 +60,6 @@
directory${basedir}/../tooling/camel-manual/target/site/manual//directory
outputDirectory/doc/manual/outputDirectory
includes
-include*.pdf/include
include*.html/include
/includes
/fileSet
http://git-wip-us.apache.org/repos/asf/camel/blob/50bdeac6/tooling/camel-manual/pom.xml
--
diff --git a/tooling/camel-manual/pom.xml b/tooling/camel-manual/pom.xml
index 744f0c0..8d4df1a 100644
--- a/tooling/camel-manual/pom.xml
+++ b/tooling/camel-manual/pom.xml
@@ -28,46 +28,65 @@
/parent
artifactIdcamel-manual/artifactId
- packagingpom/packaging
+ packagingjar/packaging
nameCamel :: Manual/name
descriptionThe Camel Manual which generates a HTML and PDF representation
of the manual./description
+ dependencies
+ dependency
+ groupIdorg.ccil.cowan.tagsoup/groupId
+ artifactIdtagsoup/artifactId
+ /dependency
+ /dependencies
+
build
plugins
- plugin
-groupIdorg.apache.camel/groupId
-artifactIdmaven-html-to-pdf/artifactId
-version${project.version}/version
-executions
- execution
-goals
- goalcompile/goal
-/goals
-phasecompile/phase
- /execution
-/executions
-configuration
- pagehttp://camel.apache.org/book-in-one-page.html/page
- contentDivClasswiki-content maincontent/contentDivClass
- head![CDATA[
- link href=file:${basedir}/src/styles/print.css
rel=stylesheet type=text/css /
- style type=text/css
-@page :left {
- @top-left {
-content: Apache Camel ${project.version} Developer's
Manual;
- }
-}
- /style
- ]]/head
- replaceToken![CDATA[
- h3 id=replaceme.*/h3
- ]]/replaceToken
- replaceValue![CDATA[
- h3Version ${project.version}/h3
- ]]/replaceValue
-
transformerFactoryClassNameorg.apache.xalan.xsltc.trax.TransformerFactoryImpl/transformerFactoryClassName
-/configuration
- /plugin
+plugin
git commit: update the maven-release-plugin configuration to use our new Git repository
Updated Branches:
refs/heads/camel-2.11.x ace5a3adc - 13b0d4656
update the maven-release-plugin configuration to use our new Git repository
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/13b0d465
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/13b0d465
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/13b0d465
Branch: refs/heads/camel-2.11.x
Commit: 13b0d46561c26c0bbb9b97dbc0a7d5ec6da48d9a
Parents: ace5a3a
Author: cmueller cmuel...@apache.org
Authored: Sat Jun 29 11:53:35 2013 +0200
Committer: cmueller cmuel...@apache.org
Committed: Sat Jun 29 11:53:35 2013 +0200
--
pom.xml | 13 -
1 file changed, 8 insertions(+), 5 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/camel/blob/13b0d465/pom.xml
--
diff --git a/pom.xml b/pom.xml
index 9e436da..1f545db 100755
--- a/pom.xml
+++ b/pom.xml
@@ -123,9 +123,9 @@
/modules
scm
-
connectionscm:svn:https://svn.apache.org/repos/asf/camel/branches/camel-2.11.x/connection
-
developerConnectionscm:svn:https://svn.apache.org/repos/asf/camel/branches/camel-2.11.x/developerConnection
-urlhttp://svn.apache.org/viewvc/camel/branches/camel-2.11.x/url
+
connectionscm:git:http://git-wip-us.apache.org/repos/asf/camel.git/connection
+
developerConnectionscm:git:https://git-wip-us.apache.org/repos/asf/camel.git/developerConnection
+urlhttps://fisheye6.atlassian.com/browse/~br=camel-2.11.x/camel-git/url
/scm
build
@@ -198,9 +198,12 @@
plugin
groupIdorg.apache.maven.plugins/groupId
artifactIdmaven-release-plugin/artifactId
- version2.4/version
+ !-- see http://jira.codehaus.org/browse/MRELEASE-812 --
+ version2.4.1/version
configuration
-tagBasehttps://svn.apache.org/repos/asf/camel/tags/tagBase
+localCheckouttrue/localCheckout
+pushChangesfalse/pushChanges
+
tagNameFormat@{project.artifactId}-@{project.version}/tagNameFormat
useReleaseProfilefalse/useReleaseProfile
preparationGoalsclean install/preparationGoals
goalsdeploy/goals
git commit: fixed the issues reported by apache-rat-plugin
Updated Branches: refs/heads/camel-2.11.x 13b0d4656 - ed63d fixed the issues reported by apache-rat-plugin Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/ed63 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/ed63 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/ed63 Branch: refs/heads/camel-2.11.x Commit: ed63d241331a6047df7a9de4fa151f70f204 Parents: 13b0d46 Author: cmueller cmuel...@apache.org Authored: Sat Jun 29 12:17:06 2013 +0200 Committer: cmueller cmuel...@apache.org Committed: Sat Jun 29 12:17:06 2013 +0200 -- components/camel-ical/pom.xml | 17 + .../src/main/data/message.xml | 4 pom.xml| 1 + .../META-INF/m2e/lifecycle-mapping-metadata.xml| 17 + 4 files changed, 35 insertions(+), 4 deletions(-) -- http://git-wip-us.apache.org/repos/asf/camel/blob/ed63/components/camel-ical/pom.xml -- diff --git a/components/camel-ical/pom.xml b/components/camel-ical/pom.xml index 4f4c197..fc80201 100644 --- a/components/camel-ical/pom.xml +++ b/components/camel-ical/pom.xml @@ -1,3 +1,20 @@ +?xml version=1.0 encoding=UTF-8? +!-- + Licensed to the Apache Software Foundation (ASF) under one or more + contributor license agreements. See the NOTICE file distributed with + this work for additional information regarding copyright ownership. + The ASF licenses this file to You under the Apache License, Version 2.0 + (the License); you may not use this file except in compliance with + the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an AS IS BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +-- project xmlns=http://maven.apache.org/POM/4.0.0; xmlns:xsi=http://www.w3.org/2001/XMLSchema-instance; xsi:schemaLocation=http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd; http://git-wip-us.apache.org/repos/asf/camel/blob/ed63/examples/camel-example-management/src/main/data/message.xml -- diff --git a/examples/camel-example-management/src/main/data/message.xml b/examples/camel-example-management/src/main/data/message.xml deleted file mode 100644 index 4b8530d..000 --- a/examples/camel-example-management/src/main/data/message.xml +++ /dev/null @@ -1,4 +0,0 @@ -?xml version=1.0 encoding=UTF-8? -person -nameClaus/name -/person \ No newline at end of file http://git-wip-us.apache.org/repos/asf/camel/blob/ed63/pom.xml -- diff --git a/pom.xml b/pom.xml index 1f545db..4398294 100755 --- a/pom.xml +++ b/pom.xml @@ -191,6 +191,7 @@ exclude**/avro/**/*.avpr/exclude exclude**/OSGI-INF/bundle.info/exclude exclude**/test_rsa*/exclude +excludeexamples/*/src/data/**/*.xml/exclude /excludes /configuration /plugin http://git-wip-us.apache.org/repos/asf/camel/blob/ed63/tooling/maven/camel-package-maven-plugin/src/main/resources/META-INF/m2e/lifecycle-mapping-metadata.xml -- diff --git a/tooling/maven/camel-package-maven-plugin/src/main/resources/META-INF/m2e/lifecycle-mapping-metadata.xml b/tooling/maven/camel-package-maven-plugin/src/main/resources/META-INF/m2e/lifecycle-mapping-metadata.xml index 565f8d4..1cae827 100644 --- a/tooling/maven/camel-package-maven-plugin/src/main/resources/META-INF/m2e/lifecycle-mapping-metadata.xml +++ b/tooling/maven/camel-package-maven-plugin/src/main/resources/META-INF/m2e/lifecycle-mapping-metadata.xml @@ -1,3 +1,20 @@ +?xml version=1.0 encoding=UTF-8? +!-- + Licensed to the Apache Software Foundation (ASF) under one or more + contributor license agreements. See the NOTICE file distributed with + this work for additional information regarding copyright ownership. + The ASF licenses this file to You under the Apache License, Version 2.0 + (the License); you may not use this file except in compliance with + the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an AS IS BASIS, + WITHOUT WARRANTIES
git commit: fixed the CS error
Updated Branches: refs/heads/camel-2.11.x ed63d - 4f5ad25be fixed the CS error Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/4f5ad25b Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/4f5ad25b Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/4f5ad25b Branch: refs/heads/camel-2.11.x Commit: 4f5ad25be2292277a0741998f67d24ac08d0fff5 Parents: ed6 Author: cmueller cmuel...@apache.org Authored: Sat Jun 29 12:28:07 2013 +0200 Committer: cmueller cmuel...@apache.org Committed: Sat Jun 29 12:28:07 2013 +0200 -- .../org/apache/camel/component/validator/ValidatorComponent.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/camel/blob/4f5ad25b/camel-core/src/main/java/org/apache/camel/component/validator/ValidatorComponent.java -- diff --git a/camel-core/src/main/java/org/apache/camel/component/validator/ValidatorComponent.java b/camel-core/src/main/java/org/apache/camel/component/validator/ValidatorComponent.java index 5ec52f4..622d376 100644 --- a/camel-core/src/main/java/org/apache/camel/component/validator/ValidatorComponent.java +++ b/camel-core/src/main/java/org/apache/camel/component/validator/ValidatorComponent.java @@ -18,6 +18,7 @@ package org.apache.camel.component.validator; import java.io.InputStream; import java.util.Map; +import org.w3c.dom.ls.LSResourceResolver; import org.apache.camel.Endpoint; import org.apache.camel.converter.IOConverter; @@ -28,7 +29,6 @@ import org.apache.camel.util.IOHelper; import org.apache.camel.util.ResourceHelper; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.w3c.dom.ls.LSResourceResolver; /** * The a href=http://camel.apache.org/validation.html;Validator Component/a
git commit: fixed the CS error
Updated Branches:
refs/heads/camel-2.11.x 4f5ad25be - 8c3dad5f8
fixed the CS error
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/8c3dad5f
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/8c3dad5f
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/8c3dad5f
Branch: refs/heads/camel-2.11.x
Commit: 8c3dad5f81d858a8bd0dda7f0eb249714d21401d
Parents: 4f5ad25
Author: cmueller cmuel...@apache.org
Authored: Sat Jun 29 12:32:21 2013 +0200
Committer: cmueller cmuel...@apache.org
Committed: Sat Jun 29 12:32:21 2013 +0200
--
.../java/org/apache/camel/test/blueprint/DebugBlueprintTest.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/camel/blob/8c3dad5f/components/camel-test-blueprint/src/test/java/org/apache/camel/test/blueprint/DebugBlueprintTest.java
--
diff --git
a/components/camel-test-blueprint/src/test/java/org/apache/camel/test/blueprint/DebugBlueprintTest.java
b/components/camel-test-blueprint/src/test/java/org/apache/camel/test/blueprint/DebugBlueprintTest.java
index 56a9b40..8b39378 100644
---
a/components/camel-test-blueprint/src/test/java/org/apache/camel/test/blueprint/DebugBlueprintTest.java
+++
b/components/camel-test-blueprint/src/test/java/org/apache/camel/test/blueprint/DebugBlueprintTest.java
@@ -70,4 +70,4 @@ public class DebugBlueprintTest extends
CamelBlueprintTestSupport {
debugAfterMethodCalled = true;
}
}
-// END SNIPPET: example
\ No newline at end of file
+// END SNIPPET: example
git commit: fixed the CS error
Updated Branches:
refs/heads/camel-2.11.x 8c3dad5f8 - 4072e3778
fixed the CS error
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/4072e377
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/4072e377
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/4072e377
Branch: refs/heads/camel-2.11.x
Commit: 4072e377848e785d4e305027a6dd95b5f526887a
Parents: 8c3dad5
Author: cmueller cmuel...@apache.org
Authored: Sat Jun 29 13:45:39 2013 +0200
Committer: cmueller cmuel...@apache.org
Committed: Sat Jun 29 13:45:39 2013 +0200
--
.../java/org/apache/camel/component/ical/ICalConverter.java | 7 +--
.../java/org/apache/camel/component/ical/ICalDataFormat.java | 2 +-
.../org/apache/camel/component/ical/ICalDataFormatTest.java | 2 +-
3 files changed, 7 insertions(+), 4 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/camel/blob/4072e377/components/camel-ical/src/main/java/org/apache/camel/component/ical/ICalConverter.java
--
diff --git
a/components/camel-ical/src/main/java/org/apache/camel/component/ical/ICalConverter.java
b/components/camel-ical/src/main/java/org/apache/camel/component/ical/ICalConverter.java
index 5a3e4d9..765b158 100644
---
a/components/camel-ical/src/main/java/org/apache/camel/component/ical/ICalConverter.java
+++
b/components/camel-ical/src/main/java/org/apache/camel/component/ical/ICalConverter.java
@@ -1,4 +1,4 @@
-/*
+/**
* 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.
@@ -31,7 +31,10 @@ import org.apache.camel.util.IOHelper;
* ICal related converter.
*/
@Converter
-public class ICalConverter {
+public final class ICalConverter {
+
+private ICalConverter() {
+}
@Converter
public static Date toDate(DateProperty property) {
http://git-wip-us.apache.org/repos/asf/camel/blob/4072e377/components/camel-ical/src/main/java/org/apache/camel/component/ical/ICalDataFormat.java
--
diff --git
a/components/camel-ical/src/main/java/org/apache/camel/component/ical/ICalDataFormat.java
b/components/camel-ical/src/main/java/org/apache/camel/component/ical/ICalDataFormat.java
index 2159b53..0448c74 100644
---
a/components/camel-ical/src/main/java/org/apache/camel/component/ical/ICalDataFormat.java
+++
b/components/camel-ical/src/main/java/org/apache/camel/component/ical/ICalDataFormat.java
@@ -1,4 +1,4 @@
-/*
+/**
* 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.
http://git-wip-us.apache.org/repos/asf/camel/blob/4072e377/components/camel-ical/src/test/java/org/apache/camel/component/ical/ICalDataFormatTest.java
--
diff --git
a/components/camel-ical/src/test/java/org/apache/camel/component/ical/ICalDataFormatTest.java
b/components/camel-ical/src/test/java/org/apache/camel/component/ical/ICalDataFormatTest.java
index 163a533..f588401 100644
---
a/components/camel-ical/src/test/java/org/apache/camel/component/ical/ICalDataFormatTest.java
+++
b/components/camel-ical/src/test/java/org/apache/camel/component/ical/ICalDataFormatTest.java
@@ -1,4 +1,4 @@
-/*
+/**
* 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.
git commit: fixed the CS error
Updated Branches:
refs/heads/camel-2.11.x 4072e3778 - 914089379
fixed the CS error
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/91408937
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/91408937
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/91408937
Branch: refs/heads/camel-2.11.x
Commit: 914089379ed80efe5481ac46cdec783f4c911910
Parents: 4072e37
Author: cmueller cmuel...@apache.org
Authored: Sat Jun 29 14:00:52 2013 +0200
Committer: cmueller cmuel...@apache.org
Committed: Sat Jun 29 14:00:52 2013 +0200
--
.../main/java/org/apache/camel/builder/script/ScriptBuilder.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/camel/blob/91408937/components/camel-script/src/main/java/org/apache/camel/builder/script/ScriptBuilder.java
--
diff --git
a/components/camel-script/src/main/java/org/apache/camel/builder/script/ScriptBuilder.java
b/components/camel-script/src/main/java/org/apache/camel/builder/script/ScriptBuilder.java
index 9feca5e..96adfab 100644
---
a/components/camel-script/src/main/java/org/apache/camel/builder/script/ScriptBuilder.java
+++
b/components/camel-script/src/main/java/org/apache/camel/builder/script/ScriptBuilder.java
@@ -345,7 +345,7 @@ public class ScriptBuilder implements Expression,
Predicate, Processor {
if (LOG.isDebugEnabled()) {
LOG.debug(Script evaluation failed: + e.getMessage(), e);
}
-if (e.getCause()!= null) {
+if (e.getCause() != null) {
throw createScriptEvaluationException(e.getCause());
} else {
throw createScriptEvaluationException(e);
git commit: fixed the CS error
Updated Branches:
refs/heads/camel-2.11.x 914089379 - cc54c81f2
fixed the CS error
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/cc54c81f
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/cc54c81f
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/cc54c81f
Branch: refs/heads/camel-2.11.x
Commit: cc54c81f2902563ad0fc03d1a209940edf40800c
Parents: 9140893
Author: cmueller cmuel...@apache.org
Authored: Sat Jun 29 14:08:33 2013 +0200
Committer: cmueller cmuel...@apache.org
Committed: Sat Jun 29 14:08:33 2013 +0200
--
.../java/org/apache/camel/example/client/CamelClientRemoting.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/camel/blob/cc54c81f/examples/camel-example-spring-jms/src/main/java/org/apache/camel/example/client/CamelClientRemoting.java
--
diff --git
a/examples/camel-example-spring-jms/src/main/java/org/apache/camel/example/client/CamelClientRemoting.java
b/examples/camel-example-spring-jms/src/main/java/org/apache/camel/example/client/CamelClientRemoting.java
index e7110e5..ac7f4eb 100644
---
a/examples/camel-example-spring-jms/src/main/java/org/apache/camel/example/client/CamelClientRemoting.java
+++
b/examples/camel-example-spring-jms/src/main/java/org/apache/camel/example/client/CamelClientRemoting.java
@@ -45,7 +45,7 @@ public final class CamelClientRemoting {
System.out.println(... the result is: + response);
// we're done so let's properly close the application context
- context.close();
+context.close();
}
// END SNIPPET: e1
git commit: fixed the CS error
Updated Branches: refs/heads/master 18f8d29f9 - 97516739b fixed the CS error Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/97516739 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/97516739 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/97516739 Branch: refs/heads/master Commit: 97516739bfc1a751345f39e9c99c1e1dbcd09d3d Parents: 18f8d29 Author: cmueller cmuel...@apache.org Authored: Sat Jun 29 14:27:24 2013 +0200 Committer: cmueller cmuel...@apache.org Committed: Sat Jun 29 14:27:24 2013 +0200 -- .../cxf/wssecurity/camel/MyProcessor.java | 16 +++ .../wssecurity/camel/WSSecurityRouteTest.java | 16 +++ .../component/cxf/wssecurity/client/Client.java | 27 -- .../wssecurity/client/UTPasswordCallback.java | 26 -- .../cxf/wssecurity/server/CxfServer.java| 27 -- .../cxf/wssecurity/server/GreeterImpl.java | 29 +--- .../wssecurity/server/UTPasswordCallback.java | 26 -- 7 files changed, 93 insertions(+), 74 deletions(-) -- http://git-wip-us.apache.org/repos/asf/camel/blob/97516739/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/wssecurity/camel/MyProcessor.java -- diff --git a/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/wssecurity/camel/MyProcessor.java b/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/wssecurity/camel/MyProcessor.java index c53f06d..3a4ebe5 100644 --- a/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/wssecurity/camel/MyProcessor.java +++ b/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/wssecurity/camel/MyProcessor.java @@ -1,3 +1,19 @@ +/** + * 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.wssecurity.camel; import java.io.InputStream; http://git-wip-us.apache.org/repos/asf/camel/blob/97516739/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/wssecurity/camel/WSSecurityRouteTest.java -- diff --git a/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/wssecurity/camel/WSSecurityRouteTest.java b/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/wssecurity/camel/WSSecurityRouteTest.java index b7c55e7..4109032 100644 --- a/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/wssecurity/camel/WSSecurityRouteTest.java +++ b/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/wssecurity/camel/WSSecurityRouteTest.java @@ -1,3 +1,19 @@ +/** + * 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.wssecurity.camel; import org.apache.camel.CamelContext; http://git-wip-us.apache.org/repos/asf/camel/blob/97516739/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/wssecurity/client/Client.java -- diff --git a/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/wssecurity/client/Client.java b/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/wssecurity/client
git commit: fixed the CS error
Updated Branches:
refs/heads/master 97516739b - 8a1c55a65
fixed the CS error
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/8a1c55a6
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/8a1c55a6
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/8a1c55a6
Branch: refs/heads/master
Commit: 8a1c55a65f4d6ceeb2c29febac6451cc3cb71441
Parents: 9751673
Author: cmueller cmuel...@apache.org
Authored: Sat Jun 29 14:39:33 2013 +0200
Committer: cmueller cmuel...@apache.org
Committed: Sat Jun 29 14:39:33 2013 +0200
--
.../component/geocoder/GeoCoderProducer.java| 24 ++--
.../geocoder/GeoCoderComponentAddressTest.java | 8 +++
.../geocoder/GeoCoderCurrentAddressTest.java| 8 +++
.../geocoder/GeoCoderLatLngComponentTest.java | 10
4 files changed, 25 insertions(+), 25 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/camel/blob/8a1c55a6/components/camel-geocoder/src/main/java/org/apache/camel/component/geocoder/GeoCoderProducer.java
--
diff --git
a/components/camel-geocoder/src/main/java/org/apache/camel/component/geocoder/GeoCoderProducer.java
b/components/camel-geocoder/src/main/java/org/apache/camel/component/geocoder/GeoCoderProducer.java
index ab10fc5..d410c97 100644
---
a/components/camel-geocoder/src/main/java/org/apache/camel/component/geocoder/GeoCoderProducer.java
+++
b/components/camel-geocoder/src/main/java/org/apache/camel/component/geocoder/GeoCoderProducer.java
@@ -114,22 +114,22 @@ public class GeoCoderProducer extends DefaultProducer {
String resLatlng = latitudeNode.asText() + , +
longitudeNode.asText();
exchange.getIn().setHeader(GeoCoderConstants.LATLNG, resLatlng);
-JsonNode country_code = node.get(country_code);
-JsonNode country_name = node.get(country_name);
-if (country_code != null) {
-exchange.getIn().setHeader(GeoCoderConstants.COUNTRY_SHORT,
country_code.asText());
+JsonNode countryCode = node.get(country_code);
+JsonNode countryName = node.get(country_name);
+if (countryCode != null) {
+exchange.getIn().setHeader(GeoCoderConstants.COUNTRY_SHORT,
countryCode.asText());
}
-if (country_name != null) {
-exchange.getIn().setHeader(GeoCoderConstants.COUNTRY_LONG,
country_name.asText());
+if (countryName != null) {
+exchange.getIn().setHeader(GeoCoderConstants.COUNTRY_LONG,
countryName.asText());
}
-JsonNode region_code = node.get(region_code);
-JsonNode region_name = node.get(region_name);
-if (region_code != null) {
-exchange.getIn().setHeader(GeoCoderConstants.REGION_CODE,
region_code.asText());
+JsonNode regionCode = node.get(region_code);
+JsonNode regionName = node.get(region_name);
+if (regionCode != null) {
+exchange.getIn().setHeader(GeoCoderConstants.REGION_CODE,
regionCode.asText());
}
-if (region_name != null) {
-exchange.getIn().setHeader(GeoCoderConstants.REGION_NAME,
region_name.asText());
+if (regionName != null) {
+exchange.getIn().setHeader(GeoCoderConstants.REGION_NAME,
regionName.asText());
}
JsonNode city = node.get(city);
http://git-wip-us.apache.org/repos/asf/camel/blob/8a1c55a6/components/camel-geocoder/src/test/java/org/apache/camel/component/geocoder/GeoCoderComponentAddressTest.java
--
diff --git
a/components/camel-geocoder/src/test/java/org/apache/camel/component/geocoder/GeoCoderComponentAddressTest.java
b/components/camel-geocoder/src/test/java/org/apache/camel/component/geocoder/GeoCoderComponentAddressTest.java
index 37f10a8..16d8bd6 100644
---
a/components/camel-geocoder/src/test/java/org/apache/camel/component/geocoder/GeoCoderComponentAddressTest.java
+++
b/components/camel-geocoder/src/test/java/org/apache/camel/component/geocoder/GeoCoderComponentAddressTest.java
@@ -39,10 +39,10 @@ public class GeoCoderComponentAddressTest extends
CamelTestSupport {
return new RouteBuilder() {
public void configure() {
from(direct:start)
- .to(geocoder:address:Paris, France)
- .to(log:result)
- .log(Location ${header.CamelGeocoderAddress} is at lat/lng:
${header.CamelGeocoderLatlng} in city ${header.CamelGeocoderCity})
- .to(mock:result);
+.to(geocoder:address:Paris, France)
+.to(log:result)
+.log(Location ${header.CamelGeocoderAddress} is at
lat/lng: ${header.CamelGeocoderLatlng} in city
git commit: fixed the CS error
Updated Branches:
refs/heads/master 8a1c55a65 - f28ea90ed
fixed the CS error
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/f28ea90e
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/f28ea90e
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/f28ea90e
Branch: refs/heads/master
Commit: f28ea90ed3efcf05ed4cf9d09fde077e978f237a
Parents: 8a1c55a
Author: cmueller cmuel...@apache.org
Authored: Sat Jun 29 15:39:06 2013 +0200
Committer: cmueller cmuel...@apache.org
Committed: Sat Jun 29 15:39:06 2013 +0200
--
.../NettyServerBootstrapConfiguration.java | 220 ---
1 file changed, 94 insertions(+), 126 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/camel/blob/f28ea90e/components/camel-netty/src/main/java/org/apache/camel/component/netty/NettyServerBootstrapConfiguration.java
--
diff --git
a/components/camel-netty/src/main/java/org/apache/camel/component/netty/NettyServerBootstrapConfiguration.java
b/components/camel-netty/src/main/java/org/apache/camel/component/netty/NettyServerBootstrapConfiguration.java
index bc71182..6ea9d9e 100644
---
a/components/camel-netty/src/main/java/org/apache/camel/component/netty/NettyServerBootstrapConfiguration.java
+++
b/components/camel-netty/src/main/java/org/apache/camel/component/netty/NettyServerBootstrapConfiguration.java
@@ -21,11 +21,8 @@ import java.util.Map;
import org.apache.camel.util.jsse.SSLContextParameters;
import org.jboss.netty.handler.ssl.SslHandler;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
public class NettyServerBootstrapConfiguration implements Cloneable {
-private static final Logger LOG =
LoggerFactory.getLogger(NettyServerBootstrapConfiguration.class);
protected String protocol;
protected String host;
@@ -290,134 +287,105 @@ public class NettyServerBootstrapConfiguration
implements Cloneable {
* {@link NettyServerBootstrapConfiguration}, which must be identical.
*/
public boolean compatible(NettyServerBootstrapConfiguration other) {
+boolean isCompatible = true;
+
if (!protocol.equals(other.protocol)) {
+isCompatible = false;
+} else if (!host.equals(other.host)) {
+isCompatible = false;
+} else if (port != other.port) {
+isCompatible = false;
+} else if (broadcast != other.broadcast) {
+isCompatible = false;
+} else if (sendBufferSize != other.sendBufferSize) {
return false;
+} else if (receiveBufferSize != other.receiveBufferSize) {
+isCompatible = false;
+} else if (receiveBufferSizePredictor !=
other.receiveBufferSizePredictor) {
+isCompatible = false;
+} else if (workerCount != other.workerCount) {
+isCompatible = false;
+} else if (keepAlive != other.keepAlive) {
+isCompatible = false;
+} else if (tcpNoDelay != other.tcpNoDelay) {
+isCompatible = false;
+} else if (reuseAddress != other.reuseAddress) {
+isCompatible = false;
+} else if (connectTimeout != other.connectTimeout) {
+isCompatible = false;
+} else if (backlog != other.backlog) {
+isCompatible = false;
+} else if (serverPipelineFactory != other.serverPipelineFactory) {
+isCompatible = false;
+} else if (nettyServerBootstrapFactory !=
other.nettyServerBootstrapFactory) {
+isCompatible = false;
+} else if (options == null other.options != null) {
+// validate all the options is identical
+isCompatible = false;
+} else if (options != null other.options == null) {
+isCompatible = false;
+} else if (options != null other.options != null options.size()
!= other.options.size()) {
+isCompatible = false;
+} else if (options != null other.options != null
!options.keySet().containsAll(other.options.keySet())) {
+isCompatible = false;
+} else if (options != null other.options != null
!options.values().containsAll(other.options.values())) {
+isCompatible = false;
+} else if (ssl != other.ssl) {
+isCompatible = false;
+} else if (sslHandler != other.sslHandler) {
+isCompatible = false;
+} else if (sslContextParameters != other.sslContextParameters) {
+isCompatible = false;
+} else if (needClientAuth != other.needClientAuth) {
+isCompatible = false;
+} else if (keyStoreFile != other.keyStoreFile) {
+isCompatible = false;
+} else if (trustStoreFile != other.trustStoreFile
git commit: fixed the CS error
Updated Branches:
refs/heads/master f28ea90ed - a477bd1be
fixed the CS error
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/a477bd1b
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/a477bd1b
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/a477bd1b
Branch: refs/heads/master
Commit: a477bd1be78779920179d448e1c64f093b11471c
Parents: f28ea90
Author: cmueller cmuel...@apache.org
Authored: Sat Jun 29 16:39:32 2013 +0200
Committer: cmueller cmuel...@apache.org
Committed: Sat Jun 29 16:39:32 2013 +0200
--
.../main/java/org/apache/camel/builder/script/ScriptBuilder.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/camel/blob/a477bd1b/components/camel-script/src/main/java/org/apache/camel/builder/script/ScriptBuilder.java
--
diff --git
a/components/camel-script/src/main/java/org/apache/camel/builder/script/ScriptBuilder.java
b/components/camel-script/src/main/java/org/apache/camel/builder/script/ScriptBuilder.java
index 9feca5e..710be36 100644
---
a/components/camel-script/src/main/java/org/apache/camel/builder/script/ScriptBuilder.java
+++
b/components/camel-script/src/main/java/org/apache/camel/builder/script/ScriptBuilder.java
@@ -345,7 +345,7 @@ public class ScriptBuilder implements Expression,
Predicate, Processor {
if (LOG.isDebugEnabled()) {
LOG.debug(Script evaluation failed: + e.getMessage(), e);
}
-if (e.getCause()!= null) {
+if (e.getCause() != null) {
throw createScriptEvaluationException(e.getCause());
} else {
throw createScriptEvaluationException(e);
git commit: fixed the CS error
Updated Branches: refs/heads/master a477bd1be - d92b38d1f fixed the CS error Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/d92b38d1 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/d92b38d1 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/d92b38d1 Branch: refs/heads/master Commit: d92b38d1f633682958b826ac6da78a192a25eec8 Parents: a477bd1 Author: cmueller cmuel...@apache.org Authored: Sat Jun 29 16:44:22 2013 +0200 Committer: cmueller cmuel...@apache.org Committed: Sat Jun 29 16:44:22 2013 +0200 -- .../itest/security/GreeterClientCxfMessageTest.java | 16 1 file changed, 16 insertions(+) -- http://git-wip-us.apache.org/repos/asf/camel/blob/d92b38d1/tests/camel-itest/src/test/java/org/apache/camel/itest/security/GreeterClientCxfMessageTest.java -- diff --git a/tests/camel-itest/src/test/java/org/apache/camel/itest/security/GreeterClientCxfMessageTest.java b/tests/camel-itest/src/test/java/org/apache/camel/itest/security/GreeterClientCxfMessageTest.java index 8aba72d..83cdb09 100644 --- a/tests/camel-itest/src/test/java/org/apache/camel/itest/security/GreeterClientCxfMessageTest.java +++ b/tests/camel-itest/src/test/java/org/apache/camel/itest/security/GreeterClientCxfMessageTest.java @@ -1,3 +1,19 @@ +/** + * 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.itest.security; import org.springframework.test.context.ContextConfiguration;
git commit: update the version numbers the maven-release-plugin skipped
Updated Branches: refs/heads/camel-2.11.x 6869741e1 - c3d948aaa update the version numbers the maven-release-plugin skipped Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/c3d948aa Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/c3d948aa Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/c3d948aa Branch: refs/heads/camel-2.11.x Commit: c3d948aaabe06bd39ae460c118f9d249872b210b Parents: 6869741 Author: cmueller cmuel...@apache.org Authored: Thu Jun 27 21:15:45 2013 +0200 Committer: cmueller cmuel...@apache.org Committed: Thu Jun 27 21:15:45 2013 +0200 -- etc/pom.xml | 2 +- tests/camel-itest-performance/pom.xml | 2 +- tests/camel-performance/pom.xml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) -- http://git-wip-us.apache.org/repos/asf/camel/blob/c3d948aa/etc/pom.xml -- diff --git a/etc/pom.xml b/etc/pom.xml index 3fb3865..66b722d 100755 --- a/etc/pom.xml +++ b/etc/pom.xml @@ -23,7 +23,7 @@ parent groupIdorg.apache.camel/groupId artifactIdcamel-parent/artifactId -version2.11-SNAPSHOT/version +version2.11.1-SNAPSHOT/version relativePath../parent/relativePath /parent http://git-wip-us.apache.org/repos/asf/camel/blob/c3d948aa/tests/camel-itest-performance/pom.xml -- diff --git a/tests/camel-itest-performance/pom.xml b/tests/camel-itest-performance/pom.xml index bf9a24b..e4e7184 100644 --- a/tests/camel-itest-performance/pom.xml +++ b/tests/camel-itest-performance/pom.xml @@ -22,7 +22,7 @@ parent groupIdorg.apache.camel/groupId artifactIdtests/artifactId -version2.11-SNAPSHOT/version +version2.11.1-SNAPSHOT/version /parent artifactIdcamel-itest-performance/artifactId http://git-wip-us.apache.org/repos/asf/camel/blob/c3d948aa/tests/camel-performance/pom.xml -- diff --git a/tests/camel-performance/pom.xml b/tests/camel-performance/pom.xml index 3e3d254..f53a6d4 100644 --- a/tests/camel-performance/pom.xml +++ b/tests/camel-performance/pom.xml @@ -22,7 +22,7 @@ parent groupIdorg.apache.camel/groupId artifactIdtests/artifactId -version2.11-SNAPSHOT/version +version2.11.1-SNAPSHOT/version /parent artifactIdcamel-performance/artifactId
git commit: CAMEL-6496: Upgrade the features.xml file to Apache CXF 2.6.8
Updated Branches:
refs/heads/camel-2.10.x 00b8cd9b4 - ced7d77c5
CAMEL-6496: Upgrade the features.xml file to Apache CXF 2.6.8
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/ced7d77c
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/ced7d77c
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/ced7d77c
Branch: refs/heads/camel-2.10.x
Commit: ced7d77c5adc22c0d1ff7b39b323a2d6052518c3
Parents: 00b8cd9
Author: cmueller cmuel...@apache.org
Authored: Thu Jun 27 22:34:00 2013 +0200
Committer: cmueller cmuel...@apache.org
Committed: Thu Jun 27 22:34:00 2013 +0200
--
platforms/karaf/features/pom.xml | 1 -
platforms/karaf/features/src/main/resources/features.xml | 3 +--
2 files changed, 1 insertion(+), 3 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/camel/blob/ced7d77c/platforms/karaf/features/pom.xml
--
diff --git a/platforms/karaf/features/pom.xml b/platforms/karaf/features/pom.xml
index 058d418..e94670c 100644
--- a/platforms/karaf/features/pom.xml
+++ b/platforms/karaf/features/pom.xml
@@ -53,7 +53,6 @@
commons-math-version2.2/commons-math-version
commons-dbcp-bundle-version1.4_3/commons-dbcp-bundle-version
commons-lang-version-xmljson2.5/commons-lang-version-xmljson
- cxf-features-version2.6.6.1/cxf-features-version
dom4j-bundle-version1.6.1_5/dom4j-bundle-version
el-api-1.0-version1.0.1/el-api-1.0-version
ezmorph-bundle-version1.0.6_1/ezmorph-bundle-version
http://git-wip-us.apache.org/repos/asf/camel/blob/ced7d77c/platforms/karaf/features/src/main/resources/features.xml
--
diff --git a/platforms/karaf/features/src/main/resources/features.xml
b/platforms/karaf/features/src/main/resources/features.xml
index 1719e42..f4d0bb2 100644
--- a/platforms/karaf/features/src/main/resources/features.xml
+++ b/platforms/karaf/features/src/main/resources/features.xml
@@ -18,8 +18,7 @@
--
features name='camel-${project.version}'
-
repositorymvn:org.apache.cxf.karaf/apache-cxf/${cxf-features-version}/xml/features/repository
- !--
repositorymvn:org.apache.cxf.karaf/apache-cxf/${cxf-version}/xml/features/repository
--
+
repositorymvn:org.apache.cxf.karaf/apache-cxf/${cxf-version}/xml/features/repository
repositorymvn:org.jclouds.karaf/jclouds-karaf/${jclouds-feature-version}/xml/features/repository
feature name='xml-specs-api' version='${servicemix-specs-version}'
resolver='(obr)' start-level='10'
git commit: CAMEL-6252: camel-aws - Possible concurrent modification exception
Updated Branches:
refs/heads/master 981c7929d - 7e53a3c58
CAMEL-6252: camel-aws - Possible concurrent modification exception
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/7e53a3c5
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/7e53a3c5
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/7e53a3c5
Branch: refs/heads/master
Commit: 7e53a3c588511ee8ad72383f80e0bdc6598003f3
Parents: 981c792
Author: cmueller cmuel...@apache.org
Authored: Thu Jun 27 23:50:21 2013 +0200
Committer: cmueller cmuel...@apache.org
Committed: Thu Jun 27 23:50:21 2013 +0200
--
.../org/apache/camel/component/aws/s3/AmazonS3ClientMock.java | 5 +++--
.../org/apache/camel/component/aws/sqs/AmazonSQSClientMock.java | 3 ++-
2 files changed, 5 insertions(+), 3 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/camel/blob/7e53a3c5/components/camel-aws/src/test/java/org/apache/camel/component/aws/s3/AmazonS3ClientMock.java
--
diff --git
a/components/camel-aws/src/test/java/org/apache/camel/component/aws/s3/AmazonS3ClientMock.java
b/components/camel-aws/src/test/java/org/apache/camel/component/aws/s3/AmazonS3ClientMock.java
index 9419b8c..ba9aabe 100644
---
a/components/camel-aws/src/test/java/org/apache/camel/component/aws/s3/AmazonS3ClientMock.java
+++
b/components/camel-aws/src/test/java/org/apache/camel/component/aws/s3/AmazonS3ClientMock.java
@@ -22,6 +22,7 @@ import java.net.URL;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
+import java.util.concurrent.CopyOnWriteArrayList;
import com.amazonaws.AmazonClientException;
import com.amazonaws.AmazonServiceException;
@@ -77,8 +78,8 @@ import org.junit.Assert;
public class AmazonS3ClientMock extends AmazonS3Client {
-ListS3Object objects = new ArrayListS3Object();
-ListPutObjectRequest putObjectRequests = new
ArrayListPutObjectRequest();
+ListS3Object objects = new CopyOnWriteArrayListS3Object();
+ListPutObjectRequest putObjectRequests = new
CopyOnWriteArrayListPutObjectRequest();
private boolean nonExistingBucketCreated;
http://git-wip-us.apache.org/repos/asf/camel/blob/7e53a3c5/components/camel-aws/src/test/java/org/apache/camel/component/aws/sqs/AmazonSQSClientMock.java
--
diff --git
a/components/camel-aws/src/test/java/org/apache/camel/component/aws/sqs/AmazonSQSClientMock.java
b/components/camel-aws/src/test/java/org/apache/camel/component/aws/sqs/AmazonSQSClientMock.java
index 45fee49..ac0838f 100644
---
a/components/camel-aws/src/test/java/org/apache/camel/component/aws/sqs/AmazonSQSClientMock.java
+++
b/components/camel-aws/src/test/java/org/apache/camel/component/aws/sqs/AmazonSQSClientMock.java
@@ -22,6 +22,7 @@ import java.util.HashMap;
import java.util.Iterator;
import java.util.List;
import java.util.Map;
+import java.util.concurrent.CopyOnWriteArrayList;
import com.amazonaws.AmazonClientException;
import com.amazonaws.AmazonServiceException;
@@ -43,7 +44,7 @@ public class AmazonSQSClientMock extends AmazonSQSClient {
ListMessage messages = new ArrayListMessage();
MapString, MapString, String queueAttributes = new HashMapString,
MapString, String();
-ListChangeMessageVisibilityRequest changeMessageVisibilityRequests = new
ArrayListChangeMessageVisibilityRequest();
+ListChangeMessageVisibilityRequest changeMessageVisibilityRequests = new
CopyOnWriteArrayListChangeMessageVisibilityRequest();
public AmazonSQSClientMock() {
super(new BasicAWSCredentials(myAccessKey, mySecretKey));
git commit: CAMEL-6252: camel-aws - Possible concurrent modification exception
Updated Branches:
refs/heads/camel-2.11.x 4aa818361 - ace5a3adc
CAMEL-6252: camel-aws - Possible concurrent modification exception
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/ace5a3ad
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/ace5a3ad
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/ace5a3ad
Branch: refs/heads/camel-2.11.x
Commit: ace5a3adcef45e03e25ea95ba55265b158cd5ded
Parents: 4aa8183
Author: cmueller cmuel...@apache.org
Authored: Thu Jun 27 23:50:21 2013 +0200
Committer: cmueller cmuel...@apache.org
Committed: Thu Jun 27 23:50:58 2013 +0200
--
.../org/apache/camel/component/aws/s3/AmazonS3ClientMock.java | 5 +++--
.../org/apache/camel/component/aws/sqs/AmazonSQSClientMock.java | 3 ++-
2 files changed, 5 insertions(+), 3 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/camel/blob/ace5a3ad/components/camel-aws/src/test/java/org/apache/camel/component/aws/s3/AmazonS3ClientMock.java
--
diff --git
a/components/camel-aws/src/test/java/org/apache/camel/component/aws/s3/AmazonS3ClientMock.java
b/components/camel-aws/src/test/java/org/apache/camel/component/aws/s3/AmazonS3ClientMock.java
index 9419b8c..ba9aabe 100644
---
a/components/camel-aws/src/test/java/org/apache/camel/component/aws/s3/AmazonS3ClientMock.java
+++
b/components/camel-aws/src/test/java/org/apache/camel/component/aws/s3/AmazonS3ClientMock.java
@@ -22,6 +22,7 @@ import java.net.URL;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
+import java.util.concurrent.CopyOnWriteArrayList;
import com.amazonaws.AmazonClientException;
import com.amazonaws.AmazonServiceException;
@@ -77,8 +78,8 @@ import org.junit.Assert;
public class AmazonS3ClientMock extends AmazonS3Client {
-ListS3Object objects = new ArrayListS3Object();
-ListPutObjectRequest putObjectRequests = new
ArrayListPutObjectRequest();
+ListS3Object objects = new CopyOnWriteArrayListS3Object();
+ListPutObjectRequest putObjectRequests = new
CopyOnWriteArrayListPutObjectRequest();
private boolean nonExistingBucketCreated;
http://git-wip-us.apache.org/repos/asf/camel/blob/ace5a3ad/components/camel-aws/src/test/java/org/apache/camel/component/aws/sqs/AmazonSQSClientMock.java
--
diff --git
a/components/camel-aws/src/test/java/org/apache/camel/component/aws/sqs/AmazonSQSClientMock.java
b/components/camel-aws/src/test/java/org/apache/camel/component/aws/sqs/AmazonSQSClientMock.java
index 45fee49..ac0838f 100644
---
a/components/camel-aws/src/test/java/org/apache/camel/component/aws/sqs/AmazonSQSClientMock.java
+++
b/components/camel-aws/src/test/java/org/apache/camel/component/aws/sqs/AmazonSQSClientMock.java
@@ -22,6 +22,7 @@ import java.util.HashMap;
import java.util.Iterator;
import java.util.List;
import java.util.Map;
+import java.util.concurrent.CopyOnWriteArrayList;
import com.amazonaws.AmazonClientException;
import com.amazonaws.AmazonServiceException;
@@ -43,7 +44,7 @@ public class AmazonSQSClientMock extends AmazonSQSClient {
ListMessage messages = new ArrayListMessage();
MapString, MapString, String queueAttributes = new HashMapString,
MapString, String();
-ListChangeMessageVisibilityRequest changeMessageVisibilityRequests = new
ArrayListChangeMessageVisibilityRequest();
+ListChangeMessageVisibilityRequest changeMessageVisibilityRequests = new
CopyOnWriteArrayListChangeMessageVisibilityRequest();
public AmazonSQSClientMock() {
super(new BasicAWSCredentials(myAccessKey, mySecretKey));
git commit: CAMEL-6252: camel-aws - Possible concurrent modification exception
Updated Branches:
refs/heads/camel-2.10.x ced7d77c5 - 6162e83db
CAMEL-6252: camel-aws - Possible concurrent modification exception
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/6162e83d
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/6162e83d
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/6162e83d
Branch: refs/heads/camel-2.10.x
Commit: 6162e83dbafb22bb9f5a335857ffaedb6b378625
Parents: ced7d77
Author: cmueller cmuel...@apache.org
Authored: Thu Jun 27 23:50:21 2013 +0200
Committer: cmueller cmuel...@apache.org
Committed: Thu Jun 27 23:53:28 2013 +0200
--
.../org/apache/camel/component/aws/s3/AmazonS3ClientMock.java | 5 +++--
.../org/apache/camel/component/aws/sqs/AmazonSQSClientMock.java | 3 ++-
2 files changed, 5 insertions(+), 3 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/camel/blob/6162e83d/components/camel-aws/src/test/java/org/apache/camel/component/aws/s3/AmazonS3ClientMock.java
--
diff --git
a/components/camel-aws/src/test/java/org/apache/camel/component/aws/s3/AmazonS3ClientMock.java
b/components/camel-aws/src/test/java/org/apache/camel/component/aws/s3/AmazonS3ClientMock.java
index c55b782..3ba8b55 100644
---
a/components/camel-aws/src/test/java/org/apache/camel/component/aws/s3/AmazonS3ClientMock.java
+++
b/components/camel-aws/src/test/java/org/apache/camel/component/aws/s3/AmazonS3ClientMock.java
@@ -22,6 +22,7 @@ import java.net.URL;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
+import java.util.concurrent.CopyOnWriteArrayList;
import junit.framework.Assert;
@@ -77,8 +78,8 @@ import com.amazonaws.services.s3.model.VersionListing;
public class AmazonS3ClientMock extends AmazonS3Client {
-ListS3Object objects = new ArrayListS3Object();
-ListPutObjectRequest putObjectRequests = new
ArrayListPutObjectRequest();
+ListS3Object objects = new CopyOnWriteArrayListS3Object();
+ListPutObjectRequest putObjectRequests = new
CopyOnWriteArrayListPutObjectRequest();
private boolean nonExistingBucketCreated;
http://git-wip-us.apache.org/repos/asf/camel/blob/6162e83d/components/camel-aws/src/test/java/org/apache/camel/component/aws/sqs/AmazonSQSClientMock.java
--
diff --git
a/components/camel-aws/src/test/java/org/apache/camel/component/aws/sqs/AmazonSQSClientMock.java
b/components/camel-aws/src/test/java/org/apache/camel/component/aws/sqs/AmazonSQSClientMock.java
index 45fee49..ac0838f 100644
---
a/components/camel-aws/src/test/java/org/apache/camel/component/aws/sqs/AmazonSQSClientMock.java
+++
b/components/camel-aws/src/test/java/org/apache/camel/component/aws/sqs/AmazonSQSClientMock.java
@@ -22,6 +22,7 @@ import java.util.HashMap;
import java.util.Iterator;
import java.util.List;
import java.util.Map;
+import java.util.concurrent.CopyOnWriteArrayList;
import com.amazonaws.AmazonClientException;
import com.amazonaws.AmazonServiceException;
@@ -43,7 +44,7 @@ public class AmazonSQSClientMock extends AmazonSQSClient {
ListMessage messages = new ArrayListMessage();
MapString, MapString, String queueAttributes = new HashMapString,
MapString, String();
-ListChangeMessageVisibilityRequest changeMessageVisibilityRequests = new
ArrayListChangeMessageVisibilityRequest();
+ListChangeMessageVisibilityRequest changeMessageVisibilityRequests = new
CopyOnWriteArrayListChangeMessageVisibilityRequest();
public AmazonSQSClientMock() {
super(new BasicAWSCredentials(myAccessKey, mySecretKey));
svn commit: r2303 - /release/camel/apache-camel/2.10.5/
Author: cmueller Date: Wed Jun 26 06:35:11 2013 New Revision: 2303 Log: Apache Camel 2.10.5 release distro placeholder. Added: release/camel/apache-camel/2.10.5/
svn commit: r2304 - /release/camel/apache-camel/2.10.5/
Author: cmueller Date: Wed Jun 26 06:49:44 2013 New Revision: 2304 Log: Apache Camel 2.10.5 released artifacts. Added: release/camel/apache-camel/2.10.5/apache-camel-2.10.5-src.zip (with props) release/camel/apache-camel/2.10.5/apache-camel-2.10.5-src.zip.asc (with props) release/camel/apache-camel/2.10.5/apache-camel-2.10.5-src.zip.asc.md5 release/camel/apache-camel/2.10.5/apache-camel-2.10.5-src.zip.asc.sha1 release/camel/apache-camel/2.10.5/apache-camel-2.10.5-src.zip.md5 release/camel/apache-camel/2.10.5/apache-camel-2.10.5-src.zip.sha1 release/camel/apache-camel/2.10.5/apache-camel-2.10.5.pom (with props) release/camel/apache-camel/2.10.5/apache-camel-2.10.5.pom.asc (with props) release/camel/apache-camel/2.10.5/apache-camel-2.10.5.pom.asc.md5 release/camel/apache-camel/2.10.5/apache-camel-2.10.5.pom.asc.sha1 release/camel/apache-camel/2.10.5/apache-camel-2.10.5.pom.md5 release/camel/apache-camel/2.10.5/apache-camel-2.10.5.pom.sha1 release/camel/apache-camel/2.10.5/apache-camel-2.10.5.tar.gz (with props) release/camel/apache-camel/2.10.5/apache-camel-2.10.5.tar.gz.asc (with props) release/camel/apache-camel/2.10.5/apache-camel-2.10.5.tar.gz.asc.md5 release/camel/apache-camel/2.10.5/apache-camel-2.10.5.tar.gz.asc.sha1 release/camel/apache-camel/2.10.5/apache-camel-2.10.5.tar.gz.md5 release/camel/apache-camel/2.10.5/apache-camel-2.10.5.tar.gz.sha1 release/camel/apache-camel/2.10.5/apache-camel-2.10.5.zip (with props) release/camel/apache-camel/2.10.5/apache-camel-2.10.5.zip.asc (with props) release/camel/apache-camel/2.10.5/apache-camel-2.10.5.zip.asc.md5 release/camel/apache-camel/2.10.5/apache-camel-2.10.5.zip.asc.sha1 release/camel/apache-camel/2.10.5/apache-camel-2.10.5.zip.md5 release/camel/apache-camel/2.10.5/apache-camel-2.10.5.zip.sha1 Added: release/camel/apache-camel/2.10.5/apache-camel-2.10.5-src.zip == Binary file - no diff available. Propchange: release/camel/apache-camel/2.10.5/apache-camel-2.10.5-src.zip -- svn:mime-type = application/zip Added: release/camel/apache-camel/2.10.5/apache-camel-2.10.5-src.zip.asc == Binary file - no diff available. Propchange: release/camel/apache-camel/2.10.5/apache-camel-2.10.5-src.zip.asc -- svn:mime-type = application/pgp-signature Added: release/camel/apache-camel/2.10.5/apache-camel-2.10.5-src.zip.asc.md5 == --- release/camel/apache-camel/2.10.5/apache-camel-2.10.5-src.zip.asc.md5 (added) +++ release/camel/apache-camel/2.10.5/apache-camel-2.10.5-src.zip.asc.md5 Wed Jun 26 06:49:44 2013 @@ -0,0 +1 @@ +e13c901480597735cfd1de48334d5078 \ No newline at end of file Added: release/camel/apache-camel/2.10.5/apache-camel-2.10.5-src.zip.asc.sha1 == --- release/camel/apache-camel/2.10.5/apache-camel-2.10.5-src.zip.asc.sha1 (added) +++ release/camel/apache-camel/2.10.5/apache-camel-2.10.5-src.zip.asc.sha1 Wed Jun 26 06:49:44 2013 @@ -0,0 +1 @@ +654f5a76baac0c5bce8f372d3d33c45416e3fd01 \ No newline at end of file Added: release/camel/apache-camel/2.10.5/apache-camel-2.10.5-src.zip.md5 == --- release/camel/apache-camel/2.10.5/apache-camel-2.10.5-src.zip.md5 (added) +++ release/camel/apache-camel/2.10.5/apache-camel-2.10.5-src.zip.md5 Wed Jun 26 06:49:44 2013 @@ -0,0 +1 @@ +ce8f3385c490616520e8f68c31fd2975 \ No newline at end of file Added: release/camel/apache-camel/2.10.5/apache-camel-2.10.5-src.zip.sha1 == --- release/camel/apache-camel/2.10.5/apache-camel-2.10.5-src.zip.sha1 (added) +++ release/camel/apache-camel/2.10.5/apache-camel-2.10.5-src.zip.sha1 Wed Jun 26 06:49:44 2013 @@ -0,0 +1 @@ +6c2d0380c960cd9fccaae9b317a80e9454f7c179 \ No newline at end of file Added: release/camel/apache-camel/2.10.5/apache-camel-2.10.5.pom == Binary file - no diff available. Propchange: release/camel/apache-camel/2.10.5/apache-camel-2.10.5.pom -- svn:mime-type = application/xml Added: release/camel/apache-camel/2.10.5/apache-camel-2.10.5.pom.asc == Binary file - no diff available. Propchange: release/camel/apache-camel/2.10.5/apache-camel-2.10.5.pom.asc
git commit: updated the version numbers for the modules the maven-release-plugin didn't updated
Updated Branches: refs/heads/camel-2.10.x 83cdfe4ac - bfeec698c updated the version numbers for the modules the maven-release-plugin didn't updated Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/bfeec698 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/bfeec698 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/bfeec698 Branch: refs/heads/camel-2.10.x Commit: bfeec698c4a98b5cdf79bf91efacddb0d089341a Parents: 83cdfe4 Author: cmueller cmuel...@apache.org Authored: Wed Jun 26 21:06:07 2013 +0200 Committer: cmueller cmuel...@apache.org Committed: Wed Jun 26 21:06:20 2013 +0200 -- etc/pom.xml | 2 +- tests/camel-itest-karaf/pom.xml | 2 +- tests/camel-itest-osgi/pom.xml | 2 +- tests/camel-performance/pom.xml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) -- http://git-wip-us.apache.org/repos/asf/camel/blob/bfeec698/etc/pom.xml -- diff --git a/etc/pom.xml b/etc/pom.xml index 981ea9d..56ed2fb 100755 --- a/etc/pom.xml +++ b/etc/pom.xml @@ -25,7 +25,7 @@ parent groupIdorg.apache.camel/groupId artifactIdcamel-parent/artifactId -version2.10.1-SNAPSHOT/version +version2.10.6-SNAPSHOT/version relativePath../parent/relativePath /parent http://git-wip-us.apache.org/repos/asf/camel/blob/bfeec698/tests/camel-itest-karaf/pom.xml -- diff --git a/tests/camel-itest-karaf/pom.xml b/tests/camel-itest-karaf/pom.xml index 72d7949..59c37c4 100644 --- a/tests/camel-itest-karaf/pom.xml +++ b/tests/camel-itest-karaf/pom.xml @@ -25,7 +25,7 @@ parent groupIdorg.apache.camel/groupId artifactIdcamel-parent/artifactId -version2.10.1-SNAPSHOT/version +version2.10.6-SNAPSHOT/version relativePath../../parent/relativePath /parent http://git-wip-us.apache.org/repos/asf/camel/blob/bfeec698/tests/camel-itest-osgi/pom.xml -- diff --git a/tests/camel-itest-osgi/pom.xml b/tests/camel-itest-osgi/pom.xml index 77358a1..921180d 100644 --- a/tests/camel-itest-osgi/pom.xml +++ b/tests/camel-itest-osgi/pom.xml @@ -24,7 +24,7 @@ parent groupIdorg.apache.camel/groupId artifactIdcamel-parent/artifactId -version2.10.3-SNAPSHOT/version +version2.10.6-SNAPSHOT/version relativePath../../parent/relativePath /parent http://git-wip-us.apache.org/repos/asf/camel/blob/bfeec698/tests/camel-performance/pom.xml -- diff --git a/tests/camel-performance/pom.xml b/tests/camel-performance/pom.xml index 16dad12..18ffe17 100644 --- a/tests/camel-performance/pom.xml +++ b/tests/camel-performance/pom.xml @@ -22,7 +22,7 @@ parent groupIdorg.apache.camel/groupId artifactIdtests/artifactId -version2.10.4-SNAPSHOT/version +version2.10.6-SNAPSHOT/version /parent artifactIdcamel-performance/artifactId
git commit: add the release version number to the spring.schemas files
Updated Branches:
refs/heads/camel-2.10.x bfeec698c - 00b8cd9b4
add the release version number to the spring.schemas files
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/00b8cd9b
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/00b8cd9b
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/00b8cd9b
Branch: refs/heads/camel-2.10.x
Commit: 00b8cd9b4e35839b7dd4bd17ed340b1442852d8d
Parents: bfeec69
Author: cmueller cmuel...@apache.org
Authored: Wed Jun 26 21:52:44 2013 +0200
Committer: cmueller cmuel...@apache.org
Committed: Wed Jun 26 21:52:44 2013 +0200
--
components/camel-cxf/src/main/resources/META-INF/spring.schemas| 1 +
.../src/main/resources/META-INF/spring.schemas | 1 +
.../src/main/resources/META-INF/spring.schemas | 1 +
components/camel-spring/src/main/resources/META-INF/spring.schemas | 2 ++
4 files changed, 5 insertions(+)
--
http://git-wip-us.apache.org/repos/asf/camel/blob/00b8cd9b/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 6f5391f..c77c2e1 100644
--- a/components/camel-cxf/src/main/resources/META-INF/spring.schemas
+++ b/components/camel-cxf/src/main/resources/META-INF/spring.schemas
@@ -55,4 +55,5 @@
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-${project.version}.xsd=schema/cxfEndpoint.xsd
http://git-wip-us.apache.org/repos/asf/camel/blob/00b8cd9b/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 ca14941..a3bb4f5 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
@@ -52,4 +52,5 @@
http\://camel.apache.org/schema/spring/integration/camel-spring-integration-2.10
http\://camel.apache.org/schema/spring/integration/camel-spring-integration-2.10.2.xsd=schema/camel-spring-integration.xsd
http\://camel.apache.org/schema/spring/integration/camel-spring-integration-2.10.3.xsd=schema/camel-spring-integration.xsd
http\://camel.apache.org/schema/spring/integration/camel-spring-integration-2.10.4.xsd=schema/camel-spring-integration.xsd
+http\://camel.apache.org/schema/spring/integration/camel-spring-integration-2.10.5.xsd=schema/camel-spring-integration.xsd
http\://camel.apache.org/schema/spring/integration/camel-spring-integration-${project.version}.xsd=schema/camel-spring-integration.xsd
http://git-wip-us.apache.org/repos/asf/camel/blob/00b8cd9b/components/camel-spring-security/src/main/resources/META-INF/spring.schemas
--
diff --git
a/components/camel-spring-security/src/main/resources/META-INF/spring.schemas
b/components/camel-spring-security/src/main/resources/META-INF/spring.schemas
index 1a5dcfe..d683f64 100644
---
a/components/camel-spring-security/src/main/resources/META-INF/spring.schemas
+++
b/components/camel-spring-security/src/main/resources/META-INF/spring.schemas
@@ -46,4 +46,5 @@
http\://camel.apache.org/schema/spring-security/camel-spring-security-2.10.1.xsd
http\://camel.apache.org/schema/spring-security/camel-spring-security-2.10.2.xsd=schema/camel-spring-security.xsd
http\://camel.apache.org/schema/spring-security/camel-spring-security-2.10.3.xsd=schema/camel-spring-security.xsd
http\://camel.apache.org/schema/spring-security/camel-spring-security-2.10.4.xsd=schema/camel-spring-security.xsd
+http\://camel.apache.org/schema/spring-security/camel-spring-security-2.10.5.xsd=schema/camel-spring-security.xsd
http\://camel.apache.org/schema/spring-security/camel-spring-security-${project.version}.xsd=schema/camel-spring-security.xsd
http://git-wip-us.apache.org/repos/asf/camel/blob/00b8cd9b/components/camel-spring/src/main/resources/META-INF/spring.schemas
--
diff --git a/components/camel-spring/src/main/resources/META-INF
git commit: CAMEL-6491: Installation of camel-leveldb feature fails
Updated Branches:
refs/heads/camel-2.10.x 04be110cc - ab8dfa70c
CAMEL-6491: Installation of camel-leveldb feature fails
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/ab8dfa70
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/ab8dfa70
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/ab8dfa70
Branch: refs/heads/camel-2.10.x
Commit: ab8dfa70c5a4d73ac7aeb25d992df6a4cc87c84f
Parents: 04be110
Author: cmueller cmuel...@apache.org
Authored: Tue Jun 25 23:06:51 2013 +0200
Committer: cmueller cmuel...@apache.org
Committed: Tue Jun 25 23:06:51 2013 +0200
--
platforms/karaf/features/src/main/resources/features.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/camel/blob/ab8dfa70/platforms/karaf/features/src/main/resources/features.xml
--
diff --git a/platforms/karaf/features/src/main/resources/features.xml
b/platforms/karaf/features/src/main/resources/features.xml
index 4c496e1..1719e42 100644
--- a/platforms/karaf/features/src/main/resources/features.xml
+++ b/platforms/karaf/features/src/main/resources/features.xml
@@ -583,7 +583,7 @@
/feature
feature name='camel-leveldb' version='${project.version}' resolver='(obr)'
start-level='50'
feature version='${project.version}'camel-core/feature
-bundle
dependency='true'wrap:mvn:org.fusesource.leveldbjni/leveldbjni-all/${leveldbjni-version}/bundle
+bundle
dependency='true'wrap:mvn:org.fusesource.leveldbjni/leveldbjni-all/${leveldbjni-version}$Bundle-Version=${leveldbjni-version}amp;Export-Package=*;-noimport:=true;version=${leveldbjni-version}/bundle
bundle
dependency='true'mvn:org.fusesource.hawtbuf/hawtbuf/${hawtbuf-version}/bundle
bundlemvn:org.apache.camel/camel-leveldb/${project.version}/bundle
/feature
[1/8] git commit: downgrade the maven-release-plugin from 2.4.1 to 2.2.1 because of MRELEASE-695
Updated Branches: refs/heads/camel-2.10.x edda88471 - 7d8a31c63 downgrade the maven-release-plugin from 2.4.1 to 2.2.1 because of MRELEASE-695 Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/5f994b02 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/5f994b02 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/5f994b02 Branch: refs/heads/camel-2.10.x Commit: 5f994b0268812a7c379ea5a553b677356d9b1fbd Parents: edda884 Author: cmueller cmuel...@apache.org Authored: Sat Jun 22 14:04:29 2013 +0200 Committer: cmueller cmuel...@apache.org Committed: Sun Jun 23 11:02:55 2013 +0200 -- pom.xml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/camel/blob/5f994b02/pom.xml -- diff --git a/pom.xml b/pom.xml index 4d14c4b..9ffb310 100755 --- a/pom.xml +++ b/pom.xml @@ -207,7 +207,9 @@ plugin groupIdorg.apache.maven.plugins/groupId artifactIdmaven-release-plugin/artifactId - version2.4.1/version + !-- we have to stick to this version unti the below issue is resolved -- + !-- see http://jira.codehaus.org/browse/MRELEASE-695 -- + version2.2.1/version configuration localCheckouttrue/localCheckout pushChangesfalse/pushChanges
[6/8] git commit: downgrade the maven-release-plugin from 2.2.1 to 2.1 because of MRELEASE-695
downgrade the maven-release-plugin from 2.2.1 to 2.1 because of MRELEASE-695 Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/bdd25815 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/bdd25815 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/bdd25815 Branch: refs/heads/camel-2.10.x Commit: bdd258152c73acecb79a20ec052679beffbba28f Parents: c9c2821 Author: cmueller cmuel...@apache.org Authored: Sat Jun 22 15:59:17 2013 +0200 Committer: cmueller cmuel...@apache.org Committed: Sun Jun 23 11:02:56 2013 +0200 -- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/camel/blob/bdd25815/pom.xml -- diff --git a/pom.xml b/pom.xml index 3d13fb2..f7d2e74 100755 --- a/pom.xml +++ b/pom.xml @@ -209,7 +209,7 @@ artifactIdmaven-release-plugin/artifactId !-- we have to stick to this version unti the below issue is resolved -- !-- see http://jira.codehaus.org/browse/MRELEASE-695 -- - version2.2.1/version + version2.1/version configuration localCheckouttrue/localCheckout pushChangesfalse/pushChanges
[7/8] [maven-release-plugin] prepare for next development iteration
http://git-wip-us.apache.org/repos/asf/camel/blob/7d8a31c6/components/camel-web/pom.xml -- diff --git a/components/camel-web/pom.xml b/components/camel-web/pom.xml index 1830e9e..20397c7 100644 --- a/components/camel-web/pom.xml +++ b/components/camel-web/pom.xml @@ -19,7 +19,7 @@ parent artifactIdcomponents/artifactId groupIdorg.apache.camel/groupId -version2.10.5/version +version2.10.6-SNAPSHOT/version /parent modelVersion4.0.0/modelVersion artifactIdcamel-web/artifactId http://git-wip-us.apache.org/repos/asf/camel/blob/7d8a31c6/components/camel-websocket/pom.xml -- diff --git a/components/camel-websocket/pom.xml b/components/camel-websocket/pom.xml index 3ff6e00..afcd212 100644 --- a/components/camel-websocket/pom.xml +++ b/components/camel-websocket/pom.xml @@ -22,7 +22,7 @@ parent groupIdorg.apache.camel/groupId artifactIdcamel-parent/artifactId -version2.10.5/version +version2.10.6-SNAPSHOT/version relativePath../../parent/relativePath /parent http://git-wip-us.apache.org/repos/asf/camel/blob/7d8a31c6/components/camel-xmlbeans/pom.xml -- diff --git a/components/camel-xmlbeans/pom.xml b/components/camel-xmlbeans/pom.xml index 6889b20..efe5820 100644 --- a/components/camel-xmlbeans/pom.xml +++ b/components/camel-xmlbeans/pom.xml @@ -22,7 +22,7 @@ parent groupIdorg.apache.camel/groupId artifactIdcamel-parent/artifactId -version2.10.5/version +version2.10.6-SNAPSHOT/version relativePath../../parent/relativePath /parent http://git-wip-us.apache.org/repos/asf/camel/blob/7d8a31c6/components/camel-xmljson/pom.xml -- diff --git a/components/camel-xmljson/pom.xml b/components/camel-xmljson/pom.xml index 75b807c..85ed80d 100644 --- a/components/camel-xmljson/pom.xml +++ b/components/camel-xmljson/pom.xml @@ -22,7 +22,7 @@ parent groupIdorg.apache.camel/groupId artifactIdcamel-parent/artifactId -version2.10.5/version +version2.10.6-SNAPSHOT/version relativePath../../parent/relativePath /parent http://git-wip-us.apache.org/repos/asf/camel/blob/7d8a31c6/components/camel-xmlsecurity/pom.xml -- diff --git a/components/camel-xmlsecurity/pom.xml b/components/camel-xmlsecurity/pom.xml index 85e1fdf..4c3e457 100755 --- a/components/camel-xmlsecurity/pom.xml +++ b/components/camel-xmlsecurity/pom.xml @@ -22,7 +22,7 @@ parent groupIdorg.apache.camel/groupId artifactIdcomponents/artifactId -version2.10.5/version +version2.10.6-SNAPSHOT/version /parent artifactIdcamel-xmlsecurity/artifactId http://git-wip-us.apache.org/repos/asf/camel/blob/7d8a31c6/components/camel-xmpp/pom.xml -- diff --git a/components/camel-xmpp/pom.xml b/components/camel-xmpp/pom.xml index 209a5e5..2a105a1 100644 --- a/components/camel-xmpp/pom.xml +++ b/components/camel-xmpp/pom.xml @@ -22,7 +22,7 @@ parent groupIdorg.apache.camel/groupId artifactIdcamel-parent/artifactId -version2.10.5/version +version2.10.6-SNAPSHOT/version relativePath../../parent/relativePath /parent http://git-wip-us.apache.org/repos/asf/camel/blob/7d8a31c6/components/camel-xstream/pom.xml -- diff --git a/components/camel-xstream/pom.xml b/components/camel-xstream/pom.xml index b1a9630..6adfefd 100644 --- a/components/camel-xstream/pom.xml +++ b/components/camel-xstream/pom.xml @@ -22,7 +22,7 @@ parent groupIdorg.apache.camel/groupId artifactIdcamel-parent/artifactId -version2.10.5/version +version2.10.6-SNAPSHOT/version relativePath../../parent/relativePath /parent http://git-wip-us.apache.org/repos/asf/camel/blob/7d8a31c6/components/camel-zookeeper/pom.xml -- diff --git a/components/camel-zookeeper/pom.xml b/components/camel-zookeeper/pom.xml index 4c44782..5e26fc4 100644 --- a/components/camel-zookeeper/pom.xml +++ b/components/camel-zookeeper/pom.xml @@ -22,7 +22,7 @@ parent artifactIdcomponents/artifactId groupIdorg.apache.camel/groupId -version2.10.5/version +version2.10.6-SNAPSHOT/version /parent artifactIdcamel-zookeeper/artifactId http://git-wip-us.apache.org/repos/asf/camel/blob/7d8a31c6/components/pom.xml -- diff --git a/components/pom.xml b/components/pom.xml index 8ae5e27..d382a8e 100644 --- a/components/pom.xml +++ b/components/pom.xml @@ -21,7
[5/8] git commit: explicitly set the tagNameFormat in maven-release-plugin
explicitly set the tagNameFormat in maven-release-plugin
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/c9c28210
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/c9c28210
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/c9c28210
Branch: refs/heads/camel-2.10.x
Commit: c9c282108e0e889c066fe9761824a0e2f4b48af2
Parents: 5f994b0
Author: cmueller cmuel...@apache.org
Authored: Sat Jun 22 15:05:20 2013 +0200
Committer: cmueller cmuel...@apache.org
Committed: Sun Jun 23 11:02:56 2013 +0200
--
pom.xml | 1 +
1 file changed, 1 insertion(+)
--
http://git-wip-us.apache.org/repos/asf/camel/blob/c9c28210/pom.xml
--
diff --git a/pom.xml b/pom.xml
index 9ffb310..3d13fb2 100755
--- a/pom.xml
+++ b/pom.xml
@@ -213,6 +213,7 @@
configuration
localCheckouttrue/localCheckout
pushChangesfalse/pushChanges
+
tagNameFormat@{project.artifactId}-@{project.version}/tagNameFormat
useReleaseProfilefalse/useReleaseProfile
preparationGoalsclean install/preparationGoals
goalsdeploy/goals
Git Push Summary
Updated Tags: refs/tags/camel-2.10.5 [created] b2ceba2d9
[1/2] [maven-release-plugin] prepare for next development iteration
Updated Branches: refs/heads/camel-2.10.x 2d0bd5a51 - 56002dd20 http://git-wip-us.apache.org/repos/asf/camel/blob/56002dd2/components/camel-velocity/pom.xml -- diff --git a/components/camel-velocity/pom.xml b/components/camel-velocity/pom.xml index a4b1ff3..c94ece0 100644 --- a/components/camel-velocity/pom.xml +++ b/components/camel-velocity/pom.xml @@ -22,7 +22,7 @@ parent groupIdorg.apache.camel/groupId artifactIdcamel-parent/artifactId -version2.10.5-SNAPSHOT/version +version2.10.6-SNAPSHOT/version relativePath../../parent/relativePath /parent http://git-wip-us.apache.org/repos/asf/camel/blob/56002dd2/components/camel-web-standalone/pom.xml -- diff --git a/components/camel-web-standalone/pom.xml b/components/camel-web-standalone/pom.xml index d7a67d9..08255e7 100755 --- a/components/camel-web-standalone/pom.xml +++ b/components/camel-web-standalone/pom.xml @@ -20,7 +20,7 @@ parent artifactIdcomponents/artifactId groupIdorg.apache.camel/groupId -version2.10.5-SNAPSHOT/version +version2.10.6-SNAPSHOT/version /parent modelVersion4.0.0/modelVersion artifactIdcamel-web-standalone/artifactId http://git-wip-us.apache.org/repos/asf/camel/blob/56002dd2/components/camel-web/pom.xml -- diff --git a/components/camel-web/pom.xml b/components/camel-web/pom.xml index 1bfc76f..20397c7 100644 --- a/components/camel-web/pom.xml +++ b/components/camel-web/pom.xml @@ -19,7 +19,7 @@ parent artifactIdcomponents/artifactId groupIdorg.apache.camel/groupId -version2.10.5-SNAPSHOT/version +version2.10.6-SNAPSHOT/version /parent modelVersion4.0.0/modelVersion artifactIdcamel-web/artifactId http://git-wip-us.apache.org/repos/asf/camel/blob/56002dd2/components/camel-websocket/pom.xml -- diff --git a/components/camel-websocket/pom.xml b/components/camel-websocket/pom.xml index ffc7eceb..afcd212 100644 --- a/components/camel-websocket/pom.xml +++ b/components/camel-websocket/pom.xml @@ -22,7 +22,7 @@ parent groupIdorg.apache.camel/groupId artifactIdcamel-parent/artifactId -version2.10.5-SNAPSHOT/version +version2.10.6-SNAPSHOT/version relativePath../../parent/relativePath /parent http://git-wip-us.apache.org/repos/asf/camel/blob/56002dd2/components/camel-xmlbeans/pom.xml -- diff --git a/components/camel-xmlbeans/pom.xml b/components/camel-xmlbeans/pom.xml index 068de7e..efe5820 100644 --- a/components/camel-xmlbeans/pom.xml +++ b/components/camel-xmlbeans/pom.xml @@ -22,7 +22,7 @@ parent groupIdorg.apache.camel/groupId artifactIdcamel-parent/artifactId -version2.10.5-SNAPSHOT/version +version2.10.6-SNAPSHOT/version relativePath../../parent/relativePath /parent http://git-wip-us.apache.org/repos/asf/camel/blob/56002dd2/components/camel-xmljson/pom.xml -- diff --git a/components/camel-xmljson/pom.xml b/components/camel-xmljson/pom.xml index 4ff79a3..85ed80d 100644 --- a/components/camel-xmljson/pom.xml +++ b/components/camel-xmljson/pom.xml @@ -22,7 +22,7 @@ parent groupIdorg.apache.camel/groupId artifactIdcamel-parent/artifactId -version2.10.5-SNAPSHOT/version +version2.10.6-SNAPSHOT/version relativePath../../parent/relativePath /parent http://git-wip-us.apache.org/repos/asf/camel/blob/56002dd2/components/camel-xmlsecurity/pom.xml -- diff --git a/components/camel-xmlsecurity/pom.xml b/components/camel-xmlsecurity/pom.xml index dba8ddd..4c3e457 100755 --- a/components/camel-xmlsecurity/pom.xml +++ b/components/camel-xmlsecurity/pom.xml @@ -22,7 +22,7 @@ parent groupIdorg.apache.camel/groupId artifactIdcomponents/artifactId -version2.10.5-SNAPSHOT/version +version2.10.6-SNAPSHOT/version /parent artifactIdcamel-xmlsecurity/artifactId http://git-wip-us.apache.org/repos/asf/camel/blob/56002dd2/components/camel-xmpp/pom.xml -- diff --git a/components/camel-xmpp/pom.xml b/components/camel-xmpp/pom.xml index fe3c43e..2a105a1 100644 --- a/components/camel-xmpp/pom.xml +++ b/components/camel-xmpp/pom.xml @@ -22,7 +22,7 @@ parent groupIdorg.apache.camel/groupId artifactIdcamel-parent/artifactId -version2.10.5-SNAPSHOT/version +version2.10.6-SNAPSHOT/version relativePath../../parent/relativePath /parent
[1/2] Revert [maven-release-plugin] prepare for next development iteration
Updated Branches: refs/heads/camel-2.10.x 56002dd20 - 0d5872b15 http://git-wip-us.apache.org/repos/asf/camel/blob/0d5872b1/components/camel-velocity/pom.xml -- diff --git a/components/camel-velocity/pom.xml b/components/camel-velocity/pom.xml index c94ece0..a4b1ff3 100644 --- a/components/camel-velocity/pom.xml +++ b/components/camel-velocity/pom.xml @@ -22,7 +22,7 @@ parent groupIdorg.apache.camel/groupId artifactIdcamel-parent/artifactId -version2.10.6-SNAPSHOT/version +version2.10.5-SNAPSHOT/version relativePath../../parent/relativePath /parent http://git-wip-us.apache.org/repos/asf/camel/blob/0d5872b1/components/camel-web-standalone/pom.xml -- diff --git a/components/camel-web-standalone/pom.xml b/components/camel-web-standalone/pom.xml index 08255e7..d7a67d9 100755 --- a/components/camel-web-standalone/pom.xml +++ b/components/camel-web-standalone/pom.xml @@ -20,7 +20,7 @@ parent artifactIdcomponents/artifactId groupIdorg.apache.camel/groupId -version2.10.6-SNAPSHOT/version +version2.10.5-SNAPSHOT/version /parent modelVersion4.0.0/modelVersion artifactIdcamel-web-standalone/artifactId http://git-wip-us.apache.org/repos/asf/camel/blob/0d5872b1/components/camel-web/pom.xml -- diff --git a/components/camel-web/pom.xml b/components/camel-web/pom.xml index 20397c7..1bfc76f 100644 --- a/components/camel-web/pom.xml +++ b/components/camel-web/pom.xml @@ -19,7 +19,7 @@ parent artifactIdcomponents/artifactId groupIdorg.apache.camel/groupId -version2.10.6-SNAPSHOT/version +version2.10.5-SNAPSHOT/version /parent modelVersion4.0.0/modelVersion artifactIdcamel-web/artifactId http://git-wip-us.apache.org/repos/asf/camel/blob/0d5872b1/components/camel-websocket/pom.xml -- diff --git a/components/camel-websocket/pom.xml b/components/camel-websocket/pom.xml index afcd212..ffc7eceb 100644 --- a/components/camel-websocket/pom.xml +++ b/components/camel-websocket/pom.xml @@ -22,7 +22,7 @@ parent groupIdorg.apache.camel/groupId artifactIdcamel-parent/artifactId -version2.10.6-SNAPSHOT/version +version2.10.5-SNAPSHOT/version relativePath../../parent/relativePath /parent http://git-wip-us.apache.org/repos/asf/camel/blob/0d5872b1/components/camel-xmlbeans/pom.xml -- diff --git a/components/camel-xmlbeans/pom.xml b/components/camel-xmlbeans/pom.xml index efe5820..068de7e 100644 --- a/components/camel-xmlbeans/pom.xml +++ b/components/camel-xmlbeans/pom.xml @@ -22,7 +22,7 @@ parent groupIdorg.apache.camel/groupId artifactIdcamel-parent/artifactId -version2.10.6-SNAPSHOT/version +version2.10.5-SNAPSHOT/version relativePath../../parent/relativePath /parent http://git-wip-us.apache.org/repos/asf/camel/blob/0d5872b1/components/camel-xmljson/pom.xml -- diff --git a/components/camel-xmljson/pom.xml b/components/camel-xmljson/pom.xml index 85ed80d..4ff79a3 100644 --- a/components/camel-xmljson/pom.xml +++ b/components/camel-xmljson/pom.xml @@ -22,7 +22,7 @@ parent groupIdorg.apache.camel/groupId artifactIdcamel-parent/artifactId -version2.10.6-SNAPSHOT/version +version2.10.5-SNAPSHOT/version relativePath../../parent/relativePath /parent http://git-wip-us.apache.org/repos/asf/camel/blob/0d5872b1/components/camel-xmlsecurity/pom.xml -- diff --git a/components/camel-xmlsecurity/pom.xml b/components/camel-xmlsecurity/pom.xml index 4c3e457..dba8ddd 100755 --- a/components/camel-xmlsecurity/pom.xml +++ b/components/camel-xmlsecurity/pom.xml @@ -22,7 +22,7 @@ parent groupIdorg.apache.camel/groupId artifactIdcomponents/artifactId -version2.10.6-SNAPSHOT/version +version2.10.5-SNAPSHOT/version /parent artifactIdcamel-xmlsecurity/artifactId http://git-wip-us.apache.org/repos/asf/camel/blob/0d5872b1/components/camel-xmpp/pom.xml -- diff --git a/components/camel-xmpp/pom.xml b/components/camel-xmpp/pom.xml index 2a105a1..fe3c43e 100644 --- a/components/camel-xmpp/pom.xml +++ b/components/camel-xmpp/pom.xml @@ -22,7 +22,7 @@ parent groupIdorg.apache.camel/groupId artifactIdcamel-parent/artifactId -version2.10.6-SNAPSHOT/version +version2.10.5-SNAPSHOT/version relativePath../../parent/relativePath /parent
Git Push Summary
Updated Tags: refs/tags/camel-2.10.5 [deleted] b2ceba2d9
git commit: fixed CS error
Updated Branches:
refs/heads/camel-2.10.x 36624994c - 5dbfc4a50
fixed CS error
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/5dbfc4a5
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/5dbfc4a5
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/5dbfc4a5
Branch: refs/heads/camel-2.10.x
Commit: 5dbfc4a50d1069384122fc6065fef7ac0066b7dd
Parents: 3662499
Author: cmueller cmuel...@apache.org
Authored: Thu Jun 20 20:59:18 2013 +0200
Committer: cmueller cmuel...@apache.org
Committed: Thu Jun 20 20:59:18 2013 +0200
--
.../java/org/apache/camel/example/client/CamelClientRemoting.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/camel/blob/5dbfc4a5/examples/camel-example-spring-jms/src/main/java/org/apache/camel/example/client/CamelClientRemoting.java
--
diff --git
a/examples/camel-example-spring-jms/src/main/java/org/apache/camel/example/client/CamelClientRemoting.java
b/examples/camel-example-spring-jms/src/main/java/org/apache/camel/example/client/CamelClientRemoting.java
index e7110e5..ac7f4eb 100644
---
a/examples/camel-example-spring-jms/src/main/java/org/apache/camel/example/client/CamelClientRemoting.java
+++
b/examples/camel-example-spring-jms/src/main/java/org/apache/camel/example/client/CamelClientRemoting.java
@@ -45,7 +45,7 @@ public final class CamelClientRemoting {
System.out.println(... the result is: + response);
// we're done so let's properly close the application context
- context.close();
+context.close();
}
// END SNIPPET: e1
[3/3] git commit: CAMEL-6317: Camel-validator not able to resolve schema when using useSharedSchema=false Thanks David J. M. Karlsen for reporting it
CAMEL-6317: Camel-validator not able to resolve schema when using
useSharedSchema=false
Thanks David J. M. Karlsen for reporting it
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/c5d5d612
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/c5d5d612
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/c5d5d612
Branch: refs/heads/master
Commit: c5d5d6124e5fac4181a5424510fa69d2f23fa078
Parents: a259399
Author: cmueller cmuel...@apache.org
Authored: Thu Jun 20 22:09:30 2013 +0200
Committer: cmueller cmuel...@apache.org
Committed: Thu Jun 20 22:09:30 2013 +0200
--
.../org/apache/camel/component/validator/ValidatorComponent.java| 1 -
1 file changed, 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/camel/blob/c5d5d612/camel-core/src/main/java/org/apache/camel/component/validator/ValidatorComponent.java
--
diff --git
a/camel-core/src/main/java/org/apache/camel/component/validator/ValidatorComponent.java
b/camel-core/src/main/java/org/apache/camel/component/validator/ValidatorComponent.java
index f69a5b9..5ec52f4 100644
---
a/camel-core/src/main/java/org/apache/camel/component/validator/ValidatorComponent.java
+++
b/camel-core/src/main/java/org/apache/camel/component/validator/ValidatorComponent.java
@@ -51,7 +51,6 @@ public class ValidatorComponent extends DefaultComponent {
ValidatingProcessor validator = new ValidatingProcessor();
validator.setSchemaAsByteArray(bytes);
-//validator.setSchemaSource(source);
LOG.debug({} using schema resource: {}, this, resourceUri);
configureValidator(validator, uri, remaining, parameters);
[1/3] git commit: CAMEL-6317: Camel-validator not able to resolve schema when using useSharedSchema=false Thanks David J. M. Karlsen for reporting it
Updated Branches:
refs/heads/master a52864dfc - c5d5d6124
CAMEL-6317: Camel-validator not able to resolve schema when using
useSharedSchema=false
Thanks David J. M. Karlsen for reporting it
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/a2593990
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/a2593990
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/a2593990
Branch: refs/heads/master
Commit: a2593990d45ae9acac14778701cc8e0cce24f6f4
Parents: b21239f
Author: cmueller cmuel...@apache.org
Authored: Thu Jun 20 22:07:31 2013 +0200
Committer: cmueller cmuel...@apache.org
Committed: Thu Jun 20 22:08:01 2013 +0200
--
.../component/validator/ValidatorComponent.java | 19 +++
.../validation/ValidatingProcessor.java | 20 +++-
.../component/validator/ValidatorRouteTest.java | 15 ---
3 files changed, 42 insertions(+), 12 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/camel/blob/a2593990/camel-core/src/main/java/org/apache/camel/component/validator/ValidatorComponent.java
--
diff --git
a/camel-core/src/main/java/org/apache/camel/component/validator/ValidatorComponent.java
b/camel-core/src/main/java/org/apache/camel/component/validator/ValidatorComponent.java
index 58de3e7..f69a5b9 100644
---
a/camel-core/src/main/java/org/apache/camel/component/validator/ValidatorComponent.java
+++
b/camel-core/src/main/java/org/apache/camel/component/validator/ValidatorComponent.java
@@ -19,11 +19,8 @@ package org.apache.camel.component.validator;
import java.io.InputStream;
import java.util.Map;
-import javax.xml.transform.stream.StreamSource;
-
-import org.w3c.dom.ls.LSResourceResolver;
-
import org.apache.camel.Endpoint;
+import org.apache.camel.converter.IOConverter;
import org.apache.camel.impl.DefaultComponent;
import org.apache.camel.impl.ProcessorEndpoint;
import org.apache.camel.processor.validation.ValidatingProcessor;
@@ -31,6 +28,7 @@ import org.apache.camel.util.IOHelper;
import org.apache.camel.util.ResourceHelper;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import org.w3c.dom.ls.LSResourceResolver;
/**
* The a href=http://camel.apache.org/validation.html;Validator
Component/a
@@ -43,18 +41,23 @@ public class ValidatorComponent extends DefaultComponent {
protected Endpoint createEndpoint(String uri, String remaining,
MapString, Object parameters) throws Exception {
final String resourceUri = remaining;
InputStream is =
ResourceHelper.resolveMandatoryResourceAsInputStream(getCamelContext().getClassResolver(),
resourceUri);
-StreamSource source = new StreamSource(is);
+byte[] bytes = null;
+try {
+bytes = IOConverter.toBytes(is);
+} finally {
+// and make sure to close the input stream after the schema has
been loaded
+IOHelper.close(is);
+}
ValidatingProcessor validator = new ValidatingProcessor();
-validator.setSchemaSource(source);
+validator.setSchemaAsByteArray(bytes);
+//validator.setSchemaSource(source);
LOG.debug({} using schema resource: {}, this, resourceUri);
configureValidator(validator, uri, remaining, parameters);
// force loading of schema at create time otherwise concurrent
// processing could cause thread safe issues for the
javax.xml.validation.SchemaFactory
validator.loadSchema();
-// and make sure to close the input stream after the schema has been
loaded
-IOHelper.close(is);
return new ProcessorEndpoint(uri, this, validator);
}
http://git-wip-us.apache.org/repos/asf/camel/blob/a2593990/camel-core/src/main/java/org/apache/camel/processor/validation/ValidatingProcessor.java
--
diff --git
a/camel-core/src/main/java/org/apache/camel/processor/validation/ValidatingProcessor.java
b/camel-core/src/main/java/org/apache/camel/processor/validation/ValidatingProcessor.java
index f2922bc..bd9f783 100644
---
a/camel-core/src/main/java/org/apache/camel/processor/validation/ValidatingProcessor.java
+++
b/camel-core/src/main/java/org/apache/camel/processor/validation/ValidatingProcessor.java
@@ -16,6 +16,7 @@
*/
package org.apache.camel.processor.validation;
+import java.io.ByteArrayInputStream;
import java.io.File;
import java.io.IOException;
import java.io.InputStream;
@@ -68,6 +69,7 @@ public class ValidatingProcessor implements AsyncProcessor {
private SchemaFactory schemaFactory;
private URL schemaUrl;
private File schemaFile;
+private byte[] schemaAsByteArray;
private ValidatorErrorHandler
[2/3] git commit: CAMEL-6464: connectionTimeout property is ignored by JavaMail Thanks to Marco Zapletal for reporting it
CAMEL-6464: connectionTimeout property is ignored by JavaMail
Thanks to Marco Zapletal for reporting it
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/b21239f7
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/b21239f7
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/b21239f7
Branch: refs/heads/master
Commit: b21239f709384f9d7c594d920f16c71d0007f61e
Parents: a52864d
Author: cmueller cmuel...@apache.org
Authored: Thu Jun 20 21:26:44 2013 +0200
Committer: cmueller cmuel...@apache.org
Committed: Thu Jun 20 22:08:01 2013 +0200
--
.../java/org/apache/camel/component/mail/MailConfiguration.java | 4 ++--
.../main/java/org/apache/camel/component/mail/MailConstants.java | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/camel/blob/b21239f7/components/camel-mail/src/main/java/org/apache/camel/component/mail/MailConfiguration.java
--
diff --git
a/components/camel-mail/src/main/java/org/apache/camel/component/mail/MailConfiguration.java
b/components/camel-mail/src/main/java/org/apache/camel/component/mail/MailConfiguration.java
index 4614f40..bb0d70e 100644
---
a/components/camel-mail/src/main/java/org/apache/camel/component/mail/MailConfiguration.java
+++
b/components/camel-mail/src/main/java/org/apache/camel/component/mail/MailConfiguration.java
@@ -55,7 +55,7 @@ public class MailConfiguration implements Cloneable {
private String replyTo;
private int fetchSize = -1;
private boolean debugMode;
-private long connectionTimeout =
MailConstants.MAIL_DEFAULT_CONNECTION_TIMEOUT;
+private int connectionTimeout =
MailConstants.MAIL_DEFAULT_CONNECTION_TIMEOUT;
private boolean dummyTrustManager;
private String contentType = text/plain;
private String alternativeBodyHeader = MailConstants.MAIL_ALTERNATIVE_BODY;
@@ -418,7 +418,7 @@ public class MailConfiguration implements Cloneable {
return connectionTimeout;
}
-public void setConnectionTimeout(long connectionTimeout) {
+public void setConnectionTimeout(int connectionTimeout) {
this.connectionTimeout = connectionTimeout;
}
http://git-wip-us.apache.org/repos/asf/camel/blob/b21239f7/components/camel-mail/src/main/java/org/apache/camel/component/mail/MailConstants.java
--
diff --git
a/components/camel-mail/src/main/java/org/apache/camel/component/mail/MailConstants.java
b/components/camel-mail/src/main/java/org/apache/camel/component/mail/MailConstants.java
index 65fd523..10d4cee 100644
---
a/components/camel-mail/src/main/java/org/apache/camel/component/mail/MailConstants.java
+++
b/components/camel-mail/src/main/java/org/apache/camel/component/mail/MailConstants.java
@@ -23,7 +23,7 @@ public final class MailConstants {
public static final String MAIL_DEFAULT_FOLDER = INBOX;
public static final String MAIL_DEFAULT_FROM = camel@localhost;
public static final String MAIL_MESSAGE_ID = CamelMailMessageId;
-public static final long MAIL_DEFAULT_CONNECTION_TIMEOUT = 3L;
+public static final int MAIL_DEFAULT_CONNECTION_TIMEOUT = 3;
private MailConstants() {
// utility class
git commit: CAMEL-6464: connectionTimeout property is ignored by JavaMail Thanks to Marco Zapletal for reporting it
Updated Branches:
refs/heads/camel-2.11.x 8221f2ce6 - a1c4835ea
CAMEL-6464: connectionTimeout property is ignored by JavaMail
Thanks to Marco Zapletal for reporting it
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/a1c4835e
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/a1c4835e
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/a1c4835e
Branch: refs/heads/camel-2.11.x
Commit: a1c4835eaa5ab8173cfb357a373ded0cf363ca06
Parents: 8221f2c
Author: cmueller cmuel...@apache.org
Authored: Thu Jun 20 21:26:44 2013 +0200
Committer: cmueller cmuel...@apache.org
Committed: Thu Jun 20 22:14:38 2013 +0200
--
.../java/org/apache/camel/component/mail/MailConfiguration.java | 4 ++--
.../main/java/org/apache/camel/component/mail/MailConstants.java | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/camel/blob/a1c4835e/components/camel-mail/src/main/java/org/apache/camel/component/mail/MailConfiguration.java
--
diff --git
a/components/camel-mail/src/main/java/org/apache/camel/component/mail/MailConfiguration.java
b/components/camel-mail/src/main/java/org/apache/camel/component/mail/MailConfiguration.java
index 4614f40..bb0d70e 100644
---
a/components/camel-mail/src/main/java/org/apache/camel/component/mail/MailConfiguration.java
+++
b/components/camel-mail/src/main/java/org/apache/camel/component/mail/MailConfiguration.java
@@ -55,7 +55,7 @@ public class MailConfiguration implements Cloneable {
private String replyTo;
private int fetchSize = -1;
private boolean debugMode;
-private long connectionTimeout =
MailConstants.MAIL_DEFAULT_CONNECTION_TIMEOUT;
+private int connectionTimeout =
MailConstants.MAIL_DEFAULT_CONNECTION_TIMEOUT;
private boolean dummyTrustManager;
private String contentType = text/plain;
private String alternativeBodyHeader = MailConstants.MAIL_ALTERNATIVE_BODY;
@@ -418,7 +418,7 @@ public class MailConfiguration implements Cloneable {
return connectionTimeout;
}
-public void setConnectionTimeout(long connectionTimeout) {
+public void setConnectionTimeout(int connectionTimeout) {
this.connectionTimeout = connectionTimeout;
}
http://git-wip-us.apache.org/repos/asf/camel/blob/a1c4835e/components/camel-mail/src/main/java/org/apache/camel/component/mail/MailConstants.java
--
diff --git
a/components/camel-mail/src/main/java/org/apache/camel/component/mail/MailConstants.java
b/components/camel-mail/src/main/java/org/apache/camel/component/mail/MailConstants.java
index 65fd523..10d4cee 100644
---
a/components/camel-mail/src/main/java/org/apache/camel/component/mail/MailConstants.java
+++
b/components/camel-mail/src/main/java/org/apache/camel/component/mail/MailConstants.java
@@ -23,7 +23,7 @@ public final class MailConstants {
public static final String MAIL_DEFAULT_FOLDER = INBOX;
public static final String MAIL_DEFAULT_FROM = camel@localhost;
public static final String MAIL_MESSAGE_ID = CamelMailMessageId;
-public static final long MAIL_DEFAULT_CONNECTION_TIMEOUT = 3L;
+public static final int MAIL_DEFAULT_CONNECTION_TIMEOUT = 3;
private MailConstants() {
// utility class
[2/2] git commit: CAMEL-6317: Camel-validator not able to resolve schema when using useSharedSchema=false Thanks David J. M. Karlsen for reporting it
CAMEL-6317: Camel-validator not able to resolve schema when using
useSharedSchema=false
Thanks David J. M. Karlsen for reporting it
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/270962a5
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/270962a5
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/270962a5
Branch: refs/heads/camel-2.11.x
Commit: 270962a5423376a1aead945aeb503c2a3869f4a3
Parents: 612f95b
Author: cmueller cmuel...@apache.org
Authored: Thu Jun 20 22:09:30 2013 +0200
Committer: cmueller cmuel...@apache.org
Committed: Thu Jun 20 22:15:28 2013 +0200
--
.../org/apache/camel/component/validator/ValidatorComponent.java| 1 -
1 file changed, 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/camel/blob/270962a5/camel-core/src/main/java/org/apache/camel/component/validator/ValidatorComponent.java
--
diff --git
a/camel-core/src/main/java/org/apache/camel/component/validator/ValidatorComponent.java
b/camel-core/src/main/java/org/apache/camel/component/validator/ValidatorComponent.java
index f69a5b9..5ec52f4 100644
---
a/camel-core/src/main/java/org/apache/camel/component/validator/ValidatorComponent.java
+++
b/camel-core/src/main/java/org/apache/camel/component/validator/ValidatorComponent.java
@@ -51,7 +51,6 @@ public class ValidatorComponent extends DefaultComponent {
ValidatingProcessor validator = new ValidatingProcessor();
validator.setSchemaAsByteArray(bytes);
-//validator.setSchemaSource(source);
LOG.debug({} using schema resource: {}, this, resourceUri);
configureValidator(validator, uri, remaining, parameters);
[1/2] git commit: CAMEL-6317: Camel-validator not able to resolve schema when using useSharedSchema=false Thanks David J. M. Karlsen for reporting it
Updated Branches:
refs/heads/camel-2.11.x a1c4835ea - 270962a54
CAMEL-6317: Camel-validator not able to resolve schema when using
useSharedSchema=false
Thanks David J. M. Karlsen for reporting it
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/612f95bb
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/612f95bb
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/612f95bb
Branch: refs/heads/camel-2.11.x
Commit: 612f95bba302228a0a900f7334d8a571c7a0a74e
Parents: a1c4835
Author: cmueller cmuel...@apache.org
Authored: Thu Jun 20 22:07:31 2013 +0200
Committer: cmueller cmuel...@apache.org
Committed: Thu Jun 20 22:15:15 2013 +0200
--
.../component/validator/ValidatorComponent.java | 19 +++
.../validation/ValidatingProcessor.java | 20 +++-
.../component/validator/ValidatorRouteTest.java | 15 ---
3 files changed, 42 insertions(+), 12 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/camel/blob/612f95bb/camel-core/src/main/java/org/apache/camel/component/validator/ValidatorComponent.java
--
diff --git
a/camel-core/src/main/java/org/apache/camel/component/validator/ValidatorComponent.java
b/camel-core/src/main/java/org/apache/camel/component/validator/ValidatorComponent.java
index 58de3e7..f69a5b9 100644
---
a/camel-core/src/main/java/org/apache/camel/component/validator/ValidatorComponent.java
+++
b/camel-core/src/main/java/org/apache/camel/component/validator/ValidatorComponent.java
@@ -19,11 +19,8 @@ package org.apache.camel.component.validator;
import java.io.InputStream;
import java.util.Map;
-import javax.xml.transform.stream.StreamSource;
-
-import org.w3c.dom.ls.LSResourceResolver;
-
import org.apache.camel.Endpoint;
+import org.apache.camel.converter.IOConverter;
import org.apache.camel.impl.DefaultComponent;
import org.apache.camel.impl.ProcessorEndpoint;
import org.apache.camel.processor.validation.ValidatingProcessor;
@@ -31,6 +28,7 @@ import org.apache.camel.util.IOHelper;
import org.apache.camel.util.ResourceHelper;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import org.w3c.dom.ls.LSResourceResolver;
/**
* The a href=http://camel.apache.org/validation.html;Validator
Component/a
@@ -43,18 +41,23 @@ public class ValidatorComponent extends DefaultComponent {
protected Endpoint createEndpoint(String uri, String remaining,
MapString, Object parameters) throws Exception {
final String resourceUri = remaining;
InputStream is =
ResourceHelper.resolveMandatoryResourceAsInputStream(getCamelContext().getClassResolver(),
resourceUri);
-StreamSource source = new StreamSource(is);
+byte[] bytes = null;
+try {
+bytes = IOConverter.toBytes(is);
+} finally {
+// and make sure to close the input stream after the schema has
been loaded
+IOHelper.close(is);
+}
ValidatingProcessor validator = new ValidatingProcessor();
-validator.setSchemaSource(source);
+validator.setSchemaAsByteArray(bytes);
+//validator.setSchemaSource(source);
LOG.debug({} using schema resource: {}, this, resourceUri);
configureValidator(validator, uri, remaining, parameters);
// force loading of schema at create time otherwise concurrent
// processing could cause thread safe issues for the
javax.xml.validation.SchemaFactory
validator.loadSchema();
-// and make sure to close the input stream after the schema has been
loaded
-IOHelper.close(is);
return new ProcessorEndpoint(uri, this, validator);
}
http://git-wip-us.apache.org/repos/asf/camel/blob/612f95bb/camel-core/src/main/java/org/apache/camel/processor/validation/ValidatingProcessor.java
--
diff --git
a/camel-core/src/main/java/org/apache/camel/processor/validation/ValidatingProcessor.java
b/camel-core/src/main/java/org/apache/camel/processor/validation/ValidatingProcessor.java
index 40995f1..6c325d9 100644
---
a/camel-core/src/main/java/org/apache/camel/processor/validation/ValidatingProcessor.java
+++
b/camel-core/src/main/java/org/apache/camel/processor/validation/ValidatingProcessor.java
@@ -16,6 +16,7 @@
*/
package org.apache.camel.processor.validation;
+import java.io.ByteArrayInputStream;
import java.io.File;
import java.io.IOException;
import java.io.InputStream;
@@ -65,6 +66,7 @@ public class ValidatingProcessor implements Processor {
private SchemaFactory schemaFactory;
private URL schemaUrl;
private File schemaFile;
+private byte[] schemaAsByteArray;
private ValidatorErrorHandler
[2/2] git commit: CAMEL-6317: Camel-validator not able to resolve schema when using useSharedSchema=false Thanks David J. M. Karlsen for reporting it
CAMEL-6317: Camel-validator not able to resolve schema when using
useSharedSchema=false
Thanks David J. M. Karlsen for reporting it
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/755c71dd
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/755c71dd
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/755c71dd
Branch: refs/heads/camel-2.10.x
Commit: 755c71dda8663cd0847a66eabc66a9033ca13013
Parents: b809a84
Author: cmueller cmuel...@apache.org
Authored: Thu Jun 20 22:09:30 2013 +0200
Committer: cmueller cmuel...@apache.org
Committed: Thu Jun 20 22:23:24 2013 +0200
--
.../org/apache/camel/component/validator/ValidatorComponent.java| 1 -
1 file changed, 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/camel/blob/755c71dd/camel-core/src/main/java/org/apache/camel/component/validator/ValidatorComponent.java
--
diff --git
a/camel-core/src/main/java/org/apache/camel/component/validator/ValidatorComponent.java
b/camel-core/src/main/java/org/apache/camel/component/validator/ValidatorComponent.java
index f69a5b9..5ec52f4 100644
---
a/camel-core/src/main/java/org/apache/camel/component/validator/ValidatorComponent.java
+++
b/camel-core/src/main/java/org/apache/camel/component/validator/ValidatorComponent.java
@@ -51,7 +51,6 @@ public class ValidatorComponent extends DefaultComponent {
ValidatingProcessor validator = new ValidatingProcessor();
validator.setSchemaAsByteArray(bytes);
-//validator.setSchemaSource(source);
LOG.debug({} using schema resource: {}, this, resourceUri);
configureValidator(validator, uri, remaining, parameters);
[1/2] git commit: CAMEL-6317: Camel-validator not able to resolve schema when using useSharedSchema=false Thanks David J. M. Karlsen for reporting it
Updated Branches:
refs/heads/camel-2.10.x e85c21375 - 755c71dda
CAMEL-6317: Camel-validator not able to resolve schema when using
useSharedSchema=false
Thanks David J. M. Karlsen for reporting it
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/b809a843
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/b809a843
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/b809a843
Branch: refs/heads/camel-2.10.x
Commit: b809a8430170c92daef3d55a699c496f5e377b2c
Parents: e85c213
Author: cmueller cmuel...@apache.org
Authored: Thu Jun 20 22:07:31 2013 +0200
Committer: cmueller cmuel...@apache.org
Committed: Thu Jun 20 22:22:59 2013 +0200
--
.../component/validator/ValidatorComponent.java | 19 +++
.../validation/ValidatingProcessor.java | 20 +++-
.../component/validator/ValidatorRouteTest.java | 15 ---
3 files changed, 42 insertions(+), 12 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/camel/blob/b809a843/camel-core/src/main/java/org/apache/camel/component/validator/ValidatorComponent.java
--
diff --git
a/camel-core/src/main/java/org/apache/camel/component/validator/ValidatorComponent.java
b/camel-core/src/main/java/org/apache/camel/component/validator/ValidatorComponent.java
index 58de3e7..f69a5b9 100644
---
a/camel-core/src/main/java/org/apache/camel/component/validator/ValidatorComponent.java
+++
b/camel-core/src/main/java/org/apache/camel/component/validator/ValidatorComponent.java
@@ -19,11 +19,8 @@ package org.apache.camel.component.validator;
import java.io.InputStream;
import java.util.Map;
-import javax.xml.transform.stream.StreamSource;
-
-import org.w3c.dom.ls.LSResourceResolver;
-
import org.apache.camel.Endpoint;
+import org.apache.camel.converter.IOConverter;
import org.apache.camel.impl.DefaultComponent;
import org.apache.camel.impl.ProcessorEndpoint;
import org.apache.camel.processor.validation.ValidatingProcessor;
@@ -31,6 +28,7 @@ import org.apache.camel.util.IOHelper;
import org.apache.camel.util.ResourceHelper;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import org.w3c.dom.ls.LSResourceResolver;
/**
* The a href=http://camel.apache.org/validation.html;Validator
Component/a
@@ -43,18 +41,23 @@ public class ValidatorComponent extends DefaultComponent {
protected Endpoint createEndpoint(String uri, String remaining,
MapString, Object parameters) throws Exception {
final String resourceUri = remaining;
InputStream is =
ResourceHelper.resolveMandatoryResourceAsInputStream(getCamelContext().getClassResolver(),
resourceUri);
-StreamSource source = new StreamSource(is);
+byte[] bytes = null;
+try {
+bytes = IOConverter.toBytes(is);
+} finally {
+// and make sure to close the input stream after the schema has
been loaded
+IOHelper.close(is);
+}
ValidatingProcessor validator = new ValidatingProcessor();
-validator.setSchemaSource(source);
+validator.setSchemaAsByteArray(bytes);
+//validator.setSchemaSource(source);
LOG.debug({} using schema resource: {}, this, resourceUri);
configureValidator(validator, uri, remaining, parameters);
// force loading of schema at create time otherwise concurrent
// processing could cause thread safe issues for the
javax.xml.validation.SchemaFactory
validator.loadSchema();
-// and make sure to close the input stream after the schema has been
loaded
-IOHelper.close(is);
return new ProcessorEndpoint(uri, this, validator);
}
http://git-wip-us.apache.org/repos/asf/camel/blob/b809a843/camel-core/src/main/java/org/apache/camel/processor/validation/ValidatingProcessor.java
--
diff --git
a/camel-core/src/main/java/org/apache/camel/processor/validation/ValidatingProcessor.java
b/camel-core/src/main/java/org/apache/camel/processor/validation/ValidatingProcessor.java
index 19fa2b1..57d285b 100644
---
a/camel-core/src/main/java/org/apache/camel/processor/validation/ValidatingProcessor.java
+++
b/camel-core/src/main/java/org/apache/camel/processor/validation/ValidatingProcessor.java
@@ -16,6 +16,7 @@
*/
package org.apache.camel.processor.validation;
+import java.io.ByteArrayInputStream;
import java.io.File;
import java.io.IOException;
import java.io.InputStream;
@@ -67,6 +68,7 @@ public class ValidatingProcessor implements Processor {
private SchemaFactory schemaFactory;
private URL schemaUrl;
private File schemaFile;
+private byte[] schemaAsByteArray;
private ValidatorErrorHandler
git commit: CAMEL-6464: connectionTimeout property is ignored by JavaMail Thanks to Marco Zapletal for reporting it
Updated Branches:
refs/heads/camel-2.10.x 5dbfc4a50 - e85c21375
CAMEL-6464: connectionTimeout property is ignored by JavaMail
Thanks to Marco Zapletal for reporting it
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/e85c2137
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/e85c2137
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/e85c2137
Branch: refs/heads/camel-2.10.x
Commit: e85c2137580aa57188924a3d125b769880d41ffe
Parents: 5dbfc4a
Author: cmueller cmuel...@apache.org
Authored: Thu Jun 20 21:26:44 2013 +0200
Committer: cmueller cmuel...@apache.org
Committed: Thu Jun 20 22:18:33 2013 +0200
--
.../java/org/apache/camel/component/mail/MailConfiguration.java | 4 ++--
.../main/java/org/apache/camel/component/mail/MailConstants.java | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/camel/blob/e85c2137/components/camel-mail/src/main/java/org/apache/camel/component/mail/MailConfiguration.java
--
diff --git
a/components/camel-mail/src/main/java/org/apache/camel/component/mail/MailConfiguration.java
b/components/camel-mail/src/main/java/org/apache/camel/component/mail/MailConfiguration.java
index 4614f40..bb0d70e 100644
---
a/components/camel-mail/src/main/java/org/apache/camel/component/mail/MailConfiguration.java
+++
b/components/camel-mail/src/main/java/org/apache/camel/component/mail/MailConfiguration.java
@@ -55,7 +55,7 @@ public class MailConfiguration implements Cloneable {
private String replyTo;
private int fetchSize = -1;
private boolean debugMode;
-private long connectionTimeout =
MailConstants.MAIL_DEFAULT_CONNECTION_TIMEOUT;
+private int connectionTimeout =
MailConstants.MAIL_DEFAULT_CONNECTION_TIMEOUT;
private boolean dummyTrustManager;
private String contentType = text/plain;
private String alternativeBodyHeader = MailConstants.MAIL_ALTERNATIVE_BODY;
@@ -418,7 +418,7 @@ public class MailConfiguration implements Cloneable {
return connectionTimeout;
}
-public void setConnectionTimeout(long connectionTimeout) {
+public void setConnectionTimeout(int connectionTimeout) {
this.connectionTimeout = connectionTimeout;
}
http://git-wip-us.apache.org/repos/asf/camel/blob/e85c2137/components/camel-mail/src/main/java/org/apache/camel/component/mail/MailConstants.java
--
diff --git
a/components/camel-mail/src/main/java/org/apache/camel/component/mail/MailConstants.java
b/components/camel-mail/src/main/java/org/apache/camel/component/mail/MailConstants.java
index acda232..c6b42ee 100644
---
a/components/camel-mail/src/main/java/org/apache/camel/component/mail/MailConstants.java
+++
b/components/camel-mail/src/main/java/org/apache/camel/component/mail/MailConstants.java
@@ -22,7 +22,7 @@ public final class MailConstants {
public static final String MAIL_ALTERNATIVE_BODY =
CamelMailAlternativeBody;
public static final String MAIL_DEFAULT_FOLDER = INBOX;
public static final String MAIL_DEFAULT_FROM = camel@localhost;
-public static final long MAIL_DEFAULT_CONNECTION_TIMEOUT = 3L;
+public static final int MAIL_DEFAULT_CONNECTION_TIMEOUT = 3;
private MailConstants() {
// utility class
svn commit: r866680 [15/15] - in /websites/production/camel/content/maven: camel-2.10.0/camel-ahc/apidocs/ camel-2.10.0/camel-amqp/apidocs/ camel-2.10.0/camel-apns/apidocs/ camel-2.10.0/camel-atom/api
Modified:
websites/production/camel/content/maven/camel-2.9.0/camel-xmpp/apidocs/index.html
==
---
websites/production/camel/content/maven/camel-2.9.0/camel-xmpp/apidocs/index.html
(original)
+++
websites/production/camel/content/maven/camel-2.9.0/camel-xmpp/apidocs/index.html
Thu Jun 20 21:40:23 2013
@@ -13,6 +13,42 @@ Camel :: XMPP 2.9.0 API
targetPage = targetPage.substring(1);
if (targetPage.indexOf(:) != -1)
targetPage = undefined;
+if (targetPage != !validURL(targetPage))
+targetPage = undefined;
+function validURL(url) {
+var pos = url.indexOf(.html);
+if (pos == -1 || pos != url.length - 5)
+return false;
+var allowNumber = false;
+var allowSep = false;
+var seenDot = false;
+for (var i = 0; i url.length - 5; i++) {
+var ch = url.charAt(i);
+if ('a' = ch ch = 'z' ||
+'A' = ch ch = 'Z' ||
+ch == '$' ||
+ch == '_') {
+allowNumber = true;
+allowSep = true;
+} else if ('0' = ch ch = '9'
+|| ch == '-') {
+if (!allowNumber)
+ return false;
+} else if (ch == '/' || ch == '.') {
+if (!allowSep)
+return false;
+allowNumber = false;
+allowSep = false;
+if (ch == '.')
+ seenDot = true;
+if (ch == '/' seenDot)
+ return false;
+} else {
+return false;
+}
+}
+return true;
+}
function loadFrames() {
if (targetPage != targetPage != undefined)
top.classFrame.location = top.targetPage;
Modified:
websites/production/camel/content/maven/camel-2.9.0/camel-xstream/apidocs/index.html
==
---
websites/production/camel/content/maven/camel-2.9.0/camel-xstream/apidocs/index.html
(original)
+++
websites/production/camel/content/maven/camel-2.9.0/camel-xstream/apidocs/index.html
Thu Jun 20 21:40:23 2013
@@ -13,6 +13,42 @@ Camel :: XStream 2.9.0 API
targetPage = targetPage.substring(1);
if (targetPage.indexOf(:) != -1)
targetPage = undefined;
+if (targetPage != !validURL(targetPage))
+targetPage = undefined;
+function validURL(url) {
+var pos = url.indexOf(.html);
+if (pos == -1 || pos != url.length - 5)
+return false;
+var allowNumber = false;
+var allowSep = false;
+var seenDot = false;
+for (var i = 0; i url.length - 5; i++) {
+var ch = url.charAt(i);
+if ('a' = ch ch = 'z' ||
+'A' = ch ch = 'Z' ||
+ch == '$' ||
+ch == '_') {
+allowNumber = true;
+allowSep = true;
+} else if ('0' = ch ch = '9'
+|| ch == '-') {
+if (!allowNumber)
+ return false;
+} else if (ch == '/' || ch == '.') {
+if (!allowSep)
+return false;
+allowNumber = false;
+allowSep = false;
+if (ch == '.')
+ seenDot = true;
+if (ch == '/' seenDot)
+ return false;
+} else {
+return false;
+}
+}
+return true;
+}
function loadFrames() {
if (targetPage != targetPage != undefined)
top.classFrame.location = top.targetPage;
Modified:
websites/production/camel/content/maven/camel-2.9.0/camel-zookeeper/apidocs/index.html
==
---
websites/production/camel/content/maven/camel-2.9.0/camel-zookeeper/apidocs/index.html
(original)
+++
websites/production/camel/content/maven/camel-2.9.0/camel-zookeeper/apidocs/index.html
Thu Jun 20 21:40:23 2013
@@ -13,6 +13,42 @@ Camel :: Zookeeper 2.9.0 API
targetPage = targetPage.substring(1);
if (targetPage.indexOf(:) != -1)
targetPage = undefined;
+if (targetPage != !validURL(targetPage))
+targetPage = undefined;
+function validURL(url) {
+var pos = url.indexOf(.html);
+if (pos == -1 || pos != url.length - 5)
+return false;
+var allowNumber = false;
+var allowSep = false;
+var seenDot = false;
+for (var i = 0; i url.length - 5; i++) {
+var ch = url.charAt(i);
+if ('a' = ch ch = 'z' ||
+'A' = ch ch = 'Z' ||
+ch == '$' ||
+ch == '_') {
+allowNumber = true;
+
git commit: fixed CS error
Updated Branches:
refs/heads/camel-2.10.x ea3823a58 - 93d0f250f
fixed CS error
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/93d0f250
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/93d0f250
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/93d0f250
Branch: refs/heads/camel-2.10.x
Commit: 93d0f250fa9024f488f7c77e2e5ee35b4b3f233c
Parents: ea3823a
Author: cmueller cmuel...@apache.org
Authored: Wed Jun 19 22:37:16 2013 +0200
Committer: cmueller cmuel...@apache.org
Committed: Wed Jun 19 22:37:16 2013 +0200
--
.../processor/DeadLetterChannelAlwaysHandledTest.java | 10 +-
1 file changed, 5 insertions(+), 5 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/camel/blob/93d0f250/camel-core/src/test/java/org/apache/camel/processor/DeadLetterChannelAlwaysHandledTest.java
--
diff --git
a/camel-core/src/test/java/org/apache/camel/processor/DeadLetterChannelAlwaysHandledTest.java
b/camel-core/src/test/java/org/apache/camel/processor/DeadLetterChannelAlwaysHandledTest.java
index 324a391..e4f6de3 100644
---
a/camel-core/src/test/java/org/apache/camel/processor/DeadLetterChannelAlwaysHandledTest.java
+++
b/camel-core/src/test/java/org/apache/camel/processor/DeadLetterChannelAlwaysHandledTest.java
@@ -26,7 +26,7 @@ import org.apache.camel.spi.ExceptionHandler;
public class DeadLetterChannelAlwaysHandledTest extends ContextTestSupport {
-private static final AtomicBoolean called = new AtomicBoolean();
+private static final AtomicBoolean CALLED = new AtomicBoolean();
public void testDeadLetterChannelAlwaysHandled() throws Exception {
// need to set exception handler manually to work around an issue
configuring from uri
@@ -42,7 +42,7 @@ public class DeadLetterChannelAlwaysHandledTest extends
ContextTestSupport {
assertMockEndpointsSatisfied();
-assertFalse(Should not have called, called.get());
+assertFalse(Should not have called, CALLED.get());
}
@Override
@@ -69,17 +69,17 @@ public class DeadLetterChannelAlwaysHandledTest extends
ContextTestSupport {
@Override
public void handleException(Throwable exception) {
-called.set(true);
+CALLED.set(true);
}
@Override
public void handleException(String message, Throwable exception) {
-called.set(true);
+CALLED.set(true);
}
@Override
public void handleException(String message, Exchange exchange,
Throwable exception) {
-called.set(true);
+CALLED.set(true);
}
}
}
[2/4] git commit: fixed an unit test issue which reports an invalid character
fixed an unit test issue which reports an invalid character
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/ddf1f6a1
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/ddf1f6a1
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/ddf1f6a1
Branch: refs/heads/camel-2.10.x
Commit: ddf1f6a172aa5443638d0f638aafdd2b1ca69b14
Parents: 02633e5
Author: cmueller cmuel...@apache.org
Authored: Wed Jun 19 22:47:20 2013 +0200
Committer: cmueller cmuel...@apache.org
Committed: Wed Jun 19 22:47:20 2013 +0200
--
.../java/org/apache/camel/test/blueprint/DebugBlueprintTest.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/camel/blob/ddf1f6a1/components/camel-test-blueprint/src/test/java/org/apache/camel/test/blueprint/DebugBlueprintTest.java
--
diff --git
a/components/camel-test-blueprint/src/test/java/org/apache/camel/test/blueprint/DebugBlueprintTest.java
b/components/camel-test-blueprint/src/test/java/org/apache/camel/test/blueprint/DebugBlueprintTest.java
index 56a9b40..8b39378 100644
---
a/components/camel-test-blueprint/src/test/java/org/apache/camel/test/blueprint/DebugBlueprintTest.java
+++
b/components/camel-test-blueprint/src/test/java/org/apache/camel/test/blueprint/DebugBlueprintTest.java
@@ -70,4 +70,4 @@ public class DebugBlueprintTest extends
CamelBlueprintTestSupport {
debugAfterMethodCalled = true;
}
}
-// END SNIPPET: example
\ No newline at end of file
+// END SNIPPET: example
git commit: fixed CS error
Updated Branches:
refs/heads/camel-2.10.x 8b0a568e1 - 36624994c
fixed CS error
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/36624994
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/36624994
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/36624994
Branch: refs/heads/camel-2.10.x
Commit: 36624994c0ed1d3c8ba036a33775c995c8434ed0
Parents: 8b0a568
Author: cmueller cmuel...@apache.org
Authored: Wed Jun 19 23:28:48 2013 +0200
Committer: cmueller cmuel...@apache.org
Committed: Wed Jun 19 23:28:48 2013 +0200
--
.../java/org/apache/camel/component/ical/ICalConverter.java | 7 +--
.../java/org/apache/camel/component/ical/ICalDataFormat.java | 2 +-
.../org/apache/camel/component/ical/ICalDataFormatTest.java | 2 +-
3 files changed, 7 insertions(+), 4 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/camel/blob/36624994/components/camel-ical/src/main/java/org/apache/camel/component/ical/ICalConverter.java
--
diff --git
a/components/camel-ical/src/main/java/org/apache/camel/component/ical/ICalConverter.java
b/components/camel-ical/src/main/java/org/apache/camel/component/ical/ICalConverter.java
index 5a3e4d9..765b158 100644
---
a/components/camel-ical/src/main/java/org/apache/camel/component/ical/ICalConverter.java
+++
b/components/camel-ical/src/main/java/org/apache/camel/component/ical/ICalConverter.java
@@ -1,4 +1,4 @@
-/*
+/**
* 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.
@@ -31,7 +31,10 @@ import org.apache.camel.util.IOHelper;
* ICal related converter.
*/
@Converter
-public class ICalConverter {
+public final class ICalConverter {
+
+private ICalConverter() {
+}
@Converter
public static Date toDate(DateProperty property) {
http://git-wip-us.apache.org/repos/asf/camel/blob/36624994/components/camel-ical/src/main/java/org/apache/camel/component/ical/ICalDataFormat.java
--
diff --git
a/components/camel-ical/src/main/java/org/apache/camel/component/ical/ICalDataFormat.java
b/components/camel-ical/src/main/java/org/apache/camel/component/ical/ICalDataFormat.java
index 2159b53..0448c74 100644
---
a/components/camel-ical/src/main/java/org/apache/camel/component/ical/ICalDataFormat.java
+++
b/components/camel-ical/src/main/java/org/apache/camel/component/ical/ICalDataFormat.java
@@ -1,4 +1,4 @@
-/*
+/**
* 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.
http://git-wip-us.apache.org/repos/asf/camel/blob/36624994/components/camel-ical/src/test/java/org/apache/camel/component/ical/ICalDataFormatTest.java
--
diff --git
a/components/camel-ical/src/test/java/org/apache/camel/component/ical/ICalDataFormatTest.java
b/components/camel-ical/src/test/java/org/apache/camel/component/ical/ICalDataFormatTest.java
index 163a533..f588401 100644
---
a/components/camel-ical/src/test/java/org/apache/camel/component/ical/ICalDataFormatTest.java
+++
b/components/camel-ical/src/test/java/org/apache/camel/component/ical/ICalDataFormatTest.java
@@ -1,4 +1,4 @@
-/*
+/**
* 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.
[1/2] git commit: added unit test for an issue on the user mailing list
Updated Branches:
refs/heads/master 4660e6fa9 - 107e3a4ed
added unit test for an issue on the user mailing list
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/0abd8fb3
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/0abd8fb3
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/0abd8fb3
Branch: refs/heads/master
Commit: 0abd8fb34b3f77ecdb9fb2701381dae033217c69
Parents: d5183ff
Author: cmueller cmuel...@apache.org
Authored: Tue Jun 11 17:00:39 2013 +0200
Committer: cmueller cmuel...@apache.org
Committed: Fri Jun 14 17:56:16 2013 +0200
--
.../processor/RemoveHeadersExcludeTest.java | 48
.../apache/camel/processor/camel-context.xml| 33 ++
2 files changed, 81 insertions(+)
--
http://git-wip-us.apache.org/repos/asf/camel/blob/0abd8fb3/components/camel-spring/src/test/java/org/apache/camel/processor/RemoveHeadersExcludeTest.java
--
diff --git
a/components/camel-spring/src/test/java/org/apache/camel/processor/RemoveHeadersExcludeTest.java
b/components/camel-spring/src/test/java/org/apache/camel/processor/RemoveHeadersExcludeTest.java
new file mode 100644
index 000..e5d1670
--- /dev/null
+++
b/components/camel-spring/src/test/java/org/apache/camel/processor/RemoveHeadersExcludeTest.java
@@ -0,0 +1,48 @@
+/**
+ * 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.processor;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import org.apache.camel.component.mock.MockEndpoint;
+import org.apache.camel.spring.SpringTestSupport;
+import org.springframework.context.support.AbstractXmlApplicationContext;
+import org.springframework.context.support.ClassPathXmlApplicationContext;
+
+public class RemoveHeadersExcludeTest extends SpringTestSupport {
+
+protected AbstractXmlApplicationContext createApplicationContext() {
+return new
ClassPathXmlApplicationContext(org/apache/camel/processor/camel-context.xml);
+}
+
+public void testRemoveHeadersWithExcludePatterns() throws Exception {
+MockEndpoint mockEndpoint = getMockEndpoint(mock:result);
+mockEndpoint.expectedMessageCount(1);
+mockEndpoint.expectedHeaderReceived(header1, value1);
+mockEndpoint.expectedHeaderReceived(header3, value3);
+
+MapString, Object headers = new HashMapString, Object();
+headers.put(header1, value1);
+headers.put(header2, value2);
+headers.put(header3, value3);
+
+template.sendBodyAndHeaders(direct:start, null, headers);
+
+assertMockEndpointsSatisfied();
+}
+}
http://git-wip-us.apache.org/repos/asf/camel/blob/0abd8fb3/components/camel-spring/src/test/resources/org/apache/camel/processor/camel-context.xml
--
diff --git
a/components/camel-spring/src/test/resources/org/apache/camel/processor/camel-context.xml
b/components/camel-spring/src/test/resources/org/apache/camel/processor/camel-context.xml
new file mode 100644
index 000..fcbe5a4
--- /dev/null
+++
b/components/camel-spring/src/test/resources/org/apache/camel/processor/camel-context.xml
@@ -0,0 +1,33 @@
+?xml version=1.0 encoding=UTF-8?
+!--
+Licensed to the Apache Software Foundation (ASF) under one or more
+contributor license agreements. See the NOTICE file distributed with
+this work for additional information regarding copyright ownership.
+The ASF licenses this file to You under the Apache License, Version 2.0
+(the License); you may not use this file except in compliance with
+the License. You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an AS IS BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions
[2/2] git commit: Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/camel
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/camel Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/107e3a4e Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/107e3a4e Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/107e3a4e Branch: refs/heads/master Commit: 107e3a4ed720ae111dcd2cf926ca51c0a7f78a77 Parents: 0abd8fb 4660e6f Author: cmueller cmuel...@apache.org Authored: Fri Jun 14 17:57:38 2013 +0200 Committer: cmueller cmuel...@apache.org Committed: Fri Jun 14 17:57:38 2013 +0200 -- parent/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --
git commit: CAMEL-6004: Tokenize XML does not support self-closing XML tokens - added unit test which shows the requested behavior. Thanks to Greg Heidorn for it.
Updated Branches:
refs/heads/master 8ac07f3fc - bd6ebd1dd
CAMEL-6004: Tokenize XML does not support self-closing XML tokens - added unit
test which shows the requested behavior. Thanks to Greg Heidorn for it.
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/bd6ebd1d
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/bd6ebd1d
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/bd6ebd1d
Branch: refs/heads/master
Commit: bd6ebd1dd3c663455a76b0a22812f89663183a9b
Parents: 8ac07f3
Author: cmueller cmuel...@apache.org
Authored: Thu May 30 14:05:24 2013 +0200
Committer: cmueller cmuel...@apache.org
Committed: Thu May 30 14:05:24 2013 +0200
--
.../language/tokenizer/TokenizeLanguageTest.java | 74 +++
1 files changed, 74 insertions(+), 0 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/camel/blob/bd6ebd1d/camel-core/src/test/java/org/apache/camel/language/tokenizer/TokenizeLanguageTest.java
--
diff --git
a/camel-core/src/test/java/org/apache/camel/language/tokenizer/TokenizeLanguageTest.java
b/camel-core/src/test/java/org/apache/camel/language/tokenizer/TokenizeLanguageTest.java
new file mode 100644
index 000..cbc6c65
--- /dev/null
+++
b/camel-core/src/test/java/org/apache/camel/language/tokenizer/TokenizeLanguageTest.java
@@ -0,0 +1,74 @@
+/**
+ * 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.language.tokenizer;
+
+import org.apache.camel.ContextTestSupport;
+import org.apache.camel.builder.RouteBuilder;
+import org.junit.Ignore;
+import org.junit.Test;
+
+public class TokenizeLanguageTest extends ContextTestSupport {
+
+@Test
+public void testSendClosedTagMessageToTokenize() throws Exception {
+getMockEndpoint(mock:result).expectedBodiesReceived(child
some_attr='a' anotherAttr='a'/child, child some_attr='b'
anotherAttr='b'/child);
+
+template.sendBody(direct:start,
+?xml version='1.0' encoding='UTF-8'?parentchild
some_attr='a' anotherAttr='a'/childchild some_attr='b'
anotherAttr='b'/child/parent);
+
+assertMockEndpointsSatisfied();
+}
+
+@Test
+public void testSendClosedTagWithLineBreaksMessageToTokenize() throws
Exception {
+getMockEndpoint(mock:result).expectedBodiesReceived(child
some_attr='a' anotherAttr='a'\n/child, child some_attr='b'
anotherAttr='b'\n/child);
+
+template.sendBody(direct:start,
+?xml version='1.0' encoding='UTF-8'?\n
++ parent\n
++ child some_attr='a' anotherAttr='a'\n
++ /child\n
++ child some_attr='b' anotherAttr='b'\n
++ /child\n
++ /parent);
+
+assertMockEndpointsSatisfied();
+}
+
+@Test
+@Ignore
+public void testSendSelfClosingTagMessageToTokenize() throws Exception {
+getMockEndpoint(mock:result).expectedBodiesReceived(child
some_attr='a' anotherAttr='a' /, child some_attr='b' anotherAttr='b' /);
+
+template.sendBody(direct:start,
+?xml version='1.0' encoding='UTF-8'?parentchild
some_attr='a' anotherAttr='a' /child some_attr='b' anotherAttr='b'
//parent);
+
+assertMockEndpointsSatisfied();
+}
+
+@Override
+protected RouteBuilder createRouteBuilder() {
+return new RouteBuilder() {
+public void configure() {
+from(direct:start)
+.split().tokenizeXML(child)
+.to(mock:result)
+.end();
+}
+};
+}
+}
git commit: fixed CS issues
Updated Branches:
refs/heads/master bd6ebd1dd - 4d1753eab
fixed CS issues
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/4d1753ea
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/4d1753ea
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/4d1753ea
Branch: refs/heads/master
Commit: 4d1753eab5697eeaf6dc94dcbb049d0ac72ba49f
Parents: bd6ebd1
Author: cmueller cmuel...@apache.org
Authored: Thu May 30 14:27:03 2013 +0200
Committer: cmueller cmuel...@apache.org
Committed: Thu May 30 14:27:03 2013 +0200
--
.../apache/camel/language/mvel/MvelComponent.java |4 ++--
.../apache/camel/language/mvel/MvelEndpoint.java | 14 +++---
2 files changed, 9 insertions(+), 9 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/camel/blob/4d1753ea/components/camel-mvel/src/main/java/org/apache/camel/language/mvel/MvelComponent.java
--
diff --git
a/components/camel-mvel/src/main/java/org/apache/camel/language/mvel/MvelComponent.java
b/components/camel-mvel/src/main/java/org/apache/camel/language/mvel/MvelComponent.java
index 02ae9cd..51acccd 100644
---
a/components/camel-mvel/src/main/java/org/apache/camel/language/mvel/MvelComponent.java
+++
b/components/camel-mvel/src/main/java/org/apache/camel/language/mvel/MvelComponent.java
@@ -16,13 +16,13 @@
*/
package org.apache.camel.language.mvel;
+import java.util.Map;
+
import org.apache.camel.Endpoint;
import org.apache.camel.impl.DefaultComponent;
import org.apache.camel.util.ObjectHelper;
import org.apache.camel.util.ResourceHelper;
-import java.util.Map;
-
/**
* An a href=http://camel.apache.org/mvel.html;Mvel Component/a
* for performing transforming messages
http://git-wip-us.apache.org/repos/asf/camel/blob/4d1753ea/components/camel-mvel/src/main/java/org/apache/camel/language/mvel/MvelEndpoint.java
--
diff --git
a/components/camel-mvel/src/main/java/org/apache/camel/language/mvel/MvelEndpoint.java
b/components/camel-mvel/src/main/java/org/apache/camel/language/mvel/MvelEndpoint.java
index defd2e6..9c5edf7 100644
---
a/components/camel-mvel/src/main/java/org/apache/camel/language/mvel/MvelEndpoint.java
+++
b/components/camel-mvel/src/main/java/org/apache/camel/language/mvel/MvelEndpoint.java
@@ -16,6 +16,13 @@
*/
package org.apache.camel.language.mvel;
+import java.io.IOException;
+import java.io.InputStreamReader;
+import java.io.Reader;
+import java.io.StringReader;
+import java.io.StringWriter;
+import java.util.Map;
+
import org.apache.camel.Exchange;
import org.apache.camel.ExchangePattern;
import org.apache.camel.Message;
@@ -28,13 +35,6 @@ import org.mvel2.templates.CompiledTemplate;
import org.mvel2.templates.TemplateCompiler;
import org.mvel2.templates.TemplateRuntime;
-import java.io.IOException;
-import java.io.InputStreamReader;
-import java.io.Reader;
-import java.io.StringReader;
-import java.io.StringWriter;
-import java.util.Map;
-
public class MvelEndpoint extends ResourceEndpoint {
private String encoding;
git commit: fixed CS issues
Updated Branches:
refs/heads/master 4d1753eab - fea576f9e
fixed CS issues
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/fea576f9
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/fea576f9
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/fea576f9
Branch: refs/heads/master
Commit: fea576f9e6c63013d58ce50209caaab15a018ca6
Parents: 4d1753e
Author: cmueller cmuel...@apache.org
Authored: Thu May 30 14:35:52 2013 +0200
Committer: cmueller cmuel...@apache.org
Committed: Thu May 30 14:35:52 2013 +0200
--
.../apache/camel/itest/shiro/ShiroOverJmsTest.java |8
1 files changed, 4 insertions(+), 4 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/camel/blob/fea576f9/tests/camel-itest/src/test/java/org/apache/camel/itest/shiro/ShiroOverJmsTest.java
--
diff --git
a/tests/camel-itest/src/test/java/org/apache/camel/itest/shiro/ShiroOverJmsTest.java
b/tests/camel-itest/src/test/java/org/apache/camel/itest/shiro/ShiroOverJmsTest.java
index 12edead..116e6d7 100644
---
a/tests/camel-itest/src/test/java/org/apache/camel/itest/shiro/ShiroOverJmsTest.java
+++
b/tests/camel-itest/src/test/java/org/apache/camel/itest/shiro/ShiroOverJmsTest.java
@@ -31,10 +31,10 @@ import org.junit.Test;
public class ShiroOverJmsTest extends CamelTestSupport {
private byte[] passPhrase = {
-(byte) 0x08, (byte) 0x09, (byte) 0x0A, (byte) 0x0B,
-(byte) 0x0C, (byte) 0x0D, (byte) 0x0E, (byte) 0x0F,
-(byte) 0x10, (byte) 0x11, (byte) 0x12, (byte) 0x13,
-(byte) 0x14, (byte) 0x15, (byte) 0x16, (byte) 0x17};
+(byte) 0x08, (byte) 0x09, (byte) 0x0A, (byte) 0x0B,
+(byte) 0x0C, (byte) 0x0D, (byte) 0x0E, (byte) 0x0F,
+(byte) 0x10, (byte) 0x11, (byte) 0x12, (byte) 0x13,
+(byte) 0x14, (byte) 0x15, (byte) 0x16, (byte) 0x17};
@Test
public void testShiroOverJms() throws Exception {
git commit: CAMEL-6370: Populate all optional parameter for SubmitSm, SubmitMulti and DataSm to SMSC
Updated Branches:
refs/heads/master accd3b54e - 09ceee600
CAMEL-6370: Populate all optional parameter for SubmitSm, SubmitMulti and
DataSm to SMSC
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/09ceee60
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/09ceee60
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/09ceee60
Branch: refs/heads/master
Commit: 09ceee6009facb660d8f1329656a84e39c2e86ff
Parents: accd3b5
Author: cmueller cmuel...@apache.org
Authored: Thu May 30 23:03:40 2013 +0200
Committer: cmueller cmuel...@apache.org
Committed: Thu May 30 23:05:56 2013 +0200
--
.../camel/component/smpp/AbstractSmppCommand.java | 54 +-
.../apache/camel/component/smpp/SmppBinding.java |3 +-
.../camel/component/smpp/SmppDataSmCommand.java| 67 +-
.../component/smpp/SmppSubmitMultiCommand.java | 12 +-
.../camel/component/smpp/SmppSubmitSmCommand.java | 44 +
.../component/smpp/AbstractSmppCommandTest.java| 13 +
.../component/smpp/SmppDataSmCommandTest.java | 171 +++
.../component/smpp/SmppSubmitMultiCommandTest.java | 124 ---
.../component/smpp/SmppSubmitSmCommandTest.java| 21 +--
9 files changed, 400 insertions(+), 109 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/camel/blob/09ceee60/components/camel-smpp/src/main/java/org/apache/camel/component/smpp/AbstractSmppCommand.java
--
diff --git
a/components/camel-smpp/src/main/java/org/apache/camel/component/smpp/AbstractSmppCommand.java
b/components/camel-smpp/src/main/java/org/apache/camel/component/smpp/AbstractSmppCommand.java
index d37bead..54d93da 100644
---
a/components/camel-smpp/src/main/java/org/apache/camel/component/smpp/AbstractSmppCommand.java
+++
b/components/camel-smpp/src/main/java/org/apache/camel/component/smpp/AbstractSmppCommand.java
@@ -16,8 +16,18 @@
*/
package org.apache.camel.component.smpp;
+import java.lang.reflect.Field;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.util.Map.Entry;
+
import org.apache.camel.Exchange;
import org.apache.camel.Message;
+import org.jsmpp.bean.OptionalParameter;
+import org.jsmpp.bean.OptionalParameter.COctetString;
+import org.jsmpp.bean.OptionalParameter.OctetString;
+import org.jsmpp.bean.OptionalParameter.Tag;
import org.jsmpp.session.SMPPSession;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -33,7 +43,7 @@ public abstract class AbstractSmppCommand implements
SmppCommand {
this.session = session;
this.config = config;
}
-
+
protected Message getResponseMessage(Exchange exchange) {
Message message;
if (exchange.getPattern().isOutCapable()) {
@@ -44,4 +54,46 @@ public abstract class AbstractSmppCommand implements
SmppCommand {
return message;
}
+
+@SuppressWarnings(rawtypes)
+protected ListOptionalParameter createOptionalParameters(MapString,
String optinalParamaters) {
+ListOptionalParameter optParams = new ArrayListOptionalParameter();
+
+for (EntryString, String entry : optinalParamaters.entrySet()) {
+OptionalParameter optParam = null;
+
+try {
+Tag tag = Tag.valueOf(entry.getKey());
+Class type = determineTypeClass(tag);
+
+if (OctetString.class.equals(type)) {
+optParam = new OptionalParameter.OctetString(tag.code(),
entry.getValue());
+} else if (COctetString.class.equals(type)) {
+optParam = new OptionalParameter.COctetString(tag.code(),
entry.getValue());
+} else if
(org.jsmpp.bean.OptionalParameter.Byte.class.equals(type)) {
+optParam = new OptionalParameter.Byte(tag.code(),
Byte.valueOf(entry.getValue()));
+} else if
(org.jsmpp.bean.OptionalParameter.Int.class.equals(type)) {
+optParam = new OptionalParameter.Int(tag.code(),
Integer.valueOf(entry.getValue()));
+} else if
(org.jsmpp.bean.OptionalParameter.Short.class.equals(type)) {
+optParam = new OptionalParameter.Short(tag.code(),
Short.valueOf(entry.getValue()));
+} else if
(org.jsmpp.bean.OptionalParameter.Null.class.equals(type)) {
+optParam = new OptionalParameter.Null(tag);
+}
+
+optParams.add(optParam);
+} catch (Exception e) {
+log.info(Couldn't determine optional parameter for key {} and
value {}. Skip this one., entry.getKey(), entry.getValue());
+}
+}
+
+return optParams;
+}
+
+@SuppressWarnings(unchecked
git commit: CAMEL-6370: Populate all optional parameter for SubmitSm, SubmitMulti and DataSm to SMSC
Updated Branches:
refs/heads/camel-2.11.x 9e3e7254e - 0497e22df
CAMEL-6370: Populate all optional parameter for SubmitSm, SubmitMulti and
DataSm to SMSC
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/0497e22d
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/0497e22d
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/0497e22d
Branch: refs/heads/camel-2.11.x
Commit: 0497e22df468215ad6099729f7a7907e17b16aad
Parents: 9e3e725
Author: cmueller cmuel...@apache.org
Authored: Thu May 30 23:03:40 2013 +0200
Committer: cmueller cmuel...@apache.org
Committed: Thu May 30 23:11:33 2013 +0200
--
.../camel/component/smpp/AbstractSmppCommand.java | 54 +-
.../apache/camel/component/smpp/SmppBinding.java |3 +-
.../camel/component/smpp/SmppDataSmCommand.java| 67 +-
.../component/smpp/SmppSubmitMultiCommand.java | 12 +-
.../camel/component/smpp/SmppSubmitSmCommand.java | 44 +
.../component/smpp/AbstractSmppCommandTest.java| 13 +
.../component/smpp/SmppDataSmCommandTest.java | 171 +++
.../component/smpp/SmppSubmitMultiCommandTest.java | 124 ---
.../component/smpp/SmppSubmitSmCommandTest.java| 21 +--
9 files changed, 400 insertions(+), 109 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/camel/blob/0497e22d/components/camel-smpp/src/main/java/org/apache/camel/component/smpp/AbstractSmppCommand.java
--
diff --git
a/components/camel-smpp/src/main/java/org/apache/camel/component/smpp/AbstractSmppCommand.java
b/components/camel-smpp/src/main/java/org/apache/camel/component/smpp/AbstractSmppCommand.java
index d37bead..54d93da 100644
---
a/components/camel-smpp/src/main/java/org/apache/camel/component/smpp/AbstractSmppCommand.java
+++
b/components/camel-smpp/src/main/java/org/apache/camel/component/smpp/AbstractSmppCommand.java
@@ -16,8 +16,18 @@
*/
package org.apache.camel.component.smpp;
+import java.lang.reflect.Field;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.util.Map.Entry;
+
import org.apache.camel.Exchange;
import org.apache.camel.Message;
+import org.jsmpp.bean.OptionalParameter;
+import org.jsmpp.bean.OptionalParameter.COctetString;
+import org.jsmpp.bean.OptionalParameter.OctetString;
+import org.jsmpp.bean.OptionalParameter.Tag;
import org.jsmpp.session.SMPPSession;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -33,7 +43,7 @@ public abstract class AbstractSmppCommand implements
SmppCommand {
this.session = session;
this.config = config;
}
-
+
protected Message getResponseMessage(Exchange exchange) {
Message message;
if (exchange.getPattern().isOutCapable()) {
@@ -44,4 +54,46 @@ public abstract class AbstractSmppCommand implements
SmppCommand {
return message;
}
+
+@SuppressWarnings(rawtypes)
+protected ListOptionalParameter createOptionalParameters(MapString,
String optinalParamaters) {
+ListOptionalParameter optParams = new ArrayListOptionalParameter();
+
+for (EntryString, String entry : optinalParamaters.entrySet()) {
+OptionalParameter optParam = null;
+
+try {
+Tag tag = Tag.valueOf(entry.getKey());
+Class type = determineTypeClass(tag);
+
+if (OctetString.class.equals(type)) {
+optParam = new OptionalParameter.OctetString(tag.code(),
entry.getValue());
+} else if (COctetString.class.equals(type)) {
+optParam = new OptionalParameter.COctetString(tag.code(),
entry.getValue());
+} else if
(org.jsmpp.bean.OptionalParameter.Byte.class.equals(type)) {
+optParam = new OptionalParameter.Byte(tag.code(),
Byte.valueOf(entry.getValue()));
+} else if
(org.jsmpp.bean.OptionalParameter.Int.class.equals(type)) {
+optParam = new OptionalParameter.Int(tag.code(),
Integer.valueOf(entry.getValue()));
+} else if
(org.jsmpp.bean.OptionalParameter.Short.class.equals(type)) {
+optParam = new OptionalParameter.Short(tag.code(),
Short.valueOf(entry.getValue()));
+} else if
(org.jsmpp.bean.OptionalParameter.Null.class.equals(type)) {
+optParam = new OptionalParameter.Null(tag);
+}
+
+optParams.add(optParam);
+} catch (Exception e) {
+log.info(Couldn't determine optional parameter for key {} and
value {}. Skip this one., entry.getKey(), entry.getValue());
+}
+}
+
+return optParams;
+}
+
+@SuppressWarnings(unchecked
git commit: CAMEL-6370: Populate all optional parameter for SubmitSm, SubmitMulti and DataSm to SMSC
Updated Branches:
refs/heads/camel-2.10.x e28ff6849 - 8caf58427
CAMEL-6370: Populate all optional parameter for SubmitSm, SubmitMulti and
DataSm to SMSC
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/8caf5842
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/8caf5842
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/8caf5842
Branch: refs/heads/camel-2.10.x
Commit: 8caf5842734c70010242d205887ffdb2bd88fca8
Parents: e28ff68
Author: cmueller cmuel...@apache.org
Authored: Thu May 30 23:03:40 2013 +0200
Committer: cmueller cmuel...@apache.org
Committed: Thu May 30 23:14:26 2013 +0200
--
.../camel/component/smpp/AbstractSmppCommand.java | 54 +-
.../apache/camel/component/smpp/SmppBinding.java |3 +-
.../camel/component/smpp/SmppDataSmCommand.java| 67 +-
.../component/smpp/SmppSubmitMultiCommand.java | 12 +-
.../camel/component/smpp/SmppSubmitSmCommand.java | 44 +
.../component/smpp/AbstractSmppCommandTest.java| 13 +
.../component/smpp/SmppDataSmCommandTest.java | 171 +++
.../component/smpp/SmppSubmitMultiCommandTest.java | 124 ---
.../component/smpp/SmppSubmitSmCommandTest.java| 21 +--
9 files changed, 400 insertions(+), 109 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/camel/blob/8caf5842/components/camel-smpp/src/main/java/org/apache/camel/component/smpp/AbstractSmppCommand.java
--
diff --git
a/components/camel-smpp/src/main/java/org/apache/camel/component/smpp/AbstractSmppCommand.java
b/components/camel-smpp/src/main/java/org/apache/camel/component/smpp/AbstractSmppCommand.java
index d37bead..54d93da 100644
---
a/components/camel-smpp/src/main/java/org/apache/camel/component/smpp/AbstractSmppCommand.java
+++
b/components/camel-smpp/src/main/java/org/apache/camel/component/smpp/AbstractSmppCommand.java
@@ -16,8 +16,18 @@
*/
package org.apache.camel.component.smpp;
+import java.lang.reflect.Field;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.util.Map.Entry;
+
import org.apache.camel.Exchange;
import org.apache.camel.Message;
+import org.jsmpp.bean.OptionalParameter;
+import org.jsmpp.bean.OptionalParameter.COctetString;
+import org.jsmpp.bean.OptionalParameter.OctetString;
+import org.jsmpp.bean.OptionalParameter.Tag;
import org.jsmpp.session.SMPPSession;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -33,7 +43,7 @@ public abstract class AbstractSmppCommand implements
SmppCommand {
this.session = session;
this.config = config;
}
-
+
protected Message getResponseMessage(Exchange exchange) {
Message message;
if (exchange.getPattern().isOutCapable()) {
@@ -44,4 +54,46 @@ public abstract class AbstractSmppCommand implements
SmppCommand {
return message;
}
+
+@SuppressWarnings(rawtypes)
+protected ListOptionalParameter createOptionalParameters(MapString,
String optinalParamaters) {
+ListOptionalParameter optParams = new ArrayListOptionalParameter();
+
+for (EntryString, String entry : optinalParamaters.entrySet()) {
+OptionalParameter optParam = null;
+
+try {
+Tag tag = Tag.valueOf(entry.getKey());
+Class type = determineTypeClass(tag);
+
+if (OctetString.class.equals(type)) {
+optParam = new OptionalParameter.OctetString(tag.code(),
entry.getValue());
+} else if (COctetString.class.equals(type)) {
+optParam = new OptionalParameter.COctetString(tag.code(),
entry.getValue());
+} else if
(org.jsmpp.bean.OptionalParameter.Byte.class.equals(type)) {
+optParam = new OptionalParameter.Byte(tag.code(),
Byte.valueOf(entry.getValue()));
+} else if
(org.jsmpp.bean.OptionalParameter.Int.class.equals(type)) {
+optParam = new OptionalParameter.Int(tag.code(),
Integer.valueOf(entry.getValue()));
+} else if
(org.jsmpp.bean.OptionalParameter.Short.class.equals(type)) {
+optParam = new OptionalParameter.Short(tag.code(),
Short.valueOf(entry.getValue()));
+} else if
(org.jsmpp.bean.OptionalParameter.Null.class.equals(type)) {
+optParam = new OptionalParameter.Null(tag);
+}
+
+optParams.add(optParam);
+} catch (Exception e) {
+log.info(Couldn't determine optional parameter for key {} and
value {}. Skip this one., entry.getKey(), entry.getValue());
+}
+}
+
+return optParams;
+}
+
+@SuppressWarnings(unchecked
git commit: CAMEL-6402: HTTP4 - Set the content length for requests, if known Thanks to Chris Geer for the patch
Updated Branches:
refs/heads/master 42d431f80 - 1995e574c
CAMEL-6402: HTTP4 - Set the content length for requests, if known
Thanks to Chris Geer for the patch
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/1995e574
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/1995e574
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/1995e574
Branch: refs/heads/master
Commit: 1995e574cc5727ba950cefa37c965201a8acdd2e
Parents: 42d431f
Author: cmueller cmuel...@apache.org
Authored: Mon May 27 23:10:38 2013 +0200
Committer: cmueller cmuel...@apache.org
Committed: Mon May 27 23:10:38 2013 +0200
--
.../java/org/apache/camel/util/GZIPHelper.java |4 +---
.../camel/component/http4/HttpEntityConverter.java | 10 +++---
2 files changed, 8 insertions(+), 6 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/camel/blob/1995e574/camel-core/src/main/java/org/apache/camel/util/GZIPHelper.java
--
diff --git a/camel-core/src/main/java/org/apache/camel/util/GZIPHelper.java
b/camel-core/src/main/java/org/apache/camel/util/GZIPHelper.java
index d615260..c016d9a 100644
--- a/camel-core/src/main/java/org/apache/camel/util/GZIPHelper.java
+++ b/camel-core/src/main/java/org/apache/camel/util/GZIPHelper.java
@@ -42,9 +42,8 @@ public final class GZIPHelper {
return in;
}
}
-
-public static InputStream compressGzip(String contentEncoding, InputStream
in) throws IOException {
+public static InputStream compressGzip(String contentEncoding, InputStream
in) throws IOException {
if (isGzip(contentEncoding)) {
ByteArrayOutputStream os = new ByteArrayOutputStream();
GZIPOutputStream gzip = new GZIPOutputStream(os);
@@ -59,7 +58,6 @@ public final class GZIPHelper {
} else {
return in;
}
-
}
public static InputStream compressGzip(String contentEncoding, byte[]
data) throws IOException {
http://git-wip-us.apache.org/repos/asf/camel/blob/1995e574/components/camel-http4/src/main/java/org/apache/camel/component/http4/HttpEntityConverter.java
--
diff --git
a/components/camel-http4/src/main/java/org/apache/camel/component/http4/HttpEntityConverter.java
b/components/camel-http4/src/main/java/org/apache/camel/component/http4/HttpEntityConverter.java
index 5991e65..e88ceb5 100644
---
a/components/camel-http4/src/main/java/org/apache/camel/component/http4/HttpEntityConverter.java
+++
b/components/camel-http4/src/main/java/org/apache/camel/component/http4/HttpEntityConverter.java
@@ -61,7 +61,9 @@ public final class HttpEntityConverter {
InputStreamEntity entity;
if (!exchange.getProperty(Exchange.SKIP_GZIP_ENCODING, Boolean.FALSE,
Boolean.class)) {
String contentEncoding =
exchange.getIn().getHeader(Exchange.CONTENT_ENCODING, String.class);
-entity = new
InputStreamEntity(GZIPHelper.compressGzip(contentEncoding, in), -1);
+InputStream stream = GZIPHelper.compressGzip(contentEncoding, in);
+entity = new InputStreamEntity(stream, stream instanceof
ByteArrayInputStream
+? stream.available() != 0 ? stream.available() : -1 : -1);
} else {
entity = new InputStreamEntity(in, -1);
}
@@ -78,9 +80,11 @@ public final class HttpEntityConverter {
InputStreamEntity entity;
if (exchange != null
!exchange.getProperty(Exchange.SKIP_GZIP_ENCODING, Boolean.FALSE,
Boolean.class)) {
String contentEncoding =
exchange.getIn().getHeader(Exchange.CONTENT_ENCODING, String.class);
-entity = new
InputStreamEntity(GZIPHelper.compressGzip(contentEncoding, data), -1);
+InputStream stream = GZIPHelper.compressGzip(contentEncoding,
data);
+entity = new InputStreamEntity(stream, stream instanceof
ByteArrayInputStream
+? stream.available() != 0 ? stream.available() : -1 : -1);
} else {
-entity = new InputStreamEntity(new ByteArrayInputStream(data), -1);
+entity = new InputStreamEntity(new ByteArrayInputStream(data),
data.length);
}
if (exchange != null) {
String contentEncoding =
exchange.getIn().getHeader(Exchange.CONTENT_ENCODING, String.class);
git commit: CAMEL-6402: HTTP4 - Set the content length for requests, if known Thanks to Chris Geer for the patch
Updated Branches:
refs/heads/camel-2.11.x 01fa3b52f - 5438802c8
CAMEL-6402: HTTP4 - Set the content length for requests, if known
Thanks to Chris Geer for the patch
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/5438802c
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/5438802c
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/5438802c
Branch: refs/heads/camel-2.11.x
Commit: 5438802c8b13a1d53f9339540b664130be57cce5
Parents: 01fa3b5
Author: cmueller cmuel...@apache.org
Authored: Mon May 27 23:10:38 2013 +0200
Committer: cmueller cmuel...@apache.org
Committed: Mon May 27 23:14:40 2013 +0200
--
.../java/org/apache/camel/util/GZIPHelper.java |4 +---
.../camel/component/http4/HttpEntityConverter.java | 10 +++---
2 files changed, 8 insertions(+), 6 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/camel/blob/5438802c/camel-core/src/main/java/org/apache/camel/util/GZIPHelper.java
--
diff --git a/camel-core/src/main/java/org/apache/camel/util/GZIPHelper.java
b/camel-core/src/main/java/org/apache/camel/util/GZIPHelper.java
index d615260..c016d9a 100644
--- a/camel-core/src/main/java/org/apache/camel/util/GZIPHelper.java
+++ b/camel-core/src/main/java/org/apache/camel/util/GZIPHelper.java
@@ -42,9 +42,8 @@ public final class GZIPHelper {
return in;
}
}
-
-public static InputStream compressGzip(String contentEncoding, InputStream
in) throws IOException {
+public static InputStream compressGzip(String contentEncoding, InputStream
in) throws IOException {
if (isGzip(contentEncoding)) {
ByteArrayOutputStream os = new ByteArrayOutputStream();
GZIPOutputStream gzip = new GZIPOutputStream(os);
@@ -59,7 +58,6 @@ public final class GZIPHelper {
} else {
return in;
}
-
}
public static InputStream compressGzip(String contentEncoding, byte[]
data) throws IOException {
http://git-wip-us.apache.org/repos/asf/camel/blob/5438802c/components/camel-http4/src/main/java/org/apache/camel/component/http4/HttpEntityConverter.java
--
diff --git
a/components/camel-http4/src/main/java/org/apache/camel/component/http4/HttpEntityConverter.java
b/components/camel-http4/src/main/java/org/apache/camel/component/http4/HttpEntityConverter.java
index 5991e65..e88ceb5 100644
---
a/components/camel-http4/src/main/java/org/apache/camel/component/http4/HttpEntityConverter.java
+++
b/components/camel-http4/src/main/java/org/apache/camel/component/http4/HttpEntityConverter.java
@@ -61,7 +61,9 @@ public final class HttpEntityConverter {
InputStreamEntity entity;
if (!exchange.getProperty(Exchange.SKIP_GZIP_ENCODING, Boolean.FALSE,
Boolean.class)) {
String contentEncoding =
exchange.getIn().getHeader(Exchange.CONTENT_ENCODING, String.class);
-entity = new
InputStreamEntity(GZIPHelper.compressGzip(contentEncoding, in), -1);
+InputStream stream = GZIPHelper.compressGzip(contentEncoding, in);
+entity = new InputStreamEntity(stream, stream instanceof
ByteArrayInputStream
+? stream.available() != 0 ? stream.available() : -1 : -1);
} else {
entity = new InputStreamEntity(in, -1);
}
@@ -78,9 +80,11 @@ public final class HttpEntityConverter {
InputStreamEntity entity;
if (exchange != null
!exchange.getProperty(Exchange.SKIP_GZIP_ENCODING, Boolean.FALSE,
Boolean.class)) {
String contentEncoding =
exchange.getIn().getHeader(Exchange.CONTENT_ENCODING, String.class);
-entity = new
InputStreamEntity(GZIPHelper.compressGzip(contentEncoding, data), -1);
+InputStream stream = GZIPHelper.compressGzip(contentEncoding,
data);
+entity = new InputStreamEntity(stream, stream instanceof
ByteArrayInputStream
+? stream.available() != 0 ? stream.available() : -1 : -1);
} else {
-entity = new InputStreamEntity(new ByteArrayInputStream(data), -1);
+entity = new InputStreamEntity(new ByteArrayInputStream(data),
data.length);
}
if (exchange != null) {
String contentEncoding =
exchange.getIn().getHeader(Exchange.CONTENT_ENCODING, String.class);
git commit: CAMEL-6402: HTTP4 - Set the content length for requests, if known Thanks to Chris Geer for the patch
Updated Branches:
refs/heads/camel-2.10.x 8d97a4711 - e28ff6849
CAMEL-6402: HTTP4 - Set the content length for requests, if known
Thanks to Chris Geer for the patch
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/e28ff684
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/e28ff684
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/e28ff684
Branch: refs/heads/camel-2.10.x
Commit: e28ff684957954684b591807fb315bcda0eb2bfd
Parents: 8d97a47
Author: cmueller cmuel...@apache.org
Authored: Mon May 27 23:10:38 2013 +0200
Committer: cmueller cmuel...@apache.org
Committed: Mon May 27 23:18:47 2013 +0200
--
.../java/org/apache/camel/util/GZIPHelper.java |4 +---
.../camel/component/http4/HttpEntityConverter.java | 10 +++---
2 files changed, 8 insertions(+), 6 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/camel/blob/e28ff684/camel-core/src/main/java/org/apache/camel/util/GZIPHelper.java
--
diff --git a/camel-core/src/main/java/org/apache/camel/util/GZIPHelper.java
b/camel-core/src/main/java/org/apache/camel/util/GZIPHelper.java
index d615260..c016d9a 100644
--- a/camel-core/src/main/java/org/apache/camel/util/GZIPHelper.java
+++ b/camel-core/src/main/java/org/apache/camel/util/GZIPHelper.java
@@ -42,9 +42,8 @@ public final class GZIPHelper {
return in;
}
}
-
-public static InputStream compressGzip(String contentEncoding, InputStream
in) throws IOException {
+public static InputStream compressGzip(String contentEncoding, InputStream
in) throws IOException {
if (isGzip(contentEncoding)) {
ByteArrayOutputStream os = new ByteArrayOutputStream();
GZIPOutputStream gzip = new GZIPOutputStream(os);
@@ -59,7 +58,6 @@ public final class GZIPHelper {
} else {
return in;
}
-
}
public static InputStream compressGzip(String contentEncoding, byte[]
data) throws IOException {
http://git-wip-us.apache.org/repos/asf/camel/blob/e28ff684/components/camel-http4/src/main/java/org/apache/camel/component/http4/HttpEntityConverter.java
--
diff --git
a/components/camel-http4/src/main/java/org/apache/camel/component/http4/HttpEntityConverter.java
b/components/camel-http4/src/main/java/org/apache/camel/component/http4/HttpEntityConverter.java
index 5991e65..e88ceb5 100644
---
a/components/camel-http4/src/main/java/org/apache/camel/component/http4/HttpEntityConverter.java
+++
b/components/camel-http4/src/main/java/org/apache/camel/component/http4/HttpEntityConverter.java
@@ -61,7 +61,9 @@ public final class HttpEntityConverter {
InputStreamEntity entity;
if (!exchange.getProperty(Exchange.SKIP_GZIP_ENCODING, Boolean.FALSE,
Boolean.class)) {
String contentEncoding =
exchange.getIn().getHeader(Exchange.CONTENT_ENCODING, String.class);
-entity = new
InputStreamEntity(GZIPHelper.compressGzip(contentEncoding, in), -1);
+InputStream stream = GZIPHelper.compressGzip(contentEncoding, in);
+entity = new InputStreamEntity(stream, stream instanceof
ByteArrayInputStream
+? stream.available() != 0 ? stream.available() : -1 : -1);
} else {
entity = new InputStreamEntity(in, -1);
}
@@ -78,9 +80,11 @@ public final class HttpEntityConverter {
InputStreamEntity entity;
if (exchange != null
!exchange.getProperty(Exchange.SKIP_GZIP_ENCODING, Boolean.FALSE,
Boolean.class)) {
String contentEncoding =
exchange.getIn().getHeader(Exchange.CONTENT_ENCODING, String.class);
-entity = new
InputStreamEntity(GZIPHelper.compressGzip(contentEncoding, data), -1);
+InputStream stream = GZIPHelper.compressGzip(contentEncoding,
data);
+entity = new InputStreamEntity(stream, stream instanceof
ByteArrayInputStream
+? stream.available() != 0 ? stream.available() : -1 : -1);
} else {
-entity = new InputStreamEntity(new ByteArrayInputStream(data), -1);
+entity = new InputStreamEntity(new ByteArrayInputStream(data),
data.length);
}
if (exchange != null) {
String contentEncoding =
exchange.getIn().getHeader(Exchange.CONTENT_ENCODING, String.class);
git commit: simplified the unit test by using CamelSpringTestSupport
Updated Branches:
refs/heads/master 456deafba - 24da11232
simplified the unit test by using CamelSpringTestSupport
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/24da1123
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/24da1123
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/24da1123
Branch: refs/heads/master
Commit: 24da1123283b20ec27712009d86b49d9a9b0ad23
Parents: 456deaf
Author: cmueller cmuel...@apache.org
Authored: Sat May 25 17:41:45 2013 +0200
Committer: cmueller cmuel...@apache.org
Committed: Sat May 25 17:41:45 2013 +0200
--
.../spring/batch/SpringBatchIntegrationTest.java | 32 +++---
1 files changed, 16 insertions(+), 16 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/camel/blob/24da1123/components/camel-spring-batch/src/test/java/org/apache/camel/component/spring/batch/SpringBatchIntegrationTest.java
--
diff --git
a/components/camel-spring-batch/src/test/java/org/apache/camel/component/spring/batch/SpringBatchIntegrationTest.java
b/components/camel-spring-batch/src/test/java/org/apache/camel/component/spring/batch/SpringBatchIntegrationTest.java
index 12e9f80..77e3ad2 100644
---
a/components/camel-spring-batch/src/test/java/org/apache/camel/component/spring/batch/SpringBatchIntegrationTest.java
+++
b/components/camel-spring-batch/src/test/java/org/apache/camel/component/spring/batch/SpringBatchIntegrationTest.java
@@ -16,35 +16,30 @@
*/
package org.apache.camel.component.spring.batch;
-import org.apache.camel.CamelContext;
-import org.apache.camel.ProducerTemplate;
+import org.apache.camel.EndpointInject;
import org.apache.camel.component.mock.MockEndpoint;
+import org.apache.camel.test.spring.CamelSpringTestSupport;
import org.junit.Before;
import org.junit.Test;
-import org.springframework.context.ApplicationContext;
+import org.springframework.context.support.AbstractApplicationContext;
import org.springframework.context.support.ClassPathXmlApplicationContext;
-public class SpringBatchIntegrationTest {
-
-ApplicationContext applicationContext;
-
-ProducerTemplate producerTemplate;
+public class SpringBatchIntegrationTest extends CamelSpringTestSupport {
+@EndpointInject(uri = mock:output)
MockEndpoint outputEndpoint;
+@EndpointInject(uri = mock:jobExecutionEventsQueue)
MockEndpoint jobExecutionEventsQueueEndpoint;
String[] inputMessages = new String[]{foo, bar, baz, null};
@Before
-public void setUp() {
-applicationContext = new
ClassPathXmlApplicationContext(classpath:org/apache/camel/component/spring/batch/springBatchtestContext.xml);
-producerTemplate = applicationContext.getBean(ProducerTemplate.class);
-outputEndpoint =
applicationContext.getBean(CamelContext.class).getEndpoint(mock:output,
MockEndpoint.class);
-jobExecutionEventsQueueEndpoint =
applicationContext.getBean(CamelContext.class).getEndpoint(mock:jobExecutionEventsQueue,
MockEndpoint.class);
+public void setUp() throws Exception {
+super.setUp();
for (String message : inputMessages) {
-producerTemplate.sendBody(seda:inputQueue, message);
+template.sendBody(seda:inputQueue, message);
}
}
@@ -52,7 +47,7 @@ public class SpringBatchIntegrationTest {
public void shouldEchoInBatch() throws InterruptedException {
outputEndpoint.expectedBodiesReceived(Echo foo, Echo bar, Echo
baz);
-producerTemplate.sendBody(direct:start, Start batch!);
+template.sendBody(direct:start, Start batch!);
outputEndpoint.assertIsSatisfied();
}
@@ -61,8 +56,13 @@ public class SpringBatchIntegrationTest {
public void shouldGenerateBatchExecutionEvents() throws
InterruptedException {
jobExecutionEventsQueueEndpoint.setExpectedMessageCount(2);
-producerTemplate.sendBody(direct:start, Start batch!);
+template.sendBody(direct:start, Start batch!);
jobExecutionEventsQueueEndpoint.assertIsSatisfied();
}
+
+@Override
+protected AbstractApplicationContext createApplicationContext() {
+return new
ClassPathXmlApplicationContext(org/apache/camel/component/spring/batch/springBatchtestContext.xml);
+}
}
[3/4] git commit: CAMEL-6076: deprecate the xxxRef options and provide the xxx option if it not exists yet - work in progress
CAMEL-6076: deprecate the xxxRef options and provide the xxx option if it not
exists yet - work in progress
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/93f717c8
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/93f717c8
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/93f717c8
Branch: refs/heads/camel-2.11.x
Commit: 93f717c8831234738b1859f1fdffa0360296aa5d
Parents: 91dcf0c
Author: cmueller cmuel...@apache.org
Authored: Thu May 23 23:47:09 2013 +0200
Committer: cmueller cmuel...@apache.org
Committed: Sat May 25 18:07:05 2013 +0200
--
components/camel-spring-batch/pom.xml |5 +
.../spring/batch/SpringBatchComponent.java |4 +-
.../spring/batch/SpringBatchEndpoint.java |7 +
.../spring/batch/SpringBatchJobLauncherTest.java | 68 ++
.../batch/springBatchtestJobLauncherContext.xml| 98 +++
5 files changed, 181 insertions(+), 1 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/camel/blob/93f717c8/components/camel-spring-batch/pom.xml
--
diff --git a/components/camel-spring-batch/pom.xml
b/components/camel-spring-batch/pom.xml
index 82ea097..1acc966 100644
--- a/components/camel-spring-batch/pom.xml
+++ b/components/camel-spring-batch/pom.xml
@@ -70,6 +70,11 @@
/dependency
dependency
groupIdorg.apache.camel/groupId
+artifactIdcamel-test-spring/artifactId
+scopetest/scope
+/dependency
+dependency
+groupIdorg.apache.camel/groupId
artifactIdcamel-spring/artifactId
scopetest/scope
/dependency
http://git-wip-us.apache.org/repos/asf/camel/blob/93f717c8/components/camel-spring-batch/src/main/java/org/apache/camel/component/spring/batch/SpringBatchComponent.java
--
diff --git
a/components/camel-spring-batch/src/main/java/org/apache/camel/component/spring/batch/SpringBatchComponent.java
b/components/camel-spring-batch/src/main/java/org/apache/camel/component/spring/batch/SpringBatchComponent.java
index bf3bcd0..bac2fb9 100644
---
a/components/camel-spring-batch/src/main/java/org/apache/camel/component/spring/batch/SpringBatchComponent.java
+++
b/components/camel-spring-batch/src/main/java/org/apache/camel/component/spring/batch/SpringBatchComponent.java
@@ -37,7 +37,9 @@ public class SpringBatchComponent extends DefaultComponent {
@Override
protected Endpoint createEndpoint(String uri, String remaining,
MapString, Object parameters) throws Exception {
Job resolvedJob =
CamelContextHelper.mandatoryLookup(getCamelContext(), remaining, Job.class);
-return new SpringBatchEndpoint(uri, this, jobLauncher,
defaultResolvedJobLauncher, allResolvedJobLaunchers, resolvedJob);
+SpringBatchEndpoint endpoint = new SpringBatchEndpoint(uri, this,
jobLauncher, defaultResolvedJobLauncher, allResolvedJobLaunchers, resolvedJob);
+setProperties(endpoint, parameters);
+return endpoint;
}
@Override
http://git-wip-us.apache.org/repos/asf/camel/blob/93f717c8/components/camel-spring-batch/src/main/java/org/apache/camel/component/spring/batch/SpringBatchEndpoint.java
--
diff --git
a/components/camel-spring-batch/src/main/java/org/apache/camel/component/spring/batch/SpringBatchEndpoint.java
b/components/camel-spring-batch/src/main/java/org/apache/camel/component/spring/batch/SpringBatchEndpoint.java
index 7d9fa0a..dfe525f 100644
---
a/components/camel-spring-batch/src/main/java/org/apache/camel/component/spring/batch/SpringBatchEndpoint.java
+++
b/components/camel-spring-batch/src/main/java/org/apache/camel/component/spring/batch/SpringBatchEndpoint.java
@@ -28,6 +28,10 @@ import org.springframework.batch.core.launch.JobLauncher;
public class SpringBatchEndpoint extends DefaultEndpoint {
+/**
+ * @deprecated will be removed in Camel 3.0
+ * use jobLauncher instead
+ */
private String jobLauncherRef;
private JobLauncher jobLauncher;
@@ -97,4 +101,7 @@ public class SpringBatchEndpoint extends DefaultEndpoint {
this.jobLauncherRef = jobLauncherRef;
}
+public void setJobLauncher(JobLauncher jobLauncher) {
+this.jobLauncher = jobLauncher;
+}
}
http://git-wip-us.apache.org/repos/asf/camel/blob/93f717c8/components/camel-spring-batch/src/test/java/org/apache/camel/component/spring/batch/SpringBatchJobLauncherTest.java
--
diff --git
a/components/camel-spring-batch/src/test/java/org/apache/camel/component/spring/batch
[1/4] git commit: added some debug statements to have the possibilities to check what's going on
Updated Branches:
refs/heads/camel-2.11.x 9ac40a69d - d3dcf50f4
added some debug statements to have the possibilities to check what's going on
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/4e989fa6
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/4e989fa6
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/4e989fa6
Branch: refs/heads/camel-2.11.x
Commit: 4e989fa69ab81f2f355e03f65548c6d847789a33
Parents: 9ac40a6
Author: cmueller cmuel...@apache.org
Authored: Thu May 23 23:44:38 2013 +0200
Committer: cmueller cmuel...@apache.org
Committed: Sat May 25 18:06:03 2013 +0200
--
.../spring/batch/support/CamelItemProcessor.java |9 -
.../spring/batch/support/CamelItemReader.java | 10 --
.../spring/batch/support/CamelItemWriter.java |6 ++
.../batch/support/CamelJobExecutionListener.java |8
4 files changed, 30 insertions(+), 3 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/camel/blob/4e989fa6/components/camel-spring-batch/src/main/java/org/apache/camel/component/spring/batch/support/CamelItemProcessor.java
--
diff --git
a/components/camel-spring-batch/src/main/java/org/apache/camel/component/spring/batch/support/CamelItemProcessor.java
b/components/camel-spring-batch/src/main/java/org/apache/camel/component/spring/batch/support/CamelItemProcessor.java
index 5332c87..ec63bd1 100644
---
a/components/camel-spring-batch/src/main/java/org/apache/camel/component/spring/batch/support/CamelItemProcessor.java
+++
b/components/camel-spring-batch/src/main/java/org/apache/camel/component/spring/batch/support/CamelItemProcessor.java
@@ -17,10 +17,14 @@
package org.apache.camel.component.spring.batch.support;
import org.apache.camel.ProducerTemplate;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.springframework.batch.item.ItemProcessor;
public class CamelItemProcessorI, O implements ItemProcessorI, O {
+private static final transient Logger LOG =
LoggerFactory.getLogger(CamelItemProcessor.class);
+
private final ProducerTemplate producerTemplate;
private final String endpointUri;
@@ -33,7 +37,10 @@ public class CamelItemProcessorI, O implements
ItemProcessorI, O {
@Override
@SuppressWarnings(unchecked)
public O process(I i) throws Exception {
-return (O) producerTemplate.requestBody(endpointUri, i);
+LOG.debug(processing item [{}]..., i);
+O result = (O) producerTemplate.requestBody(endpointUri, i);
+LOG.debug(processed item);
+return result;
}
}
http://git-wip-us.apache.org/repos/asf/camel/blob/4e989fa6/components/camel-spring-batch/src/main/java/org/apache/camel/component/spring/batch/support/CamelItemReader.java
--
diff --git
a/components/camel-spring-batch/src/main/java/org/apache/camel/component/spring/batch/support/CamelItemReader.java
b/components/camel-spring-batch/src/main/java/org/apache/camel/component/spring/batch/support/CamelItemReader.java
index e54c64e..c337003 100644
---
a/components/camel-spring-batch/src/main/java/org/apache/camel/component/spring/batch/support/CamelItemReader.java
+++
b/components/camel-spring-batch/src/main/java/org/apache/camel/component/spring/batch/support/CamelItemReader.java
@@ -21,14 +21,17 @@ import org.apache.camel.ConsumerTemplate;
import org.apache.camel.support.ServiceSupport;
import org.apache.camel.util.ObjectHelper;
import org.apache.camel.util.ServiceHelper;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.springframework.batch.item.ItemReader;
import org.springframework.beans.factory.InitializingBean;
public class CamelItemReaderI extends ServiceSupport implements
ItemReaderI, InitializingBean {
+private static final transient Logger LOG =
LoggerFactory.getLogger(CamelItemReader.class);
+
private final CamelContext camelContext;
private final ConsumerTemplate consumerTemplate;
-
private final String endpointUri;
public CamelItemReader(ConsumerTemplate consumerTemplate, String
endpointUri) {
@@ -47,7 +50,10 @@ public class CamelItemReaderI extends ServiceSupport
implements ItemReaderI,
@Override
@SuppressWarnings(unchecked)
public I read() throws Exception {
-return (I) consumerTemplate.receiveBody(endpointUri);
+LOG.debug(reading new item...);
+I item = (I) consumerTemplate.receiveBody(endpointUri);
+LOG.debug(read item [{}], item);
+return item;
}
@Override
http://git-wip-us.apache.org/repos/asf/camel/blob/4e989fa6/components/camel-spring-batch/src/main/java/org/apache/camel/component/spring/batch
[4/4] git commit: simplified the unit test by using CamelSpringTestSupport
simplified the unit test by using CamelSpringTestSupport
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/d3dcf50f
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/d3dcf50f
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/d3dcf50f
Branch: refs/heads/camel-2.11.x
Commit: d3dcf50f463fdcc28bdecf27968b1e15eca81dd4
Parents: 93f717c
Author: cmueller cmuel...@apache.org
Authored: Sat May 25 17:41:45 2013 +0200
Committer: cmueller cmuel...@apache.org
Committed: Sat May 25 18:07:26 2013 +0200
--
.../spring/batch/SpringBatchIntegrationTest.java | 32 +++---
1 files changed, 16 insertions(+), 16 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/camel/blob/d3dcf50f/components/camel-spring-batch/src/test/java/org/apache/camel/component/spring/batch/SpringBatchIntegrationTest.java
--
diff --git
a/components/camel-spring-batch/src/test/java/org/apache/camel/component/spring/batch/SpringBatchIntegrationTest.java
b/components/camel-spring-batch/src/test/java/org/apache/camel/component/spring/batch/SpringBatchIntegrationTest.java
index 12e9f80..77e3ad2 100644
---
a/components/camel-spring-batch/src/test/java/org/apache/camel/component/spring/batch/SpringBatchIntegrationTest.java
+++
b/components/camel-spring-batch/src/test/java/org/apache/camel/component/spring/batch/SpringBatchIntegrationTest.java
@@ -16,35 +16,30 @@
*/
package org.apache.camel.component.spring.batch;
-import org.apache.camel.CamelContext;
-import org.apache.camel.ProducerTemplate;
+import org.apache.camel.EndpointInject;
import org.apache.camel.component.mock.MockEndpoint;
+import org.apache.camel.test.spring.CamelSpringTestSupport;
import org.junit.Before;
import org.junit.Test;
-import org.springframework.context.ApplicationContext;
+import org.springframework.context.support.AbstractApplicationContext;
import org.springframework.context.support.ClassPathXmlApplicationContext;
-public class SpringBatchIntegrationTest {
-
-ApplicationContext applicationContext;
-
-ProducerTemplate producerTemplate;
+public class SpringBatchIntegrationTest extends CamelSpringTestSupport {
+@EndpointInject(uri = mock:output)
MockEndpoint outputEndpoint;
+@EndpointInject(uri = mock:jobExecutionEventsQueue)
MockEndpoint jobExecutionEventsQueueEndpoint;
String[] inputMessages = new String[]{foo, bar, baz, null};
@Before
-public void setUp() {
-applicationContext = new
ClassPathXmlApplicationContext(classpath:org/apache/camel/component/spring/batch/springBatchtestContext.xml);
-producerTemplate = applicationContext.getBean(ProducerTemplate.class);
-outputEndpoint =
applicationContext.getBean(CamelContext.class).getEndpoint(mock:output,
MockEndpoint.class);
-jobExecutionEventsQueueEndpoint =
applicationContext.getBean(CamelContext.class).getEndpoint(mock:jobExecutionEventsQueue,
MockEndpoint.class);
+public void setUp() throws Exception {
+super.setUp();
for (String message : inputMessages) {
-producerTemplate.sendBody(seda:inputQueue, message);
+template.sendBody(seda:inputQueue, message);
}
}
@@ -52,7 +47,7 @@ public class SpringBatchIntegrationTest {
public void shouldEchoInBatch() throws InterruptedException {
outputEndpoint.expectedBodiesReceived(Echo foo, Echo bar, Echo
baz);
-producerTemplate.sendBody(direct:start, Start batch!);
+template.sendBody(direct:start, Start batch!);
outputEndpoint.assertIsSatisfied();
}
@@ -61,8 +56,13 @@ public class SpringBatchIntegrationTest {
public void shouldGenerateBatchExecutionEvents() throws
InterruptedException {
jobExecutionEventsQueueEndpoint.setExpectedMessageCount(2);
-producerTemplate.sendBody(direct:start, Start batch!);
+template.sendBody(direct:start, Start batch!);
jobExecutionEventsQueueEndpoint.assertIsSatisfied();
}
+
+@Override
+protected AbstractApplicationContext createApplicationContext() {
+return new
ClassPathXmlApplicationContext(org/apache/camel/component/spring/batch/springBatchtestContext.xml);
+}
}
git commit: use dataSource instead of dataSourceRef in our test and snippets
Updated Branches:
refs/heads/master 98f9c066e - 2048318a9
use dataSource instead of dataSourceRef in our test and snippets
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/2048318a
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/2048318a
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/2048318a
Branch: refs/heads/master
Commit: 2048318a9230307f0e61ae109494731196e9e6cb
Parents: 98f9c06
Author: cmueller cmuel...@apache.org
Authored: Sat May 25 22:20:00 2013 +0200
Committer: cmueller cmuel...@apache.org
Committed: Sat May 25 22:20:00 2013 +0200
--
.../camel/component/sql/SqlDataSourceRefTest.java |2 +-
.../camel/component/sql/SqlEndpointLikeTest.java |2 +-
.../component/sql/SqlTransactedRouteTest.java |2 +-
.../component/sql/SpringSqlEndpointLikeTest.xml|2 +-
4 files changed, 4 insertions(+), 4 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/camel/blob/2048318a/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlDataSourceRefTest.java
--
diff --git
a/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlDataSourceRefTest.java
b/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlDataSourceRefTest.java
index 323d9f0..aa29b4c 100755
---
a/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlDataSourceRefTest.java
+++
b/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlDataSourceRefTest.java
@@ -90,7 +90,7 @@ public class SqlDataSourceRefTest extends CamelTestSupport {
public void configure() {
// START SNIPPET: e1
from(direct:simple)
-.to(sql:select * from projects where license = # order by
id?dataSourceRef=jdbc/myDataSource)
+.to(sql:select * from projects where license = # order by
id?dataSource=#jdbc/myDataSource)
.to(mock:result);
// END SNIPPET: e1
}
http://git-wip-us.apache.org/repos/asf/camel/blob/2048318a/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlEndpointLikeTest.java
--
diff --git
a/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlEndpointLikeTest.java
b/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlEndpointLikeTest.java
index 32cf527..4a82f5f 100755
---
a/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlEndpointLikeTest.java
+++
b/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlEndpointLikeTest.java
@@ -64,7 +64,7 @@ public class SqlEndpointLikeTest extends CamelTestSupport {
return new RouteBuilder() {
public void configure() throws Exception {
from(direct:start)
-.to(sql:select * from projects where license like
'A%25'?dataSourceRef=jdbc/myDataSource)
+.to(sql:select * from projects where license like
'A%25'?dataSource=#jdbc/myDataSource)
.split(body())
.to(mock:result);
}
http://git-wip-us.apache.org/repos/asf/camel/blob/2048318a/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlTransactedRouteTest.java
--
diff --git
a/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlTransactedRouteTest.java
b/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlTransactedRouteTest.java
index f2fc697..0b485a4 100644
---
a/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlTransactedRouteTest.java
+++
b/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlTransactedRouteTest.java
@@ -42,7 +42,7 @@ public class SqlTransactedRouteTest extends CamelTestSupport {
private JdbcTemplate jdbc;
private String startEndpoint = direct:start;
-private String sqlEndpoint =
sql:overriddenByTheHeader?dataSourceRef=testdb;
+private String sqlEndpoint =
sql:overriddenByTheHeader?dataSource=#testdb;
@Before
public void setUp() throws Exception {
http://git-wip-us.apache.org/repos/asf/camel/blob/2048318a/components/camel-sql/src/test/resources/org/apache/camel/component/sql/SpringSqlEndpointLikeTest.xml
--
diff --git
a/components/camel-sql/src/test/resources/org/apache/camel/component/sql/SpringSqlEndpointLikeTest.xml
b/components/camel-sql/src/test/resources/org/apache/camel/component/sql/SpringSqlEndpointLikeTest.xml
index 775bb79..0c88363 100644
---
a/components/camel-sql/src/test
[1/3] git commit: added some debug statements to have the possibilities to check what's going on
Updated Branches:
refs/heads/master 6c3f812a5 - adf8c4395
added some debug statements to have the possibilities to check what's going on
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/d1d9f4a4
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/d1d9f4a4
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/d1d9f4a4
Branch: refs/heads/master
Commit: d1d9f4a4ad5ab1d5ead416dfc2b2ee24df9cba4c
Parents: 6c3f812
Author: cmueller cmuel...@apache.org
Authored: Thu May 23 23:44:38 2013 +0200
Committer: cmueller cmuel...@apache.org
Committed: Thu May 23 23:44:38 2013 +0200
--
.../spring/batch/support/CamelItemProcessor.java |9 -
.../spring/batch/support/CamelItemReader.java |9 -
.../spring/batch/support/CamelItemWriter.java |6 ++
.../batch/support/CamelJobExecutionListener.java |8
4 files changed, 30 insertions(+), 2 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/camel/blob/d1d9f4a4/components/camel-spring-batch/src/main/java/org/apache/camel/component/spring/batch/support/CamelItemProcessor.java
--
diff --git
a/components/camel-spring-batch/src/main/java/org/apache/camel/component/spring/batch/support/CamelItemProcessor.java
b/components/camel-spring-batch/src/main/java/org/apache/camel/component/spring/batch/support/CamelItemProcessor.java
index 5332c87..ec63bd1 100644
---
a/components/camel-spring-batch/src/main/java/org/apache/camel/component/spring/batch/support/CamelItemProcessor.java
+++
b/components/camel-spring-batch/src/main/java/org/apache/camel/component/spring/batch/support/CamelItemProcessor.java
@@ -17,10 +17,14 @@
package org.apache.camel.component.spring.batch.support;
import org.apache.camel.ProducerTemplate;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.springframework.batch.item.ItemProcessor;
public class CamelItemProcessorI, O implements ItemProcessorI, O {
+private static final transient Logger LOG =
LoggerFactory.getLogger(CamelItemProcessor.class);
+
private final ProducerTemplate producerTemplate;
private final String endpointUri;
@@ -33,7 +37,10 @@ public class CamelItemProcessorI, O implements
ItemProcessorI, O {
@Override
@SuppressWarnings(unchecked)
public O process(I i) throws Exception {
-return (O) producerTemplate.requestBody(endpointUri, i);
+LOG.debug(processing item [{}]..., i);
+O result = (O) producerTemplate.requestBody(endpointUri, i);
+LOG.debug(processed item);
+return result;
}
}
http://git-wip-us.apache.org/repos/asf/camel/blob/d1d9f4a4/components/camel-spring-batch/src/main/java/org/apache/camel/component/spring/batch/support/CamelItemReader.java
--
diff --git
a/components/camel-spring-batch/src/main/java/org/apache/camel/component/spring/batch/support/CamelItemReader.java
b/components/camel-spring-batch/src/main/java/org/apache/camel/component/spring/batch/support/CamelItemReader.java
index 3c0a0db..221cba7 100644
---
a/components/camel-spring-batch/src/main/java/org/apache/camel/component/spring/batch/support/CamelItemReader.java
+++
b/components/camel-spring-batch/src/main/java/org/apache/camel/component/spring/batch/support/CamelItemReader.java
@@ -17,10 +17,14 @@
package org.apache.camel.component.spring.batch.support;
import org.apache.camel.ConsumerTemplate;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.springframework.batch.item.ItemReader;
public class CamelItemReaderI implements ItemReaderI {
+private static final transient Logger LOG =
LoggerFactory.getLogger(CamelItemReader.class);
+
private final ConsumerTemplate consumerTemplate;
private final String endpointUri;
@@ -33,7 +37,10 @@ public class CamelItemReaderI implements ItemReaderI {
@Override
@SuppressWarnings(unchecked)
public I read() throws Exception {
-return (I) consumerTemplate.receiveBody(endpointUri);
+LOG.debug(reading new item...);
+I item = (I) consumerTemplate.receiveBody(endpointUri);
+LOG.debug(read item [{}], item);
+return item;
}
}
http://git-wip-us.apache.org/repos/asf/camel/blob/d1d9f4a4/components/camel-spring-batch/src/main/java/org/apache/camel/component/spring/batch/support/CamelItemWriter.java
--
diff --git
a/components/camel-spring-batch/src/main/java/org/apache/camel/component/spring/batch/support/CamelItemWriter.java
b/components/camel-spring-batch/src/main/java/org/apache/camel/component/spring/batch/support/CamelItemWriter.java
index e38d9fe
[2/3] git commit: simplified the unit test
simplified 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/50d661fe
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/50d661fe
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/50d661fe
Branch: refs/heads/master
Commit: 50d661fe1317ece724cb2f68c7b5f89f4a3fe5ad
Parents: d1d9f4a
Author: cmueller cmuel...@apache.org
Authored: Thu May 23 23:45:21 2013 +0200
Committer: cmueller cmuel...@apache.org
Committed: Thu May 23 23:45:21 2013 +0200
--
.../spring/batch/SpringBatchIntegrationTest.java | 19 ---
1 files changed, 5 insertions(+), 14 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/camel/blob/50d661fe/components/camel-spring-batch/src/test/java/org/apache/camel/component/spring/batch/SpringBatchIntegrationTest.java
--
diff --git
a/components/camel-spring-batch/src/test/java/org/apache/camel/component/spring/batch/SpringBatchIntegrationTest.java
b/components/camel-spring-batch/src/test/java/org/apache/camel/component/spring/batch/SpringBatchIntegrationTest.java
index 74dc734..12e9f80 100644
---
a/components/camel-spring-batch/src/test/java/org/apache/camel/component/spring/batch/SpringBatchIntegrationTest.java
+++
b/components/camel-spring-batch/src/test/java/org/apache/camel/component/spring/batch/SpringBatchIntegrationTest.java
@@ -24,8 +24,6 @@ import org.junit.Test;
import org.springframework.context.ApplicationContext;
import org.springframework.context.support.ClassPathXmlApplicationContext;
-import static org.junit.Assert.assertTrue;
-
public class SpringBatchIntegrationTest {
ApplicationContext applicationContext;
@@ -36,7 +34,7 @@ public class SpringBatchIntegrationTest {
MockEndpoint jobExecutionEventsQueueEndpoint;
-String[] inputMessages;
+String[] inputMessages = new String[]{foo, bar, baz, null};
@Before
public void setUp() {
@@ -44,34 +42,27 @@ public class SpringBatchIntegrationTest {
producerTemplate = applicationContext.getBean(ProducerTemplate.class);
outputEndpoint =
applicationContext.getBean(CamelContext.class).getEndpoint(mock:output,
MockEndpoint.class);
jobExecutionEventsQueueEndpoint =
applicationContext.getBean(CamelContext.class).getEndpoint(mock:jobExecutionEventsQueue,
MockEndpoint.class);
-inputMessages = new String[]{foo, bar, baz};
for (String message : inputMessages) {
producerTemplate.sendBody(seda:inputQueue, message);
}
-producerTemplate.sendBody(seda:inputQueue, null);
-
}
@Test
public void shouldEchoInBatch() throws InterruptedException {
-// When
+outputEndpoint.expectedBodiesReceived(Echo foo, Echo bar, Echo
baz);
+
producerTemplate.sendBody(direct:start, Start batch!);
-// Then
-outputEndpoint.setExpectedMessageCount(inputMessages.length);
outputEndpoint.assertIsSatisfied();
-
assertTrue(outputEndpoint.getExchanges().get(0).getIn().getBody(String.class).startsWith(Echo
));
}
@Test
public void shouldGenerateBatchExecutionEvents() throws
InterruptedException {
-// When
+jobExecutionEventsQueueEndpoint.setExpectedMessageCount(2);
+
producerTemplate.sendBody(direct:start, Start batch!);
-// Then
-jobExecutionEventsQueueEndpoint.setExpectedMessageCount(2);
jobExecutionEventsQueueEndpoint.assertIsSatisfied();
}
-
}
[3/3] git commit: CAMEL-6076: deprecate the xxxRef options and provide the xxx option if it not exists yet - work in progress
CAMEL-6076: deprecate the xxxRef options and provide the xxx option if it not
exists yet - work in progress
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/adf8c439
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/adf8c439
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/adf8c439
Branch: refs/heads/master
Commit: adf8c4395376d770e6eb19cb536a020edbc3d561
Parents: 50d661f
Author: cmueller cmuel...@apache.org
Authored: Thu May 23 23:47:09 2013 +0200
Committer: cmueller cmuel...@apache.org
Committed: Thu May 23 23:47:09 2013 +0200
--
components/camel-spring-batch/pom.xml |5 +
.../spring/batch/SpringBatchComponent.java |4 +-
.../spring/batch/SpringBatchEndpoint.java |7 +
.../spring/batch/SpringBatchJobLauncherTest.java | 68 ++
.../batch/springBatchtestJobLauncherContext.xml| 98 +++
5 files changed, 181 insertions(+), 1 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/camel/blob/adf8c439/components/camel-spring-batch/pom.xml
--
diff --git a/components/camel-spring-batch/pom.xml
b/components/camel-spring-batch/pom.xml
index 4179850..7bf80e7 100644
--- a/components/camel-spring-batch/pom.xml
+++ b/components/camel-spring-batch/pom.xml
@@ -70,6 +70,11 @@
/dependency
dependency
groupIdorg.apache.camel/groupId
+artifactIdcamel-test-spring/artifactId
+scopetest/scope
+/dependency
+dependency
+groupIdorg.apache.camel/groupId
artifactIdcamel-spring/artifactId
scopetest/scope
/dependency
http://git-wip-us.apache.org/repos/asf/camel/blob/adf8c439/components/camel-spring-batch/src/main/java/org/apache/camel/component/spring/batch/SpringBatchComponent.java
--
diff --git
a/components/camel-spring-batch/src/main/java/org/apache/camel/component/spring/batch/SpringBatchComponent.java
b/components/camel-spring-batch/src/main/java/org/apache/camel/component/spring/batch/SpringBatchComponent.java
index bf3bcd0..bac2fb9 100644
---
a/components/camel-spring-batch/src/main/java/org/apache/camel/component/spring/batch/SpringBatchComponent.java
+++
b/components/camel-spring-batch/src/main/java/org/apache/camel/component/spring/batch/SpringBatchComponent.java
@@ -37,7 +37,9 @@ public class SpringBatchComponent extends DefaultComponent {
@Override
protected Endpoint createEndpoint(String uri, String remaining,
MapString, Object parameters) throws Exception {
Job resolvedJob =
CamelContextHelper.mandatoryLookup(getCamelContext(), remaining, Job.class);
-return new SpringBatchEndpoint(uri, this, jobLauncher,
defaultResolvedJobLauncher, allResolvedJobLaunchers, resolvedJob);
+SpringBatchEndpoint endpoint = new SpringBatchEndpoint(uri, this,
jobLauncher, defaultResolvedJobLauncher, allResolvedJobLaunchers, resolvedJob);
+setProperties(endpoint, parameters);
+return endpoint;
}
@Override
http://git-wip-us.apache.org/repos/asf/camel/blob/adf8c439/components/camel-spring-batch/src/main/java/org/apache/camel/component/spring/batch/SpringBatchEndpoint.java
--
diff --git
a/components/camel-spring-batch/src/main/java/org/apache/camel/component/spring/batch/SpringBatchEndpoint.java
b/components/camel-spring-batch/src/main/java/org/apache/camel/component/spring/batch/SpringBatchEndpoint.java
index 7d9fa0a..dfe525f 100644
---
a/components/camel-spring-batch/src/main/java/org/apache/camel/component/spring/batch/SpringBatchEndpoint.java
+++
b/components/camel-spring-batch/src/main/java/org/apache/camel/component/spring/batch/SpringBatchEndpoint.java
@@ -28,6 +28,10 @@ import org.springframework.batch.core.launch.JobLauncher;
public class SpringBatchEndpoint extends DefaultEndpoint {
+/**
+ * @deprecated will be removed in Camel 3.0
+ * use jobLauncher instead
+ */
private String jobLauncherRef;
private JobLauncher jobLauncher;
@@ -97,4 +101,7 @@ public class SpringBatchEndpoint extends DefaultEndpoint {
this.jobLauncherRef = jobLauncherRef;
}
+public void setJobLauncher(JobLauncher jobLauncher) {
+this.jobLauncher = jobLauncher;
+}
}
http://git-wip-us.apache.org/repos/asf/camel/blob/adf8c439/components/camel-spring-batch/src/test/java/org/apache/camel/component/spring/batch/SpringBatchJobLauncherTest.java
--
diff --git
a/components/camel-spring-batch/src/test/java/org/apache/camel/component/spring/batch
git commit: upgrade Spring 3.2.2.RELEASE to 3.2.3.RELEASE
Updated Branches:
refs/heads/master a0ae8a31d - 0051f2443
upgrade Spring 3.2.2.RELEASE to 3.2.3.RELEASE
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/0051f244
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/0051f244
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/0051f244
Branch: refs/heads/master
Commit: 0051f2443915540a6604474e4b13429ce7cf55c7
Parents: a0ae8a3
Author: cmueller cmuel...@apache.org
Authored: Wed May 22 08:01:45 2013 +0200
Committer: cmueller cmuel...@apache.org
Committed: Wed May 22 08:01:45 2013 +0200
--
parent/pom.xml |2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/camel/blob/0051f244/parent/pom.xml
--
diff --git a/parent/pom.xml b/parent/pom.xml
index 5b641a1..807afb0 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -351,7 +351,7 @@
spring-version-range[3.1,3.3)/spring-version-range
spring-version${spring32-version}/spring-version
spring31-version3.1.4.RELEASE/spring31-version
-spring32-version3.2.2.RELEASE/spring32-version
+spring32-version3.2.3.RELEASE/spring32-version
spring-osgi-version1.2.1/spring-osgi-version
spring-security-version3.1.4.RELEASE/spring-security-version
spring-ws-version2.1.3.RELEASE/spring-ws-version
git commit: fixed the feature validation and upgraded Spring Security 3.1.3.RELEASE to 3.1.4.RELEASE to work with Spring 3.2.x
Updated Branches:
refs/heads/master 790a30531 - a255ba318
fixed the feature validation and upgraded Spring Security 3.1.3.RELEASE to
3.1.4.RELEASE to work with Spring 3.2.x
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/a255ba31
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/a255ba31
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/a255ba31
Branch: refs/heads/master
Commit: a255ba318571de31a7da60ba3c15b1bfea90ce15
Parents: 790a305
Author: cmueller cmuel...@apache.org
Authored: Tue May 14 21:33:18 2013 +0200
Committer: cmueller cmuel...@apache.org
Committed: Tue May 14 21:35:32 2013 +0200
--
parent/pom.xml |4 ++--
platforms/karaf/features/pom.xml |7 +++
.../karaf/features/src/main/resources/features.xml |3 +--
3 files changed, 10 insertions(+), 4 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/camel/blob/a255ba31/parent/pom.xml
--
diff --git a/parent/pom.xml b/parent/pom.xml
index 1f4045b..af9f539 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -235,7 +235,7 @@
junit-bundle-version4.11_1/junit-bundle-version
junit-version4.11/junit-version
jython-version2.5.3/jython-version
-karaf-version2.3.1/karaf-version
+karaf-version2.3.2-SNAPSHOT/karaf-version
krati-version0.4.8/krati-version
kxml2-bundle-version2.3.0_2/kxml2-bundle-version
leveldbjni-version1.7/leveldbjni-version
@@ -352,7 +352,7 @@
spring31-version3.1.4.RELEASE/spring31-version
spring32-version3.2.2.RELEASE/spring32-version
spring-osgi-version1.2.1/spring-osgi-version
-spring-security-version3.1.3.RELEASE/spring-security-version
+spring-security-version3.1.4.RELEASE/spring-security-version
spring-ws-version2.1.3.RELEASE/spring-ws-version
spymemcached-bundle-version2.5_2/spymemcached-bundle-version !--
FIXME cmueller: not in sync! --
spymemcached-version2.8.4/spymemcached-version
http://git-wip-us.apache.org/repos/asf/camel/blob/a255ba31/platforms/karaf/features/pom.xml
--
diff --git a/platforms/karaf/features/pom.xml b/platforms/karaf/features/pom.xml
index 3bd3255..02c1e45 100644
--- a/platforms/karaf/features/pom.xml
+++ b/platforms/karaf/features/pom.xml
@@ -186,4 +186,11 @@
/profile
/profiles
+ repositories
+repository
+ idcom.springsource.repository.bundles.release/id
+ nameSpringSource Enterprise Bundle Repository - SpringSource Bundle
Releases/name
+ urlhttp://repository.springsource.com/maven/bundles/release/url
+/repository
+ /repositories
/project
http://git-wip-us.apache.org/repos/asf/camel/blob/a255ba31/platforms/karaf/features/src/main/resources/features.xml
--
diff --git a/platforms/karaf/features/src/main/resources/features.xml
b/platforms/karaf/features/src/main/resources/features.xml
index 62621b1..933b64a 100644
--- a/platforms/karaf/features/src/main/resources/features.xml
+++ b/platforms/karaf/features/src/main/resources/features.xml
@@ -850,7 +850,6 @@
feature version='${project.version}'camel-core/feature
feature version='${spring-version-range}'spring/feature
feature version='${spring-version-range}'spring-tx/feature
-bundle
dependency='true'mvn:org.springframework/spring-context/${spring-version}/bundle
bundle
dependency='true'mvn:commons-pool/commons-pool/${commons-pool-version}/bundle
bundle
dependency='true'mvn:org.springframework.data/spring-data-redis/${spring-data-redis-version}/bundle
bundle
dependency='true'mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jedis/${jedis-client-bundle-version}/bundle
@@ -925,7 +924,7 @@
/feature
feature name='camel-test-spring' version='${project.version}'
resolver='(obr)' start-level='50'
feature version='${project.version}'camel-spring/feature
-bundle
dependency='true'mvn:org.springframework/spring-test/${spring-version}/bundle
+feature version='${spring-version-range}'spring-test/feature
bundle
dependency='true'mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.junit/${junit-bundle-version}/bundle
bundlemvn:org.apache.camel/camel-test/${project.version}/bundle
bundlemvn:org.apache.camel/camel-test-spring/${project.version}/bundle
git commit: upgrade TestNG 6.8.1 to 6.8.5
Updated Branches: refs/heads/master a255ba318 - b9b0962cf upgrade TestNG 6.8.1 to 6.8.5 Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/b9b0962c Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/b9b0962c Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/b9b0962c Branch: refs/heads/master Commit: b9b0962cf9f0b0b0bcd3401838e8f4bf606de33c Parents: a255ba3 Author: cmueller cmuel...@apache.org Authored: Tue May 14 21:49:33 2013 +0200 Committer: cmueller cmuel...@apache.org Committed: Tue May 14 21:49:33 2013 +0200 -- parent/pom.xml |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) -- http://git-wip-us.apache.org/repos/asf/camel/blob/b9b0962c/parent/pom.xml -- diff --git a/parent/pom.xml b/parent/pom.xml index af9f539..413d4dd 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -364,7 +364,7 @@ taglist-maven-plugin-version2.4/taglist-maven-plugin-version tagsoup-bundle-version1.2_5/tagsoup-bundle-version tagsoup-version1.2.1/tagsoup-version -testng-version6.8.1/testng-version +testng-version6.8.5/testng-version twitter4j-bundle-version3.0.3_1/twitter4j-bundle-version twitter4j-version3.0.3/twitter4j-version urlrewritefilter-version4.0.4/urlrewritefilter-version
git commit: upgrade ehcache bundle from 2.5.2_1 to 2.6.5_1
Updated Branches: refs/heads/master b9b0962cf - f4505b83f upgrade ehcache bundle from 2.5.2_1 to 2.6.5_1 Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/f4505b83 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/f4505b83 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/f4505b83 Branch: refs/heads/master Commit: f4505b83faa5dabd8a2d1a7c650a4e9c7b6bb930 Parents: b9b0962 Author: cmueller cmuel...@apache.org Authored: Tue May 14 21:54:00 2013 +0200 Committer: cmueller cmuel...@apache.org Committed: Tue May 14 21:54:00 2013 +0200 -- parent/pom.xml |3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) -- http://git-wip-us.apache.org/repos/asf/camel/blob/f4505b83/parent/pom.xml -- diff --git a/parent/pom.xml b/parent/pom.xml index 413d4dd..dbfcdfa 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -113,8 +113,7 @@ dozer-version5.4.0/dozer-version easymock-version3.1/easymock-version eclipse-equinox-common-version3.3.0-v20070426/eclipse-equinox-common-version -!-- The 2.6.3 bundle is flawed, see SMX-1395 -- -ehcache-bundle-version2.5.2_1/ehcache-bundle-version +ehcache-bundle-version2.6.5_1/ehcache-bundle-version !-- The 0.20 bundle is flawed, see SMX4-1372 -- elasticsearch-bundle-version0.19.10_1/elasticsearch-bundle-version elasticsearch-version0.20.5/elasticsearch-version
git commit: upgrade Derby from 10.9.1.0 to 10.10.1.1
Updated Branches: refs/heads/master f4505b83f - 4ccb1ef18 upgrade Derby from 10.9.1.0 to 10.10.1.1 Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/4ccb1ef1 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/4ccb1ef1 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/4ccb1ef1 Branch: refs/heads/master Commit: 4ccb1ef184bb89368b2d2bac91101b8b9bb1a1b2 Parents: f4505b8 Author: cmueller cmuel...@apache.org Authored: Tue May 14 21:59:57 2013 +0200 Committer: cmueller cmuel...@apache.org Committed: Tue May 14 21:59:57 2013 +0200 -- parent/pom.xml |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) -- http://git-wip-us.apache.org/repos/asf/camel/blob/4ccb1ef1/parent/pom.xml -- diff --git a/parent/pom.xml b/parent/pom.xml index dbfcdfa..f7e779f 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -106,7 +106,7 @@ cxf-version-range[2.6,2.9)/cxf-version-range cxf-xjc-utils-version2.6.0/cxf-xjc-utils-version deltaspike-version0.3-incubating/deltaspike-version -derby-version10.9.1.0/derby-version +derby-version10.10.1.1/derby-version dnsjava-version2.1.1/dnsjava-version dnsjava-bundle-version2.1.1_1/dnsjava-bundle-version dom4j-bundle-version1.6.1_5/dom4j-bundle-version
git commit: upgrade XStream 1.4.3 to 1.4.4
Updated Branches: refs/heads/master 4ccb1ef18 - ca22cf2e3 upgrade XStream 1.4.3 to 1.4.4 Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/ca22cf2e Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/ca22cf2e Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/ca22cf2e Branch: refs/heads/master Commit: ca22cf2e3240ef0f2b5c5fb77c6cd0c0b0190bd0 Parents: 4ccb1ef Author: cmueller cmuel...@apache.org Authored: Tue May 14 22:16:55 2013 +0200 Committer: cmueller cmuel...@apache.org Committed: Tue May 14 22:16:55 2013 +0200 -- parent/pom.xml |4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) -- http://git-wip-us.apache.org/repos/asf/camel/blob/ca22cf2e/parent/pom.xml -- diff --git a/parent/pom.xml b/parent/pom.xml index f7e779f..495cba4 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -398,8 +398,8 @@ xpp3-bundle-version1.1.4c_6/xpp3-bundle-version xpp3-version1.1.4c/xpp3-version xsdlib-version2013.2/xsdlib-version -xstream-bundle-version1.4.3_1/xstream-bundle-version -xstream-version1.4.3/xstream-version +xstream-bundle-version1.4.4_1/xstream-bundle-version +xstream-version1.4.4/xstream-version xom-version1.2.5/xom-version zookeeper-version3.4.5/zookeeper-version
git commit: upgrade CXF 2.7.4 to 2.7.5
Updated Branches: refs/heads/master ca22cf2e3 - 23e6ee4bd upgrade CXF 2.7.4 to 2.7.5 Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/23e6ee4b Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/23e6ee4b Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/23e6ee4b Branch: refs/heads/master Commit: 23e6ee4bdf4838cc73e954f9a61f7d22d4f5ffb7 Parents: ca22cf2 Author: cmueller cmuel...@apache.org Authored: Tue May 14 22:24:00 2013 +0200 Committer: cmueller cmuel...@apache.org Committed: Tue May 14 22:24:00 2013 +0200 -- parent/pom.xml |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) -- http://git-wip-us.apache.org/repos/asf/camel/blob/23e6ee4b/parent/pom.xml -- diff --git a/parent/pom.xml b/parent/pom.xml index 495cba4..36a28ba 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -102,7 +102,7 @@ commons-vfs2-version2.0/commons-vfs2-version concurrentlinkedhashmap.version1.3.2/concurrentlinkedhashmap.version cobertura-maven-plugin-version2.5.2/cobertura-maven-plugin-version -cxf-version2.7.4/cxf-version +cxf-version2.7.5/cxf-version cxf-version-range[2.6,2.9)/cxf-version-range cxf-xjc-utils-version2.6.0/cxf-xjc-utils-version deltaspike-version0.3-incubating/deltaspike-version
git commit: upgrade Krati 0.4.8 to 0.4.9
Updated Branches: refs/heads/master 23e6ee4bd - 995a468d6 upgrade Krati 0.4.8 to 0.4.9 Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/995a468d Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/995a468d Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/995a468d Branch: refs/heads/master Commit: 995a468d6383cf7867592de51a26755759a84c75 Parents: 23e6ee4 Author: cmueller cmuel...@apache.org Authored: Tue May 14 22:26:21 2013 +0200 Committer: cmueller cmuel...@apache.org Committed: Tue May 14 22:26:21 2013 +0200 -- parent/pom.xml |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) -- http://git-wip-us.apache.org/repos/asf/camel/blob/995a468d/parent/pom.xml -- diff --git a/parent/pom.xml b/parent/pom.xml index 36a28ba..bdc45b4 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -235,7 +235,7 @@ junit-version4.11/junit-version jython-version2.5.3/jython-version karaf-version2.3.2-SNAPSHOT/karaf-version -krati-version0.4.8/krati-version +krati-version0.4.9/krati-version kxml2-bundle-version2.3.0_2/kxml2-bundle-version leveldbjni-version1.7/leveldbjni-version log4j-version1.2.17/log4j-version
git commit: CAMEL-6361: Validations exception should include line/column Thanks metatech for the patch
Updated Branches:
refs/heads/master 995a468d6 - 58b87ec5c
CAMEL-6361: Validations exception should include line/column
Thanks metatech for the patch
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/58b87ec5
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/58b87ec5
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/58b87ec5
Branch: refs/heads/master
Commit: 58b87ec5c63a5ceefd221228cfd3a8ae1f2edf1c
Parents: 995a468
Author: cmueller cmuel...@apache.org
Authored: Tue May 14 23:37:34 2013 +0200
Committer: cmueller cmuel...@apache.org
Committed: Tue May 14 23:37:34 2013 +0200
--
.../validation/SchemaValidationException.java | 28 +++---
.../DefaultValidationErrorHandlerTest.java | 14 +++
2 files changed, 36 insertions(+), 6 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/camel/blob/58b87ec5/camel-core/src/main/java/org/apache/camel/processor/validation/SchemaValidationException.java
--
diff --git
a/camel-core/src/main/java/org/apache/camel/processor/validation/SchemaValidationException.java
b/camel-core/src/main/java/org/apache/camel/processor/validation/SchemaValidationException.java
index 8100a7c..6cd8566 100644
---
a/camel-core/src/main/java/org/apache/camel/processor/validation/SchemaValidationException.java
+++
b/camel-core/src/main/java/org/apache/camel/processor/validation/SchemaValidationException.java
@@ -75,18 +75,34 @@ public class SchemaValidationException extends
ValidationException {
protected static String message(Object schema, ListSAXParseException
fatalErrors,
ListSAXParseException errors,
ListSAXParseException warnings) {
-StringBuilder buffer = new StringBuilder(Validation failed for: );
-buffer.append(schema);
+StringBuilder buffer = new StringBuilder(Validation failed for: )
+.append(schema)
+.append(\n);
if (!fatalErrors.isEmpty()) {
-buffer.append( fatal errors: );
-buffer.append(fatalErrors);
+buffer.append(fatal errors: [)
+.append(\n);
+appendDetails(buffer, fatalErrors);
+buffer.append(])
+.append(\n);
}
+
if (!errors.isEmpty()) {
-buffer.append( errors: );
-buffer.append(errors);
+buffer.append(errors: [)
+.append(\n);
+appendDetails(buffer, errors);
+buffer.append(]);
}
return buffer.toString();
}
+
+private static void appendDetails(StringBuilder buffer,
ListSAXParseException saxParseExceptions) {
+for (SAXParseException e : saxParseExceptions) {
+buffer.append(e.getClass().getName()).append(: );
+buffer.append(e.getMessage()).append(, );
+buffer.append(Line : ).append(e.getLineNumber()).append(, );
+buffer.append(Column :
).append(e.getColumnNumber()).append(\n);
+}
+}
}
http://git-wip-us.apache.org/repos/asf/camel/blob/58b87ec5/camel-core/src/test/java/org/apache/camel/processor/validation/DefaultValidationErrorHandlerTest.java
--
diff --git
a/camel-core/src/test/java/org/apache/camel/processor/validation/DefaultValidationErrorHandlerTest.java
b/camel-core/src/test/java/org/apache/camel/processor/validation/DefaultValidationErrorHandlerTest.java
index 3e54b76..f27a0e2 100644
---
a/camel-core/src/test/java/org/apache/camel/processor/validation/DefaultValidationErrorHandlerTest.java
+++
b/camel-core/src/test/java/org/apache/camel/processor/validation/DefaultValidationErrorHandlerTest.java
@@ -89,6 +89,14 @@ public class DefaultValidationErrorHandlerTest extends
ContextTestSupport {
assertEquals(0, e.getWarnings().size());
assertNotNull(e.getSchema());
assertNotNull(e.getExchange());
+
+assertTrue(e.getMessage().startsWith(Validation failed for:
org.apache.camel.processor.validation.DefaultValidationErrorHandlerTest));
+assertTrue(e.getMessage().contains(fatal errors: [));
+assertTrue(e.getMessage().contains(org.xml.sax.SAXParseException:
cheese, Line : 13, Column : 17));
+assertTrue(e.getMessage().contains(errors: [));
+assertTrue(e.getMessage().contains(org.xml.sax.SAXParseException:
foo, Line : 3, Column : 5));
+assertTrue(e.getMessage().contains(org.xml.sax.SAXParseException:
bar, Line : 9, Column : 12));
+assertTrue(e.getMessage().contains(Exchange[null]));
}
}
@@ -110,6 +118,12 @@ public class DefaultValidationErrorHandlerTest extends
git commit: CAMEL-6361: Validations exception should include line/column Thanks metatech for the patch
Updated Branches:
refs/heads/camel-2.11.x b80218fc3 - 4e46eea4b
CAMEL-6361: Validations exception should include line/column
Thanks metatech for the patch
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/4e46eea4
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/4e46eea4
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/4e46eea4
Branch: refs/heads/camel-2.11.x
Commit: 4e46eea4bf08097efa1896cfb00c5f064a908662
Parents: b80218f
Author: cmueller cmuel...@apache.org
Authored: Tue May 14 23:37:34 2013 +0200
Committer: cmueller cmuel...@apache.org
Committed: Tue May 14 23:39:13 2013 +0200
--
.../validation/SchemaValidationException.java | 28 +++---
.../DefaultValidationErrorHandlerTest.java | 14 +++
2 files changed, 36 insertions(+), 6 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/camel/blob/4e46eea4/camel-core/src/main/java/org/apache/camel/processor/validation/SchemaValidationException.java
--
diff --git
a/camel-core/src/main/java/org/apache/camel/processor/validation/SchemaValidationException.java
b/camel-core/src/main/java/org/apache/camel/processor/validation/SchemaValidationException.java
index 8100a7c..6cd8566 100644
---
a/camel-core/src/main/java/org/apache/camel/processor/validation/SchemaValidationException.java
+++
b/camel-core/src/main/java/org/apache/camel/processor/validation/SchemaValidationException.java
@@ -75,18 +75,34 @@ public class SchemaValidationException extends
ValidationException {
protected static String message(Object schema, ListSAXParseException
fatalErrors,
ListSAXParseException errors,
ListSAXParseException warnings) {
-StringBuilder buffer = new StringBuilder(Validation failed for: );
-buffer.append(schema);
+StringBuilder buffer = new StringBuilder(Validation failed for: )
+.append(schema)
+.append(\n);
if (!fatalErrors.isEmpty()) {
-buffer.append( fatal errors: );
-buffer.append(fatalErrors);
+buffer.append(fatal errors: [)
+.append(\n);
+appendDetails(buffer, fatalErrors);
+buffer.append(])
+.append(\n);
}
+
if (!errors.isEmpty()) {
-buffer.append( errors: );
-buffer.append(errors);
+buffer.append(errors: [)
+.append(\n);
+appendDetails(buffer, errors);
+buffer.append(]);
}
return buffer.toString();
}
+
+private static void appendDetails(StringBuilder buffer,
ListSAXParseException saxParseExceptions) {
+for (SAXParseException e : saxParseExceptions) {
+buffer.append(e.getClass().getName()).append(: );
+buffer.append(e.getMessage()).append(, );
+buffer.append(Line : ).append(e.getLineNumber()).append(, );
+buffer.append(Column :
).append(e.getColumnNumber()).append(\n);
+}
+}
}
http://git-wip-us.apache.org/repos/asf/camel/blob/4e46eea4/camel-core/src/test/java/org/apache/camel/processor/validation/DefaultValidationErrorHandlerTest.java
--
diff --git
a/camel-core/src/test/java/org/apache/camel/processor/validation/DefaultValidationErrorHandlerTest.java
b/camel-core/src/test/java/org/apache/camel/processor/validation/DefaultValidationErrorHandlerTest.java
index 3e54b76..f27a0e2 100644
---
a/camel-core/src/test/java/org/apache/camel/processor/validation/DefaultValidationErrorHandlerTest.java
+++
b/camel-core/src/test/java/org/apache/camel/processor/validation/DefaultValidationErrorHandlerTest.java
@@ -89,6 +89,14 @@ public class DefaultValidationErrorHandlerTest extends
ContextTestSupport {
assertEquals(0, e.getWarnings().size());
assertNotNull(e.getSchema());
assertNotNull(e.getExchange());
+
+assertTrue(e.getMessage().startsWith(Validation failed for:
org.apache.camel.processor.validation.DefaultValidationErrorHandlerTest));
+assertTrue(e.getMessage().contains(fatal errors: [));
+assertTrue(e.getMessage().contains(org.xml.sax.SAXParseException:
cheese, Line : 13, Column : 17));
+assertTrue(e.getMessage().contains(errors: [));
+assertTrue(e.getMessage().contains(org.xml.sax.SAXParseException:
foo, Line : 3, Column : 5));
+assertTrue(e.getMessage().contains(org.xml.sax.SAXParseException:
bar, Line : 9, Column : 12));
+assertTrue(e.getMessage().contains(Exchange[null]));
}
}
@@ -110,6 +118,12 @@ public class DefaultValidationErrorHandlerTest
git commit: CAMEL-6361: Validations exception should include line/column Thanks metatech for the patch
Updated Branches:
refs/heads/camel-2.10.x a85b70861 - 16851b5a4
CAMEL-6361: Validations exception should include line/column
Thanks metatech for the patch
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/16851b5a
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/16851b5a
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/16851b5a
Branch: refs/heads/camel-2.10.x
Commit: 16851b5a45f3644976d7128065ab7e757f151679
Parents: a85b708
Author: cmueller cmuel...@apache.org
Authored: Tue May 14 23:37:34 2013 +0200
Committer: cmueller cmuel...@apache.org
Committed: Tue May 14 23:41:38 2013 +0200
--
.../validation/SchemaValidationException.java | 28 +++---
.../DefaultValidationErrorHandlerTest.java | 14 +++
2 files changed, 36 insertions(+), 6 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/camel/blob/16851b5a/camel-core/src/main/java/org/apache/camel/processor/validation/SchemaValidationException.java
--
diff --git
a/camel-core/src/main/java/org/apache/camel/processor/validation/SchemaValidationException.java
b/camel-core/src/main/java/org/apache/camel/processor/validation/SchemaValidationException.java
index 8100a7c..6cd8566 100644
---
a/camel-core/src/main/java/org/apache/camel/processor/validation/SchemaValidationException.java
+++
b/camel-core/src/main/java/org/apache/camel/processor/validation/SchemaValidationException.java
@@ -75,18 +75,34 @@ public class SchemaValidationException extends
ValidationException {
protected static String message(Object schema, ListSAXParseException
fatalErrors,
ListSAXParseException errors,
ListSAXParseException warnings) {
-StringBuilder buffer = new StringBuilder(Validation failed for: );
-buffer.append(schema);
+StringBuilder buffer = new StringBuilder(Validation failed for: )
+.append(schema)
+.append(\n);
if (!fatalErrors.isEmpty()) {
-buffer.append( fatal errors: );
-buffer.append(fatalErrors);
+buffer.append(fatal errors: [)
+.append(\n);
+appendDetails(buffer, fatalErrors);
+buffer.append(])
+.append(\n);
}
+
if (!errors.isEmpty()) {
-buffer.append( errors: );
-buffer.append(errors);
+buffer.append(errors: [)
+.append(\n);
+appendDetails(buffer, errors);
+buffer.append(]);
}
return buffer.toString();
}
+
+private static void appendDetails(StringBuilder buffer,
ListSAXParseException saxParseExceptions) {
+for (SAXParseException e : saxParseExceptions) {
+buffer.append(e.getClass().getName()).append(: );
+buffer.append(e.getMessage()).append(, );
+buffer.append(Line : ).append(e.getLineNumber()).append(, );
+buffer.append(Column :
).append(e.getColumnNumber()).append(\n);
+}
+}
}
http://git-wip-us.apache.org/repos/asf/camel/blob/16851b5a/camel-core/src/test/java/org/apache/camel/processor/validation/DefaultValidationErrorHandlerTest.java
--
diff --git
a/camel-core/src/test/java/org/apache/camel/processor/validation/DefaultValidationErrorHandlerTest.java
b/camel-core/src/test/java/org/apache/camel/processor/validation/DefaultValidationErrorHandlerTest.java
index 3e54b76..f27a0e2 100644
---
a/camel-core/src/test/java/org/apache/camel/processor/validation/DefaultValidationErrorHandlerTest.java
+++
b/camel-core/src/test/java/org/apache/camel/processor/validation/DefaultValidationErrorHandlerTest.java
@@ -89,6 +89,14 @@ public class DefaultValidationErrorHandlerTest extends
ContextTestSupport {
assertEquals(0, e.getWarnings().size());
assertNotNull(e.getSchema());
assertNotNull(e.getExchange());
+
+assertTrue(e.getMessage().startsWith(Validation failed for:
org.apache.camel.processor.validation.DefaultValidationErrorHandlerTest));
+assertTrue(e.getMessage().contains(fatal errors: [));
+assertTrue(e.getMessage().contains(org.xml.sax.SAXParseException:
cheese, Line : 13, Column : 17));
+assertTrue(e.getMessage().contains(errors: [));
+assertTrue(e.getMessage().contains(org.xml.sax.SAXParseException:
foo, Line : 3, Column : 5));
+assertTrue(e.getMessage().contains(org.xml.sax.SAXParseException:
bar, Line : 9, Column : 12));
+assertTrue(e.getMessage().contains(Exchange[null]));
}
}
@@ -110,6 +118,12 @@ public class DefaultValidationErrorHandlerTest
[1/5] git commit: upgrad Spring Security 3.1.3.RELEASE to 3.1.4.RELEASE
Updated Branches: refs/heads/camel-2.11.x 4e46eea4b - 91eaa5ca9 upgrad Spring Security 3.1.3.RELEASE to 3.1.4.RELEASE Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/f17d9dad Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/f17d9dad Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/f17d9dad Branch: refs/heads/camel-2.11.x Commit: f17d9dad27efae3d88877a42e5b516aa375ea92a Parents: 4e46eea Author: cmueller cmuel...@apache.org Authored: Tue May 14 23:46:55 2013 +0200 Committer: cmueller cmuel...@apache.org Committed: Tue May 14 23:46:55 2013 +0200 -- parent/pom.xml |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) -- http://git-wip-us.apache.org/repos/asf/camel/blob/f17d9dad/parent/pom.xml -- diff --git a/parent/pom.xml b/parent/pom.xml index bb7765b..cb0ba1b 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -355,7 +355,7 @@ spring31-version3.1.4.RELEASE/spring31-version spring32-version3.2.2.RELEASE/spring32-version spring-osgi-version1.2.1/spring-osgi-version -spring-security-version3.1.3.RELEASE/spring-security-version +spring-security-version3.1.4.RELEASE/spring-security-version spring-ws-version2.1.2.RELEASE/spring-ws-version spymemcached-bundle-version2.5_2/spymemcached-bundle-version !-- FIXME cmueller: not in sync! -- spymemcached-version2.8.4/spymemcached-version
[2/5] git commit: upgrade TestNG 6.8.1 to 6.8.5
upgrade TestNG 6.8.1 to 6.8.5 Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/e46c156c Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/e46c156c Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/e46c156c Branch: refs/heads/camel-2.11.x Commit: e46c156c0ebe4129d25ced1271f5b7589a3a4760 Parents: f17d9da Author: cmueller cmuel...@apache.org Authored: Tue May 14 21:49:33 2013 +0200 Committer: cmueller cmuel...@apache.org Committed: Tue May 14 23:47:15 2013 +0200 -- parent/pom.xml |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) -- http://git-wip-us.apache.org/repos/asf/camel/blob/e46c156c/parent/pom.xml -- diff --git a/parent/pom.xml b/parent/pom.xml index cb0ba1b..26fdadd 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -367,7 +367,7 @@ taglist-maven-plugin-version2.4/taglist-maven-plugin-version tagsoup-bundle-version1.2_5/tagsoup-bundle-version tagsoup-version1.2.1/tagsoup-version -testng-version6.8.1/testng-version +testng-version6.8.5/testng-version twitter4j-bundle-version3.0.3_1/twitter4j-bundle-version twitter4j-version3.0.3/twitter4j-version urlrewritefilter-version4.0.4/urlrewritefilter-version
[4/5] git commit: upgrade CXF 2.7.4 to 2.7.5
upgrade CXF 2.7.4 to 2.7.5 Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/58a03b48 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/58a03b48 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/58a03b48 Branch: refs/heads/camel-2.11.x Commit: 58a03b48ac1c97b3baf6a72b069306dd503fec8c Parents: 9a266bc Author: cmueller cmuel...@apache.org Authored: Tue May 14 22:24:00 2013 +0200 Committer: cmueller cmuel...@apache.org Committed: Tue May 14 23:49:06 2013 +0200 -- parent/pom.xml |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) -- http://git-wip-us.apache.org/repos/asf/camel/blob/58a03b48/parent/pom.xml -- diff --git a/parent/pom.xml b/parent/pom.xml index 2463231..d7cec2d 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -102,7 +102,7 @@ commons-vfs2-version2.0/commons-vfs2-version concurrentlinkedhashmap.version1.3.2/concurrentlinkedhashmap.version cobertura-maven-plugin-version2.5.2/cobertura-maven-plugin-version -cxf-version2.7.4/cxf-version +cxf-version2.7.5/cxf-version cxf-version-range[2.6,2.9)/cxf-version-range cxf-xjc-utils-version2.6.0/cxf-xjc-utils-version deltaspike-version0.3-incubating/deltaspike-version
[5/5] git commit: upgrade Krati 0.4.8 to 0.4.9
upgrade Krati 0.4.8 to 0.4.9 Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/91eaa5ca Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/91eaa5ca Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/91eaa5ca Branch: refs/heads/camel-2.11.x Commit: 91eaa5ca94d4f9d8c8198587f3a52ffb4bc5f891 Parents: 58a03b4 Author: cmueller cmuel...@apache.org Authored: Tue May 14 23:50:50 2013 +0200 Committer: cmueller cmuel...@apache.org Committed: Tue May 14 23:50:50 2013 +0200 -- parent/pom.xml |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) -- http://git-wip-us.apache.org/repos/asf/camel/blob/91eaa5ca/parent/pom.xml -- diff --git a/parent/pom.xml b/parent/pom.xml index d7cec2d..1eca447 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -235,7 +235,7 @@ junit-version4.11/junit-version jython-version2.5.3/jython-version karaf-version2.3.1/karaf-version -krati-version0.4.8/krati-version +krati-version0.4.9/krati-version kxml2-bundle-version2.3.0_2/kxml2-bundle-version leveldbjni-version1.6/leveldbjni-version log4j-version1.2.17/log4j-version
[3/5] git commit: upgrade XStream 1.4.3 to 1.4.4
upgrade XStream 1.4.3 to 1.4.4 Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/9a266bc6 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/9a266bc6 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/9a266bc6 Branch: refs/heads/camel-2.11.x Commit: 9a266bc6aeb634a224199779693e77fe5c61c800 Parents: e46c156 Author: cmueller cmuel...@apache.org Authored: Tue May 14 22:16:55 2013 +0200 Committer: cmueller cmuel...@apache.org Committed: Tue May 14 23:48:22 2013 +0200 -- parent/pom.xml |4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) -- http://git-wip-us.apache.org/repos/asf/camel/blob/9a266bc6/parent/pom.xml -- diff --git a/parent/pom.xml b/parent/pom.xml index 26fdadd..2463231 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -402,8 +402,8 @@ xpp3-bundle-version1.1.4c_6/xpp3-bundle-version xpp3-version1.1.4c/xpp3-version xsdlib-version2013.2/xsdlib-version -xstream-bundle-version1.4.3_1/xstream-bundle-version -xstream-version1.4.3/xstream-version +xstream-bundle-version1.4.4_1/xstream-bundle-version +xstream-version1.4.4/xstream-version xom-version1.2.5/xom-version zookeeper-version3.4.5/zookeeper-version
[2/3] git commit: upgrade XStream 1.4.2 to 1.4.4
upgrade XStream 1.4.2 to 1.4.4 Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/35fa9ebe Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/35fa9ebe Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/35fa9ebe Branch: refs/heads/camel-2.10.x Commit: 35fa9ebe22fa71db3fa86fb6e596d8357ccef72f Parents: 066b950 Author: cmueller cmuel...@apache.org Authored: Tue May 14 23:55:02 2013 +0200 Committer: cmueller cmuel...@apache.org Committed: Tue May 14 23:55:02 2013 +0200 -- parent/pom.xml |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) -- http://git-wip-us.apache.org/repos/asf/camel/blob/35fa9ebe/parent/pom.xml -- diff --git a/parent/pom.xml b/parent/pom.xml index 19ae3a6..c315f66 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -206,7 +206,7 @@ woodstox-version4.1.4/woodstox-version xbean-spring-version3.12/xbean-spring-version xml-resolver-version1.2/xml-resolver-version -xstream-version1.4.2/xstream-version +xstream-version1.4.4/xstream-version xmlsec-version1.5.1/xmlsec-version xerces-version2.9.1/xerces-version xalan-version2.7.1/xalan-version
[1/3] git commit: upgrad Spring Security 3.1.3.RELEASE to 3.1.4.RELEASE
Updated Branches: refs/heads/camel-2.10.x 16851b5a4 - fa27fc94f upgrad Spring Security 3.1.3.RELEASE to 3.1.4.RELEASE Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/066b9509 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/066b9509 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/066b9509 Branch: refs/heads/camel-2.10.x Commit: 066b950905adc5be439c36f87c2e4c28c887c7b1 Parents: 16851b5 Author: cmueller cmuel...@apache.org Authored: Tue May 14 23:53:45 2013 +0200 Committer: cmueller cmuel...@apache.org Committed: Tue May 14 23:53:45 2013 +0200 -- parent/pom.xml |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) -- http://git-wip-us.apache.org/repos/asf/camel/blob/066b9509/parent/pom.xml -- diff --git a/parent/pom.xml b/parent/pom.xml index eec5199..19ae3a6 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -192,7 +192,7 @@ spring-javaconfig-version1.0.0-20090215/spring-javaconfig-version spring-version3.0.7.RELEASE/spring-version spring-osgi-version1.2.1/spring-osgi-version -spring-security-version3.1.3.RELEASE/spring-security-version +spring-security-version3.1.4.RELEASE/spring-security-version !-- spring WS 2.0.3 is the last release to support Spring 3.0.x -- spring-ws-version2.0.3.RELEASE/spring-ws-version spymemcached-version2.8.0/spymemcached-version
[3/3] git commit: upgrade Krati 0.4.5 to 0.4.9
upgrade Krati 0.4.5 to 0.4.9 Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/fa27fc94 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/fa27fc94 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/fa27fc94 Branch: refs/heads/camel-2.10.x Commit: fa27fc94f9b727935c263cb10abd90dea3521b52 Parents: 35fa9eb Author: cmueller cmuel...@apache.org Authored: Wed May 15 00:08:07 2013 +0200 Committer: cmueller cmuel...@apache.org Committed: Wed May 15 00:08:07 2013 +0200 -- parent/pom.xml |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) -- http://git-wip-us.apache.org/repos/asf/camel/blob/fa27fc94/parent/pom.xml -- diff --git a/parent/pom.xml b/parent/pom.xml index c315f66..c913dc0 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -139,7 +139,7 @@ jt400-version6.0/jt400-version jaxb2-plugin-version0.8.1/jaxb2-plugin-version karaf-version2.2.9/karaf-version -krati-version0.4.5/krati-version +krati-version0.4.9/krati-version leveldbjni-version1.3/leveldbjni-version log4j-version1.2.17/log4j-version lucene-version3.6.0/lucene-version
git commit: upgrade CXF 2.6.6 to 2.6.7
Updated Branches: refs/heads/camel-2.10.x fa27fc94f - 50dc12f58 upgrade CXF 2.6.6 to 2.6.7 Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/50dc12f5 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/50dc12f5 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/50dc12f5 Branch: refs/heads/camel-2.10.x Commit: 50dc12f58750ea6caca037bb1ef9e6804ddef6ad Parents: fa27fc9 Author: cmueller cmuel...@apache.org Authored: Wed May 15 00:13:30 2013 +0200 Committer: cmueller cmuel...@apache.org Committed: Wed May 15 00:13:30 2013 +0200 -- parent/pom.xml |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) -- http://git-wip-us.apache.org/repos/asf/camel/blob/50dc12f5/parent/pom.xml -- diff --git a/parent/pom.xml b/parent/pom.xml index c913dc0..71df889 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -70,7 +70,7 @@ commons-pool-version1.6/commons-pool-version commons-vfs2-version2.0/commons-vfs2-version concurrentlinkedhashmap.version1.2/concurrentlinkedhashmap.version -cxf-version2.6.6/cxf-version +cxf-version2.6.7/cxf-version cxf-version-range[2.4,2.9)/cxf-version-range cxf-xjc-utils-version2.6.0/cxf-xjc-utils-version derby-version10.8.2.2/derby-version
git commit: upgrade Spring 3.1.4.RELEASE to 3.2.2.RELEASE
Updated Branches:
refs/heads/master 4c9943510 - 1658cce84
upgrade Spring 3.1.4.RELEASE to 3.2.2.RELEASE
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/1658cce8
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/1658cce8
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/1658cce8
Branch: refs/heads/master
Commit: 1658cce849532be7bed3a3c56d51f425c882cdc1
Parents: 4c99435
Author: cmueller cmuel...@apache.org
Authored: Mon May 13 19:49:34 2013 +0200
Committer: cmueller cmuel...@apache.org
Committed: Mon May 13 19:49:34 2013 +0200
--
parent/pom.xml |2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/camel/blob/1658cce8/parent/pom.xml
--
diff --git a/parent/pom.xml b/parent/pom.xml
index 322118a..37a6a6e 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -348,7 +348,7 @@
spring-retry-version1.0.2.RELEASE/spring-retry-version
!-- CAMEL-5768 using spring3.1.x by default --
spring-version-range[3.1,3.3)/spring-version-range
-spring-version${spring31-version}/spring-version
+spring-version${spring32-version}/spring-version
!-- spring 3.0 support is @deprecated --
spring30-version3.0.7.RELEASE/spring30-version
spring31-version3.1.4.RELEASE/spring31-version
git commit: removed the deprecated Spring 3.0 support
Updated Branches:
refs/heads/master 1658cce84 - 2ff57af36
removed the deprecated Spring 3.0 support
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/2ff57af3
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/2ff57af3
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/2ff57af3
Branch: refs/heads/master
Commit: 2ff57af3649d0129a9cd45464b0afc177b0ba164
Parents: 1658cce
Author: cmueller cmuel...@apache.org
Authored: Mon May 13 20:18:20 2013 +0200
Committer: cmueller cmuel...@apache.org
Committed: Mon May 13 20:18:20 2013 +0200
--
parent/pom.xml |8
1 files changed, 0 insertions(+), 8 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/camel/blob/2ff57af3/parent/pom.xml
--
diff --git a/parent/pom.xml b/parent/pom.xml
index 37a6a6e..8d0e4b6 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -349,8 +349,6 @@
!-- CAMEL-5768 using spring3.1.x by default --
spring-version-range[3.1,3.3)/spring-version-range
spring-version${spring32-version}/spring-version
-!-- spring 3.0 support is @deprecated --
-spring30-version3.0.7.RELEASE/spring30-version
spring31-version3.1.4.RELEASE/spring31-version
spring32-version3.2.2.RELEASE/spring32-version
spring-osgi-version1.2.1/spring-osgi-version
@@ -2578,12 +2576,6 @@
!-- profiles for choosing default spring version --
profile
- idspring3.0/id
- properties
-spring-version${spring30-version}/spring-version
- /properties
-/profile
-profile
idspring3.1/id
properties
spring-version${spring31-version}/spring-version
git commit: upgrade JRuby 1.7.2 to 1.7.3
Updated Branches: refs/heads/master 2ff57af36 - 0f3c51e04 upgrade JRuby 1.7.2 to 1.7.3 Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/0f3c51e0 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/0f3c51e0 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/0f3c51e0 Branch: refs/heads/master Commit: 0f3c51e04a0c0d89891ecb9e195ca17cc6f22676 Parents: 2ff57af Author: cmueller cmuel...@apache.org Authored: Mon May 13 21:13:33 2013 +0200 Committer: cmueller cmuel...@apache.org Committed: Mon May 13 21:13:33 2013 +0200 -- parent/pom.xml |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) -- http://git-wip-us.apache.org/repos/asf/camel/blob/0f3c51e0/parent/pom.xml -- diff --git a/parent/pom.xml b/parent/pom.xml index 8d0e4b6..598c88f 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -218,7 +218,7 @@ jodatime2-bundle-version2.1/jodatime2-bundle-version josql-bundle-version1.5_5/josql-bundle-version josql-version1.5/josql-version -jruby-version1.7.2/jruby-version +jruby-version1.7.3/jruby-version jsendnsca-version1.3.1/jsendnsca-version jsmpp-version2.1.0_4/jsmpp-version jsch-bundle-version0.1.49_1/jsch-bundle-version
git commit: upgrade OpenJPA 2.2.1 to 2.2.2
Updated Branches: refs/heads/master 0f3c51e04 - d929748f0 upgrade OpenJPA 2.2.1 to 2.2.2 Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/d929748f Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/d929748f Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/d929748f Branch: refs/heads/master Commit: d929748f0a314d992182e9cf1308d82138c312c4 Parents: 0f3c51e Author: cmueller cmuel...@apache.org Authored: Mon May 13 21:20:44 2013 +0200 Committer: cmueller cmuel...@apache.org Committed: Mon May 13 21:20:44 2013 +0200 -- parent/pom.xml |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) -- http://git-wip-us.apache.org/repos/asf/camel/blob/d929748f/parent/pom.xml -- diff --git a/parent/pom.xml b/parent/pom.xml index 598c88f..eee6ec9 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -289,7 +289,7 @@ openwebbeans-version1.1.5/openwebbeans-version ognl-version3.0.6_1/ognl-version openejb-version4.5.1/openejb-version -openjpa-version2.2.1/openjpa-version +openjpa-version2.2.2/openjpa-version opensaml-version2.5.1_2/opensaml-version oro-bundle-version2.0.8_6/oro-bundle-version oscache-bundle-version2.4_5/oscache-bundle-version
git commit: upgrade OpenJPA 2.2.1 to 2.2.2
Updated Branches: refs/heads/camel-2.11.x 4afac18c1 - 43f42f6b6 upgrade OpenJPA 2.2.1 to 2.2.2 Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/43f42f6b Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/43f42f6b Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/43f42f6b Branch: refs/heads/camel-2.11.x Commit: 43f42f6b65df909db1d08fea069d9ace0b9a6137 Parents: 4afac18 Author: cmueller cmuel...@apache.org Authored: Mon May 13 21:20:44 2013 +0200 Committer: cmueller cmuel...@apache.org Committed: Mon May 13 21:25:40 2013 +0200 -- parent/pom.xml |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) -- http://git-wip-us.apache.org/repos/asf/camel/blob/43f42f6b/parent/pom.xml -- diff --git a/parent/pom.xml b/parent/pom.xml index 4bc3acb..ca24390 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -288,7 +288,7 @@ openwebbeans-version1.1.5/openwebbeans-version ognl-version3.0.6_1/ognl-version openejb-version4.5.1/openejb-version -openjpa-version2.2.1/openjpa-version +openjpa-version2.2.2/openjpa-version opensaml-version2.5.1_2/opensaml-version oro-bundle-version2.0.8_6/oro-bundle-version oscache-bundle-version2.4_5/oscache-bundle-version
git commit: upgrade JRuby 1.7.2 to 1.7.3
Updated Branches: refs/heads/camel-2.11.x 43f42f6b6 - 75b901eb1 upgrade JRuby 1.7.2 to 1.7.3 Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/75b901eb Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/75b901eb Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/75b901eb Branch: refs/heads/camel-2.11.x Commit: 75b901eb1c66f522245161facec00e2407a480d2 Parents: 43f42f6 Author: cmueller cmuel...@apache.org Authored: Mon May 13 21:13:33 2013 +0200 Committer: cmueller cmuel...@apache.org Committed: Mon May 13 21:30:46 2013 +0200 -- parent/pom.xml |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) -- http://git-wip-us.apache.org/repos/asf/camel/blob/75b901eb/parent/pom.xml -- diff --git a/parent/pom.xml b/parent/pom.xml index ca24390..bb7765b 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -217,7 +217,7 @@ jodatime2-bundle-version2.1/jodatime2-bundle-version josql-bundle-version1.5_5/josql-bundle-version josql-version1.5/josql-version -jruby-version1.7.2/jruby-version +jruby-version1.7.3/jruby-version jsendnsca-version1.3.1/jsendnsca-version jsmpp-version2.1.0_4/jsmpp-version jsch-bundle-version0.1.49_1/jsch-bundle-version
git commit: upgrade JRuby 1.7.2 to 1.7.3
Updated Branches: refs/heads/camel-2.10.x 4fe2323d1 - 2ca4c02fb upgrade JRuby 1.7.2 to 1.7.3 Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/2ca4c02f Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/2ca4c02f Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/2ca4c02f Branch: refs/heads/camel-2.10.x Commit: 2ca4c02fbf3785f506e730af49a34ff703d3da47 Parents: 4fe2323 Author: cmueller cmuel...@apache.org Authored: Mon May 13 21:13:33 2013 +0200 Committer: cmueller cmuel...@apache.org Committed: Mon May 13 21:34:28 2013 +0200 -- parent/pom.xml |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) -- http://git-wip-us.apache.org/repos/asf/camel/blob/2ca4c02f/parent/pom.xml -- diff --git a/parent/pom.xml b/parent/pom.xml index cf5f362..eec5199 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -130,7 +130,7 @@ jettison-version1.3.3/jettison-version jexcelapi-version2.4.2/jexcelapi-version jibx-version1.2.4.5/jibx-version -jruby-version1.7.2/jruby-version +jruby-version1.7.3/jruby-version jsmpp-version2.1.0_4/jsmpp-version jsch-version0.1.48/jsch-version jsonlib-version2.4/jsonlib-version
git commit: upgrade OpenJPA 2.2.0 to 2.2.2
Updated Branches: refs/heads/camel-2.10.x 2ca4c02fb - a85b70861 upgrade OpenJPA 2.2.0 to 2.2.2 Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/a85b7086 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/a85b7086 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/a85b7086 Branch: refs/heads/camel-2.10.x Commit: a85b70861acbd437f2c222e0374614fb2336f80b Parents: 2ca4c02 Author: cmueller cmuel...@apache.org Authored: Mon May 13 21:40:46 2013 +0200 Committer: cmueller cmuel...@apache.org Committed: Mon May 13 21:40:46 2013 +0200 -- pom.xml |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) -- http://git-wip-us.apache.org/repos/asf/camel/blob/a85b7086/pom.xml -- diff --git a/pom.xml b/pom.xml index 15a2eb1..f4369a0 100755 --- a/pom.xml +++ b/pom.xml @@ -49,7 +49,7 @@ jaxb-version2.1.13/jaxb-version maven-bundle-version2.3.7/maven-bundle-version -openjpa-version2.2.0/openjpa-version +openjpa-version2.2.2/openjpa-version /properties mailingLists
git commit: fixed the Netty type converter encoding issue which results in NettyHttpEndpointUriEncodingIssueTest.testEndpointUriWithDanishCharEncodingIssue to fail
Updated Branches:
refs/heads/master d929748f0 - dbd0ce546
fixed the Netty type converter encoding issue which results in
NettyHttpEndpointUriEncodingIssueTest.testEndpointUriWithDanishCharEncodingIssue
to fail
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/dbd0ce54
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/dbd0ce54
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/dbd0ce54
Branch: refs/heads/master
Commit: dbd0ce546972e17efde3e451ec3ca62eade73708
Parents: d929748
Author: cmueller cmuel...@apache.org
Authored: Mon May 13 23:35:40 2013 +0200
Committer: cmueller cmuel...@apache.org
Committed: Mon May 13 23:35:40 2013 +0200
--
.../camel/component/netty/NettyConverter.java |5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/camel/blob/dbd0ce54/components/camel-netty/src/main/java/org/apache/camel/component/netty/NettyConverter.java
--
diff --git
a/components/camel-netty/src/main/java/org/apache/camel/component/netty/NettyConverter.java
b/components/camel-netty/src/main/java/org/apache/camel/component/netty/NettyConverter.java
index 73a2e12..0638138 100644
---
a/components/camel-netty/src/main/java/org/apache/camel/component/netty/NettyConverter.java
+++
b/components/camel-netty/src/main/java/org/apache/camel/component/netty/NettyConverter.java
@@ -20,6 +20,7 @@ import java.io.IOException;
import java.io.InputStream;
import java.io.ObjectInput;
import java.io.ObjectInputStream;
+import java.io.UnsupportedEncodingException;
import org.apache.camel.Converter;
import org.apache.camel.Exchange;
@@ -45,13 +46,13 @@ public final class NettyConverter {
}
@Converter
-public static String toString(ChannelBuffer buffer, Exchange exchange) {
+public static String toString(ChannelBuffer buffer, Exchange exchange)
throws UnsupportedEncodingException {
byte[] bytes = toByteArray(buffer);
// use type converter as it can handle encoding set on the Exchange
if (exchange != null) {
return
exchange.getContext().getTypeConverter().convertTo(String.class, exchange,
bytes);
}
-return new String(bytes);
+return new String(bytes, UTF-8);
}
@Converter
git commit: fixed the unit test which fails in environments where New York isn't the default time zone
Updated Branches:
refs/heads/master b395401c2 - f62dda2d6
fixed the unit test which fails in environments where New York isn't the
default time zone
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/f62dda2d
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/f62dda2d
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/f62dda2d
Branch: refs/heads/master
Commit: f62dda2d6e92fa0127c1c5b5a5ec59eae100b330
Parents: b395401
Author: cmueller cmuel...@apache.org
Authored: Sun May 12 18:55:56 2013 +0200
Committer: cmueller cmuel...@apache.org
Committed: Sun May 12 18:55:56 2013 +0200
--
.../camel/component/ical/ICalDataFormatTest.java | 21 +++
1 files changed, 21 insertions(+), 0 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/camel/blob/f62dda2d/components/camel-ical/src/test/java/org/apache/camel/component/ical/ICalDataFormatTest.java
--
diff --git
a/components/camel-ical/src/test/java/org/apache/camel/component/ical/ICalDataFormatTest.java
b/components/camel-ical/src/test/java/org/apache/camel/component/ical/ICalDataFormatTest.java
index f588401..969e1f0 100644
---
a/components/camel-ical/src/test/java/org/apache/camel/component/ical/ICalDataFormatTest.java
+++
b/components/camel-ical/src/test/java/org/apache/camel/component/ical/ICalDataFormatTest.java
@@ -46,6 +46,8 @@ import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.converter.IOConverter;
import org.apache.camel.test.junit4.CamelTestSupport;
+import org.junit.After;
+import org.junit.Before;
import org.junit.Test;
/**
@@ -53,6 +55,25 @@ import org.junit.Test;
*/
public class ICalDataFormatTest extends CamelTestSupport {
+private java.util.TimeZone defaultTimeZone;
+
+@Override
+@Before
+public void setUp() throws Exception {
+defaultTimeZone = java.util.TimeZone.getDefault();
+
java.util.TimeZone.setDefault(java.util.TimeZone.getTimeZone(America/New_York));
+
+super.setUp();
+}
+
+@Override
+@After
+public void tearDown() throws Exception {
+java.util.TimeZone.setDefault(defaultTimeZone);
+
+super.tearDown();
+}
+
@Test
public void testUnmarshal() throws Exception {
InputStream stream = IOConverter.toInputStream(new
File(src/test/resources/data.ics));
git commit: upgrade Testng 6.8 to 6.8.1
Updated Branches: refs/heads/master 4eae3f90b - 73b614da5 upgrade Testng 6.8 to 6.8.1 Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/73b614da Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/73b614da Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/73b614da Branch: refs/heads/master Commit: 73b614da58ef933544da8d1b68cd753f3cc1b614 Parents: 4eae3f9 Author: cmueller cmuel...@apache.org Authored: Sun May 12 23:54:51 2013 +0200 Committer: cmueller cmuel...@apache.org Committed: Sun May 12 23:54:51 2013 +0200 -- parent/pom.xml |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) -- http://git-wip-us.apache.org/repos/asf/camel/blob/73b614da/parent/pom.xml -- diff --git a/parent/pom.xml b/parent/pom.xml index 03e6263..322118a 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -366,7 +366,7 @@ taglist-maven-plugin-version2.4/taglist-maven-plugin-version tagsoup-bundle-version1.2_5/tagsoup-bundle-version tagsoup-version1.2.1/tagsoup-version -testng-version6.8/testng-version +testng-version6.8.1/testng-version twitter4j-bundle-version3.0.3_1/twitter4j-bundle-version twitter4j-version3.0.3/twitter4j-version urlrewritefilter-version4.0.4/urlrewritefilter-version
git commit: upgrade Testng 6.8 to 6.8.1
Updated Branches: refs/heads/camel-2.11.x 41c8b0052 - 27d9449f4 upgrade Testng 6.8 to 6.8.1 Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/27d9449f Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/27d9449f Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/27d9449f Branch: refs/heads/camel-2.11.x Commit: 27d9449f4fe304b4b80cfcd2eb215ba07d784f1c Parents: 41c8b00 Author: cmueller cmuel...@apache.org Authored: Sun May 12 23:58:11 2013 +0200 Committer: cmueller cmuel...@apache.org Committed: Sun May 12 23:58:11 2013 +0200 -- parent/pom.xml |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) -- http://git-wip-us.apache.org/repos/asf/camel/blob/27d9449f/parent/pom.xml -- diff --git a/parent/pom.xml b/parent/pom.xml index a518a5f..4bc3acb 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -367,7 +367,7 @@ taglist-maven-plugin-version2.4/taglist-maven-plugin-version tagsoup-bundle-version1.2_5/tagsoup-bundle-version tagsoup-version1.2.1/tagsoup-version -testng-version6.8/testng-version +testng-version6.8.1/testng-version twitter4j-bundle-version3.0.3_1/twitter4j-bundle-version twitter4j-version3.0.3/twitter4j-version urlrewritefilter-version4.0.4/urlrewritefilter-version
git commit: upgrade commons httpclient and httpcore
Updated Branches: refs/heads/master 91578af66 - 1d8ebe220 upgrade commons httpclient and httpcore Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/1d8ebe22 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/1d8ebe22 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/1d8ebe22 Branch: refs/heads/master Commit: 1d8ebe220a6f11257d2725c92de869ff71a3e275 Parents: 91578af Author: cmueller cmuel...@apache.org Authored: Tue May 7 23:14:24 2013 +0200 Committer: cmueller cmuel...@apache.org Committed: Tue May 7 23:14:44 2013 +0200 -- parent/pom.xml |4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) -- http://git-wip-us.apache.org/repos/asf/camel/blob/1d8ebe22/parent/pom.xml -- diff --git a/parent/pom.xml b/parent/pom.xml index 53d2c2c..a43544a 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -171,8 +171,8 @@ hibernate-validator-bundle-version4.1.0.Final_3/hibernate-validator-bundle-version hibernate-version4.1.11.Final/hibernate-version httpunit-version1.7/httpunit-version -httpcore4-version4.2.3/httpcore4-version -httpclient4-version4.2.3/httpclient4-version +httpcore4-version4.2.4/httpcore4-version +httpclient4-version4.2.5/httpclient4-version httpclient-version3.1/httpclient-version ibatis-bundle-version2.3.4.726_4/ibatis-bundle-version ibatis-version2.3.4.726/ibatis-version
git commit: upgrade commons httpclient and httpcore
Updated Branches: refs/heads/camel-2.11.x c9acef1af - 855788011 upgrade commons httpclient and httpcore Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/85578801 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/85578801 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/85578801 Branch: refs/heads/camel-2.11.x Commit: 855788011016f32ce685c7b4aa7885553dcd4445 Parents: c9acef1 Author: cmueller cmuel...@apache.org Authored: Tue May 7 23:14:24 2013 +0200 Committer: cmueller cmuel...@apache.org Committed: Tue May 7 23:25:07 2013 +0200 -- parent/pom.xml |4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) -- http://git-wip-us.apache.org/repos/asf/camel/blob/85578801/parent/pom.xml -- diff --git a/parent/pom.xml b/parent/pom.xml index ef75d3e..a518a5f 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -171,8 +171,8 @@ hibernate-validator-bundle-version4.1.0.Final_3/hibernate-validator-bundle-version hibernate-version4.1.11.Final/hibernate-version httpunit-version1.7/httpunit-version -httpcore4-version4.2.3/httpcore4-version -httpclient4-version4.2.3/httpclient4-version +httpcore4-version4.2.4/httpcore4-version +httpclient4-version4.2.5/httpclient4-version httpclient-version3.1/httpclient-version ibatis-bundle-version2.3.4.726_4/ibatis-bundle-version ibatis-version2.3.4.726/ibatis-version
git commit: Revert fixed some sonar issue: Empty If Stmt
Updated Branches:
refs/heads/master b0ccd9474 - f85c6931b
Revert fixed some sonar issue: Empty If Stmt
This reverts commit 949d5b800338b764bb57e91c89bd514832e0e024.
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/f85c6931
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/f85c6931
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/f85c6931
Branch: refs/heads/master
Commit: f85c6931b541e415c158fa400c1ce6e7f129a8fa
Parents: b0ccd94
Author: Christian Mueller christian.muel...@gmail.com
Authored: Mon May 6 21:43:45 2013 +0200
Committer: Christian Mueller christian.muel...@gmail.com
Committed: Mon May 6 21:43:45 2013 +0200
--
.../org/apache/camel/component/bean/BeanInfo.java |2 ++
.../org/apache/camel/impl/DefaultCamelContext.java |4 +++-
.../processor/resequencer/ResequencerEngine.java |6 +-
.../java/org/apache/camel/util/ExchangeHelper.java |8 ++--
.../camel/component/kestrel/KestrelConsumer.java |4 +++-
.../component/syslog/Rfc3164SyslogConverter.java |5 -
6 files changed, 23 insertions(+), 6 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/camel/blob/f85c6931/camel-core/src/main/java/org/apache/camel/component/bean/BeanInfo.java
--
diff --git
a/camel-core/src/main/java/org/apache/camel/component/bean/BeanInfo.java
b/camel-core/src/main/java/org/apache/camel/component/bean/BeanInfo.java
index 72d793e..a511943 100644
--- a/camel-core/src/main/java/org/apache/camel/component/bean/BeanInfo.java
+++ b/camel-core/src/main/java/org/apache/camel/component/bean/BeanInfo.java
@@ -407,6 +407,8 @@ public class BeanInfo {
LOG.trace(Parameter #{} is the body parameter using
expression {}, i, expression);
parameterInfo.setExpression(expression);
bodyParameters.add(parameterInfo);
+} else {
+// will ignore the expression for parameter evaluation
}
}
LOG.trace(Parameter #{} has parameter info: , i, parameterInfo);
http://git-wip-us.apache.org/repos/asf/camel/blob/f85c6931/camel-core/src/main/java/org/apache/camel/impl/DefaultCamelContext.java
--
diff --git
a/camel-core/src/main/java/org/apache/camel/impl/DefaultCamelContext.java
b/camel-core/src/main/java/org/apache/camel/impl/DefaultCamelContext.java
index f5b2525..d69358d 100644
--- a/camel-core/src/main/java/org/apache/camel/impl/DefaultCamelContext.java
+++ b/camel-core/src/main/java/org/apache/camel/impl/DefaultCamelContext.java
@@ -2014,7 +2014,9 @@ public class DefaultCamelContext extends ServiceSupport
implements ModelCamelCon
// check in existing already started as well
for (RouteStartupOrder order : routeStartupOrder) {
String otherId = order.getRoute().getId();
-if (answer.getStartupOrder() == order.getStartupOrder()) {
+if (answer.getRoute().getId().equals(otherId)) {
+// its the same route id so skip clash check as its the same
route (can happen when using suspend/resume)
+} else if (answer.getStartupOrder() == order.getStartupOrder()) {
throw new
FailedToStartRouteException(answer.getRoute().getId(), startupOrder clash.
Route + otherId + already has startupOrder
+ answer.getStartupOrder() + configured which this route
have as well. Please correct startupOrder to be unique among all your routes.);
}
http://git-wip-us.apache.org/repos/asf/camel/blob/f85c6931/camel-core/src/main/java/org/apache/camel/processor/resequencer/ResequencerEngine.java
--
diff --git
a/camel-core/src/main/java/org/apache/camel/processor/resequencer/ResequencerEngine.java
b/camel-core/src/main/java/org/apache/camel/processor/resequencer/ResequencerEngine.java
index 9fb43f1..9a83cd0 100644
---
a/camel-core/src/main/java/org/apache/camel/processor/resequencer/ResequencerEngine.java
+++
b/camel-core/src/main/java/org/apache/camel/processor/resequencer/ResequencerEngine.java
@@ -224,7 +224,11 @@ public class ResequencerEngineE {
}
// start delivery if current element is successor of last delivered
element
-if (!successorOfLastDelivered(element)
sequence.predecessor(element) != null) {
+if (successorOfLastDelivered(element)) {
+// nothing to schedule
+} else if (sequence.predecessor(element) != null) {
+// nothing to schedule
+} else {
element.schedule(defineTimeout());
}
}
