git commit: JAR upgrades
Repository: camel Updated Branches: refs/heads/master 4697d0228 - 19b3e58d9 JAR upgrades Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/19b3e58d Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/19b3e58d Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/19b3e58d Branch: refs/heads/master Commit: 19b3e58d96e98dd964dde4e11b79f090d483016d Parents: 4697d02 Author: Claus Ibsen davscl...@apache.org Authored: Tue Oct 28 07:01:09 2014 +0100 Committer: Claus Ibsen davscl...@apache.org Committed: Tue Oct 28 07:01:09 2014 +0100 -- parent/pom.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) -- http://git-wip-us.apache.org/repos/asf/camel/blob/19b3e58d/parent/pom.xml -- diff --git a/parent/pom.xml b/parent/pom.xml index 51d5b3c..7b0b769 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -230,7 +230,7 @@ jboss-javaee-6-version1.0.0.Final/jboss-javaee-6-version jboss-logging-version3.1.4.GA/jboss-logging-version jboss-marshalling-version1.3.18.GA/jboss-marshalling-version -jclouds-version1.8.0/jclouds-version +jclouds-version1.8.1/jclouds-version !-- jclouds must use this guava version -- jclouds-google-guava-version17.0/jclouds-google-guava-version jcr-version2.0/jcr-version @@ -318,7 +318,7 @@ metrics-version3.1.0/metrics-version mina-bundle-version1.1.7_6/mina-bundle-version mina-version1.1.7/mina-version -mina2-version2.0.8/mina2-version +mina2-version2.0.9/mina2-version mock-javamail-version1.7/mock-javamail-version mockito-version1.9.5/mockito-version mongo-java-driver-version2.12.0/mongo-java-driver-version @@ -371,7 +371,7 @@ rhino-version1.7R2/rhino-version rome-bundle-version1.0_3/rome-bundle-version rome-version1.0/rome-version -rxjava-version0.20.5/rxjava-version +rxjava-version0.20.6/rxjava-version saaj-impl-version1.3.2_2/saaj-impl-version saxon-bundle-version9.5.1-5_1/saxon-bundle-version saxon-version9.5.1-5/saxon-version
svn commit: r927118 - in /websites/production/camel/content: cache/main.pageCache spring-boot.html
Author: buildbot
Date: Tue Oct 28 06:18:37 2014
New Revision: 927118
Log:
Production update by buildbot for camel
Modified:
websites/production/camel/content/cache/main.pageCache
websites/production/camel/content/spring-boot.html
Modified: websites/production/camel/content/cache/main.pageCache
==
Binary files - no diff available.
Modified: websites/production/camel/content/spring-boot.html
==
--- websites/production/camel/content/spring-boot.html (original)
+++ websites/production/camel/content/spring-boot.html Tue Oct 28 06:18:37 2014
@@ -128,7 +128,9 @@ public class MyRouterConfiguration {
from(quot;jms:invoicesquot;).to(quot;file:/invoicesquot;);
}
- };
+};
+ }
+Â
}]]/script
/div/divh3 id=SpringBoot-CamelpropertiesCamel properties/h3pSpring
Boot auto-configuration automatically connect a shape=rect
class=external-link
href=http://docs.spring.io/spring-boot/docs/current/reference/html/boot-features-external-config.html#boot-features-external-config;
rel=nofollowSpring Boot external configuration/a#160;(like properties
placeholders, spanOS environment variables or system properties) with
the#160;a shape=rect href=properties.htmlCamel properties
support/a./span#160;It basically means that any property defined in
codeapplication.properties/code file: #160;/pdiv class=code panel pdl
style=border-width: 1px;div class=codeContent panelContent pdl
script class=theme: Default; brush: xml; gutter: false
type=syntaxhighlighter![CDATA[route.from = jms:invoices]]/script
@@ -157,7 +159,7 @@ public class MyAppConfig {
void beforeStart(CamelContext context) {
// your custom configuration goes here
}
-}
+};
}
}]]/script
svn commit: r6876 - /release/camel/apache-camel/2.12.4/
Author: cmueller Date: Tue Oct 28 06:25:37 2014 New Revision: 6876 Log: Removed the old release Removed: release/camel/apache-camel/2.12.4/
[3/3] git commit: Merge branch 'impr-new-mustache-version' of https://github.com/oscerd/camel
Merge branch 'impr-new-mustache-version' of https://github.com/oscerd/camel Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/cd204ac0 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/cd204ac0 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/cd204ac0 Branch: refs/heads/master Commit: cd204ac0a382becf09ae117828db016d54550963 Parents: 19b3e58 6a8b33e Author: Claus Ibsen davscl...@apache.org Authored: Tue Oct 28 07:34:43 2014 +0100 Committer: Claus Ibsen davscl...@apache.org Committed: Tue Oct 28 07:34:43 2014 +0100 -- --
[2/3] git commit: Fix typing error
Fix typing error Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/6a8b33e2 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/6a8b33e2 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/6a8b33e2 Branch: refs/heads/master Commit: 6a8b33e2298ff86dfe487693ef40711dfc568144 Parents: 8c546d0 Author: ancosen anco...@gmail.com Authored: Sat Oct 18 15:40:43 2014 +0200 Committer: ancosen anco...@gmail.com Committed: Sat Oct 18 15:40:43 2014 +0200 -- parent/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/camel/blob/6a8b33e2/parent/pom.xml -- diff --git a/parent/pom.xml b/parent/pom.xml index e12e9b7..19d504b 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -325,7 +325,7 @@ mqtt-client-version1.10/mqtt-client-version msv-version2013.6.1/msv-version mustache-java-version0.8.17/mustache-java-version -mustache-bundle-version0.8.16_1//mustache-bundle-version +mustache-bundle-version0.8.16_1/mustache-bundle-version mvel-version2.2.1.Final/mvel-version mybatis-version3.2.7/mybatis-version neethi-bundle-version3.0.1/neethi-bundle-version
[1/3] git commit: Added new mustache java version
Repository: camel Updated Branches: refs/heads/master 19b3e58d9 - cd204ac0a Added new mustache java version Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/8c546d0e Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/8c546d0e Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/8c546d0e Branch: refs/heads/master Commit: 8c546d0ef5a5f53f8b8db4f7b4adf6dc427d1316 Parents: 857f559 Author: ancosen anco...@gmail.com Authored: Sat Oct 18 15:25:44 2014 +0200 Committer: ancosen anco...@gmail.com Committed: Sat Oct 18 15:25:44 2014 +0200 -- parent/pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -- http://git-wip-us.apache.org/repos/asf/camel/blob/8c546d0e/parent/pom.xml -- diff --git a/parent/pom.xml b/parent/pom.xml index f9c9701..e12e9b7 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -324,8 +324,8 @@ mongo-java-driver-version2.12.0/mongo-java-driver-version mqtt-client-version1.10/mqtt-client-version msv-version2013.6.1/msv-version -mustache-java-version0.8.16/mustache-java-version -mustache-bundle-version0.8.15_1//mustache-bundle-version +mustache-java-version0.8.17/mustache-java-version +mustache-bundle-version0.8.16_1//mustache-bundle-version mvel-version2.2.1.Final/mvel-version mybatis-version3.2.7/mybatis-version neethi-bundle-version3.0.1/neethi-bundle-version
[1/3] [maven-release-plugin] prepare release camel-2.13.3
Repository: camel Updated Branches: refs/heads/camel-2.13.x 8ec2f3155 - b1f8e1d3c http://git-wip-us.apache.org/repos/asf/camel/blob/b1f8e1d3/tooling/spi-annotations/pom.xml -- diff --git a/tooling/spi-annotations/pom.xml b/tooling/spi-annotations/pom.xml index 8c0cf97..8838c2a 100644 --- a/tooling/spi-annotations/pom.xml +++ b/tooling/spi-annotations/pom.xml @@ -22,7 +22,7 @@ parent groupIdorg.apache.camel/groupId artifactIdtooling/artifactId -version2.13.3-SNAPSHOT/version +version2.13.3/version /parent !-- should not be OSGi bundle as we shade this component into camel-core --
[3/3] git commit: [maven-release-plugin] prepare release camel-2.13.3
[maven-release-plugin] prepare release camel-2.13.3 Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/b1f8e1d3 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/b1f8e1d3 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/b1f8e1d3 Branch: refs/heads/camel-2.13.x Commit: b1f8e1d3cd0d24cdf7e1296565eef946222eecf1 Parents: 8ec2f31 Author: Christian Mueller cmuel...@apache.org Authored: Tue Oct 28 07:40:58 2014 +0100 Committer: Christian Mueller cmuel...@apache.org Committed: Tue Oct 28 07:40:58 2014 +0100 -- apache-camel/pom.xml | 2 +- buildingtools/pom.xml| 2 +- camel-core/pom.xml | 2 +- components/camel-ahc/pom.xml | 2 +- components/camel-amqp/pom.xml| 2 +- components/camel-apns/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-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-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-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-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 +- components/camel-http/pom.xml| 2 +- components/camel-http4/pom.xml | 2 +- components/camel-ibatis/pom.xml | 2 +- components/camel-ical/pom.xml| 2 +- components/camel-infinispan/pom.xml | 2 +- components/camel-irc/pom.xml | 2 +-
[2/3] [maven-release-plugin] prepare release camel-2.13.3
http://git-wip-us.apache.org/repos/asf/camel/blob/b1f8e1d3/components/camel-scala/pom.xml -- diff --git a/components/camel-scala/pom.xml b/components/camel-scala/pom.xml index 01b68e8..b88dbd0 100644 --- a/components/camel-scala/pom.xml +++ b/components/camel-scala/pom.xml @@ -21,7 +21,7 @@ parent groupIdorg.apache.camel/groupId artifactIdcomponents/artifactId -version2.13.3-SNAPSHOT/version +version2.13.3/version /parent artifactIdcamel-scala/artifactId http://git-wip-us.apache.org/repos/asf/camel/blob/b1f8e1d3/components/camel-script/pom.xml -- diff --git a/components/camel-script/pom.xml b/components/camel-script/pom.xml index 259a5bc..c609810 100644 --- a/components/camel-script/pom.xml +++ b/components/camel-script/pom.xml @@ -21,7 +21,7 @@ parent groupIdorg.apache.camel/groupId artifactIdcomponents/artifactId -version2.13.3-SNAPSHOT/version +version2.13.3/version /parent artifactIdcamel-script/artifactId http://git-wip-us.apache.org/repos/asf/camel/blob/b1f8e1d3/components/camel-servlet/pom.xml -- diff --git a/components/camel-servlet/pom.xml b/components/camel-servlet/pom.xml index 443664f..32f682c 100644 --- a/components/camel-servlet/pom.xml +++ b/components/camel-servlet/pom.xml @@ -21,7 +21,7 @@ parent groupIdorg.apache.camel/groupId artifactIdcomponents/artifactId -version2.13.3-SNAPSHOT/version +version2.13.3/version /parent groupIdorg.apache.camel/groupId http://git-wip-us.apache.org/repos/asf/camel/blob/b1f8e1d3/components/camel-servletlistener/pom.xml -- diff --git a/components/camel-servletlistener/pom.xml b/components/camel-servletlistener/pom.xml index 77419bc..546e335 100644 --- a/components/camel-servletlistener/pom.xml +++ b/components/camel-servletlistener/pom.xml @@ -21,7 +21,7 @@ parent groupIdorg.apache.camel/groupId artifactIdcomponents/artifactId -version2.13.3-SNAPSHOT/version +version2.13.3/version /parent groupIdorg.apache.camel/groupId http://git-wip-us.apache.org/repos/asf/camel/blob/b1f8e1d3/components/camel-shiro/pom.xml -- diff --git a/components/camel-shiro/pom.xml b/components/camel-shiro/pom.xml index 96d90a0..36dfba8 100644 --- a/components/camel-shiro/pom.xml +++ b/components/camel-shiro/pom.xml @@ -21,7 +21,7 @@ parent artifactIdcomponents/artifactId groupIdorg.apache.camel/groupId - version2.13.3-SNAPSHOT/version + version2.13.3/version /parent artifactIdcamel-shiro/artifactId http://git-wip-us.apache.org/repos/asf/camel/blob/b1f8e1d3/components/camel-sip/pom.xml -- diff --git a/components/camel-sip/pom.xml b/components/camel-sip/pom.xml index 895a053..d02074b 100644 --- a/components/camel-sip/pom.xml +++ b/components/camel-sip/pom.xml @@ -22,7 +22,7 @@ parent groupIdorg.apache.camel/groupId artifactIdcomponents/artifactId -version2.13.3-SNAPSHOT/version +version2.13.3/version /parent artifactIdcamel-sip/artifactId http://git-wip-us.apache.org/repos/asf/camel/blob/b1f8e1d3/components/camel-sjms/pom.xml -- diff --git a/components/camel-sjms/pom.xml b/components/camel-sjms/pom.xml index 7d1a3a9..953de8f 100644 --- a/components/camel-sjms/pom.xml +++ b/components/camel-sjms/pom.xml @@ -21,7 +21,7 @@ parent groupIdorg.apache.camel/groupId artifactIdcomponents/artifactId -version2.13.3-SNAPSHOT/version +version2.13.3/version /parent artifactIdcamel-sjms/artifactId http://git-wip-us.apache.org/repos/asf/camel/blob/b1f8e1d3/components/camel-smpp/pom.xml -- diff --git a/components/camel-smpp/pom.xml b/components/camel-smpp/pom.xml index ddfc108..8790e82 100644 --- a/components/camel-smpp/pom.xml +++ b/components/camel-smpp/pom.xml @@ -20,7 +20,7 @@ parent groupIdorg.apache.camel/groupId artifactIdcomponents/artifactId -version2.13.3-SNAPSHOT/version +version2.13.3/version /parent artifactIdcamel-smpp/artifactId http://git-wip-us.apache.org/repos/asf/camel/blob/b1f8e1d3/components/camel-snmp/pom.xml -- diff --git a/components/camel-snmp/pom.xml b/components/camel-snmp/pom.xml index fdcf548..4197aed 100644 --- a/components/camel-snmp/pom.xml +++
[3/3] 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/b33f223e Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/b33f223e Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/b33f223e Branch: refs/heads/camel-2.13.x Commit: b33f223e8ce1ace2c339e435ee72bb26ee3584ca Parents: b1f8e1d Author: Christian Mueller cmuel...@apache.org Authored: Tue Oct 28 07:41:22 2014 +0100 Committer: Christian Mueller cmuel...@apache.org Committed: Tue Oct 28 07:41:22 2014 +0100 -- apache-camel/pom.xml | 2 +- buildingtools/pom.xml| 2 +- camel-core/pom.xml | 2 +- components/camel-ahc/pom.xml | 2 +- components/camel-amqp/pom.xml| 2 +- components/camel-apns/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-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-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-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-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 +- components/camel-http/pom.xml| 2 +- components/camel-http4/pom.xml | 2 +- components/camel-ibatis/pom.xml | 2 +- components/camel-ical/pom.xml| 2 +- components/camel-infinispan/pom.xml | 2 +- components/camel-irc/pom.xml | 2 +-
[1/3] [maven-release-plugin] prepare for next development iteration
Repository: camel Updated Branches: refs/heads/camel-2.13.x b1f8e1d3c - b33f223e8 http://git-wip-us.apache.org/repos/asf/camel/blob/b33f223e/tooling/spi-annotations/pom.xml -- diff --git a/tooling/spi-annotations/pom.xml b/tooling/spi-annotations/pom.xml index 8838c2a..0393653 100644 --- a/tooling/spi-annotations/pom.xml +++ b/tooling/spi-annotations/pom.xml @@ -22,7 +22,7 @@ parent groupIdorg.apache.camel/groupId artifactIdtooling/artifactId -version2.13.3/version +version2.13.4-SNAPSHOT/version /parent !-- should not be OSGi bundle as we shade this component into camel-core --
Git Push Summary
Repository: camel Updated Tags: refs/tags/camel-2.13.3 [created] 7bcf9592c
[2/3] [maven-release-plugin] prepare for next development iteration
http://git-wip-us.apache.org/repos/asf/camel/blob/b33f223e/components/camel-scala/pom.xml -- diff --git a/components/camel-scala/pom.xml b/components/camel-scala/pom.xml index b88dbd0..b8de3d4 100644 --- a/components/camel-scala/pom.xml +++ b/components/camel-scala/pom.xml @@ -21,7 +21,7 @@ parent groupIdorg.apache.camel/groupId artifactIdcomponents/artifactId -version2.13.3/version +version2.13.4-SNAPSHOT/version /parent artifactIdcamel-scala/artifactId http://git-wip-us.apache.org/repos/asf/camel/blob/b33f223e/components/camel-script/pom.xml -- diff --git a/components/camel-script/pom.xml b/components/camel-script/pom.xml index c609810..24b33c2 100644 --- a/components/camel-script/pom.xml +++ b/components/camel-script/pom.xml @@ -21,7 +21,7 @@ parent groupIdorg.apache.camel/groupId artifactIdcomponents/artifactId -version2.13.3/version +version2.13.4-SNAPSHOT/version /parent artifactIdcamel-script/artifactId http://git-wip-us.apache.org/repos/asf/camel/blob/b33f223e/components/camel-servlet/pom.xml -- diff --git a/components/camel-servlet/pom.xml b/components/camel-servlet/pom.xml index 32f682c..d88393b 100644 --- a/components/camel-servlet/pom.xml +++ b/components/camel-servlet/pom.xml @@ -21,7 +21,7 @@ parent groupIdorg.apache.camel/groupId artifactIdcomponents/artifactId -version2.13.3/version +version2.13.4-SNAPSHOT/version /parent groupIdorg.apache.camel/groupId http://git-wip-us.apache.org/repos/asf/camel/blob/b33f223e/components/camel-servletlistener/pom.xml -- diff --git a/components/camel-servletlistener/pom.xml b/components/camel-servletlistener/pom.xml index 546e335..7a918c7 100644 --- a/components/camel-servletlistener/pom.xml +++ b/components/camel-servletlistener/pom.xml @@ -21,7 +21,7 @@ parent groupIdorg.apache.camel/groupId artifactIdcomponents/artifactId -version2.13.3/version +version2.13.4-SNAPSHOT/version /parent groupIdorg.apache.camel/groupId http://git-wip-us.apache.org/repos/asf/camel/blob/b33f223e/components/camel-shiro/pom.xml -- diff --git a/components/camel-shiro/pom.xml b/components/camel-shiro/pom.xml index 36dfba8..b13208d 100644 --- a/components/camel-shiro/pom.xml +++ b/components/camel-shiro/pom.xml @@ -21,7 +21,7 @@ parent artifactIdcomponents/artifactId groupIdorg.apache.camel/groupId - version2.13.3/version + version2.13.4-SNAPSHOT/version /parent artifactIdcamel-shiro/artifactId http://git-wip-us.apache.org/repos/asf/camel/blob/b33f223e/components/camel-sip/pom.xml -- diff --git a/components/camel-sip/pom.xml b/components/camel-sip/pom.xml index d02074b..0cd587a 100644 --- a/components/camel-sip/pom.xml +++ b/components/camel-sip/pom.xml @@ -22,7 +22,7 @@ parent groupIdorg.apache.camel/groupId artifactIdcomponents/artifactId -version2.13.3/version +version2.13.4-SNAPSHOT/version /parent artifactIdcamel-sip/artifactId http://git-wip-us.apache.org/repos/asf/camel/blob/b33f223e/components/camel-sjms/pom.xml -- diff --git a/components/camel-sjms/pom.xml b/components/camel-sjms/pom.xml index 953de8f..1f8c8cb 100644 --- a/components/camel-sjms/pom.xml +++ b/components/camel-sjms/pom.xml @@ -21,7 +21,7 @@ parent groupIdorg.apache.camel/groupId artifactIdcomponents/artifactId -version2.13.3/version +version2.13.4-SNAPSHOT/version /parent artifactIdcamel-sjms/artifactId http://git-wip-us.apache.org/repos/asf/camel/blob/b33f223e/components/camel-smpp/pom.xml -- diff --git a/components/camel-smpp/pom.xml b/components/camel-smpp/pom.xml index 8790e82..d65ad38 100644 --- a/components/camel-smpp/pom.xml +++ b/components/camel-smpp/pom.xml @@ -20,7 +20,7 @@ parent groupIdorg.apache.camel/groupId artifactIdcomponents/artifactId -version2.13.3/version +version2.13.4-SNAPSHOT/version /parent artifactIdcamel-smpp/artifactId http://git-wip-us.apache.org/repos/asf/camel/blob/b33f223e/components/camel-snmp/pom.xml -- diff --git a/components/camel-snmp/pom.xml b/components/camel-snmp/pom.xml index 4197aed..e2b6bb2 100644 --- a/components/camel-snmp/pom.xml +++
svn commit: r927122 [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.12.5-blueprint.xsd == --- websites/production/camel/content/schema/cxf/camel-cxf-2.12.5-blueprint.xsd (added) +++ websites/production/camel/content/schema/cxf/camel-cxf-2.12.5-blueprint.xsd Tue Oct 28 06:46:41 2014 @@ -0,0 +1,176 @@ +?xml version=1.0 encoding=UTF-8? +!-- + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + License); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + AS IS BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. +-- +xsd:schema xmlns=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; + + xsd:import namespace=http://www.osgi.org/xmlns/blueprint/v1.0.0; schemaLocation=http://www.osgi.org/xmlns/blueprint/v1.0.0/blueprint.xsd/ + xsd:import namespace=http://cxf.apache.org/configuration/beans; schemaLocation=http://cxf.apache.org/schemas/configuration/cxf-beans.xsd/ + + xsd:element name=cxfEndpoint +xsd:complexType + xsd:complexContent +xsd:extension base=beans:Tcomponent + xsd:all +xsd:element name=binding type=xsd:anyType minOccurs=0/ +xsd:element name=dataBinding type=xsd:anyType minOccurs=0/ +xsd:element name=features type=xsd:anyType minOccurs=0/ +xsd:element name=inInterceptors type=xsd:anyType minOccurs=0/ +xsd:element name=inFaultInterceptors type=xsd:anyType minOccurs=0/ +xsd:element name=outInterceptors type=xsd:anyType minOccurs=0/ +xsd:element name=outFaultInterceptors type=xsd:anyType minOccurs=0/ +xsd:element name=handlers type=xsd:anyType minOccurs=0/ +xsd:element name=properties type=beans:Tmap minOccurs=0/ +xsd:element name=schemaLocations type=schemasType minOccurs=0/ +xsd:element name=serviceBean type=xsd:anyType minOccurs=0/ +xsd:element name=serviceFactory type=xsd:anyType minOccurs=0/ + /xsd:all + !-- xsd:attributeGroup ref=cxf-beans:beanAttributes/-- + xsd:attribute name=address type=xsd:string/ + xsd:attribute name=bindingId type=xsd:string/ + xsd:attribute name=bus type=xsd:string/ + xsd:attribute name=serviceClass type=xsd:string/ + xsd:attribute name=transportId type=xsd:string/ + xsd:attribute name=wsdlURL type=xsd:string/ + xsd:attribute name=endpointName type=xsd:QName/ + xsd:attribute name=serviceName type=xsd:QName/ + xsd:attribute name=loggingFeatureEnabled type=xsd:boolean/ + xsd:attribute name=loggingSizeLimit type=xsd:integer / +/xsd:extension + /xsd:complexContent +/xsd:complexType + /xsd:element + + xsd:element name=rsServer +xsd:complexType + xsd:complexContent +xsd:extension base=beans:Tcomponent + xsd:all +xsd:element name=executor type=xsd:anyType minOccurs=0/ +xsd:element name=features type=xsd:anyType minOccurs=0/ +xsd:element name=binding type=xsd:anyType minOccurs=0/ +xsd:element name=inInterceptors type=xsd:anyType minOccurs=0/ +xsd:element name=inFaultInterceptors type=xsd:anyType minOccurs=0/ +xsd:element name=invoker type=xsd:anyType minOccurs=0/ +xsd:element name=outInterceptors type=xsd:anyType minOccurs=0/ +xsd:element name=outFaultInterceptors type=xsd:anyType minOccurs=0/ +xsd:element name=properties type=beans:Tmap minOccurs=0/ +xsd:element name=serviceBeans type=xsd:anyType minOccurs=0/ +xsd:element name=modelBeans type=xsd:anyType minOccurs=0/ +xsd:element name=model type=model minOccurs=0/ +xsd:element name=providers type=xsd:anyType minOccurs=0/ +
svn commit: r927122 [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.12.5.xsd == --- websites/production/camel/content/schema/blueprint/camel-blueprint-2.12.5.xsd (added) +++ websites/production/camel/content/schema/blueprint/camel-blueprint-2.12.5.xsd Tue Oct 28 06:46:41 2014 @@ -0,0 +1,3196 @@ +?xml version=1.0 encoding=UTF-8 standalone=yes? +xs:schema elementFormDefault=qualified version=1.0 targetNamespace=http://camel.apache.org/schema/blueprint; xmlns:tns=http://camel.apache.org/schema/blueprint; xmlns:xs=http://www.w3.org/2001/XMLSchema; + + xs:element name=aggregate type=tns:aggregateDefinition/ + + xs:element name=aop type=tns:aopDefinition/ + + xs:element name=avro type=tns:avroDataFormat/ + + xs:element name=base64 type=tns:base64DataFormat/ + + xs:element name=batchResequencerConfig type=tns:batchResequencerConfig/ + + xs:element name=bean type=tns:beanDefinition/ + + xs:element name=beanio type=tns:beanioDataFormat/ + + xs:element name=bindy type=tns:bindyDataFormat/ + + xs:element name=camelContext type=tns:camelContextFactoryBean/ + + xs:element name=castor type=tns:castorDataFormat/ + + xs:element name=choice type=tns:choiceDefinition/ + + xs:element name=constant type=tns:constantExpression/ + + xs:element name=consumerTemplate type=tns:camelConsumerTemplateFactoryBean/ + + xs:element name=contextScan type=tns:contextScanDefinition/ + + xs:element name=convertBodyTo type=tns:convertBodyDefinition/ + + xs:element name=crypto type=tns:cryptoDataFormat/ + + xs:element name=csv type=tns:csvDataFormat/ + + xs:element name=customDataFormat type=tns:customDataFormat/ + + xs:element name=customLoadBalancer type=tns:customLoadBalancerDefinition/ + + xs:element name=dataFormats type=tns:dataFormatsDefinition/ + + xs:element name=delay type=tns:delayDefinition/ + + xs:element name=description type=tns:descriptionDefinition/ + + xs:element name=doCatch type=tns:catchDefinition/ + + xs:element name=doFinally type=tns:finallyDefinition/ + + xs:element name=doTry type=tns:tryDefinition/ + + xs:element name=dynamicRouter type=tns:dynamicRouterDefinition/ + + xs:element name=el type=tns:elExpression/ + + xs:element name=endpoint type=tns:camelEndpointFactoryBean/ + + xs:element name=enrich type=tns:enrichDefinition/ + + xs:element name=errorHandler type=tns:camelErrorHandlerFactoryBean/ + + xs:element name=export type=tns:camelServiceExporterDefinition/ + + xs:element name=expression type=tns:expressionSubElementDefinition/ + + xs:element name=expressionDefinition type=tns:expression/ + + xs:element name=failover type=tns:failoverLoadBalancerDefinition/ + + xs:element name=filter type=tns:filterDefinition/ + + xs:element name=flatpack type=tns:flatpackDataFormat/ + + xs:element name=from type=tns:fromDefinition/ + + xs:element name=groovy type=tns:groovyExpression/ + + xs:element name=gzip type=tns:gzipDataFormat/ + + xs:element name=header type=tns:headerExpression/ + + xs:element name=hl7 type=tns:hl7DataFormat/ + + xs:element name=idempotentConsumer type=tns:idempotentConsumerDefinition/ + + xs:element name=inOnly type=tns:inOnlyDefinition/ + + xs:element name=inOut type=tns:inOutDefinition/ + + xs:element name=intercept type=tns:interceptDefinition/ + + xs:element name=interceptFrom type=tns:interceptFromDefinition/ + + xs:element name=interceptToEndpoint type=tns:interceptSendToEndpointDefinition/ + + xs:element name=javaScript type=tns:javaScriptExpression/ + + xs:element name=jaxb type=tns:jaxbDataFormat/ + + xs:element name=jibx type=tns:jibxDataFormat/ + + xs:element name=jmxAgent type=tns:camelJMXAgentDefinition/ + + xs:element name=json type=tns:jsonDataFormat/ + + xs:element name=jxpath type=tns:jxPathExpression/ + + xs:element name=keyStoreParameters type=tns:keyStoreParametersFactoryBean/ + + xs:element name=language type=tns:languageExpression/ + + xs:element name=loadBalance type=tns:loadBalanceDefinition/ + + xs:element name=log type=tns:logDefinition/ + + xs:element name=loop type=tns:loopDefinition/ + + xs:element name=marshal type=tns:marshalDefinition/ + + xs:element name=method type=tns:methodCallExpression/ + + xs:element name=multicast type=tns:multicastDefinition/ + + xs:element name=mvel type=tns:mvelExpression/ + + xs:element name=ognl type=tns:ognlExpression/ + + xs:element name=onCompletion type=tns:onCompletionDefinition/ + + xs:element name=onException type=tns:onExceptionDefinition/ + + xs:element name=optimisticLockRetryPolicy type=tns:optimisticLockRetryPolicyDefinition/ + + xs:element name=otherwise type=tns:otherwiseDefinition/ + + xs:element name=packageScan type=tns:packageScanDefinition/ + + xs:element name=pgp type=tns:pgpDataFormat/ + + xs:element name=php type=tns:phpExpression/ + + xs:element name=pipeline type=tns:pipelineDefinition/ + + xs:element name=policy type=tns:policyDefinition/ + +
svn commit: r927122 [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.12.5.xsd == --- websites/production/camel/content/schema/spring/camel-spring-2.12.5.xsd (added) +++ websites/production/camel/content/schema/spring/camel-spring-2.12.5.xsd Tue Oct 28 06:46:41 2014 @@ -0,0 +1,3203 @@ +?xml version=1.0 encoding=UTF-8 standalone=yes? +xs:schema elementFormDefault=qualified version=1.0 targetNamespace=http://camel.apache.org/schema/spring; xmlns:tns=http://camel.apache.org/schema/spring; xmlns:xs=http://www.w3.org/2001/XMLSchema; + + xs:element name=aggregate type=tns:aggregateDefinition/ + + xs:element name=aop type=tns:aopDefinition/ + + xs:element name=avro type=tns:avroDataFormat/ + + xs:element name=base64 type=tns:base64DataFormat/ + + xs:element name=batchResequencerConfig type=tns:batchResequencerConfig/ + + xs:element name=bean type=tns:beanDefinition/ + + xs:element name=beanPostProcessor type=tns:camelBeanPostProcessor/ + + xs:element name=beanio type=tns:beanioDataFormat/ + + xs:element name=bindy type=tns:bindyDataFormat/ + + xs:element name=camelContext type=tns:camelContextFactoryBean/ + + xs:element name=castor type=tns:castorDataFormat/ + + xs:element name=choice type=tns:choiceDefinition/ + + xs:element name=constant type=tns:constantExpression/ + + xs:element name=consumerTemplate type=tns:camelConsumerTemplateFactoryBean/ + + xs:element name=contextScan type=tns:contextScanDefinition/ + + xs:element name=convertBodyTo type=tns:convertBodyDefinition/ + + xs:element name=crypto type=tns:cryptoDataFormat/ + + xs:element name=csv type=tns:csvDataFormat/ + + xs:element name=customDataFormat type=tns:customDataFormat/ + + xs:element name=customLoadBalancer type=tns:customLoadBalancerDefinition/ + + xs:element name=dataFormats type=tns:dataFormatsDefinition/ + + xs:element name=delay type=tns:delayDefinition/ + + xs:element name=description type=tns:descriptionDefinition/ + + xs:element name=doCatch type=tns:catchDefinition/ + + xs:element name=doFinally type=tns:finallyDefinition/ + + xs:element name=doTry type=tns:tryDefinition/ + + xs:element name=dynamicRouter type=tns:dynamicRouterDefinition/ + + xs:element name=el type=tns:elExpression/ + + xs:element name=endpoint type=tns:camelEndpointFactoryBean/ + + xs:element name=enrich type=tns:enrichDefinition/ + + xs:element name=errorHandler type=tns:errorHandlerDefinition/ + + xs:element name=export type=tns:camelServiceExporterDefinition/ + + xs:element name=expression type=tns:expressionSubElementDefinition/ + + xs:element name=expressionDefinition type=tns:expression/ + + xs:element name=failover type=tns:failoverLoadBalancerDefinition/ + + xs:element name=filter type=tns:filterDefinition/ + + xs:element name=flatpack type=tns:flatpackDataFormat/ + + xs:element name=from type=tns:fromDefinition/ + + xs:element name=groovy type=tns:groovyExpression/ + + xs:element name=gzip type=tns:gzipDataFormat/ + + xs:element name=header type=tns:headerExpression/ + + xs:element name=hl7 type=tns:hl7DataFormat/ + + xs:element name=idempotentConsumer type=tns:idempotentConsumerDefinition/ + + xs:element name=inOnly type=tns:inOnlyDefinition/ + + xs:element name=inOut type=tns:inOutDefinition/ + + xs:element name=intercept type=tns:interceptDefinition/ + + xs:element name=interceptFrom type=tns:interceptFromDefinition/ + + xs:element name=interceptToEndpoint type=tns:interceptSendToEndpointDefinition/ + + xs:element name=javaScript type=tns:javaScriptExpression/ + + xs:element name=jaxb type=tns:jaxbDataFormat/ + + xs:element name=jibx type=tns:jibxDataFormat/ + + xs:element name=jmxAgent type=tns:camelJMXAgentDefinition/ + + xs:element name=json type=tns:jsonDataFormat/ + + xs:element name=jxpath type=tns:jxPathExpression/ + + xs:element name=keyStoreParameters type=tns:keyStoreParametersFactoryBean/ + + xs:element name=language type=tns:languageExpression/ + + xs:element name=loadBalance type=tns:loadBalanceDefinition/ + + xs:element name=log type=tns:logDefinition/ + + xs:element name=loop type=tns:loopDefinition/ + + xs:element name=marshal type=tns:marshalDefinition/ + + xs:element name=method type=tns:methodCallExpression/ + + xs:element name=multicast type=tns:multicastDefinition/ + + xs:element name=mvel type=tns:mvelExpression/ + + xs:element name=ognl type=tns:ognlExpression/ + + xs:element name=onCompletion type=tns:onCompletionDefinition/ + + xs:element name=onException type=tns:onExceptionDefinition/ + + xs:element name=optimisticLockRetryPolicy type=tns:optimisticLockRetryPolicyDefinition/ + + xs:element name=otherwise type=tns:otherwiseDefinition/ + + xs:element name=packageScan type=tns:packageScanDefinition/ + + xs:element name=pgp type=tns:pgpDataFormat/ + + xs:element name=php type=tns:phpExpression/ + + xs:element name=pipeline type=tns:pipelineDefinition/ + + xs:element
svn commit: r927122 [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.12.5.xsd == --- websites/production/camel/content/schema/spring/integration/camel-spring-integration-2.12.5.xsd (added) +++ websites/production/camel/content/schema/spring/integration/camel-spring-integration-2.12.5.xsd Tue Oct 28 06:46:41 2014 @@ -0,0 +1,65 @@ +?xml version=1.0 encoding=UTF-8? +!-- + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + License); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + AS IS BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. +-- +xsd:schema xmlns=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 + + xsd:import namespace=http://www.springframework.org/schema/beans; schemaLocation=http://www.springframework.org/schema/beans/spring-beans.xsd/ + xsd:import namespace=http://camel.apache.org/schema/spring; schemaLocation=http://camel.apache.org/schema/spring/camel-spring.xsd/ + + xsd:complexType name=camelEndpointType + xsd:sequence + xsd:element ref=camel-spring:camelContext minOccurs=0 / + xsd:element name=camelContextRef type=xsd:string minOccurs=0 / + /xsd:sequence + xsd:attribute name=id type=xsd:ID use=required / + xsd:attribute name=camelEndpointUri type=xsd:string / + xsd:attribute name=replyChannel type=xsd:string / + xsd:attribute name=expectReply type=xsd:boolean default=true/ + /xsd:complexType + + xsd:element name=camelSource + xsd:complexType +xsd:annotation + xsd:documentation + Defines a camel-source for handling the Camel context message in Spring Integration message bus. + /xsd:documentation + /xsd:annotation +xsd:complexContent + xsd:extension base=camelEndpointType + xsd:attribute name=requestChannel type=xsd:string use=required / + /xsd:extension + /xsd:complexContent + /xsd:complexType + /xsd:element + + xsd:element name=camelTarget type=camelEndpointType +xsd:annotation + xsd:documentation + Defines a camel-target to feed Spring Integration message to the Camel context. + /xsd:documentation + /xsd:annotation + /xsd:element +/xsd:schema
svn commit: r927122 [1/5] - in /websites/production/camel/content/schema: blueprint/ cxf/ spring-security/ spring/ spring/integration/
Author: cmueller Date: Tue Oct 28 06:46:41 2014 New Revision: 927122 Log: Uploading released schemas for camel-2.12.5 Added: websites/production/camel/content/schema/blueprint/camel-blueprint-2.12.5.xsd websites/production/camel/content/schema/cxf/camel-cxf-2.12.5-blueprint.xsd websites/production/camel/content/schema/cxf/camel-cxf-2.12.5-spring.xsd websites/production/camel/content/schema/spring-security/camel-spring-security-2.12.5.xsd websites/production/camel/content/schema/spring/camel-spring-2.12.5.xsd websites/production/camel/content/schema/spring/integration/camel-spring-integration-2.12.5.xsd
git commit: CAMEL-7976: Validation of feature camel-ssh is failing
Repository: camel
Updated Branches:
refs/heads/camel-2.14.x 9bbd8b272 - e544c924d
CAMEL-7976: Validation of feature camel-ssh is failing
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/e544c924
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/e544c924
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/e544c924
Branch: refs/heads/camel-2.14.x
Commit: e544c924ddd5dd060332e5bbbf9877035ca92b3d
Parents: 9bbd8b2
Author: Christian Mueller cmuel...@apache.org
Authored: Tue Oct 28 06:57:23 2014 +0100
Committer: Christian Mueller cmuel...@apache.org
Committed: Tue Oct 28 08:09:06 2014 +0100
--
platforms/karaf/features/src/main/resources/features.xml | 1 +
1 file changed, 1 insertion(+)
--
http://git-wip-us.apache.org/repos/asf/camel/blob/e544c924/platforms/karaf/features/src/main/resources/features.xml
--
diff --git a/platforms/karaf/features/src/main/resources/features.xml
b/platforms/karaf/features/src/main/resources/features.xml
index b06a95f..802044f 100644
--- a/platforms/karaf/features/src/main/resources/features.xml
+++ b/platforms/karaf/features/src/main/resources/features.xml
@@ -1263,6 +1263,7 @@
feature version='${project.version}'camel-core/feature
bundle
dependency='true'mvn:org.apache.mina/mina-core/${mina2-version}/bundle
bundle
dependency='true'mvn:org.apache.sshd/sshd-core/${sshd-version}/bundle
+bundle
dependency='true'mvn:org.bouncycastle/bcprov-jdk15on/${bouncycastle-version}/bundle
bundle
dependency='true'mvn:org.bouncycastle/bcpkix-jdk15on/${bouncycastle-version}/bundle
bundlemvn:org.apache.camel/camel-ssh/${project.version}/bundle
/feature
git commit: CAMEL-7976: Validation of feature camel-ssh is failing
Repository: camel
Updated Branches:
refs/heads/master cd204ac0a - d21cd6303
CAMEL-7976: Validation of feature camel-ssh is failing
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/d21cd630
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/d21cd630
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/d21cd630
Branch: refs/heads/master
Commit: d21cd6303d6cff9643239a77c228ebba4fbcff14
Parents: cd204ac
Author: Christian Mueller cmuel...@apache.org
Authored: Tue Oct 28 06:57:23 2014 +0100
Committer: Christian Mueller cmuel...@apache.org
Committed: Tue Oct 28 08:10:14 2014 +0100
--
platforms/karaf/features/src/main/resources/features.xml | 1 +
1 file changed, 1 insertion(+)
--
http://git-wip-us.apache.org/repos/asf/camel/blob/d21cd630/platforms/karaf/features/src/main/resources/features.xml
--
diff --git a/platforms/karaf/features/src/main/resources/features.xml
b/platforms/karaf/features/src/main/resources/features.xml
index fd26c83..f345107 100644
--- a/platforms/karaf/features/src/main/resources/features.xml
+++ b/platforms/karaf/features/src/main/resources/features.xml
@@ -1274,6 +1274,7 @@
feature version='${project.version}'camel-core/feature
bundle
dependency='true'mvn:org.apache.mina/mina-core/${mina2-version}/bundle
bundle
dependency='true'mvn:org.apache.sshd/sshd-core/${sshd-version}/bundle
+bundle
dependency='true'mvn:org.bouncycastle/bcprov-jdk15on/${bouncycastle-version}/bundle
bundle
dependency='true'mvn:org.bouncycastle/bcpkix-jdk15on/${bouncycastle-version}/bundle
bundlemvn:org.apache.camel/camel-ssh/${project.version}/bundle
/feature
git commit: Upgrade CXF 3.0.1 to 3.0.2, mainly because of CVE-2014-3623
Repository: camel Updated Branches: refs/heads/master d21cd6303 - 342dade95 Upgrade CXF 3.0.1 to 3.0.2, mainly because of CVE-2014-3623 Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/342dade9 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/342dade9 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/342dade9 Branch: refs/heads/master Commit: 342dade9585e49b700771904a79eac6099c4eaa8 Parents: d21cd63 Author: Christian Mueller cmuel...@apache.org Authored: Tue Oct 28 08:12:36 2014 +0100 Committer: Christian Mueller cmuel...@apache.org Committed: Tue Oct 28 08:12:36 2014 +0100 -- parent/pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -- http://git-wip-us.apache.org/repos/asf/camel/blob/342dade9/parent/pom.xml -- diff --git a/parent/pom.xml b/parent/pom.xml index 7b0b769..4e0f71d 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -114,9 +114,9 @@ commons-vfs2-version2.0/commons-vfs2-version concurrentlinkedhashmap.version1.4/concurrentlinkedhashmap.version cobertura-maven-plugin-version2.5.2/cobertura-maven-plugin-version -cxf-version3.0.1/cxf-version +cxf-version3.0.2/cxf-version cxf-version-range[2.7,4.0)/cxf-version-range -cxf-xjc-utils-version3.0.1/cxf-xjc-utils-version +cxf-xjc-utils-version3.0.2/cxf-xjc-utils-version deltaspike-version1.0.3/deltaspike-version derby-version10.10.2.0/derby-version disruptor-version3.3.0/disruptor-version
git commit: Upgrade CXF 3.0.1 to 3.0.2, mainly because of CVE-2014-3623
Repository: camel Updated Branches: refs/heads/camel-2.14.x e544c924d - 3860decad Upgrade CXF 3.0.1 to 3.0.2, mainly because of CVE-2014-3623 Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/3860deca Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/3860deca Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/3860deca Branch: refs/heads/camel-2.14.x Commit: 3860decadcf9e9d4d6883df731ce0e6f1728f839 Parents: e544c92 Author: Christian Mueller cmuel...@apache.org Authored: Tue Oct 28 08:17:53 2014 +0100 Committer: Christian Mueller cmuel...@apache.org Committed: Tue Oct 28 08:17:53 2014 +0100 -- parent/pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -- http://git-wip-us.apache.org/repos/asf/camel/blob/3860deca/parent/pom.xml -- diff --git a/parent/pom.xml b/parent/pom.xml index a51f3cb..9fbe371 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -113,9 +113,9 @@ commons-vfs2-version2.0/commons-vfs2-version concurrentlinkedhashmap.version1.4/concurrentlinkedhashmap.version cobertura-maven-plugin-version2.5.2/cobertura-maven-plugin-version -cxf-version3.0.1/cxf-version +cxf-version3.0.2/cxf-version cxf-version-range[2.7,4.0)/cxf-version-range -cxf-xjc-utils-version3.0.1/cxf-xjc-utils-version +cxf-xjc-utils-version3.0.2/cxf-xjc-utils-version deltaspike-version1.0.2/deltaspike-version derby-version10.10.2.0/derby-version disruptor-version3.3.0/disruptor-version
git commit: Upgrade Avro 1.7.6 to 1.7.7, mainly because the bundle version 1.7.6_2 doesn't exist
Repository: camel Updated Branches: refs/heads/master 342dade95 - a31eba88e Upgrade Avro 1.7.6 to 1.7.7, mainly because the bundle version 1.7.6_2 doesn't exist Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/a31eba88 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/a31eba88 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/a31eba88 Branch: refs/heads/master Commit: a31eba88e35bb0ccf31abc3e6289fe9252b81a9c Parents: 342dade Author: Christian Mueller cmuel...@apache.org Authored: Tue Oct 28 08:19:34 2014 +0100 Committer: Christian Mueller cmuel...@apache.org Committed: Tue Oct 28 08:19:34 2014 +0100 -- parent/pom.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) -- http://git-wip-us.apache.org/repos/asf/camel/blob/a31eba88/parent/pom.xml -- diff --git a/parent/pom.xml b/parent/pom.xml index 4e0f71d..92c1bea 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -59,9 +59,9 @@ atomikos-transactions-version3.9.3/atomikos-transactions-version avalon-bundle-version4.3.1_1/avalon-bundle-version avalon-version4.3.1/avalon-version -avro-version1.7.6/avro-version -avro-bundle-version1.7.6_2/avro-bundle-version -avro-ipc-bundle-version1.7.6_1/avro-ipc-bundle-version +avro-version1.7.7/avro-version +avro-bundle-version1.7.7_1/avro-bundle-version +avro-ipc-bundle-version1.7.7_1/avro-ipc-bundle-version aws-java-sdk-bundle-version1.8.9.1_1/aws-java-sdk-bundle-version aws-java-sdk-version1.8.9.1/aws-java-sdk-version axiom-version1.2.14/axiom-version
svn commit: r927124 - in /websites/production/camel/content: 2014/10/ 2014/10/28/ 2014/10/28/apache-camel-2125-released.html cache/main.pageCache xml-reference.html
Author: buildbot
Date: Tue Oct 28 07:19:39 2014
New Revision: 927124
Log:
Production update by buildbot for camel
Added:
websites/production/camel/content/2014/10/
websites/production/camel/content/2014/10/28/
websites/production/camel/content/2014/10/28/apache-camel-2125-released.html
Modified:
websites/production/camel/content/cache/main.pageCache
websites/production/camel/content/xml-reference.html
Added:
websites/production/camel/content/2014/10/28/apache-camel-2125-released.html
==
---
websites/production/camel/content/2014/10/28/apache-camel-2125-released.html
(added)
+++
websites/production/camel/content/2014/10/28/apache-camel-2125-released.html
Tue Oct 28 07:19:39 2014
@@ -0,0 +1,147 @@
+!DOCTYPE html PUBLIC -//W3C//DTD HTML 4.01 Transitional//EN
http://www.w3.org/TR/html4/loose.dtd;
+!--
+
+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.
+--
+html
+head
+link href=//camel.apache.org/styles/site.css rel=stylesheet
type=text/css
+link href=//camel.apache.org/styles/type-settings.css rel=stylesheet
type=text/css
+script src=//camel.apache.org/styles/prototype.js
type=text/javascript/script
+script src=//camel.apache.org/styles/rico.js
type=text/javascript/script
+script src=//camel.apache.org/styles/site.js
type=text/javascript/script
+
+meta http-equiv=Content-type content=text/html;charset=UTF-8
+
+style type=text/css
+ .maincontent { overflow:hidden; }
+/style
+!--[if IE]
+style type=text/css
+ .maincontent { width:100%; }
+/style
+![endif]--
+
+
+
+title
+Apache Camel: Apache Camel 2.12.5 released
+/title
+/head
+body
+div class=white_box
+div class=header
+ div class=header_l
+div class=header_r
+/div
+ /div
+/div
+div class=content
+ div class=content_l
+div class=content_r
+ div
+ !-- Banner --
+div id=banner-contentdiv id=asf_logo
+ div id=activemq_logo style=height:108px; background:transparent
url(banner.data/apache-camel-7.png) no-repeat scroll left top;
+a shape=rect style=float:left;
width:310px;display:block;text-indent:-5000px;text-decoration:none;line-height:140px;
margin-top:20px; margin-left:18px; href=http://camel.apache.org/;Camel/a
+a shape=rect style=float:right;
width:180px;display:block;text-indent:-5000px;text-decoration:none;line-height:80px;
margin-top:45px; margin-right:10px; href=http://www.apache.org;Apache/a
+ /div
+/div/div
+ !-- Banner --
+div class=top_red_bar
+ div id=site-breadcrumbs
+!-- Breadcrumbs --
+a href=../../../index.htmlApache
Camel/anbsp;gt;nbsp;2014nbsp;gt;nbsp;10nbsp;gt;nbsp;28nbsp;gt;nbsp;a
href=apache-camel-2125-released.htmlApache Camel 2.12.5 released/a
+ /div
+ !-- Quicklinks --
+div id=site-quicklinkspa shape=rect href=download.htmlDownload/a
| a shape=rect href=javadoc.htmlJavaDoc/a | a shape=rect
href=source.htmlSource/a | a shape=rect
href=discussion-forums.htmlForums/a | a shape=rect
href=support.htmlSupport/a/p/div
+ !-- Quicklinks --
+/div
+
+ table border=0
+ tbody
+tr
+td valign=top width=100%
+div class=wiki-content maincontentpThe Camel community announces the
immediate availability of the new patch release Camel 2.12.5. This bug fix
release is issued after more than 3 months of intense efforts of the Camel
2.12.x maintenance branch and resolves 75 issues in total./ppThe artifacts
are published and ready for you to a shape=rect class=external-link
href=http://camel.apache.org/download.html;download/a either from the
Apache mirrors or from the Central Maven repository. For more details please
take a look at the a shape=rect class=external-link
href=http://camel.apache.org/camel-2125-release.html;release
notes/a./ppMany thanks to all who made this release
possible./pp#160;/ppOn behalf of the Camel
PMC,/ppChristian/pp#160;/pp#160;/p/div
+/td
+td valign=top
+ div class=navigation
+div class=navigation_top
+!-- NavigationBar --
+div class=navigation_bottom
git commit: Upgrade Avro 1.7.6 to 1.7.7, mainly because the bundle version 1.7.6_2 doesn't exist
Repository: camel Updated Branches: refs/heads/camel-2.14.x 3860decad - 59b160c23 Upgrade Avro 1.7.6 to 1.7.7, mainly because the bundle version 1.7.6_2 doesn't exist Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/59b160c2 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/59b160c2 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/59b160c2 Branch: refs/heads/camel-2.14.x Commit: 59b160c23ec40792a6037944674d390c64ca04ff Parents: 3860dec Author: Christian Mueller cmuel...@apache.org Authored: Tue Oct 28 08:20:18 2014 +0100 Committer: Christian Mueller cmuel...@apache.org Committed: Tue Oct 28 08:20:18 2014 +0100 -- parent/pom.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) -- http://git-wip-us.apache.org/repos/asf/camel/blob/59b160c2/parent/pom.xml -- diff --git a/parent/pom.xml b/parent/pom.xml index 9fbe371..465ecd2 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -59,9 +59,9 @@ atomikos-transactions-version3.9.3/atomikos-transactions-version avalon-bundle-version4.3.1_1/avalon-bundle-version avalon-version4.3.1/avalon-version -avro-version1.7.6/avro-version -avro-bundle-version1.7.6_2/avro-bundle-version -avro-ipc-bundle-version1.7.6_1/avro-ipc-bundle-version +avro-version1.7.7/avro-version +avro-bundle-version1.7.7_1/avro-bundle-version +avro-ipc-bundle-version1.7.7_1/avro-ipc-bundle-version aws-java-sdk-bundle-version1.8.9.1_1/aws-java-sdk-bundle-version aws-java-sdk-version1.8.9.1/aws-java-sdk-version axiom-version1.2.14/axiom-version
[1/3] [maven-release-plugin] rollback the release of camel-2.13.3
Repository: camel Updated Branches: refs/heads/camel-2.13.x b33f223e8 - 2f2dde16c http://git-wip-us.apache.org/repos/asf/camel/blob/2f2dde16/tooling/maven/camel-package-maven-plugin/pom.xml -- diff --git a/tooling/maven/camel-package-maven-plugin/pom.xml b/tooling/maven/camel-package-maven-plugin/pom.xml index b9e5224..be1220b 100644 --- a/tooling/maven/camel-package-maven-plugin/pom.xml +++ b/tooling/maven/camel-package-maven-plugin/pom.xml @@ -21,7 +21,7 @@ parent groupIdorg.apache.camel/groupId artifactIdmaven-plugins/artifactId -version2.13.4-SNAPSHOT/version +version2.13.3-SNAPSHOT/version /parent artifactIdcamel-package-maven-plugin/artifactId http://git-wip-us.apache.org/repos/asf/camel/blob/2f2dde16/tooling/maven/guice-maven-plugin/pom.xml -- diff --git a/tooling/maven/guice-maven-plugin/pom.xml b/tooling/maven/guice-maven-plugin/pom.xml index 9a377bb..af1a632 100644 --- a/tooling/maven/guice-maven-plugin/pom.xml +++ b/tooling/maven/guice-maven-plugin/pom.xml @@ -21,7 +21,7 @@ parent groupIdorg.apache.camel/groupId artifactIdmaven-plugins/artifactId -version2.13.4-SNAPSHOT/version +version2.13.3-SNAPSHOT/version /parent artifactIdguice-maven-plugin/artifactId http://git-wip-us.apache.org/repos/asf/camel/blob/2f2dde16/tooling/maven/pom.xml -- diff --git a/tooling/maven/pom.xml b/tooling/maven/pom.xml index 6479e31..3af3621 100644 --- a/tooling/maven/pom.xml +++ b/tooling/maven/pom.xml @@ -21,7 +21,7 @@ parent groupIdorg.apache.camel/groupId artifactIdtooling/artifactId -version2.13.4-SNAPSHOT/version +version2.13.3-SNAPSHOT/version /parent artifactIdmaven-plugins/artifactId http://git-wip-us.apache.org/repos/asf/camel/blob/2f2dde16/tooling/pom.xml -- diff --git a/tooling/pom.xml b/tooling/pom.xml index 17cd100..fefcbe9 100644 --- a/tooling/pom.xml +++ b/tooling/pom.xml @@ -21,7 +21,7 @@ parent groupIdorg.apache.camel/groupId artifactIdcamel-parent/artifactId -version2.13.4-SNAPSHOT/version +version2.13.3-SNAPSHOT/version relativePath../parent/relativePath /parent http://git-wip-us.apache.org/repos/asf/camel/blob/2f2dde16/tooling/spi-annotations/pom.xml -- diff --git a/tooling/spi-annotations/pom.xml b/tooling/spi-annotations/pom.xml index 0393653..8c0cf97 100644 --- a/tooling/spi-annotations/pom.xml +++ b/tooling/spi-annotations/pom.xml @@ -22,7 +22,7 @@ parent groupIdorg.apache.camel/groupId artifactIdtooling/artifactId -version2.13.4-SNAPSHOT/version +version2.13.3-SNAPSHOT/version /parent !-- should not be OSGi bundle as we shade this component into camel-core --
[3/3] git commit: [maven-release-plugin] rollback the release of camel-2.13.3
[maven-release-plugin] rollback the release of camel-2.13.3 Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/2f2dde16 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/2f2dde16 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/2f2dde16 Branch: refs/heads/camel-2.13.x Commit: 2f2dde16c6b954ce77eda4921e1fddbf0d39268f Parents: b33f223 Author: Christian Mueller cmuel...@apache.org Authored: Tue Oct 28 08:22:59 2014 +0100 Committer: Christian Mueller cmuel...@apache.org Committed: Tue Oct 28 08:22:59 2014 +0100 -- apache-camel/pom.xml | 2 +- buildingtools/pom.xml | 2 +- camel-core/pom.xml | 2 +- components/camel-ahc/pom.xml | 2 +- components/camel-amqp/pom.xml | 2 +- components/camel-apns/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-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-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-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-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 +- components/camel-http/pom.xml | 2 +- components/camel-http4/pom.xml | 2 +- components/camel-ibatis/pom.xml| 2 +- components/camel-ical/pom.xml | 2 +- components/camel-infinispan/pom.xml
[2/3] [maven-release-plugin] rollback the release of camel-2.13.3
http://git-wip-us.apache.org/repos/asf/camel/blob/2f2dde16/components/camel-sap-netweaver/pom.xml -- diff --git a/components/camel-sap-netweaver/pom.xml b/components/camel-sap-netweaver/pom.xml index 6afc468..78e0612 100644 --- a/components/camel-sap-netweaver/pom.xml +++ b/components/camel-sap-netweaver/pom.xml @@ -21,7 +21,7 @@ parent artifactIdcomponents/artifactId groupIdorg.apache.camel/groupId -version2.13.4-SNAPSHOT/version +version2.13.3-SNAPSHOT/version /parent groupIdorg.apache.camel/groupId http://git-wip-us.apache.org/repos/asf/camel/blob/2f2dde16/components/camel-saxon/pom.xml -- diff --git a/components/camel-saxon/pom.xml b/components/camel-saxon/pom.xml index 2b178de..ba51897 100644 --- a/components/camel-saxon/pom.xml +++ b/components/camel-saxon/pom.xml @@ -21,7 +21,7 @@ parent groupIdorg.apache.camel/groupId artifactIdcomponents/artifactId -version2.13.4-SNAPSHOT/version +version2.13.3-SNAPSHOT/version /parent artifactIdcamel-saxon/artifactId http://git-wip-us.apache.org/repos/asf/camel/blob/2f2dde16/components/camel-scala/pom.xml -- diff --git a/components/camel-scala/pom.xml b/components/camel-scala/pom.xml index b8de3d4..01b68e8 100644 --- a/components/camel-scala/pom.xml +++ b/components/camel-scala/pom.xml @@ -21,7 +21,7 @@ parent groupIdorg.apache.camel/groupId artifactIdcomponents/artifactId -version2.13.4-SNAPSHOT/version +version2.13.3-SNAPSHOT/version /parent artifactIdcamel-scala/artifactId http://git-wip-us.apache.org/repos/asf/camel/blob/2f2dde16/components/camel-script/pom.xml -- diff --git a/components/camel-script/pom.xml b/components/camel-script/pom.xml index 24b33c2..259a5bc 100644 --- a/components/camel-script/pom.xml +++ b/components/camel-script/pom.xml @@ -21,7 +21,7 @@ parent groupIdorg.apache.camel/groupId artifactIdcomponents/artifactId -version2.13.4-SNAPSHOT/version +version2.13.3-SNAPSHOT/version /parent artifactIdcamel-script/artifactId http://git-wip-us.apache.org/repos/asf/camel/blob/2f2dde16/components/camel-servlet/pom.xml -- diff --git a/components/camel-servlet/pom.xml b/components/camel-servlet/pom.xml index d88393b..443664f 100644 --- a/components/camel-servlet/pom.xml +++ b/components/camel-servlet/pom.xml @@ -21,7 +21,7 @@ parent groupIdorg.apache.camel/groupId artifactIdcomponents/artifactId -version2.13.4-SNAPSHOT/version +version2.13.3-SNAPSHOT/version /parent groupIdorg.apache.camel/groupId http://git-wip-us.apache.org/repos/asf/camel/blob/2f2dde16/components/camel-servletlistener/pom.xml -- diff --git a/components/camel-servletlistener/pom.xml b/components/camel-servletlistener/pom.xml index 7a918c7..77419bc 100644 --- a/components/camel-servletlistener/pom.xml +++ b/components/camel-servletlistener/pom.xml @@ -21,7 +21,7 @@ parent groupIdorg.apache.camel/groupId artifactIdcomponents/artifactId -version2.13.4-SNAPSHOT/version +version2.13.3-SNAPSHOT/version /parent groupIdorg.apache.camel/groupId http://git-wip-us.apache.org/repos/asf/camel/blob/2f2dde16/components/camel-shiro/pom.xml -- diff --git a/components/camel-shiro/pom.xml b/components/camel-shiro/pom.xml index b13208d..96d90a0 100644 --- a/components/camel-shiro/pom.xml +++ b/components/camel-shiro/pom.xml @@ -21,7 +21,7 @@ parent artifactIdcomponents/artifactId groupIdorg.apache.camel/groupId - version2.13.4-SNAPSHOT/version + version2.13.3-SNAPSHOT/version /parent artifactIdcamel-shiro/artifactId http://git-wip-us.apache.org/repos/asf/camel/blob/2f2dde16/components/camel-sip/pom.xml -- diff --git a/components/camel-sip/pom.xml b/components/camel-sip/pom.xml index 0cd587a..895a053 100644 --- a/components/camel-sip/pom.xml +++ b/components/camel-sip/pom.xml @@ -22,7 +22,7 @@ parent groupIdorg.apache.camel/groupId artifactIdcomponents/artifactId -version2.13.4-SNAPSHOT/version +version2.13.3-SNAPSHOT/version /parent artifactIdcamel-sip/artifactId http://git-wip-us.apache.org/repos/asf/camel/blob/2f2dde16/components/camel-sjms/pom.xml -- diff --git
git commit: CAMEL-7977 Fixed the sftp compression option setting issue
Repository: camel
Updated Branches:
refs/heads/master a31eba88e - bc056bcc1
CAMEL-7977 Fixed the sftp compression option setting issue
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/bc056bcc
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/bc056bcc
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/bc056bcc
Branch: refs/heads/master
Commit: bc056bcc1b3c3bac5ccb893635ac1caedf3f7313
Parents: a31eba8
Author: Willem Jiang willem.ji...@gmail.com
Authored: Tue Oct 28 15:56:43 2014 +0800
Committer: Willem Jiang willem.ji...@gmail.com
Committed: Tue Oct 28 15:57:03 2014 +0800
--
.../org/apache/camel/component/file/remote/SftpOperations.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/camel/blob/bc056bcc/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/SftpOperations.java
--
diff --git
a/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/SftpOperations.java
b/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/SftpOperations.java
index 4440368..daf6db6 100644
---
a/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/SftpOperations.java
+++
b/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/SftpOperations.java
@@ -266,8 +266,8 @@ public class SftpOperations implements
RemoteFileOperationsChannelSftp.LsEntry
// compression
if (sftpConfig.getCompression() 0) {
LOG.debug(Using compression: {}, sftpConfig.getCompression());
-session.setConfig(compression.s2c, z...@openssh.com, zlib,
none);
-session.setConfig(compression.c2s, z...@openssh.com, zlib,
none);
+session.setConfig(compression.s2c, z...@openssh.com,zlib,none);
+session.setConfig(compression.c2s, z...@openssh.com,zlib,none);
session.setConfig(compression_level,
Integer.toString(sftpConfig.getCompression()));
}
git commit: CAMEL-7977 Fixed the sftp compression option setting issue
Repository: camel
Updated Branches:
refs/heads/camel-2.14.x 59b160c23 - d37afded6
CAMEL-7977 Fixed the sftp compression option setting issue
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/d37afded
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/d37afded
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/d37afded
Branch: refs/heads/camel-2.14.x
Commit: d37afded68017c4c76bd848194930802fafa703a
Parents: 59b160c
Author: Willem Jiang willem.ji...@gmail.com
Authored: Tue Oct 28 15:56:43 2014 +0800
Committer: Willem Jiang willem.ji...@gmail.com
Committed: Tue Oct 28 15:58:35 2014 +0800
--
.../org/apache/camel/component/file/remote/SftpOperations.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/camel/blob/d37afded/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/SftpOperations.java
--
diff --git
a/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/SftpOperations.java
b/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/SftpOperations.java
index 4440368..daf6db6 100644
---
a/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/SftpOperations.java
+++
b/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/SftpOperations.java
@@ -266,8 +266,8 @@ public class SftpOperations implements
RemoteFileOperationsChannelSftp.LsEntry
// compression
if (sftpConfig.getCompression() 0) {
LOG.debug(Using compression: {}, sftpConfig.getCompression());
-session.setConfig(compression.s2c, z...@openssh.com, zlib,
none);
-session.setConfig(compression.c2s, z...@openssh.com, zlib,
none);
+session.setConfig(compression.s2c, z...@openssh.com,zlib,none);
+session.setConfig(compression.c2s, z...@openssh.com,zlib,none);
session.setConfig(compression_level,
Integer.toString(sftpConfig.getCompression()));
}
[3/3] git commit: CAMEL-7940 - disable SSL by default in netty components
CAMEL-7940 - disable SSL by default in netty components
Conflicts:
components/camel-netty/src/main/java/org/apache/camel/component/netty/NettyServerBootstrapConfiguration.java
components/camel-netty4-http/src/main/java/org/apache/camel/component/netty4/http/HttpClientInitializerFactory.java
components/camel-netty4-http/src/main/java/org/apache/camel/component/netty4/http/HttpServerInitializerFactory.java
components/camel-netty4-http/src/main/java/org/apache/camel/component/netty4/http/HttpServerSharedInitializerFactory.java
components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpSSLTest.java
components/camel-netty4/src/main/java/org/apache/camel/component/netty4/DefaultClientInitializerFactory.java
components/camel-netty4/src/main/java/org/apache/camel/component/netty4/DefaultServerInitializerFactory.java
components/camel-netty4/src/main/java/org/apache/camel/component/netty4/NettyServerBootstrapConfiguration.java
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/f98cfda6
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/f98cfda6
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/f98cfda6
Branch: refs/heads/camel-2.13.x
Commit: f98cfda6d17e4aa4fc93f8834740e69c4fc50aac
Parents: 2f2dde1
Author: Jonathan Anstey jans...@gmail.com
Authored: Tue Oct 28 10:24:37 2014 -0230
Committer: Jonathan Anstey jans...@gmail.com
Committed: Tue Oct 28 10:29:12 2014 -0230
--
.../component/netty/http/HttpClientPipelineFactory.java | 1 +
.../component/netty/http/HttpServerPipelineFactory.java | 1 +
.../netty/http/HttpServerSharedPipelineFactory.java | 1 +
.../component/netty/DefaultClientPipelineFactory.java | 4 +++-
.../component/netty/DefaultServerPipelineFactory.java | 5 -
.../netty/NettyServerBootstrapConfiguration.java| 12 +++-
6 files changed, 21 insertions(+), 3 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/camel/blob/f98cfda6/components/camel-netty-http/src/main/java/org/apache/camel/component/netty/http/HttpClientPipelineFactory.java
--
diff --git
a/components/camel-netty-http/src/main/java/org/apache/camel/component/netty/http/HttpClientPipelineFactory.java
b/components/camel-netty-http/src/main/java/org/apache/camel/component/netty/http/HttpClientPipelineFactory.java
index 846d690..ce95648 100644
---
a/components/camel-netty-http/src/main/java/org/apache/camel/component/netty/http/HttpClientPipelineFactory.java
+++
b/components/camel-netty-http/src/main/java/org/apache/camel/component/netty/http/HttpClientPipelineFactory.java
@@ -174,6 +174,7 @@ public class HttpClientPipelineFactory extends
ClientPipelineFactory {
} else if (sslContext != null) {
SSLEngine engine = sslContext.createSSLEngine();
engine.setUseClientMode(true);
+
engine.setEnabledProtocols(producer.getConfiguration().getEnabledProtocols().split(,));
return new SslHandler(engine);
}
http://git-wip-us.apache.org/repos/asf/camel/blob/f98cfda6/components/camel-netty-http/src/main/java/org/apache/camel/component/netty/http/HttpServerPipelineFactory.java
--
diff --git
a/components/camel-netty-http/src/main/java/org/apache/camel/component/netty/http/HttpServerPipelineFactory.java
b/components/camel-netty-http/src/main/java/org/apache/camel/component/netty/http/HttpServerPipelineFactory.java
index 37fc58b..b8305ea 100644
---
a/components/camel-netty-http/src/main/java/org/apache/camel/component/netty/http/HttpServerPipelineFactory.java
+++
b/components/camel-netty-http/src/main/java/org/apache/camel/component/netty/http/HttpServerPipelineFactory.java
@@ -186,6 +186,7 @@ public class HttpServerPipelineFactory extends
ServerPipelineFactory {
SSLEngine engine = sslContext.createSSLEngine();
engine.setUseClientMode(false);
engine.setNeedClientAuth(consumer.getConfiguration().isNeedClientAuth());
+
engine.setEnabledProtocols(consumer.getConfiguration().getEnabledProtocols().split(,));
return new SslHandler(engine);
}
http://git-wip-us.apache.org/repos/asf/camel/blob/f98cfda6/components/camel-netty-http/src/main/java/org/apache/camel/component/netty/http/HttpServerSharedPipelineFactory.java
--
diff --git
a/components/camel-netty-http/src/main/java/org/apache/camel/component/netty/http/HttpServerSharedPipelineFactory.java
[2/3] git commit: CAMEL-7940 - disable SSL by default in netty components
CAMEL-7940 - disable SSL by default in netty components
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/e6cc689f
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/e6cc689f
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/e6cc689f
Branch: refs/heads/camel-2.14.x
Commit: e6cc689f4233fb3539a05f70dde53bac8bd208d9
Parents: d37afde
Author: Jonathan Anstey jans...@gmail.com
Authored: Tue Oct 28 10:24:37 2014 -0230
Committer: Jonathan Anstey jans...@gmail.com
Committed: Tue Oct 28 10:25:39 2014 -0230
--
.../component/netty/http/HttpClientPipelineFactory.java | 1 +
.../component/netty/http/HttpServerPipelineFactory.java | 1 +
.../netty/http/HttpServerSharedPipelineFactory.java | 1 +
.../component/netty/DefaultClientPipelineFactory.java | 4 +++-
.../component/netty/DefaultServerPipelineFactory.java | 5 -
.../netty/NettyServerBootstrapConfiguration.java| 12 +++-
.../netty4/http/HttpClientInitializerFactory.java | 1 +
.../netty4/http/HttpServerInitializerFactory.java | 1 +
.../netty4/http/HttpServerSharedInitializerFactory.java | 1 +
.../camel/component/netty4/http/NettyHttpSSLTest.java | 1 -
.../netty4/DefaultClientInitializerFactory.java | 1 +
.../netty4/DefaultServerInitializerFactory.java | 1 +
.../netty4/NettyServerBootstrapConfiguration.java | 10 ++
13 files changed, 36 insertions(+), 4 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/camel/blob/e6cc689f/components/camel-netty-http/src/main/java/org/apache/camel/component/netty/http/HttpClientPipelineFactory.java
--
diff --git
a/components/camel-netty-http/src/main/java/org/apache/camel/component/netty/http/HttpClientPipelineFactory.java
b/components/camel-netty-http/src/main/java/org/apache/camel/component/netty/http/HttpClientPipelineFactory.java
index 019a6cd..9c85c9d 100644
---
a/components/camel-netty-http/src/main/java/org/apache/camel/component/netty/http/HttpClientPipelineFactory.java
+++
b/components/camel-netty-http/src/main/java/org/apache/camel/component/netty/http/HttpClientPipelineFactory.java
@@ -174,6 +174,7 @@ public class HttpClientPipelineFactory extends
ClientPipelineFactory {
} else if (sslContext != null) {
SSLEngine engine = sslContext.createSSLEngine();
engine.setUseClientMode(true);
+
engine.setEnabledProtocols(producer.getConfiguration().getEnabledProtocols().split(,));
return new SslHandler(engine);
}
http://git-wip-us.apache.org/repos/asf/camel/blob/e6cc689f/components/camel-netty-http/src/main/java/org/apache/camel/component/netty/http/HttpServerPipelineFactory.java
--
diff --git
a/components/camel-netty-http/src/main/java/org/apache/camel/component/netty/http/HttpServerPipelineFactory.java
b/components/camel-netty-http/src/main/java/org/apache/camel/component/netty/http/HttpServerPipelineFactory.java
index 22ea852..565534c 100644
---
a/components/camel-netty-http/src/main/java/org/apache/camel/component/netty/http/HttpServerPipelineFactory.java
+++
b/components/camel-netty-http/src/main/java/org/apache/camel/component/netty/http/HttpServerPipelineFactory.java
@@ -184,6 +184,7 @@ public class HttpServerPipelineFactory extends
ServerPipelineFactory {
SSLEngine engine = sslContext.createSSLEngine();
engine.setUseClientMode(false);
engine.setNeedClientAuth(consumer.getConfiguration().isNeedClientAuth());
+
engine.setEnabledProtocols(consumer.getConfiguration().getEnabledProtocols().split(,));
return new SslHandler(engine);
}
http://git-wip-us.apache.org/repos/asf/camel/blob/e6cc689f/components/camel-netty-http/src/main/java/org/apache/camel/component/netty/http/HttpServerSharedPipelineFactory.java
--
diff --git
a/components/camel-netty-http/src/main/java/org/apache/camel/component/netty/http/HttpServerSharedPipelineFactory.java
b/components/camel-netty-http/src/main/java/org/apache/camel/component/netty/http/HttpServerSharedPipelineFactory.java
index cca79bc..c920fd4 100644
---
a/components/camel-netty-http/src/main/java/org/apache/camel/component/netty/http/HttpServerSharedPipelineFactory.java
+++
b/components/camel-netty-http/src/main/java/org/apache/camel/component/netty/http/HttpServerSharedPipelineFactory.java
@@ -151,6 +151,7 @@ public class HttpServerSharedPipelineFactory extends
HttpServerPipelineFactory {
SSLEngine engine = sslContext.createSSLEngine();
engine.setUseClientMode(false);
[1/3] git commit: CAMEL-7940 - disable SSL by default in netty components
Repository: camel
Updated Branches:
refs/heads/camel-2.13.x 2f2dde16c - f98cfda6d
refs/heads/camel-2.14.x d37afded6 - e6cc689f4
refs/heads/master bc056bcc1 - c10a91ace
CAMEL-7940 - disable SSL by default in netty components
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/c10a91ac
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/c10a91ac
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/c10a91ac
Branch: refs/heads/master
Commit: c10a91ace9f789510ddf84a216e43ebfeabe02b6
Parents: bc056bc
Author: Jonathan Anstey jans...@gmail.com
Authored: Tue Oct 28 10:24:37 2014 -0230
Committer: Jonathan Anstey jans...@gmail.com
Committed: Tue Oct 28 10:24:48 2014 -0230
--
.../component/netty/http/HttpClientPipelineFactory.java | 1 +
.../component/netty/http/HttpServerPipelineFactory.java | 1 +
.../netty/http/HttpServerSharedPipelineFactory.java | 1 +
.../component/netty/DefaultClientPipelineFactory.java | 4 +++-
.../component/netty/DefaultServerPipelineFactory.java | 5 -
.../netty/NettyServerBootstrapConfiguration.java| 12 +++-
.../netty4/http/HttpClientInitializerFactory.java | 1 +
.../netty4/http/HttpServerInitializerFactory.java | 1 +
.../netty4/http/HttpServerSharedInitializerFactory.java | 1 +
.../camel/component/netty4/http/NettyHttpSSLTest.java | 1 -
.../netty4/DefaultClientInitializerFactory.java | 1 +
.../netty4/DefaultServerInitializerFactory.java | 1 +
.../netty4/NettyServerBootstrapConfiguration.java | 10 ++
13 files changed, 36 insertions(+), 4 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/camel/blob/c10a91ac/components/camel-netty-http/src/main/java/org/apache/camel/component/netty/http/HttpClientPipelineFactory.java
--
diff --git
a/components/camel-netty-http/src/main/java/org/apache/camel/component/netty/http/HttpClientPipelineFactory.java
b/components/camel-netty-http/src/main/java/org/apache/camel/component/netty/http/HttpClientPipelineFactory.java
index 019a6cd..9c85c9d 100644
---
a/components/camel-netty-http/src/main/java/org/apache/camel/component/netty/http/HttpClientPipelineFactory.java
+++
b/components/camel-netty-http/src/main/java/org/apache/camel/component/netty/http/HttpClientPipelineFactory.java
@@ -174,6 +174,7 @@ public class HttpClientPipelineFactory extends
ClientPipelineFactory {
} else if (sslContext != null) {
SSLEngine engine = sslContext.createSSLEngine();
engine.setUseClientMode(true);
+
engine.setEnabledProtocols(producer.getConfiguration().getEnabledProtocols().split(,));
return new SslHandler(engine);
}
http://git-wip-us.apache.org/repos/asf/camel/blob/c10a91ac/components/camel-netty-http/src/main/java/org/apache/camel/component/netty/http/HttpServerPipelineFactory.java
--
diff --git
a/components/camel-netty-http/src/main/java/org/apache/camel/component/netty/http/HttpServerPipelineFactory.java
b/components/camel-netty-http/src/main/java/org/apache/camel/component/netty/http/HttpServerPipelineFactory.java
index 22ea852..565534c 100644
---
a/components/camel-netty-http/src/main/java/org/apache/camel/component/netty/http/HttpServerPipelineFactory.java
+++
b/components/camel-netty-http/src/main/java/org/apache/camel/component/netty/http/HttpServerPipelineFactory.java
@@ -184,6 +184,7 @@ public class HttpServerPipelineFactory extends
ServerPipelineFactory {
SSLEngine engine = sslContext.createSSLEngine();
engine.setUseClientMode(false);
engine.setNeedClientAuth(consumer.getConfiguration().isNeedClientAuth());
+
engine.setEnabledProtocols(consumer.getConfiguration().getEnabledProtocols().split(,));
return new SslHandler(engine);
}
http://git-wip-us.apache.org/repos/asf/camel/blob/c10a91ac/components/camel-netty-http/src/main/java/org/apache/camel/component/netty/http/HttpServerSharedPipelineFactory.java
--
diff --git
a/components/camel-netty-http/src/main/java/org/apache/camel/component/netty/http/HttpServerSharedPipelineFactory.java
b/components/camel-netty-http/src/main/java/org/apache/camel/component/netty/http/HttpServerSharedPipelineFactory.java
index cca79bc..c920fd4 100644
---
a/components/camel-netty-http/src/main/java/org/apache/camel/component/netty/http/HttpServerSharedPipelineFactory.java
+++
b/components/camel-netty-http/src/main/java/org/apache/camel/component/netty/http/HttpServerSharedPipelineFactory.java
@@ -151,6 +151,7 @@ public class HttpServerSharedPipelineFactory
svn commit: r927184 - in /websites/production/camel/content: cache/main.pageCache spring-boot.html
Author: buildbot
Date: Tue Oct 28 16:18:59 2014
New Revision: 927184
Log:
Production update by buildbot for camel
Modified:
websites/production/camel/content/cache/main.pageCache
websites/production/camel/content/spring-boot.html
Modified: websites/production/camel/content/cache/main.pageCache
==
Binary files - no diff available.
Modified: websites/production/camel/content/spring-boot.html
==
--- websites/production/camel/content/spring-boot.html (original)
+++ websites/production/camel/content/spring-boot.html Tue Oct 28 16:18:59 2014
@@ -184,7 +184,20 @@ public class InvoiceProcessor {
/div/divpBy default consumer and producer templates comes with the
endpoint cache sizes equal to 1000. You can change that values via the
following Spring properties:/pdiv class=code panel pdl
style=border-width: 1px;div class=codeContent panelContent pdl
script class=theme: Default; brush: xml; gutter: false
type=syntaxhighlighter![CDATA[camel.springboot.consumerTemplateCacheSize =
100
camel.springboot.producerTemplateCacheSize = 200]]/script
-/div/divp#160;/ppbr clear=none/ph3
id=SpringBoot-SeeAlsoSee Also/h3
+/div/divh3
id=SpringBoot-Auto-configuredTypeConverterAuto-configured#160;TypeConverter/h3pCamel
auto-configuration registers#160;codeTypeConverter/code instance named
codetypeConverter/code#160;in the Spring context./pdiv class=code
panel pdl style=border-width: 1px;div class=codeContent panelContent pdl
+script class=theme: Default; brush: java; gutter: false
type=syntaxhighlighter![CDATA[@Component
+public class InvoiceProcessor {
+
+ @Autowired
+ private TypeConverter typeConverter;
+
+ public long parseInvoiceValue(Invoice invoice) {
+String invoiceValue = invoice.grossValue();
+return typeConverter.convertTo(Long.class, invoiceValue);
+ }
+
+}]]/script
+/div/divpbr clear=none/ph3 id=SpringBoot-SeeAlsoSee Also/h3
ullia shape=rect href=configuring-camel.htmlConfiguring
Camel/a/lilia shape=rect
href=component.htmlComponent/a/lilia shape=rect
href=endpoint.htmlEndpoint/a/lilia shape=rect
href=getting-started.htmlGetting Started/a/li/ul/div
/td
td valign=top
svn commit: r927201 - /websites/production/camel/content/cache/main.pageCache
Author: cmueller Date: Tue Oct 28 19:58:59 2014 New Revision: 927201 Log: trigger full site export because of a new blog post Removed: websites/production/camel/content/cache/main.pageCache
svn commit: r927205 [1/2] - in /websites/production/camel/content: ./ cache/
Author: buildbot
Date: Tue Oct 28 20:31:52 2014
New Revision: 927205
Log:
Production update by buildbot for camel
Added:
websites/production/camel/content/cache/main.pageCache (with props)
Modified:
websites/production/camel/content/book-component-appendix.html
websites/production/camel/content/book-in-one-page.html
websites/production/camel/content/book-tutorials.html
websites/production/camel/content/camel-30-ideas.html
websites/production/camel/content/camel-jmx.html
websites/production/camel/content/component.html
websites/production/camel/content/cxf.html
websites/production/camel/content/scala-dsl-eip.html
websites/production/camel/content/siteindex.html
websites/production/camel/content/sitemap.html
websites/production/camel/content/tutorial-axis-camel.html
websites/production/camel/content/tutorial-jmsremoting.html
websites/production/camel/content/user-guide.html
Modified: websites/production/camel/content/book-component-appendix.html
==
--- websites/production/camel/content/book-component-appendix.html (original)
+++ websites/production/camel/content/book-component-appendix.html Tue Oct 28
20:31:52 2014
@@ -1529,11 +1529,11 @@ template.send(quot;direct:alias-verify
/div
/div
pThe strongcxf:/strong component provides integration with a
shape=rect href=http://cxf.apache.org;Apache CXF/a for connecting to
JAX-WS services hosted in CXF./ppstyle type=text/css/*![CDATA[*/
-div.rbtoc1414037916527 {padding: 0px;}
-div.rbtoc1414037916527 ul {list-style: disc;margin-left: 0px;}
-div.rbtoc1414037916527 li {margin-left: 0px;padding-left: 0px;}
+div.rbtoc1414527938586 {padding: 0px;}
+div.rbtoc1414527938586 ul {list-style: disc;margin-left: 0px;}
+div.rbtoc1414527938586 li {margin-left: 0px;padding-left: 0px;}
-/*]]*//style/pdiv class=toc-macro rbtoc1414037916527
+/*]]*//style/pdiv class=toc-macro rbtoc1414527938586
ul class=toc-indentationlia shape=rect href=#CXF-CXFComponentCXF
Component/a
ul class=toc-indentationlia shape=rect href=#CXF-URIformatURI
format/a/lilia shape=rect href=#CXF-OptionsOptions/a
ul class=toc-indentationlia shape=rect
href=#CXF-ThedescriptionsofthedataformatsThe descriptions of the
dataformats/a
Modified: websites/production/camel/content/book-in-one-page.html
==
--- websites/production/camel/content/book-in-one-page.html (original)
+++ websites/production/camel/content/book-in-one-page.html Tue Oct 28 20:31:52
2014
@@ -4129,11 +4129,11 @@ While not actual tutorials you might fin
/div
/div
h2 id=BookInOnePage-PrefacePreface/h2pThis tutorial aims to guide the
reader through the stages of creating a project which uses Camel to facilitate
the routing of messages from a JMS queue to a a shape=rect
class=external-link href=http://www.springramework.org;
rel=nofollowSpring/a service. The route works in a synchronous fashion
returning a response to the client./ppstyle type=text/css/*![CDATA[*/
-div.rbtoc1414441126489 {padding: 0px;}
-div.rbtoc1414441126489 ul {list-style: disc;margin-left: 0px;}
-div.rbtoc1414441126489 li {margin-left: 0px;padding-left: 0px;}
+div.rbtoc1414527798672 {padding: 0px;}
+div.rbtoc1414527798672 ul {list-style: disc;margin-left: 0px;}
+div.rbtoc1414527798672 li {margin-left: 0px;padding-left: 0px;}
-/*]]*//style/pdiv class=toc-macro rbtoc1414441126489
+/*]]*//style/pdiv class=toc-macro rbtoc1414527798672
ul class=toc-indentationlia shape=rect
href=#Tutorial-JmsRemoting-TutorialonSpringRemotingwithJMSTutorial on Spring
Remoting with JMS/a/lilia shape=rect
href=#Tutorial-JmsRemoting-PrefacePreface/a/lilia shape=rect
href=#Tutorial-JmsRemoting-PrerequisitesPrerequisites/a/lilia
shape=rect
href=#Tutorial-JmsRemoting-DistributionDistribution/a/lilia
shape=rect href=#Tutorial-JmsRemoting-AboutAbout/a/lilia
shape=rect href=#Tutorial-JmsRemoting-CreatetheCamelProjectCreate the
Camel Project/a
ul class=toc-indentationlia shape=rect
href=#Tutorial-JmsRemoting-UpdatethePOMwithDependenciesUpdate the POM with
Dependencies/a/li/ul
/lilia shape=rect href=#Tutorial-JmsRemoting-WritingtheServerWriting
the Server/a
@@ -6319,11 +6319,11 @@ So we completed the last piece in the pi
style type=text/css/*![CDATA[*/
-div.rbtoc1414441126814 {padding: 0px;}
-div.rbtoc1414441126814 ul {list-style: disc;margin-left: 0px;}
-div.rbtoc1414441126814 li {margin-left: 0px;padding-left: 0px;}
+div.rbtoc1414527801257 {padding: 0px;}
+div.rbtoc1414527801257 ul {list-style: disc;margin-left: 0px;}
+div.rbtoc1414527801257 li {margin-left: 0px;padding-left: 0px;}
-/*]]*//stylediv class=toc-macro rbtoc1414441126814
+/*]]*//stylediv class=toc-macro rbtoc1414527801257
ul class=toc-indentationlia shape=rect
href=#Tutorial-AXIS-Camel-TutorialusingAxis1.4withApacheCamelTutorial using
Axis 1.4 with
svn commit: r927205 [2/2] - in /websites/production/camel/content: ./ cache/
Modified: websites/production/camel/content/sitemap.html == --- websites/production/camel/content/sitemap.html (original) +++ websites/production/camel/content/sitemap.html Tue Oct 28 20:31:52 2014 @@ -76,10 +76,10 @@ tr td valign=top width=100% div class=wiki-content maincontenth2 id=SiteMap-DocumentationDocumentation/h2 -ul class=childpages-macrolia shape=rect href=architecture.htmlArchitecture/aul class=childpages-macrolia shape=rect href=dozer-type-conversion.htmlDozer Type Conversion/a/lilia shape=rect href=aop.htmlAOP/a/lilia shape=rect href=async.htmlAsync/a/lilia shape=rect href=bam.htmlBAM/a/lilia shape=rect href=batch-consumer.htmlBatch Consumer/a/lilia shape=rect href=browsableendpoint.htmlBrowsableEndpoint/a/lilia shape=rect href=camelcontext.htmlCamelContext/a/lilia shape=rect href=camel-core.htmlCamel-Core/a/lilia shape=rect href=component.htmlComponent/a/lilia shape=rect href=data-format.htmlData Format/aul class=childpages-macrolia shape=rect href=serialization.htmlSerialization/a/lilia shape=rect href=jaxb.htmlJAXB/a/lilia shape=rect href=xmlbeans.htmlXmlBeans/a/lilia shape=rect href=xstream.htmlXStream /a/lilia shape=rect href=csv.htmlCSV/a/lilia shape=rect href=string.htmlString/a/lilia shape=rect href=hl7-dataformat.htmlHL7 DataFormat/a/lilia shape=rect href=edi.htmlEDI/a/lilia shape=rect href=flatpack-dataformat.htmlFlatpack DataFormat/a/lilia shape=rect href=json.htmlJSON/a/lilia shape=rect href=zip-dataformat.htmlZip DataFormat/a/lilia shape=rect href=tidymarkup.htmlTidyMarkup/a/lilia shape=rect href=bindy.htmlBindy/a/lilia shape=rect href=xmlsecurity-dataformat.htmlXMLSecurity DataFormat/a/lilia shape=rect href=gzip-data-format.htmlGZip data format/a/lilia shape=rect href=castor.htmlCastor/a/lilia shape=rect href=protobuf.htmlProtobuf/a/lilia shape=rect href=soap.htmlSOAP/a/lilia shape=rect href=crypto.htmlCrypto/a/lilia shape=rect href=syslog.htmlSyslog/a/lilia shape=rect href= jibx.htmlJiBX/a/lilia shape=rect href=custom-dataformat.htmlCustom DataFormat/a/lilia shape=rect href=ical.htmlICal/a/lilia shape=rect href=barcode-data-format.htmlBarcode Data Format/a/lilia shape=rect href=base64.htmlBase64/a/lilia shape=rect href=beanio.htmlBeanIO/a/lilia shape=rect href=xmljson.htmlXmlJson/a/li/ul/lilia shape=rect href=debugger.htmlDebugger/a/lilia shape=rect href=delay-interceptor.htmlDelay Interceptor/a/lilia shape=rect href=dependency-injection.htmlDependency Injection/a/lilia shape=rect href=dsl.htmlDSL/aul class=childpages-macrolia shape=rect href=exception-clause.htmlException Clause/a/lilia shape=rect href=fluent-builders.htmlFluent Builders/a/lilia shape=rect href=java-dsl.htmlJava DSL/a/lilia shape=rect href=rest-dsl.htmlRest DSL/a/lilia shape=rect href=try-catch-finall y.htmlTry Catch Finally/a/li/ul/lilia shape=rect href=endpoint.htmlEndpoint/a/lilia shape=rect href=error-handler.htmlError Handler/aul class=childpages-macrolia shape=rect href=defaulterrorhandler.htmlDefaultErrorHandler/a/lilia shape=rect href=redeliverypolicy.htmlRedeliveryPolicy/a/lilia shape=rect href=transactionerrorhandler.htmlTransactionErrorHandler/a/li/ul/lilia shape=rect href=exchange.htmlExchange/a/lilia shape=rect href=exchange-pattern.htmlExchange Pattern/a/lilia shape=rect href=expression.htmlExpression/a/lilia shape=rect href=injector.htmlInjector/a/lilia shape=rect href=intercept.htmlIntercept/a/lilia shape=rect href=inversion-of-control-with-smart-defaults.htmlInversion Of Control With Smart Defaults/a/lilia shape=rect href=languages.htmlLanguages/aul class=childpages-macrolia shape=rect href=bean-la nguage.htmlBean Language/a/lilia shape=rect href=constant.htmlConstant/a/lilia shape=rect href=el.htmlEL/a/lilia shape=rect href=file-language.htmlFile Language/a/lilia shape=rect href=groovy-dsl.htmlGroovy DSL/a/lilia shape=rect href=header.htmlHeader/a/lilia shape=rect href=jsonpath.htmlJSonPath/a/lilia shape=rect href=jxpath.htmlJXPath/a/lilia shape=rect href=mvel.htmlMvel/a/lilia shape=rect href=ognl.htmlOGNL/a/lilia shape=rect href=property.htmlProperty/a/lilia shape=rect href=ref-language.htmlRef Language/a/lilia shape=rect href=scala-dsl.htmlScala DSL/aul class=childpages-macrolia shape=rect href=scala-dsl-eip.htmlScala DSL - EIP/a/lilia shape=rect href=scala-dsl-getting-started.htmlScala DSL - Getting Started/a/lilia shape=rect href=scala-dsl-supported-languages.htmlScala DSL - Supported langua ges/a/li/ul/lilia shape=rect href=scripting-languages.htmlScripting Languages/aul class=childpages-macrolia shape=rect href=beanshell.htmlBeanShell/a/lilia shape=rect href=groovy.htmlGroovy/a/lilia shape=rect href=javascript.htmlJavaScript/a/lilia shape=rect href=php.htmlPHP/a/lilia shape=rect href=python.htmlPython/a/lilia shape=rect href=ruby.htmlRuby/a/lilia shape=rect href=scripting-languages-context.htmlScripting
git commit: CAMEL-7980 Setup the ClassResolver on the OGNL context
Repository: camel
Updated Branches:
refs/heads/master c10a91ace - 94b7cba4e
CAMEL-7980 Setup the ClassResolver on the OGNL context
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/94b7cba4
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/94b7cba4
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/94b7cba4
Branch: refs/heads/master
Commit: 94b7cba4eec635f4464fb8258d81074752e528f0
Parents: c10a91a
Author: Willem Jiang willem.ji...@gmail.com
Authored: Wed Oct 29 12:27:04 2014 +0800
Committer: Willem Jiang willem.ji...@gmail.com
Committed: Wed Oct 29 12:27:29 2014 +0800
--
.../camel/language/ognl/CamelClassResolver.java | 39
.../camel/language/ognl/OgnlExpression.java | 2 +
.../org/apache/camel/language/ognl/Animal.java | 4 ++
.../camel/language/ognl/MyClassResolver.java| 29 +++
.../apache/camel/language/ognl/OgnlTest.java| 12 ++
5 files changed, 86 insertions(+)
--
http://git-wip-us.apache.org/repos/asf/camel/blob/94b7cba4/components/camel-ognl/src/main/java/org/apache/camel/language/ognl/CamelClassResolver.java
--
diff --git
a/components/camel-ognl/src/main/java/org/apache/camel/language/ognl/CamelClassResolver.java
b/components/camel-ognl/src/main/java/org/apache/camel/language/ognl/CamelClassResolver.java
new file mode 100644
index 000..0a0912f
--- /dev/null
+++
b/components/camel-ognl/src/main/java/org/apache/camel/language/ognl/CamelClassResolver.java
@@ -0,0 +1,39 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the License); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an AS IS BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.camel.language.ognl;
+
+import java.util.Map;
+
+import ognl.ClassResolver;
+/**
+ * This class is used to wrap the org.apache.camel.spi.ClassResolver with
ClassResolver interface
+ */
+public class CamelClassResolver implements ClassResolver {
+
+private org.apache.camel.spi.ClassResolver delegateClassResolver;
+
+public CamelClassResolver(org.apache.camel.spi.ClassResolver resolver) {
+delegateClassResolver = resolver;
+}
+
+@Override
+public Class? classForName(String className, Map context) throws
ClassNotFoundException {
+
+return delegateClassResolver.resolveClass(className);
+}
+
+}
http://git-wip-us.apache.org/repos/asf/camel/blob/94b7cba4/components/camel-ognl/src/main/java/org/apache/camel/language/ognl/OgnlExpression.java
--
diff --git
a/components/camel-ognl/src/main/java/org/apache/camel/language/ognl/OgnlExpression.java
b/components/camel-ognl/src/main/java/org/apache/camel/language/ognl/OgnlExpression.java
index 96b3e52..973e35c 100644
---
a/components/camel-ognl/src/main/java/org/apache/camel/language/ognl/OgnlExpression.java
+++
b/components/camel-ognl/src/main/java/org/apache/camel/language/ognl/OgnlExpression.java
@@ -51,6 +51,8 @@ public class OgnlExpression extends ExpressionSupport {
public T T evaluate(Exchange exchange, ClassT tClass) {
OgnlContext oglContext = new OgnlContext();
+// setup the class resolver from camel
+oglContext.setClassResolver(new
CamelClassResolver(exchange.getContext().getClassResolver()));
try {
Object value = Ognl.getValue(expression, oglContext, new
RootObject(exchange));
return exchange.getContext().getTypeConverter().convertTo(tClass,
value);
http://git-wip-us.apache.org/repos/asf/camel/blob/94b7cba4/components/camel-ognl/src/test/java/org/apache/camel/language/ognl/Animal.java
--
diff --git
a/components/camel-ognl/src/test/java/org/apache/camel/language/ognl/Animal.java
b/components/camel-ognl/src/test/java/org/apache/camel/language/ognl/Animal.java
index c3266ba..d55d3a2 100644
---
a/components/camel-ognl/src/test/java/org/apache/camel/language/ognl/Animal.java
+++
