camel git commit: Fix Checkstyle errors
Repository: camel Updated Branches: refs/heads/master 4939cce5f -> 596a12892 Fix Checkstyle errors Signed-off-by: Gregor Zurowski Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/596a1289 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/596a1289 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/596a1289 Branch: refs/heads/master Commit: 596a12892135a018f1d97da6b553633cdab131b9 Parents: 4939cce Author: Gregor Zurowski Authored: Fri Oct 16 20:31:26 2015 +0200 Committer: Gregor Zurowski Committed: Fri Oct 16 20:31:26 2015 +0200 -- .../java/org/apache/camel/tools/apt/EipAnnotationProcessor.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -- http://git-wip-us.apache.org/repos/asf/camel/blob/596a1289/tooling/apt/src/main/java/org/apache/camel/tools/apt/EipAnnotationProcessor.java -- diff --git a/tooling/apt/src/main/java/org/apache/camel/tools/apt/EipAnnotationProcessor.java b/tooling/apt/src/main/java/org/apache/camel/tools/apt/EipAnnotationProcessor.java index e7e6387..53bc12d 100644 --- a/tooling/apt/src/main/java/org/apache/camel/tools/apt/EipAnnotationProcessor.java +++ b/tooling/apt/src/main/java/org/apache/camel/tools/apt/EipAnnotationProcessor.java @@ -60,8 +60,8 @@ public class EipAnnotationProcessor extends AbstractAnnotationProcessor { // special when using expression/predicates in the model private static final String ONE_OF_TYPE_NAME = "org.apache.camel.model.ExpressionSubElementDefinition"; private static final String[] ONE_OF_LANGUAGES = new String[]{ -"org.apache.camel.model.language.ExpressionDefinition", -"org.apache.camel.model.language.NamespaceAwareExpression" +"org.apache.camel.model.language.ExpressionDefinition", +"org.apache.camel.model.language.NamespaceAwareExpression" }; // special for inputs (these classes have sub classes, so we use this to find all classes) private static final String[] ONE_OF_INPUTS = new String[]{
camel git commit: Fix Checkstyle errors
Repository: camel Updated Branches: refs/heads/camel-2.15.x 84281b415 -> 4b619ac2b Fix Checkstyle errors Signed-off-by: Gregor Zurowski Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/4b619ac2 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/4b619ac2 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/4b619ac2 Branch: refs/heads/camel-2.15.x Commit: 4b619ac2b94da75fe1602554d9c66ed0467d8aab Parents: 84281b4 Author: Gregor Zurowski Authored: Fri Oct 16 20:31:26 2015 +0200 Committer: Gregor Zurowski Committed: Fri Oct 16 20:55:43 2015 +0200 -- .../java/org/apache/camel/tools/apt/EipAnnotationProcessor.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -- http://git-wip-us.apache.org/repos/asf/camel/blob/4b619ac2/tooling/apt/src/main/java/org/apache/camel/tools/apt/EipAnnotationProcessor.java -- diff --git a/tooling/apt/src/main/java/org/apache/camel/tools/apt/EipAnnotationProcessor.java b/tooling/apt/src/main/java/org/apache/camel/tools/apt/EipAnnotationProcessor.java index 4dc7db0..bc4f843 100644 --- a/tooling/apt/src/main/java/org/apache/camel/tools/apt/EipAnnotationProcessor.java +++ b/tooling/apt/src/main/java/org/apache/camel/tools/apt/EipAnnotationProcessor.java @@ -59,8 +59,8 @@ public class EipAnnotationProcessor extends AbstractAnnotationProcessor { // special when using expression/predicates in the model private static final String ONE_OF_TYPE_NAME = "org.apache.camel.model.ExpressionSubElementDefinition"; private static final String[] ONE_OF_LANGUAGES = new String[]{ -"org.apache.camel.model.language.ExpressionDefinition", -"org.apache.camel.model.language.NamespaceAwareExpression" +"org.apache.camel.model.language.ExpressionDefinition", +"org.apache.camel.model.language.NamespaceAwareExpression" }; // special for inputs (these classes have sub classes, so we use this to find all classes) private static final String[] ONE_OF_INPUTS = new String[]{
camel git commit: Add Gregor's public key
Repository: camel Updated Branches: refs/heads/master 596a12892 -> 1b01faeb7 Add Gregor's public key Signed-off-by: Gregor Zurowski Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/1b01faeb Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/1b01faeb Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/1b01faeb Branch: refs/heads/master Commit: 1b01faeb74fea519811f9bd4cb2d53ea21e692dd Parents: 596a128 Author: Gregor Zurowski Authored: Fri Oct 16 21:32:41 2015 +0200 Committer: Gregor Zurowski Committed: Fri Oct 16 21:32:41 2015 +0200 -- KEYS | 58 ++ 1 file changed, 58 insertions(+) -- http://git-wip-us.apache.org/repos/asf/camel/blob/1b01faeb/KEYS -- diff --git a/KEYS b/KEYS index 13e88d8..d2af581 100644 --- a/KEYS +++ b/KEYS @@ -1049,3 +1049,61 @@ O89+mqkE1TM0W6OF2aHV+RbQgyyufR/gsvKBfIKxEDATew== =eNwt -END PGP PUBLIC KEY BLOCK- ++pub 4096R/5942C049 2015-10-15 ++uid Gregor Zurowski ++sig 35942C049 2015-10-15 Gregor Zurowski ++sub 4096R/A48CCE10 2015-10-15 ++sig 5942C049 2015-10-15 Gregor Zurowski ++ ++-BEGIN PGP PUBLIC KEY BLOCK- ++Version: GnuPG v1 ++ ++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 ++uxLacDc= ++=QAF1 ++-END PGP PUBLIC KEY BLOCK-
camel git commit: Fix Gregor's public key format
Repository: camel Updated Branches: refs/heads/master 1b01faeb7 -> d45296dce Fix Gregor's public key format Signed-off-by: Gregor Zurowski Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/d45296dc Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/d45296dc Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/d45296dc Branch: refs/heads/master Commit: d45296dcebe0a1e7705247fdfeeb5aafd1a1d420 Parents: 1b01fae Author: Gregor Zurowski Authored: Fri Oct 16 21:40:27 2015 +0200 Committer: Gregor Zurowski Committed: Fri Oct 16 21:40:27 2015 +0200 -- KEYS | 116 +++--- 1 file changed, 58 insertions(+), 58 deletions(-) -- http://git-wip-us.apache.org/repos/asf/camel/blob/d45296dc/KEYS -- diff --git a/KEYS b/KEYS index d2af581..5824713 100644 --- a/KEYS +++ b/KEYS @@ -1049,61 +1049,61 @@ O89+mqkE1TM0W6OF2aHV+RbQgyyufR/gsvKBfIKxEDATew== =eNwt -END PGP PUBLIC KEY BLOCK- -+pub 4096R/5942C049 2015-10-15 -+uid Gregor Zurowski -+sig 35942C049 2015-10-15 Gregor Zurowski -+sub 4096R/A48CCE10 2015-10-15 -+sig 5942C049 2015-10-15 Gregor Zurowski -+ -+-BEGIN PGP PUBLIC KEY BLOCK- -+Version: GnuPG v1 -+ -+mQINBFYgF44BEACxR9vzD/W006okO77T9aEOrUCfRJAuqmwBr/VLCGHIAWTTg/cS -+WKLWfV+jIcCvsfOmo05P9zrf/VtPvuKIVOeBkKA/RCbCAKCkNdp3lyaIHZl/2ees -+oZ7whVMXqCx46L2im8cavi96JPM+gKeX8UVQxThNBdmlgZ8R4Z3ZfxT/ya3QqUmB -+LqAZk7EqvToIaOMmaay5tIr0vKettwnWPhK9kgPuH8i7ZdWHeSVFofHC6uB0/TPV -+zBgfJfZidPfnP9Ho+swnN1R54cXNyKlwe+FfOhtxU3urpUhr4GKXwBC3wn4vG4n5 -+D4+Qzd8xKzhB8mHqnu4jQvvvkomXZv21yPa42+/meVxQK47l3BwogddQAGBSYp1O -+TAL3wvpFDwxZxhSZHQqnI+1sDB76hL1t57CI+iJCHd2W7qh4wwX6I+TaGoRR07Jv -+bHYweMhI6tFp9bSXpKEReN0bJ+XZwmk3mhCBE6Ce8gcUmXo5hUT6dphwVI+yY5Ge -+v+USEA0anknjY5vyLNoDI+EEZfC9Twfk8ZP0mdo/X/INTPvwIv/3PWrCnc8/+Yf0 -+sqPDiYgK5yADoLUhYXo4JcY0Xv7Twud7XWriQLpWiULBTzTmnGF8e+uHhfAZ/tTk -+wmslNUKW3xOerrMYaz2xYcv7n7UQOm8X1coygbdyo53buIdajaE+2j2w1wARAQAB -+tCZHcmVnb3IgWnVyb3dza2kgPGd6dXJvd3NraUBhcGFjaGUub3JnPokCOAQTAQIA -+IgUCViAXjgIbAwYLCQgHAwIGFQgCCQoLBBYCAwECHgECF4AACgkQnVvv+llCwEmr -+fhAAqF1PuVbLd5RMLIpguQd5x3sH6yNdnrmYzmwM4sdR6CJinJpDkLS2PO5alSso -+DbsZ3RzIKXH5N1k0xW2YzhFYIEOIHeZ4Avf0FF53NWWWyzZWLUMixFRWwBtTdyWE -+YrQDtf3Vc5pFMIL9ihrvWnCTrjKEF+hIzYVD7ffhSVBwgttlVaB84kZQP2lVHva5 -+xbgtknieHJuuyRPTMdSi2+yXt4CbYl90kie1J23zhjW6PIdDk83kA6ZIhrKa6pLy -+Sp/N4aIRORtDoUBThUiQ7LVQz+sHoCy9IjFPQNkJt400a9VouNycgrzp1pXDFXcj -+G4o4Sq1gEJaEts/3RtOPPGch36f/+KEkLbIVBH7sxwtGVyqhGnueHdgxB8TijLst -+emW81Y2Re69WUkFt7DC64U8tSfEAuDnCmvRjksVytaHNOxk7VMoiw0havRQYgUTm -+PpwmaFnuVc2NvoSGhfZBe7IUb9oWh8b1bN+uWL6M1USTjs29uSpv3o7oWLndMuPl -+6yTne1ITFg4DcOcFm/uwP6/keVCfAlmbeBvW/kznktRbweFk0HtseXDXimDlC7H9 -+B7tD2n/VC0Dz7N0PhG+T2undJ8Zt7z/spkeNfmBq945nfOT5PO87SDiU3iEZZbfL -+CyIL7yqyVAnbpfHz4UNdvBL49P9NIe1/dUrRdDhgaUX6epa5Ag0EViAXjgEQAKol -+14P2Y2jOB58+FYe6eVAMxI3r/KX8Brf3PF1QWbeTw5S0QAQUQGr2DdF+tMFws57g -+/bczJLLp4oVTtV+ypM0Qbpswa/u5cZnpMczAVnusJLIunS4htn/x8wPNyJ/XU3FV -+JsU48UACJatT/6Eg8b/lH3hUpS9bnBfJ2CIchzBMk+dOFHhKFQTHPgfjHF1zmDmz -+8S6N2v1sLelOpqZXJoMLm/9k6LHMOSE83nuIP3uMpT7RyRjVrJW9rHQpISbAa1Wx -+bWyW72dDxaPaVXaXcAbSIDPhjWNvFtEiuw2ehGiKcDcPvZmR9HXiajt+Y26WbXkX -+JA87eu96658CzCpCSaqcvI4DJdfKhLREwpUUDEbcX/DmzanGcX0FcbpbPAIpbMsm -+eC3k3U2WkXf/h0UKbybOPM4mngUJ6epMrVX8iNtWW1Gddk75J1GJtbx5syxudz2B -+7CllB/1yuMLYeNEpcBEhJIXPyv+VABRIUfmaF18xino04/bo0HieqDSOvUCR+dsD -+3jxVOJUp0C9eow7R6z2bNaTuqQcfq1ZQ/FhLgvhv+PGS4RrJoe/l7FDd1PY2vUm6 -+5YhN6vlmpm9w4PCGkM+N6+FdnALUV7tVdWTrKLj6W4tbAialIQ8S/fyHiPCGcvcN -+KL0i4fUi5wWVByPU+KzLaXENWl/Q22/NVC5MpwrrABEBAAGJAh8EGAECAAkFAlYg -+F44CGwwACgkQnVvv+llCwEkKeA//XaE+zGZXN9qrZzgkxy5V6ZvzOWTXy6f+885r -+grscljylswTCZW7T0pki2O0OyJmBpebqB2bhUCPH51yXNzCjxDwYUYHeEJtb0H9B -+r59LH1ny8ZpB7G8Q6pZ7NcMmG+4849Ex4+W8p6n3vLc6VZ6+FwCTx64IXukFCWT+ -+27nlJkfpKVPqDHaEYkiegp17voCoHYaLnQFlwiHr4/AD9mn6vbIwUlSHJjM85fuB -+2fAqMFjVWQuFah9qkfr1tEF2sFBJA/edUoJ2x7E2rVO4+2LBShVjRhX+ZIooKNsw -+OCbxdc1ICt6nOqiXJ95CvuzN5BmObbPXSFnwJqL6QAYjlzB0XaMW9Qdhtl3w+qUm -+c9J/Cocf72P/a41cqYuAbJbmPk0D+2DFbe6TLsxETVpJy6nvZywNv03eXSnoV8IK -+FusyuxSqd2OwbHiUEOsCiyZstZE+OaCLQ2qWSmdV1DxuvdHUeU0ITTSmhLkxGQII -+9o0XD366pFf65++79zJv7XSY97Z/WntIkiyTtO77LPhcjNEmgkR3Ct0oHiB9UCh1 -+PtCLFFDEuRQgSyprUeRhiKGMykMIOzwiR3RocYI6KfU13cRsotGHTUzWFtzNyAuV -+2+PMGHIkmOlVR1Aiq1tcralzbHwVy8Ycd3kdy3KPO+f2sinFZgsBR0FmsqlNZXap -+uxLacDc= -+=QAF1 -+-END PGP PUBLIC KEY BLOCK- +pub 4096R/5942C049 2015-10-15 +uid Gregor Zurowski +sig 35942C049 2015-10-15 Gregor Zurowski +sub 4096R/A48CCE10 2015-10-15 +sig 5942C049 2015-10-15 Gregor Zurowski + +-BEGIN PGP PUBLIC KEY BLOCK- +Version: GnuPG v1 + +mQINBFYgF44BEACxR9vzD/W006okO77T9aEOrUCfRJAuqmwBr/VLCGHIAWTTg/cS +WKLWfV+jIc
camel git commit: Add Gregor's public key
Repository: camel Updated Branches: refs/heads/camel-2.15.x 4b619ac2b -> 904435682 Add Gregor's public key Signed-off-by: Gregor Zurowski Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/90443568 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/90443568 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/90443568 Branch: refs/heads/camel-2.15.x Commit: 9044356828e6638118b3af691ef22c23ea9b367c Parents: 4b619ac Author: Gregor Zurowski Authored: Fri Oct 16 21:40:27 2015 +0200 Committer: Gregor Zurowski Committed: Fri Oct 16 21:51:47 2015 +0200 -- KEYS | 59 +++ 1 file changed, 59 insertions(+) -- http://git-wip-us.apache.org/repos/asf/camel/blob/90443568/KEYS -- diff --git a/KEYS b/KEYS index cf65015..7481260 100644 --- a/KEYS +++ b/KEYS @@ -1014,3 +1014,62 @@ ly+0IqM8hQmA113GdFh8FPs9PuOvln7gp1Lqn4f7JKBZHHQbLkD/ppn3sLlZb/Xq S0maYlA= =OANb -END PGP PUBLIC KEY BLOCK- + +pub 4096R/5942C049 2015-10-15 +uid Gregor Zurowski +sig 35942C049 2015-10-15 Gregor Zurowski +sub 4096R/A48CCE10 2015-10-15 +sig 5942C049 2015-10-15 Gregor Zurowski + +-BEGIN PGP PUBLIC KEY BLOCK- +Version: GnuPG v1 + +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 +uxLacDc= +=QAF1 +-END PGP PUBLIC KEY BLOCK-
camel git commit: Add license headers
Repository: camel Updated Branches: refs/heads/camel-2.15.x 904435682 -> 5987582c6 Add license headers Signed-off-by: Gregor Zurowski Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/5987582c Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/5987582c Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/5987582c Branch: refs/heads/camel-2.15.x Commit: 5987582c6e8a6368b90744584e7f8f4e7cddd42a Parents: 9044356 Author: Gregor Zurowski Authored: Fri Oct 16 22:51:52 2015 +0200 Committer: Gregor Zurowski Committed: Fri Oct 16 22:51:52 2015 +0200 -- .../src/main/resources/default.properties | 17 + .../archetype-resources/src/main/webapp/index.html | 16 2 files changed, 33 insertions(+) -- http://git-wip-us.apache.org/repos/asf/camel/blob/5987582c/tooling/archetypes/camel-archetype-scr/src/main/resources/archetype-resources/src/main/resources/default.properties -- diff --git a/tooling/archetypes/camel-archetype-scr/src/main/resources/archetype-resources/src/main/resources/default.properties b/tooling/archetypes/camel-archetype-scr/src/main/resources/archetype-resources/src/main/resources/default.properties index aa81b4a..45dee32 100644 --- a/tooling/archetypes/camel-archetype-scr/src/main/resources/archetype-resources/src/main/resources/default.properties +++ b/tooling/archetypes/camel-archetype-scr/src/main/resources/archetype-resources/src/main/resources/default.properties @@ -1 +1,18 @@ +# +# 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. +# + dummy = dummy http://git-wip-us.apache.org/repos/asf/camel/blob/5987582c/tooling/archetypes/camel-archetype-web/src/main/resources/archetype-resources/src/main/webapp/index.html -- diff --git a/tooling/archetypes/camel-archetype-web/src/main/resources/archetype-resources/src/main/webapp/index.html b/tooling/archetypes/camel-archetype-web/src/main/resources/archetype-resources/src/main/webapp/index.html index 7e212ba..26626cf 100644 --- a/tooling/archetypes/camel-archetype-web/src/main/resources/archetype-resources/src/main/webapp/index.html +++ b/tooling/archetypes/camel-archetype-web/src/main/resources/archetype-resources/src/main/webapp/index.html @@ -1,3 +1,19 @@ +
camel git commit: Add exclude rules for RAT plugin
Repository: camel Updated Branches: refs/heads/camel-2.15.x 5987582c6 -> 136004280 Add exclude rules for RAT plugin Signed-off-by: Gregor Zurowski Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/13600428 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/13600428 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/13600428 Branch: refs/heads/camel-2.15.x Commit: 13600428090f62406042ce8084546c01b4cc870d Parents: 5987582 Author: Gregor Zurowski Authored: Fri Oct 16 22:53:56 2015 +0200 Committer: Gregor Zurowski Committed: Fri Oct 16 22:53:56 2015 +0200 -- pom.xml | 6 -- 1 file changed, 4 insertions(+), 2 deletions(-) -- http://git-wip-us.apache.org/repos/asf/camel/blob/13600428/pom.xml -- diff --git a/pom.xml b/pom.xml index db10daa..883e509 100755 --- a/pom.xml +++ b/pom.xml @@ -248,9 +248,11 @@ **/avro/**/*.avpr **/OSGI-INF/bundle.info **/test_rsa* -**/examples/*/src/**/data/**/*.xml +**/data*/**/*.xml **/dependency-reduced-pom.xml - +**/Dropbox_API_Terms_and_Conditions.txt +**/MerchandiseRestResource.apxc +**/file-sig-api.txt
camel git commit: Fix checkstyle issues
Repository: camel Updated Branches: refs/heads/camel-2.15.x 136004280 -> 5e121e91d Fix checkstyle issues Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/5e121e91 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/5e121e91 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/5e121e91 Branch: refs/heads/camel-2.15.x Commit: 5e121e91d5edb7abd00cbe21f94a7683f4088e40 Parents: 1360042 Author: Daniel Kulp Authored: Mon Sep 28 10:32:40 2015 -0400 Committer: Gregor Zurowski Committed: Sat Oct 17 09:40:51 2015 +0200 -- .../cxf/CxfProducerSoapActionTest.java | 105 +-- 1 file changed, 50 insertions(+), 55 deletions(-) -- http://git-wip-us.apache.org/repos/asf/camel/blob/5e121e91/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfProducerSoapActionTest.java -- diff --git a/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfProducerSoapActionTest.java b/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfProducerSoapActionTest.java index 178a425..d6019f4 100644 --- a/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfProducerSoapActionTest.java +++ b/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfProducerSoapActionTest.java @@ -1,5 +1,5 @@ -/** -* Licensed to the Apache Software Foundation (ASF) under one or more +/** + * 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 @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.camel.component.cxf; +package org.apache.camel.component.cxf; import java.util.ArrayList; import java.util.List; @@ -28,60 +28,55 @@ import org.apache.cxf.binding.soap.SoapBindingConstants; import org.junit.Test; public class CxfProducerSoapActionTest extends CamelTestSupport { - - private static final String SOAP_ACTION = "http://camel.apache.org/order/Order";; - private static final String OPERATION_NAMESPACE = "http://camel.apache.org/order";; - private static final String OPERATION_NAME = "order"; - private static final String DIRECT_START = "direct:start"; - private static final String CXF_ENDPOINT = "cxf:http://localhost:9000/order?wsdlURL=classpath:order.wsdl&loggingFeatureEnabled=true";; - private static final String REQUEST_MESSAGE = "http://schemas.xmlsoap.org/soap/envelope/\";>" - + "" - + ""; - @Test - public void testSendSoapRequestWithoutSoapActionSet() { - template.requestBody(DIRECT_START, REQUEST_MESSAGE, String.class); - } - - - protected RouteBuilder createRouteBuilder() { - return new RouteBuilder() { +private static final String SOAP_ACTION = "http://camel.apache.org/order/Order";; +private static final String OPERATION_NAMESPACE = "http://camel.apache.org/order";; +private static final String OPERATION_NAME = "order"; +private static final String DIRECT_START = "direct:start"; +private static final String CXF_ENDPOINT = "cxf:http://localhost:9000/order?wsdlURL=classpath:order.wsdl&loggingFeatureEnabled=true";; +private static final String REQUEST_MESSAGE = "http://schemas.xmlsoap.org/soap/envelope/\";>" + + "" + ""; - @Override - public void configure() throws Exception { - from(DIRECT_START) - .setHeader(CxfConstants.OPERATION_NAME, constant(OPERATION_NAME)) - .setHeader(CxfConstants.OPERATION_NAMESPACE, constant(OPERATION_NAMESPACE)) - .process(new Processor() { +@Test +public void testSendSoapRequestWithoutSoapActionSet() { +template.requestBody(DIRECT_START, REQUEST_MESSAGE, String.class); +} - @Override - public void process(Exchange exchange) throws Exception { - - final List params = new ArrayList(); - params.add("foo"); - params.add(10); - params.add("bar"); -
camel git commit: Fix Checkstyle issue
Repository: camel Updated Branches: refs/heads/camel-2.15.x f8905dc27 -> e43edb737 Fix Checkstyle issue Signed-off-by: Gregor Zurowski Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/e43edb73 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/e43edb73 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/e43edb73 Branch: refs/heads/camel-2.15.x Commit: e43edb737d78b7f8127764dbe51ad9468b23cf60 Parents: f8905dc Author: Gregor Zurowski Authored: Sat Oct 17 10:03:03 2015 +0200 Committer: Gregor Zurowski Committed: Sat Oct 17 10:08:55 2015 +0200 -- .../apache/camel/converter/dozer/DozerTypeConverterLoader.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -- http://git-wip-us.apache.org/repos/asf/camel/blob/e43edb73/components/camel-dozer/src/main/java/org/apache/camel/converter/dozer/DozerTypeConverterLoader.java -- diff --git a/components/camel-dozer/src/main/java/org/apache/camel/converter/dozer/DozerTypeConverterLoader.java b/components/camel-dozer/src/main/java/org/apache/camel/converter/dozer/DozerTypeConverterLoader.java index 6696115..9d6d3ae 100644 --- a/components/camel-dozer/src/main/java/org/apache/camel/converter/dozer/DozerTypeConverterLoader.java +++ b/components/camel-dozer/src/main/java/org/apache/camel/converter/dozer/DozerTypeConverterLoader.java @@ -16,8 +16,6 @@ */ package org.apache.camel.converter.dozer; -import static org.dozer.classmap.MappingDirection.ONE_WAY; - import java.lang.reflect.Field; import java.net.MalformedURLException; import java.net.URL; @@ -48,6 +46,8 @@ import org.dozer.util.DozerClassLoader; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import static org.dozer.classmap.MappingDirection.ONE_WAY; + /** * DozerTypeConverterLoader provides the mechanism for registering * a Dozer {@link Mapper} as {@link TypeConverter} for a {@link CamelContext}.
camel git commit: Fix Checkstyle issues
Repository: camel Updated Branches: refs/heads/camel-2.15.x e43edb737 -> b821f7f98 Fix Checkstyle issues Signed-off-by: Gregor Zurowski Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/b821f7f9 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/b821f7f9 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/b821f7f9 Branch: refs/heads/camel-2.15.x Commit: b821f7f989b5cf3b8a6c3e817287314bf6cc0a35 Parents: e43edb7 Author: Gregor Zurowski Authored: Sat Oct 17 10:15:47 2015 +0200 Committer: Gregor Zurowski Committed: Sat Oct 17 10:15:47 2015 +0200 -- .../http/NettyHttpBindingPreservePostFormUrlEncodedBodyTest.java | 4 ++-- .../netty4/http/NettyHttpBindingUseRelativePathInPostTest.java | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) -- http://git-wip-us.apache.org/repos/asf/camel/blob/b821f7f9/components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpBindingPreservePostFormUrlEncodedBodyTest.java -- diff --git a/components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpBindingPreservePostFormUrlEncodedBodyTest.java b/components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpBindingPreservePostFormUrlEncodedBodyTest.java index 861c227..e94ffd4 100644 --- a/components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpBindingPreservePostFormUrlEncodedBodyTest.java +++ b/components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpBindingPreservePostFormUrlEncodedBodyTest.java @@ -16,6 +16,8 @@ */ package org.apache.camel.component.netty4.http; +import io.netty.handler.codec.http.FullHttpRequest; + import org.apache.camel.Exchange; import org.apache.camel.Message; import org.apache.camel.Processor; @@ -23,8 +25,6 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.http.HttpMethods; import org.junit.Test; -import io.netty.handler.codec.http.FullHttpRequest; - public class NettyHttpBindingPreservePostFormUrlEncodedBodyTest extends BaseNettyTest { @Test http://git-wip-us.apache.org/repos/asf/camel/blob/b821f7f9/components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpBindingUseRelativePathInPostTest.java -- diff --git a/components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpBindingUseRelativePathInPostTest.java b/components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpBindingUseRelativePathInPostTest.java index 39ed697..89bceff 100644 --- a/components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpBindingUseRelativePathInPostTest.java +++ b/components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpBindingUseRelativePathInPostTest.java @@ -16,14 +16,14 @@ */ package org.apache.camel.component.netty4.http; +import io.netty.handler.codec.http.FullHttpRequest; + import org.apache.camel.Exchange; import org.apache.camel.Processor; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.http.HttpMethods; import org.junit.Test; -import io.netty.handler.codec.http.FullHttpRequest; - public class NettyHttpBindingUseRelativePathInPostTest extends BaseNettyTest { @Test
camel git commit: Fix Checkstyle issue
Repository: camel Updated Branches: refs/heads/camel-2.15.x b821f7f98 -> c659d7eab Fix Checkstyle issue Remove redundant import Signed-off-by: Gregor Zurowski Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/c659d7ea Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/c659d7ea Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/c659d7ea Branch: refs/heads/camel-2.15.x Commit: c659d7eab827b3b4f74e4c35a144dfa8e3352b12 Parents: b821f7f Author: Gregor Zurowski Authored: Sat Oct 17 10:22:43 2015 +0200 Committer: Gregor Zurowski Committed: Sat Oct 17 10:22:43 2015 +0200 -- .../src/test/java/org/apache/camel/scr/internal/ScrHelperTest.java | 1 - 1 file changed, 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/camel/blob/c659d7ea/components/camel-scr/src/test/java/org/apache/camel/scr/internal/ScrHelperTest.java -- diff --git a/components/camel-scr/src/test/java/org/apache/camel/scr/internal/ScrHelperTest.java b/components/camel-scr/src/test/java/org/apache/camel/scr/internal/ScrHelperTest.java index 9d301e5..8a219ea 100644 --- a/components/camel-scr/src/test/java/org/apache/camel/scr/internal/ScrHelperTest.java +++ b/components/camel-scr/src/test/java/org/apache/camel/scr/internal/ScrHelperTest.java @@ -18,7 +18,6 @@ package org.apache.camel.scr.internal; import java.util.Map; -import org.apache.camel.scr.internal.ScrHelper; import org.junit.Before; import org.junit.Rule; import org.junit.Test;
camel git commit: Fix Checkstyle issues
Repository: camel Updated Branches: refs/heads/master e0d3edd94 -> 43cea21cf Fix Checkstyle issues Signed-off-by: Gregor Zurowski Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/43cea21c Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/43cea21c Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/43cea21c Branch: refs/heads/master Commit: 43cea21cf10055ad6daedba5b1288fb102f683af Parents: e0d3edd Author: Gregor Zurowski Authored: Sat Oct 17 10:31:31 2015 +0200 Committer: Gregor Zurowski Committed: Sat Oct 17 10:31:31 2015 +0200 -- .../main/java/org/apache/camel/component/xmpp/XmppBinding.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) -- http://git-wip-us.apache.org/repos/asf/camel/blob/43cea21c/components/camel-xmpp/src/main/java/org/apache/camel/component/xmpp/XmppBinding.java -- diff --git a/components/camel-xmpp/src/main/java/org/apache/camel/component/xmpp/XmppBinding.java b/components/camel-xmpp/src/main/java/org/apache/camel/component/xmpp/XmppBinding.java index ddb198b..b33bdbb 100644 --- a/components/camel-xmpp/src/main/java/org/apache/camel/component/xmpp/XmppBinding.java +++ b/components/camel-xmpp/src/main/java/org/apache/camel/component/xmpp/XmppBinding.java @@ -135,12 +135,12 @@ public class XmppBinding { Map answer = new HashMap(); PacketExtension jpe = xmppPacket.getExtension(JivePropertiesExtension.NAMESPACE); -if (jpe !=null && jpe instanceof JivePropertiesExtension) { +if (jpe != null && jpe instanceof JivePropertiesExtension) { extractHeadersFrom((JivePropertiesExtension)jpe, exchange, answer); } -if (jpe !=null && jpe instanceof DefaultPacketExtension) { +if (jpe != null && jpe instanceof DefaultPacketExtension) { extractHeadersFrom((DefaultPacketExtension)jpe, exchange, answer); -} +} if (xmppPacket instanceof Message) { Message xmppMessage = (Message) xmppPacket;
camel git commit: Remove unused imports
Repository: camel Updated Branches: refs/heads/master 43cea21cf -> e2ef05d41 Remove unused imports Signed-off-by: Gregor Zurowski Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/e2ef05d4 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/e2ef05d4 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/e2ef05d4 Branch: refs/heads/master Commit: e2ef05d41018b7a042a0ae4d19a8406f25e2cd51 Parents: 43cea21 Author: Gregor Zurowski Authored: Sat Oct 17 10:34:48 2015 +0200 Committer: Gregor Zurowski Committed: Sat Oct 17 10:34:48 2015 +0200 -- .../http/NettyHttpBindingPreservePostFormUrlEncodedBodyTest.java| 1 - 1 file changed, 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/camel/blob/e2ef05d4/components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpBindingPreservePostFormUrlEncodedBodyTest.java -- diff --git a/components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpBindingPreservePostFormUrlEncodedBodyTest.java b/components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpBindingPreservePostFormUrlEncodedBodyTest.java index 868574c..05b7038 100644 --- a/components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpBindingPreservePostFormUrlEncodedBodyTest.java +++ b/components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpBindingPreservePostFormUrlEncodedBodyTest.java @@ -19,7 +19,6 @@ package org.apache.camel.component.netty4.http; import io.netty.handler.codec.http.FullHttpRequest; import org.apache.camel.Exchange; -import org.apache.camel.Message; import org.apache.camel.Processor; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.http.HttpMethods;
camel git commit: Fix Checkstyle issues
Repository: camel Updated Branches: refs/heads/camel-2.15.x c659d7eab -> 706907ab1 Fix Checkstyle issues Signed-off-by: Gregor Zurowski Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/706907ab Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/706907ab Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/706907ab Branch: refs/heads/camel-2.15.x Commit: 706907ab13ac1c38a46cc2db1b661fb58cf97986 Parents: c659d7e Author: Gregor Zurowski Authored: Sat Oct 17 10:31:31 2015 +0200 Committer: Gregor Zurowski Committed: Sat Oct 17 10:37:53 2015 +0200 -- .../main/java/org/apache/camel/component/xmpp/XmppBinding.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) -- http://git-wip-us.apache.org/repos/asf/camel/blob/706907ab/components/camel-xmpp/src/main/java/org/apache/camel/component/xmpp/XmppBinding.java -- diff --git a/components/camel-xmpp/src/main/java/org/apache/camel/component/xmpp/XmppBinding.java b/components/camel-xmpp/src/main/java/org/apache/camel/component/xmpp/XmppBinding.java index ddb198b..b33bdbb 100644 --- a/components/camel-xmpp/src/main/java/org/apache/camel/component/xmpp/XmppBinding.java +++ b/components/camel-xmpp/src/main/java/org/apache/camel/component/xmpp/XmppBinding.java @@ -135,12 +135,12 @@ public class XmppBinding { Map answer = new HashMap(); PacketExtension jpe = xmppPacket.getExtension(JivePropertiesExtension.NAMESPACE); -if (jpe !=null && jpe instanceof JivePropertiesExtension) { +if (jpe != null && jpe instanceof JivePropertiesExtension) { extractHeadersFrom((JivePropertiesExtension)jpe, exchange, answer); } -if (jpe !=null && jpe instanceof DefaultPacketExtension) { +if (jpe != null && jpe instanceof DefaultPacketExtension) { extractHeadersFrom((DefaultPacketExtension)jpe, exchange, answer); -} +} if (xmppPacket instanceof Message) { Message xmppMessage = (Message) xmppPacket;
camel git commit: Replace try-with-resources statement with try..finally block
Repository: camel Updated Branches: refs/heads/camel-2.15.x 706907ab1 -> c2b6a023d Replace try-with-resources statement with try..finally block The 2.15.x branch uses an older Checkstyle version that does not support Java 7's try-with-resources statement. In order to cut releases on this branch, this commit replaces the try-with-resources statement with a traditional try..finally block. Signed-off-by: Gregor Zurowski Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/c2b6a023 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/c2b6a023 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/c2b6a023 Branch: refs/heads/camel-2.15.x Commit: c2b6a023d758b20ab42d734c249d6551ee4c3c75 Parents: 706907a Author: Gregor Zurowski Authored: Sat Oct 17 11:46:53 2015 +0200 Committer: Gregor Zurowski Committed: Sat Oct 17 11:46:53 2015 +0200 -- .../camel/test/blueprint/CamelBlueprintTestSupport.java | 8 +++- 1 file changed, 7 insertions(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/camel/blob/c2b6a023/components/camel-test-blueprint/src/main/java/org/apache/camel/test/blueprint/CamelBlueprintTestSupport.java -- diff --git a/components/camel-test-blueprint/src/main/java/org/apache/camel/test/blueprint/CamelBlueprintTestSupport.java b/components/camel-test-blueprint/src/main/java/org/apache/camel/test/blueprint/CamelBlueprintTestSupport.java index 5f9e5fc..cc33ed6 100644 --- a/components/camel-test-blueprint/src/main/java/org/apache/camel/test/blueprint/CamelBlueprintTestSupport.java +++ b/components/camel-test-blueprint/src/main/java/org/apache/camel/test/blueprint/CamelBlueprintTestSupport.java @@ -238,7 +238,9 @@ public abstract class CamelBlueprintTestSupport extends CamelTestSupport { )); for (URL descriptor : CamelBlueprintHelper.getBlueprintDescriptors(getBlueprintDescriptor())) { DocumentBuilder db = dbf.newDocumentBuilder(); -try (InputStream is = descriptor.openStream()) { +InputStream is = null; +try { +is = descriptor.openStream(); Document doc = db.parse(is); NodeList nl = doc.getDocumentElement().getChildNodes(); for (int i = 0; i < nl.getLength(); i++) { @@ -254,6 +256,10 @@ public abstract class CamelBlueprintTestSupport extends CamelTestSupport { } } } +} finally { +if (is != null) { +is.close(); +} } } } catch (Exception e) {
[1/2] camel git commit: Fix checkstyle issues
Repository: camel Updated Branches: refs/heads/camel-2.14.x f5dda9c63 -> 97a73d275 Fix checkstyle issues Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/ceb8f54c Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/ceb8f54c Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/ceb8f54c Branch: refs/heads/camel-2.14.x Commit: ceb8f54c7045385df026de66c87c787ee475ce92 Parents: f5dda9c Author: Daniel Kulp Authored: Mon Sep 28 10:32:40 2015 -0400 Committer: Gregor Zurowski Committed: Sat Oct 17 12:12:54 2015 +0200 -- .../cxf/CxfProducerSoapActionTest.java | 105 +-- 1 file changed, 50 insertions(+), 55 deletions(-) -- http://git-wip-us.apache.org/repos/asf/camel/blob/ceb8f54c/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfProducerSoapActionTest.java -- diff --git a/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfProducerSoapActionTest.java b/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfProducerSoapActionTest.java index 178a425..d6019f4 100644 --- a/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfProducerSoapActionTest.java +++ b/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfProducerSoapActionTest.java @@ -1,5 +1,5 @@ -/** -* Licensed to the Apache Software Foundation (ASF) under one or more +/** + * 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 @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.camel.component.cxf; +package org.apache.camel.component.cxf; import java.util.ArrayList; import java.util.List; @@ -28,60 +28,55 @@ import org.apache.cxf.binding.soap.SoapBindingConstants; import org.junit.Test; public class CxfProducerSoapActionTest extends CamelTestSupport { - - private static final String SOAP_ACTION = "http://camel.apache.org/order/Order";; - private static final String OPERATION_NAMESPACE = "http://camel.apache.org/order";; - private static final String OPERATION_NAME = "order"; - private static final String DIRECT_START = "direct:start"; - private static final String CXF_ENDPOINT = "cxf:http://localhost:9000/order?wsdlURL=classpath:order.wsdl&loggingFeatureEnabled=true";; - private static final String REQUEST_MESSAGE = "http://schemas.xmlsoap.org/soap/envelope/\";>" - + "" - + ""; - @Test - public void testSendSoapRequestWithoutSoapActionSet() { - template.requestBody(DIRECT_START, REQUEST_MESSAGE, String.class); - } - - - protected RouteBuilder createRouteBuilder() { - return new RouteBuilder() { +private static final String SOAP_ACTION = "http://camel.apache.org/order/Order";; +private static final String OPERATION_NAMESPACE = "http://camel.apache.org/order";; +private static final String OPERATION_NAME = "order"; +private static final String DIRECT_START = "direct:start"; +private static final String CXF_ENDPOINT = "cxf:http://localhost:9000/order?wsdlURL=classpath:order.wsdl&loggingFeatureEnabled=true";; +private static final String REQUEST_MESSAGE = "http://schemas.xmlsoap.org/soap/envelope/\";>" + + "" + ""; - @Override - public void configure() throws Exception { - from(DIRECT_START) - .setHeader(CxfConstants.OPERATION_NAME, constant(OPERATION_NAME)) - .setHeader(CxfConstants.OPERATION_NAMESPACE, constant(OPERATION_NAMESPACE)) - .process(new Processor() { +@Test +public void testSendSoapRequestWithoutSoapActionSet() { +template.requestBody(DIRECT_START, REQUEST_MESSAGE, String.class); +} - @Override - public void process(Exchange exchange) throws Exception { - - final List params = new ArrayList(); - params.add("foo"); - params.add(10); - params.add("bar"); -
[2/2] camel git commit: Add Gregor's public key
Add Gregor's public key Signed-off-by: Gregor Zurowski Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/97a73d27 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/97a73d27 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/97a73d27 Branch: refs/heads/camel-2.14.x Commit: 97a73d275102680437c724cef55bd8bd74ec089d Parents: ceb8f54 Author: Gregor Zurowski Authored: Sat Oct 17 12:45:21 2015 +0200 Committer: Gregor Zurowski Committed: Sat Oct 17 12:45:21 2015 +0200 -- KEYS | 59 +++ 1 file changed, 59 insertions(+) -- http://git-wip-us.apache.org/repos/asf/camel/blob/97a73d27/KEYS -- diff --git a/KEYS b/KEYS index 0174020..5824713 100644 --- a/KEYS +++ b/KEYS @@ -1048,3 +1048,62 @@ VcGkOXenZaUgBAp1p1GyxGlmFa8/VJAhsMzUvOUVU2T3nVKb/moMk7kZ34L11Ycm O89+mqkE1TM0W6OF2aHV+RbQgyyufR/gsvKBfIKxEDATew== =eNwt -END PGP PUBLIC KEY BLOCK- + +pub 4096R/5942C049 2015-10-15 +uid Gregor Zurowski +sig 35942C049 2015-10-15 Gregor Zurowski +sub 4096R/A48CCE10 2015-10-15 +sig 5942C049 2015-10-15 Gregor Zurowski + +-BEGIN PGP PUBLIC KEY BLOCK- +Version: GnuPG v1 + +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 +uxLacDc= +=QAF1 +-END PGP PUBLIC KEY BLOCK-
camel git commit: CAMEL-9072: Disable failing test
Repository: camel Updated Branches: refs/heads/camel-2.15.x c2b6a023d -> bc63c46d5 CAMEL-9072: Disable failing test The fix for CAMEL-9072 has not been merged into branch camel-2.15.x, therefore this commit disables the failing test. Signed-off-by: Gregor Zurowski Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/bc63c46d Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/bc63c46d Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/bc63c46d Branch: refs/heads/camel-2.15.x Commit: bc63c46d5083de3a77978470926b05d5c9d4b7d4 Parents: c2b6a02 Author: Claus Ibsen Authored: Tue Aug 11 10:00:10 2015 +0200 Committer: Gregor Zurowski Committed: Sat Oct 17 14:02:47 2015 +0200 -- .../apache/camel/test/blueprint/converter/CustomConverterTest.java | 2 ++ 1 file changed, 2 insertions(+) -- http://git-wip-us.apache.org/repos/asf/camel/blob/bc63c46d/components/camel-test-blueprint/src/test/java/org/apache/camel/test/blueprint/converter/CustomConverterTest.java -- diff --git a/components/camel-test-blueprint/src/test/java/org/apache/camel/test/blueprint/converter/CustomConverterTest.java b/components/camel-test-blueprint/src/test/java/org/apache/camel/test/blueprint/converter/CustomConverterTest.java index 1c1ce64..7c6e899 100644 --- a/components/camel-test-blueprint/src/test/java/org/apache/camel/test/blueprint/converter/CustomConverterTest.java +++ b/components/camel-test-blueprint/src/test/java/org/apache/camel/test/blueprint/converter/CustomConverterTest.java @@ -18,8 +18,10 @@ package org.apache.camel.test.blueprint.converter; import org.apache.camel.test.blueprint.CamelBlueprintTestSupport; import org.apache.camel.test.blueprint.Foo; +import org.junit.Ignore; import org.junit.Test; +@Ignore("See CAMEL-9072") public class CustomConverterTest extends CamelBlueprintTestSupport { @Override
camel git commit: Ignore Camel-irc test currently failing on the CI-Server
Repository: camel Updated Branches: refs/heads/camel-2.15.x bc63c46d5 -> f349ce929 Ignore Camel-irc test currently failing on the CI-Server Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/f349ce92 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/f349ce92 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/f349ce92 Branch: refs/heads/camel-2.15.x Commit: f349ce929ec6c9737530d174bf0fb0e9d9f4d224 Parents: bc63c46 Author: Andrea Cosentino Authored: Fri Jun 19 17:04:03 2015 +0200 Committer: Gregor Zurowski Committed: Sat Oct 17 14:22:19 2015 +0200 -- .../org/apache/camel/component/irc/IrcMultiChannelRouteTest.java | 2 +- .../test/java/org/apache/camel/component/irc/IrcOnReplyTest.java | 2 +- .../test/java/org/apache/camel/component/irc/IrcPrivmsgTest.java | 2 +- .../test/java/org/apache/camel/component/irc/IrcRouteTest.java| 3 ++- 4 files changed, 5 insertions(+), 4 deletions(-) -- http://git-wip-us.apache.org/repos/asf/camel/blob/f349ce92/components/camel-irc/src/test/java/org/apache/camel/component/irc/IrcMultiChannelRouteTest.java -- diff --git a/components/camel-irc/src/test/java/org/apache/camel/component/irc/IrcMultiChannelRouteTest.java b/components/camel-irc/src/test/java/org/apache/camel/component/irc/IrcMultiChannelRouteTest.java index ea4e771..dd1dd73 100644 --- a/components/camel-irc/src/test/java/org/apache/camel/component/irc/IrcMultiChannelRouteTest.java +++ b/components/camel-irc/src/test/java/org/apache/camel/component/irc/IrcMultiChannelRouteTest.java @@ -36,7 +36,7 @@ public class IrcMultiChannelRouteTest extends CamelTestSupport { protected String body3 = "Message Three"; private boolean sentMessages; -@Ignore("test manual") +@Ignore("test manual, irc.codehaus.org has been closed") @Test public void testIrcMessages() throws Exception { resultEndpoint = context.getEndpoint("mock:result", MockEndpoint.class); http://git-wip-us.apache.org/repos/asf/camel/blob/f349ce92/components/camel-irc/src/test/java/org/apache/camel/component/irc/IrcOnReplyTest.java -- diff --git a/components/camel-irc/src/test/java/org/apache/camel/component/irc/IrcOnReplyTest.java b/components/camel-irc/src/test/java/org/apache/camel/component/irc/IrcOnReplyTest.java index d00789c..7f7b076 100644 --- a/components/camel-irc/src/test/java/org/apache/camel/component/irc/IrcOnReplyTest.java +++ b/components/camel-irc/src/test/java/org/apache/camel/component/irc/IrcOnReplyTest.java @@ -35,7 +35,7 @@ public class IrcOnReplyTest extends CamelTestSupport { protected String resultEnd = "End of WHO list"; private boolean sentMessages; -@Ignore("test manual") +@Ignore("test manual, irc.codehaus.org has been closed") @Test public void testIrcMessages() throws Exception { resultEndpoint = context.getEndpoint("mock:result", MockEndpoint.class); http://git-wip-us.apache.org/repos/asf/camel/blob/f349ce92/components/camel-irc/src/test/java/org/apache/camel/component/irc/IrcPrivmsgTest.java -- diff --git a/components/camel-irc/src/test/java/org/apache/camel/component/irc/IrcPrivmsgTest.java b/components/camel-irc/src/test/java/org/apache/camel/component/irc/IrcPrivmsgTest.java index 9b177de..22716a2 100644 --- a/components/camel-irc/src/test/java/org/apache/camel/component/irc/IrcPrivmsgTest.java +++ b/components/camel-irc/src/test/java/org/apache/camel/component/irc/IrcPrivmsgTest.java @@ -40,7 +40,7 @@ public class IrcPrivmsgTest extends CamelTestSupport { private boolean sentMessages; -@Ignore("test manual") +@Ignore("test manual, irc.codehaus.org has been closed") @Test public void testIrcPrivateMessages() throws Exception { resultEndpoint = context.getEndpoint("mock:result", MockEndpoint.class); http://git-wip-us.apache.org/repos/asf/camel/blob/f349ce92/components/camel-irc/src/test/java/org/apache/camel/component/irc/IrcRouteTest.java -- diff --git a/components/camel-irc/src/test/java/org/apache/camel/component/irc/IrcRouteTest.java b/components/camel-irc/src/test/java/org/apache/camel/component/irc/IrcRouteTest.java index 8d66b8a..7b3d60f 100644 --- a/components/camel-irc/src/test/java/org/apache/camel/component/irc/IrcRouteTest.java +++ b/components/camel-irc/src/test/java/org/apache/camel/component/irc/IrcRouteTest.java @@ -23,6 +23,7 @@ import org.apache.camel.Processor; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; impor
camel git commit: Skip test that has problem
Repository: camel Updated Branches: refs/heads/camel-2.15.x f349ce929 -> b73e2321b Skip test that has problem Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/b73e2321 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/b73e2321 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/b73e2321 Branch: refs/heads/camel-2.15.x Commit: b73e2321bb70bef07ada8bbc19431c22b3155afe Parents: f349ce9 Author: Claus Ibsen Authored: Thu Sep 24 08:34:06 2015 +0200 Committer: Gregor Zurowski Committed: Sat Oct 17 14:27:17 2015 +0200 -- .../component/mina2/Mina2ClientModeTcpTextlineDelimiterTest.java | 2 ++ 1 file changed, 2 insertions(+) -- http://git-wip-us.apache.org/repos/asf/camel/blob/b73e2321/components/camel-mina2/src/test/java/org/apache/camel/component/mina2/Mina2ClientModeTcpTextlineDelimiterTest.java -- diff --git a/components/camel-mina2/src/test/java/org/apache/camel/component/mina2/Mina2ClientModeTcpTextlineDelimiterTest.java b/components/camel-mina2/src/test/java/org/apache/camel/component/mina2/Mina2ClientModeTcpTextlineDelimiterTest.java index 7e2c446..b160add 100644 --- a/components/camel-mina2/src/test/java/org/apache/camel/component/mina2/Mina2ClientModeTcpTextlineDelimiterTest.java +++ b/components/camel-mina2/src/test/java/org/apache/camel/component/mina2/Mina2ClientModeTcpTextlineDelimiterTest.java @@ -27,8 +27,10 @@ import org.apache.mina.core.session.IoSession; import org.apache.mina.filter.codec.ProtocolCodecFilter; import org.apache.mina.filter.codec.textline.LineDelimiter; import org.apache.mina.transport.socket.nio.NioSocketAcceptor; +import org.junit.Ignore; import org.junit.Test; +@Ignore("fix me") public class Mina2ClientModeTcpTextlineDelimiterTest extends BaseMina2Test { @Test
[3/3] camel git commit: [maven-release-plugin] prepare release camel-2.15.4
[maven-release-plugin] prepare release camel-2.15.4 Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/308039de Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/308039de Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/308039de Branch: refs/heads/camel-2.15.x Commit: 308039de6cd92bae8e1c94612a991058b1fd512c Parents: b73e232 Author: Gregor Zurowski Authored: Sat Oct 17 15:20:46 2015 + Committer: Gregor Zurowski Committed: Sat Oct 17 15:20:46 2015 + -- apache-camel/pom.xml | 2 +- buildingtools/pom.xml| 2 +- camel-core/pom.xml | 2 +- components/camel-ahc-ws/pom.xml | 2 +- components/camel-ahc/pom.xml | 2 +- components/camel-amqp/pom.xml| 2 +- components/camel-apns/pom.xml| 2 +- components/camel-atmos/pom.xml | 2 +- components/camel-atmosphere-websocket/pom.xml| 2 +- components/camel-atom/pom.xml| 2 +- components/camel-avro/pom.xml| 2 +- components/camel-aws/pom.xml | 2 +- components/camel-bam/pom.xml | 2 +- components/camel-barcode/pom.xml | 2 +- components/camel-base64/pom.xml | 2 +- components/camel-bean-validator/pom.xml | 2 +- components/camel-beanio/pom.xml | 2 +- components/camel-beanstalk/pom.xml | 2 +- components/camel-bindy/pom.xml | 2 +- components/camel-blueprint/pom.xml | 2 +- components/camel-box/pom.xml | 2 +- components/camel-cache/pom.xml | 2 +- components/camel-cassandraql/pom.xml | 2 +- components/camel-castor/pom.xml | 2 +- components/camel-cdi/pom.xml | 2 +- components/camel-chunk/pom.xml | 2 +- components/camel-cmis/pom.xml| 2 +- components/camel-cometd/pom.xml | 2 +- components/camel-context/pom.xml | 2 +- components/camel-core-osgi/pom.xml | 2 +- components/camel-core-xml/pom.xml| 2 +- components/camel-couchdb/pom.xml | 2 +- components/camel-crypto/pom.xml | 2 +- components/camel-csv/pom.xml | 2 +- components/camel-cxf-transport/pom.xml | 2 +- components/camel-cxf/pom.xml | 2 +- components/camel-disruptor/pom.xml | 2 +- components/camel-dns/pom.xml | 2 +- components/camel-docker/pom.xml | 2 +- components/camel-dozer/pom.xml | 2 +- components/camel-dropbox/pom.xml | 2 +- components/camel-eclipse/pom.xml | 2 +- components/camel-ejb/pom.xml | 2 +- components/camel-elasticsearch/pom.xml | 2 +- components/camel-eventadmin/pom.xml | 2 +- components/camel-exec/pom.xml| 2 +- components/camel-facebook/pom.xml| 2 +- components/camel-flatpack/pom.xml| 2 +- components/camel-fop/pom.xml | 2 +- components/camel-freemarker/pom.xml | 2 +- components/camel-ftp/pom.xml | 2 +- components/camel-gae/pom.xml | 2 +- components/camel-ganglia/pom.xml | 2 +- components/camel-geocoder/pom.xml| 2 +- components/camel-github/pom.xml | 2 +- components/camel-google-calendar/pom.xml | 2 +- components/camel-google-drive/pom.xml| 2 +- components/camel-google-mail/pom.xml | 2 +- components/camel-gora/pom.xml| 2 +- components/camel-groovy/pom.xml | 2 +-
[2/3] camel git commit: [maven-release-plugin] prepare release camel-2.15.4
http://git-wip-us.apache.org/repos/asf/camel/blob/308039de/components/camel-lucene/pom.xml -- diff --git a/components/camel-lucene/pom.xml b/components/camel-lucene/pom.xml index 7cb0b3a..28ad09d 100644 --- a/components/camel-lucene/pom.xml +++ b/components/camel-lucene/pom.xml @@ -20,7 +20,7 @@ org.apache.camel components - 2.15.4-SNAPSHOT + 2.15.4 camel-lucene http://git-wip-us.apache.org/repos/asf/camel/blob/308039de/components/camel-mail/pom.xml -- diff --git a/components/camel-mail/pom.xml b/components/camel-mail/pom.xml index 065c172..e739eaa 100644 --- a/components/camel-mail/pom.xml +++ b/components/camel-mail/pom.xml @@ -21,7 +21,7 @@ org.apache.camel components -2.15.4-SNAPSHOT +2.15.4 camel-mail http://git-wip-us.apache.org/repos/asf/camel/blob/308039de/components/camel-metrics/pom.xml -- diff --git a/components/camel-metrics/pom.xml b/components/camel-metrics/pom.xml index 0a89a67..f476303 100644 --- a/components/camel-metrics/pom.xml +++ b/components/camel-metrics/pom.xml @@ -20,7 +20,7 @@ org.apache.camel components -2.15.4-SNAPSHOT +2.15.4 camel-metrics http://git-wip-us.apache.org/repos/asf/camel/blob/308039de/components/camel-mina/pom.xml -- diff --git a/components/camel-mina/pom.xml b/components/camel-mina/pom.xml index 8c677d7..7f73125 100644 --- a/components/camel-mina/pom.xml +++ b/components/camel-mina/pom.xml @@ -21,7 +21,7 @@ org.apache.camel components -2.15.4-SNAPSHOT +2.15.4 camel-mina http://git-wip-us.apache.org/repos/asf/camel/blob/308039de/components/camel-mina2/pom.xml -- diff --git a/components/camel-mina2/pom.xml b/components/camel-mina2/pom.xml index 3efc600..ddf22d7 100644 --- a/components/camel-mina2/pom.xml +++ b/components/camel-mina2/pom.xml @@ -21,7 +21,7 @@ org.apache.camel components -2.15.4-SNAPSHOT +2.15.4 camel-mina2 http://git-wip-us.apache.org/repos/asf/camel/blob/308039de/components/camel-mongodb/pom.xml -- diff --git a/components/camel-mongodb/pom.xml b/components/camel-mongodb/pom.xml index e6b184b..2088960 100644 --- a/components/camel-mongodb/pom.xml +++ b/components/camel-mongodb/pom.xml @@ -23,7 +23,7 @@ org.apache.camel components -2.15.4-SNAPSHOT +2.15.4 camel-mongodb http://git-wip-us.apache.org/repos/asf/camel/blob/308039de/components/camel-mqtt/pom.xml -- diff --git a/components/camel-mqtt/pom.xml b/components/camel-mqtt/pom.xml index c25833b..d57d64e 100644 --- a/components/camel-mqtt/pom.xml +++ b/components/camel-mqtt/pom.xml @@ -21,7 +21,7 @@ org.apache.camel components -2.15.4-SNAPSHOT +2.15.4 camel-mqtt http://git-wip-us.apache.org/repos/asf/camel/blob/308039de/components/camel-msv/pom.xml -- diff --git a/components/camel-msv/pom.xml b/components/camel-msv/pom.xml index 17383ba..4962831 100644 --- a/components/camel-msv/pom.xml +++ b/components/camel-msv/pom.xml @@ -21,7 +21,7 @@ org.apache.camel components -2.15.4-SNAPSHOT +2.15.4 camel-msv http://git-wip-us.apache.org/repos/asf/camel/blob/308039de/components/camel-mustache/pom.xml -- diff --git a/components/camel-mustache/pom.xml b/components/camel-mustache/pom.xml index 5b72fe3..59b254d 100644 --- a/components/camel-mustache/pom.xml +++ b/components/camel-mustache/pom.xml @@ -21,7 +21,7 @@ org.apache.camel components -2.15.4-SNAPSHOT +2.15.4 camel-mustache http://git-wip-us.apache.org/repos/asf/camel/blob/308039de/components/camel-mvel/pom.xml -- diff --git a/components/camel-mvel/pom.xml b/components/camel-mvel/pom.xml index 3f8fc63..02a2bdc 100644 --- a/components/camel-mvel/pom.xml +++ b/components/camel-mvel/pom.xml @@ -21,7 +21,7 @@ org.apache.camel components -2.15.4-SNAPSHOT +2.15.4 camel-mvel http://git-wip-us.apache.org/repos/asf/camel/blob/308039de/components/camel-mybatis/pom.xml -- diff --git a/components/camel-mybatis/pom.xml b/components/camel-mybatis/pom.xml index c5d863a..b22f8a8 10
Git Push Summary
Repository: camel Updated Tags: refs/tags/camel-2.15.4 [created] 2de23e3bc
[1/3] camel git commit: [maven-release-plugin] prepare release camel-2.15.4
Repository: camel Updated Branches: refs/heads/camel-2.15.x b73e2321b -> 308039de6 http://git-wip-us.apache.org/repos/asf/camel/blob/308039de/examples/camel-example-spark-rest-tomcat/pom.xml -- diff --git a/examples/camel-example-spark-rest-tomcat/pom.xml b/examples/camel-example-spark-rest-tomcat/pom.xml index b3c306b..4dc0da6 100755 --- a/examples/camel-example-spark-rest-tomcat/pom.xml +++ b/examples/camel-example-spark-rest-tomcat/pom.xml @@ -22,7 +22,7 @@ org.apache.camel examples -2.15.4-SNAPSHOT +2.15.4 camel-example-spark-rest-tomcat http://git-wip-us.apache.org/repos/asf/camel/blob/308039de/examples/camel-example-splunk/pom.xml -- diff --git a/examples/camel-example-splunk/pom.xml b/examples/camel-example-splunk/pom.xml index 310dee4..96d12c7 100644 --- a/examples/camel-example-splunk/pom.xml +++ b/examples/camel-example-splunk/pom.xml @@ -22,7 +22,7 @@ org.apache.camel examples -2.15.4-SNAPSHOT +2.15.4 camel-example-splunk http://git-wip-us.apache.org/repos/asf/camel/blob/308039de/examples/camel-example-spring-javaconfig/pom.xml -- diff --git a/examples/camel-example-spring-javaconfig/pom.xml b/examples/camel-example-spring-javaconfig/pom.xml index 7eff055..70e7611 100644 --- a/examples/camel-example-spring-javaconfig/pom.xml +++ b/examples/camel-example-spring-javaconfig/pom.xml @@ -21,7 +21,7 @@ org.apache.camel examples -2.15.4-SNAPSHOT +2.15.4 camel-example-spring-javaconfig http://git-wip-us.apache.org/repos/asf/camel/blob/308039de/examples/camel-example-spring-jms/pom.xml -- diff --git a/examples/camel-example-spring-jms/pom.xml b/examples/camel-example-spring-jms/pom.xml index 1c262e2..35c5515 100644 --- a/examples/camel-example-spring-jms/pom.xml +++ b/examples/camel-example-spring-jms/pom.xml @@ -21,7 +21,7 @@ org.apache.camel examples -2.15.4-SNAPSHOT +2.15.4 camel-example-spring-jms http://git-wip-us.apache.org/repos/asf/camel/blob/308039de/examples/camel-example-spring-security/pom.xml -- diff --git a/examples/camel-example-spring-security/pom.xml b/examples/camel-example-spring-security/pom.xml index 077bb24..f6b5d10 100755 --- a/examples/camel-example-spring-security/pom.xml +++ b/examples/camel-example-spring-security/pom.xml @@ -21,7 +21,7 @@ org.apache.camel examples - 2.15.4-SNAPSHOT + 2.15.4 camel-example-spring-security http://git-wip-us.apache.org/repos/asf/camel/blob/308039de/examples/camel-example-spring-ws/pom.xml -- diff --git a/examples/camel-example-spring-ws/pom.xml b/examples/camel-example-spring-ws/pom.xml index b5945b9..1291a34 100644 --- a/examples/camel-example-spring-ws/pom.xml +++ b/examples/camel-example-spring-ws/pom.xml @@ -22,7 +22,7 @@ org.apache.camel examples - 2.15.4-SNAPSHOT + 2.15.4 camel-example-spring-ws http://git-wip-us.apache.org/repos/asf/camel/blob/308039de/examples/camel-example-spring-xquery/pom.xml -- diff --git a/examples/camel-example-spring-xquery/pom.xml b/examples/camel-example-spring-xquery/pom.xml index 8c008aa..b2fde83 100755 --- a/examples/camel-example-spring-xquery/pom.xml +++ b/examples/camel-example-spring-xquery/pom.xml @@ -22,7 +22,7 @@ org.apache.camel examples -2.15.4-SNAPSHOT +2.15.4 camel-example-spring-xquery http://git-wip-us.apache.org/repos/asf/camel/blob/308039de/examples/camel-example-spring/pom.xml -- diff --git a/examples/camel-example-spring/pom.xml b/examples/camel-example-spring/pom.xml index 1656ea8..49b9890 100755 --- a/examples/camel-example-spring/pom.xml +++ b/examples/camel-example-spring/pom.xml @@ -21,7 +21,7 @@ org.apache.camel examples - 2.15.4-SNAPSHOT + 2.15.4 camel-example-spring http://git-wip-us.apache.org/repos/asf/camel/blob/308039de/examples/camel-example-sql-blueprint/pom.xml -- diff --git a/examples/camel-example-sql-blueprint/pom.xml b/examples/camel-example-sql-blueprint/pom.xml index cae2661..40b612b 100644 --- a/examples/camel-example-sql-blueprint/pom.xml +++ b/examples/camel-example-sql-blueprint/pom.xml @@ -22,7 +22,7 @@ org
[1/3] camel git commit: [maven-release-plugin] prepare for next development iteration
Repository: camel Updated Branches: refs/heads/camel-2.15.x 308039de6 -> 79081600b http://git-wip-us.apache.org/repos/asf/camel/blob/79081600/examples/camel-example-spark-rest-tomcat/pom.xml -- diff --git a/examples/camel-example-spark-rest-tomcat/pom.xml b/examples/camel-example-spark-rest-tomcat/pom.xml index 4dc0da6..93e7085 100755 --- a/examples/camel-example-spark-rest-tomcat/pom.xml +++ b/examples/camel-example-spark-rest-tomcat/pom.xml @@ -22,7 +22,7 @@ org.apache.camel examples -2.15.4 +2.15.5-SNAPSHOT camel-example-spark-rest-tomcat http://git-wip-us.apache.org/repos/asf/camel/blob/79081600/examples/camel-example-splunk/pom.xml -- diff --git a/examples/camel-example-splunk/pom.xml b/examples/camel-example-splunk/pom.xml index 96d12c7..f3dc34c 100644 --- a/examples/camel-example-splunk/pom.xml +++ b/examples/camel-example-splunk/pom.xml @@ -22,7 +22,7 @@ org.apache.camel examples -2.15.4 +2.15.5-SNAPSHOT camel-example-splunk http://git-wip-us.apache.org/repos/asf/camel/blob/79081600/examples/camel-example-spring-javaconfig/pom.xml -- diff --git a/examples/camel-example-spring-javaconfig/pom.xml b/examples/camel-example-spring-javaconfig/pom.xml index 70e7611..a460428 100644 --- a/examples/camel-example-spring-javaconfig/pom.xml +++ b/examples/camel-example-spring-javaconfig/pom.xml @@ -21,7 +21,7 @@ org.apache.camel examples -2.15.4 +2.15.5-SNAPSHOT camel-example-spring-javaconfig http://git-wip-us.apache.org/repos/asf/camel/blob/79081600/examples/camel-example-spring-jms/pom.xml -- diff --git a/examples/camel-example-spring-jms/pom.xml b/examples/camel-example-spring-jms/pom.xml index 35c5515..c6b5a9e 100644 --- a/examples/camel-example-spring-jms/pom.xml +++ b/examples/camel-example-spring-jms/pom.xml @@ -21,7 +21,7 @@ org.apache.camel examples -2.15.4 +2.15.5-SNAPSHOT camel-example-spring-jms http://git-wip-us.apache.org/repos/asf/camel/blob/79081600/examples/camel-example-spring-security/pom.xml -- diff --git a/examples/camel-example-spring-security/pom.xml b/examples/camel-example-spring-security/pom.xml index f6b5d10..f155a49 100755 --- a/examples/camel-example-spring-security/pom.xml +++ b/examples/camel-example-spring-security/pom.xml @@ -21,7 +21,7 @@ org.apache.camel examples - 2.15.4 + 2.15.5-SNAPSHOT camel-example-spring-security http://git-wip-us.apache.org/repos/asf/camel/blob/79081600/examples/camel-example-spring-ws/pom.xml -- diff --git a/examples/camel-example-spring-ws/pom.xml b/examples/camel-example-spring-ws/pom.xml index 1291a34..aaee4e7 100644 --- a/examples/camel-example-spring-ws/pom.xml +++ b/examples/camel-example-spring-ws/pom.xml @@ -22,7 +22,7 @@ org.apache.camel examples - 2.15.4 + 2.15.5-SNAPSHOT camel-example-spring-ws http://git-wip-us.apache.org/repos/asf/camel/blob/79081600/examples/camel-example-spring-xquery/pom.xml -- diff --git a/examples/camel-example-spring-xquery/pom.xml b/examples/camel-example-spring-xquery/pom.xml index b2fde83..a498c64 100755 --- a/examples/camel-example-spring-xquery/pom.xml +++ b/examples/camel-example-spring-xquery/pom.xml @@ -22,7 +22,7 @@ org.apache.camel examples -2.15.4 +2.15.5-SNAPSHOT camel-example-spring-xquery http://git-wip-us.apache.org/repos/asf/camel/blob/79081600/examples/camel-example-spring/pom.xml -- diff --git a/examples/camel-example-spring/pom.xml b/examples/camel-example-spring/pom.xml index 49b9890..4c81757 100755 --- a/examples/camel-example-spring/pom.xml +++ b/examples/camel-example-spring/pom.xml @@ -21,7 +21,7 @@ org.apache.camel examples - 2.15.4 + 2.15.5-SNAPSHOT camel-example-spring http://git-wip-us.apache.org/repos/asf/camel/blob/79081600/examples/camel-example-sql-blueprint/pom.xml -- diff --git a/examples/camel-example-sql-blueprint/pom.xml b/examples/camel-example-sql-blueprint/pom.xml index 40b612b..a4fff41 100644 --- a/examples/camel-example-sql-blueprint/pom.xml +++ b/examples/camel-example-sql-blueprint/pom.xml @@ -22,7 +22,7 @@ org
[3/3] camel git commit: [maven-release-plugin] prepare for next development iteration
[maven-release-plugin] prepare for next development iteration Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/79081600 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/79081600 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/79081600 Branch: refs/heads/camel-2.15.x Commit: 79081600b55af2578f27b4b37318b632967aa29d Parents: 308039d Author: Gregor Zurowski Authored: Sat Oct 17 15:21:08 2015 + Committer: Gregor Zurowski Committed: Sat Oct 17 15:21:08 2015 + -- apache-camel/pom.xml | 2 +- buildingtools/pom.xml| 2 +- camel-core/pom.xml | 2 +- components/camel-ahc-ws/pom.xml | 2 +- components/camel-ahc/pom.xml | 2 +- components/camel-amqp/pom.xml| 2 +- components/camel-apns/pom.xml| 2 +- components/camel-atmos/pom.xml | 2 +- components/camel-atmosphere-websocket/pom.xml| 2 +- components/camel-atom/pom.xml| 2 +- components/camel-avro/pom.xml| 2 +- components/camel-aws/pom.xml | 2 +- components/camel-bam/pom.xml | 2 +- components/camel-barcode/pom.xml | 2 +- components/camel-base64/pom.xml | 2 +- components/camel-bean-validator/pom.xml | 2 +- components/camel-beanio/pom.xml | 2 +- components/camel-beanstalk/pom.xml | 2 +- components/camel-bindy/pom.xml | 2 +- components/camel-blueprint/pom.xml | 2 +- components/camel-box/pom.xml | 2 +- components/camel-cache/pom.xml | 2 +- components/camel-cassandraql/pom.xml | 2 +- components/camel-castor/pom.xml | 2 +- components/camel-cdi/pom.xml | 2 +- components/camel-chunk/pom.xml | 2 +- components/camel-cmis/pom.xml| 2 +- components/camel-cometd/pom.xml | 2 +- components/camel-context/pom.xml | 2 +- components/camel-core-osgi/pom.xml | 2 +- components/camel-core-xml/pom.xml| 2 +- components/camel-couchdb/pom.xml | 2 +- components/camel-crypto/pom.xml | 2 +- components/camel-csv/pom.xml | 2 +- components/camel-cxf-transport/pom.xml | 2 +- components/camel-cxf/pom.xml | 2 +- components/camel-disruptor/pom.xml | 2 +- components/camel-dns/pom.xml | 2 +- components/camel-docker/pom.xml | 2 +- components/camel-dozer/pom.xml | 2 +- components/camel-dropbox/pom.xml | 2 +- components/camel-eclipse/pom.xml | 2 +- components/camel-ejb/pom.xml | 2 +- components/camel-elasticsearch/pom.xml | 2 +- components/camel-eventadmin/pom.xml | 2 +- components/camel-exec/pom.xml| 2 +- components/camel-facebook/pom.xml| 2 +- components/camel-flatpack/pom.xml| 2 +- components/camel-fop/pom.xml | 2 +- components/camel-freemarker/pom.xml | 2 +- components/camel-ftp/pom.xml | 2 +- components/camel-gae/pom.xml | 2 +- components/camel-ganglia/pom.xml | 2 +- components/camel-geocoder/pom.xml| 2 +- components/camel-github/pom.xml | 2 +- components/camel-google-calendar/pom.xml | 2 +- components/camel-google-drive/pom.xml| 2 +- components/camel-google-mail/pom.xml | 2 +- components/camel-gora/pom.xml| 2 +- components/camel-groovy/pom.xml
[2/3] camel git commit: [maven-release-plugin] prepare for next development iteration
http://git-wip-us.apache.org/repos/asf/camel/blob/79081600/components/camel-lucene/pom.xml -- diff --git a/components/camel-lucene/pom.xml b/components/camel-lucene/pom.xml index 28ad09d..39cea04 100644 --- a/components/camel-lucene/pom.xml +++ b/components/camel-lucene/pom.xml @@ -20,7 +20,7 @@ org.apache.camel components - 2.15.4 + 2.15.5-SNAPSHOT camel-lucene http://git-wip-us.apache.org/repos/asf/camel/blob/79081600/components/camel-mail/pom.xml -- diff --git a/components/camel-mail/pom.xml b/components/camel-mail/pom.xml index e739eaa..63d43e8 100644 --- a/components/camel-mail/pom.xml +++ b/components/camel-mail/pom.xml @@ -21,7 +21,7 @@ org.apache.camel components -2.15.4 +2.15.5-SNAPSHOT camel-mail http://git-wip-us.apache.org/repos/asf/camel/blob/79081600/components/camel-metrics/pom.xml -- diff --git a/components/camel-metrics/pom.xml b/components/camel-metrics/pom.xml index f476303..3d3fada 100644 --- a/components/camel-metrics/pom.xml +++ b/components/camel-metrics/pom.xml @@ -20,7 +20,7 @@ org.apache.camel components -2.15.4 +2.15.5-SNAPSHOT camel-metrics http://git-wip-us.apache.org/repos/asf/camel/blob/79081600/components/camel-mina/pom.xml -- diff --git a/components/camel-mina/pom.xml b/components/camel-mina/pom.xml index 7f73125..6c9b5de 100644 --- a/components/camel-mina/pom.xml +++ b/components/camel-mina/pom.xml @@ -21,7 +21,7 @@ org.apache.camel components -2.15.4 +2.15.5-SNAPSHOT camel-mina http://git-wip-us.apache.org/repos/asf/camel/blob/79081600/components/camel-mina2/pom.xml -- diff --git a/components/camel-mina2/pom.xml b/components/camel-mina2/pom.xml index ddf22d7..82a2f98 100644 --- a/components/camel-mina2/pom.xml +++ b/components/camel-mina2/pom.xml @@ -21,7 +21,7 @@ org.apache.camel components -2.15.4 +2.15.5-SNAPSHOT camel-mina2 http://git-wip-us.apache.org/repos/asf/camel/blob/79081600/components/camel-mongodb/pom.xml -- diff --git a/components/camel-mongodb/pom.xml b/components/camel-mongodb/pom.xml index 2088960..5331762 100644 --- a/components/camel-mongodb/pom.xml +++ b/components/camel-mongodb/pom.xml @@ -23,7 +23,7 @@ org.apache.camel components -2.15.4 +2.15.5-SNAPSHOT camel-mongodb http://git-wip-us.apache.org/repos/asf/camel/blob/79081600/components/camel-mqtt/pom.xml -- diff --git a/components/camel-mqtt/pom.xml b/components/camel-mqtt/pom.xml index d57d64e..953cf78 100644 --- a/components/camel-mqtt/pom.xml +++ b/components/camel-mqtt/pom.xml @@ -21,7 +21,7 @@ org.apache.camel components -2.15.4 +2.15.5-SNAPSHOT camel-mqtt http://git-wip-us.apache.org/repos/asf/camel/blob/79081600/components/camel-msv/pom.xml -- diff --git a/components/camel-msv/pom.xml b/components/camel-msv/pom.xml index 4962831..728d543 100644 --- a/components/camel-msv/pom.xml +++ b/components/camel-msv/pom.xml @@ -21,7 +21,7 @@ org.apache.camel components -2.15.4 +2.15.5-SNAPSHOT camel-msv http://git-wip-us.apache.org/repos/asf/camel/blob/79081600/components/camel-mustache/pom.xml -- diff --git a/components/camel-mustache/pom.xml b/components/camel-mustache/pom.xml index 59b254d..d5fa195 100644 --- a/components/camel-mustache/pom.xml +++ b/components/camel-mustache/pom.xml @@ -21,7 +21,7 @@ org.apache.camel components -2.15.4 +2.15.5-SNAPSHOT camel-mustache http://git-wip-us.apache.org/repos/asf/camel/blob/79081600/components/camel-mvel/pom.xml -- diff --git a/components/camel-mvel/pom.xml b/components/camel-mvel/pom.xml index 02a2bdc..849a88d 100644 --- a/components/camel-mvel/pom.xml +++ b/components/camel-mvel/pom.xml @@ -21,7 +21,7 @@ org.apache.camel components -2.15.4 +2.15.5-SNAPSHOT camel-mvel http://git-wip-us.apache.org/repos/asf/camel/blob/79081600/components/camel-mybatis/pom.xml -- diff --git a/components/camel-mybatis/pom.xml b/components/camel-mybatis/pom.xml index b22f8a8..ebb3975 10
camel git commit: Fix Checkstyle issues
Repository: camel Updated Branches: refs/heads/master f8def8a14 -> 73ca6880b Fix Checkstyle issues Signed-off-by: Gregor Zurowski Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/73ca6880 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/73ca6880 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/73ca6880 Branch: refs/heads/master Commit: 73ca6880b9c1e4e507be6bd3df2939125d37121a Parents: f8def8a Author: Gregor Zurowski Authored: Sat Oct 17 19:11:54 2015 +0200 Committer: Gregor Zurowski Committed: Sat Oct 17 19:11:54 2015 +0200 -- .../org/apache/camel/groovy/dataformat/AbstractXmlDataFormat.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/camel/blob/73ca6880/components/camel-groovy/src/main/java/org/apache/camel/groovy/dataformat/AbstractXmlDataFormat.java -- diff --git a/components/camel-groovy/src/main/java/org/apache/camel/groovy/dataformat/AbstractXmlDataFormat.java b/components/camel-groovy/src/main/java/org/apache/camel/groovy/dataformat/AbstractXmlDataFormat.java index 8ec6087..9202059 100644 --- a/components/camel-groovy/src/main/java/org/apache/camel/groovy/dataformat/AbstractXmlDataFormat.java +++ b/components/camel-groovy/src/main/java/org/apache/camel/groovy/dataformat/AbstractXmlDataFormat.java @@ -19,13 +19,14 @@ package org.apache.camel.groovy.dataformat; import javax.xml.parsers.SAXParser; import javax.xml.parsers.SAXParserFactory; -import org.apache.camel.support.ServiceSupport; import org.xml.sax.ErrorHandler; import org.xml.sax.SAXException; import org.xml.sax.SAXParseException; import groovy.xml.FactorySupport; + import org.apache.camel.spi.DataFormat; +import org.apache.camel.support.ServiceSupport; import org.slf4j.Logger; import org.slf4j.LoggerFactory;
camel git commit: Fix Checkstyle issues
Repository: camel Updated Branches: refs/heads/master 73ca6880b -> 7430c1289 Fix Checkstyle issues Signed-off-by: Gregor Zurowski Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/7430c128 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/7430c128 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/7430c128 Branch: refs/heads/master Commit: 7430c1289a59af3d691305f486b98a303ddad342 Parents: 73ca688 Author: Gregor Zurowski Authored: Sat Oct 17 19:41:44 2015 +0200 Committer: Gregor Zurowski Committed: Sat Oct 17 19:41:44 2015 +0200 -- .../main/java/org/apache/camel/converter/jaxb/JaxbDataFormat.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/camel/blob/7430c128/components/camel-jaxb/src/main/java/org/apache/camel/converter/jaxb/JaxbDataFormat.java -- diff --git a/components/camel-jaxb/src/main/java/org/apache/camel/converter/jaxb/JaxbDataFormat.java b/components/camel-jaxb/src/main/java/org/apache/camel/converter/jaxb/JaxbDataFormat.java index dc5090e..7a205fe 100644 --- a/components/camel-jaxb/src/main/java/org/apache/camel/converter/jaxb/JaxbDataFormat.java +++ b/components/camel-jaxb/src/main/java/org/apache/camel/converter/jaxb/JaxbDataFormat.java @@ -45,7 +45,6 @@ import javax.xml.transform.stream.StreamSource; import javax.xml.validation.Schema; import javax.xml.validation.SchemaFactory; -import org.apache.camel.spi.DataFormatName; import org.xml.sax.SAXException; import org.apache.camel.CamelContext; @@ -55,6 +54,7 @@ import org.apache.camel.InvalidPayloadException; import org.apache.camel.NoTypeConversionAvailableException; import org.apache.camel.TypeConverter; import org.apache.camel.spi.DataFormat; +import org.apache.camel.spi.DataFormatName; import org.apache.camel.support.ServiceSupport; import org.apache.camel.util.CamelContextHelper; import org.apache.camel.util.IOHelper;
[3/3] camel git commit: Fix Checkstyle issues
Fix Checkstyle issues Signed-off-by: Gregor Zurowski Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/df0b512a Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/df0b512a Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/df0b512a Branch: refs/heads/master Commit: df0b512a9bf1fd81c248098a29acb0840e624d82 Parents: 711b62a Author: Gregor Zurowski Authored: Sat Oct 17 21:39:08 2015 +0200 Committer: Gregor Zurowski Committed: Sat Oct 17 21:39:08 2015 +0200 -- .../camel/dataformat/xmlsecurity/XMLSecurityDataFormat.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -- http://git-wip-us.apache.org/repos/asf/camel/blob/df0b512a/components/camel-xmlsecurity/src/main/java/org/apache/camel/dataformat/xmlsecurity/XMLSecurityDataFormat.java -- diff --git a/components/camel-xmlsecurity/src/main/java/org/apache/camel/dataformat/xmlsecurity/XMLSecurityDataFormat.java b/components/camel-xmlsecurity/src/main/java/org/apache/camel/dataformat/xmlsecurity/XMLSecurityDataFormat.java index 25da8f4..1261df2 100755 --- a/components/camel-xmlsecurity/src/main/java/org/apache/camel/dataformat/xmlsecurity/XMLSecurityDataFormat.java +++ b/components/camel-xmlsecurity/src/main/java/org/apache/camel/dataformat/xmlsecurity/XMLSecurityDataFormat.java @@ -40,8 +40,6 @@ import javax.crypto.spec.DESedeKeySpec; import javax.crypto.spec.SecretKeySpec; import javax.xml.transform.dom.DOMSource; -import org.apache.camel.spi.DataFormatName; -import org.apache.camel.support.ServiceSupport; import org.w3c.dom.Document; import org.w3c.dom.Element; import org.w3c.dom.Node; @@ -52,6 +50,8 @@ import org.apache.camel.Exchange; import org.apache.camel.builder.xml.DefaultNamespaceContext; import org.apache.camel.builder.xml.XPathBuilder; import org.apache.camel.spi.DataFormat; +import org.apache.camel.spi.DataFormatName; +import org.apache.camel.support.ServiceSupport; import org.apache.camel.util.IOHelper; import org.apache.camel.util.jsse.KeyStoreParameters; import org.apache.xml.security.encryption.EncryptedData;
[2/3] camel git commit: Fix Checkstyle issues
Fix Checkstyle issues Signed-off-by: Gregor Zurowski Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/711b62af Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/711b62af Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/711b62af Branch: refs/heads/master Commit: 711b62af6f8217694265324ef4dc8948aa7f6005 Parents: cd3f1d2 Author: Gregor Zurowski Authored: Sat Oct 17 21:34:21 2015 +0200 Committer: Gregor Zurowski Committed: Sat Oct 17 21:34:21 2015 +0200 -- .../org/apache/camel/dataformat/xmlrpc/XmlRpcDataFormat.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -- http://git-wip-us.apache.org/repos/asf/camel/blob/711b62af/components/camel-xmlrpc/src/main/java/org/apache/camel/dataformat/xmlrpc/XmlRpcDataFormat.java -- diff --git a/components/camel-xmlrpc/src/main/java/org/apache/camel/dataformat/xmlrpc/XmlRpcDataFormat.java b/components/camel-xmlrpc/src/main/java/org/apache/camel/dataformat/xmlrpc/XmlRpcDataFormat.java index cd90a0d..d04d651 100644 --- a/components/camel-xmlrpc/src/main/java/org/apache/camel/dataformat/xmlrpc/XmlRpcDataFormat.java +++ b/components/camel-xmlrpc/src/main/java/org/apache/camel/dataformat/xmlrpc/XmlRpcDataFormat.java @@ -23,8 +23,6 @@ import java.io.OutputStream; import java.io.OutputStreamWriter; import java.io.UnsupportedEncodingException; -import org.apache.camel.spi.DataFormatName; -import org.apache.camel.support.ServiceSupport; import org.xml.sax.InputSource; import org.xml.sax.SAXException; import org.xml.sax.XMLReader; @@ -33,6 +31,8 @@ import org.apache.camel.Exchange; import org.apache.camel.component.xmlrpc.XmlRpcConstants; import org.apache.camel.component.xmlrpc.XmlRpcRequestImpl; import org.apache.camel.spi.DataFormat; +import org.apache.camel.spi.DataFormatName; +import org.apache.camel.support.ServiceSupport; import org.apache.camel.util.IOHelper; import org.apache.ws.commons.serialize.CharSetXMLWriter; import org.apache.ws.commons.serialize.XMLWriter;
[1/3] camel git commit: Fix Checkstyle issues
Repository: camel Updated Branches: refs/heads/master 7430c1289 -> df0b512a9 Fix Checkstyle issues Signed-off-by: Gregor Zurowski Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/cd3f1d24 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/cd3f1d24 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/cd3f1d24 Branch: refs/heads/master Commit: cd3f1d2404684baab769be8b1246bfdc95e0659c Parents: 7430c12 Author: Gregor Zurowski Authored: Sat Oct 17 21:24:16 2015 +0200 Committer: Gregor Zurowski Committed: Sat Oct 17 21:24:16 2015 +0200 -- .../java/org/apache/camel/component/sql/DefaultSqlEndpoint.java | 3 ++- .../src/main/java/org/apache/camel/component/sql/SqlConsumer.java | 3 ++- .../sql/SqlComponentConfigurationAndDocumentationTest.java| 3 ++- 3 files changed, 6 insertions(+), 3 deletions(-) -- http://git-wip-us.apache.org/repos/asf/camel/blob/cd3f1d24/components/camel-sql/src/main/java/org/apache/camel/component/sql/DefaultSqlEndpoint.java -- diff --git a/components/camel-sql/src/main/java/org/apache/camel/component/sql/DefaultSqlEndpoint.java b/components/camel-sql/src/main/java/org/apache/camel/component/sql/DefaultSqlEndpoint.java index c67ecc1..2de1d64 100644 --- a/components/camel-sql/src/main/java/org/apache/camel/component/sql/DefaultSqlEndpoint.java +++ b/components/camel-sql/src/main/java/org/apache/camel/component/sql/DefaultSqlEndpoint.java @@ -54,7 +54,8 @@ public abstract class DefaultSqlEndpoint extends DefaultPollingEndpoint { description = "Allows to plugin to use a custom org.apache.camel.component.sql.SqlPrepareStatementStrategy to control preparation of the query and prepared statement.") private SqlPrepareStatementStrategy prepareStatementStrategy; @UriParam(label = "consumer", -description = "After processing each row then this query can be executed, if the Exchange was processed successfully, for example to mark the row as processed. The query can have parameter.") +description = "After processing each row then this query can be executed, if the Exchange was processed successfully, for example to mark the row as processed. The query can have" ++ " parameter.") private String onConsume; @UriParam(label = "consumer", description = "After processing each row then this query can be executed, if the Exchange failed, for example to mark the row as failed. The query can have parameter.") http://git-wip-us.apache.org/repos/asf/camel/blob/cd3f1d24/components/camel-sql/src/main/java/org/apache/camel/component/sql/SqlConsumer.java -- diff --git a/components/camel-sql/src/main/java/org/apache/camel/component/sql/SqlConsumer.java b/components/camel-sql/src/main/java/org/apache/camel/component/sql/SqlConsumer.java index 0f52280..ce8135a 100644 --- a/components/camel-sql/src/main/java/org/apache/camel/component/sql/SqlConsumer.java +++ b/components/camel-sql/src/main/java/org/apache/camel/component/sql/SqlConsumer.java @@ -63,7 +63,8 @@ public class SqlConsumer extends ScheduledBatchPollingConsumer { } } -public SqlConsumer(DefaultSqlEndpoint endpoint, Processor processor, JdbcTemplate jdbcTemplate, String query, SqlPrepareStatementStrategy sqlPrepareStatementStrategy, SqlProcessingStrategy sqlProcessingStrategy) { +public SqlConsumer(DefaultSqlEndpoint endpoint, Processor processor, JdbcTemplate jdbcTemplate, String query, SqlPrepareStatementStrategy sqlPrepareStatementStrategy, +SqlProcessingStrategy sqlProcessingStrategy) { super(endpoint, processor); this.jdbcTemplate = jdbcTemplate; this.namedJdbcTemplate = null; http://git-wip-us.apache.org/repos/asf/camel/blob/cd3f1d24/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlComponentConfigurationAndDocumentationTest.java -- diff --git a/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlComponentConfigurationAndDocumentationTest.java b/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlComponentConfigurationAndDocumentationTest.java index f3d0674..68bbe9c 100644 --- a/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlComponentConfigurationAndDocumentationTest.java +++ b/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlComponentConfigurationAndDocumentationTest.java @@ -48,7 +48,8 @@ public class SqlComponentConfigurationAndDocumentationTest extends CamelTestSupp assertTrue(json.contains("\"onConsumeBatchComplete\": { \"kind\": \
camel git commit: Fix Checkstyle issues
Repository: camel Updated Branches: refs/heads/master df0b512a9 -> ea6f85025 Fix Checkstyle issues Signed-off-by: Gregor Zurowski Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/ea6f8502 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/ea6f8502 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/ea6f8502 Branch: refs/heads/master Commit: ea6f850252862ca1eeb82a54b90cde560f6be5cc Parents: df0b512 Author: Gregor Zurowski Authored: Sat Oct 17 21:45:08 2015 +0200 Committer: Gregor Zurowski Committed: Sat Oct 17 21:45:08 2015 +0200 -- .../src/main/java/org/apache/camel/commands/RouteListCommand.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/camel/blob/ea6f8502/platforms/commands/commands-core/src/main/java/org/apache/camel/commands/RouteListCommand.java -- diff --git a/platforms/commands/commands-core/src/main/java/org/apache/camel/commands/RouteListCommand.java b/platforms/commands/commands-core/src/main/java/org/apache/camel/commands/RouteListCommand.java index 2c94afd..95bdd3e 100644 --- a/platforms/commands/commands-core/src/main/java/org/apache/camel/commands/RouteListCommand.java +++ b/platforms/commands/commands-core/src/main/java/org/apache/camel/commands/RouteListCommand.java @@ -58,7 +58,8 @@ public class RouteListCommand extends AbstractCamelCommand { final String rowFormat = buildFormatString(columnWidths, false); if (routes.size() > 0) { -out.println(String.format(headerFormat, CONTEXT_COLUMN_LABEL, ROUTE_COLUMN_LABEL, STATUS_COLUMN_LABEL, TOTAL_COLUMN_LABEL, FAILED_COLUMN_LABEL, INFLIGHT_COLUMN_LABEL, UPTIME_COLUMN_LABEL)); +out.println(String.format(headerFormat, CONTEXT_COLUMN_LABEL, ROUTE_COLUMN_LABEL, STATUS_COLUMN_LABEL, TOTAL_COLUMN_LABEL, FAILED_COLUMN_LABEL, INFLIGHT_COLUMN_LABEL, +UPTIME_COLUMN_LABEL)); out.println(String.format(headerFormat, "---", "-", "--", "---", "", "--", "--")); for (Map row : routes) { String contextId = row.get("camelContextName");
camel git commit: Ignore Camel-irc test currently failing on the CI-Server
Repository: camel Updated Branches: refs/heads/camel-2.14.x 97a73d275 -> 2036f8a36 Ignore Camel-irc test currently failing on the CI-Server Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/2036f8a3 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/2036f8a3 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/2036f8a3 Branch: refs/heads/camel-2.14.x Commit: 2036f8a36fefca0be2373cbfa248ea569538ed71 Parents: 97a73d2 Author: Andrea Cosentino Authored: Fri Jun 19 17:04:03 2015 +0200 Committer: Gregor Zurowski Committed: Thu Oct 22 21:58:58 2015 +0200 -- .../org/apache/camel/component/irc/IrcMultiChannelRouteTest.java | 2 +- .../test/java/org/apache/camel/component/irc/IrcOnReplyTest.java | 2 +- .../test/java/org/apache/camel/component/irc/IrcPrivmsgTest.java | 2 +- .../test/java/org/apache/camel/component/irc/IrcRouteTest.java| 3 ++- 4 files changed, 5 insertions(+), 4 deletions(-) -- http://git-wip-us.apache.org/repos/asf/camel/blob/2036f8a3/components/camel-irc/src/test/java/org/apache/camel/component/irc/IrcMultiChannelRouteTest.java -- diff --git a/components/camel-irc/src/test/java/org/apache/camel/component/irc/IrcMultiChannelRouteTest.java b/components/camel-irc/src/test/java/org/apache/camel/component/irc/IrcMultiChannelRouteTest.java index ea4e771..dd1dd73 100644 --- a/components/camel-irc/src/test/java/org/apache/camel/component/irc/IrcMultiChannelRouteTest.java +++ b/components/camel-irc/src/test/java/org/apache/camel/component/irc/IrcMultiChannelRouteTest.java @@ -36,7 +36,7 @@ public class IrcMultiChannelRouteTest extends CamelTestSupport { protected String body3 = "Message Three"; private boolean sentMessages; -@Ignore("test manual") +@Ignore("test manual, irc.codehaus.org has been closed") @Test public void testIrcMessages() throws Exception { resultEndpoint = context.getEndpoint("mock:result", MockEndpoint.class); http://git-wip-us.apache.org/repos/asf/camel/blob/2036f8a3/components/camel-irc/src/test/java/org/apache/camel/component/irc/IrcOnReplyTest.java -- diff --git a/components/camel-irc/src/test/java/org/apache/camel/component/irc/IrcOnReplyTest.java b/components/camel-irc/src/test/java/org/apache/camel/component/irc/IrcOnReplyTest.java index d00789c..7f7b076 100644 --- a/components/camel-irc/src/test/java/org/apache/camel/component/irc/IrcOnReplyTest.java +++ b/components/camel-irc/src/test/java/org/apache/camel/component/irc/IrcOnReplyTest.java @@ -35,7 +35,7 @@ public class IrcOnReplyTest extends CamelTestSupport { protected String resultEnd = "End of WHO list"; private boolean sentMessages; -@Ignore("test manual") +@Ignore("test manual, irc.codehaus.org has been closed") @Test public void testIrcMessages() throws Exception { resultEndpoint = context.getEndpoint("mock:result", MockEndpoint.class); http://git-wip-us.apache.org/repos/asf/camel/blob/2036f8a3/components/camel-irc/src/test/java/org/apache/camel/component/irc/IrcPrivmsgTest.java -- diff --git a/components/camel-irc/src/test/java/org/apache/camel/component/irc/IrcPrivmsgTest.java b/components/camel-irc/src/test/java/org/apache/camel/component/irc/IrcPrivmsgTest.java index 9b177de..22716a2 100644 --- a/components/camel-irc/src/test/java/org/apache/camel/component/irc/IrcPrivmsgTest.java +++ b/components/camel-irc/src/test/java/org/apache/camel/component/irc/IrcPrivmsgTest.java @@ -40,7 +40,7 @@ public class IrcPrivmsgTest extends CamelTestSupport { private boolean sentMessages; -@Ignore("test manual") +@Ignore("test manual, irc.codehaus.org has been closed") @Test public void testIrcPrivateMessages() throws Exception { resultEndpoint = context.getEndpoint("mock:result", MockEndpoint.class); http://git-wip-us.apache.org/repos/asf/camel/blob/2036f8a3/components/camel-irc/src/test/java/org/apache/camel/component/irc/IrcRouteTest.java -- diff --git a/components/camel-irc/src/test/java/org/apache/camel/component/irc/IrcRouteTest.java b/components/camel-irc/src/test/java/org/apache/camel/component/irc/IrcRouteTest.java index 8d66b8a..7b3d60f 100644 --- a/components/camel-irc/src/test/java/org/apache/camel/component/irc/IrcRouteTest.java +++ b/components/camel-irc/src/test/java/org/apache/camel/component/irc/IrcRouteTest.java @@ -23,6 +23,7 @@ import org.apache.camel.Processor; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; impor
Git Push Summary
Repository: camel Updated Tags: refs/tags/camel-2.15.4 [deleted] 2de23e3bc
camel git commit: Match pom versions before cutting release
Repository: camel Updated Branches: refs/heads/camel-2.15.x d92ff43d2 -> e0b31784c Match pom versions before cutting release Signed-off-by: Gregor Zurowski Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/e0b31784 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/e0b31784 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/e0b31784 Branch: refs/heads/camel-2.15.x Commit: e0b31784c7d47f87609cf44bbc5e04b75593c06f Parents: d92ff43 Author: Gregor Zurowski Authored: Fri Oct 23 17:47:59 2015 + Committer: Gregor Zurowski Committed: Fri Oct 23 17:55:12 2015 + -- tests/camel-itest-karaf/pom.xml | 2 +- tests/camel-itest-osgi/pom.xml| 2 +- tests/camel-itest-performance/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/e0b31784/tests/camel-itest-karaf/pom.xml -- diff --git a/tests/camel-itest-karaf/pom.xml b/tests/camel-itest-karaf/pom.xml index e2ada97..854e549 100644 --- a/tests/camel-itest-karaf/pom.xml +++ b/tests/camel-itest-karaf/pom.xml @@ -22,7 +22,7 @@ org.apache.camel tests -2.15.4-SNAPSHOT +2.15.5-SNAPSHOT camel-itest-karaf http://git-wip-us.apache.org/repos/asf/camel/blob/e0b31784/tests/camel-itest-osgi/pom.xml -- diff --git a/tests/camel-itest-osgi/pom.xml b/tests/camel-itest-osgi/pom.xml index 95162b0..f3aea8f 100644 --- a/tests/camel-itest-osgi/pom.xml +++ b/tests/camel-itest-osgi/pom.xml @@ -22,7 +22,7 @@ org.apache.camel tests -2.15.4-SNAPSHOT +2.15.5-SNAPSHOT camel-itest-osgi http://git-wip-us.apache.org/repos/asf/camel/blob/e0b31784/tests/camel-itest-performance/pom.xml -- diff --git a/tests/camel-itest-performance/pom.xml b/tests/camel-itest-performance/pom.xml index 713fb5d..f2a3244 100644 --- a/tests/camel-itest-performance/pom.xml +++ b/tests/camel-itest-performance/pom.xml @@ -22,7 +22,7 @@ org.apache.camel tests -2.15.4-SNAPSHOT +2.15.5-SNAPSHOT camel-itest-performance http://git-wip-us.apache.org/repos/asf/camel/blob/e0b31784/tests/camel-performance/pom.xml -- diff --git a/tests/camel-performance/pom.xml b/tests/camel-performance/pom.xml index fd88d5a..57a0155 100644 --- a/tests/camel-performance/pom.xml +++ b/tests/camel-performance/pom.xml @@ -22,7 +22,7 @@ org.apache.camel tests -2.15.4-SNAPSHOT +2.15.5-SNAPSHOT camel-performance
[1/3] camel git commit: [maven-release-plugin] prepare release camel-2.15.4
Repository: camel Updated Branches: refs/heads/camel-2.15.x e0b31784c -> 04cbd86fa http://git-wip-us.apache.org/repos/asf/camel/blob/04cbd86f/examples/camel-example-spark-rest-tomcat/pom.xml -- diff --git a/examples/camel-example-spark-rest-tomcat/pom.xml b/examples/camel-example-spark-rest-tomcat/pom.xml index 93e7085..4dc0da6 100755 --- a/examples/camel-example-spark-rest-tomcat/pom.xml +++ b/examples/camel-example-spark-rest-tomcat/pom.xml @@ -22,7 +22,7 @@ org.apache.camel examples -2.15.5-SNAPSHOT +2.15.4 camel-example-spark-rest-tomcat http://git-wip-us.apache.org/repos/asf/camel/blob/04cbd86f/examples/camel-example-splunk/pom.xml -- diff --git a/examples/camel-example-splunk/pom.xml b/examples/camel-example-splunk/pom.xml index f3dc34c..96d12c7 100644 --- a/examples/camel-example-splunk/pom.xml +++ b/examples/camel-example-splunk/pom.xml @@ -22,7 +22,7 @@ org.apache.camel examples -2.15.5-SNAPSHOT +2.15.4 camel-example-splunk http://git-wip-us.apache.org/repos/asf/camel/blob/04cbd86f/examples/camel-example-spring-javaconfig/pom.xml -- diff --git a/examples/camel-example-spring-javaconfig/pom.xml b/examples/camel-example-spring-javaconfig/pom.xml index a460428..70e7611 100644 --- a/examples/camel-example-spring-javaconfig/pom.xml +++ b/examples/camel-example-spring-javaconfig/pom.xml @@ -21,7 +21,7 @@ org.apache.camel examples -2.15.5-SNAPSHOT +2.15.4 camel-example-spring-javaconfig http://git-wip-us.apache.org/repos/asf/camel/blob/04cbd86f/examples/camel-example-spring-jms/pom.xml -- diff --git a/examples/camel-example-spring-jms/pom.xml b/examples/camel-example-spring-jms/pom.xml index c6b5a9e..35c5515 100644 --- a/examples/camel-example-spring-jms/pom.xml +++ b/examples/camel-example-spring-jms/pom.xml @@ -21,7 +21,7 @@ org.apache.camel examples -2.15.5-SNAPSHOT +2.15.4 camel-example-spring-jms http://git-wip-us.apache.org/repos/asf/camel/blob/04cbd86f/examples/camel-example-spring-security/pom.xml -- diff --git a/examples/camel-example-spring-security/pom.xml b/examples/camel-example-spring-security/pom.xml index f155a49..f6b5d10 100755 --- a/examples/camel-example-spring-security/pom.xml +++ b/examples/camel-example-spring-security/pom.xml @@ -21,7 +21,7 @@ org.apache.camel examples - 2.15.5-SNAPSHOT + 2.15.4 camel-example-spring-security http://git-wip-us.apache.org/repos/asf/camel/blob/04cbd86f/examples/camel-example-spring-ws/pom.xml -- diff --git a/examples/camel-example-spring-ws/pom.xml b/examples/camel-example-spring-ws/pom.xml index aaee4e7..1291a34 100644 --- a/examples/camel-example-spring-ws/pom.xml +++ b/examples/camel-example-spring-ws/pom.xml @@ -22,7 +22,7 @@ org.apache.camel examples - 2.15.5-SNAPSHOT + 2.15.4 camel-example-spring-ws http://git-wip-us.apache.org/repos/asf/camel/blob/04cbd86f/examples/camel-example-spring-xquery/pom.xml -- diff --git a/examples/camel-example-spring-xquery/pom.xml b/examples/camel-example-spring-xquery/pom.xml index a498c64..b2fde83 100755 --- a/examples/camel-example-spring-xquery/pom.xml +++ b/examples/camel-example-spring-xquery/pom.xml @@ -22,7 +22,7 @@ org.apache.camel examples -2.15.5-SNAPSHOT +2.15.4 camel-example-spring-xquery http://git-wip-us.apache.org/repos/asf/camel/blob/04cbd86f/examples/camel-example-spring/pom.xml -- diff --git a/examples/camel-example-spring/pom.xml b/examples/camel-example-spring/pom.xml index 4c81757..49b9890 100755 --- a/examples/camel-example-spring/pom.xml +++ b/examples/camel-example-spring/pom.xml @@ -21,7 +21,7 @@ org.apache.camel examples - 2.15.5-SNAPSHOT + 2.15.4 camel-example-spring http://git-wip-us.apache.org/repos/asf/camel/blob/04cbd86f/examples/camel-example-sql-blueprint/pom.xml -- diff --git a/examples/camel-example-sql-blueprint/pom.xml b/examples/camel-example-sql-blueprint/pom.xml index a4fff41..40b612b 100644 --- a/examples/camel-example-sql-blueprint/pom.xml +++ b/examples/camel-example-sql-blueprint/pom.xml @@ -22,7 +22,7 @@ org
Git Push Summary
Repository: camel Updated Tags: refs/tags/camel-2.15.4 [created] 99004324c
[3/3] camel git commit: [maven-release-plugin] prepare release camel-2.15.4
[maven-release-plugin] prepare release camel-2.15.4 Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/04cbd86f Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/04cbd86f Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/04cbd86f Branch: refs/heads/camel-2.15.x Commit: 04cbd86fa800e5a19a80a926ea042e7b56f6b66e Parents: e0b3178 Author: Gregor Zurowski Authored: Fri Oct 23 20:50:32 2015 + Committer: Gregor Zurowski Committed: Fri Oct 23 20:50:32 2015 + -- apache-camel/pom.xml | 2 +- buildingtools/pom.xml| 2 +- camel-core/pom.xml | 2 +- components/camel-ahc-ws/pom.xml | 2 +- components/camel-ahc/pom.xml | 2 +- components/camel-amqp/pom.xml| 2 +- components/camel-apns/pom.xml| 2 +- components/camel-atmos/pom.xml | 2 +- components/camel-atmosphere-websocket/pom.xml| 2 +- components/camel-atom/pom.xml| 2 +- components/camel-avro/pom.xml| 2 +- components/camel-aws/pom.xml | 2 +- components/camel-bam/pom.xml | 2 +- components/camel-barcode/pom.xml | 2 +- components/camel-base64/pom.xml | 2 +- components/camel-bean-validator/pom.xml | 2 +- components/camel-beanio/pom.xml | 2 +- components/camel-beanstalk/pom.xml | 2 +- components/camel-bindy/pom.xml | 2 +- components/camel-blueprint/pom.xml | 2 +- components/camel-box/pom.xml | 2 +- components/camel-cache/pom.xml | 2 +- components/camel-cassandraql/pom.xml | 2 +- components/camel-castor/pom.xml | 2 +- components/camel-cdi/pom.xml | 2 +- components/camel-chunk/pom.xml | 2 +- components/camel-cmis/pom.xml| 2 +- components/camel-cometd/pom.xml | 2 +- components/camel-context/pom.xml | 2 +- components/camel-core-osgi/pom.xml | 2 +- components/camel-core-xml/pom.xml| 2 +- components/camel-couchdb/pom.xml | 2 +- components/camel-crypto/pom.xml | 2 +- components/camel-csv/pom.xml | 2 +- components/camel-cxf-transport/pom.xml | 2 +- components/camel-cxf/pom.xml | 2 +- components/camel-disruptor/pom.xml | 2 +- components/camel-dns/pom.xml | 2 +- components/camel-docker/pom.xml | 2 +- components/camel-dozer/pom.xml | 2 +- components/camel-dropbox/pom.xml | 2 +- components/camel-eclipse/pom.xml | 2 +- components/camel-ejb/pom.xml | 2 +- components/camel-elasticsearch/pom.xml | 2 +- components/camel-eventadmin/pom.xml | 2 +- components/camel-exec/pom.xml| 2 +- components/camel-facebook/pom.xml| 2 +- components/camel-flatpack/pom.xml| 2 +- components/camel-fop/pom.xml | 2 +- components/camel-freemarker/pom.xml | 2 +- components/camel-ftp/pom.xml | 2 +- components/camel-gae/pom.xml | 2 +- components/camel-ganglia/pom.xml | 2 +- components/camel-geocoder/pom.xml| 2 +- components/camel-github/pom.xml | 2 +- components/camel-google-calendar/pom.xml | 2 +- components/camel-google-drive/pom.xml| 2 +- components/camel-google-mail/pom.xml | 2 +- components/camel-gora/pom.xml| 2 +- components/camel-groovy/pom.xml | 2 +-
[2/3] camel git commit: [maven-release-plugin] prepare release camel-2.15.4
http://git-wip-us.apache.org/repos/asf/camel/blob/04cbd86f/components/camel-lucene/pom.xml -- diff --git a/components/camel-lucene/pom.xml b/components/camel-lucene/pom.xml index 39cea04..28ad09d 100644 --- a/components/camel-lucene/pom.xml +++ b/components/camel-lucene/pom.xml @@ -20,7 +20,7 @@ org.apache.camel components - 2.15.5-SNAPSHOT + 2.15.4 camel-lucene http://git-wip-us.apache.org/repos/asf/camel/blob/04cbd86f/components/camel-mail/pom.xml -- diff --git a/components/camel-mail/pom.xml b/components/camel-mail/pom.xml index 63d43e8..e739eaa 100644 --- a/components/camel-mail/pom.xml +++ b/components/camel-mail/pom.xml @@ -21,7 +21,7 @@ org.apache.camel components -2.15.5-SNAPSHOT +2.15.4 camel-mail http://git-wip-us.apache.org/repos/asf/camel/blob/04cbd86f/components/camel-metrics/pom.xml -- diff --git a/components/camel-metrics/pom.xml b/components/camel-metrics/pom.xml index 3d3fada..f476303 100644 --- a/components/camel-metrics/pom.xml +++ b/components/camel-metrics/pom.xml @@ -20,7 +20,7 @@ org.apache.camel components -2.15.5-SNAPSHOT +2.15.4 camel-metrics http://git-wip-us.apache.org/repos/asf/camel/blob/04cbd86f/components/camel-mina/pom.xml -- diff --git a/components/camel-mina/pom.xml b/components/camel-mina/pom.xml index 6c9b5de..7f73125 100644 --- a/components/camel-mina/pom.xml +++ b/components/camel-mina/pom.xml @@ -21,7 +21,7 @@ org.apache.camel components -2.15.5-SNAPSHOT +2.15.4 camel-mina http://git-wip-us.apache.org/repos/asf/camel/blob/04cbd86f/components/camel-mina2/pom.xml -- diff --git a/components/camel-mina2/pom.xml b/components/camel-mina2/pom.xml index 82a2f98..ddf22d7 100644 --- a/components/camel-mina2/pom.xml +++ b/components/camel-mina2/pom.xml @@ -21,7 +21,7 @@ org.apache.camel components -2.15.5-SNAPSHOT +2.15.4 camel-mina2 http://git-wip-us.apache.org/repos/asf/camel/blob/04cbd86f/components/camel-mongodb/pom.xml -- diff --git a/components/camel-mongodb/pom.xml b/components/camel-mongodb/pom.xml index 5331762..2088960 100644 --- a/components/camel-mongodb/pom.xml +++ b/components/camel-mongodb/pom.xml @@ -23,7 +23,7 @@ org.apache.camel components -2.15.5-SNAPSHOT +2.15.4 camel-mongodb http://git-wip-us.apache.org/repos/asf/camel/blob/04cbd86f/components/camel-mqtt/pom.xml -- diff --git a/components/camel-mqtt/pom.xml b/components/camel-mqtt/pom.xml index 953cf78..d57d64e 100644 --- a/components/camel-mqtt/pom.xml +++ b/components/camel-mqtt/pom.xml @@ -21,7 +21,7 @@ org.apache.camel components -2.15.5-SNAPSHOT +2.15.4 camel-mqtt http://git-wip-us.apache.org/repos/asf/camel/blob/04cbd86f/components/camel-msv/pom.xml -- diff --git a/components/camel-msv/pom.xml b/components/camel-msv/pom.xml index 728d543..4962831 100644 --- a/components/camel-msv/pom.xml +++ b/components/camel-msv/pom.xml @@ -21,7 +21,7 @@ org.apache.camel components -2.15.5-SNAPSHOT +2.15.4 camel-msv http://git-wip-us.apache.org/repos/asf/camel/blob/04cbd86f/components/camel-mustache/pom.xml -- diff --git a/components/camel-mustache/pom.xml b/components/camel-mustache/pom.xml index d5fa195..59b254d 100644 --- a/components/camel-mustache/pom.xml +++ b/components/camel-mustache/pom.xml @@ -21,7 +21,7 @@ org.apache.camel components -2.15.5-SNAPSHOT +2.15.4 camel-mustache http://git-wip-us.apache.org/repos/asf/camel/blob/04cbd86f/components/camel-mvel/pom.xml -- diff --git a/components/camel-mvel/pom.xml b/components/camel-mvel/pom.xml index 849a88d..02a2bdc 100644 --- a/components/camel-mvel/pom.xml +++ b/components/camel-mvel/pom.xml @@ -21,7 +21,7 @@ org.apache.camel components -2.15.5-SNAPSHOT +2.15.4 camel-mvel http://git-wip-us.apache.org/repos/asf/camel/blob/04cbd86f/components/camel-mybatis/pom.xml -- diff --git a/components/camel-mybatis/pom.xml b/components/camel-mybatis/pom.xml index ebb3975..b22f8a8 10
[1/3] camel git commit: [maven-release-plugin] prepare for next development iteration
Repository: camel Updated Branches: refs/heads/camel-2.15.x 04cbd86fa -> cba909b97 http://git-wip-us.apache.org/repos/asf/camel/blob/cba909b9/examples/camel-example-spark-rest-tomcat/pom.xml -- diff --git a/examples/camel-example-spark-rest-tomcat/pom.xml b/examples/camel-example-spark-rest-tomcat/pom.xml index 4dc0da6..93e7085 100755 --- a/examples/camel-example-spark-rest-tomcat/pom.xml +++ b/examples/camel-example-spark-rest-tomcat/pom.xml @@ -22,7 +22,7 @@ org.apache.camel examples -2.15.4 +2.15.5-SNAPSHOT camel-example-spark-rest-tomcat http://git-wip-us.apache.org/repos/asf/camel/blob/cba909b9/examples/camel-example-splunk/pom.xml -- diff --git a/examples/camel-example-splunk/pom.xml b/examples/camel-example-splunk/pom.xml index 96d12c7..f3dc34c 100644 --- a/examples/camel-example-splunk/pom.xml +++ b/examples/camel-example-splunk/pom.xml @@ -22,7 +22,7 @@ org.apache.camel examples -2.15.4 +2.15.5-SNAPSHOT camel-example-splunk http://git-wip-us.apache.org/repos/asf/camel/blob/cba909b9/examples/camel-example-spring-javaconfig/pom.xml -- diff --git a/examples/camel-example-spring-javaconfig/pom.xml b/examples/camel-example-spring-javaconfig/pom.xml index 70e7611..a460428 100644 --- a/examples/camel-example-spring-javaconfig/pom.xml +++ b/examples/camel-example-spring-javaconfig/pom.xml @@ -21,7 +21,7 @@ org.apache.camel examples -2.15.4 +2.15.5-SNAPSHOT camel-example-spring-javaconfig http://git-wip-us.apache.org/repos/asf/camel/blob/cba909b9/examples/camel-example-spring-jms/pom.xml -- diff --git a/examples/camel-example-spring-jms/pom.xml b/examples/camel-example-spring-jms/pom.xml index 35c5515..c6b5a9e 100644 --- a/examples/camel-example-spring-jms/pom.xml +++ b/examples/camel-example-spring-jms/pom.xml @@ -21,7 +21,7 @@ org.apache.camel examples -2.15.4 +2.15.5-SNAPSHOT camel-example-spring-jms http://git-wip-us.apache.org/repos/asf/camel/blob/cba909b9/examples/camel-example-spring-security/pom.xml -- diff --git a/examples/camel-example-spring-security/pom.xml b/examples/camel-example-spring-security/pom.xml index f6b5d10..f155a49 100755 --- a/examples/camel-example-spring-security/pom.xml +++ b/examples/camel-example-spring-security/pom.xml @@ -21,7 +21,7 @@ org.apache.camel examples - 2.15.4 + 2.15.5-SNAPSHOT camel-example-spring-security http://git-wip-us.apache.org/repos/asf/camel/blob/cba909b9/examples/camel-example-spring-ws/pom.xml -- diff --git a/examples/camel-example-spring-ws/pom.xml b/examples/camel-example-spring-ws/pom.xml index 1291a34..aaee4e7 100644 --- a/examples/camel-example-spring-ws/pom.xml +++ b/examples/camel-example-spring-ws/pom.xml @@ -22,7 +22,7 @@ org.apache.camel examples - 2.15.4 + 2.15.5-SNAPSHOT camel-example-spring-ws http://git-wip-us.apache.org/repos/asf/camel/blob/cba909b9/examples/camel-example-spring-xquery/pom.xml -- diff --git a/examples/camel-example-spring-xquery/pom.xml b/examples/camel-example-spring-xquery/pom.xml index b2fde83..a498c64 100755 --- a/examples/camel-example-spring-xquery/pom.xml +++ b/examples/camel-example-spring-xquery/pom.xml @@ -22,7 +22,7 @@ org.apache.camel examples -2.15.4 +2.15.5-SNAPSHOT camel-example-spring-xquery http://git-wip-us.apache.org/repos/asf/camel/blob/cba909b9/examples/camel-example-spring/pom.xml -- diff --git a/examples/camel-example-spring/pom.xml b/examples/camel-example-spring/pom.xml index 49b9890..4c81757 100755 --- a/examples/camel-example-spring/pom.xml +++ b/examples/camel-example-spring/pom.xml @@ -21,7 +21,7 @@ org.apache.camel examples - 2.15.4 + 2.15.5-SNAPSHOT camel-example-spring http://git-wip-us.apache.org/repos/asf/camel/blob/cba909b9/examples/camel-example-sql-blueprint/pom.xml -- diff --git a/examples/camel-example-sql-blueprint/pom.xml b/examples/camel-example-sql-blueprint/pom.xml index 40b612b..a4fff41 100644 --- a/examples/camel-example-sql-blueprint/pom.xml +++ b/examples/camel-example-sql-blueprint/pom.xml @@ -22,7 +22,7 @@ org
[3/3] camel git commit: [maven-release-plugin] prepare for next development iteration
[maven-release-plugin] prepare for next development iteration Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/cba909b9 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/cba909b9 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/cba909b9 Branch: refs/heads/camel-2.15.x Commit: cba909b97e5872076a9e6291b99f354fc1777c50 Parents: 04cbd86 Author: Gregor Zurowski Authored: Fri Oct 23 20:50:57 2015 + Committer: Gregor Zurowski Committed: Fri Oct 23 20:50:57 2015 + -- apache-camel/pom.xml | 2 +- buildingtools/pom.xml| 2 +- camel-core/pom.xml | 2 +- components/camel-ahc-ws/pom.xml | 2 +- components/camel-ahc/pom.xml | 2 +- components/camel-amqp/pom.xml| 2 +- components/camel-apns/pom.xml| 2 +- components/camel-atmos/pom.xml | 2 +- components/camel-atmosphere-websocket/pom.xml| 2 +- components/camel-atom/pom.xml| 2 +- components/camel-avro/pom.xml| 2 +- components/camel-aws/pom.xml | 2 +- components/camel-bam/pom.xml | 2 +- components/camel-barcode/pom.xml | 2 +- components/camel-base64/pom.xml | 2 +- components/camel-bean-validator/pom.xml | 2 +- components/camel-beanio/pom.xml | 2 +- components/camel-beanstalk/pom.xml | 2 +- components/camel-bindy/pom.xml | 2 +- components/camel-blueprint/pom.xml | 2 +- components/camel-box/pom.xml | 2 +- components/camel-cache/pom.xml | 2 +- components/camel-cassandraql/pom.xml | 2 +- components/camel-castor/pom.xml | 2 +- components/camel-cdi/pom.xml | 2 +- components/camel-chunk/pom.xml | 2 +- components/camel-cmis/pom.xml| 2 +- components/camel-cometd/pom.xml | 2 +- components/camel-context/pom.xml | 2 +- components/camel-core-osgi/pom.xml | 2 +- components/camel-core-xml/pom.xml| 2 +- components/camel-couchdb/pom.xml | 2 +- components/camel-crypto/pom.xml | 2 +- components/camel-csv/pom.xml | 2 +- components/camel-cxf-transport/pom.xml | 2 +- components/camel-cxf/pom.xml | 2 +- components/camel-disruptor/pom.xml | 2 +- components/camel-dns/pom.xml | 2 +- components/camel-docker/pom.xml | 2 +- components/camel-dozer/pom.xml | 2 +- components/camel-dropbox/pom.xml | 2 +- components/camel-eclipse/pom.xml | 2 +- components/camel-ejb/pom.xml | 2 +- components/camel-elasticsearch/pom.xml | 2 +- components/camel-eventadmin/pom.xml | 2 +- components/camel-exec/pom.xml| 2 +- components/camel-facebook/pom.xml| 2 +- components/camel-flatpack/pom.xml| 2 +- components/camel-fop/pom.xml | 2 +- components/camel-freemarker/pom.xml | 2 +- components/camel-ftp/pom.xml | 2 +- components/camel-gae/pom.xml | 2 +- components/camel-ganglia/pom.xml | 2 +- components/camel-geocoder/pom.xml| 2 +- components/camel-github/pom.xml | 2 +- components/camel-google-calendar/pom.xml | 2 +- components/camel-google-drive/pom.xml| 2 +- components/camel-google-mail/pom.xml | 2 +- components/camel-gora/pom.xml| 2 +- components/camel-groovy/pom.xml
[2/3] camel git commit: [maven-release-plugin] prepare for next development iteration
http://git-wip-us.apache.org/repos/asf/camel/blob/cba909b9/components/camel-lucene/pom.xml -- diff --git a/components/camel-lucene/pom.xml b/components/camel-lucene/pom.xml index 28ad09d..39cea04 100644 --- a/components/camel-lucene/pom.xml +++ b/components/camel-lucene/pom.xml @@ -20,7 +20,7 @@ org.apache.camel components - 2.15.4 + 2.15.5-SNAPSHOT camel-lucene http://git-wip-us.apache.org/repos/asf/camel/blob/cba909b9/components/camel-mail/pom.xml -- diff --git a/components/camel-mail/pom.xml b/components/camel-mail/pom.xml index e739eaa..63d43e8 100644 --- a/components/camel-mail/pom.xml +++ b/components/camel-mail/pom.xml @@ -21,7 +21,7 @@ org.apache.camel components -2.15.4 +2.15.5-SNAPSHOT camel-mail http://git-wip-us.apache.org/repos/asf/camel/blob/cba909b9/components/camel-metrics/pom.xml -- diff --git a/components/camel-metrics/pom.xml b/components/camel-metrics/pom.xml index f476303..3d3fada 100644 --- a/components/camel-metrics/pom.xml +++ b/components/camel-metrics/pom.xml @@ -20,7 +20,7 @@ org.apache.camel components -2.15.4 +2.15.5-SNAPSHOT camel-metrics http://git-wip-us.apache.org/repos/asf/camel/blob/cba909b9/components/camel-mina/pom.xml -- diff --git a/components/camel-mina/pom.xml b/components/camel-mina/pom.xml index 7f73125..6c9b5de 100644 --- a/components/camel-mina/pom.xml +++ b/components/camel-mina/pom.xml @@ -21,7 +21,7 @@ org.apache.camel components -2.15.4 +2.15.5-SNAPSHOT camel-mina http://git-wip-us.apache.org/repos/asf/camel/blob/cba909b9/components/camel-mina2/pom.xml -- diff --git a/components/camel-mina2/pom.xml b/components/camel-mina2/pom.xml index ddf22d7..82a2f98 100644 --- a/components/camel-mina2/pom.xml +++ b/components/camel-mina2/pom.xml @@ -21,7 +21,7 @@ org.apache.camel components -2.15.4 +2.15.5-SNAPSHOT camel-mina2 http://git-wip-us.apache.org/repos/asf/camel/blob/cba909b9/components/camel-mongodb/pom.xml -- diff --git a/components/camel-mongodb/pom.xml b/components/camel-mongodb/pom.xml index 2088960..5331762 100644 --- a/components/camel-mongodb/pom.xml +++ b/components/camel-mongodb/pom.xml @@ -23,7 +23,7 @@ org.apache.camel components -2.15.4 +2.15.5-SNAPSHOT camel-mongodb http://git-wip-us.apache.org/repos/asf/camel/blob/cba909b9/components/camel-mqtt/pom.xml -- diff --git a/components/camel-mqtt/pom.xml b/components/camel-mqtt/pom.xml index d57d64e..953cf78 100644 --- a/components/camel-mqtt/pom.xml +++ b/components/camel-mqtt/pom.xml @@ -21,7 +21,7 @@ org.apache.camel components -2.15.4 +2.15.5-SNAPSHOT camel-mqtt http://git-wip-us.apache.org/repos/asf/camel/blob/cba909b9/components/camel-msv/pom.xml -- diff --git a/components/camel-msv/pom.xml b/components/camel-msv/pom.xml index 4962831..728d543 100644 --- a/components/camel-msv/pom.xml +++ b/components/camel-msv/pom.xml @@ -21,7 +21,7 @@ org.apache.camel components -2.15.4 +2.15.5-SNAPSHOT camel-msv http://git-wip-us.apache.org/repos/asf/camel/blob/cba909b9/components/camel-mustache/pom.xml -- diff --git a/components/camel-mustache/pom.xml b/components/camel-mustache/pom.xml index 59b254d..d5fa195 100644 --- a/components/camel-mustache/pom.xml +++ b/components/camel-mustache/pom.xml @@ -21,7 +21,7 @@ org.apache.camel components -2.15.4 +2.15.5-SNAPSHOT camel-mustache http://git-wip-us.apache.org/repos/asf/camel/blob/cba909b9/components/camel-mvel/pom.xml -- diff --git a/components/camel-mvel/pom.xml b/components/camel-mvel/pom.xml index 02a2bdc..849a88d 100644 --- a/components/camel-mvel/pom.xml +++ b/components/camel-mvel/pom.xml @@ -21,7 +21,7 @@ org.apache.camel components -2.15.4 +2.15.5-SNAPSHOT camel-mvel http://git-wip-us.apache.org/repos/asf/camel/blob/cba909b9/components/camel-mybatis/pom.xml -- diff --git a/components/camel-mybatis/pom.xml b/components/camel-mybatis/pom.xml index b22f8a8..ebb3975 10
camel git commit: Fix camel-quartz unit tests
Repository: camel Updated Branches: refs/heads/master 2866a6348 -> df75c1ca7 Fix camel-quartz unit tests Signed-off-by: Gregor Zurowski Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/df75c1ca Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/df75c1ca Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/df75c1ca Branch: refs/heads/master Commit: df75c1ca745ef1c8fa39329b8be0e22f40b982e1 Parents: 2866a63 Author: Gregor Zurowski Authored: Sat Oct 24 12:00:23 2015 +0200 Committer: Gregor Zurowski Committed: Sat Oct 24 12:00:56 2015 +0200 -- .../camel/routepolicy/quartz/CronScheduledRoutePolicyTest.java | 6 +++--- .../routepolicy/quartz/SimpleScheduledRoutePolicyTest.java | 2 +- .../routepolicy/quartz/SpringScheduledRoutePolicyTest.java | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) -- http://git-wip-us.apache.org/repos/asf/camel/blob/df75c1ca/components/camel-quartz/src/test/java/org/apache/camel/routepolicy/quartz/CronScheduledRoutePolicyTest.java -- diff --git a/components/camel-quartz/src/test/java/org/apache/camel/routepolicy/quartz/CronScheduledRoutePolicyTest.java b/components/camel-quartz/src/test/java/org/apache/camel/routepolicy/quartz/CronScheduledRoutePolicyTest.java index d34a9b2..7f76119 100644 --- a/components/camel-quartz/src/test/java/org/apache/camel/routepolicy/quartz/CronScheduledRoutePolicyTest.java +++ b/components/camel-quartz/src/test/java/org/apache/camel/routepolicy/quartz/CronScheduledRoutePolicyTest.java @@ -64,8 +64,8 @@ public class CronScheduledRoutePolicyTest extends CamelTestSupport { } }); context.start(); -context.stopRoute("test1", 0, TimeUnit.MILLISECONDS); -context.stopRoute("test2", 0, TimeUnit.MILLISECONDS); +context.stopRoute("test1", 1000, TimeUnit.MILLISECONDS); +context.stopRoute("test2", 1000, TimeUnit.MILLISECONDS); Thread.sleep(5000); assertTrue(context.getRouteStatus("test1") == ServiceStatus.Started); @@ -125,7 +125,7 @@ public class CronScheduledRoutePolicyTest extends CamelTestSupport { } }); context.start(); -context.stopRoute("test", 0, TimeUnit.MILLISECONDS); +context.stopRoute("test", 1000, TimeUnit.MILLISECONDS); Thread.sleep(5000); assertTrue(context.getRouteStatus("test") == ServiceStatus.Started); http://git-wip-us.apache.org/repos/asf/camel/blob/df75c1ca/components/camel-quartz/src/test/java/org/apache/camel/routepolicy/quartz/SimpleScheduledRoutePolicyTest.java -- diff --git a/components/camel-quartz/src/test/java/org/apache/camel/routepolicy/quartz/SimpleScheduledRoutePolicyTest.java b/components/camel-quartz/src/test/java/org/apache/camel/routepolicy/quartz/SimpleScheduledRoutePolicyTest.java index 92199be..e87d04f 100644 --- a/components/camel-quartz/src/test/java/org/apache/camel/routepolicy/quartz/SimpleScheduledRoutePolicyTest.java +++ b/components/camel-quartz/src/test/java/org/apache/camel/routepolicy/quartz/SimpleScheduledRoutePolicyTest.java @@ -62,7 +62,7 @@ public class SimpleScheduledRoutePolicyTest extends CamelTestSupport { } }); context.start(); -context.stopRoute("test", 0, TimeUnit.MILLISECONDS); +context.stopRoute("test", 1000, TimeUnit.MILLISECONDS); Thread.sleep(5000); assertTrue(context.getRouteStatus("test") == ServiceStatus.Started); http://git-wip-us.apache.org/repos/asf/camel/blob/df75c1ca/components/camel-quartz/src/test/java/org/apache/camel/routepolicy/quartz/SpringScheduledRoutePolicyTest.java -- diff --git a/components/camel-quartz/src/test/java/org/apache/camel/routepolicy/quartz/SpringScheduledRoutePolicyTest.java b/components/camel-quartz/src/test/java/org/apache/camel/routepolicy/quartz/SpringScheduledRoutePolicyTest.java index 2e87b90..39745ca 100644 --- a/components/camel-quartz/src/test/java/org/apache/camel/routepolicy/quartz/SpringScheduledRoutePolicyTest.java +++ b/components/camel-quartz/src/test/java/org/apache/camel/routepolicy/quartz/SpringScheduledRoutePolicyTest.java @@ -47,7 +47,7 @@ public abstract class SpringScheduledRoutePolicyTest extends TestSupport { MockEndpoint mock = context.getEndpoint("mock:success", MockEndpoint.class); mock.expectedMinimumMessageCount(1); -context.stopRoute("testRoute", 0, TimeUnit.MILLISECONDS); +context.stopRoute("testRoute", 1000, TimeUnit.MILLISECONDS); Thread.sleep(4000); assertTrue(context.getRouteStat
[1/2] camel git commit: Fixed Quartz2 component tests
Repository: camel Updated Branches: refs/heads/camel-2.15.x cba909b97 -> 4cbc8cd26 Fixed Quartz2 component tests Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/2c38524e Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/2c38524e Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/2c38524e Branch: refs/heads/camel-2.15.x Commit: 2c38524e9d79b85d96ba7f39b5e6a0c856dbd16d Parents: cba909b Author: Andrea Cosentino Authored: Tue Oct 20 17:16:22 2015 +0200 Committer: Gregor Zurowski Committed: Sat Oct 24 12:03:40 2015 +0200 -- .../routepolicy/quartz2/CronScheduledRoutePolicyTest.java | 6 +++--- .../routepolicy/quartz2/SimpleScheduledRoutePolicyTest.java| 2 +- .../routepolicy/quartz2/SpringScheduledRoutePolicyTest.java| 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) -- http://git-wip-us.apache.org/repos/asf/camel/blob/2c38524e/components/camel-quartz2/src/test/java/org/apache/camel/routepolicy/quartz2/CronScheduledRoutePolicyTest.java -- diff --git a/components/camel-quartz2/src/test/java/org/apache/camel/routepolicy/quartz2/CronScheduledRoutePolicyTest.java b/components/camel-quartz2/src/test/java/org/apache/camel/routepolicy/quartz2/CronScheduledRoutePolicyTest.java index 6b6ace4..f8d9b2e 100644 --- a/components/camel-quartz2/src/test/java/org/apache/camel/routepolicy/quartz2/CronScheduledRoutePolicyTest.java +++ b/components/camel-quartz2/src/test/java/org/apache/camel/routepolicy/quartz2/CronScheduledRoutePolicyTest.java @@ -64,8 +64,8 @@ public class CronScheduledRoutePolicyTest extends CamelTestSupport { } }); context.start(); -context.stopRoute("test1", 0, TimeUnit.MILLISECONDS); -context.stopRoute("test2", 0, TimeUnit.MILLISECONDS); +context.stopRoute("test1", 1000, TimeUnit.MILLISECONDS); +context.stopRoute("test2", 1000, TimeUnit.MILLISECONDS); Thread.sleep(5000); assertTrue(context.getRouteStatus("test1") == ServiceStatus.Started); @@ -125,7 +125,7 @@ public class CronScheduledRoutePolicyTest extends CamelTestSupport { } }); context.start(); -context.stopRoute("test", 0, TimeUnit.MILLISECONDS); +context.stopRoute("test", 1000, TimeUnit.MILLISECONDS); Thread.sleep(5000); assertTrue(context.getRouteStatus("test") == ServiceStatus.Started); http://git-wip-us.apache.org/repos/asf/camel/blob/2c38524e/components/camel-quartz2/src/test/java/org/apache/camel/routepolicy/quartz2/SimpleScheduledRoutePolicyTest.java -- diff --git a/components/camel-quartz2/src/test/java/org/apache/camel/routepolicy/quartz2/SimpleScheduledRoutePolicyTest.java b/components/camel-quartz2/src/test/java/org/apache/camel/routepolicy/quartz2/SimpleScheduledRoutePolicyTest.java index b2b669e..c2dcbd6 100644 --- a/components/camel-quartz2/src/test/java/org/apache/camel/routepolicy/quartz2/SimpleScheduledRoutePolicyTest.java +++ b/components/camel-quartz2/src/test/java/org/apache/camel/routepolicy/quartz2/SimpleScheduledRoutePolicyTest.java @@ -59,7 +59,7 @@ public class SimpleScheduledRoutePolicyTest extends CamelTestSupport { } }); context.start(); -context.stopRoute("test", 0, TimeUnit.MILLISECONDS); +context.stopRoute("test", 1000, TimeUnit.MILLISECONDS); Thread.sleep(5000); assertTrue(context.getRouteStatus("test") == ServiceStatus.Started); http://git-wip-us.apache.org/repos/asf/camel/blob/2c38524e/components/camel-quartz2/src/test/java/org/apache/camel/routepolicy/quartz2/SpringScheduledRoutePolicyTest.java -- diff --git a/components/camel-quartz2/src/test/java/org/apache/camel/routepolicy/quartz2/SpringScheduledRoutePolicyTest.java b/components/camel-quartz2/src/test/java/org/apache/camel/routepolicy/quartz2/SpringScheduledRoutePolicyTest.java index 2926418..40666e8 100644 --- a/components/camel-quartz2/src/test/java/org/apache/camel/routepolicy/quartz2/SpringScheduledRoutePolicyTest.java +++ b/components/camel-quartz2/src/test/java/org/apache/camel/routepolicy/quartz2/SpringScheduledRoutePolicyTest.java @@ -45,7 +45,7 @@ public abstract class SpringScheduledRoutePolicyTest extends TestSupport { MockEndpoint mock = context.getEndpoint("mock:success", MockEndpoint.class); mock.expectedMinimumMessageCount(1); -context.stopRoute("testRoute", 0, TimeUnit.MILLISECONDS); +context.stopRoute("testRoute", 1000, TimeUnit.MILLISECONDS); Thread.sleep(4000); assertTrue(context
[2/2] camel git commit: Fix camel-quartz unit tests
Fix camel-quartz unit tests Signed-off-by: Gregor Zurowski Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/4cbc8cd2 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/4cbc8cd2 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/4cbc8cd2 Branch: refs/heads/camel-2.15.x Commit: 4cbc8cd26b24df2cbbb881f2217aaff5250514b2 Parents: 2c38524 Author: Gregor Zurowski Authored: Sat Oct 24 12:00:23 2015 +0200 Committer: Gregor Zurowski Committed: Sat Oct 24 12:04:44 2015 +0200 -- .../camel/routepolicy/quartz/CronScheduledRoutePolicyTest.java | 6 +++--- .../routepolicy/quartz/SimpleScheduledRoutePolicyTest.java | 2 +- .../routepolicy/quartz/SpringScheduledRoutePolicyTest.java | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) -- http://git-wip-us.apache.org/repos/asf/camel/blob/4cbc8cd2/components/camel-quartz/src/test/java/org/apache/camel/routepolicy/quartz/CronScheduledRoutePolicyTest.java -- diff --git a/components/camel-quartz/src/test/java/org/apache/camel/routepolicy/quartz/CronScheduledRoutePolicyTest.java b/components/camel-quartz/src/test/java/org/apache/camel/routepolicy/quartz/CronScheduledRoutePolicyTest.java index d34a9b2..7f76119 100644 --- a/components/camel-quartz/src/test/java/org/apache/camel/routepolicy/quartz/CronScheduledRoutePolicyTest.java +++ b/components/camel-quartz/src/test/java/org/apache/camel/routepolicy/quartz/CronScheduledRoutePolicyTest.java @@ -64,8 +64,8 @@ public class CronScheduledRoutePolicyTest extends CamelTestSupport { } }); context.start(); -context.stopRoute("test1", 0, TimeUnit.MILLISECONDS); -context.stopRoute("test2", 0, TimeUnit.MILLISECONDS); +context.stopRoute("test1", 1000, TimeUnit.MILLISECONDS); +context.stopRoute("test2", 1000, TimeUnit.MILLISECONDS); Thread.sleep(5000); assertTrue(context.getRouteStatus("test1") == ServiceStatus.Started); @@ -125,7 +125,7 @@ public class CronScheduledRoutePolicyTest extends CamelTestSupport { } }); context.start(); -context.stopRoute("test", 0, TimeUnit.MILLISECONDS); +context.stopRoute("test", 1000, TimeUnit.MILLISECONDS); Thread.sleep(5000); assertTrue(context.getRouteStatus("test") == ServiceStatus.Started); http://git-wip-us.apache.org/repos/asf/camel/blob/4cbc8cd2/components/camel-quartz/src/test/java/org/apache/camel/routepolicy/quartz/SimpleScheduledRoutePolicyTest.java -- diff --git a/components/camel-quartz/src/test/java/org/apache/camel/routepolicy/quartz/SimpleScheduledRoutePolicyTest.java b/components/camel-quartz/src/test/java/org/apache/camel/routepolicy/quartz/SimpleScheduledRoutePolicyTest.java index 92199be..e87d04f 100644 --- a/components/camel-quartz/src/test/java/org/apache/camel/routepolicy/quartz/SimpleScheduledRoutePolicyTest.java +++ b/components/camel-quartz/src/test/java/org/apache/camel/routepolicy/quartz/SimpleScheduledRoutePolicyTest.java @@ -62,7 +62,7 @@ public class SimpleScheduledRoutePolicyTest extends CamelTestSupport { } }); context.start(); -context.stopRoute("test", 0, TimeUnit.MILLISECONDS); +context.stopRoute("test", 1000, TimeUnit.MILLISECONDS); Thread.sleep(5000); assertTrue(context.getRouteStatus("test") == ServiceStatus.Started); http://git-wip-us.apache.org/repos/asf/camel/blob/4cbc8cd2/components/camel-quartz/src/test/java/org/apache/camel/routepolicy/quartz/SpringScheduledRoutePolicyTest.java -- diff --git a/components/camel-quartz/src/test/java/org/apache/camel/routepolicy/quartz/SpringScheduledRoutePolicyTest.java b/components/camel-quartz/src/test/java/org/apache/camel/routepolicy/quartz/SpringScheduledRoutePolicyTest.java index 2e87b90..39745ca 100644 --- a/components/camel-quartz/src/test/java/org/apache/camel/routepolicy/quartz/SpringScheduledRoutePolicyTest.java +++ b/components/camel-quartz/src/test/java/org/apache/camel/routepolicy/quartz/SpringScheduledRoutePolicyTest.java @@ -47,7 +47,7 @@ public abstract class SpringScheduledRoutePolicyTest extends TestSupport { MockEndpoint mock = context.getEndpoint("mock:success", MockEndpoint.class); mock.expectedMinimumMessageCount(1); -context.stopRoute("testRoute", 0, TimeUnit.MILLISECONDS); +context.stopRoute("testRoute", 1000, TimeUnit.MILLISECONDS); Thread.sleep(4000); assertTrue(context.getRouteStatus("testRoute") == ServiceStatus.Started);
svn commit: r970748 - /websites/production/camel/content/cache/main.pageCache
Author: gzurowski Date: Fri Oct 30 09:06:17 2015 New Revision: 970748 Log: (empty) Removed: websites/production/camel/content/cache/main.pageCache
camel git commit: Update Spring schemas for Camel release 2.15.4
Repository: camel Updated Branches: refs/heads/master 6dae060ee -> 992bc4bc3 Update Spring schemas for Camel release 2.15.4 Signed-off-by: Gregor Zurowski Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/992bc4bc Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/992bc4bc Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/992bc4bc Branch: refs/heads/master Commit: 992bc4bc332003a1cee4874f0037cfe45dcc32dd Parents: 6dae060 Author: Gregor Zurowski Authored: Fri Oct 30 11:58:31 2015 +0100 Committer: Gregor Zurowski Committed: Fri Oct 30 11:58:31 2015 +0100 -- .../src/main/resources/META-INF/spring.schemas | 1 + .../src/main/resources/META-INF/spring.schemas | 165 ++- .../src/main/resources/META-INF/spring.schemas | 153 - .../src/main/resources/META-INF/spring.schemas | 1 + 4 files changed, 162 insertions(+), 158 deletions(-) -- http://git-wip-us.apache.org/repos/asf/camel/blob/992bc4bc/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 45037cb..3603111 100644 --- a/components/camel-cxf/src/main/resources/META-INF/spring.schemas +++ b/components/camel-cxf/src/main/resources/META-INF/spring.schemas @@ -83,4 +83,5 @@ http\://camel.apache.org/schema/cxf/camel-cxf-2.15.0.xsd=schema/cxfEndpoint.xsd http\://camel.apache.org/schema/cxf/camel-cxf-2.15.1.xsd=schema/cxfEndpoint.xsd http\://camel.apache.org/schema/cxf/camel-cxf-2.15.2.xsd=schema/cxfEndpoint.xsd http\://camel.apache.org/schema/cxf/camel-cxf-2.15.3.xsd=schema/cxfEndpoint.xsd +http\://camel.apache.org/schema/cxf/camel-cxf-2.15.4.xsd=schema/cxfEndpoint.xsd http\://camel.apache.org/schema/cxf/camel-cxf-${project.version}.xsd=schema/cxfEndpoint.xsd http://git-wip-us.apache.org/repos/asf/camel/blob/992bc4bc/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 f6db230..df45504 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 @@ -1,83 +1,84 @@ -# -# 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. -# - -http\://camel.apache.org/schema/spring/integration/camel-spring-integration.xsd=schema/camel-spring-integration.xsd - -http\://camel.apache.org/schema/spring/integration/camel-spring-integration-2.0-M1.xsd=schema/camel-spring-integration.xsd -http\://camel.apache.org/schema/spring/integration/camel-spring-integration-2.0-M2.xsd=schema/camel-spring-integration.xsd -http\://camel.apache.org/schema/spring/integration/camel-spring-integration-2.0-M3.xsd=schema/camel-spring-integration.xsd -http\://camel.apache.org/schema/spring/integration/camel-spring-integration-2.0.0.xsd=schema/camel-spring-integration.xsd -http\://camel.apache.org/schema/spring/integration/camel-spring-integration-2.1.0.xsd=schema/camel-spring-integration.xsd -http\://camel.apache.org/schema/spring/integration/camel-spring-integration-2.2.0.xsd=schema/camel-spring-integration.xsd -http\://camel.apache.org/schema/spring/integration/camel-spring-integration-2.3.0.xsd=schema/camel-spring-integration.xsd -http\://camel.apache.org/schema/spring/integration/camel-spring-integration-2.4.0.xsd=schema/camel-spring-integration.xsd -http\://camel.apache.org/schema/spring/integration/camel-spring-integration-2.5.0.xsd=schema/camel-spring-integration.xsd -http\://camel.apache.org/schema/spring/integration/camel-spring-integration-2.6.0.xsd=schema/camel-spring-integration.xsd -http\://camel.apache.org/schema/spring/integration/camel-spring-integration-2.7.0.xsd=schema/camel-spring-
[2/2] camel git commit: Update Spring schemas for Camel release 2.15.4
Update Spring schemas for Camel release 2.15.4 Signed-off-by: Gregor Zurowski Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/e330b65f Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/e330b65f Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/e330b65f Branch: refs/heads/camel-2.15.x Commit: e330b65f420ee224101ee7a0b3aff7fae3ff7c37 Parents: a9a1644 Author: Gregor Zurowski Authored: Fri Oct 30 11:58:31 2015 +0100 Committer: Gregor Zurowski Committed: Fri Oct 30 12:03:42 2015 +0100 -- .../src/main/resources/META-INF/spring.schemas | 1 + .../src/main/resources/META-INF/spring.schemas | 165 ++- .../src/main/resources/META-INF/spring.schemas | 153 - .../src/main/resources/META-INF/spring.schemas | 1 + 4 files changed, 162 insertions(+), 158 deletions(-) -- http://git-wip-us.apache.org/repos/asf/camel/blob/e330b65f/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 45037cb..3603111 100644 --- a/components/camel-cxf/src/main/resources/META-INF/spring.schemas +++ b/components/camel-cxf/src/main/resources/META-INF/spring.schemas @@ -83,4 +83,5 @@ http\://camel.apache.org/schema/cxf/camel-cxf-2.15.0.xsd=schema/cxfEndpoint.xsd http\://camel.apache.org/schema/cxf/camel-cxf-2.15.1.xsd=schema/cxfEndpoint.xsd http\://camel.apache.org/schema/cxf/camel-cxf-2.15.2.xsd=schema/cxfEndpoint.xsd http\://camel.apache.org/schema/cxf/camel-cxf-2.15.3.xsd=schema/cxfEndpoint.xsd +http\://camel.apache.org/schema/cxf/camel-cxf-2.15.4.xsd=schema/cxfEndpoint.xsd http\://camel.apache.org/schema/cxf/camel-cxf-${project.version}.xsd=schema/cxfEndpoint.xsd http://git-wip-us.apache.org/repos/asf/camel/blob/e330b65f/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 f6db230..df45504 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 @@ -1,83 +1,84 @@ -# -# 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. -# - -http\://camel.apache.org/schema/spring/integration/camel-spring-integration.xsd=schema/camel-spring-integration.xsd - -http\://camel.apache.org/schema/spring/integration/camel-spring-integration-2.0-M1.xsd=schema/camel-spring-integration.xsd -http\://camel.apache.org/schema/spring/integration/camel-spring-integration-2.0-M2.xsd=schema/camel-spring-integration.xsd -http\://camel.apache.org/schema/spring/integration/camel-spring-integration-2.0-M3.xsd=schema/camel-spring-integration.xsd -http\://camel.apache.org/schema/spring/integration/camel-spring-integration-2.0.0.xsd=schema/camel-spring-integration.xsd -http\://camel.apache.org/schema/spring/integration/camel-spring-integration-2.1.0.xsd=schema/camel-spring-integration.xsd -http\://camel.apache.org/schema/spring/integration/camel-spring-integration-2.2.0.xsd=schema/camel-spring-integration.xsd -http\://camel.apache.org/schema/spring/integration/camel-spring-integration-2.3.0.xsd=schema/camel-spring-integration.xsd -http\://camel.apache.org/schema/spring/integration/camel-spring-integration-2.4.0.xsd=schema/camel-spring-integration.xsd -http\://camel.apache.org/schema/spring/integration/camel-spring-integration-2.5.0.xsd=schema/camel-spring-integration.xsd -http\://camel.apache.org/schema/spring/integration/camel-spring-integration-2.6.0.xsd=schema/camel-spring-integration.xsd -http\://camel.apache.org/schema/spring/integration/camel-spring-integration-2.7.0.xsd=schema/camel-spring-integration.xsd -http\://camel.apache.org/schema/spring/integration/camel-s
[1/2] camel git commit: Update spring.schemas
Repository: camel Updated Branches: refs/heads/camel-2.15.x 9cb4de7fb -> e330b65f4 Update spring.schemas Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/a9a16447 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/a9a16447 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/a9a16447 Branch: refs/heads/camel-2.15.x Commit: a9a1644709f15764c2b7c5a67ca2457e1e0a1b73 Parents: 9cb4de7 Author: Daniel Kulp Authored: Fri Aug 21 12:12:14 2015 -0400 Committer: Gregor Zurowski Committed: Fri Oct 30 12:02:58 2015 +0100 -- 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 | 1 + 4 files changed, 4 insertions(+) -- http://git-wip-us.apache.org/repos/asf/camel/blob/a9a16447/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 34df52c..45037cb 100644 --- a/components/camel-cxf/src/main/resources/META-INF/spring.schemas +++ b/components/camel-cxf/src/main/resources/META-INF/spring.schemas @@ -82,4 +82,5 @@ http\://camel.apache.org/schema/cxf/camel-cxf-2.14.2.xsd=schema/cxfEndpoint.xsd http\://camel.apache.org/schema/cxf/camel-cxf-2.15.0.xsd=schema/cxfEndpoint.xsd http\://camel.apache.org/schema/cxf/camel-cxf-2.15.1.xsd=schema/cxfEndpoint.xsd http\://camel.apache.org/schema/cxf/camel-cxf-2.15.2.xsd=schema/cxfEndpoint.xsd +http\://camel.apache.org/schema/cxf/camel-cxf-2.15.3.xsd=schema/cxfEndpoint.xsd http\://camel.apache.org/schema/cxf/camel-cxf-${project.version}.xsd=schema/cxfEndpoint.xsd http://git-wip-us.apache.org/repos/asf/camel/blob/a9a16447/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 9145044..f6db230 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 @@ -79,4 +79,5 @@ http\://camel.apache.org/schema/spring/integration/camel-spring-integration-2.14 http\://camel.apache.org/schema/spring/integration/camel-spring-integration-2.15.0.xsd=schema/camel-spring-integration.xsd http\://camel.apache.org/schema/spring/integration/camel-spring-integration-2.15.1.xsd=schema/camel-spring-integration.xsd http\://camel.apache.org/schema/spring/integration/camel-spring-integration-2.15.2.xsd=schema/camel-spring-integration.xsd +http\://camel.apache.org/schema/spring/integration/camel-spring-integration-2.15.3.xsd=schema/camel-spring-integration.xsd http\://camel.apache.org/schema/spring/integration/camel-spring-integration-${project.version}.xsd=schema/camel-spring-integration.xsd \ No newline at end of file http://git-wip-us.apache.org/repos/asf/camel/blob/a9a16447/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 c194398..9e32e77 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 @@ -73,4 +73,5 @@ http\://camel.apache.org/schema/spring-security/camel-spring-security-2.14.2.xsd http\://camel.apache.org/schema/spring-security/camel-spring-security-2.15.0.xsd=schema/camel-spring-security.xsd http\://camel.apache.org/schema/spring-security/camel-spring-security-2.15.1.xsd=schema/camel-spring-security.xsd http\://camel.apache.org/schema/spring-security/camel-spring-security-2.15.2.xsd=schema/camel-spring-security.xsd +http\://camel.apache.org/schema/spring-security/camel-spring-security-2.15.3.xsd=schema/camel-spring-security.xsd http\://camel.apache.org/schema/spring-security/camel-spring-security-${project.version}.xsd=schema/camel-spring-security.xsd \ No newline at end of file http://git-wip-us.apache.org/repos/asf/camel/blob/a9a16447/components/camel-spring/src/main/resources/META-INF/spring.schemas -- diff --git a/components/camel-spring/src/main/resource
camel git commit: Update Spring schemas with version 2.16.0
Repository: camel Updated Branches: refs/heads/master 992bc4bc3 -> e940ab6f3 Update Spring schemas with version 2.16.0 Signed-off-by: Gregor Zurowski Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/e940ab6f Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/e940ab6f Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/e940ab6f Branch: refs/heads/master Commit: e940ab6f3a3395ba217e3dd00b62e8325d766594 Parents: 992bc4b Author: Gregor Zurowski Authored: Fri Oct 30 12:12:32 2015 +0100 Committer: Gregor Zurowski Committed: Fri Oct 30 12:14:59 2015 +0100 -- 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 | 1 + 4 files changed, 4 insertions(+) -- http://git-wip-us.apache.org/repos/asf/camel/blob/e940ab6f/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 3603111..f37f8ab 100644 --- a/components/camel-cxf/src/main/resources/META-INF/spring.schemas +++ b/components/camel-cxf/src/main/resources/META-INF/spring.schemas @@ -84,4 +84,5 @@ http\://camel.apache.org/schema/cxf/camel-cxf-2.15.1.xsd=schema/cxfEndpoint.xsd http\://camel.apache.org/schema/cxf/camel-cxf-2.15.2.xsd=schema/cxfEndpoint.xsd http\://camel.apache.org/schema/cxf/camel-cxf-2.15.3.xsd=schema/cxfEndpoint.xsd http\://camel.apache.org/schema/cxf/camel-cxf-2.15.4.xsd=schema/cxfEndpoint.xsd +http\://camel.apache.org/schema/cxf/camel-cxf-2.16.0.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/e940ab6f/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 df45504..805646e 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 @@ -81,4 +81,5 @@ http\://camel.apache.org/schema/spring/integration/camel-spring-integration-2.15 http\://camel.apache.org/schema/spring/integration/camel-spring-integration-2.15.2.xsd=schema/camel-spring-integration.xsd http\://camel.apache.org/schema/spring/integration/camel-spring-integration-2.15.3.xsd=schema/camel-spring-integration.xsd http\://camel.apache.org/schema/spring/integration/camel-spring-integration-2.15.4.xsd=schema/camel-spring-integration.xsd +http\://camel.apache.org/schema/spring/integration/camel-spring-integration-2.16.0.xsd=schema/camel-spring-integration.xsd http\://camel.apache.org/schema/spring/integration/camel-spring-integration-${project.version}.xsd=schema/camel-spring-integration.xsd \ No newline at end of file http://git-wip-us.apache.org/repos/asf/camel/blob/e940ab6f/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 1a51dcd..6ff 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 @@ -75,4 +75,5 @@ http\://camel.apache.org/schema/spring-security/camel-spring-security-2.15.1.xsd http\://camel.apache.org/schema/spring-security/camel-spring-security-2.15.2.xsd=schema/camel-spring-security.xsd http\://camel.apache.org/schema/spring-security/camel-spring-security-2.15.3.xsd=schema/camel-spring-security.xsd http\://camel.apache.org/schema/spring-security/camel-spring-security-2.15.4.xsd=schema/camel-spring-security.xsd +http\://camel.apache.org/schema/spring-security/camel-spring-security-2.16.0.xsd=schema/camel-spring-security.xsd http\://camel.apache.org/schema/spring-security/camel-spring-security-${project.version}.xsd=schema/camel-spring-security.xsd \ No newline at end of file http://git-wip-us.apache.org/repos/asf/camel/blob/e940ab6f/components/camel-spring/src/main/resources/META-INF/spring.schemas -- diff --gi
[1/2] camel git commit: Update Spring schemas for Camel release 2.15.4
Repository: camel Updated Branches: refs/heads/camel-2.16.x 9e9ff70d3 -> d86513bcb Update Spring schemas for Camel release 2.15.4 Signed-off-by: Gregor Zurowski Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/1f7c1a9e Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/1f7c1a9e Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/1f7c1a9e Branch: refs/heads/camel-2.16.x Commit: 1f7c1a9eafc9f476009a278d79fdf2e35dcffb28 Parents: 9e9ff70 Author: Gregor Zurowski Authored: Fri Oct 30 11:58:31 2015 +0100 Committer: Gregor Zurowski Committed: Fri Oct 30 12:42:41 2015 +0100 -- .../src/main/resources/META-INF/spring.schemas | 1 + .../src/main/resources/META-INF/spring.schemas | 165 ++- .../src/main/resources/META-INF/spring.schemas | 153 - .../src/main/resources/META-INF/spring.schemas | 1 + 4 files changed, 162 insertions(+), 158 deletions(-) -- http://git-wip-us.apache.org/repos/asf/camel/blob/1f7c1a9e/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 45037cb..3603111 100644 --- a/components/camel-cxf/src/main/resources/META-INF/spring.schemas +++ b/components/camel-cxf/src/main/resources/META-INF/spring.schemas @@ -83,4 +83,5 @@ http\://camel.apache.org/schema/cxf/camel-cxf-2.15.0.xsd=schema/cxfEndpoint.xsd http\://camel.apache.org/schema/cxf/camel-cxf-2.15.1.xsd=schema/cxfEndpoint.xsd http\://camel.apache.org/schema/cxf/camel-cxf-2.15.2.xsd=schema/cxfEndpoint.xsd http\://camel.apache.org/schema/cxf/camel-cxf-2.15.3.xsd=schema/cxfEndpoint.xsd +http\://camel.apache.org/schema/cxf/camel-cxf-2.15.4.xsd=schema/cxfEndpoint.xsd http\://camel.apache.org/schema/cxf/camel-cxf-${project.version}.xsd=schema/cxfEndpoint.xsd http://git-wip-us.apache.org/repos/asf/camel/blob/1f7c1a9e/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 f6db230..df45504 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 @@ -1,83 +1,84 @@ -# -# 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. -# - -http\://camel.apache.org/schema/spring/integration/camel-spring-integration.xsd=schema/camel-spring-integration.xsd - -http\://camel.apache.org/schema/spring/integration/camel-spring-integration-2.0-M1.xsd=schema/camel-spring-integration.xsd -http\://camel.apache.org/schema/spring/integration/camel-spring-integration-2.0-M2.xsd=schema/camel-spring-integration.xsd -http\://camel.apache.org/schema/spring/integration/camel-spring-integration-2.0-M3.xsd=schema/camel-spring-integration.xsd -http\://camel.apache.org/schema/spring/integration/camel-spring-integration-2.0.0.xsd=schema/camel-spring-integration.xsd -http\://camel.apache.org/schema/spring/integration/camel-spring-integration-2.1.0.xsd=schema/camel-spring-integration.xsd -http\://camel.apache.org/schema/spring/integration/camel-spring-integration-2.2.0.xsd=schema/camel-spring-integration.xsd -http\://camel.apache.org/schema/spring/integration/camel-spring-integration-2.3.0.xsd=schema/camel-spring-integration.xsd -http\://camel.apache.org/schema/spring/integration/camel-spring-integration-2.4.0.xsd=schema/camel-spring-integration.xsd -http\://camel.apache.org/schema/spring/integration/camel-spring-integration-2.5.0.xsd=schema/camel-spring-integration.xsd -http\://camel.apache.org/schema/spring/integration/camel-spring-integration-2.6.0.xsd=schema/camel-spring-integration.xsd -http\://camel.apache.org/schema/spring/integration/camel-spring-integration-2.7.0.xsd=schema/c
[2/2] camel git commit: Update Spring schemas with version 2.16.0
Update Spring schemas with version 2.16.0 Signed-off-by: Gregor Zurowski Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/d86513bc Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/d86513bc Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/d86513bc Branch: refs/heads/camel-2.16.x Commit: d86513bcbc1164909dc23488b49dec1b5b173e28 Parents: 1f7c1a9 Author: Gregor Zurowski Authored: Fri Oct 30 12:12:32 2015 +0100 Committer: Gregor Zurowski Committed: Fri Oct 30 12:43:22 2015 +0100 -- 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 | 1 + 4 files changed, 4 insertions(+) -- http://git-wip-us.apache.org/repos/asf/camel/blob/d86513bc/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 3603111..f37f8ab 100644 --- a/components/camel-cxf/src/main/resources/META-INF/spring.schemas +++ b/components/camel-cxf/src/main/resources/META-INF/spring.schemas @@ -84,4 +84,5 @@ http\://camel.apache.org/schema/cxf/camel-cxf-2.15.1.xsd=schema/cxfEndpoint.xsd http\://camel.apache.org/schema/cxf/camel-cxf-2.15.2.xsd=schema/cxfEndpoint.xsd http\://camel.apache.org/schema/cxf/camel-cxf-2.15.3.xsd=schema/cxfEndpoint.xsd http\://camel.apache.org/schema/cxf/camel-cxf-2.15.4.xsd=schema/cxfEndpoint.xsd +http\://camel.apache.org/schema/cxf/camel-cxf-2.16.0.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/d86513bc/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 df45504..805646e 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 @@ -81,4 +81,5 @@ http\://camel.apache.org/schema/spring/integration/camel-spring-integration-2.15 http\://camel.apache.org/schema/spring/integration/camel-spring-integration-2.15.2.xsd=schema/camel-spring-integration.xsd http\://camel.apache.org/schema/spring/integration/camel-spring-integration-2.15.3.xsd=schema/camel-spring-integration.xsd http\://camel.apache.org/schema/spring/integration/camel-spring-integration-2.15.4.xsd=schema/camel-spring-integration.xsd +http\://camel.apache.org/schema/spring/integration/camel-spring-integration-2.16.0.xsd=schema/camel-spring-integration.xsd http\://camel.apache.org/schema/spring/integration/camel-spring-integration-${project.version}.xsd=schema/camel-spring-integration.xsd \ No newline at end of file http://git-wip-us.apache.org/repos/asf/camel/blob/d86513bc/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 1a51dcd..6ff 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 @@ -75,4 +75,5 @@ http\://camel.apache.org/schema/spring-security/camel-spring-security-2.15.1.xsd http\://camel.apache.org/schema/spring-security/camel-spring-security-2.15.2.xsd=schema/camel-spring-security.xsd http\://camel.apache.org/schema/spring-security/camel-spring-security-2.15.3.xsd=schema/camel-spring-security.xsd http\://camel.apache.org/schema/spring-security/camel-spring-security-2.15.4.xsd=schema/camel-spring-security.xsd +http\://camel.apache.org/schema/spring-security/camel-spring-security-2.16.0.xsd=schema/camel-spring-security.xsd http\://camel.apache.org/schema/spring-security/camel-spring-security-${project.version}.xsd=schema/camel-spring-security.xsd \ No newline at end of file http://git-wip-us.apache.org/repos/asf/camel/blob/d86513bc/components/camel-spring/src/main/resources/META-INF/spring.schemas -- diff --git a/components/camel-spring/src/main/resources/META-INF/spring.schemas b/c
camel git commit: Add newline at end of file
Repository: camel Updated Branches: refs/heads/master e940ab6f3 -> c35811609 Add newline at end of file Add newline at the end of file in order to avoid Git issues when switching between Windows and Unix environments. Signed-off-by: Gregor Zurowski Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/c3581160 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/c3581160 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/c3581160 Branch: refs/heads/master Commit: c35811609d2195a5411149fd6e087d7a6a94a526 Parents: e940ab6 Author: Gregor Zurowski Authored: Fri Oct 30 12:52:39 2015 +0100 Committer: Gregor Zurowski Committed: Fri Oct 30 12:52:39 2015 +0100 -- .../src/main/resources/META-INF/spring.schemas | 2 +- .../src/main/resources/META-INF/spring.schemas | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) -- http://git-wip-us.apache.org/repos/asf/camel/blob/c3581160/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 805646e..228acd3 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 @@ -82,4 +82,4 @@ http\://camel.apache.org/schema/spring/integration/camel-spring-integration-2.15 http\://camel.apache.org/schema/spring/integration/camel-spring-integration-2.15.3.xsd=schema/camel-spring-integration.xsd http\://camel.apache.org/schema/spring/integration/camel-spring-integration-2.15.4.xsd=schema/camel-spring-integration.xsd http\://camel.apache.org/schema/spring/integration/camel-spring-integration-2.16.0.xsd=schema/camel-spring-integration.xsd -http\://camel.apache.org/schema/spring/integration/camel-spring-integration-${project.version}.xsd=schema/camel-spring-integration.xsd \ No newline at end of file +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/c3581160/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 6ff..4a72eea 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 @@ -76,4 +76,4 @@ http\://camel.apache.org/schema/spring-security/camel-spring-security-2.15.2.xsd http\://camel.apache.org/schema/spring-security/camel-spring-security-2.15.3.xsd=schema/camel-spring-security.xsd http\://camel.apache.org/schema/spring-security/camel-spring-security-2.15.4.xsd=schema/camel-spring-security.xsd http\://camel.apache.org/schema/spring-security/camel-spring-security-2.16.0.xsd=schema/camel-spring-security.xsd -http\://camel.apache.org/schema/spring-security/camel-spring-security-${project.version}.xsd=schema/camel-spring-security.xsd \ No newline at end of file +http\://camel.apache.org/schema/spring-security/camel-spring-security-${project.version}.xsd=schema/camel-spring-security.xsd
camel git commit: Organize imports to avoid CS issues
Repository: camel Updated Branches: refs/heads/master c35811609 -> 04e16bef5 Organize imports to avoid CS issues Signed-off-by: Gregor Zurowski Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/04e16bef Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/04e16bef Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/04e16bef Branch: refs/heads/master Commit: 04e16bef564c8856f7605138374f30a49a597061 Parents: c358116 Author: Gregor Zurowski Authored: Fri Oct 30 13:04:51 2015 +0100 Committer: Gregor Zurowski Committed: Fri Oct 30 13:04:51 2015 +0100 -- .../apache/camel/builder/NotifyBuilderFromRouteTest.java | 11 +++ 1 file changed, 7 insertions(+), 4 deletions(-) -- http://git-wip-us.apache.org/repos/asf/camel/blob/04e16bef/camel-core/src/test/java/org/apache/camel/builder/NotifyBuilderFromRouteTest.java -- diff --git a/camel-core/src/test/java/org/apache/camel/builder/NotifyBuilderFromRouteTest.java b/camel-core/src/test/java/org/apache/camel/builder/NotifyBuilderFromRouteTest.java index bf94389..f71ff1c 100644 --- a/camel-core/src/test/java/org/apache/camel/builder/NotifyBuilderFromRouteTest.java +++ b/camel-core/src/test/java/org/apache/camel/builder/NotifyBuilderFromRouteTest.java @@ -16,14 +16,17 @@ */ package org.apache.camel.builder; -import org.apache.camel.*; +import java.util.Map; + +import org.apache.camel.Consumer; +import org.apache.camel.ContextTestSupport; +import org.apache.camel.Endpoint; +import org.apache.camel.Processor; +import org.apache.camel.Producer; import org.apache.camel.impl.DefaultComponent; import org.apache.camel.impl.DefaultEndpoint; import org.apache.camel.impl.JndiRegistry; -import java.util.Map; -import java.util.concurrent.atomic.AtomicInteger; - /** * @version */
camel git commit: Organize imports to avoid CS issues
Repository: camel Updated Branches: refs/heads/camel-2.16.x d86513bcb -> 36d5c02c5 Organize imports to avoid CS issues Signed-off-by: Gregor Zurowski Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/36d5c02c Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/36d5c02c Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/36d5c02c Branch: refs/heads/camel-2.16.x Commit: 36d5c02c579537dcb02f4a423d821020fcb744b4 Parents: d86513b Author: Gregor Zurowski Authored: Fri Oct 30 13:04:51 2015 +0100 Committer: Gregor Zurowski Committed: Fri Oct 30 13:05:50 2015 +0100 -- .../apache/camel/builder/NotifyBuilderFromRouteTest.java | 11 +++ 1 file changed, 7 insertions(+), 4 deletions(-) -- http://git-wip-us.apache.org/repos/asf/camel/blob/36d5c02c/camel-core/src/test/java/org/apache/camel/builder/NotifyBuilderFromRouteTest.java -- diff --git a/camel-core/src/test/java/org/apache/camel/builder/NotifyBuilderFromRouteTest.java b/camel-core/src/test/java/org/apache/camel/builder/NotifyBuilderFromRouteTest.java index bf94389..f71ff1c 100644 --- a/camel-core/src/test/java/org/apache/camel/builder/NotifyBuilderFromRouteTest.java +++ b/camel-core/src/test/java/org/apache/camel/builder/NotifyBuilderFromRouteTest.java @@ -16,14 +16,17 @@ */ package org.apache.camel.builder; -import org.apache.camel.*; +import java.util.Map; + +import org.apache.camel.Consumer; +import org.apache.camel.ContextTestSupport; +import org.apache.camel.Endpoint; +import org.apache.camel.Processor; +import org.apache.camel.Producer; import org.apache.camel.impl.DefaultComponent; import org.apache.camel.impl.DefaultEndpoint; import org.apache.camel.impl.JndiRegistry; -import java.util.Map; -import java.util.concurrent.atomic.AtomicInteger; - /** * @version */
camel git commit: Fix Checkstyle issues
Repository: camel Updated Branches: refs/heads/master 04e16bef5 -> d528cd2c7 Fix Checkstyle issues Signed-off-by: Gregor Zurowski Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/d528cd2c Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/d528cd2c Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/d528cd2c Branch: refs/heads/master Commit: d528cd2c72752e7bc60188c8de4e8ee8103394ad Parents: 04e16be Author: Gregor Zurowski Authored: Fri Oct 30 13:40:44 2015 +0100 Committer: Gregor Zurowski Committed: Fri Oct 30 13:41:20 2015 +0100 -- .../java/org/apache/camel/component/hbase/HBaseConsumer.java | 6 +++--- .../org/apache/camel/component/hbase/CamelHBaseFilterTest.java | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) -- http://git-wip-us.apache.org/repos/asf/camel/blob/d528cd2c/components/camel-hbase/src/main/java/org/apache/camel/component/hbase/HBaseConsumer.java -- diff --git a/components/camel-hbase/src/main/java/org/apache/camel/component/hbase/HBaseConsumer.java b/components/camel-hbase/src/main/java/org/apache/camel/component/hbase/HBaseConsumer.java index 27a7abe..bf3760d 100644 --- a/components/camel-hbase/src/main/java/org/apache/camel/component/hbase/HBaseConsumer.java +++ b/components/camel-hbase/src/main/java/org/apache/camel/component/hbase/HBaseConsumer.java @@ -82,9 +82,9 @@ public class HBaseConsumer extends ScheduledBatchPollingConsumer { filters.add(new PageFilter(maxMessagesPerPoll)); } -if (!filters.isEmpty()){ - Filter compoundFilter = new FilterList(filters); - scan.setFilter(compoundFilter); +if (!filters.isEmpty()) { +Filter compoundFilter = new FilterList(filters); +scan.setFilter(compoundFilter); } if (rowModel != null && rowModel.getCells() != null) { http://git-wip-us.apache.org/repos/asf/camel/blob/d528cd2c/components/camel-hbase/src/test/java/org/apache/camel/component/hbase/CamelHBaseFilterTest.java -- diff --git a/components/camel-hbase/src/test/java/org/apache/camel/component/hbase/CamelHBaseFilterTest.java b/components/camel-hbase/src/test/java/org/apache/camel/component/hbase/CamelHBaseFilterTest.java index cfdcd8e..5cc0286 100644 --- a/components/camel-hbase/src/test/java/org/apache/camel/component/hbase/CamelHBaseFilterTest.java +++ b/components/camel-hbase/src/test/java/org/apache/camel/component/hbase/CamelHBaseFilterTest.java @@ -56,9 +56,9 @@ public class CamelHBaseFilterTest extends CamelHBaseTestSupport { Exchange resp = template.send(endpoint, exchange); Message out = resp.getOut(); assertTrue("two first keys returned", -out.getHeaders().containsValue(body[0][0][0]) && -out.getHeaders().containsValue(body[1][0][0]) && -!out.getHeaders().containsValue(body[2][0][0])); +out.getHeaders().containsValue(body[0][0][0]) +&& out.getHeaders().containsValue(body[1][0][0]) +&& !out.getHeaders().containsValue(body[2][0][0])); } }
[2/3] camel git commit: add parent to elasticsearch IndexRequest
add parent to elasticsearch IndexRequest Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/047d8e0f Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/047d8e0f Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/047d8e0f Branch: refs/heads/master Commit: 047d8e0f5658e038e3e14af13c92e8fa2b75dc16 Parents: 021a93b Author: Jay Lapham Authored: Fri Oct 30 12:02:23 2015 -0500 Committer: Jay Lapham Committed: Fri Oct 30 12:02:23 2015 -0500 -- .../converter/ElasticsearchActionRequestConverter.java | 2 ++ 1 file changed, 2 insertions(+) -- http://git-wip-us.apache.org/repos/asf/camel/blob/047d8e0f/components/camel-elasticsearch/src/main/java/org/apache/camel/component/elasticsearch/converter/ElasticsearchActionRequestConverter.java -- diff --git a/components/camel-elasticsearch/src/main/java/org/apache/camel/component/elasticsearch/converter/ElasticsearchActionRequestConverter.java b/components/camel-elasticsearch/src/main/java/org/apache/camel/component/elasticsearch/converter/ElasticsearchActionRequestConverter.java index 3a804f5..af7b214 100644 --- a/components/camel-elasticsearch/src/main/java/org/apache/camel/component/elasticsearch/converter/ElasticsearchActionRequestConverter.java +++ b/components/camel-elasticsearch/src/main/java/org/apache/camel/component/elasticsearch/converter/ElasticsearchActionRequestConverter.java @@ -51,6 +51,8 @@ public final class ElasticsearchActionRequestConverter { } else { return null; } + + indexRequest.parent(exchange.getIn().getHeader(ElasticsearchConstants.PARENT, String.class)); return indexRequest .consistencyLevel(exchange.getIn().getHeader(
[1/3] camel git commit: add parent to constants
Repository: camel Updated Branches: refs/heads/master 4f239bc79 -> 8d31380c3 add parent to constants Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/021a93b2 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/021a93b2 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/021a93b2 Branch: refs/heads/master Commit: 021a93b27371236b1fc3cefff02164c40c655455 Parents: 4f239bc Author: Jay Lapham Authored: Fri Oct 30 11:59:48 2015 -0500 Committer: Jay Lapham Committed: Fri Oct 30 11:59:48 2015 -0500 -- .../camel/component/elasticsearch/ElasticsearchConstants.java | 1 + 1 file changed, 1 insertion(+) -- http://git-wip-us.apache.org/repos/asf/camel/blob/021a93b2/components/camel-elasticsearch/src/main/java/org/apache/camel/component/elasticsearch/ElasticsearchConstants.java -- diff --git a/components/camel-elasticsearch/src/main/java/org/apache/camel/component/elasticsearch/ElasticsearchConstants.java b/components/camel-elasticsearch/src/main/java/org/apache/camel/component/elasticsearch/ElasticsearchConstants.java index 998047a..66388be 100644 --- a/components/camel-elasticsearch/src/main/java/org/apache/camel/component/elasticsearch/ElasticsearchConstants.java +++ b/components/camel-elasticsearch/src/main/java/org/apache/camel/component/elasticsearch/ElasticsearchConstants.java @@ -35,6 +35,7 @@ public interface ElasticsearchConstants { String PARAM_INDEX_TYPE = "indexType"; String PARAM_CONSISTENCY_LEVEL = "consistencyLevel"; String PARAM_REPLICATION_TYPE = "replicationType"; +String PARENT = "parent"; String TRANSPORT_ADDRESSES = "transportAddresses"; String PROTOCOL = "elasticsearch"; String LOCAL_NAME = "local";
[3/3] camel git commit: style consistency
style consistency Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/8d31380c Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/8d31380c Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/8d31380c Branch: refs/heads/master Commit: 8d31380c3bf6b80cb1fb0736721a364ccdf81699 Parents: 047d8e0 Author: Jay Lapham Authored: Fri Oct 30 12:07:36 2015 -0500 Committer: Jay Lapham Committed: Fri Oct 30 12:07:36 2015 -0500 -- .../converter/ElasticsearchActionRequestConverter.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -- http://git-wip-us.apache.org/repos/asf/camel/blob/8d31380c/components/camel-elasticsearch/src/main/java/org/apache/camel/component/elasticsearch/converter/ElasticsearchActionRequestConverter.java -- diff --git a/components/camel-elasticsearch/src/main/java/org/apache/camel/component/elasticsearch/converter/ElasticsearchActionRequestConverter.java b/components/camel-elasticsearch/src/main/java/org/apache/camel/component/elasticsearch/converter/ElasticsearchActionRequestConverter.java index af7b214..3763ff1 100644 --- a/components/camel-elasticsearch/src/main/java/org/apache/camel/component/elasticsearch/converter/ElasticsearchActionRequestConverter.java +++ b/components/camel-elasticsearch/src/main/java/org/apache/camel/component/elasticsearch/converter/ElasticsearchActionRequestConverter.java @@ -51,14 +51,14 @@ public final class ElasticsearchActionRequestConverter { } else { return null; } - - indexRequest.parent(exchange.getIn().getHeader(ElasticsearchConstants.PARENT, String.class)); return indexRequest .consistencyLevel(exchange.getIn().getHeader( ElasticsearchConstants.PARAM_CONSISTENCY_LEVEL, WriteConsistencyLevel.class)) .replicationType(exchange.getIn().getHeader( ElasticsearchConstants.PARAM_REPLICATION_TYPE, ReplicationType.class)) +.parent(exchange.getIn().getHeader( +ElasticsearchConstants.PARENT, String.class)) .index(exchange.getIn().getHeader( ElasticsearchConstants.PARAM_INDEX_NAME, String.class)) .type(exchange.getIn().getHeader(
[2/3] camel git commit: add parent to elasticsearch IndexRequest
add parent to elasticsearch IndexRequest Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/0bf6708e Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/0bf6708e Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/0bf6708e Branch: refs/heads/camel-2.16.x Commit: 0bf6708e29f568629f1913964235dc81401782de Parents: 7abbf6d Author: Jay Lapham Authored: Fri Oct 30 12:02:23 2015 -0500 Committer: Gregor Zurowski Committed: Fri Oct 30 21:23:33 2015 +0100 -- .../converter/ElasticsearchActionRequestConverter.java | 2 ++ 1 file changed, 2 insertions(+) -- http://git-wip-us.apache.org/repos/asf/camel/blob/0bf6708e/components/camel-elasticsearch/src/main/java/org/apache/camel/component/elasticsearch/converter/ElasticsearchActionRequestConverter.java -- diff --git a/components/camel-elasticsearch/src/main/java/org/apache/camel/component/elasticsearch/converter/ElasticsearchActionRequestConverter.java b/components/camel-elasticsearch/src/main/java/org/apache/camel/component/elasticsearch/converter/ElasticsearchActionRequestConverter.java index 3a804f5..af7b214 100644 --- a/components/camel-elasticsearch/src/main/java/org/apache/camel/component/elasticsearch/converter/ElasticsearchActionRequestConverter.java +++ b/components/camel-elasticsearch/src/main/java/org/apache/camel/component/elasticsearch/converter/ElasticsearchActionRequestConverter.java @@ -51,6 +51,8 @@ public final class ElasticsearchActionRequestConverter { } else { return null; } + + indexRequest.parent(exchange.getIn().getHeader(ElasticsearchConstants.PARENT, String.class)); return indexRequest .consistencyLevel(exchange.getIn().getHeader(
[1/3] camel git commit: add parent to constants
Repository: camel Updated Branches: refs/heads/camel-2.16.x 85391f67e -> 59705f956 add parent to constants Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/7abbf6d7 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/7abbf6d7 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/7abbf6d7 Branch: refs/heads/camel-2.16.x Commit: 7abbf6d7fc8d705797eb4e39ddab39a7516c2d2c Parents: 85391f6 Author: Jay Lapham Authored: Fri Oct 30 11:59:48 2015 -0500 Committer: Gregor Zurowski Committed: Fri Oct 30 21:22:51 2015 +0100 -- .../camel/component/elasticsearch/ElasticsearchConstants.java | 1 + 1 file changed, 1 insertion(+) -- http://git-wip-us.apache.org/repos/asf/camel/blob/7abbf6d7/components/camel-elasticsearch/src/main/java/org/apache/camel/component/elasticsearch/ElasticsearchConstants.java -- diff --git a/components/camel-elasticsearch/src/main/java/org/apache/camel/component/elasticsearch/ElasticsearchConstants.java b/components/camel-elasticsearch/src/main/java/org/apache/camel/component/elasticsearch/ElasticsearchConstants.java index 998047a..66388be 100644 --- a/components/camel-elasticsearch/src/main/java/org/apache/camel/component/elasticsearch/ElasticsearchConstants.java +++ b/components/camel-elasticsearch/src/main/java/org/apache/camel/component/elasticsearch/ElasticsearchConstants.java @@ -35,6 +35,7 @@ public interface ElasticsearchConstants { String PARAM_INDEX_TYPE = "indexType"; String PARAM_CONSISTENCY_LEVEL = "consistencyLevel"; String PARAM_REPLICATION_TYPE = "replicationType"; +String PARENT = "parent"; String TRANSPORT_ADDRESSES = "transportAddresses"; String PROTOCOL = "elasticsearch"; String LOCAL_NAME = "local";
[3/3] camel git commit: style consistency
style consistency Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/59705f95 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/59705f95 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/59705f95 Branch: refs/heads/camel-2.16.x Commit: 59705f9566788199b5912c267e7bc48bdc8e013a Parents: 0bf6708 Author: Jay Lapham Authored: Fri Oct 30 12:07:36 2015 -0500 Committer: Gregor Zurowski Committed: Fri Oct 30 21:24:19 2015 +0100 -- .../converter/ElasticsearchActionRequestConverter.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -- http://git-wip-us.apache.org/repos/asf/camel/blob/59705f95/components/camel-elasticsearch/src/main/java/org/apache/camel/component/elasticsearch/converter/ElasticsearchActionRequestConverter.java -- diff --git a/components/camel-elasticsearch/src/main/java/org/apache/camel/component/elasticsearch/converter/ElasticsearchActionRequestConverter.java b/components/camel-elasticsearch/src/main/java/org/apache/camel/component/elasticsearch/converter/ElasticsearchActionRequestConverter.java index af7b214..3763ff1 100644 --- a/components/camel-elasticsearch/src/main/java/org/apache/camel/component/elasticsearch/converter/ElasticsearchActionRequestConverter.java +++ b/components/camel-elasticsearch/src/main/java/org/apache/camel/component/elasticsearch/converter/ElasticsearchActionRequestConverter.java @@ -51,14 +51,14 @@ public final class ElasticsearchActionRequestConverter { } else { return null; } - - indexRequest.parent(exchange.getIn().getHeader(ElasticsearchConstants.PARENT, String.class)); return indexRequest .consistencyLevel(exchange.getIn().getHeader( ElasticsearchConstants.PARAM_CONSISTENCY_LEVEL, WriteConsistencyLevel.class)) .replicationType(exchange.getIn().getHeader( ElasticsearchConstants.PARAM_REPLICATION_TYPE, ReplicationType.class)) +.parent(exchange.getIn().getHeader( +ElasticsearchConstants.PARENT, String.class)) .index(exchange.getIn().getHeader( ElasticsearchConstants.PARAM_INDEX_NAME, String.class)) .type(exchange.getIn().getHeader(
Git Push Summary
Repository: camel Updated Tags: refs/tags/camel-2.14.4 [created] fb867c192
[1/3] camel git commit: [maven-release-plugin] prepare release camel-2.14.4
Repository: camel Updated Branches: refs/heads/camel-2.14.x 2036f8a36 -> 4770be143 http://git-wip-us.apache.org/repos/asf/camel/blob/4770be14/pom.xml -- diff --git a/pom.xml b/pom.xml index d966b57..b5fcbed 100755 --- a/pom.xml +++ b/pom.xml @@ -26,7 +26,7 @@ org.apache.camel camel - 2.14.4-SNAPSHOT + 2.14.4 pom Camel Camel build POM @@ -131,7 +131,7 @@ scm:git:http://git-wip-us.apache.org/repos/asf/camel.git scm:git:https://git-wip-us.apache.org/repos/asf/camel.git https://fisheye6.atlassian.com/browse/~br=master/camel-git -HEAD +camel-2.14.4 http://git-wip-us.apache.org/repos/asf/camel/blob/4770be14/tests/camel-blueprint-cxf-test/pom.xml -- diff --git a/tests/camel-blueprint-cxf-test/pom.xml b/tests/camel-blueprint-cxf-test/pom.xml index 6f7a098..d76e9c7 100644 --- a/tests/camel-blueprint-cxf-test/pom.xml +++ b/tests/camel-blueprint-cxf-test/pom.xml @@ -22,7 +22,7 @@ org.apache.camel tests -2.14.4-SNAPSHOT +2.14.4 camel-blueprint-cxf-test http://git-wip-us.apache.org/repos/asf/camel/blob/4770be14/tests/camel-itest-cdi/pom.xml -- diff --git a/tests/camel-itest-cdi/pom.xml b/tests/camel-itest-cdi/pom.xml index ae5d066..a9941b0 100644 --- a/tests/camel-itest-cdi/pom.xml +++ b/tests/camel-itest-cdi/pom.xml @@ -21,7 +21,7 @@ org.apache.camel tests -2.14.4-SNAPSHOT +2.14.4 camel-itest-cdi http://git-wip-us.apache.org/repos/asf/camel/blob/4770be14/tests/camel-itest-karaf/pom.xml -- diff --git a/tests/camel-itest-karaf/pom.xml b/tests/camel-itest-karaf/pom.xml index 7d049f8..8fc8065 100644 --- a/tests/camel-itest-karaf/pom.xml +++ b/tests/camel-itest-karaf/pom.xml @@ -22,7 +22,7 @@ org.apache.camel tests -2.14.4-SNAPSHOT +2.14.4 camel-itest-karaf http://git-wip-us.apache.org/repos/asf/camel/blob/4770be14/tests/camel-itest-osgi/pom.xml -- diff --git a/tests/camel-itest-osgi/pom.xml b/tests/camel-itest-osgi/pom.xml index 7bf25e8..091762f 100644 --- a/tests/camel-itest-osgi/pom.xml +++ b/tests/camel-itest-osgi/pom.xml @@ -22,7 +22,7 @@ org.apache.camel tests -2.14.4-SNAPSHOT +2.14.4 camel-itest-osgi http://git-wip-us.apache.org/repos/asf/camel/blob/4770be14/tests/camel-itest-performance/pom.xml -- diff --git a/tests/camel-itest-performance/pom.xml b/tests/camel-itest-performance/pom.xml index 5b60f00..c14bacf 100644 --- a/tests/camel-itest-performance/pom.xml +++ b/tests/camel-itest-performance/pom.xml @@ -22,7 +22,7 @@ org.apache.camel tests -2.14.4-SNAPSHOT +2.14.4 camel-itest-performance http://git-wip-us.apache.org/repos/asf/camel/blob/4770be14/tests/camel-itest-spring32/pom.xml -- diff --git a/tests/camel-itest-spring32/pom.xml b/tests/camel-itest-spring32/pom.xml index 74c3210..637e1b8 100644 --- a/tests/camel-itest-spring32/pom.xml +++ b/tests/camel-itest-spring32/pom.xml @@ -22,7 +22,7 @@ org.apache.camel tests -2.14.4-SNAPSHOT +2.14.4 camel-itest-spring32 http://git-wip-us.apache.org/repos/asf/camel/blob/4770be14/tests/camel-itest-standalone/pom.xml -- diff --git a/tests/camel-itest-standalone/pom.xml b/tests/camel-itest-standalone/pom.xml index 343f608..52c2666 100644 --- a/tests/camel-itest-standalone/pom.xml +++ b/tests/camel-itest-standalone/pom.xml @@ -22,7 +22,7 @@ org.apache.camel tests -2.14.4-SNAPSHOT +2.14.4 camel-itest-standalone http://git-wip-us.apache.org/repos/asf/camel/blob/4770be14/tests/camel-itest/pom.xml -- diff --git a/tests/camel-itest/pom.xml b/tests/camel-itest/pom.xml index 40933f3..7abc915 100644 --- a/tests/camel-itest/pom.xml +++ b/tests/camel-itest/pom.xml @@ -22,7 +22,7 @@ org.apache.camel tests -2.14.4-SNAPSHOT +2.14.4 camel-itest http://git-wip-us.apache.org/repos/asf/camel/blob/4770be14/tests/camel-partial-classpath-test/pom.xml -- diff --git a/tests/camel-partial-classpath-test/pom.xml b/tests/camel-partial-classpath-test/pom.xml index 9a00041..f679b0b 100644 --- a/tests/camel-partial-classpath-test/pom.xml +++ b/tests/camel-partial-classpath-test/pom.xml @@ -22,7 +22,7 @@ org.apache.camel tests -2.14.4-SNAPSHOT +2.14.4
[2/3] camel git commit: [maven-release-plugin] prepare release camel-2.14.4
http://git-wip-us.apache.org/repos/asf/camel/blob/4770be14/components/camel-olingo2/camel-olingo2-component/pom.xml -- diff --git a/components/camel-olingo2/camel-olingo2-component/pom.xml b/components/camel-olingo2/camel-olingo2-component/pom.xml index 0b7da51..4489d19 100644 --- a/components/camel-olingo2/camel-olingo2-component/pom.xml +++ b/components/camel-olingo2/camel-olingo2-component/pom.xml @@ -22,7 +22,7 @@ org.apache.camel.component.olingo2 camel-olingo2-parent -2.14.4-SNAPSHOT +2.14.4 camel-olingo2 http://git-wip-us.apache.org/repos/asf/camel/blob/4770be14/components/camel-olingo2/pom.xml -- diff --git a/components/camel-olingo2/pom.xml b/components/camel-olingo2/pom.xml index 572084a..1479295 100644 --- a/components/camel-olingo2/pom.xml +++ b/components/camel-olingo2/pom.xml @@ -22,7 +22,7 @@ components org.apache.camel -2.14.4-SNAPSHOT +2.14.4 org.apache.camel.component.olingo2 http://git-wip-us.apache.org/repos/asf/camel/blob/4770be14/components/camel-openshift/pom.xml -- diff --git a/components/camel-openshift/pom.xml b/components/camel-openshift/pom.xml index 1682c07..ffbda47 100644 --- a/components/camel-openshift/pom.xml +++ b/components/camel-openshift/pom.xml @@ -21,7 +21,7 @@ org.apache.camel components -2.14.4-SNAPSHOT +2.14.4 camel-openshift http://git-wip-us.apache.org/repos/asf/camel/blob/4770be14/components/camel-optaplanner/pom.xml -- diff --git a/components/camel-optaplanner/pom.xml b/components/camel-optaplanner/pom.xml index 069e970..d310641 100644 --- a/components/camel-optaplanner/pom.xml +++ b/components/camel-optaplanner/pom.xml @@ -21,7 +21,7 @@ org.apache.camel components -2.14.4-SNAPSHOT +2.14.4 camel-optaplanner http://git-wip-us.apache.org/repos/asf/camel/blob/4770be14/components/camel-paxlogging/pom.xml -- diff --git a/components/camel-paxlogging/pom.xml b/components/camel-paxlogging/pom.xml index 2de87e8..19f5148 100644 --- a/components/camel-paxlogging/pom.xml +++ b/components/camel-paxlogging/pom.xml @@ -21,7 +21,7 @@ org.apache.camel components -2.14.4-SNAPSHOT +2.14.4 camel-paxlogging http://git-wip-us.apache.org/repos/asf/camel/blob/4770be14/components/camel-printer/pom.xml -- diff --git a/components/camel-printer/pom.xml b/components/camel-printer/pom.xml index b84e033..074a9c8 100644 --- a/components/camel-printer/pom.xml +++ b/components/camel-printer/pom.xml @@ -21,7 +21,7 @@ org.apache.camel components -2.14.4-SNAPSHOT +2.14.4 camel-printer http://git-wip-us.apache.org/repos/asf/camel/blob/4770be14/components/camel-protobuf/pom.xml -- diff --git a/components/camel-protobuf/pom.xml b/components/camel-protobuf/pom.xml index af295ee..b6a39ad 100755 --- a/components/camel-protobuf/pom.xml +++ b/components/camel-protobuf/pom.xml @@ -21,7 +21,7 @@ org.apache.camel components - 2.14.4-SNAPSHOT + 2.14.4 camel-protobuf http://git-wip-us.apache.org/repos/asf/camel/blob/4770be14/components/camel-quartz/pom.xml -- diff --git a/components/camel-quartz/pom.xml b/components/camel-quartz/pom.xml index 27990d8..cd6994b 100644 --- a/components/camel-quartz/pom.xml +++ b/components/camel-quartz/pom.xml @@ -21,7 +21,7 @@ org.apache.camel components -2.14.4-SNAPSHOT +2.14.4 camel-quartz http://git-wip-us.apache.org/repos/asf/camel/blob/4770be14/components/camel-quartz2/pom.xml -- diff --git a/components/camel-quartz2/pom.xml b/components/camel-quartz2/pom.xml index 0d6e322..dbaef84 100644 --- a/components/camel-quartz2/pom.xml +++ b/components/camel-quartz2/pom.xml @@ -21,7 +21,7 @@ org.apache.camel components -2.14.4-SNAPSHOT +2.14.4 camel-quartz2 http://git-wip-us.apache.org/repos/asf/camel/blob/4770be14/components/camel-quickfix/pom.xml -- diff --git a/components/camel-quickfix/pom.xml b/components/camel-quickfix/pom.xml index 078b3b2..7f2e995 100644 --- a/components/camel-quickfix/pom.xml +++ b/components/camel-quickfix/pom.xml @@ -21,7 +21,7 @@ org.apache.camel components -2.14.4-SNAPSHOT +2.1
[3/3] camel git commit: [maven-release-plugin] prepare release camel-2.14.4
[maven-release-plugin] prepare release camel-2.14.4 Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/4770be14 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/4770be14 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/4770be14 Branch: refs/heads/camel-2.14.x Commit: 4770be143ef2036bc06dfcff392d57328e2d0a5e Parents: 2036f8a Author: Gregor Zurowski Authored: Fri Nov 6 16:46:44 2015 + Committer: Gregor Zurowski Committed: Fri Nov 6 16:46:44 2015 + -- apache-camel/pom.xml | 2 +- buildingtools/pom.xml| 2 +- camel-core/pom.xml | 2 +- components/camel-ahc-ws/pom.xml | 2 +- components/camel-ahc/pom.xml | 2 +- components/camel-amqp/pom.xml| 2 +- components/camel-apns/pom.xml| 2 +- components/camel-atmosphere-websocket/pom.xml| 2 +- components/camel-atom/pom.xml| 2 +- components/camel-avro/pom.xml| 2 +- components/camel-aws/pom.xml | 2 +- components/camel-bam/pom.xml | 2 +- components/camel-barcode/pom.xml | 2 +- components/camel-base64/pom.xml | 2 +- components/camel-bean-validator/pom.xml | 2 +- components/camel-beanio/pom.xml | 2 +- components/camel-bindy/pom.xml | 2 +- components/camel-blueprint/pom.xml | 2 +- components/camel-box/pom.xml | 2 +- components/camel-cache/pom.xml | 2 +- components/camel-castor/pom.xml | 2 +- components/camel-cdi/pom.xml | 2 +- components/camel-cmis/pom.xml| 2 +- components/camel-cometd/pom.xml | 2 +- components/camel-context/pom.xml | 2 +- components/camel-core-osgi/pom.xml | 2 +- components/camel-core-xml/pom.xml| 2 +- components/camel-couchdb/pom.xml | 2 +- components/camel-crypto/pom.xml | 2 +- components/camel-csv/pom.xml | 2 +- components/camel-cxf-transport/pom.xml | 2 +- components/camel-cxf/pom.xml | 2 +- components/camel-disruptor/pom.xml | 2 +- components/camel-dns/pom.xml | 2 +- components/camel-dozer/pom.xml | 2 +- components/camel-dropbox/pom.xml | 2 +- components/camel-eclipse/pom.xml | 2 +- components/camel-ejb/pom.xml | 2 +- components/camel-elasticsearch/pom.xml | 2 +- components/camel-eventadmin/pom.xml | 2 +- components/camel-exec/pom.xml| 2 +- components/camel-facebook/pom.xml| 2 +- components/camel-flatpack/pom.xml| 2 +- components/camel-fop/pom.xml | 2 +- components/camel-freemarker/pom.xml | 2 +- components/camel-ftp/pom.xml | 2 +- components/camel-gae/pom.xml | 2 +- components/camel-geocoder/pom.xml| 2 +- components/camel-google-drive/pom.xml| 2 +- components/camel-gora/pom.xml| 2 +- components/camel-groovy/pom.xml | 2 +- components/camel-gson/pom.xml| 2 +- components/camel-guava-eventbus/pom.xml | 2 +- components/camel-guice/pom.xml | 2 +- components/camel-hawtdb/pom.xml | 2 +- components/camel-hazelcast/pom.xml | 2 +- components/camel-hbase/pom.xml | 2 +- components/camel-hdfs/pom.xml| 2 +- components/camel-hdfs2/pom.xml | 2 +- components/camel-hl7/pom.xml | 2 +- c
[1/3] camel git commit: [maven-release-plugin] prepare for next development iteration
Repository: camel Updated Branches: refs/heads/camel-2.14.x 4770be143 -> 35264ab6f http://git-wip-us.apache.org/repos/asf/camel/blob/35264ab6/pom.xml -- diff --git a/pom.xml b/pom.xml index b5fcbed..069c6a7 100755 --- a/pom.xml +++ b/pom.xml @@ -26,7 +26,7 @@ org.apache.camel camel - 2.14.4 + 2.14.5-SNAPSHOT pom Camel Camel build POM @@ -131,7 +131,7 @@ scm:git:http://git-wip-us.apache.org/repos/asf/camel.git scm:git:https://git-wip-us.apache.org/repos/asf/camel.git https://fisheye6.atlassian.com/browse/~br=master/camel-git -camel-2.14.4 +HEAD http://git-wip-us.apache.org/repos/asf/camel/blob/35264ab6/tests/camel-blueprint-cxf-test/pom.xml -- diff --git a/tests/camel-blueprint-cxf-test/pom.xml b/tests/camel-blueprint-cxf-test/pom.xml index d76e9c7..136e5e0 100644 --- a/tests/camel-blueprint-cxf-test/pom.xml +++ b/tests/camel-blueprint-cxf-test/pom.xml @@ -22,7 +22,7 @@ org.apache.camel tests -2.14.4 +2.14.5-SNAPSHOT camel-blueprint-cxf-test http://git-wip-us.apache.org/repos/asf/camel/blob/35264ab6/tests/camel-itest-cdi/pom.xml -- diff --git a/tests/camel-itest-cdi/pom.xml b/tests/camel-itest-cdi/pom.xml index a9941b0..e20eddf 100644 --- a/tests/camel-itest-cdi/pom.xml +++ b/tests/camel-itest-cdi/pom.xml @@ -21,7 +21,7 @@ org.apache.camel tests -2.14.4 +2.14.5-SNAPSHOT camel-itest-cdi http://git-wip-us.apache.org/repos/asf/camel/blob/35264ab6/tests/camel-itest-karaf/pom.xml -- diff --git a/tests/camel-itest-karaf/pom.xml b/tests/camel-itest-karaf/pom.xml index 8fc8065..ba49c6d 100644 --- a/tests/camel-itest-karaf/pom.xml +++ b/tests/camel-itest-karaf/pom.xml @@ -22,7 +22,7 @@ org.apache.camel tests -2.14.4 +2.14.5-SNAPSHOT camel-itest-karaf http://git-wip-us.apache.org/repos/asf/camel/blob/35264ab6/tests/camel-itest-osgi/pom.xml -- diff --git a/tests/camel-itest-osgi/pom.xml b/tests/camel-itest-osgi/pom.xml index 091762f..96fa6d4 100644 --- a/tests/camel-itest-osgi/pom.xml +++ b/tests/camel-itest-osgi/pom.xml @@ -22,7 +22,7 @@ org.apache.camel tests -2.14.4 +2.14.5-SNAPSHOT camel-itest-osgi http://git-wip-us.apache.org/repos/asf/camel/blob/35264ab6/tests/camel-itest-performance/pom.xml -- diff --git a/tests/camel-itest-performance/pom.xml b/tests/camel-itest-performance/pom.xml index c14bacf..8da2ee7 100644 --- a/tests/camel-itest-performance/pom.xml +++ b/tests/camel-itest-performance/pom.xml @@ -22,7 +22,7 @@ org.apache.camel tests -2.14.4 +2.14.5-SNAPSHOT camel-itest-performance http://git-wip-us.apache.org/repos/asf/camel/blob/35264ab6/tests/camel-itest-spring32/pom.xml -- diff --git a/tests/camel-itest-spring32/pom.xml b/tests/camel-itest-spring32/pom.xml index 637e1b8..72534bf 100644 --- a/tests/camel-itest-spring32/pom.xml +++ b/tests/camel-itest-spring32/pom.xml @@ -22,7 +22,7 @@ org.apache.camel tests -2.14.4 +2.14.5-SNAPSHOT camel-itest-spring32 http://git-wip-us.apache.org/repos/asf/camel/blob/35264ab6/tests/camel-itest-standalone/pom.xml -- diff --git a/tests/camel-itest-standalone/pom.xml b/tests/camel-itest-standalone/pom.xml index 52c2666..30c0ed0 100644 --- a/tests/camel-itest-standalone/pom.xml +++ b/tests/camel-itest-standalone/pom.xml @@ -22,7 +22,7 @@ org.apache.camel tests -2.14.4 +2.14.5-SNAPSHOT camel-itest-standalone http://git-wip-us.apache.org/repos/asf/camel/blob/35264ab6/tests/camel-itest/pom.xml -- diff --git a/tests/camel-itest/pom.xml b/tests/camel-itest/pom.xml index 7abc915..d965aed 100644 --- a/tests/camel-itest/pom.xml +++ b/tests/camel-itest/pom.xml @@ -22,7 +22,7 @@ org.apache.camel tests -2.14.4 +2.14.5-SNAPSHOT camel-itest http://git-wip-us.apache.org/repos/asf/camel/blob/35264ab6/tests/camel-partial-classpath-test/pom.xml -- diff --git a/tests/camel-partial-classpath-test/pom.xml b/tests/camel-partial-classpath-test/pom.xml index f679b0b..e9b7dac 100644 --- a/tests/camel-partial-classpath-test/pom.xml +++ b/tests/camel-partial-classpath-test/pom.xml @@ -22,7 +22,7 @@ org.apache.camel tests -2.14.4 +2.14.5-SNAPSHOT
[3/3] camel git commit: [maven-release-plugin] prepare for next development iteration
[maven-release-plugin] prepare for next development iteration Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/35264ab6 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/35264ab6 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/35264ab6 Branch: refs/heads/camel-2.14.x Commit: 35264ab6f7f3783a4d668bd2077da66b6a79f3e5 Parents: 4770be1 Author: Gregor Zurowski Authored: Fri Nov 6 16:47:11 2015 + Committer: Gregor Zurowski Committed: Fri Nov 6 16:47:11 2015 + -- apache-camel/pom.xml | 2 +- buildingtools/pom.xml| 2 +- camel-core/pom.xml | 2 +- components/camel-ahc-ws/pom.xml | 2 +- components/camel-ahc/pom.xml | 2 +- components/camel-amqp/pom.xml| 2 +- components/camel-apns/pom.xml| 2 +- components/camel-atmosphere-websocket/pom.xml| 2 +- components/camel-atom/pom.xml| 2 +- components/camel-avro/pom.xml| 2 +- components/camel-aws/pom.xml | 2 +- components/camel-bam/pom.xml | 2 +- components/camel-barcode/pom.xml | 2 +- components/camel-base64/pom.xml | 2 +- components/camel-bean-validator/pom.xml | 2 +- components/camel-beanio/pom.xml | 2 +- components/camel-bindy/pom.xml | 2 +- components/camel-blueprint/pom.xml | 2 +- components/camel-box/pom.xml | 2 +- components/camel-cache/pom.xml | 2 +- components/camel-castor/pom.xml | 2 +- components/camel-cdi/pom.xml | 2 +- components/camel-cmis/pom.xml| 2 +- components/camel-cometd/pom.xml | 2 +- components/camel-context/pom.xml | 2 +- components/camel-core-osgi/pom.xml | 2 +- components/camel-core-xml/pom.xml| 2 +- components/camel-couchdb/pom.xml | 2 +- components/camel-crypto/pom.xml | 2 +- components/camel-csv/pom.xml | 2 +- components/camel-cxf-transport/pom.xml | 2 +- components/camel-cxf/pom.xml | 2 +- components/camel-disruptor/pom.xml | 2 +- components/camel-dns/pom.xml | 2 +- components/camel-dozer/pom.xml | 2 +- components/camel-dropbox/pom.xml | 2 +- components/camel-eclipse/pom.xml | 2 +- components/camel-ejb/pom.xml | 2 +- components/camel-elasticsearch/pom.xml | 2 +- components/camel-eventadmin/pom.xml | 2 +- components/camel-exec/pom.xml| 2 +- components/camel-facebook/pom.xml| 2 +- components/camel-flatpack/pom.xml| 2 +- components/camel-fop/pom.xml | 2 +- components/camel-freemarker/pom.xml | 2 +- components/camel-ftp/pom.xml | 2 +- components/camel-gae/pom.xml | 2 +- components/camel-geocoder/pom.xml| 2 +- components/camel-google-drive/pom.xml| 2 +- components/camel-gora/pom.xml| 2 +- components/camel-groovy/pom.xml | 2 +- components/camel-gson/pom.xml| 2 +- components/camel-guava-eventbus/pom.xml | 2 +- components/camel-guice/pom.xml | 2 +- components/camel-hawtdb/pom.xml | 2 +- components/camel-hazelcast/pom.xml | 2 +- components/camel-hbase/pom.xml | 2 +- components/camel-hdfs/pom.xml| 2 +- components/camel-hdfs2/pom.xml | 2 +- components/camel-hl7/pom.xml
[2/3] camel git commit: [maven-release-plugin] prepare for next development iteration
http://git-wip-us.apache.org/repos/asf/camel/blob/35264ab6/components/camel-olingo2/camel-olingo2-component/pom.xml -- diff --git a/components/camel-olingo2/camel-olingo2-component/pom.xml b/components/camel-olingo2/camel-olingo2-component/pom.xml index 4489d19..8e7fa9d 100644 --- a/components/camel-olingo2/camel-olingo2-component/pom.xml +++ b/components/camel-olingo2/camel-olingo2-component/pom.xml @@ -22,7 +22,7 @@ org.apache.camel.component.olingo2 camel-olingo2-parent -2.14.4 +2.14.5-SNAPSHOT camel-olingo2 http://git-wip-us.apache.org/repos/asf/camel/blob/35264ab6/components/camel-olingo2/pom.xml -- diff --git a/components/camel-olingo2/pom.xml b/components/camel-olingo2/pom.xml index 1479295..86b355b 100644 --- a/components/camel-olingo2/pom.xml +++ b/components/camel-olingo2/pom.xml @@ -22,7 +22,7 @@ components org.apache.camel -2.14.4 +2.14.5-SNAPSHOT org.apache.camel.component.olingo2 http://git-wip-us.apache.org/repos/asf/camel/blob/35264ab6/components/camel-openshift/pom.xml -- diff --git a/components/camel-openshift/pom.xml b/components/camel-openshift/pom.xml index ffbda47..ef2bb6a 100644 --- a/components/camel-openshift/pom.xml +++ b/components/camel-openshift/pom.xml @@ -21,7 +21,7 @@ org.apache.camel components -2.14.4 +2.14.5-SNAPSHOT camel-openshift http://git-wip-us.apache.org/repos/asf/camel/blob/35264ab6/components/camel-optaplanner/pom.xml -- diff --git a/components/camel-optaplanner/pom.xml b/components/camel-optaplanner/pom.xml index d310641..883035e 100644 --- a/components/camel-optaplanner/pom.xml +++ b/components/camel-optaplanner/pom.xml @@ -21,7 +21,7 @@ org.apache.camel components -2.14.4 +2.14.5-SNAPSHOT camel-optaplanner http://git-wip-us.apache.org/repos/asf/camel/blob/35264ab6/components/camel-paxlogging/pom.xml -- diff --git a/components/camel-paxlogging/pom.xml b/components/camel-paxlogging/pom.xml index 19f5148..7f516c9 100644 --- a/components/camel-paxlogging/pom.xml +++ b/components/camel-paxlogging/pom.xml @@ -21,7 +21,7 @@ org.apache.camel components -2.14.4 +2.14.5-SNAPSHOT camel-paxlogging http://git-wip-us.apache.org/repos/asf/camel/blob/35264ab6/components/camel-printer/pom.xml -- diff --git a/components/camel-printer/pom.xml b/components/camel-printer/pom.xml index 074a9c8..11d1e87 100644 --- a/components/camel-printer/pom.xml +++ b/components/camel-printer/pom.xml @@ -21,7 +21,7 @@ org.apache.camel components -2.14.4 +2.14.5-SNAPSHOT camel-printer http://git-wip-us.apache.org/repos/asf/camel/blob/35264ab6/components/camel-protobuf/pom.xml -- diff --git a/components/camel-protobuf/pom.xml b/components/camel-protobuf/pom.xml index b6a39ad..6a355a9 100755 --- a/components/camel-protobuf/pom.xml +++ b/components/camel-protobuf/pom.xml @@ -21,7 +21,7 @@ org.apache.camel components - 2.14.4 + 2.14.5-SNAPSHOT camel-protobuf http://git-wip-us.apache.org/repos/asf/camel/blob/35264ab6/components/camel-quartz/pom.xml -- diff --git a/components/camel-quartz/pom.xml b/components/camel-quartz/pom.xml index cd6994b..c6708c3 100644 --- a/components/camel-quartz/pom.xml +++ b/components/camel-quartz/pom.xml @@ -21,7 +21,7 @@ org.apache.camel components -2.14.4 +2.14.5-SNAPSHOT camel-quartz http://git-wip-us.apache.org/repos/asf/camel/blob/35264ab6/components/camel-quartz2/pom.xml -- diff --git a/components/camel-quartz2/pom.xml b/components/camel-quartz2/pom.xml index dbaef84..95faaa8 100644 --- a/components/camel-quartz2/pom.xml +++ b/components/camel-quartz2/pom.xml @@ -21,7 +21,7 @@ org.apache.camel components -2.14.4 +2.14.5-SNAPSHOT camel-quartz2 http://git-wip-us.apache.org/repos/asf/camel/blob/35264ab6/components/camel-quickfix/pom.xml -- diff --git a/components/camel-quickfix/pom.xml b/components/camel-quickfix/pom.xml index 7f2e995..b5540bd 100644 --- a/components/camel-quickfix/pom.xml +++ b/components/camel-quickfix/pom.xml @@ -21,7 +21,7 @@ org.apache.camel components -2.14.4 +2.14.5-SNAPS
camel git commit: Refactor to JUnit 4-style test classes
Repository: camel Updated Branches: refs/heads/master a6a26b33e -> 896dbd717 Refactor to JUnit 4-style test classes Signed-off-by: Gregor Zurowski Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/896dbd71 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/896dbd71 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/896dbd71 Branch: refs/heads/master Commit: 896dbd7175ae6d87f83bae8cac12caca6d5fb0b3 Parents: a6a26b3 Author: Gregor Zurowski Authored: Sat Nov 7 21:15:11 2015 +0100 Committer: Gregor Zurowski Committed: Sat Nov 7 21:15:23 2015 +0100 -- .../apache/camel/catalog/CamelCatalogMBeanExporterTest.java| 6 -- .../test/java/org/apache/camel/catalog/CamelCatalogTest.java | 6 -- 2 files changed, 8 insertions(+), 4 deletions(-) -- http://git-wip-us.apache.org/repos/asf/camel/blob/896dbd71/platforms/catalog/src/test/java/org/apache/camel/catalog/CamelCatalogMBeanExporterTest.java -- diff --git a/platforms/catalog/src/test/java/org/apache/camel/catalog/CamelCatalogMBeanExporterTest.java b/platforms/catalog/src/test/java/org/apache/camel/catalog/CamelCatalogMBeanExporterTest.java index 7492c04..1d6d1bc 100644 --- a/platforms/catalog/src/test/java/org/apache/camel/catalog/CamelCatalogMBeanExporterTest.java +++ b/platforms/catalog/src/test/java/org/apache/camel/catalog/CamelCatalogMBeanExporterTest.java @@ -20,9 +20,11 @@ import java.lang.management.ManagementFactory; import javax.management.MBeanServer; import javax.management.ObjectName; -import junit.framework.TestCase; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertTrue; -public class CamelCatalogMBeanExporterTest extends TestCase { +public class CamelCatalogMBeanExporterTest { private CamelCatalogMBeanExporter exporter = new CamelCatalogMBeanExporter(); http://git-wip-us.apache.org/repos/asf/camel/blob/896dbd71/platforms/catalog/src/test/java/org/apache/camel/catalog/CamelCatalogTest.java -- diff --git a/platforms/catalog/src/test/java/org/apache/camel/catalog/CamelCatalogTest.java b/platforms/catalog/src/test/java/org/apache/camel/catalog/CamelCatalogTest.java index 9de5f88..b2f7861 100644 --- a/platforms/catalog/src/test/java/org/apache/camel/catalog/CamelCatalogTest.java +++ b/platforms/catalog/src/test/java/org/apache/camel/catalog/CamelCatalogTest.java @@ -22,12 +22,14 @@ import java.util.Map; import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.ObjectMapper; -import junit.framework.TestCase; import org.junit.Test; import static org.apache.camel.catalog.CatalogHelper.loadText; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertTrue; -public class CamelCatalogTest extends TestCase { +public class CamelCatalogTest { private CamelCatalog catalog = new DefaultCamelCatalog();
[3/3] camel git commit: fix up camel-core checkstyle
fix up camel-core checkstyle Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/c5097fc0 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/c5097fc0 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/c5097fc0 Branch: refs/heads/camel-2.16.x Commit: c5097fc092ae4f061b31aa4f66657df563fbc5e4 Parents: 4715847 Author: Jonathan Anstey Authored: Sat Oct 10 18:24:46 2015 -0230 Committer: Gregor Zurowski Committed: Sun Nov 8 11:11:24 2015 +0100 -- buildingtools/src/main/resources/camel-checkstyle.xml | 2 +- .../apache/camel/api/management/mbean/CamelOpenMBeanTypes.java| 2 +- .../src/main/java/org/apache/camel/impl/DefaultRestRegistry.java | 3 ++- .../src/main/java/org/apache/camel/impl/GzipDataFormat.java | 1 - .../java/org/apache/camel/impl/DataFormatContextAwareTest.java| 1 - 5 files changed, 4 insertions(+), 5 deletions(-) -- http://git-wip-us.apache.org/repos/asf/camel/blob/c5097fc0/buildingtools/src/main/resources/camel-checkstyle.xml -- diff --git a/buildingtools/src/main/resources/camel-checkstyle.xml b/buildingtools/src/main/resources/camel-checkstyle.xml index 4c60fc6..02fd21c 100644 --- a/buildingtools/src/main/resources/camel-checkstyle.xml +++ b/buildingtools/src/main/resources/camel-checkstyle.xml @@ -53,7 +53,7 @@ lengths, if/try depths, etc... - + http://git-wip-us.apache.org/repos/asf/camel/blob/c5097fc0/camel-core/src/main/java/org/apache/camel/api/management/mbean/CamelOpenMBeanTypes.java -- diff --git a/camel-core/src/main/java/org/apache/camel/api/management/mbean/CamelOpenMBeanTypes.java b/camel-core/src/main/java/org/apache/camel/api/management/mbean/CamelOpenMBeanTypes.java index 549a2f6..fc00071 100644 --- a/camel-core/src/main/java/org/apache/camel/api/management/mbean/CamelOpenMBeanTypes.java +++ b/camel-core/src/main/java/org/apache/camel/api/management/mbean/CamelOpenMBeanTypes.java @@ -98,7 +98,7 @@ public final class CamelOpenMBeanTypes { return new CompositeType("dataformats", "DataFormats", new String[]{"option", "kind", "label", "type", "java type", "deprecated", "value", "default value", "description"}, new String[]{"Option", "Kind", "Label", "Type", "Java Type", "Deprecated", "Value", "Default Value", "Description"}, new OpenType[]{SimpleType.STRING, SimpleType.STRING, SimpleType.STRING, SimpleType.STRING, SimpleType.STRING, -SimpleType.STRING, SimpleType.STRING, SimpleType.STRING, SimpleType.STRING}); + SimpleType.STRING, SimpleType.STRING, SimpleType.STRING, SimpleType.STRING}); } http://git-wip-us.apache.org/repos/asf/camel/blob/c5097fc0/camel-core/src/main/java/org/apache/camel/impl/DefaultRestRegistry.java -- diff --git a/camel-core/src/main/java/org/apache/camel/impl/DefaultRestRegistry.java b/camel-core/src/main/java/org/apache/camel/impl/DefaultRestRegistry.java index 250566d..04a827d 100644 --- a/camel-core/src/main/java/org/apache/camel/impl/DefaultRestRegistry.java +++ b/camel-core/src/main/java/org/apache/camel/impl/DefaultRestRegistry.java @@ -91,7 +91,8 @@ public class DefaultRestRegistry extends ServiceSupport implements StaticService RestConfiguration config = camelContext.getRestConfiguration(componentName, true); String apiComponent = config.getApiComponent() != null ? config.getApiComponent() : RestApiEndpoint.DEFAULT_API_COMPONENT_NAME; String path = config.getApiContextPath() != null ? config.getApiContextPath() : "api-doc"; -restApiEndpoint = camelContext.getEndpoint(String.format("rest-api:%s/%s?componentName=%s&apiComponentName=%s&contextIdPattern=#name#", path, camelContext.getName(), componentName, apiComponent)); +restApiEndpoint = camelContext.getEndpoint(String.format("rest-api:%s/%s?componentName=%s&apiComponentName=%s&contextIdPattern=#name#", +path, camelContext.getName(), componentName, apiComponent)); } } http://git-wip-us.apache.org/repos/asf/camel/blob/c5097fc0/camel-core/src/main/java/org/apache/camel/impl/GzipDataFormat.java -- diff --git a/camel-core/src/main/java/org/apache/camel/impl/GzipDataFormat.java b/camel-core/src/main/java/org/apache/camel/impl/GzipDataFormat.java index 7770687..66f7a7f 100644 --- a/camel-core/src/main/java/org/apache/camel/impl/GzipDataFormat.java +++ b/camel-c
[1/3] camel git commit: fix apt CS
Repository: camel Updated Branches: refs/heads/camel-2.16.x 8e91fd069 -> c5097fc09 fix apt CS Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/827e7bc7 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/827e7bc7 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/827e7bc7 Branch: refs/heads/camel-2.16.x Commit: 827e7bc766a99901c1f449bb6c3f7b2765303e9f Parents: 8e91fd0 Author: Jonathan Anstey Authored: Sat Oct 10 17:49:34 2015 -0230 Committer: Gregor Zurowski Committed: Sun Nov 8 11:10:43 2015 +0100 -- .../java/org/apache/camel/tools/apt/EipAnnotationProcessor.java| 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/camel/blob/827e7bc7/tooling/apt/src/main/java/org/apache/camel/tools/apt/EipAnnotationProcessor.java -- diff --git a/tooling/apt/src/main/java/org/apache/camel/tools/apt/EipAnnotationProcessor.java b/tooling/apt/src/main/java/org/apache/camel/tools/apt/EipAnnotationProcessor.java index dfa5763..e7e6387 100644 --- a/tooling/apt/src/main/java/org/apache/camel/tools/apt/EipAnnotationProcessor.java +++ b/tooling/apt/src/main/java/org/apache/camel/tools/apt/EipAnnotationProcessor.java @@ -81,7 +81,7 @@ public class EipAnnotationProcessor extends AbstractAnnotationProcessor { }; // special for verbs (these classes have sub classes, so we use this to find all classes) private static final String[] ONE_OF_VERBS = new String[]{ -"org.apache.camel.model.rest.VerbDefinition" +"org.apache.camel.model.rest.VerbDefinition" }; private boolean skipUnwanted = true;
[2/3] camel git commit: Fix Checkstyle errors
Fix Checkstyle errors Signed-off-by: Gregor Zurowski Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/47158476 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/47158476 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/47158476 Branch: refs/heads/camel-2.16.x Commit: 47158476ea229fde7d9b6d534e05cc66dfc91aea Parents: 827e7bc Author: Gregor Zurowski Authored: Fri Oct 16 20:31:26 2015 +0200 Committer: Gregor Zurowski Committed: Sun Nov 8 11:11:03 2015 +0100 -- .../java/org/apache/camel/tools/apt/EipAnnotationProcessor.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -- http://git-wip-us.apache.org/repos/asf/camel/blob/47158476/tooling/apt/src/main/java/org/apache/camel/tools/apt/EipAnnotationProcessor.java -- diff --git a/tooling/apt/src/main/java/org/apache/camel/tools/apt/EipAnnotationProcessor.java b/tooling/apt/src/main/java/org/apache/camel/tools/apt/EipAnnotationProcessor.java index e7e6387..53bc12d 100644 --- a/tooling/apt/src/main/java/org/apache/camel/tools/apt/EipAnnotationProcessor.java +++ b/tooling/apt/src/main/java/org/apache/camel/tools/apt/EipAnnotationProcessor.java @@ -60,8 +60,8 @@ public class EipAnnotationProcessor extends AbstractAnnotationProcessor { // special when using expression/predicates in the model private static final String ONE_OF_TYPE_NAME = "org.apache.camel.model.ExpressionSubElementDefinition"; private static final String[] ONE_OF_LANGUAGES = new String[]{ -"org.apache.camel.model.language.ExpressionDefinition", -"org.apache.camel.model.language.NamespaceAwareExpression" +"org.apache.camel.model.language.ExpressionDefinition", +"org.apache.camel.model.language.NamespaceAwareExpression" }; // special for inputs (these classes have sub classes, so we use this to find all classes) private static final String[] ONE_OF_INPUTS = new String[]{
camel git commit: Fix Checkstyle issues
Repository: camel Updated Branches: refs/heads/camel-2.16.x e5881b17f -> 489277c54 Fix Checkstyle issues Signed-off-by: Gregor Zurowski Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/489277c5 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/489277c5 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/489277c5 Branch: refs/heads/camel-2.16.x Commit: 489277c543a5c42786b9da1f2b76475fc5613bd8 Parents: e5881b1 Author: Gregor Zurowski Authored: Sat Oct 17 19:11:54 2015 +0200 Committer: Gregor Zurowski Committed: Sun Nov 8 12:10:16 2015 +0100 -- .../org/apache/camel/groovy/dataformat/AbstractXmlDataFormat.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/camel/blob/489277c5/components/camel-groovy/src/main/java/org/apache/camel/groovy/dataformat/AbstractXmlDataFormat.java -- diff --git a/components/camel-groovy/src/main/java/org/apache/camel/groovy/dataformat/AbstractXmlDataFormat.java b/components/camel-groovy/src/main/java/org/apache/camel/groovy/dataformat/AbstractXmlDataFormat.java index 8ec6087..9202059 100644 --- a/components/camel-groovy/src/main/java/org/apache/camel/groovy/dataformat/AbstractXmlDataFormat.java +++ b/components/camel-groovy/src/main/java/org/apache/camel/groovy/dataformat/AbstractXmlDataFormat.java @@ -19,13 +19,14 @@ package org.apache.camel.groovy.dataformat; import javax.xml.parsers.SAXParser; import javax.xml.parsers.SAXParserFactory; -import org.apache.camel.support.ServiceSupport; import org.xml.sax.ErrorHandler; import org.xml.sax.SAXException; import org.xml.sax.SAXParseException; import groovy.xml.FactorySupport; + import org.apache.camel.spi.DataFormat; +import org.apache.camel.support.ServiceSupport; import org.slf4j.Logger; import org.slf4j.LoggerFactory;
camel git commit: Fix Checkstyle issues
Repository: camel Updated Branches: refs/heads/camel-2.16.x 489277c54 -> 0fdf9c9ef Fix Checkstyle issues Signed-off-by: Gregor Zurowski Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/0fdf9c9e Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/0fdf9c9e Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/0fdf9c9e Branch: refs/heads/camel-2.16.x Commit: 0fdf9c9ef96b5c06127b27b87e5b06040a37d9d4 Parents: 489277c Author: Gregor Zurowski Authored: Sat Oct 17 19:41:44 2015 +0200 Committer: Gregor Zurowski Committed: Sun Nov 8 12:12:17 2015 +0100 -- .../main/java/org/apache/camel/converter/jaxb/JaxbDataFormat.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/camel/blob/0fdf9c9e/components/camel-jaxb/src/main/java/org/apache/camel/converter/jaxb/JaxbDataFormat.java -- diff --git a/components/camel-jaxb/src/main/java/org/apache/camel/converter/jaxb/JaxbDataFormat.java b/components/camel-jaxb/src/main/java/org/apache/camel/converter/jaxb/JaxbDataFormat.java index dc5090e..7a205fe 100644 --- a/components/camel-jaxb/src/main/java/org/apache/camel/converter/jaxb/JaxbDataFormat.java +++ b/components/camel-jaxb/src/main/java/org/apache/camel/converter/jaxb/JaxbDataFormat.java @@ -45,7 +45,6 @@ import javax.xml.transform.stream.StreamSource; import javax.xml.validation.Schema; import javax.xml.validation.SchemaFactory; -import org.apache.camel.spi.DataFormatName; import org.xml.sax.SAXException; import org.apache.camel.CamelContext; @@ -55,6 +54,7 @@ import org.apache.camel.InvalidPayloadException; import org.apache.camel.NoTypeConversionAvailableException; import org.apache.camel.TypeConverter; import org.apache.camel.spi.DataFormat; +import org.apache.camel.spi.DataFormatName; import org.apache.camel.support.ServiceSupport; import org.apache.camel.util.CamelContextHelper; import org.apache.camel.util.IOHelper;
camel git commit: Fix Checkstyle issues
Repository: camel Updated Branches: refs/heads/camel-2.16.x 0fdf9c9ef -> ca9a05a2c Fix Checkstyle issues Signed-off-by: Gregor Zurowski Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/ca9a05a2 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/ca9a05a2 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/ca9a05a2 Branch: refs/heads/camel-2.16.x Commit: ca9a05a2cb56d6c77da9cfcc6ed87f260974acef Parents: 0fdf9c9 Author: Gregor Zurowski Authored: Sat Oct 17 21:24:16 2015 +0200 Committer: Gregor Zurowski Committed: Sun Nov 8 12:26:57 2015 +0100 -- .../java/org/apache/camel/component/sql/DefaultSqlEndpoint.java | 3 ++- .../src/main/java/org/apache/camel/component/sql/SqlConsumer.java | 3 ++- .../sql/SqlComponentConfigurationAndDocumentationTest.java| 3 ++- 3 files changed, 6 insertions(+), 3 deletions(-) -- http://git-wip-us.apache.org/repos/asf/camel/blob/ca9a05a2/components/camel-sql/src/main/java/org/apache/camel/component/sql/DefaultSqlEndpoint.java -- diff --git a/components/camel-sql/src/main/java/org/apache/camel/component/sql/DefaultSqlEndpoint.java b/components/camel-sql/src/main/java/org/apache/camel/component/sql/DefaultSqlEndpoint.java index c67ecc1..2de1d64 100644 --- a/components/camel-sql/src/main/java/org/apache/camel/component/sql/DefaultSqlEndpoint.java +++ b/components/camel-sql/src/main/java/org/apache/camel/component/sql/DefaultSqlEndpoint.java @@ -54,7 +54,8 @@ public abstract class DefaultSqlEndpoint extends DefaultPollingEndpoint { description = "Allows to plugin to use a custom org.apache.camel.component.sql.SqlPrepareStatementStrategy to control preparation of the query and prepared statement.") private SqlPrepareStatementStrategy prepareStatementStrategy; @UriParam(label = "consumer", -description = "After processing each row then this query can be executed, if the Exchange was processed successfully, for example to mark the row as processed. The query can have parameter.") +description = "After processing each row then this query can be executed, if the Exchange was processed successfully, for example to mark the row as processed. The query can have" ++ " parameter.") private String onConsume; @UriParam(label = "consumer", description = "After processing each row then this query can be executed, if the Exchange failed, for example to mark the row as failed. The query can have parameter.") http://git-wip-us.apache.org/repos/asf/camel/blob/ca9a05a2/components/camel-sql/src/main/java/org/apache/camel/component/sql/SqlConsumer.java -- diff --git a/components/camel-sql/src/main/java/org/apache/camel/component/sql/SqlConsumer.java b/components/camel-sql/src/main/java/org/apache/camel/component/sql/SqlConsumer.java index 0f52280..ce8135a 100644 --- a/components/camel-sql/src/main/java/org/apache/camel/component/sql/SqlConsumer.java +++ b/components/camel-sql/src/main/java/org/apache/camel/component/sql/SqlConsumer.java @@ -63,7 +63,8 @@ public class SqlConsumer extends ScheduledBatchPollingConsumer { } } -public SqlConsumer(DefaultSqlEndpoint endpoint, Processor processor, JdbcTemplate jdbcTemplate, String query, SqlPrepareStatementStrategy sqlPrepareStatementStrategy, SqlProcessingStrategy sqlProcessingStrategy) { +public SqlConsumer(DefaultSqlEndpoint endpoint, Processor processor, JdbcTemplate jdbcTemplate, String query, SqlPrepareStatementStrategy sqlPrepareStatementStrategy, +SqlProcessingStrategy sqlProcessingStrategy) { super(endpoint, processor); this.jdbcTemplate = jdbcTemplate; this.namedJdbcTemplate = null; http://git-wip-us.apache.org/repos/asf/camel/blob/ca9a05a2/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlComponentConfigurationAndDocumentationTest.java -- diff --git a/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlComponentConfigurationAndDocumentationTest.java b/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlComponentConfigurationAndDocumentationTest.java index f3d0674..68bbe9c 100644 --- a/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlComponentConfigurationAndDocumentationTest.java +++ b/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlComponentConfigurationAndDocumentationTest.java @@ -48,7 +48,8 @@ public class SqlComponentConfigurationAndDocumentationTest extends CamelTestSupp assertTrue(json.contains("\"onConsumeBatchComplete\": { \
[3/3] camel git commit: Fix Checkstyle issues
Fix Checkstyle issues Signed-off-by: Gregor Zurowski Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/7a5fd88f Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/7a5fd88f Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/7a5fd88f Branch: refs/heads/camel-2.16.x Commit: 7a5fd88f34ebdf16477171b0d75e444f68cd6740 Parents: 231a24d Author: Gregor Zurowski Authored: Sat Oct 17 10:31:31 2015 +0200 Committer: Gregor Zurowski Committed: Sun Nov 8 13:13:26 2015 +0100 -- .../main/java/org/apache/camel/component/xmpp/XmppBinding.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) -- http://git-wip-us.apache.org/repos/asf/camel/blob/7a5fd88f/components/camel-xmpp/src/main/java/org/apache/camel/component/xmpp/XmppBinding.java -- diff --git a/components/camel-xmpp/src/main/java/org/apache/camel/component/xmpp/XmppBinding.java b/components/camel-xmpp/src/main/java/org/apache/camel/component/xmpp/XmppBinding.java index ddb198b..b33bdbb 100644 --- a/components/camel-xmpp/src/main/java/org/apache/camel/component/xmpp/XmppBinding.java +++ b/components/camel-xmpp/src/main/java/org/apache/camel/component/xmpp/XmppBinding.java @@ -135,12 +135,12 @@ public class XmppBinding { Map answer = new HashMap(); PacketExtension jpe = xmppPacket.getExtension(JivePropertiesExtension.NAMESPACE); -if (jpe !=null && jpe instanceof JivePropertiesExtension) { +if (jpe != null && jpe instanceof JivePropertiesExtension) { extractHeadersFrom((JivePropertiesExtension)jpe, exchange, answer); } -if (jpe !=null && jpe instanceof DefaultPacketExtension) { +if (jpe != null && jpe instanceof DefaultPacketExtension) { extractHeadersFrom((DefaultPacketExtension)jpe, exchange, answer); -} +} if (xmppPacket instanceof Message) { Message xmppMessage = (Message) xmppPacket;
[1/3] camel git commit: Fix Checkstyle issues
Repository: camel Updated Branches: refs/heads/camel-2.16.x ca9a05a2c -> 7a5fd88f3 Fix Checkstyle issues Signed-off-by: Gregor Zurowski Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/805486ba Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/805486ba Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/805486ba Branch: refs/heads/camel-2.16.x Commit: 805486bad1cb3018de28b1fdef16d820da08c5c5 Parents: ca9a05a Author: Gregor Zurowski Authored: Sat Oct 17 21:34:21 2015 +0200 Committer: Gregor Zurowski Committed: Sun Nov 8 13:08:57 2015 +0100 -- .../org/apache/camel/dataformat/xmlrpc/XmlRpcDataFormat.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -- http://git-wip-us.apache.org/repos/asf/camel/blob/805486ba/components/camel-xmlrpc/src/main/java/org/apache/camel/dataformat/xmlrpc/XmlRpcDataFormat.java -- diff --git a/components/camel-xmlrpc/src/main/java/org/apache/camel/dataformat/xmlrpc/XmlRpcDataFormat.java b/components/camel-xmlrpc/src/main/java/org/apache/camel/dataformat/xmlrpc/XmlRpcDataFormat.java index cd90a0d..d04d651 100644 --- a/components/camel-xmlrpc/src/main/java/org/apache/camel/dataformat/xmlrpc/XmlRpcDataFormat.java +++ b/components/camel-xmlrpc/src/main/java/org/apache/camel/dataformat/xmlrpc/XmlRpcDataFormat.java @@ -23,8 +23,6 @@ import java.io.OutputStream; import java.io.OutputStreamWriter; import java.io.UnsupportedEncodingException; -import org.apache.camel.spi.DataFormatName; -import org.apache.camel.support.ServiceSupport; import org.xml.sax.InputSource; import org.xml.sax.SAXException; import org.xml.sax.XMLReader; @@ -33,6 +31,8 @@ import org.apache.camel.Exchange; import org.apache.camel.component.xmlrpc.XmlRpcConstants; import org.apache.camel.component.xmlrpc.XmlRpcRequestImpl; import org.apache.camel.spi.DataFormat; +import org.apache.camel.spi.DataFormatName; +import org.apache.camel.support.ServiceSupport; import org.apache.camel.util.IOHelper; import org.apache.ws.commons.serialize.CharSetXMLWriter; import org.apache.ws.commons.serialize.XMLWriter;
[2/3] camel git commit: Fix Checkstyle issues
Fix Checkstyle issues Signed-off-by: Gregor Zurowski Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/231a24d5 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/231a24d5 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/231a24d5 Branch: refs/heads/camel-2.16.x Commit: 231a24d56f284007fb991dc33aecc6d3edeaaf56 Parents: 805486b Author: Gregor Zurowski Authored: Sat Oct 17 21:39:08 2015 +0200 Committer: Gregor Zurowski Committed: Sun Nov 8 13:11:20 2015 +0100 -- .../camel/dataformat/xmlsecurity/XMLSecurityDataFormat.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -- http://git-wip-us.apache.org/repos/asf/camel/blob/231a24d5/components/camel-xmlsecurity/src/main/java/org/apache/camel/dataformat/xmlsecurity/XMLSecurityDataFormat.java -- diff --git a/components/camel-xmlsecurity/src/main/java/org/apache/camel/dataformat/xmlsecurity/XMLSecurityDataFormat.java b/components/camel-xmlsecurity/src/main/java/org/apache/camel/dataformat/xmlsecurity/XMLSecurityDataFormat.java index 25da8f4..1261df2 100755 --- a/components/camel-xmlsecurity/src/main/java/org/apache/camel/dataformat/xmlsecurity/XMLSecurityDataFormat.java +++ b/components/camel-xmlsecurity/src/main/java/org/apache/camel/dataformat/xmlsecurity/XMLSecurityDataFormat.java @@ -40,8 +40,6 @@ import javax.crypto.spec.DESedeKeySpec; import javax.crypto.spec.SecretKeySpec; import javax.xml.transform.dom.DOMSource; -import org.apache.camel.spi.DataFormatName; -import org.apache.camel.support.ServiceSupport; import org.w3c.dom.Document; import org.w3c.dom.Element; import org.w3c.dom.Node; @@ -52,6 +50,8 @@ import org.apache.camel.Exchange; import org.apache.camel.builder.xml.DefaultNamespaceContext; import org.apache.camel.builder.xml.XPathBuilder; import org.apache.camel.spi.DataFormat; +import org.apache.camel.spi.DataFormatName; +import org.apache.camel.support.ServiceSupport; import org.apache.camel.util.IOHelper; import org.apache.camel.util.jsse.KeyStoreParameters; import org.apache.xml.security.encryption.EncryptedData;
camel git commit: Refactor to JUnit 4-style test classes
Repository: camel Updated Branches: refs/heads/camel-2.16.x 7a5fd88f3 -> 749089c09 Refactor to JUnit 4-style test classes Signed-off-by: Gregor Zurowski Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/749089c0 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/749089c0 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/749089c0 Branch: refs/heads/camel-2.16.x Commit: 749089c09842d5bcdb2cd370d457dd4080137b32 Parents: 7a5fd88 Author: Gregor Zurowski Authored: Sat Nov 7 21:15:11 2015 +0100 Committer: Gregor Zurowski Committed: Sun Nov 8 13:16:30 2015 +0100 -- .../apache/camel/catalog/CamelCatalogMBeanExporterTest.java| 6 -- .../test/java/org/apache/camel/catalog/CamelCatalogTest.java | 6 -- 2 files changed, 8 insertions(+), 4 deletions(-) -- http://git-wip-us.apache.org/repos/asf/camel/blob/749089c0/platforms/catalog/src/test/java/org/apache/camel/catalog/CamelCatalogMBeanExporterTest.java -- diff --git a/platforms/catalog/src/test/java/org/apache/camel/catalog/CamelCatalogMBeanExporterTest.java b/platforms/catalog/src/test/java/org/apache/camel/catalog/CamelCatalogMBeanExporterTest.java index 7492c04..1d6d1bc 100644 --- a/platforms/catalog/src/test/java/org/apache/camel/catalog/CamelCatalogMBeanExporterTest.java +++ b/platforms/catalog/src/test/java/org/apache/camel/catalog/CamelCatalogMBeanExporterTest.java @@ -20,9 +20,11 @@ import java.lang.management.ManagementFactory; import javax.management.MBeanServer; import javax.management.ObjectName; -import junit.framework.TestCase; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertTrue; -public class CamelCatalogMBeanExporterTest extends TestCase { +public class CamelCatalogMBeanExporterTest { private CamelCatalogMBeanExporter exporter = new CamelCatalogMBeanExporter(); http://git-wip-us.apache.org/repos/asf/camel/blob/749089c0/platforms/catalog/src/test/java/org/apache/camel/catalog/CamelCatalogTest.java -- diff --git a/platforms/catalog/src/test/java/org/apache/camel/catalog/CamelCatalogTest.java b/platforms/catalog/src/test/java/org/apache/camel/catalog/CamelCatalogTest.java index 9de5f88..b2f7861 100644 --- a/platforms/catalog/src/test/java/org/apache/camel/catalog/CamelCatalogTest.java +++ b/platforms/catalog/src/test/java/org/apache/camel/catalog/CamelCatalogTest.java @@ -22,12 +22,14 @@ import java.util.Map; import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.ObjectMapper; -import junit.framework.TestCase; import org.junit.Test; import static org.apache.camel.catalog.CatalogHelper.loadText; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertTrue; -public class CamelCatalogTest extends TestCase { +public class CamelCatalogTest { private CamelCatalog catalog = new DefaultCamelCatalog();
camel git commit: Fix Checkstyle issues
Repository: camel Updated Branches: refs/heads/camel-2.16.x 749089c09 -> 5e70c92e4 Fix Checkstyle issues Signed-off-by: Gregor Zurowski Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/5e70c92e Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/5e70c92e Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/5e70c92e Branch: refs/heads/camel-2.16.x Commit: 5e70c92e4fda95988182c66aaa3bbc844fd54d31 Parents: 749089c Author: Gregor Zurowski Authored: Sat Oct 17 21:45:08 2015 +0200 Committer: Gregor Zurowski Committed: Sun Nov 8 13:18:23 2015 +0100 -- .../src/main/java/org/apache/camel/commands/RouteListCommand.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/camel/blob/5e70c92e/platforms/commands/commands-core/src/main/java/org/apache/camel/commands/RouteListCommand.java -- diff --git a/platforms/commands/commands-core/src/main/java/org/apache/camel/commands/RouteListCommand.java b/platforms/commands/commands-core/src/main/java/org/apache/camel/commands/RouteListCommand.java index 2c94afd..95bdd3e 100644 --- a/platforms/commands/commands-core/src/main/java/org/apache/camel/commands/RouteListCommand.java +++ b/platforms/commands/commands-core/src/main/java/org/apache/camel/commands/RouteListCommand.java @@ -58,7 +58,8 @@ public class RouteListCommand extends AbstractCamelCommand { final String rowFormat = buildFormatString(columnWidths, false); if (routes.size() > 0) { -out.println(String.format(headerFormat, CONTEXT_COLUMN_LABEL, ROUTE_COLUMN_LABEL, STATUS_COLUMN_LABEL, TOTAL_COLUMN_LABEL, FAILED_COLUMN_LABEL, INFLIGHT_COLUMN_LABEL, UPTIME_COLUMN_LABEL)); +out.println(String.format(headerFormat, CONTEXT_COLUMN_LABEL, ROUTE_COLUMN_LABEL, STATUS_COLUMN_LABEL, TOTAL_COLUMN_LABEL, FAILED_COLUMN_LABEL, INFLIGHT_COLUMN_LABEL, +UPTIME_COLUMN_LABEL)); out.println(String.format(headerFormat, "---", "-", "--", "---", "", "--", "--")); for (Map row : routes) { String contextId = row.get("camelContextName");
svn commit: r11148 - /release/camel/apache-camel/2.14.4/
Author: gzurowski Date: Wed Nov 11 21:52:01 2015 New Revision: 11148 Log: Apache Camel 2.14.4 release distro placeholder. Added: release/camel/apache-camel/2.14.4/
svn commit: r11149 - /release/camel/apache-camel/2.14.4/
Author: gzurowski Date: Wed Nov 11 21:56:18 2015 New Revision: 11149 Log: Apache Camel 2.14.4 released artifacts. Added: release/camel/apache-camel/2.14.4/apache-camel-2.14.4-src.zip (with props) release/camel/apache-camel/2.14.4/apache-camel-2.14.4-src.zip.asc release/camel/apache-camel/2.14.4/apache-camel-2.14.4-src.zip.md5 release/camel/apache-camel/2.14.4/apache-camel-2.14.4-src.zip.sha1 release/camel/apache-camel/2.14.4/apache-camel-2.14.4.pom release/camel/apache-camel/2.14.4/apache-camel-2.14.4.pom.asc release/camel/apache-camel/2.14.4/apache-camel-2.14.4.pom.md5 release/camel/apache-camel/2.14.4/apache-camel-2.14.4.pom.sha1 release/camel/apache-camel/2.14.4/apache-camel-2.14.4.tar.gz (with props) release/camel/apache-camel/2.14.4/apache-camel-2.14.4.tar.gz.asc release/camel/apache-camel/2.14.4/apache-camel-2.14.4.tar.gz.md5 release/camel/apache-camel/2.14.4/apache-camel-2.14.4.tar.gz.sha1 release/camel/apache-camel/2.14.4/apache-camel-2.14.4.zip (with props) release/camel/apache-camel/2.14.4/apache-camel-2.14.4.zip.asc release/camel/apache-camel/2.14.4/apache-camel-2.14.4.zip.md5 release/camel/apache-camel/2.14.4/apache-camel-2.14.4.zip.sha1 Added: release/camel/apache-camel/2.14.4/apache-camel-2.14.4-src.zip == Binary file - no diff available. Propchange: release/camel/apache-camel/2.14.4/apache-camel-2.14.4-src.zip -- svn:mime-type = application/octet-stream Added: release/camel/apache-camel/2.14.4/apache-camel-2.14.4-src.zip.asc == --- release/camel/apache-camel/2.14.4/apache-camel-2.14.4-src.zip.asc (added) +++ release/camel/apache-camel/2.14.4/apache-camel-2.14.4-src.zip.asc Wed Nov 11 21:56:18 2015 @@ -0,0 +1,17 @@ +-BEGIN PGP SIGNATURE- +Version: GnuPG v1 + +iQIcBAABAgAGBQJWPRv7AAoJEJ1b7/pZQsBJGJ8P/jJMIs+gpYKx2j9pDasQkzP2 +tfeErFLRxwOv4J+tLYRlnJu3XCc5Lom1gjwOXbntw0qrHTVXvlMPkxA0yZZjL5jg +juxyXO5oH0BEk/clNVuDOgIqgWsr+1XJ//urj/Ghj65Pn9hgswrndeMyp+UaQBHd +afo98EBr8AlGO2jhureQnK6NjhZfcbL15yEDUnYRUWJjUlhXQd2v23riFzWIqdGa +uA/6l1nqIwg10ysrTSMOBBnaeUpvW0enBxK+PXfsHWNYhPcWVg53Zvb1HMsyjlVM +xHS1cM7dE1Gh6ptiOqrvd6nGyqX1x+gEnB1qhYg9zm94fmbWtiQ+clIMVZ2l0toY +KCTKlyjc7OkcbWTYqfy0qQILc9ryCMO03N9dp/eVGU+1kOfYQGHEpQt+3LvLvfrF +Dznx+lochveJAoKD6VkDdC7+4VSbjlEnob414ITEKilnkUfWNokbpLX9uNYbO2ks +b8zSrpPg6BCaZ8A/RYHY708MMZZ02x0AzBNhKS35KLchEPb/z598sfD6C5QEGFOS +mUClm5FvTvHLgiqMunanYSrG3kXeFJlpdQtVwHkJ3voGW/5c6/c36L3eLr/6FTtG +NuLRdlPQWXz+JfgzJZvasIluK40x9MDXde6983saUDzpAxcgebET78UGzqiXR22U +04g0X48PCq2GrEh6qoH6 +=N+Dd +-END PGP SIGNATURE- Added: release/camel/apache-camel/2.14.4/apache-camel-2.14.4-src.zip.md5 == --- release/camel/apache-camel/2.14.4/apache-camel-2.14.4-src.zip.md5 (added) +++ release/camel/apache-camel/2.14.4/apache-camel-2.14.4-src.zip.md5 Wed Nov 11 21:56:18 2015 @@ -0,0 +1 @@ +a2a493dbe0b7bcd3d74c5f1c90636f50 \ No newline at end of file Added: release/camel/apache-camel/2.14.4/apache-camel-2.14.4-src.zip.sha1 == --- release/camel/apache-camel/2.14.4/apache-camel-2.14.4-src.zip.sha1 (added) +++ release/camel/apache-camel/2.14.4/apache-camel-2.14.4-src.zip.sha1 Wed Nov 11 21:56:18 2015 @@ -0,0 +1 @@ +294da96ba68d050084d3a175ea0a5e342ff0ce7c \ No newline at end of file Added: release/camel/apache-camel/2.14.4/apache-camel-2.14.4.pom == --- release/camel/apache-camel/2.14.4/apache-camel-2.14.4.pom (added) +++ release/camel/apache-camel/2.14.4/apache-camel-2.14.4.pom Wed Nov 11 21:56:18 2015 @@ -0,0 +1,937 @@ + + +http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd";> + + 4.0.0 + + +org.apache.camel +camel-parent +2.14.4 +../parent + + + apache-camel + Camel :: Assembly + Apache Camel Assembly + pom + + +true +false +1.0.1 + + + + + + org.apache.camel + camel-core + + + org.apache.camel + camel-core-osgi + + + org.apache.camel + camel-core-xml + + + org.apache.camel + camel-ahc + + + org.apache.camel + camel-ahc-ws + + + org.apache.camel + camel-amqp + + + org.apache.camel + camel-apns + + + org.apache.camel + camel-atmosphere-websocket + + + org.apache.camel + camel-atom + + + org.apache.camel + camel-aws + + + org.ap
svn commit: r11150 - /release/camel/apache-camel/2.14.3/
Author: gzurowski Date: Wed Nov 11 21:58:41 2015 New Revision: 11150 Log: Remove old release 2.14.3 Removed: release/camel/apache-camel/2.14.3/
svn commit: r972141 [5/5] - in /websites/production/camel/content/schema: blueprint/ cxf/ spring-security/ spring/ spring/integration/
Added: websites/production/camel/content/schema/spring/integration/camel-spring-integration-2.14.4.xsd == --- websites/production/camel/content/schema/spring/integration/camel-spring-integration-2.14.4.xsd (added) +++ websites/production/camel/content/schema/spring/integration/camel-spring-integration-2.14.4.xsd Wed Nov 11 22:15:51 2015 @@ -0,0 +1,65 @@ + + +http://camel.apache.org/schema/spring/integration"; + xmlns:xsd="http://www.w3.org/2001/XMLSchema"; + xmlns:beans="http://www.springframework.org/schema/beans"; + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; + xmlns:camel-spring="http://camel.apache.org/schema/spring"; + targetNamespace="http://camel.apache.org/schema/spring/integration"; + elementFormDefault="qualified" + attributeFormDefault="unqualified"> + + http://www.springframework.org/schema/beans"; schemaLocation="http://www.springframework.org/schema/beans/spring-beans.xsd"/> + http://camel.apache.org/schema/spring"; schemaLocation="http://camel.apache.org/schema/spring/camel-spring.xsd"/> + + + + + + + + + + + + + + + + + Defines a camel-source for handling the Camel context message in Spring Integration message bus. + + + + + + + + + + + + + + Defines a camel-target to feed Spring Integration message to the Camel context. + + + +
svn commit: r972141 [4/5] - in /websites/production/camel/content/schema: blueprint/ cxf/ spring-security/ spring/ spring/integration/
Added: websites/production/camel/content/schema/spring/camel-spring-2.14.4.xsd == --- websites/production/camel/content/schema/spring/camel-spring-2.14.4.xsd (added) +++ websites/production/camel/content/schema/spring/camel-spring-2.14.4.xsd Wed Nov 11 22:15:51 2015 @@ -0,0 +1,3518 @@ + +http://camel.apache.org/schema/spring"; xmlns:tns="http://camel.apache.org/schema/spring"; xmlns:xs="http://www.w3.org/2001/XMLSchema";> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
svn commit: r972141 [1/5] - in /websites/production/camel/content/schema: blueprint/ cxf/ spring-security/ spring/ spring/integration/
Author: gzurowski Date: Wed Nov 11 22:15:51 2015 New Revision: 972141 Log: Uploading released schemas for camel-2.14.4 Added: websites/production/camel/content/schema/blueprint/camel-blueprint-2.14.4.xsd websites/production/camel/content/schema/cxf/camel-cxf-2.14.4-blueprint.xsd websites/production/camel/content/schema/cxf/camel-cxf-2.14.4-spring.xsd websites/production/camel/content/schema/spring-security/camel-spring-security-2.14.4.xsd websites/production/camel/content/schema/spring/camel-spring-2.14.4.xsd websites/production/camel/content/schema/spring/integration/camel-spring-integration-2.14.4.xsd
svn commit: r972141 [3/5] - in /websites/production/camel/content/schema: blueprint/ cxf/ spring-security/ spring/ spring/integration/
Added: websites/production/camel/content/schema/cxf/camel-cxf-2.14.4-blueprint.xsd == --- websites/production/camel/content/schema/cxf/camel-cxf-2.14.4-blueprint.xsd (added) +++ websites/production/camel/content/schema/cxf/camel-cxf-2.14.4-blueprint.xsd Wed Nov 11 22:15:51 2015 @@ -0,0 +1,178 @@ + + +http://camel.apache.org/schema/blueprint/cxf"; +xmlns:xsd="http://www.w3.org/2001/XMLSchema"; +xmlns:beans="http://www.osgi.org/xmlns/blueprint/v1.0.0"; +xmlns:cxf-beans="http://cxf.apache.org/configuration/beans"; +xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; +targetNamespace="http://camel.apache.org/schema/blueprint/cxf"; +elementFormDefault="qualified" +attributeFormDefault="unqualified" +xsi:schemaLocation="http://www.osgi.org/xmlns/blueprint/v1.0.0 http://www.osgi.org/xmlns/blueprint/v1.0.0/blueprint.xsd";> + + http://www.osgi.org/xmlns/blueprint/v1.0.0"; schemaLocation="http://www.osgi.org/xmlns/blueprint/v1.0.0/blueprint.xsd"/> + http://cxf.apache.org/configuration/beans"; schemaLocation="http://cxf.apache.org/schemas/configuration/cxf-beans.xsd"/> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file Added: websites/production/camel/content/schema/cxf/camel-cxf-2.14.4-spring.xsd == --- websites/production/camel/content/schema/cxf/camel-cxf-2.14.4-spring.xsd (added) +++ websites/production/camel/content/schema/cxf/camel-cxf-2.14.4-spring.xsd Wed Nov 11 22:15:51 2015 @@ -0,0 +1,179 @@ + + +http://camel.apache.org/schema/cxf"; + xmlns:xsd="http://www.w3.org/2001/XMLSchema"; + xmlns:beans="http://www.springframework.org/schema/beans"; + xmlns:cxf-beans="http://cxf.apache.org/configuration/beans"; + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; + targetNamespace="http://camel.apache.org/schema/cxf"; + elementFormDefault="qualified" + attributeFormDefault="unqualified"> + + http://www.springframework.org/schema/beans"; schemaLocation="http://www.springframework.org/schema/beans/spring-beans.xsd"/> + http://cxf.apache.org/configuration/beans"; schemaLocation="http://cxf.apache.org/schemas/configuration/cxf-beans.xsd"/> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
svn commit: r972141 [2/5] - in /websites/production/camel/content/schema: blueprint/ cxf/ spring-security/ spring/ spring/integration/
Added: websites/production/camel/content/schema/blueprint/camel-blueprint-2.14.4.xsd == --- websites/production/camel/content/schema/blueprint/camel-blueprint-2.14.4.xsd (added) +++ websites/production/camel/content/schema/blueprint/camel-blueprint-2.14.4.xsd Wed Nov 11 22:15:51 2015 @@ -0,0 +1,3519 @@ + +http://camel.apache.org/schema/blueprint"; xmlns:tns="http://camel.apache.org/schema/blueprint"; xmlns:xs="http://www.w3.org/2001/XMLSchema";> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
svn commit: r972142 - /websites/production/camel/content/manual/camel-manual-2.14.4.html
Author: gzurowski Date: Wed Nov 11 22:16:36 2015 New Revision: 972142 Log: Uploading released manuals for camel-2.14.4 Added: websites/production/camel/content/manual/camel-manual-2.14.4.html Added: websites/production/camel/content/manual/camel-manual-2.14.4.html == --- websites/production/camel/content/manual/camel-manual-2.14.4.html (added) +++ websites/production/camel/content/manual/camel-manual-2.14.4.html Wed Nov 11 22:16:36 2015 @@ -0,0 +1,27001 @@ + + +http://camel.apache.org/styles/camel-manual.css"; rel="stylesheet" type="text/css" /> + +@page :left { +@top-left { +content: "Apache Camel 2.14.4 Developer's Manual"; +} +} + + + + + + + + + + + +SyntaxHighlighter.defaults['toolbar'] = false; +SyntaxHighlighter.all(); + + +Apache CamelUser GuideVersion 2.14.4 + Copyright 2007-2015, Apache Software Foundation + +Table of Contents + + +Table of ContentsIntroductionQuickstartGetting StartedArchitectureEnterprise Integration PatternsCook BookTutorialsLanguage AppendixDataFormat AppendixPattern AppendixComponent AppendixIndex + + +Introduction + +Apache Camel ™ is a versatile open-source integration framework based on known Enterprise Integration Patterns. + +Camel empowers you to define routing and mediation rules in a variety of domain-specific languages, including a Java-based Fluent API, Spring or Blueprint XML Configuration files, and a Scala DSL. This means you get smart completion of routing rules in your IDE, whether in a Java, Scala or XML editor. + +Apache Camel uses URIs to work directly with any kind of Transport or messaging model such as HTTP, ActiveMQ, JMS, JBI, SCA, MINA or CXF, as well as pluggable Components and Data Format options. Apache Camel is a small library with minimal dependencies for easy embedding in any Java application. Apache Camel lets you work with the same API regardless which kind of Transport is used - so learn the API once and you can interact with all the Components provided out-of-box. + +Apache Camel provides support for Bean Binding and seamless integration with popular frameworks such as Spring, Blueprint and Guice. Camel also has extensive support for unit testing your routes. + +The following projects can leverage Apache Camel as a routing and mediation engine: + +http://servicemix.apache.org/";>Apache ServiceMix - a popular distributed open source ESB and JBI containerhttp://activemq.apache.org/";>Apache ActiveMQ - a mature, widely used open source message brokerhttp://cxf.apache.org/";>Apache CXF - a smart web services suite (JAX-WS and JAX-RS)http://karaf.apache.org/";>Apache Karaf - a small OSGi based runtime in which applications can be deployedhttp://mina.apache.org/";>Apache MINA - a high-performance http://en.wikipedia.org/wiki/New_I/O"; rel="nofollow">NIO-driven networking framework + + +So don't get the hump - try Camel today! https://cwiki.apache.org/confluence/s/en_GB/5982/f2b47fb3d636c8bc9fd0b11c0ec6d0ae18646be7.1/_/images/icons/emoticons/smile.png"; data-emoticon-name="smile" alt="(smile)"> + +Too many buzzwords - what exactly is Camel? +Okay, so the description above is technology focused. +There's a great discussion about Camel at http://stackoverflow.com/questions/8845186/what-exactly-is-apache-camel"; rel="nofollow">Stack Overflow. We suggest you view the post, read the comments, and browse the suggested links for more details. + +Quickstart + +To start using Apache Camel quickly, you can read through some simple examples in this chapter. For readers who would like a more thorough introduction, please skip ahead to Chapter 3. + +Walk through an Example CodeThis mini-guide takes you through the source code of a https://svn.apache.org/repos/asf/camel/trunk/examples/camel-example-jms-file/src/main/java/org/apache/camel/example/jmstofile/CamelJmsToFileExample.java";>simple example.Camel can be configured either by using Spring or directly in Java - which https://svn.apache.org/repos/asf/camel/trunk/examples/camel-example-jms-file/src/main/java/org/apache/camel/example/jmstofile/CamelJmsToFileExample.java";>this example does.This example is available in the examples\came
svn commit: r972146 - /websites/production/camel/content/cache/main.pageCache
Author: gzurowski Date: Wed Nov 11 22:57:17 2015 New Revision: 972146 Log: (empty) Removed: websites/production/camel/content/cache/main.pageCache
[2/2] camel git commit: Add missing Spring schema references for Camel release 2.14.3
Add missing Spring schema references for Camel release 2.14.3 Signed-off-by: Gregor Zurowski Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/795316b3 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/795316b3 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/795316b3 Branch: refs/heads/master Commit: 795316b311b632e3d2d2fe00d2d70c2027aef50a Parents: d34a81a Author: Gregor Zurowski Authored: Thu Nov 12 00:15:59 2015 +0100 Committer: Gregor Zurowski Committed: Thu Nov 12 00:15:59 2015 +0100 -- 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 | 1 + 4 files changed, 4 insertions(+) -- http://git-wip-us.apache.org/repos/asf/camel/blob/795316b3/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 2b5874a..20d3a45 100644 --- a/components/camel-cxf/src/main/resources/META-INF/spring.schemas +++ b/components/camel-cxf/src/main/resources/META-INF/spring.schemas @@ -79,6 +79,7 @@ http\://camel.apache.org/schema/cxf/camel-cxf-2.13.4.xsd=schema/cxfEndpoint.xsd http\://camel.apache.org/schema/cxf/camel-cxf-2.14.0.xsd=schema/cxfEndpoint.xsd http\://camel.apache.org/schema/cxf/camel-cxf-2.14.1.xsd=schema/cxfEndpoint.xsd http\://camel.apache.org/schema/cxf/camel-cxf-2.14.2.xsd=schema/cxfEndpoint.xsd +http\://camel.apache.org/schema/cxf/camel-cxf-2.14.3.xsd=schema/cxfEndpoint.xsd http\://camel.apache.org/schema/cxf/camel-cxf-2.14.4.xsd=schema/cxfEndpoint.xsd http\://camel.apache.org/schema/cxf/camel-cxf-2.15.0.xsd=schema/cxfEndpoint.xsd http\://camel.apache.org/schema/cxf/camel-cxf-2.15.1.xsd=schema/cxfEndpoint.xsd http://git-wip-us.apache.org/repos/asf/camel/blob/795316b3/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 60a7fa1..9424275 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 @@ -76,6 +76,7 @@ http\://camel.apache.org/schema/spring/integration/camel-spring-integration-2.13 http\://camel.apache.org/schema/spring/integration/camel-spring-integration-2.14.0.xsd=schema/camel-spring-integration.xsd http\://camel.apache.org/schema/spring/integration/camel-spring-integration-2.14.1.xsd=schema/camel-spring-integration.xsd http\://camel.apache.org/schema/spring/integration/camel-spring-integration-2.14.2.xsd=schema/camel-spring-integration.xsd +http\://camel.apache.org/schema/spring/integration/camel-spring-integration-2.14.3.xsd=schema/camel-spring-integration.xsd http\://camel.apache.org/schema/spring/integration/camel-spring-integration-2.14.4.xsd=schema/camel-spring-integration.xsd http\://camel.apache.org/schema/spring/integration/camel-spring-integration-2.15.0.xsd=schema/camel-spring-integration.xsd http\://camel.apache.org/schema/spring/integration/camel-spring-integration-2.15.1.xsd=schema/camel-spring-integration.xsd http://git-wip-us.apache.org/repos/asf/camel/blob/795316b3/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 222b5ef..56c7d5c 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 @@ -70,6 +70,7 @@ http\://camel.apache.org/schema/spring-security/camel-spring-security-2.13.4.xsd http\://camel.apache.org/schema/spring-security/camel-spring-security-2.14.0.xsd=schema/camel-spring-security.xsd http\://camel.apache.org/schema/spring-security/camel-spring-security-2.14.1.xsd=schema/camel-spring-security.xsd http\://camel.apache.org/schema/spring-security/camel-spring-security-2.14.2.xsd=schema/camel-spring-security.xsd +http\://camel.apache.org/schema/spring-security/camel-spring-security-2.14.3.xsd=schema/camel-spring-security.xsd http\://camel.apache.org/schema/spring-security/camel-spring-sec
[1/2] camel git commit: Update Spring schemas for Camel release 2.14.4
Repository: camel Updated Branches: refs/heads/master 7d30e2c4e -> 795316b31 Update Spring schemas for Camel release 2.14.4 Signed-off-by: Gregor Zurowski Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/d34a81a7 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/d34a81a7 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/d34a81a7 Branch: refs/heads/master Commit: d34a81a79f5bfe02c6f7e6a849c95930e478ad3b Parents: 7d30e2c Author: Gregor Zurowski Authored: Thu Nov 12 00:11:46 2015 +0100 Committer: Gregor Zurowski Committed: Thu Nov 12 00:13:01 2015 +0100 -- 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 | 1 + 4 files changed, 4 insertions(+) -- http://git-wip-us.apache.org/repos/asf/camel/blob/d34a81a7/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 f37f8ab..2b5874a 100644 --- a/components/camel-cxf/src/main/resources/META-INF/spring.schemas +++ b/components/camel-cxf/src/main/resources/META-INF/spring.schemas @@ -79,6 +79,7 @@ http\://camel.apache.org/schema/cxf/camel-cxf-2.13.4.xsd=schema/cxfEndpoint.xsd http\://camel.apache.org/schema/cxf/camel-cxf-2.14.0.xsd=schema/cxfEndpoint.xsd http\://camel.apache.org/schema/cxf/camel-cxf-2.14.1.xsd=schema/cxfEndpoint.xsd http\://camel.apache.org/schema/cxf/camel-cxf-2.14.2.xsd=schema/cxfEndpoint.xsd +http\://camel.apache.org/schema/cxf/camel-cxf-2.14.4.xsd=schema/cxfEndpoint.xsd http\://camel.apache.org/schema/cxf/camel-cxf-2.15.0.xsd=schema/cxfEndpoint.xsd http\://camel.apache.org/schema/cxf/camel-cxf-2.15.1.xsd=schema/cxfEndpoint.xsd http\://camel.apache.org/schema/cxf/camel-cxf-2.15.2.xsd=schema/cxfEndpoint.xsd http://git-wip-us.apache.org/repos/asf/camel/blob/d34a81a7/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 228acd3..60a7fa1 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 @@ -76,6 +76,7 @@ http\://camel.apache.org/schema/spring/integration/camel-spring-integration-2.13 http\://camel.apache.org/schema/spring/integration/camel-spring-integration-2.14.0.xsd=schema/camel-spring-integration.xsd http\://camel.apache.org/schema/spring/integration/camel-spring-integration-2.14.1.xsd=schema/camel-spring-integration.xsd http\://camel.apache.org/schema/spring/integration/camel-spring-integration-2.14.2.xsd=schema/camel-spring-integration.xsd +http\://camel.apache.org/schema/spring/integration/camel-spring-integration-2.14.4.xsd=schema/camel-spring-integration.xsd http\://camel.apache.org/schema/spring/integration/camel-spring-integration-2.15.0.xsd=schema/camel-spring-integration.xsd http\://camel.apache.org/schema/spring/integration/camel-spring-integration-2.15.1.xsd=schema/camel-spring-integration.xsd http\://camel.apache.org/schema/spring/integration/camel-spring-integration-2.15.2.xsd=schema/camel-spring-integration.xsd http://git-wip-us.apache.org/repos/asf/camel/blob/d34a81a7/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 4a72eea..222b5ef 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 @@ -70,6 +70,7 @@ http\://camel.apache.org/schema/spring-security/camel-spring-security-2.13.4.xsd http\://camel.apache.org/schema/spring-security/camel-spring-security-2.14.0.xsd=schema/camel-spring-security.xsd http\://camel.apache.org/schema/spring-security/camel-spring-security-2.14.1.xsd=schema/camel-spring-security.xsd http\://camel.apache.org/schema/spring-security/camel-spring-security-2.14.2.xsd=schema/camel-spring-security.xsd +http\://camel.apache.org/schema/spring-security/camel-spring-security-2.14.4.xsd=schema/camel-spring-security.xsd
[3/3] camel git commit: [maven-release-plugin] prepare release camel-2.16.1
[maven-release-plugin] prepare release camel-2.16.1 Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/2b69b9d3 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/2b69b9d3 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/2b69b9d3 Branch: refs/heads/camel-2.16.x Commit: 2b69b9d327def91b24c28c236c7f90d23dfd18c9 Parents: 910b517 Author: Gregor Zurowski Authored: Fri Nov 13 19:20:04 2015 + Committer: Gregor Zurowski Committed: Fri Nov 13 19:20:04 2015 + -- apache-camel/pom.xml | 2 +- buildingtools/pom.xml| 2 +- camel-core/pom.xml | 2 +- components/camel-ahc-ws/pom.xml | 2 +- components/camel-ahc/pom.xml | 2 +- components/camel-amqp/pom.xml| 2 +- components/camel-apns/pom.xml| 2 +- components/camel-atmos/pom.xml | 2 +- components/camel-atmosphere-websocket/pom.xml| 2 +- components/camel-atom/pom.xml| 2 +- components/camel-avro/pom.xml| 2 +- components/camel-aws/pom.xml | 2 +- components/camel-bam/pom.xml | 2 +- components/camel-barcode/pom.xml | 2 +- components/camel-base64/pom.xml | 2 +- components/camel-bean-validator/pom.xml | 2 +- components/camel-beanio/pom.xml | 2 +- components/camel-beanstalk/pom.xml | 2 +- components/camel-bindy/pom.xml | 2 +- components/camel-blueprint/pom.xml | 2 +- components/camel-boon/pom.xml| 2 +- components/camel-box/pom.xml | 2 +- components/camel-cache/pom.xml | 2 +- components/camel-cassandraql/pom.xml | 2 +- components/camel-castor/pom.xml | 2 +- components/camel-cdi/pom.xml | 2 +- components/camel-chunk/pom.xml | 2 +- components/camel-cmis/pom.xml| 2 +- components/camel-coap/pom.xml| 2 +- components/camel-cometd/pom.xml | 2 +- components/camel-context/pom.xml | 2 +- components/camel-core-osgi/pom.xml | 2 +- components/camel-core-xml/pom.xml| 2 +- components/camel-couchdb/pom.xml | 2 +- components/camel-crypto/pom.xml | 2 +- components/camel-csv/pom.xml | 2 +- components/camel-cxf-transport/pom.xml | 2 +- components/camel-cxf/pom.xml | 2 +- components/camel-disruptor/pom.xml | 2 +- components/camel-dns/pom.xml | 2 +- components/camel-docker/pom.xml | 2 +- components/camel-dozer/pom.xml | 2 +- components/camel-dropbox/pom.xml | 2 +- components/camel-eclipse/pom.xml | 2 +- components/camel-ejb/pom.xml | 2 +- components/camel-elasticsearch/pom.xml | 2 +- components/camel-elsql/pom.xml | 2 +- components/camel-eventadmin/pom.xml | 2 +- components/camel-exec/pom.xml| 2 +- components/camel-facebook/pom.xml| 2 +- components/camel-flatpack/pom.xml| 2 +- components/camel-fop/pom.xml | 2 +- components/camel-freemarker/pom.xml | 2 +- components/camel-ftp/pom.xml | 2 +- components/camel-gae/pom.xml | 2 +- components/camel-ganglia/pom.xml | 2 +- components/camel-geocoder/pom.xml| 2 +- components/camel-git/pom.xml | 2 +- components/camel-github/pom.xml | 2 +- components/camel-google-calendar/pom.xml | 2 +-
[1/3] camel git commit: [maven-release-plugin] prepare release camel-2.16.1
Repository: camel Updated Branches: refs/heads/camel-2.16.x 910b517fc -> 2b69b9d32 http://git-wip-us.apache.org/repos/asf/camel/blob/2b69b9d3/examples/camel-example-reportincident/pom.xml -- diff --git a/examples/camel-example-reportincident/pom.xml b/examples/camel-example-reportincident/pom.xml index d15fba3..2cfc1c3 100755 --- a/examples/camel-example-reportincident/pom.xml +++ b/examples/camel-example-reportincident/pom.xml @@ -22,7 +22,7 @@ org.apache.camel examples -2.16.1-SNAPSHOT +2.16.1 camel-example-reportincident http://git-wip-us.apache.org/repos/asf/camel/blob/2b69b9d3/examples/camel-example-restlet-jdbc/pom.xml -- diff --git a/examples/camel-example-restlet-jdbc/pom.xml b/examples/camel-example-restlet-jdbc/pom.xml index 3a8f859..98f34c2 100755 --- a/examples/camel-example-restlet-jdbc/pom.xml +++ b/examples/camel-example-restlet-jdbc/pom.xml @@ -22,7 +22,7 @@ org.apache.camel examples -2.16.1-SNAPSHOT +2.16.1 camel-example-restlet-jdbc http://git-wip-us.apache.org/repos/asf/camel/blob/2b69b9d3/examples/camel-example-route-throttling/pom.xml -- diff --git a/examples/camel-example-route-throttling/pom.xml b/examples/camel-example-route-throttling/pom.xml index f757ed5..4af64db 100644 --- a/examples/camel-example-route-throttling/pom.xml +++ b/examples/camel-example-route-throttling/pom.xml @@ -22,7 +22,7 @@ org.apache.camel examples -2.16.1-SNAPSHOT +2.16.1 camel-example-route-throttling http://git-wip-us.apache.org/repos/asf/camel/blob/2b69b9d3/examples/camel-example-servlet-rest-blueprint/pom.xml -- diff --git a/examples/camel-example-servlet-rest-blueprint/pom.xml b/examples/camel-example-servlet-rest-blueprint/pom.xml index d054768..b9b7567 100755 --- a/examples/camel-example-servlet-rest-blueprint/pom.xml +++ b/examples/camel-example-servlet-rest-blueprint/pom.xml @@ -22,7 +22,7 @@ org.apache.camel examples -2.16.1-SNAPSHOT +2.16.1 camel-example-servlet-rest-blueprint http://git-wip-us.apache.org/repos/asf/camel/blob/2b69b9d3/examples/camel-example-servlet-tomcat-no-spring/pom.xml -- diff --git a/examples/camel-example-servlet-tomcat-no-spring/pom.xml b/examples/camel-example-servlet-tomcat-no-spring/pom.xml index c4460fd..059ba8f 100755 --- a/examples/camel-example-servlet-tomcat-no-spring/pom.xml +++ b/examples/camel-example-servlet-tomcat-no-spring/pom.xml @@ -22,7 +22,7 @@ org.apache.camel examples -2.16.1-SNAPSHOT +2.16.1 camel-example-servlet-tomcat-no-spring http://git-wip-us.apache.org/repos/asf/camel/blob/2b69b9d3/examples/camel-example-servlet-tomcat/pom.xml -- diff --git a/examples/camel-example-servlet-tomcat/pom.xml b/examples/camel-example-servlet-tomcat/pom.xml index 998e55e..3802b0f 100755 --- a/examples/camel-example-servlet-tomcat/pom.xml +++ b/examples/camel-example-servlet-tomcat/pom.xml @@ -22,7 +22,7 @@ org.apache.camel examples -2.16.1-SNAPSHOT +2.16.1 camel-example-servlet-tomcat http://git-wip-us.apache.org/repos/asf/camel/blob/2b69b9d3/examples/camel-example-simplejirabot/javadsl/pom.xml -- diff --git a/examples/camel-example-simplejirabot/javadsl/pom.xml b/examples/camel-example-simplejirabot/javadsl/pom.xml index 7ad3249..6b783b7 100644 --- a/examples/camel-example-simplejirabot/javadsl/pom.xml +++ b/examples/camel-example-simplejirabot/javadsl/pom.xml @@ -19,7 +19,7 @@ camel-example-simplejirabot org.apache.camel -2.16.1-SNAPSHOT +2.16.1 4.0.0 http://git-wip-us.apache.org/repos/asf/camel/blob/2b69b9d3/examples/camel-example-simplejirabot/pom.xml -- diff --git a/examples/camel-example-simplejirabot/pom.xml b/examples/camel-example-simplejirabot/pom.xml index e902f8f..45951ef 100644 --- a/examples/camel-example-simplejirabot/pom.xml +++ b/examples/camel-example-simplejirabot/pom.xml @@ -21,7 +21,7 @@ org.apache.camel examples -2.16.1-SNAPSHOT +2.16.1 camel-example-simplejirabot http://git-wip-us.apache.org/repos/asf/camel/blob/2b69b9d3/examples/camel-example-simplejirabot/xmlconf/pom.xml -- diff --git a/examples/camel-example-simplejirabot/xmlconf/
[2/3] camel git commit: [maven-release-plugin] prepare release camel-2.16.1
http://git-wip-us.apache.org/repos/asf/camel/blob/2b69b9d3/components/camel-jxpath/pom.xml -- diff --git a/components/camel-jxpath/pom.xml b/components/camel-jxpath/pom.xml index 9321bbc..aac7886 100644 --- a/components/camel-jxpath/pom.xml +++ b/components/camel-jxpath/pom.xml @@ -21,7 +21,7 @@ org.apache.camel components -2.16.1-SNAPSHOT +2.16.1 camel-jxpath http://git-wip-us.apache.org/repos/asf/camel/blob/2b69b9d3/components/camel-kafka/pom.xml -- diff --git a/components/camel-kafka/pom.xml b/components/camel-kafka/pom.xml index 532a608a..abc2eed 100644 --- a/components/camel-kafka/pom.xml +++ b/components/camel-kafka/pom.xml @@ -21,7 +21,7 @@ org.apache.camel components -2.16.1-SNAPSHOT +2.16.1 camel-kafka http://git-wip-us.apache.org/repos/asf/camel/blob/2b69b9d3/components/camel-kestrel/pom.xml -- diff --git a/components/camel-kestrel/pom.xml b/components/camel-kestrel/pom.xml index efff95b..f7c35ce 100644 --- a/components/camel-kestrel/pom.xml +++ b/components/camel-kestrel/pom.xml @@ -21,7 +21,7 @@ org.apache.camel components -2.16.1-SNAPSHOT +2.16.1 camel-kestrel http://git-wip-us.apache.org/repos/asf/camel/blob/2b69b9d3/components/camel-krati/pom.xml -- diff --git a/components/camel-krati/pom.xml b/components/camel-krati/pom.xml index b0519d7..7f393c5 100644 --- a/components/camel-krati/pom.xml +++ b/components/camel-krati/pom.xml @@ -21,7 +21,7 @@ org.apache.camel components -2.16.1-SNAPSHOT +2.16.1 camel-krati http://git-wip-us.apache.org/repos/asf/camel/blob/2b69b9d3/components/camel-kura/pom.xml -- diff --git a/components/camel-kura/pom.xml b/components/camel-kura/pom.xml index da3dcb7..2df23b0 100644 --- a/components/camel-kura/pom.xml +++ b/components/camel-kura/pom.xml @@ -24,7 +24,7 @@ org.apache.camel components -2.16.1-SNAPSHOT +2.16.1 camel-kura http://git-wip-us.apache.org/repos/asf/camel/blob/2b69b9d3/components/camel-ldap/pom.xml -- diff --git a/components/camel-ldap/pom.xml b/components/camel-ldap/pom.xml index a71e936..8f532df 100644 --- a/components/camel-ldap/pom.xml +++ b/components/camel-ldap/pom.xml @@ -23,7 +23,7 @@ org.apache.camel components -2.16.1-SNAPSHOT +2.16.1 camel-ldap http://git-wip-us.apache.org/repos/asf/camel/blob/2b69b9d3/components/camel-leveldb/pom.xml -- diff --git a/components/camel-leveldb/pom.xml b/components/camel-leveldb/pom.xml index 8489188..3a99d71 100644 --- a/components/camel-leveldb/pom.xml +++ b/components/camel-leveldb/pom.xml @@ -21,7 +21,7 @@ org.apache.camel components -2.16.1-SNAPSHOT +2.16.1 camel-leveldb http://git-wip-us.apache.org/repos/asf/camel/blob/2b69b9d3/components/camel-linkedin/camel-linkedin-api/pom.xml -- diff --git a/components/camel-linkedin/camel-linkedin-api/pom.xml b/components/camel-linkedin/camel-linkedin-api/pom.xml index 64c58bd..6f72bc9 100644 --- a/components/camel-linkedin/camel-linkedin-api/pom.xml +++ b/components/camel-linkedin/camel-linkedin-api/pom.xml @@ -22,7 +22,7 @@ org.apache.camel camel-linkedin-parent -2.16.1-SNAPSHOT +2.16.1 camel-linkedin-api http://git-wip-us.apache.org/repos/asf/camel/blob/2b69b9d3/components/camel-linkedin/camel-linkedin-component/pom.xml -- diff --git a/components/camel-linkedin/camel-linkedin-component/pom.xml b/components/camel-linkedin/camel-linkedin-component/pom.xml index 05f2e59..296b51f 100644 --- a/components/camel-linkedin/camel-linkedin-component/pom.xml +++ b/components/camel-linkedin/camel-linkedin-component/pom.xml @@ -22,7 +22,7 @@ org.apache.camel camel-linkedin-parent -2.16.1-SNAPSHOT +2.16.1 camel-linkedin http://git-wip-us.apache.org/repos/asf/camel/blob/2b69b9d3/components/camel-linkedin/pom.xml -- diff --git a/components/camel-linkedin/pom.xml b/components/camel-linkedin/pom.xml index 20e3328..1c7086d 100644 --- a/components/camel-linkedin/pom.xml +++ b/components/camel-linkedin/pom.xml @@ -22,7 +22,7 @@ components org.apache.camel -2.16.1-SNAPSHOT +2.16.1 camel-linkedi
[2/3] camel git commit: [maven-release-plugin] prepare for next development iteration
http://git-wip-us.apache.org/repos/asf/camel/blob/b1404582/components/camel-jxpath/pom.xml -- diff --git a/components/camel-jxpath/pom.xml b/components/camel-jxpath/pom.xml index aac7886..478b8b3 100644 --- a/components/camel-jxpath/pom.xml +++ b/components/camel-jxpath/pom.xml @@ -21,7 +21,7 @@ org.apache.camel components -2.16.1 +2.16.2-SNAPSHOT camel-jxpath http://git-wip-us.apache.org/repos/asf/camel/blob/b1404582/components/camel-kafka/pom.xml -- diff --git a/components/camel-kafka/pom.xml b/components/camel-kafka/pom.xml index abc2eed..883a860 100644 --- a/components/camel-kafka/pom.xml +++ b/components/camel-kafka/pom.xml @@ -21,7 +21,7 @@ org.apache.camel components -2.16.1 +2.16.2-SNAPSHOT camel-kafka http://git-wip-us.apache.org/repos/asf/camel/blob/b1404582/components/camel-kestrel/pom.xml -- diff --git a/components/camel-kestrel/pom.xml b/components/camel-kestrel/pom.xml index f7c35ce..66aafbd 100644 --- a/components/camel-kestrel/pom.xml +++ b/components/camel-kestrel/pom.xml @@ -21,7 +21,7 @@ org.apache.camel components -2.16.1 +2.16.2-SNAPSHOT camel-kestrel http://git-wip-us.apache.org/repos/asf/camel/blob/b1404582/components/camel-krati/pom.xml -- diff --git a/components/camel-krati/pom.xml b/components/camel-krati/pom.xml index 7f393c5..fe634fb 100644 --- a/components/camel-krati/pom.xml +++ b/components/camel-krati/pom.xml @@ -21,7 +21,7 @@ org.apache.camel components -2.16.1 +2.16.2-SNAPSHOT camel-krati http://git-wip-us.apache.org/repos/asf/camel/blob/b1404582/components/camel-kura/pom.xml -- diff --git a/components/camel-kura/pom.xml b/components/camel-kura/pom.xml index 2df23b0..4eae3a2 100644 --- a/components/camel-kura/pom.xml +++ b/components/camel-kura/pom.xml @@ -24,7 +24,7 @@ org.apache.camel components -2.16.1 +2.16.2-SNAPSHOT camel-kura http://git-wip-us.apache.org/repos/asf/camel/blob/b1404582/components/camel-ldap/pom.xml -- diff --git a/components/camel-ldap/pom.xml b/components/camel-ldap/pom.xml index 8f532df..8539c65 100644 --- a/components/camel-ldap/pom.xml +++ b/components/camel-ldap/pom.xml @@ -23,7 +23,7 @@ org.apache.camel components -2.16.1 +2.16.2-SNAPSHOT camel-ldap http://git-wip-us.apache.org/repos/asf/camel/blob/b1404582/components/camel-leveldb/pom.xml -- diff --git a/components/camel-leveldb/pom.xml b/components/camel-leveldb/pom.xml index 3a99d71..ba62933 100644 --- a/components/camel-leveldb/pom.xml +++ b/components/camel-leveldb/pom.xml @@ -21,7 +21,7 @@ org.apache.camel components -2.16.1 +2.16.2-SNAPSHOT camel-leveldb http://git-wip-us.apache.org/repos/asf/camel/blob/b1404582/components/camel-linkedin/camel-linkedin-api/pom.xml -- diff --git a/components/camel-linkedin/camel-linkedin-api/pom.xml b/components/camel-linkedin/camel-linkedin-api/pom.xml index 6f72bc9..c3df531 100644 --- a/components/camel-linkedin/camel-linkedin-api/pom.xml +++ b/components/camel-linkedin/camel-linkedin-api/pom.xml @@ -22,7 +22,7 @@ org.apache.camel camel-linkedin-parent -2.16.1 +2.16.2-SNAPSHOT camel-linkedin-api http://git-wip-us.apache.org/repos/asf/camel/blob/b1404582/components/camel-linkedin/camel-linkedin-component/pom.xml -- diff --git a/components/camel-linkedin/camel-linkedin-component/pom.xml b/components/camel-linkedin/camel-linkedin-component/pom.xml index 296b51f..584e1a8 100644 --- a/components/camel-linkedin/camel-linkedin-component/pom.xml +++ b/components/camel-linkedin/camel-linkedin-component/pom.xml @@ -22,7 +22,7 @@ org.apache.camel camel-linkedin-parent -2.16.1 +2.16.2-SNAPSHOT camel-linkedin http://git-wip-us.apache.org/repos/asf/camel/blob/b1404582/components/camel-linkedin/pom.xml -- diff --git a/components/camel-linkedin/pom.xml b/components/camel-linkedin/pom.xml index 1c7086d..aa99243 100644 --- a/components/camel-linkedin/pom.xml +++ b/components/camel-linkedin/pom.xml @@ -22,7 +22,7 @@ components org.apache.camel -2.16.1 +2.16.2-SNAPSHOT camel-linkedin
Git Push Summary
Repository: camel Updated Tags: refs/tags/camel-2.16.1 [created] ce71d873f
[1/3] camel git commit: [maven-release-plugin] prepare for next development iteration
Repository: camel Updated Branches: refs/heads/camel-2.16.x 2b69b9d32 -> b1404582b http://git-wip-us.apache.org/repos/asf/camel/blob/b1404582/examples/camel-example-reportincident/pom.xml -- diff --git a/examples/camel-example-reportincident/pom.xml b/examples/camel-example-reportincident/pom.xml index 2cfc1c3..d19b617 100755 --- a/examples/camel-example-reportincident/pom.xml +++ b/examples/camel-example-reportincident/pom.xml @@ -22,7 +22,7 @@ org.apache.camel examples -2.16.1 +2.16.2-SNAPSHOT camel-example-reportincident http://git-wip-us.apache.org/repos/asf/camel/blob/b1404582/examples/camel-example-restlet-jdbc/pom.xml -- diff --git a/examples/camel-example-restlet-jdbc/pom.xml b/examples/camel-example-restlet-jdbc/pom.xml index 98f34c2..7d5c79d 100755 --- a/examples/camel-example-restlet-jdbc/pom.xml +++ b/examples/camel-example-restlet-jdbc/pom.xml @@ -22,7 +22,7 @@ org.apache.camel examples -2.16.1 +2.16.2-SNAPSHOT camel-example-restlet-jdbc http://git-wip-us.apache.org/repos/asf/camel/blob/b1404582/examples/camel-example-route-throttling/pom.xml -- diff --git a/examples/camel-example-route-throttling/pom.xml b/examples/camel-example-route-throttling/pom.xml index 4af64db..ae09020 100644 --- a/examples/camel-example-route-throttling/pom.xml +++ b/examples/camel-example-route-throttling/pom.xml @@ -22,7 +22,7 @@ org.apache.camel examples -2.16.1 +2.16.2-SNAPSHOT camel-example-route-throttling http://git-wip-us.apache.org/repos/asf/camel/blob/b1404582/examples/camel-example-servlet-rest-blueprint/pom.xml -- diff --git a/examples/camel-example-servlet-rest-blueprint/pom.xml b/examples/camel-example-servlet-rest-blueprint/pom.xml index b9b7567..9c3e5b6 100755 --- a/examples/camel-example-servlet-rest-blueprint/pom.xml +++ b/examples/camel-example-servlet-rest-blueprint/pom.xml @@ -22,7 +22,7 @@ org.apache.camel examples -2.16.1 +2.16.2-SNAPSHOT camel-example-servlet-rest-blueprint http://git-wip-us.apache.org/repos/asf/camel/blob/b1404582/examples/camel-example-servlet-tomcat-no-spring/pom.xml -- diff --git a/examples/camel-example-servlet-tomcat-no-spring/pom.xml b/examples/camel-example-servlet-tomcat-no-spring/pom.xml index 059ba8f..412fa2e 100755 --- a/examples/camel-example-servlet-tomcat-no-spring/pom.xml +++ b/examples/camel-example-servlet-tomcat-no-spring/pom.xml @@ -22,7 +22,7 @@ org.apache.camel examples -2.16.1 +2.16.2-SNAPSHOT camel-example-servlet-tomcat-no-spring http://git-wip-us.apache.org/repos/asf/camel/blob/b1404582/examples/camel-example-servlet-tomcat/pom.xml -- diff --git a/examples/camel-example-servlet-tomcat/pom.xml b/examples/camel-example-servlet-tomcat/pom.xml index 3802b0f..75c3b43 100755 --- a/examples/camel-example-servlet-tomcat/pom.xml +++ b/examples/camel-example-servlet-tomcat/pom.xml @@ -22,7 +22,7 @@ org.apache.camel examples -2.16.1 +2.16.2-SNAPSHOT camel-example-servlet-tomcat http://git-wip-us.apache.org/repos/asf/camel/blob/b1404582/examples/camel-example-simplejirabot/javadsl/pom.xml -- diff --git a/examples/camel-example-simplejirabot/javadsl/pom.xml b/examples/camel-example-simplejirabot/javadsl/pom.xml index 6b783b7..9dcac62 100644 --- a/examples/camel-example-simplejirabot/javadsl/pom.xml +++ b/examples/camel-example-simplejirabot/javadsl/pom.xml @@ -19,7 +19,7 @@ camel-example-simplejirabot org.apache.camel -2.16.1 +2.16.2-SNAPSHOT 4.0.0 http://git-wip-us.apache.org/repos/asf/camel/blob/b1404582/examples/camel-example-simplejirabot/pom.xml -- diff --git a/examples/camel-example-simplejirabot/pom.xml b/examples/camel-example-simplejirabot/pom.xml index 45951ef..078d881 100644 --- a/examples/camel-example-simplejirabot/pom.xml +++ b/examples/camel-example-simplejirabot/pom.xml @@ -21,7 +21,7 @@ org.apache.camel examples -2.16.1 +2.16.2-SNAPSHOT camel-example-simplejirabot http://git-wip-us.apache.org/repos/asf/camel/blob/b1404582/examples/camel-example-simplejirabot/xmlconf/pom.xml -- diff --git a/examples/camel-example-simplejirabot/xmlconf/