svn commit: r928473 - in /websites/production/camel/content: cache/main.pageCache camel-2150-release.html docker.html
Author: buildbot Date: Sun Nov 9 08:18:04 2014 New Revision: 928473 Log: Production update by buildbot for camel Modified: websites/production/camel/content/cache/main.pageCache websites/production/camel/content/camel-2150-release.html websites/production/camel/content/docker.html Modified: websites/production/camel/content/cache/main.pageCache == Binary files - no diff available. Modified: websites/production/camel/content/camel-2150-release.html == --- websites/production/camel/content/camel-2150-release.html (original) +++ websites/production/camel/content/camel-2150-release.html Sun Nov 9 08:18:04 2014 @@ -84,7 +84,7 @@ tbody tr td valign=top width=100% -div class=wiki-content maincontenth1 id=Camel2.15.0Release-Camel2.15.0release(currentlyinprogress)Camel#160;2.15.0 release (currently in progress)/h1div style=padding-right:20px;float:left;margin-left:-20px;pimg class=confluence-embedded-image confluence-external-resource src=http://camel.apache.org/download.data/camel-box-v1.0-150x200.png; data-image-src=http://camel.apache.org/download.data/camel-box-v1.0-150x200.png;/p/divdiv style=min-height:200px#160;/divh2 id=Camel2.15.0Release-NewandNoteworthyNew and Noteworthy/h2pWelcome to the 2.15.0 release which approx XXX issues resolved (new features, improvements and bug fixes such as...)/pullispanComponent documentation now included in the built component JARs. And Java API and JMX API to access that documentation. And APIs to explain an endpoint uri and what all those configured options mean.#160;/span/lilispanProvide Configurer for user to configure the CXF conduit and CXF d estination from Java code/span/lilispanspanAdded a codeDelegateEndpoint/code#160;interface into Camel API/span/span/liliSupport to setup the SslContextParameters in the a shape=rect href=restlet.htmlcamel-restlet/a component/liliJava DSL - Should support nested choice in doTry .. doCatch/lilia shape=rect href=mongodb.htmlMongoDb/a component now a shape=rect class=external-link href=https://issues.apache.org/jira/browse/CAMEL-7996;stores OIDs/a#160;of the inserted records in the message header/liliAdded#160;codeorg.apache.camel.spi.CamelContextRegistry/codespan#160;as a replacement for#160;codeorg.apache.camel.spi.Container/code and acting as global registry for all CamelContexts' in the JVM. Though its still intended for SPI's to hook into the lifecycle of creation of#160;codeCamelContext/code's and being able to influence behavior - such as adding insight or other capabilities./spanbr clear=nonebr clear=none/li/ulpFixed issues/pulliFixed processors was not enlisted in JMX when routes was transacted./liliFixed the NullPointerException when using CXF endpoint with enrich/liliFixed the#160;endpointProperty of#160;restConfiguration doesn't work issue/liliFixed the issue that#160;CircuitBreakerLoadBalancer fails on async processors/liliFixed#160;MyBatis consumer a shape=rect class=external-link href=https://issues.apache.org/jira/browse/CAMEL-8011;ignoring maxMessagesPerPoll/a optionbr clear=nonebr clear=none/li/ulh3 id=Camel2.15.0Release-NewNew a shape=rect href=enterprise-integration-patterns.htmlEnterprise Integration Patterns/a/h3h3 id=Camel2.15.0Release-New.1New a shape=rect href=components.htmlComponents/a/h3ullia shape=rect href=beanstalk.htmlcamel-beanstalk/a - for working with Amazon Beanstalk jobs./lilia shape=rect href=docker.htmlcamel-docker/a - to communicate w ith Docker./lilicamel-github/lilicamel-jira/lilia shape=rect href=spring-boot.htmlcamel-spring-boot/a - for using Camel with Spring Boot/lilicamel-test-spring40 - for testing with Spring 4.0.x. camel-test-spring is for Spring 4.1.x onwards./li/ulh3 id=Camel2.15.0Release-NewDSLNew DSL/h3h3 id=Camel2.15.0Release-NewAnnotationsNew Annotations/h3h3 id=Camel2.15.0Release-NewDataFormatsNew a shape=rect href=data-format.htmlData Formats/a/h3h3 id=Camel2.15.0Release-New.2New a shape=rect href=languages.htmlLanguages/a/h3h3 id=Camel2.15.0Release-New.3New a shape=rect href=examples.htmlExamples/a/h3h3 id=Camel2.15.0Release-New.4New a shape=rect href=tutorials.htmlTutorials/a/h3h2 id=Camel2.15.0Release-APIbreakingAPI breaking/h2h2 id=Camel2.15.0Release-KnownIssuesKnown Issues/h2h2 id=Camel2.15.0Release-DependencyUpgradesspanDependency Upgrades/span/h2ulliAWS-Java-SDK 1.8.3 to 1.8.9.1/liliCodahale Metrics 3.0 to 3.1/liliGuava 17.0 to 18.0/liliJsch 0.1.50 to 0.1.51/liliSpring 4.0.7.RELEASE to 4.1.1.RELEASE/liliSpring Security 3.1.7.RELEASE to 3.2.5.RELEASE/li/ulh2 id=Camel2.15.0Release-ImportantchangestoconsiderwhenupgradingImportant changes to consider when upgrading/h2ulliSpring 4.1.x is now the default out of the box Spring version./lilispan style=color: rgb(0,0,0);Unit testing with Spring 4.0.x requires using
[4/5] camel git commit: CAMEL-7997: camel-scr should be an OSGi bundle. Add feature to install it.
CAMEL-7997: camel-scr should be an OSGi bundle. Add feature to install it.
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/d3a69dc8
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/d3a69dc8
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/d3a69dc8
Branch: refs/heads/master
Commit: d3a69dc8185e96982ebaea4d31a5eb34f052d316
Parents: 733e4cb
Author: Claus Ibsen davscl...@apache.org
Authored: Sun Nov 9 09:31:19 2014 +0100
Committer: Claus Ibsen davscl...@apache.org
Committed: Sun Nov 9 09:31:30 2014 +0100
--
components/camel-scr/pom.xml| 117 ++-
.../apache/camel/scr/AbstractCamelRunner.java | 16 +--
.../features/src/main/resources/features.xml| 9 +-
3 files changed, 78 insertions(+), 64 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/camel/blob/d3a69dc8/components/camel-scr/pom.xml
--
diff --git a/components/camel-scr/pom.xml b/components/camel-scr/pom.xml
index 0e495dc..418505e 100644
--- a/components/camel-scr/pom.xml
+++ b/components/camel-scr/pom.xml
@@ -15,66 +15,71 @@
See the License for the specific language governing permissions and
limitations under the License.
--
-project xmlns=http://maven.apache.org/POM/4.0.0;
xmlns:xsi=http://www.w3.org/2001/XMLSchema-instance;
xsi:schemaLocation=http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xsd/maven-4.0.0.xsd;
-modelVersion4.0.0/modelVersion
+project xmlns=http://maven.apache.org/POM/4.0.0;
xmlns:xsi=http://www.w3.org/2001/XMLSchema-instance;
+ xsi:schemaLocation=http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xsd/maven-4.0.0.xsd;
+ modelVersion4.0.0/modelVersion
-parent
-artifactIdcomponents/artifactId
-groupIdorg.apache.camel/groupId
-version2.15-SNAPSHOT/version
-/parent
+ parent
+artifactIdcomponents/artifactId
+groupIdorg.apache.camel/groupId
+version2.15-SNAPSHOT/version
+ /parent
-artifactIdcamel-scr/artifactId
-nameCamel :: SCR/name
-descriptionCamel SCR support/description
-packagingjar/packaging
+ artifactIdcamel-scr/artifactId
+ nameCamel :: SCR/name
+ descriptionCamel SCR support/description
+ packagingbundle/packaging
-dependencies
-dependency
-groupIdorg.apache.camel/groupId
-artifactIdcamel-core/artifactId
-/dependency
-dependency
-groupIdorg.apache.camel/groupId
-artifactIdcamel-core-osgi/artifactId
-/dependency
-dependency
-groupIdorg.apache.felix/groupId
-artifactIdorg.apache.felix.framework/artifactId
-version${felix-framework-version}/version
-/dependency
-dependency
-groupIdorg.apache.felix/groupId
-artifactIdorg.apache.felix.scr.annotations/artifactId
-version${felix-scr-annotations-version}/version
-/dependency
+ properties
+camel.osgi.export.pkgorg.apache.camel.scr.*/camel.osgi.export.pkg
+ /properties
-!-- logging --
-dependency
-groupIdorg.slf4j/groupId
-artifactIdslf4j-api/artifactId
-/dependency
-dependency
-groupIdorg.slf4j/groupId
-artifactIdslf4j-log4j12/artifactId
-/dependency
-dependency
-groupIdlog4j/groupId
-artifactIdlog4j/artifactId
-/dependency
+ dependencies
+dependency
+ groupIdorg.apache.camel/groupId
+ artifactIdcamel-core/artifactId
+/dependency
+dependency
+ groupIdorg.apache.camel/groupId
+ artifactIdcamel-core-osgi/artifactId
+/dependency
+dependency
+ groupIdorg.apache.felix/groupId
+ artifactIdorg.apache.felix.framework/artifactId
+ version${felix-framework-version}/version
+/dependency
+dependency
+ groupIdorg.apache.felix/groupId
+ artifactIdorg.apache.felix.scr.annotations/artifactId
+ version${felix-scr-annotations-version}/version
+/dependency
-!-- testing --
-dependency
-groupIdorg.apache.camel/groupId
-artifactIdcamel-test/artifactId
-scopetest/scope
-/dependency
-dependency
-groupIdcommons-lang/groupId
-artifactIdcommons-lang/artifactId
-version${commons-lang-version}/version
-scopetest/scope
-/dependency
-/dependencies
+!-- logging --
+dependency
+ groupIdorg.slf4j/groupId
+ artifactIdslf4j-api/artifactId
+/dependency
+dependency
+ groupIdorg.slf4j/groupId
+ artifactIdslf4j-log4j12/artifactId
+/dependency
+dependency
+ groupIdlog4j/groupId
+
[1/5] camel git commit: Initial commit for camel-scr
Repository: camel
Updated Branches:
refs/heads/master a9e987fe2 - d3a69dc81
Initial commit for camel-scr
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/d742358e
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/d742358e
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/d742358e
Branch: refs/heads/master
Commit: d742358e4080fd3dfd9bc4414495e3c5b2420542
Parents: a9e987f
Author: Jyrki Ruuskanen yur...@kotikone.fi
Authored: Wed Nov 5 21:49:17 2014 +0200
Committer: Claus Ibsen davscl...@apache.org
Committed: Sun Nov 9 09:31:29 2014 +0100
--
components/camel-scr/pom.xml| 80 ++
.../apache/camel/scr/AbstractCamelRunner.java | 263 +++
.../java/org/apache/camel/scr/ScrHelper.java| 80 ++
.../camel/scr/AbstractCamelRunnerTest.java | 105
.../apache/camel/scr/ConcreteCamelRunner.java | 98 +++
.../org/apache/camel/scr/TestRouteBuilder.java | 43 +++
.../org/apache/camel/scr/TestRouteBuilder2.java | 13 +
.../src/test/resources/log4j.properties | 18 ++
components/pom.xml | 1 +
parent/pom.xml | 1 +
tooling/archetypes/camel-archetype-scr/pom.xml | 79 ++
.../META-INF/maven/archetype-metadata.xml | 47
.../main/resources/archetype-resources/pom.xml | 219 +++
.../src/main/java/__className__.java| 47
.../main/java/internal/__className__Route.java | 79 ++
.../src/main/resources/default.properties | 1 +
.../src/main/resources/log4j.properties | 17 ++
.../src/test/java/__className__Test.java| 103
.../src/test/resources/log4j.properties | 12 +
.../camel-scr-example/archetype.properties | 9 +
.../projects/camel-scr-example/goal.txt | 1 +
tooling/archetypes/pom.xml | 1 +
22 files changed, 1317 insertions(+)
--
http://git-wip-us.apache.org/repos/asf/camel/blob/d742358e/components/camel-scr/pom.xml
--
diff --git a/components/camel-scr/pom.xml b/components/camel-scr/pom.xml
new file mode 100644
index 000..0e495dc
--- /dev/null
+++ b/components/camel-scr/pom.xml
@@ -0,0 +1,80 @@
+?xml version=1.0 encoding=UTF-8?
+!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the License); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an AS IS BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+--
+project xmlns=http://maven.apache.org/POM/4.0.0;
xmlns:xsi=http://www.w3.org/2001/XMLSchema-instance;
xsi:schemaLocation=http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xsd/maven-4.0.0.xsd;
+modelVersion4.0.0/modelVersion
+
+parent
+artifactIdcomponents/artifactId
+groupIdorg.apache.camel/groupId
+version2.15-SNAPSHOT/version
+/parent
+
+artifactIdcamel-scr/artifactId
+nameCamel :: SCR/name
+descriptionCamel SCR support/description
+packagingjar/packaging
+
+dependencies
+dependency
+groupIdorg.apache.camel/groupId
+artifactIdcamel-core/artifactId
+/dependency
+dependency
+groupIdorg.apache.camel/groupId
+artifactIdcamel-core-osgi/artifactId
+/dependency
+dependency
+groupIdorg.apache.felix/groupId
+artifactIdorg.apache.felix.framework/artifactId
+version${felix-framework-version}/version
+/dependency
+dependency
+groupIdorg.apache.felix/groupId
+artifactIdorg.apache.felix.scr.annotations/artifactId
+version${felix-scr-annotations-version}/version
+/dependency
+
+!-- logging --
+dependency
+groupIdorg.slf4j/groupId
+artifactIdslf4j-api/artifactId
+/dependency
+dependency
+groupIdorg.slf4j/groupId
+artifactIdslf4j-log4j12/artifactId
+/dependency
+dependency
+groupIdlog4j/groupId
+artifactIdlog4j/artifactId
+/dependency
+
+!-- testing --
+dependency
+
[5/5] camel git commit: Added license information, readme files
Added license information, readme files
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/095629a9
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/095629a9
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/095629a9
Branch: refs/heads/master
Commit: 095629a9815b3e65898dee7cb59ed1fc980aad6c
Parents: d742358
Author: yuruki yur...@kotikone.fi
Authored: Thu Nov 6 10:03:06 2014 +0200
Committer: Claus Ibsen davscl...@apache.org
Committed: Sun Nov 9 09:31:30 2014 +0100
--
components/camel-scr/README.md | 51 +
.../apache/camel/scr/AbstractCamelRunner.java | 16 ++
.../java/org/apache/camel/scr/ScrHelper.java| 16 ++
.../src/main/resources/META-INF/LICENSE.txt | 203 +++
.../src/main/resources/META-INF/NOTICE.txt | 11 +
.../camel/scr/AbstractCamelRunnerTest.java | 16 ++
.../apache/camel/scr/ConcreteCamelRunner.java | 16 ++
.../org/apache/camel/scr/TestRouteBuilder.java | 16 ++
.../org/apache/camel/scr/TestRouteBuilder2.java | 16 ++
.../src/test/resources/log4j.properties | 30 ++-
tooling/archetypes/camel-archetype-scr/pom.xml | 3 +-
.../META-INF/maven/archetype-metadata.xml | 27 +++
.../src/main/resources/META-INF/LICENSE.txt | 203 +++
.../src/main/resources/META-INF/NOTICE.txt | 11 +
.../resources/archetype-resources/ReadMe.txt| 27 +++
.../main/resources/archetype-resources/pom.xml | 21 +-
.../src/main/java/__className__.java| 16 ++
.../main/java/internal/__className__Route.java | 16 ++
.../src/main/resources/default.properties | 2 +-
.../src/main/resources/log4j.properties | 17 --
.../src/test/java/__className__Test.java| 16 ++
.../src/test/resources/log4j.properties | 19 +-
.../camel-scr-example/archetype.properties | 17 ++
23 files changed, 756 insertions(+), 30 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/camel/blob/095629a9/components/camel-scr/README.md
--
diff --git a/components/camel-scr/README.md b/components/camel-scr/README.md
new file mode 100644
index 000..8266f92
--- /dev/null
+++ b/components/camel-scr/README.md
@@ -0,0 +1,51 @@
+camel-scr
+=
+
+Camel SCR support (OSGi Declarative Services)
+
+Running Camel in an SCR bundle is a great alternative for the more common
methods (Spring DM and Blueprint). Using Camel SCR support your bundle can
remain completely in Java world; there is no need to create or modify any XML
or properties files. This offers us full control over everything and means that
your IDE of choice knows exactly what is going on in your project.
+
+### Usage
+
+*AbstractCamelRunner* ties CamelContext's lifecycle to Service Component's
lifecycle and handles configuration with Camel's PropertiesComponent. All you
have to do is extend your a Java class from *AbstractCamelRunner* and add the
following org.apache.felix.scr.annotations on class level:
+
+```
+@Component
+@References({
+@Reference(name = camelComponent,referenceInterface =
ComponentResolver.class,
+cardinality = ReferenceCardinality.MANDATORY_MULTIPLE, policy
= ReferencePolicy.DYNAMIC,
+policyOption = ReferencePolicyOption.GREEDY, bind =
gotCamelComponent, unbind = lostCamelComponent)
+})
+```
+
+Then implement *getRouteBuilders()* which should return the Camel routes you
want to run. And finally provide the default configuration with:
+
+```
+@Properties({
+ @Property(name = camelContextId, value = my-test),
+ @Property(name = active, value = true),
+ @Property(name = ..., value = ...),
+ ...
+})
+```
+
+That's all. And if you use camel-archetype-scr all this is already taken care
of.
+
+Properties *camelContextId* and *active* control the CamelContext's name
(defaults to camel-runner-default) and whether it will be started or not
(defaults to false), respectively. In addition to these you can add and use
as many properties as you like. PropertiesComponent handles recursive
properties and prefixing with fallback with no problem (see camel-archetype-scr
generated example for more).
+
+*AbstractCamelRunner* will make these properties available to your
RouteBuilders through Camel's PropertiesComponent AND it will also inject these
values into your Service Component class' and RouteBuilder's fields when their
names match. The fields can be declared with any visibility level, and many
types are supported (String, int, boolean, URL, ...).
+
+### Lifecycle
+
+AbstractCamelRunner lifecycle in SCR:
+
+1. When component's configuration policy and mandatory references are
satisfied SCR calls activate(). This creates and sets up a CamelContext through
the following
[2/5] camel git commit: CAMEL-7997: add camel-scr to kit
CAMEL-7997: add camel-scr to kit
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/79a47178
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/79a47178
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/79a47178
Branch: refs/heads/master
Commit: 79a4717829ff123e6cce4df940bfea2adf9eb338
Parents: 095629a
Author: Claus Ibsen davscl...@apache.org
Authored: Sun Nov 9 08:51:21 2014 +0100
Committer: Claus Ibsen davscl...@apache.org
Committed: Sun Nov 9 09:31:30 2014 +0100
--
apache-camel/pom.xml | 4
apache-camel/src/main/descriptors/common-bin.xml | 1 +
parent/pom.xml | 5 +
3 files changed, 10 insertions(+)
--
http://git-wip-us.apache.org/repos/asf/camel/blob/79a47178/apache-camel/pom.xml
--
diff --git a/apache-camel/pom.xml b/apache-camel/pom.xml
index 8a1690a..82bb40b 100644
--- a/apache-camel/pom.xml
+++ b/apache-camel/pom.xml
@@ -584,6 +584,10 @@
/dependency
dependency
groupIdorg.apache.camel/groupId
+ artifactIdcamel-scr/artifactId
+/dependency
+dependency
+ groupIdorg.apache.camel/groupId
artifactIdcamel-script/artifactId
/dependency
dependency
http://git-wip-us.apache.org/repos/asf/camel/blob/79a47178/apache-camel/src/main/descriptors/common-bin.xml
--
diff --git a/apache-camel/src/main/descriptors/common-bin.xml
b/apache-camel/src/main/descriptors/common-bin.xml
index 6138be9..9d013e4 100644
--- a/apache-camel/src/main/descriptors/common-bin.xml
+++ b/apache-camel/src/main/descriptors/common-bin.xml
@@ -157,6 +157,7 @@
includeorg.apache.camel:camel-saxon/include
includeorg.apache.camel:camel-scala/include
includeorg.apache.camel:camel-schematron/include
+includeorg.apache.camel:camel-scr/include
includeorg.apache.camel:camel-script/include
includeorg.apache.camel:camel-servlet/include
includeorg.apache.camel:camel-servletlistener/include
http://git-wip-us.apache.org/repos/asf/camel/blob/79a47178/parent/pom.xml
--
diff --git a/parent/pom.xml b/parent/pom.xml
index 5fb0bc5..2765f68 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -1227,6 +1227,11 @@
/dependency
dependency
groupIdorg.apache.camel/groupId
+artifactIdcamel-scr/artifactId
+version${project.version}/version
+ /dependency
+ dependency
+groupIdorg.apache.camel/groupId
artifactIdcamel-script/artifactId
version${project.version}/version
/dependency
[3/5] camel git commit: CAMEL-7997: Fixed CS
CAMEL-7997: Fixed CS
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/733e4cbd
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/733e4cbd
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/733e4cbd
Branch: refs/heads/master
Commit: 733e4cbdc818838ecc8693efc367e00b8b95ded0
Parents: 79a4717
Author: Claus Ibsen davscl...@apache.org
Authored: Sun Nov 9 09:18:13 2014 +0100
Committer: Claus Ibsen davscl...@apache.org
Committed: Sun Nov 9 09:31:30 2014 +0100
--
.../apache/camel/scr/AbstractCamelRunner.java | 64 +++
.../java/org/apache/camel/scr/ScrHelper.java| 48 --
.../camel/scr/AbstractCamelRunnerTest.java | 8 +--
.../apache/camel/scr/ConcreteCamelRunner.java | 66 +---
4 files changed, 117 insertions(+), 69 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/camel/blob/733e4cbd/components/camel-scr/src/main/java/org/apache/camel/scr/AbstractCamelRunner.java
--
diff --git
a/components/camel-scr/src/main/java/org/apache/camel/scr/AbstractCamelRunner.java
b/components/camel-scr/src/main/java/org/apache/camel/scr/AbstractCamelRunner.java
index f029422..e1fa67c 100644
---
a/components/camel-scr/src/main/java/org/apache/camel/scr/AbstractCamelRunner.java
+++
b/components/camel-scr/src/main/java/org/apache/camel/scr/AbstractCamelRunner.java
@@ -16,6 +16,23 @@
*/
package org.apache.camel.scr;
+import java.io.File;
+import java.lang.reflect.Field;
+import java.lang.reflect.ParameterizedType;
+import java.lang.reflect.Type;
+import java.net.URI;
+import java.net.URL;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.List;
+import java.util.Map;
+import java.util.Properties;
+import java.util.concurrent.Executors;
+import java.util.concurrent.ScheduledExecutorService;
+import java.util.concurrent.ScheduledFuture;
+import java.util.concurrent.TimeUnit;
+
import org.apache.camel.CamelContext;
import org.apache.camel.RoutesBuilder;
import org.apache.camel.component.properties.PropertiesComponent;
@@ -31,38 +48,28 @@ import org.osgi.framework.BundleContext;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import java.io.File;
-import java.lang.reflect.Field;
-import java.lang.reflect.ParameterizedType;
-import java.lang.reflect.Type;
-import java.net.URI;
-import java.net.URL;
-import java.util.*;
-import java.util.concurrent.Executors;
-import java.util.concurrent.ScheduledExecutorService;
-import java.util.concurrent.ScheduledFuture;
-import java.util.concurrent.TimeUnit;
-
public abstract class AbstractCamelRunner implements Runnable {
+public static final int START_DELAY = 5000;
+public static final String PROPERTY_PREFIX = camel.scr.properties.prefix;
+
protected Logger log = LoggerFactory.getLogger(getClass());
protected ModelCamelContext context;
protected SimpleRegistry registry = new SimpleRegistry();
private ScheduledExecutorService executor =
Executors.newSingleThreadScheduledExecutor();
private ScheduledFuture starter;
-private boolean activated = false;
-private boolean started = false;
-
-public static final int START_DELAY = 5000;
-public static final String PROPERTY_PREFIX = camel.scr.properties.prefix;
+private volatile boolean activated;
+private volatile boolean started;
// Configured fields
-public String camelContextId = camel-runner-default;
-public boolean active = false;
+private String camelContextId = camel-runner-default;
+private volatile boolean active;
public synchronized void activate(final BundleContext bundleContext, final
MapString, String props) throws Exception {
-if (activated) return;
+if (activated) {
+return;
+}
log.debug(activated!);
activated = true;
@@ -84,7 +91,6 @@ public abstract class AbstractCamelRunner implements Runnable
{
protected void createCamelContext(final BundleContext bundleContext, final
MapString, String props) {
if (null != bundleContext) {
context = new OsgiDefaultCamelContext(bundleContext, registry);
-// From https://issues.jboss.org/browse/MR-911
// Setup the application context classloader with the bundle
classloader
context.setApplicationContextClassLoader(new
BundleDelegatingClassLoader(bundleContext.getBundle()));
// and make sure the TCCL is our classloader
@@ -159,7 +165,9 @@ public abstract class AbstractCamelRunner implements
Runnable {
}
public synchronized void deactivate() {
-if (!activated) return;
+if (!activated) {
+return;
+}
[2/5] camel git commit: Removed duplicate camel-docker
Removed duplicate camel-docker
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/82124427
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/82124427
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/82124427
Branch: refs/heads/master
Commit: 821244276a768c437a9d34deefb1a7cb81994490
Parents: da78207
Author: Claus Ibsen davscl...@apache.org
Authored: Sun Nov 9 10:27:08 2014 +0100
Committer: Claus Ibsen davscl...@apache.org
Committed: Sun Nov 9 10:27:08 2014 +0100
--
parent/pom.xml | 5 -
1 file changed, 5 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/camel/blob/82124427/parent/pom.xml
--
diff --git a/parent/pom.xml b/parent/pom.xml
index 2765f68..6efd4ec 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -722,11 +722,6 @@
/dependency
dependency
groupIdorg.apache.camel/groupId
-artifactIdcamel-docker/artifactId
-version${project.version}/version
- /dependency
- dependency
-groupIdorg.apache.camel/groupId
artifactIdcamel-dozer/artifactId
version${project.version}/version
/dependency
[4/5] camel git commit: CAMEL-7999: Add defaultValue to @UriParam
CAMEL-7999: Add defaultValue to @UriParam
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/fc152202
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/fc152202
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/fc152202
Branch: refs/heads/master
Commit: fc152202f5f412f95778b736ed48442d7adff584
Parents: 03dd3cc
Author: Claus Ibsen davscl...@apache.org
Authored: Sun Nov 9 11:10:24 2014 +0100
Committer: Claus Ibsen davscl...@apache.org
Committed: Sun Nov 9 11:10:24 2014 +0100
--
.../api/management/mbean/CamelOpenMBeanTypes.java | 8
.../api/management/mbean/ManagedEndpointMBean.java | 2 +-
.../org/apache/camel/component/log/LogEndpoint.java| 4 ++--
.../org/apache/camel/impl/DefaultCamelContext.java | 13 ++---
.../apache/camel/management/mbean/ManagedEndpoint.java | 5 +++--
.../camel/management/ManagedEndpointExplainTest.java | 8
6 files changed, 24 insertions(+), 16 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/camel/blob/fc152202/camel-core/src/main/java/org/apache/camel/api/management/mbean/CamelOpenMBeanTypes.java
--
diff --git
a/camel-core/src/main/java/org/apache/camel/api/management/mbean/CamelOpenMBeanTypes.java
b/camel-core/src/main/java/org/apache/camel/api/management/mbean/CamelOpenMBeanTypes.java
index fc75bdd..da19b08 100644
---
a/camel-core/src/main/java/org/apache/camel/api/management/mbean/CamelOpenMBeanTypes.java
+++
b/camel-core/src/main/java/org/apache/camel/api/management/mbean/CamelOpenMBeanTypes.java
@@ -66,13 +66,13 @@ public final class CamelOpenMBeanTypes {
public static TabularType explainEndpointTabularType() throws
OpenDataException {
CompositeType ct = explainEndpointsCompositeType();
-return new TabularType(explainEndpoint, Explain how this endpoint
is configured, ct, new String[]{option, type, java type, value,
description});
+return new TabularType(explainEndpoint, Explain how this endpoint
is configured, ct, new String[]{option, type, java type, value,
default value, description});
}
public static CompositeType explainEndpointsCompositeType() throws
OpenDataException {
-return new CompositeType(endpoint, Explain Endpoint, new
String[]{option, type, java type, value, description},
-new String[]{Option, Type, Java Type, Value,
Description},
-new OpenType[]{SimpleType.STRING, SimpleType.STRING,
SimpleType.STRING, SimpleType.STRING, SimpleType.STRING});
+return new CompositeType(endpoint, Explain Endpoint, new
String[]{option, type, java type, value, default value,
description},
+new String[]{Option, Type, Java Type, Value, Default
Value, Description},
+new OpenType[]{SimpleType.STRING, SimpleType.STRING,
SimpleType.STRING, SimpleType.STRING, SimpleType.STRING, SimpleType.STRING});
}
}
http://git-wip-us.apache.org/repos/asf/camel/blob/fc152202/camel-core/src/main/java/org/apache/camel/api/management/mbean/ManagedEndpointMBean.java
--
diff --git
a/camel-core/src/main/java/org/apache/camel/api/management/mbean/ManagedEndpointMBean.java
b/camel-core/src/main/java/org/apache/camel/api/management/mbean/ManagedEndpointMBean.java
index fd49aee..fa25f43 100644
---
a/camel-core/src/main/java/org/apache/camel/api/management/mbean/ManagedEndpointMBean.java
+++
b/camel-core/src/main/java/org/apache/camel/api/management/mbean/ManagedEndpointMBean.java
@@ -38,7 +38,7 @@ public interface ManagedEndpointMBean {
@ManagedAttribute(description = Endpoint State)
String getState();
-@ManagedOperation(description = Explain how this endpoint is configured
(option, value, description))
+@ManagedOperation(description = Explain how this endpoint is configured)
TabularData explain(boolean allOptions);
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/camel/blob/fc152202/camel-core/src/main/java/org/apache/camel/component/log/LogEndpoint.java
--
diff --git
a/camel-core/src/main/java/org/apache/camel/component/log/LogEndpoint.java
b/camel-core/src/main/java/org/apache/camel/component/log/LogEndpoint.java
index c5e96b5..7aeac00 100644
--- a/camel-core/src/main/java/org/apache/camel/component/log/LogEndpoint.java
+++ b/camel-core/src/main/java/org/apache/camel/component/log/LogEndpoint.java
@@ -37,7 +37,7 @@ import org.slf4j.Logger;
public class LogEndpoint extends ProcessorEndpoint {
private volatile Processor logger;
-@UriParam
+@UriParam(defaultValue = INFO)
private String level;
@UriParam
[5/5] camel git commit: CAMEL-7999: Add defaultValue to @UriParam
CAMEL-7999: Add defaultValue to @UriParam
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/9b61389d
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/9b61389d
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/9b61389d
Branch: refs/heads/master
Commit: 9b61389d4e745184629f7793dc9a61957c4d8bc9
Parents: fc15220
Author: Claus Ibsen davscl...@apache.org
Authored: Sun Nov 9 11:18:39 2014 +0100
Committer: Claus Ibsen davscl...@apache.org
Committed: Sun Nov 9 11:18:39 2014 +0100
--
.../java/org/apache/camel/karaf/commands/EndpointExplain.java | 5 +
.../main/java/org/apache/camel/karaf/commands/EndpointList.java | 4
2 files changed, 9 insertions(+)
--
http://git-wip-us.apache.org/repos/asf/camel/blob/9b61389d/platforms/karaf/commands/src/main/java/org/apache/camel/karaf/commands/EndpointExplain.java
--
diff --git
a/platforms/karaf/commands/src/main/java/org/apache/camel/karaf/commands/EndpointExplain.java
b/platforms/karaf/commands/src/main/java/org/apache/camel/karaf/commands/EndpointExplain.java
index 895083f..40c62c7 100644
---
a/platforms/karaf/commands/src/main/java/org/apache/camel/karaf/commands/EndpointExplain.java
+++
b/platforms/karaf/commands/src/main/java/org/apache/camel/karaf/commands/EndpointExplain.java
@@ -111,6 +111,11 @@ public class EndpointExplain extends CamelCommandSupport {
out.print(Value:\t\t);
out.println(value);
}
+String defaultValue = option.get(defaultValue);
+if (defaultValue != null) {
+out.print(Default Value:\t);
+out.println(defaultValue);
+}
String description = option.get(description);
if (description != null) {
out.print(Description:\t);
http://git-wip-us.apache.org/repos/asf/camel/blob/9b61389d/platforms/karaf/commands/src/main/java/org/apache/camel/karaf/commands/EndpointList.java
--
diff --git
a/platforms/karaf/commands/src/main/java/org/apache/camel/karaf/commands/EndpointList.java
b/platforms/karaf/commands/src/main/java/org/apache/camel/karaf/commands/EndpointList.java
index 2ec9d6c..caed7ab 100644
---
a/platforms/karaf/commands/src/main/java/org/apache/camel/karaf/commands/EndpointList.java
+++
b/platforms/karaf/commands/src/main/java/org/apache/camel/karaf/commands/EndpointList.java
@@ -28,6 +28,7 @@ import org.apache.camel.Endpoint;
import org.apache.camel.ServiceStatus;
import org.apache.camel.StatefulService;
import org.apache.camel.util.JsonSchemaHelper;
+import org.apache.camel.util.ObjectHelper;
import org.apache.camel.util.URISupport;
import org.apache.felix.gogo.commands.Argument;
import org.apache.felix.gogo.commands.Command;
@@ -110,6 +111,9 @@ public class EndpointList extends CamelCommandSupport {
String type = option.get(type);
String javaType = option.get(javaType);
String value = option.get(value);
+if (ObjectHelper.isEmpty(value)) {
+value = option.get(defaultValue);
+}
String desc = option.get(description);
if (key != null value != null) {
if (first) {
[3/5] camel git commit: CAMEL-7999: Add defaultValue to @UriParam
CAMEL-7999: Add defaultValue to @UriParam
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/03dd3cc0
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/03dd3cc0
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/03dd3cc0
Branch: refs/heads/master
Commit: 03dd3cc0a6b5d5604f17cfaeb3424433a39b7ef9
Parents: 8212442
Author: Claus Ibsen davscl...@apache.org
Authored: Sun Nov 9 10:54:30 2014 +0100
Committer: Claus Ibsen davscl...@apache.org
Committed: Sun Nov 9 10:54:30 2014 +0100
--
.../camel/component/bean/BeanEndpoint.java | 4 +--
.../controlbus/ControlBusEndpoint.java | 4 +--
.../component/dataset/DataSetEndpoint.java | 10 +++---
.../camel/component/direct/DirectEndpoint.java | 4 +--
.../component/directvm/DirectVmEndpoint.java| 4 +--
.../camel/component/file/FileEndpoint.java | 6 ++--
.../component/file/GenericFileEndpoint.java | 38 ++--
.../component/language/LanguageEndpoint.java| 8 ++---
.../camel/component/seda/SedaEndpoint.java | 16 -
.../camel/component/test/TestEndpoint.java | 2 +-
.../camel/component/timer/TimerEndpoint.java| 10 +++---
.../camel/component/xslt/XsltEndpoint.java | 2 +-
.../org/apache/camel/impl/DefaultEndpoint.java | 4 +--
.../tools/apt/EndpointAnnotationProcessor.java | 21 +--
.../camel/tools/apt/JsonSchemaHelper.java | 7 +++-
.../java/org/apache/camel/spi/UriParam.java | 4 +--
16 files changed, 75 insertions(+), 69 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/camel/blob/03dd3cc0/camel-core/src/main/java/org/apache/camel/component/bean/BeanEndpoint.java
--
diff --git
a/camel-core/src/main/java/org/apache/camel/component/bean/BeanEndpoint.java
b/camel-core/src/main/java/org/apache/camel/component/bean/BeanEndpoint.java
index c6933ae..cdb770f 100644
--- a/camel-core/src/main/java/org/apache/camel/component/bean/BeanEndpoint.java
+++ b/camel-core/src/main/java/org/apache/camel/component/bean/BeanEndpoint.java
@@ -31,9 +31,9 @@ import org.apache.camel.spi.UriParam;
@UriEndpoint(scheme = bean)
public class BeanEndpoint extends ProcessorEndpoint {
private BeanHolder beanHolder;
-@UriParam
+@UriParam(defaultValue = false)
private boolean cache;
-@UriParam
+@UriParam(defaultValue = false)
private boolean multiParameterArray;
@UriParam
private String beanName;
http://git-wip-us.apache.org/repos/asf/camel/blob/03dd3cc0/camel-core/src/main/java/org/apache/camel/component/controlbus/ControlBusEndpoint.java
--
diff --git
a/camel-core/src/main/java/org/apache/camel/component/controlbus/ControlBusEndpoint.java
b/camel-core/src/main/java/org/apache/camel/component/controlbus/ControlBusEndpoint.java
index daacd7c..f1fd3df 100644
---
a/camel-core/src/main/java/org/apache/camel/component/controlbus/ControlBusEndpoint.java
+++
b/camel-core/src/main/java/org/apache/camel/component/controlbus/ControlBusEndpoint.java
@@ -39,9 +39,9 @@ public class ControlBusEndpoint extends DefaultEndpoint {
private String routeId;
@UriParam
private String action;
-@UriParam
+@UriParam(defaultValue = false)
private boolean async;
-@UriParam
+@UriParam(defaultValue = INFO)
private LoggingLevel loggingLevel = LoggingLevel.INFO;
public ControlBusEndpoint(String endpointUri, Component component) {
http://git-wip-us.apache.org/repos/asf/camel/blob/03dd3cc0/camel-core/src/main/java/org/apache/camel/component/dataset/DataSetEndpoint.java
--
diff --git
a/camel-core/src/main/java/org/apache/camel/component/dataset/DataSetEndpoint.java
b/camel-core/src/main/java/org/apache/camel/component/dataset/DataSetEndpoint.java
index 6999452..57f30fe 100644
---
a/camel-core/src/main/java/org/apache/camel/component/dataset/DataSetEndpoint.java
+++
b/camel-core/src/main/java/org/apache/camel/component/dataset/DataSetEndpoint.java
@@ -45,15 +45,15 @@ public class DataSetEndpoint extends MockEndpoint
implements Service {
private final transient Logger log;
private volatile DataSet dataSet;
private final AtomicInteger receivedCounter = new AtomicInteger();
-@UriParam
+@UriParam(defaultValue = 0)
private int minRate;
-@UriParam
+@UriParam(defaultValue = 3)
private long produceDelay = 3;
-@UriParam
+@UriParam(defaultValue = 0)
private long consumeDelay;
-@UriParam
+@UriParam(defaultValue = 0)
private long preloadSize;
-@UriParam
+@UriParam(defaultValue = 1000)
private long initialDelay = 1000;
@Deprecated
[1/5] camel git commit: CAMEL-7999: Add defaultValue to @UriParam
Repository: camel
Updated Branches:
refs/heads/master d3a69dc81 - 9b61389d4
CAMEL-7999: Add defaultValue to @UriParam
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/da782074
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/da782074
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/da782074
Branch: refs/heads/master
Commit: da7820746a14a45bc0b08ba4a7e1177a81e7507d
Parents: d3a69dc
Author: Claus Ibsen davscl...@apache.org
Authored: Sun Nov 9 10:26:36 2014 +0100
Committer: Claus Ibsen davscl...@apache.org
Committed: Sun Nov 9 10:26:36 2014 +0100
--
.../tools/apt/EndpointAnnotationProcessor.java | 30
.../java/org/apache/camel/spi/UriEndpoint.java | 1 +
.../java/org/apache/camel/spi/UriParam.java | 17 ++-
.../java/org/apache/camel/spi/UriParams.java| 1 +
4 files changed, 43 insertions(+), 6 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/camel/blob/da782074/tooling/apt/src/main/java/org/apache/camel/tools/apt/EndpointAnnotationProcessor.java
--
diff --git
a/tooling/apt/src/main/java/org/apache/camel/tools/apt/EndpointAnnotationProcessor.java
b/tooling/apt/src/main/java/org/apache/camel/tools/apt/EndpointAnnotationProcessor.java
index 0db4b60..7d90b1a 100644
---
a/tooling/apt/src/main/java/org/apache/camel/tools/apt/EndpointAnnotationProcessor.java
+++
b/tooling/apt/src/main/java/org/apache/camel/tools/apt/EndpointAnnotationProcessor.java
@@ -192,13 +192,15 @@ public class EndpointAnnotationProcessor extends
AbstractProcessor {
writer.println( tr);
writer.println(thName/th);
writer.println(thType/th);
+writer.println(thDefault Value/th);
writer.println(thDescription/th);
writer.println( /tr);
for (EndpointOption option : endpointOptions) {
writer.println( tr);
writer.println(td + option.getName() + /td);
writer.println(td + option.getType() + /td);
-writer.println(td + option.getDocumentation() +
/td);
+writer.println(td + option.getDefaultValue() +
/td);
+writer.println(td + option.getDocumentationWithNotes()
+ /td);
writer.println( /tr);
}
writer.println(/table);
@@ -221,6 +223,10 @@ public class EndpointAnnotationProcessor extends
AbstractProcessor {
name = fieldName;
}
name = prefix + name;
+
+String defaultValue = param.defaultValue();
+String defaultValueNote = param.defaultValueNote();
+
// if the field type is a nested parameter then iterate
through its fields
TypeMirror fieldType = fieldElement.asType();
String fieldTypeName = fieldType.toString();
@@ -275,9 +281,7 @@ public class EndpointAnnotationProcessor extends
AbstractProcessor {
}
}
-// we could likely detect if the type is collection
based?
-
-EndpointOption option = new EndpointOption(name,
fieldTypeName, docComment.trim(), isEnum, enums);
+EndpointOption option = new EndpointOption(name,
fieldTypeName, defaultValue, defaultValueNote, docComment.trim(), isEnum,
enums);
endpointOptions.add(option);
}
}
@@ -377,13 +381,18 @@ public class EndpointAnnotationProcessor extends
AbstractProcessor {
private String name;
private String type;
+private String defaultValue;
+private String defaultValueNote;
private String documentation;
private boolean enumType;
private SetString enums;
-private EndpointOption(String name, String type, String documentation,
boolean enumType, SetString enums) {
+private EndpointOption(String name, String type, String defaultValue,
String defaultValueNote,
+ String documentation, boolean enumType,
SetString enums) {
this.name = name;
this.type = type;
+this.defaultValue = defaultValue;
+this.defaultValueNote = defaultValueNote;
this.documentation = documentation;
this.enumType = enumType;
this.enums = enums;
@@ -397,10 +406,21 @@ public class EndpointAnnotationProcessor extends
AbstractProcessor {
return type;
}
+public String getDefaultValue() {
+return defaultValue;
+}
+
public
svn commit: r928492 - /websites/production/camel/content/cache/main.pageCache
Author: cmueller Date: Sun Nov 9 12:49:12 2014 New Revision: 928492 Log: trigger full site export because of a new blog post Removed: websites/production/camel/content/cache/main.pageCache
svn commit: r928494 [3/4] - in /websites/production/camel/content: ./ 2014/11/ 2014/11/09/ cache/
Modified: websites/production/camel/content/sitemap.html == --- websites/production/camel/content/sitemap.html (original) +++ websites/production/camel/content/sitemap.html Sun Nov 9 13:22:27 2014 @@ -79,7 +79,7 @@ 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 Languages Context/a/li/ul/lilia shape=rect href=simple.htmlSimple/a/lilia shape=rect href=spel.htmlSpEL/a/lilia shape=rect
svn commit: r928494 [4/4] - in /websites/production/camel/content: ./ 2014/11/ 2014/11/09/ cache/
Modified: websites/production/camel/content/user-guide.html
==
--- websites/production/camel/content/user-guide.html (original)
+++ websites/production/camel/content/user-guide.html Sun Nov 9 13:22:27 2014
@@ -76,11 +76,11 @@
tr
td valign=top width=100%
div class=wiki-content maincontenth2 id=UserGuide-UserGuideUser
Guide/h2pIf you want to get more familiar with what Apache Camel has to
offer, please try the following resources:/ppstyle
type=text/css/*![CDATA[*/
-div.rbtoc1415045938806 {padding: 0px;}
-div.rbtoc1415045938806 ul {list-style: disc;margin-left: 0px;}
-div.rbtoc1415045938806 li {margin-left: 0px;padding-left: 0px;}
+div.rbtoc1415539154391 {padding: 0px;}
+div.rbtoc1415539154391 ul {list-style: disc;margin-left: 0px;}
+div.rbtoc1415539154391 li {margin-left: 0px;padding-left: 0px;}
-/*]]*//style/pdiv class=toc-macro rbtoc1415045938806
+/*]]*//style/pdiv class=toc-macro rbtoc1415539154391
ul class=toc-indentationlia shape=rect
href=#UserGuide-WikipagesWiki pages/a/lilia shape=rect
href=#UserGuide-PDFPDF/a/lilia shape=rect
href=#UserGuide-OtherResources.Other Resources./a/li/ul
/divh3 id=UserGuide-WikipagesWiki pages/h3ullia shape=rect
href=getting-started.htmlGetting Started/a/lilia shape=rect
href=book-getting-started.htmlLonger Getting Started Guide/a/lilia
shape=rect href=camel-jar-dependencies.htmlCamel jar
dependencies/a/lilia shape=rect href=spring.htmlWorking with Camel
and Spring/a/lilia shape=rect href=guice.htmlWorking with Camel and
Guice/a/lilia shape=rect href=karaf.htmlWorking with Camel and
Karaf/a/lilia shape=rect href=how-do-i-configure-endpoints.htmlHow
do I configure endpoints/a/lilia shape=rect
href=bean-integration.htmlBean Integration/a/lilia shape=rect
href=configuring-camel.htmlConfiguring Camel/a/lilia shape=rect
href=configuring-route-startup-ordering-and-autostartup.htmlConfiguring
route startup ordering and autostartup/a/lilia shape=rect
href=graceful-shutdown.htmlGraceful Shutdown/a/lil
ia shape=rect href=error-handling-in-camel.htmlError handling in
Camel/a/lilia shape=rect href=using-propertyplaceholder.htmlHow to
use Camel property placeholders/a/lilia shape=rect
href=tutorials.htmlTutorials/a/lilia shape=rect
href=examples.htmlExamples/a/lilia shape=rect
href=testing.htmlTesting/a/lilia shape=rect
href=xml-configuration.htmlXml Configuration/a/lilia shape=rect
href=using-camelproxy.htmlUsing CamelProxy/a for how to use proxies for
clients to easily invoke camel routes without them knowing/lilia
shape=rect href=camel-maven-plugin.htmlCamel Maven Plugin/a for running
Camel from a Maven goal/lilia shape=rect
href=guice-maven-plugin.htmlGuice Maven Plugin/a for working with a
shape=rect href=guice.htmlGuice/a/lilia shape=rect
href=camel-maven-archetypes.htmlCamel Maven Archetypes/a/lilia
shape=rect href=creating-a-new-spring-based-cam
el-route.htmlCreating a new Spring based Camel Route/a/lilia
shape=rect href=camel-jmx.htmlCamel JMX/a/lilia shape=rect
href=how-to-run-camel-in-a-osgi-container.htmlHow to run Camel in a osgi
container/a/lilia shape=rect
href=using-osgi-blueprint-with-camel.htmlUsing OSGi blueprint with
Camel/a/lilia shape=rect href=karaf.htmlKaraf/a for working with
a shape=rect class=external-link href=http://karaf.apache.org/;Apache
Karaf/a/li/ulh3 id=UserGuide-PDFPDF/h3pYou can try the a
shape=rect href=manual.htmlManual/a if you want to get a PDF of this
documentation./ph3 id=UserGuide-OtherResources.Other
Resources./h3pThe a shape=rect class=external-link
href=http://architects.dzone.com/articles/apache-camel-integration;
rel=nofollowApache Camel: Integration Nirvana/a article by Jonathan
Anstey, a great place to start your journey./ppThe a shape=rect
href=books.htmlCamel in Action
/a book./ppThe Camel Components Poster - a shape=rect
class=external-link
href=http://gliesian.com/camel/ApacheCamelComponents.pdf; rel=nofollowFree
PDF/a, a shape=rect class=external-link
href=http://fineartamerica.com/featured/apache-camel-2122-components-poster-robert-liguori.html;
rel=nofollow36x24 Print/a/ppTry these online a shape=rect
href=articles.htmlArticles/a and a shape=rect
href=tutorials.htmlTutorials/a./p/div
/td
svn commit: r928494 [1/4] - in /websites/production/camel/content: ./ 2014/11/ 2014/11/09/ cache/
Author: buildbot
Date: Sun Nov 9 13:22:27 2014
New Revision: 928494
Log:
Production update by buildbot for camel
Added:
websites/production/camel/content/2014/11/
websites/production/camel/content/2014/11/09/
websites/production/camel/content/2014/11/09/welcome-colm-o-heigeartaigh-as-the-newest-camel-rider.html
websites/production/camel/content/cache/main.pageCache (with props)
websites/production/camel/content/camel-2133-release.html
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/community.html
websites/production/camel/content/cxf.html
websites/production/camel/content/download-archives.html
websites/production/camel/content/index.html
websites/production/camel/content/news.html
websites/production/camel/content/scala-dsl-eip.html
websites/production/camel/content/siteindex.html
websites/production/camel/content/sitemap.html
websites/production/camel/content/tutorial-axis-camel.html
websites/production/camel/content/tutorial-jmsremoting.html
websites/production/camel/content/user-guide.html
Added:
websites/production/camel/content/2014/11/09/welcome-colm-o-heigeartaigh-as-the-newest-camel-rider.html
==
---
websites/production/camel/content/2014/11/09/welcome-colm-o-heigeartaigh-as-the-newest-camel-rider.html
(added)
+++
websites/production/camel/content/2014/11/09/welcome-colm-o-heigeartaigh-as-the-newest-camel-rider.html
Sun Nov 9 13:22:27 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: Welcome Colm O hEigeartaigh as the newest Camel Rider
+/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;11nbsp;gt;nbsp;09nbsp;gt;nbsp;a
href=welcome-colm-o-heigeartaigh-as-the-newest-camel-rider.htmlWelcome Colm
O hEigeartaigh as the newest Camel Rider/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
svn commit: r928494 [2/4] - in /websites/production/camel/content: ./ 2014/11/ 2014/11/09/ cache/
Modified: websites/production/camel/content/siteindex.html == --- websites/production/camel/content/siteindex.html (original) +++ websites/production/camel/content/siteindex.html Sun Nov 9 13:22:27 2014 @@ -168,7 +168,7 @@ div class=smalltext style=margin: 0 0 0 36pxAvro Component Available as of Camel 2.10 This component provides a dataformat for avro, which allows serialization and deserialization of messages using Apache Avro's binary dataformat. Moreover, it provides support for Apache Avro's rpc, by providing pr/div span class=icon icon-page title=PagePage:/span a shape=rect href=aws.htmlAWS/a br clear=none - div class=smalltext style=margin: 0 0 0 36pxCamel Components for Amazon Web Services The Camel Components for Amazon Web Services provide connectivity to AWS services from Camel. AWS service Camel component Camel Version Component description Simple Queue Service (SQS) AWS-SQS 2.6.0 Supports sendin/div + div class=smalltext style=margin: 0 0 0 36pxCamel Components for Amazon Web Services The Camel Components for Amazon Web Services provide connectivity to AWS services from Camel. #160; #160; #160; AWS service Camel component Camel Version Component description Simple Queue Service (SQS) AWS-SQS 2.6.0 Supports /div span class=icon icon-page title=PagePage:/span a shape=rect href=aws-cw.htmlAWS-CW/a br clear=none div class=smalltext style=margin: 0 0 0 36pxCW Component *Available as of Camel 2.11 The CW component allows messages to be sent to an Amazon CloudWatch metrics. The implementation of the Amazon API is provided by the#160;AWS SDK. You must have a valid Amazon Web Services developer account, and be sign/div @@ -444,7 +444,7 @@ span class=icon icon-page title=PagePage:/span a shape=rect href=camel-2132-release.htmlCamel 2.13.2 Release/a br clear=none div class=smalltext style=margin: 0 0 0 36pxCamel 2.13.2 release New and Noteworthy Welcome to the 2.13.2 release which is mainly a bug fix release with 41 issues resolved.. For more details see the#160;JIRA tickets Known Issues See#160;Camel 2.13.0 Release Important changes to consider when upgrading See#160;/div - span class=icon icon-page title=PagePage:/span a shape=rect href=camel-2133.htmlCamel 2.13.3/a + span class=icon icon-page title=PagePage:/span a shape=rect href=camel-2133-release.htmlCamel 2.13.3 Release/a br clear=none div class=smalltext style=margin: 0 0 0 36pxCamel 2.13.3 release #160; New and Noteworthy Welcome to the 2.13.3 release which is mainly a bug fix release with 103 issues resolved.. For more details see the#160;JIRA tickets Known Issues See#160;Camel 2.13.0 Release Important changes to consider when upgrading S/div span class=icon icon-page title=PagePage:/span a shape=rect href=camel-2140-release.htmlCamel 2.14.0 Release/a @@ -452,7 +452,7 @@ div class=smalltext style=margin: 0 0 0 36pxCamel 2.14.0 release #160; New and Noteworthy Welcome to the 2.14.0 release which approx 399 issues resolved (new features, improvements and bug fixes such as...) Support for running on Java 1.8 JVMs Spring 4.x supported, camel-test-spring module can only wor/div span class=icon icon-page title=PagePage:/span a shape=rect href=camel-2150-release.htmlCamel 2.15.0 Release/a br clear=none - div class=smalltext style=margin: 0 0 0 36pxCamel#160;2.15.0 release (currently in progress) #160; New and Noteworthy Welcome to the 2.15.0 release which approx XXX issues resolved (new features, improvements and bug fixes such as...) Provide Configurer for user to configure the CXF conduit and CXF destina/div + div class=smalltext style=margin: 0 0 0 36pxCamel#160;2.15.0 release (currently in progress) #160; New and Noteworthy Welcome to the 2.15.0 release which approx XXX issues resolved (new features, improvements and bug fixes such as...) Component documentation now included in the built component JARs. And Ja/div span class=icon icon-page title=PagePage:/span a shape=rect href=camel-220-release.htmlCamel 2.2.0 Release/a br clear=none div class=smalltext style=margin: 0 0 0 36pxCamel 2.2.0 release New and Noteworthy Welcome to the 2.2.0 release which approx 180 issues resolved (new features, improvements and bug fixes such as...) Routing Slip now breaks when an exception occurred MINA now supports easier configuration of multipl/div @@ -870,7 +870,7 @@ div
[3/3] camel git commit: CAMEL-7999: Added default values
CAMEL-7999: Added default values
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/6bbb9bc7
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/6bbb9bc7
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/6bbb9bc7
Branch: refs/heads/master
Commit: 6bbb9bc787017f5862f32d44adf442d26aa2bc31
Parents: 7e0d92c
Author: Claus Ibsen davscl...@apache.org
Authored: Sun Nov 9 16:21:41 2014 +0100
Committer: Claus Ibsen davscl...@apache.org
Committed: Sun Nov 9 16:21:41 2014 +0100
--
.../component/yammer/YammerConfiguration.java | 25 +++-
1 file changed, 8 insertions(+), 17 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/camel/blob/6bbb9bc7/components/camel-yammer/src/main/java/org/apache/camel/component/yammer/YammerConfiguration.java
--
diff --git
a/components/camel-yammer/src/main/java/org/apache/camel/component/yammer/YammerConfiguration.java
b/components/camel-yammer/src/main/java/org/apache/camel/component/yammer/YammerConfiguration.java
index 18019ca..f2b813e 100644
---
a/components/camel-yammer/src/main/java/org/apache/camel/component/yammer/YammerConfiguration.java
+++
b/components/camel-yammer/src/main/java/org/apache/camel/component/yammer/YammerConfiguration.java
@@ -28,32 +28,24 @@ public class YammerConfiguration {
private String consumerSecret;
@UriParam
private String accessToken;
-
-private String function;
-
@UriParam
private boolean useJson;
-
-@UriParam
-private long delay = 3000 + 2000; // 3 sec per poll is enforced by yammer;
add 2 sec for safety
-
-@UriParam
+@UriParam(defaultValue = 5000)
+private long delay = 3000 + 2000; // 3 sec per poll is enforced by yammer;
add 2 sec for safety
+@UriParam(defaultValue = -1)
private int limit = -1; // default is unlimited
-
-@UriParam
+@UriParam(defaultValue = -1)
private int olderThan = -1;
-
-@UriParam
+@UriParam(defaultValue = -1)
private int newerThan = -1;
-
@UriParam
private String threaded;
-
@UriParam
private String userId;
-
+
+private String function;
private ApiRequestor requestor;
-
+
public String getConsumerKey() {
return consumerKey;
}
@@ -94,7 +86,6 @@ public class YammerConfiguration {
this.function = function;
}
-
public boolean isUseJson() {
return useJson;
}
[1/3] camel git commit: CAMEL-7999: Add enum values to html doc
Repository: camel
Updated Branches:
refs/heads/master 9b61389d4 - 6bbb9bc78
CAMEL-7999: Add enum values to html doc
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/fc3a01cb
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/fc3a01cb
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/fc3a01cb
Branch: refs/heads/master
Commit: fc3a01cba908db721e2e3fcebf79d636bc218272
Parents: 9b61389
Author: Claus Ibsen davscl...@apache.org
Authored: Sun Nov 9 14:21:23 2014 +0100
Committer: Claus Ibsen davscl...@apache.org
Committed: Sun Nov 9 14:21:23 2014 +0100
--
.../tools/apt/EndpointAnnotationProcessor.java | 24 +---
1 file changed, 21 insertions(+), 3 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/camel/blob/fc3a01cb/tooling/apt/src/main/java/org/apache/camel/tools/apt/EndpointAnnotationProcessor.java
--
diff --git
a/tooling/apt/src/main/java/org/apache/camel/tools/apt/EndpointAnnotationProcessor.java
b/tooling/apt/src/main/java/org/apache/camel/tools/apt/EndpointAnnotationProcessor.java
index c825bf4..ca85271 100644
---
a/tooling/apt/src/main/java/org/apache/camel/tools/apt/EndpointAnnotationProcessor.java
+++
b/tooling/apt/src/main/java/org/apache/camel/tools/apt/EndpointAnnotationProcessor.java
@@ -58,6 +58,7 @@ import static
org.apache.camel.tools.apt.Strings.isNullOrEmpty;
@SupportedAnnotationTypes({org.apache.camel.spi.*})
@SupportedSourceVersion(SourceVersion.RELEASE_7)
public class EndpointAnnotationProcessor extends AbstractProcessor {
+
public boolean process(Set? extends TypeElement annotations, final
RoundEnvironment roundEnv) {
if (roundEnv.processingOver()) {
return true;
@@ -150,7 +151,8 @@ public class EndpointAnnotationProcessor extends
AbstractProcessor {
classDoc = JsonSchemaHelper.sanitizeDescription(classDoc);
}
-// TODO: add some top details about component scheme name, and
documentation
+// TODO: include component meta-data such as scheme name, java class,
mvn coordinate etc.
+// also component summary, eg grab description from mvn pom.xml
SetEndpointOption endpointOptions = new LinkedHashSet();
findClassProperties(roundEnv, endpointOptions, classElement, );
@@ -194,6 +196,7 @@ public class EndpointAnnotationProcessor extends
AbstractProcessor {
writer.println(thName/th);
writer.println(thType/th);
writer.println(thDefault Value/th);
+writer.println(thEnum Values/th);
writer.println(thDescription/th);
writer.println( /tr);
for (EndpointOption option : endpointOptions) {
@@ -201,6 +204,7 @@ public class EndpointAnnotationProcessor extends
AbstractProcessor {
writer.println(td + option.getName() + /td);
writer.println(td + option.getType() + /td);
writer.println(td + option.getDefaultValue() +
/td);
+writer.println(td + option.getEnumValuesAsHtml() +
/td);
writer.println(td + option.getDocumentationWithNotes()
+ /td);
writer.println( /tr);
}
@@ -415,11 +419,25 @@ public class EndpointAnnotationProcessor extends
AbstractProcessor {
return documentation;
}
+public String getEnumValuesAsHtml() {
+CollectionStringBuffer csb = new CollectionStringBuffer(br/);
+if (enums != null enums.size() 0) {
+for (String e : enums) {
+csb.append(e);
+}
+}
+return csb.toString();
+}
+
public String getDocumentationWithNotes() {
+StringBuilder sb = new StringBuilder();
+sb.append(documentation);
+
if (!isNullOrEmpty(defaultValueNote)) {
-return documentation + . Default value notice: +
defaultValueNote;
+sb.append(. Default value notice: ).append(defaultValueNote);
}
-return documentation;
+
+return sb.toString();
}
public boolean isEnumType() {
[2/3] camel git commit: CAMEL-7999: Add component details to json
CAMEL-7999: Add component details to json
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/7e0d92c6
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/7e0d92c6
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/7e0d92c6
Branch: refs/heads/master
Commit: 7e0d92c64b631397026c25118c88de842c0e9ab5
Parents: fc3a01c
Author: Claus Ibsen davscl...@apache.org
Authored: Sun Nov 9 15:51:11 2014 +0100
Committer: Claus Ibsen davscl...@apache.org
Committed: Sun Nov 9 16:09:10 2014 +0100
--
.../apache/camel/impl/DefaultCamelContext.java | 2 +-
.../camel/management/mbean/ManagedEndpoint.java | 2 +-
.../org/apache/camel/util/JsonSchemaHelper.java | 19 ++-
.../tools/apt/EndpointAnnotationProcessor.java | 160 +--
.../org/apache/camel/tools/apt/IOHelper.java| 82 ++
5 files changed, 246 insertions(+), 19 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/camel/blob/7e0d92c6/camel-core/src/main/java/org/apache/camel/impl/DefaultCamelContext.java
--
diff --git
a/camel-core/src/main/java/org/apache/camel/impl/DefaultCamelContext.java
b/camel-core/src/main/java/org/apache/camel/impl/DefaultCamelContext.java
index 01cdefb..addcc63 100644
--- a/camel-core/src/main/java/org/apache/camel/impl/DefaultCamelContext.java
+++ b/camel-core/src/main/java/org/apache/camel/impl/DefaultCamelContext.java
@@ -1151,7 +1151,7 @@ public class DefaultCamelContext extends ServiceSupport
implements ModelCamelCon
return null;
}
-ListMapString, String rows =
JsonSchemaHelper.parseJsonSchema(json);
+ListMapString, String rows =
JsonSchemaHelper.parseJsonSchema(properties, json);
// selected rows to use for answer
MapString, String[] selected = new LinkedHashMapString,
String[]();
http://git-wip-us.apache.org/repos/asf/camel/blob/7e0d92c6/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedEndpoint.java
--
diff --git
a/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedEndpoint.java
b/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedEndpoint.java
index e6ae3e3..7e55502 100644
---
a/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedEndpoint.java
+++
b/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedEndpoint.java
@@ -87,7 +87,7 @@ public class ManagedEndpoint implements ManagedInstance,
ManagedEndpointMBean {
public TabularData explain(boolean allOptions) {
try {
String json =
endpoint.getCamelContext().explainEndpointJson(getEndpointUri(), allOptions);
-ListMapString, String rows =
JsonSchemaHelper.parseJsonSchema(json);
+ListMapString, String rows =
JsonSchemaHelper.parseJsonSchema(properties, json);
TabularData answer = new
TabularDataSupport(CamelOpenMBeanTypes.explainEndpointTabularType());
http://git-wip-us.apache.org/repos/asf/camel/blob/7e0d92c6/camel-core/src/main/java/org/apache/camel/util/JsonSchemaHelper.java
--
diff --git
a/camel-core/src/main/java/org/apache/camel/util/JsonSchemaHelper.java
b/camel-core/src/main/java/org/apache/camel/util/JsonSchemaHelper.java
index 8690939..4233a14 100644
--- a/camel-core/src/main/java/org/apache/camel/util/JsonSchemaHelper.java
+++ b/camel-core/src/main/java/org/apache/camel/util/JsonSchemaHelper.java
@@ -111,20 +111,31 @@ public final class JsonSchemaHelper {
/**
* Parses the json schema to split it into a list or rows, where each row
contains key value pairs with the metadata
*
+ * @param group the group to parse from such as ttcomponent/tt,
ttcomponentProperties/tt, or ttproperties/tt.
* @param json the json
* @return a list of all the rows, where each row is a set of key value
pairs with metadata
*/
-public static ListMapString, String parseJsonSchema(String json) {
+public static ListMapString, String parseJsonSchema(String group,
String json) {
ListMapString, String answer = new ArrayListMapString,
String();
if (json == null) {
return answer;
}
+boolean found = false;
+
// parse line by line
-// skip first 2 lines as they are leading
String[] lines = json.split(\n);
-for (int i = 2; i lines.length; i++) {
-String line = lines[i];
+for (String line : lines) {
+// we need to find the group first
+if (!found) {
+found = line.startsWith( \ + group + \:);
+continue;
+}
+
+
camel git commit: CAMEL-7999: Add component details to json
Repository: camel
Updated Branches:
refs/heads/master 6bbb9bc78 - 736ae9a48
CAMEL-7999: Add component details to json
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/736ae9a4
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/736ae9a4
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/736ae9a4
Branch: refs/heads/master
Commit: 736ae9a48bbdd7443032006f9c8c2b14c20b90cc
Parents: 6bbb9bc
Author: Claus Ibsen davscl...@apache.org
Authored: Mon Nov 10 07:59:23 2014 +0100
Committer: Claus Ibsen davscl...@apache.org
Committed: Mon Nov 10 07:59:23 2014 +0100
--
.../main/java/org/apache/camel/karaf/commands/EndpointExplain.java | 2 +-
.../main/java/org/apache/camel/karaf/commands/EndpointList.java| 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/camel/blob/736ae9a4/platforms/karaf/commands/src/main/java/org/apache/camel/karaf/commands/EndpointExplain.java
--
diff --git
a/platforms/karaf/commands/src/main/java/org/apache/camel/karaf/commands/EndpointExplain.java
b/platforms/karaf/commands/src/main/java/org/apache/camel/karaf/commands/EndpointExplain.java
index 40c62c7..2113af8 100644
---
a/platforms/karaf/commands/src/main/java/org/apache/camel/karaf/commands/EndpointExplain.java
+++
b/platforms/karaf/commands/src/main/java/org/apache/camel/karaf/commands/EndpointExplain.java
@@ -83,7 +83,7 @@ public class EndpointExplain extends CamelCommandSupport {
out.println();
// use a basic json parser
-ListMapString, String options =
JsonSchemaHelper.parseJsonSchema(json);
+ListMapString, String options =
JsonSchemaHelper.parseJsonSchema(properties, json);
// lets sort the options by name
Collections.sort(options, new ComparatorMapString, String() {
http://git-wip-us.apache.org/repos/asf/camel/blob/736ae9a4/platforms/karaf/commands/src/main/java/org/apache/camel/karaf/commands/EndpointList.java
--
diff --git
a/platforms/karaf/commands/src/main/java/org/apache/camel/karaf/commands/EndpointList.java
b/platforms/karaf/commands/src/main/java/org/apache/camel/karaf/commands/EndpointList.java
index caed7ab..eda29d4 100644
---
a/platforms/karaf/commands/src/main/java/org/apache/camel/karaf/commands/EndpointList.java
+++
b/platforms/karaf/commands/src/main/java/org/apache/camel/karaf/commands/EndpointList.java
@@ -96,7 +96,7 @@ public class EndpointList extends CamelCommandSupport {
boolean first = true;
String json =
camelController.explainEndpoint(endpoint.getCamelContext().getName(),
endpoint.getEndpointUri(), verbose);
// use a basic json parser
-ListMapString, String options =
JsonSchemaHelper.parseJsonSchema(json);
+ListMapString, String options =
JsonSchemaHelper.parseJsonSchema(properties, json);
// lets sort the options by name
Collections.sort(options, new ComparatorMapString,
String() {
