You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2016/01/06 11:36:08 UTC
[1/9] camel git commit: Camel catalog - Fixed validator
Repository: camel
Updated Branches:
refs/heads/camel-2.16.x c0e14fe10 -> a9cee89a5
Camel catalog - Fixed validator
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/17ae7c4b
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/17ae7c4b
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/17ae7c4b
Branch: refs/heads/camel-2.16.x
Commit: 17ae7c4b922cc73c0fdff83e50470ec766921c79
Parents: c0e14fe
Author: Claus Ibsen <da...@apache.org>
Authored: Tue Jan 5 19:26:40 2016 +0100
Committer: Claus Ibsen <da...@apache.org>
Committed: Wed Jan 6 11:29:18 2016 +0100
----------------------------------------------------------------------
.../java/org/apache/camel/catalog/DefaultCamelCatalog.java | 8 ++++++++
.../test/java/org/apache/camel/catalog/CamelCatalogTest.java | 4 ++++
2 files changed, 12 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/17ae7c4b/platforms/catalog/src/main/java/org/apache/camel/catalog/DefaultCamelCatalog.java
----------------------------------------------------------------------
diff --git a/platforms/catalog/src/main/java/org/apache/camel/catalog/DefaultCamelCatalog.java b/platforms/catalog/src/main/java/org/apache/camel/catalog/DefaultCamelCatalog.java
index f04bd3f..5a619bc 100644
--- a/platforms/catalog/src/main/java/org/apache/camel/catalog/DefaultCamelCatalog.java
+++ b/platforms/catalog/src/main/java/org/apache/camel/catalog/DefaultCamelCatalog.java
@@ -780,8 +780,16 @@ public class DefaultCamelCatalog implements CamelCatalog {
}
// validate all the options
+ boolean first = true;
for (Map.Entry<String, String> property : properties.entrySet()) {
String value = property.getValue();
+ if (first) {
+ // skip any leading double slash in first property from uri as that is from the scheme part
+ if (value != null && value.startsWith("//")) {
+ value = value.substring(2);
+ }
+ }
+ first = false;
String originalName = property.getKey();
String name = property.getKey();
http://git-wip-us.apache.org/repos/asf/camel/blob/17ae7c4b/platforms/catalog/src/test/java/org/apache/camel/catalog/CamelCatalogTest.java
----------------------------------------------------------------------
diff --git a/platforms/catalog/src/test/java/org/apache/camel/catalog/CamelCatalogTest.java b/platforms/catalog/src/test/java/org/apache/camel/catalog/CamelCatalogTest.java
index b59f872..16627ff 100644
--- a/platforms/catalog/src/test/java/org/apache/camel/catalog/CamelCatalogTest.java
+++ b/platforms/catalog/src/test/java/org/apache/camel/catalog/CamelCatalogTest.java
@@ -501,6 +501,10 @@ public class CamelCatalogTest {
// data format
result = catalog.validateEndpointProperties("dataformat:string:marshal?charset=utf-8", true);
assertTrue(result.isSuccess());
+
+ // 2 slash after component name
+ result = catalog.validateEndpointProperties("atmos://put?remotePath=/dummy.txt");
+ assertTrue(result.isSuccess());
}
@Test
[8/9] camel git commit: Component docs
Posted by da...@apache.org.
Component docs
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/f78cecfb
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/f78cecfb
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/f78cecfb
Branch: refs/heads/camel-2.16.x
Commit: f78cecfb20a1f93171aa7bfb105f39c87ed3f332
Parents: 68374e1
Author: Claus Ibsen <da...@apache.org>
Authored: Wed Jan 6 10:41:16 2016 +0100
Committer: Claus Ibsen <da...@apache.org>
Committed: Wed Jan 6 11:32:46 2016 +0100
----------------------------------------------------------------------
.../camel/component/jbpm/JBPMConfiguration.java | 138 ++++++++++++++++---
.../camel/component/jbpm/JBPMEndpoint.java | 21 +--
.../metrics/MetricsComponentRouteTest.java | 2 +-
.../component/mongodb/MongoDbEndpoint.java | 2 +-
.../camel/component/mqtt/MQTTConfiguration.java | 4 +-
.../component/mybatis/MyBatisConsumer.java | 11 --
.../component/mybatis/MyBatisEndpoint.java | 43 +++++-
.../nagios/NagiosConfiguraitonRefTest.java | 115 ----------------
8 files changed, 175 insertions(+), 161 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/f78cecfb/components/camel-jbpm/src/main/java/org/apache/camel/component/jbpm/JBPMConfiguration.java
----------------------------------------------------------------------
diff --git a/components/camel-jbpm/src/main/java/org/apache/camel/component/jbpm/JBPMConfiguration.java b/components/camel-jbpm/src/main/java/org/apache/camel/component/jbpm/JBPMConfiguration.java
index b7ce878..556001a 100644
--- a/components/camel-jbpm/src/main/java/org/apache/camel/component/jbpm/JBPMConfiguration.java
+++ b/components/camel-jbpm/src/main/java/org/apache/camel/component/jbpm/JBPMConfiguration.java
@@ -33,11 +33,11 @@ import org.kie.api.task.model.Task;
@UriParams
public class JBPMConfiguration {
- /**
- * Specifies the operation to perform
- */
+ @UriPath @Metadata(required = "true")
+ private URL connectionURL;
@UriParam(label = "producer", defaultValue = "startProcess")
private String operation;
+<<<<<<< HEAD
/**
* Specifies the key to use
*/
@@ -48,48 +48,66 @@ public class JBPMConfiguration {
*/
@UriParam
private Objects value;
- private String processId;
- private Map<String, Object> parameters;
- /**
- * Specifies the process instance to interact with
- */
+=======
@UriParam @Metadata(required = "true")
+ private String deploymentId;
+ @UriParam
private Long processInstanceId;
+ @UriParam
+ private Object value;
+ @UriParam
+>>>>>>> 38d72c9... Component docs
+ private String processId;
+ @UriParam
private String eventType;
+<<<<<<< HEAD
private String event;
+=======
+ @UriParam
+ private Object event;
+ @UriParam
+>>>>>>> 38d72c9... Component docs
private Integer maxNumber;
+ @UriParam
private String identifier;
+ @UriParam
private Long workItemId;
+ @UriParam
private Long taskId;
+ @UriParam
private String userId;
+ @UriParam
private String language;
+ @UriParam
private String targetUserId;
+ @UriParam
private Long attachmentId;
+ @UriParam
private Long contentId;
+ @UriParam
private Task task;
+ @UriParam
private List<OrganizationalEntity> entities;
+ @UriParam
private List<Status> statuses;
-
- //connection
+ @UriParam(label = "security")
private String userName;
+ @UriParam(label = "security")
private String password;
- /**
- * Specifies the connection url to the jBPM system
- */
- @UriPath @Metadata(required = "true")
- private URL connectionURL;
- /**
- * Specifies the deploymentId to use
- */
- @UriParam @Metadata(required = "true")
- private String deploymentId;
+ @UriParam
private Integer timeout;
+ @UriParam(label = "advanced")
+ private Map<String, Object> parameters;
+ @UriParam(label = "advanced")
private Class[] extraJaxbClasses;
public String getOperation() {
return operation;
}
+ /**
+ * The operation to perform
+ */
public void setOperation(String operation) {
this.operation = operation;
}
@@ -106,7 +124,14 @@ public class JBPMConfiguration {
return value;
}
+<<<<<<< HEAD
public void setValue(Objects value) {
+=======
+ /**
+ * the value to assign to the global identifier
+ */
+ public void setValue(Object value) {
+>>>>>>> 38d72c9... Component docs
this.value = value;
}
@@ -114,6 +139,9 @@ public class JBPMConfiguration {
return processId;
}
+ /**
+ * the id of the process that should be acted upon
+ */
public void setProcessId(String processId) {
this.processId = processId;
}
@@ -122,6 +150,9 @@ public class JBPMConfiguration {
return parameters;
}
+ /**
+ * the variables that should be set for various operations
+ */
public void setParameters(Map<String, Object> parameters) {
this.parameters = parameters;
}
@@ -130,6 +161,9 @@ public class JBPMConfiguration {
return processInstanceId;
}
+ /**
+ * the id of the process instance
+ */
public void setProcessInstanceId(Long processInstanceId) {
this.processInstanceId = processInstanceId;
}
@@ -138,6 +172,9 @@ public class JBPMConfiguration {
return eventType;
}
+ /**
+ * the type of event to use when signalEvent operation is performed
+ */
public void setEventType(String eventType) {
this.eventType = eventType;
}
@@ -146,7 +183,14 @@ public class JBPMConfiguration {
return event;
}
+<<<<<<< HEAD
public void setEvent(String event) {
+=======
+ /**
+ * the data associated with this event when signalEvent operation is performed
+ */
+ public void setEvent(Object event) {
+>>>>>>> 38d72c9... Component docs
this.event = event;
}
@@ -154,6 +198,9 @@ public class JBPMConfiguration {
return maxNumber;
}
+ /**
+ * the maximum number of rules that should be fired
+ */
public void setMaxNumber(Integer maxNumber) {
this.maxNumber = maxNumber;
}
@@ -162,6 +209,9 @@ public class JBPMConfiguration {
return identifier;
}
+ /**
+ * identifier the global identifier
+ */
public void setIdentifier(String identifier) {
this.identifier = identifier;
}
@@ -170,6 +220,9 @@ public class JBPMConfiguration {
return workItemId;
}
+ /**
+ * the id of the work item
+ */
public void setWorkItemId(Long workItemId) {
this.workItemId = workItemId;
}
@@ -178,6 +231,9 @@ public class JBPMConfiguration {
return taskId;
}
+ /**
+ *the id of the task
+ */
public void setTaskId(Long taskId) {
this.taskId = taskId;
}
@@ -186,6 +242,9 @@ public class JBPMConfiguration {
return userId;
}
+ /**
+ * userId to use with task operations
+ */
public void setUserId(String userId) {
this.userId = userId;
}
@@ -194,6 +253,9 @@ public class JBPMConfiguration {
return task;
}
+ /**
+ * The task instance to use with task operations
+ */
public void setTask(Task task) {
this.task = task;
}
@@ -202,6 +264,9 @@ public class JBPMConfiguration {
return language;
}
+ /**
+ * The language to use when filtering user tasks
+ */
public void setLanguage(String language) {
this.language = language;
}
@@ -210,6 +275,9 @@ public class JBPMConfiguration {
return targetUserId;
}
+ /**
+ * The targetUserId used when delegating a task
+ */
public void setTargetUserId(String targetUserId) {
this.targetUserId = targetUserId;
}
@@ -218,6 +286,9 @@ public class JBPMConfiguration {
return attachmentId;
}
+ /**
+ * attachId to use when retrieving attachments
+ */
public void setAttachmentId(Long attachmentId) {
this.attachmentId = attachmentId;
}
@@ -226,6 +297,9 @@ public class JBPMConfiguration {
return contentId;
}
+ /**
+ * contentId to use when retrieving attachments
+ */
public void setContentId(Long contentId) {
this.contentId = contentId;
}
@@ -234,6 +308,9 @@ public class JBPMConfiguration {
return entities;
}
+ /**
+ * The potentialOwners when nominateTask operation is performed
+ */
public void setEntities(List<OrganizationalEntity> entities) {
this.entities = entities;
}
@@ -242,6 +319,9 @@ public class JBPMConfiguration {
return statuses;
}
+ /**
+ * The list of status to use when filtering tasks
+ */
public void setStatuses(List<Status> statuses) {
this.statuses = statuses;
}
@@ -250,6 +330,9 @@ public class JBPMConfiguration {
return userName;
}
+ /**
+ * Username for authentication
+ */
public void setUserName(String userName) {
this.userName = userName;
}
@@ -258,6 +341,9 @@ public class JBPMConfiguration {
return password;
}
+ /**
+ * Password for authentication
+ */
public void setPassword(String password) {
this.password = password;
}
@@ -266,6 +352,9 @@ public class JBPMConfiguration {
return connectionURL;
}
+ /**
+ * The URL to the jBPM server.
+ */
public void setConnectionURL(URL connectionURL) {
this.connectionURL = connectionURL;
}
@@ -274,6 +363,9 @@ public class JBPMConfiguration {
return deploymentId;
}
+ /**
+ * The id of the deployment
+ */
public void setDeploymentId(String deploymentId) {
this.deploymentId = deploymentId;
}
@@ -282,6 +374,9 @@ public class JBPMConfiguration {
return timeout;
}
+ /**
+ * A timeout value
+ */
public void setTimeout(Integer timeout) {
this.timeout = timeout;
}
@@ -290,6 +385,9 @@ public class JBPMConfiguration {
return extraJaxbClasses;
}
+ /**
+ * To load additional classes when working with XML
+ */
public void setExtraJaxbClasses(Class[] extraJaxbClasses) {
this.extraJaxbClasses = extraJaxbClasses;
}
http://git-wip-us.apache.org/repos/asf/camel/blob/f78cecfb/components/camel-jbpm/src/main/java/org/apache/camel/component/jbpm/JBPMEndpoint.java
----------------------------------------------------------------------
diff --git a/components/camel-jbpm/src/main/java/org/apache/camel/component/jbpm/JBPMEndpoint.java b/components/camel-jbpm/src/main/java/org/apache/camel/component/jbpm/JBPMEndpoint.java
index 453e66c..044aa14 100644
--- a/components/camel-jbpm/src/main/java/org/apache/camel/component/jbpm/JBPMEndpoint.java
+++ b/components/camel-jbpm/src/main/java/org/apache/camel/component/jbpm/JBPMEndpoint.java
@@ -31,19 +31,22 @@ import org.kie.services.client.api.RemoteRuntimeEngineFactory;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-@UriEndpoint(scheme = "jbpm", title = "JBPM", syntax = "jbpm:host", producerOnly = true, label = "process")
+/**
+ * The jbpm component provides integration with jBPM (Business Process Management).
+ */
+@UriEndpoint(scheme = "jbpm", title = "JBPM", syntax = "jbpm:connectionURL", producerOnly = true, label = "process")
public class JBPMEndpoint extends DefaultEndpoint {
private static final transient Logger LOGGER = LoggerFactory.getLogger(JBPMEndpoint.class);
@UriParam
- private final JBPMConfiguration configuration;
- private RuntimeEngine runtimeEngine;
+ private JBPMConfiguration configuration;
public JBPMEndpoint(String uri, JBPMComponent component, JBPMConfiguration configuration) throws URISyntaxException, MalformedURLException {
super(uri, component);
this.configuration = configuration;
- LOGGER.trace("creating endpoint: [{}]", configuration);
+ }
+ public Producer createProducer() throws Exception {
RemoteRestRuntimeEngineBuilder engineBuilder = RemoteRuntimeEngineFactory.newRestBuilder();
if (configuration.getUserName() != null) {
engineBuilder.addUserName(configuration.getUserName());
@@ -66,12 +69,8 @@ public class JBPMEndpoint extends DefaultEndpoint {
if (configuration.getExtraJaxbClasses() != null) {
engineBuilder.addExtraJaxbClasses(configuration.getExtraJaxbClasses());
}
- runtimeEngine = engineBuilder.build();
- LOGGER.trace("created endpoint");
-
- }
+ RuntimeEngine runtimeEngine = engineBuilder.build();
- public Producer createProducer() throws Exception {
return new JBPMProducer(this, runtimeEngine);
}
@@ -83,6 +82,10 @@ public class JBPMEndpoint extends DefaultEndpoint {
return true;
}
+ public void setConfiguration(JBPMConfiguration configuration) {
+ this.configuration = configuration;
+ }
+
public JBPMConfiguration getConfiguration() {
return configuration;
}
http://git-wip-us.apache.org/repos/asf/camel/blob/f78cecfb/components/camel-metrics/src/test/java/org/apache/camel/component/metrics/MetricsComponentRouteTest.java
----------------------------------------------------------------------
diff --git a/components/camel-metrics/src/test/java/org/apache/camel/component/metrics/MetricsComponentRouteTest.java b/components/camel-metrics/src/test/java/org/apache/camel/component/metrics/MetricsComponentRouteTest.java
index 6f71bf6..7459a19 100644
--- a/components/camel-metrics/src/test/java/org/apache/camel/component/metrics/MetricsComponentRouteTest.java
+++ b/components/camel-metrics/src/test/java/org/apache/camel/component/metrics/MetricsComponentRouteTest.java
@@ -93,7 +93,7 @@ public class MetricsComponentRouteTest extends CamelTestSupport {
public void configure() {
from("direct:start-1")
.to("metrics:timer:T?action=start")
- .to("metrics:A")
+ .to("metrics:counter://A")
.to("metrics:counter://B")
.to("metrics:counter:C?increment=19291")
.to("metrics:counter:C?decrement=19292")
http://git-wip-us.apache.org/repos/asf/camel/blob/f78cecfb/components/camel-mongodb/src/main/java/org/apache/camel/component/mongodb/MongoDbEndpoint.java
----------------------------------------------------------------------
diff --git a/components/camel-mongodb/src/main/java/org/apache/camel/component/mongodb/MongoDbEndpoint.java b/components/camel-mongodb/src/main/java/org/apache/camel/component/mongodb/MongoDbEndpoint.java
index b3980d7..07e5d42 100644
--- a/components/camel-mongodb/src/main/java/org/apache/camel/component/mongodb/MongoDbEndpoint.java
+++ b/components/camel-mongodb/src/main/java/org/apache/camel/component/mongodb/MongoDbEndpoint.java
@@ -65,7 +65,7 @@ public class MongoDbEndpoint extends DefaultEndpoint {
private MongoDbOperation operation;
@UriParam(defaultValue = "true")
private boolean createCollection = true;
- @UriParam
+ @UriParam(enums = "ACKNOWLEDGED,W1,W2,W3,UNACKNOWLEDGED,JOURNALED,MAJORITY,SAFE")
private WriteConcern writeConcern;
private WriteConcern writeConcernRef;
@UriParam
http://git-wip-us.apache.org/repos/asf/camel/blob/f78cecfb/components/camel-mqtt/src/main/java/org/apache/camel/component/mqtt/MQTTConfiguration.java
----------------------------------------------------------------------
diff --git a/components/camel-mqtt/src/main/java/org/apache/camel/component/mqtt/MQTTConfiguration.java b/components/camel-mqtt/src/main/java/org/apache/camel/component/mqtt/MQTTConfiguration.java
index a0dcaf1..a346125 100644
--- a/components/camel-mqtt/src/main/java/org/apache/camel/component/mqtt/MQTTConfiguration.java
+++ b/components/camel-mqtt/src/main/java/org/apache/camel/component/mqtt/MQTTConfiguration.java
@@ -76,7 +76,7 @@ public class MQTTConfiguration extends MQTT {
String willTopic;
@UriParam
String willMessage;
- @UriParam(defaultValue = "AT_MOST_ONCE")
+ @UriParam(enums = "AtMostOnce,AtLeastOne,ExactlyOnce", defaultValue = "AtMostOnce")
QoS willQos = QoS.AT_MOST_ONCE;
@UriParam
QoS willRetain;
@@ -111,7 +111,7 @@ public class MQTTConfiguration extends MQTT {
private int sendWaitInSeconds = 5;
@UriParam
private boolean byDefaultRetain;
- @UriParam(enums = "AT_MOST_ONCE,AT_LEAST_ONCE,EXACTLY_ONCE", defaultValue = "AT_LEAST_ONCE")
+ @UriParam(enums = "AtMostOnce,AtLeastOne,ExactlyOnce", defaultValue = "AtLeastOnce")
private String qualityOfService = QoS.AT_LEAST_ONCE.name();
private QoS qos = QoS.AT_LEAST_ONCE;
http://git-wip-us.apache.org/repos/asf/camel/blob/f78cecfb/components/camel-mybatis/src/main/java/org/apache/camel/component/mybatis/MyBatisConsumer.java
----------------------------------------------------------------------
diff --git a/components/camel-mybatis/src/main/java/org/apache/camel/component/mybatis/MyBatisConsumer.java b/components/camel-mybatis/src/main/java/org/apache/camel/component/mybatis/MyBatisConsumer.java
index 0f2fbd9..0547e29 100644
--- a/components/camel-mybatis/src/main/java/org/apache/camel/component/mybatis/MyBatisConsumer.java
+++ b/components/camel-mybatis/src/main/java/org/apache/camel/component/mybatis/MyBatisConsumer.java
@@ -50,19 +50,8 @@ public class MyBatisConsumer extends ScheduledBatchPollingConsumer {
protected volatile ShutdownRunningTask shutdownRunningTask;
protected volatile int pendingExchanges;
- /**
- * Statement to run after data has been processed in the route
- */
private String onConsume;
-
- /**
- * Process resultset individually or as a list
- */
private boolean useIterator = true;
-
- /**
- * Whether allow empty resultset to be routed to the next hop
- */
private boolean routeEmptyResultSet;
public MyBatisConsumer(MyBatisEndpoint endpoint, Processor processor) {
http://git-wip-us.apache.org/repos/asf/camel/blob/f78cecfb/components/camel-mybatis/src/main/java/org/apache/camel/component/mybatis/MyBatisEndpoint.java
----------------------------------------------------------------------
diff --git a/components/camel-mybatis/src/main/java/org/apache/camel/component/mybatis/MyBatisEndpoint.java b/components/camel-mybatis/src/main/java/org/apache/camel/component/mybatis/MyBatisEndpoint.java
index ce460c1..a22416c 100644
--- a/components/camel-mybatis/src/main/java/org/apache/camel/component/mybatis/MyBatisEndpoint.java
+++ b/components/camel-mybatis/src/main/java/org/apache/camel/component/mybatis/MyBatisEndpoint.java
@@ -51,6 +51,12 @@ public class MyBatisEndpoint extends DefaultPollingEndpoint {
private String outputHeader;
@UriParam(label = "consumer")
private String inputHeader;
+ @UriParam(label = "consumer", optionalPrefix = "consumer.")
+ private String onConsume;
+ @UriParam(label = "consumer", optionalPrefix = "consumer.", defaultValue = "true")
+ private boolean useIterator = true;
+ @UriParam(label = "consumer", optionalPrefix = "consumer.")
+ private boolean routeEmptyResultSet;
@UriParam(label = "producer", defaultValue = "SIMPLE")
private ExecutorType executorType;
@@ -72,6 +78,9 @@ public class MyBatisEndpoint extends DefaultPollingEndpoint {
ObjectHelper.notNull(statement, "statement", this);
MyBatisConsumer consumer = new MyBatisConsumer(this, processor);
consumer.setMaxMessagesPerPoll(getMaxMessagesPerPoll());
+ consumer.setOnConsume(getOnConsume());
+ consumer.setUseIterator(isUseIterator());
+ consumer.setRouteEmptyResultSet(isRouteEmptyResultSet());
configureConsumer(consumer);
return consumer;
}
@@ -196,6 +205,36 @@ public class MyBatisEndpoint extends DefaultPollingEndpoint {
this.inputHeader = inputHeader;
}
-
-
+ public String getOnConsume() {
+ return onConsume;
+ }
+
+ /**
+ * Statement to run after data has been processed in the route
+ */
+ public void setOnConsume(String onConsume) {
+ this.onConsume = onConsume;
+ }
+
+ public boolean isUseIterator() {
+ return useIterator;
+ }
+
+ /**
+ * Process resultset individually or as a list
+ */
+ public void setUseIterator(boolean useIterator) {
+ this.useIterator = useIterator;
+ }
+
+ public boolean isRouteEmptyResultSet() {
+ return routeEmptyResultSet;
+ }
+
+ /**
+ * Whether allow empty resultset to be routed to the next hop
+ */
+ public void setRouteEmptyResultSet(boolean routeEmptyResultSet) {
+ this.routeEmptyResultSet = routeEmptyResultSet;
+ }
}
http://git-wip-us.apache.org/repos/asf/camel/blob/f78cecfb/components/camel-nagios/src/test/java/org/apache/camel/component/nagios/NagiosConfiguraitonRefTest.java
----------------------------------------------------------------------
diff --git a/components/camel-nagios/src/test/java/org/apache/camel/component/nagios/NagiosConfiguraitonRefTest.java b/components/camel-nagios/src/test/java/org/apache/camel/component/nagios/NagiosConfiguraitonRefTest.java
deleted file mode 100644
index 248de4b..0000000
--- a/components/camel-nagios/src/test/java/org/apache/camel/component/nagios/NagiosConfiguraitonRefTest.java
+++ /dev/null
@@ -1,115 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.camel.component.nagios;
-
-import com.googlecode.jsendnsca.core.Level;
-import com.googlecode.jsendnsca.core.MessagePayload;
-import com.googlecode.jsendnsca.core.mocks.NagiosNscaStub;
-import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.component.mock.MockEndpoint;
-import org.apache.camel.impl.JndiRegistry;
-import org.apache.camel.test.junit4.CamelTestSupport;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-
-/**
- * @version
- */
-public class NagiosConfiguraitonRefTest extends CamelTestSupport {
- protected boolean canRun;
- private NagiosNscaStub nagios;
-
- @Before
- @Override
- public void setUp() throws Exception {
- canRun = true;
-
- nagios = new NagiosNscaStub(25668, "secret");
- try {
- nagios.start();
- } catch (Exception e) {
- log.warn("Error starting NagiosNscaStub. This exception is ignored.", e);
- canRun = false;
- }
-
- super.setUp();
- }
-
- @After
- @Override
- public void tearDown() throws Exception {
- super.tearDown();
- try {
- nagios.stop();
- } catch (Exception e) {
- // ignore
- log.warn("Error stopping NagiosNscaStub. This exception is ignored.", e);
- }
- }
-
- @Override
- protected JndiRegistry createRegistry() throws Exception {
- NagiosConfiguration config = new NagiosConfiguration();
- config.setPassword("secret");
- config.setHost("127.0.0.1");
- config.setPort(25668);
-
- JndiRegistry jndi = super.createRegistry();
- jndi.bind("nagiosConf", config);
- return jndi;
- }
-
- @Test
- public void testSendToNagios() throws Exception {
- if (!canRun) {
- return;
- }
-
- MockEndpoint mock = getMockEndpoint("mock:result");
- mock.expectedMessageCount(1);
- mock.allMessages().body().isInstanceOf(String.class);
-
- template.sendBody("direct:start", "Hello Nagios");
-
- assertMockEndpointsSatisfied();
-
- // sleep a little to let nagios stub process the payloads
- Thread.sleep(1000);
-
- assertEquals(1, nagios.getMessagePayloadList().size());
-
- MessagePayload payload = nagios.getMessagePayloadList().get(0);
- assertEquals("Hello Nagios", payload.getMessage());
- assertEquals("localhost", payload.getHostname());
- assertEquals(Level.OK.ordinal(), payload.getLevel());
- assertEquals(context.getName(), payload.getServiceName());
- }
-
- @Override
- protected RouteBuilder createRouteBuilder() throws Exception {
- return new RouteBuilder() {
- @Override
- public void configure() throws Exception {
- // START SNIPPET: e1
- from("direct:start").to("nagios:foo?configuration=#nagiosConf").to("mock:result");
- // END SNIPPET: e1
- }
- };
- }
-
-}
\ No newline at end of file
[4/9] camel git commit: Component docs - Allow to exclude inherited
properties
Posted by da...@apache.org.
Component docs - Allow to exclude inherited properties
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/a5b109af
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/a5b109af
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/a5b109af
Branch: refs/heads/camel-2.16.x
Commit: a5b109af69fab77df1c7a7ec000d26b17d92040b
Parents: bcfe7da
Author: Claus Ibsen <da...@apache.org>
Authored: Wed Jan 6 09:47:30 2016 +0100
Committer: Claus Ibsen <da...@apache.org>
Committed: Wed Jan 6 11:29:46 2016 +0100
----------------------------------------------------------------------
.../atmosphere/websocket/WebsocketEndpoint.java | 3 +-
.../tools/apt/EndpointAnnotationProcessor.java | 36 +++++++++++++++-----
.../java/org/apache/camel/spi/UriEndpoint.java | 8 +++++
3 files changed, 38 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/a5b109af/components/camel-atmosphere-websocket/src/main/java/org/apache/camel/component/atmosphere/websocket/WebsocketEndpoint.java
----------------------------------------------------------------------
diff --git a/components/camel-atmosphere-websocket/src/main/java/org/apache/camel/component/atmosphere/websocket/WebsocketEndpoint.java b/components/camel-atmosphere-websocket/src/main/java/org/apache/camel/component/atmosphere/websocket/WebsocketEndpoint.java
index d8d803c..2d3d841 100644
--- a/components/camel-atmosphere-websocket/src/main/java/org/apache/camel/component/atmosphere/websocket/WebsocketEndpoint.java
+++ b/components/camel-atmosphere-websocket/src/main/java/org/apache/camel/component/atmosphere/websocket/WebsocketEndpoint.java
@@ -32,7 +32,8 @@ import org.apache.camel.spi.UriPath;
*
*/
@UriEndpoint(scheme = "atmosphere-websocket", extendsScheme = "servlet", title = "Atmosphere Websocket",
- syntax = "atmosphere-websocket:servicePath", consumerClass = WebsocketConsumer.class, label = "websocket")
+ syntax = "atmosphere-websocket:servicePath", consumerClass = WebsocketConsumer.class, label = "websocket",
+ excludeProperties = "httpUri,contextPath")
public class WebsocketEndpoint extends ServletEndpoint {
private WebSocketStore store;
http://git-wip-us.apache.org/repos/asf/camel/blob/a5b109af/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 a1c52db..e63d57e 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
@@ -148,7 +148,7 @@ public class EndpointAnnotationProcessor extends AbstractAnnotationProcessor {
writer.println("<b>Syntax:</b> " + syntax + "<br/>");
writer.println("<b>Maven:</b> " + componentModel.getGroupId() + "/" + componentModel.getArtifactId() + "/" + componentModel.getVersionId() + "<br/>");
- writeHtmlDocumentationAndFieldInjections(writer, roundEnv, componentModel, classElement, "");
+ writeHtmlDocumentationAndFieldInjections(writer, roundEnv, componentModel, classElement, "", uriEndpoint.excludeProperties());
// This code is not my fault, it seems to honestly be the hacky way to find a class name in APT :)
TypeMirror consumerType = null;
@@ -166,7 +166,7 @@ public class EndpointAnnotationProcessor extends AbstractAnnotationProcessor {
TypeElement consumerElement = findTypeElement(roundEnv, consumerClassName);
if (consumerElement != null) {
writer.println("<h2>" + scheme + " consumer" + "</h2>");
- writeHtmlDocumentationAndFieldInjections(writer, roundEnv, componentModel, consumerElement, consumerPrefix);
+ writeHtmlDocumentationAndFieldInjections(writer, roundEnv, componentModel, consumerElement, consumerPrefix, uriEndpoint.excludeProperties());
found = true;
}
}
@@ -192,7 +192,7 @@ public class EndpointAnnotationProcessor extends AbstractAnnotationProcessor {
findComponentClassProperties(writer, roundEnv, componentModel, componentOptions, componentClassElement, "");
}
- findClassProperties(writer, roundEnv, componentModel, endpointPaths, endpointOptions, classElement, "");
+ findClassProperties(writer, roundEnv, componentModel, endpointPaths, endpointOptions, classElement, "", uriEndpoint.excludeProperties());
String json = createParameterJsonSchema(componentModel, componentOptions, endpointPaths, endpointOptions);
writer.println(json);
@@ -362,7 +362,7 @@ public class EndpointAnnotationProcessor extends AbstractAnnotationProcessor {
}
protected void writeHtmlDocumentationAndFieldInjections(PrintWriter writer, RoundEnvironment roundEnv, ComponentModel componentModel,
- TypeElement classElement, String prefix) {
+ TypeElement classElement, String prefix, String excludeProperties) {
String classDoc = processingEnv.getElementUtils().getDocComment(classElement);
if (!isNullOrEmpty(classDoc)) {
// remove dodgy @version that we may have in class javadoc
@@ -373,7 +373,7 @@ public class EndpointAnnotationProcessor extends AbstractAnnotationProcessor {
Set<EndpointPath> endpointPaths = new LinkedHashSet<EndpointPath>();
Set<EndpointOption> endpointOptions = new LinkedHashSet<EndpointOption>();
- findClassProperties(writer, roundEnv, componentModel, endpointPaths, endpointOptions, classElement, prefix);
+ findClassProperties(writer, roundEnv, componentModel, endpointPaths, endpointOptions, classElement, prefix, excludeProperties);
// sort the endpoint options in the standard order we prefer
List<EndpointPath> paths = new ArrayList<EndpointPath>();
@@ -593,7 +593,7 @@ public class EndpointAnnotationProcessor extends AbstractAnnotationProcessor {
protected void findClassProperties(PrintWriter writer, RoundEnvironment roundEnv, ComponentModel componentModel,
Set<EndpointPath> endpointPaths, Set<EndpointOption> endpointOptions,
- TypeElement classElement, String prefix) {
+ TypeElement classElement, String prefix, String excludeProperties) {
Elements elementUtils = processingEnv.getElementUtils();
while (true) {
List<VariableElement> fieldElements = ElementFilter.fieldsIn(classElement.getEnclosedElements());
@@ -611,6 +611,11 @@ public class EndpointAnnotationProcessor extends AbstractAnnotationProcessor {
}
name = prefix + name;
+ // should we exclude the name?
+ if (excludeProperty(excludeProperties, name)) {
+ continue;
+ }
+
String defaultValue = path.defaultValue();
if (defaultValue == null && metadata != null) {
defaultValue = metadata.defaultValue();
@@ -675,6 +680,11 @@ public class EndpointAnnotationProcessor extends AbstractAnnotationProcessor {
}
name = prefix + name;
+ // should we exclude the name?
+ if (excludeProperty(excludeProperties, name)) {
+ continue;
+ }
+
String paramOptionalPrefix = param.optionalPrefix();
String paramPrefix = param.prefix();
boolean multiValue = param.multiValue();
@@ -703,7 +713,7 @@ public class EndpointAnnotationProcessor extends AbstractAnnotationProcessor {
if (!isNullOrEmpty(extraPrefix)) {
nestedPrefix += extraPrefix;
}
- findClassProperties(writer, roundEnv, componentModel, endpointPaths, endpointOptions, fieldTypeElement, nestedPrefix);
+ findClassProperties(writer, roundEnv, componentModel, endpointPaths, endpointOptions, fieldTypeElement, nestedPrefix, excludeProperties);
} else {
String docComment = findJavaDoc(elementUtils, fieldElement, fieldName, name, classElement, false);
if (isNullOrEmpty(docComment)) {
@@ -763,7 +773,17 @@ public class EndpointAnnotationProcessor extends AbstractAnnotationProcessor {
}
}
- protected Map<String, String> parseAsMap(String data) {
+ private static boolean excludeProperty(String excludeProperties, String name) {
+ String[] excludes = excludeProperties.split(",");
+ for (String exclude : excludes) {
+ if (name.equals(exclude)) {
+ return true;
+ }
+ }
+ return false;
+ }
+
+ protected static Map<String, String> parseAsMap(String data) {
Map<String, String> answer = new HashMap<String, String>();
String[] lines = data.split("\n");
for (String line : lines) {
http://git-wip-us.apache.org/repos/asf/camel/blob/a5b109af/tooling/spi-annotations/src/main/java/org/apache/camel/spi/UriEndpoint.java
----------------------------------------------------------------------
diff --git a/tooling/spi-annotations/src/main/java/org/apache/camel/spi/UriEndpoint.java b/tooling/spi-annotations/src/main/java/org/apache/camel/spi/UriEndpoint.java
index e989ce9..b557d51 100644
--- a/tooling/spi-annotations/src/main/java/org/apache/camel/spi/UriEndpoint.java
+++ b/tooling/spi-annotations/src/main/java/org/apache/camel/spi/UriEndpoint.java
@@ -130,4 +130,12 @@ public @interface UriEndpoint {
*/
boolean lenientProperties() default false;
+ /**
+ * To exclude one or more properties in this endpoint.
+ * <p/>
+ * This is used when a Camel component extend another component, and then may need to not use some of the properties from
+ * the parent component. Multiple properties can be separated by comma.
+ */
+ String excludeProperties() default "";
+
}
\ No newline at end of file
[6/9] camel git commit: Camel component docs
Posted by da...@apache.org.
Camel component docs
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/cb64e2d0
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/cb64e2d0
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/cb64e2d0
Branch: refs/heads/camel-2.16.x
Commit: cb64e2d0715ec26fda38a8da9238e0fce6200b10
Parents: 8ce2e5b
Author: Claus Ibsen <da...@apache.org>
Authored: Wed Jan 6 10:00:41 2016 +0100
Committer: Claus Ibsen <da...@apache.org>
Committed: Wed Jan 6 11:30:46 2016 +0100
----------------------------------------------------------------------
.../org/apache/camel/component/restlet/RestletEndpoint.java | 5 +++--
.../main/java/org/apache/camel/component/rss/RssEndpoint.java | 2 +-
2 files changed, 4 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/cb64e2d0/components/camel-restlet/src/main/java/org/apache/camel/component/restlet/RestletEndpoint.java
----------------------------------------------------------------------
diff --git a/components/camel-restlet/src/main/java/org/apache/camel/component/restlet/RestletEndpoint.java b/components/camel-restlet/src/main/java/org/apache/camel/component/restlet/RestletEndpoint.java
index 4136f40..0deb746 100644
--- a/components/camel-restlet/src/main/java/org/apache/camel/component/restlet/RestletEndpoint.java
+++ b/components/camel-restlet/src/main/java/org/apache/camel/component/restlet/RestletEndpoint.java
@@ -62,9 +62,9 @@ public class RestletEndpoint extends DefaultEndpoint implements HeaderFilterStra
private int socketTimeout = DEFAULT_SOCKET_TIMEOUT;
@UriParam(label = "producer", defaultValue = "" + DEFAULT_CONNECT_TIMEOUT)
private int connectTimeout = DEFAULT_CONNECT_TIMEOUT;
- @UriParam(defaultValue = "GET")
+ @UriParam(defaultValue = "GET", enums = "ALL,CONNECT,DELETE,GET,HEAD,OPTIONS,PATCH,POST,PUT,TRACE")
private Method restletMethod = Method.GET;
- @UriParam(label = "consumer")
+ @UriParam(label = "consumer", javaType = "java.lang.String")
private Method[] restletMethods;
@UriParam(label = "consumer")
private List<String> restletUriPatterns;
@@ -245,6 +245,7 @@ public class RestletEndpoint extends DefaultEndpoint implements HeaderFilterStra
/**
* Specify one or more methods separated by commas (e.g. restletMethods=post,put) to be serviced by a restlet consumer endpoint.
* If both restletMethod and restletMethods options are specified, the restletMethod setting is ignored.
+ * The possible methods are: ALL,CONNECT,DELETE,GET,HEAD,OPTIONS,PATCH,POST,PUT,TRACE
*/
public void setRestletMethods(Method[] restletMethods) {
this.restletMethods = restletMethods;
http://git-wip-us.apache.org/repos/asf/camel/blob/cb64e2d0/components/camel-rss/src/main/java/org/apache/camel/component/rss/RssEndpoint.java
----------------------------------------------------------------------
diff --git a/components/camel-rss/src/main/java/org/apache/camel/component/rss/RssEndpoint.java b/components/camel-rss/src/main/java/org/apache/camel/component/rss/RssEndpoint.java
index c4cc6d0..2ccc2d8 100644
--- a/components/camel-rss/src/main/java/org/apache/camel/component/rss/RssEndpoint.java
+++ b/components/camel-rss/src/main/java/org/apache/camel/component/rss/RssEndpoint.java
@@ -34,7 +34,7 @@ import org.slf4j.LoggerFactory;
* Is used for polling rss feeds.
*/
@UriEndpoint(scheme = "rss", extendsScheme = "atom", title = "RSS",
- syntax = "rss:feedUri", consumerOnly = true, consumerClass = RssEntryPollingConsumer.class, label = "feeds")
+ syntax = "rss:feedUri", consumerOnly = true, consumerClass = RssEntryPollingConsumer.class, label = "rss", lenientProperties = true)
public class RssEndpoint extends FeedEndpoint {
protected static final Logger LOG = LoggerFactory.getLogger(RssEndpoint.class);
[5/9] camel git commit: Camel component docs
Posted by da...@apache.org.
Camel component docs
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/8ce2e5be
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/8ce2e5be
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/8ce2e5be
Branch: refs/heads/camel-2.16.x
Commit: 8ce2e5be34417e1773a49be6ad447150ac4aeaa6
Parents: a5b109a
Author: Claus Ibsen <da...@apache.org>
Authored: Wed Jan 6 09:53:54 2016 +0100
Committer: Claus Ibsen <da...@apache.org>
Committed: Wed Jan 6 11:29:53 2016 +0100
----------------------------------------------------------------------
.../main/java/org/apache/camel/component/snmp/SnmpEndpoint.java | 5 +++--
.../camel/component/weather/CurrentWeatherConsumerHtmlTest.java | 2 +-
.../camel/component/weather/CurrentWeatherConsumerTest.java | 2 +-
.../camel/component/weather/CurrentWeatherConsumerXmlTest.java | 2 +-
.../component/weather/CurrentWeatherMadridConsumerTest.java | 2 +-
.../component/weather/Forecast7WeatherMadridConsumerTest.java | 2 +-
6 files changed, 8 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/8ce2e5be/components/camel-snmp/src/main/java/org/apache/camel/component/snmp/SnmpEndpoint.java
----------------------------------------------------------------------
diff --git a/components/camel-snmp/src/main/java/org/apache/camel/component/snmp/SnmpEndpoint.java b/components/camel-snmp/src/main/java/org/apache/camel/component/snmp/SnmpEndpoint.java
index c7dc15d..d929ddc 100644
--- a/components/camel-snmp/src/main/java/org/apache/camel/component/snmp/SnmpEndpoint.java
+++ b/components/camel-snmp/src/main/java/org/apache/camel/component/snmp/SnmpEndpoint.java
@@ -44,8 +44,6 @@ public class SnmpEndpoint extends DefaultPollingEndpoint {
private static final Logger LOG = LoggerFactory.getLogger(SnmpEndpoint.class);
- private OIDList oids = new OIDList();
-
private transient String address;
@UriPath(description = "Hostname of the SNMP enabled device") @Metadata(required = "true")
@@ -82,6 +80,9 @@ public class SnmpEndpoint extends DefaultPollingEndpoint {
private String snmpContextName;
@UriParam
private String snmpContextEngineId;
+ @UriParam(javaType = "java.lang.String")
+ private OIDList oids = new OIDList();
+
/**
* creates a snmp endpoint
*
http://git-wip-us.apache.org/repos/asf/camel/blob/8ce2e5be/components/camel-weather/src/test/java/org/apache/camel/component/weather/CurrentWeatherConsumerHtmlTest.java
----------------------------------------------------------------------
diff --git a/components/camel-weather/src/test/java/org/apache/camel/component/weather/CurrentWeatherConsumerHtmlTest.java b/components/camel-weather/src/test/java/org/apache/camel/component/weather/CurrentWeatherConsumerHtmlTest.java
index cc87bb8..d0b5aeb 100644
--- a/components/camel-weather/src/test/java/org/apache/camel/component/weather/CurrentWeatherConsumerHtmlTest.java
+++ b/components/camel-weather/src/test/java/org/apache/camel/component/weather/CurrentWeatherConsumerHtmlTest.java
@@ -35,7 +35,7 @@ public class CurrentWeatherConsumerHtmlTest extends BaseWeatherConsumerTest {
return new RouteBuilder() {
@Override
public void configure() throws Exception {
- from("weather:foo?mode=HTML&appId=9162755b2efa555823cfe0451d7fff38").to("mock:result");
+ from("weather:foo?mode=HTML&appid=9162755b2efa555823cfe0451d7fff38").to("mock:result");
}
};
}
http://git-wip-us.apache.org/repos/asf/camel/blob/8ce2e5be/components/camel-weather/src/test/java/org/apache/camel/component/weather/CurrentWeatherConsumerTest.java
----------------------------------------------------------------------
diff --git a/components/camel-weather/src/test/java/org/apache/camel/component/weather/CurrentWeatherConsumerTest.java b/components/camel-weather/src/test/java/org/apache/camel/component/weather/CurrentWeatherConsumerTest.java
index 41b26d8..eceed0b 100644
--- a/components/camel-weather/src/test/java/org/apache/camel/component/weather/CurrentWeatherConsumerTest.java
+++ b/components/camel-weather/src/test/java/org/apache/camel/component/weather/CurrentWeatherConsumerTest.java
@@ -25,7 +25,7 @@ public class CurrentWeatherConsumerTest extends BaseWeatherConsumerTest {
return new RouteBuilder() {
@Override
public void configure() throws Exception {
- from("weather:foo?appId=9162755b2efa555823cfe0451d7fff38").to("mock:result");
+ from("weather:foo?appid=9162755b2efa555823cfe0451d7fff38").to("mock:result");
}
};
}
http://git-wip-us.apache.org/repos/asf/camel/blob/8ce2e5be/components/camel-weather/src/test/java/org/apache/camel/component/weather/CurrentWeatherConsumerXmlTest.java
----------------------------------------------------------------------
diff --git a/components/camel-weather/src/test/java/org/apache/camel/component/weather/CurrentWeatherConsumerXmlTest.java b/components/camel-weather/src/test/java/org/apache/camel/component/weather/CurrentWeatherConsumerXmlTest.java
index a40785c..8fd3be7 100644
--- a/components/camel-weather/src/test/java/org/apache/camel/component/weather/CurrentWeatherConsumerXmlTest.java
+++ b/components/camel-weather/src/test/java/org/apache/camel/component/weather/CurrentWeatherConsumerXmlTest.java
@@ -34,7 +34,7 @@ public class CurrentWeatherConsumerXmlTest extends BaseWeatherConsumerTest {
return new RouteBuilder() {
@Override
public void configure() throws Exception {
- from("weather:foo?mode=XML&appId=9162755b2efa555823cfe0451d7fff38").to("mock:result");
+ from("weather:foo?mode=XML&appid=9162755b2efa555823cfe0451d7fff38").to("mock:result");
}
};
}
http://git-wip-us.apache.org/repos/asf/camel/blob/8ce2e5be/components/camel-weather/src/test/java/org/apache/camel/component/weather/CurrentWeatherMadridConsumerTest.java
----------------------------------------------------------------------
diff --git a/components/camel-weather/src/test/java/org/apache/camel/component/weather/CurrentWeatherMadridConsumerTest.java b/components/camel-weather/src/test/java/org/apache/camel/component/weather/CurrentWeatherMadridConsumerTest.java
index e176276..f047ad7 100644
--- a/components/camel-weather/src/test/java/org/apache/camel/component/weather/CurrentWeatherMadridConsumerTest.java
+++ b/components/camel-weather/src/test/java/org/apache/camel/component/weather/CurrentWeatherMadridConsumerTest.java
@@ -25,7 +25,7 @@ public class CurrentWeatherMadridConsumerTest extends BaseWeatherConsumerTest {
return new RouteBuilder() {
@Override
public void configure() throws Exception {
- from("weather:foo?location=Madrid,Spain&appId=9162755b2efa555823cfe0451d7fff38").to("mock:result");
+ from("weather:foo?location=Madrid,Spain&appid=9162755b2efa555823cfe0451d7fff38").to("mock:result");
}
};
}
http://git-wip-us.apache.org/repos/asf/camel/blob/8ce2e5be/components/camel-weather/src/test/java/org/apache/camel/component/weather/Forecast7WeatherMadridConsumerTest.java
----------------------------------------------------------------------
diff --git a/components/camel-weather/src/test/java/org/apache/camel/component/weather/Forecast7WeatherMadridConsumerTest.java b/components/camel-weather/src/test/java/org/apache/camel/component/weather/Forecast7WeatherMadridConsumerTest.java
index 7dca7ab..497a923 100644
--- a/components/camel-weather/src/test/java/org/apache/camel/component/weather/Forecast7WeatherMadridConsumerTest.java
+++ b/components/camel-weather/src/test/java/org/apache/camel/component/weather/Forecast7WeatherMadridConsumerTest.java
@@ -25,7 +25,7 @@ public class Forecast7WeatherMadridConsumerTest extends BaseWeatherConsumerTest
return new RouteBuilder() {
@Override
public void configure() throws Exception {
- from("weather:foo?location=Madrid,Spain&period=7 days&units=IMPERIAL&appId=9162755b2efa555823cfe0451d7fff38").to("mock:result");
+ from("weather:foo?location=Madrid,Spain&period=7 days&units=IMPERIAL&appid=9162755b2efa555823cfe0451d7fff38").to("mock:result");
}
};
}
[2/9] camel git commit: Polished
Posted by da...@apache.org.
Polished
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/f8962911
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/f8962911
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/f8962911
Branch: refs/heads/camel-2.16.x
Commit: f89629116e38e2bd46554354c736dd10b736e5f1
Parents: 17ae7c4
Author: Claus Ibsen <da...@apache.org>
Authored: Tue Jan 5 19:50:46 2016 +0100
Committer: Claus Ibsen <da...@apache.org>
Committed: Wed Jan 6 11:29:30 2016 +0100
----------------------------------------------------------------------
.../java/org/apache/camel/component/atmos/AtmosConsumerTest.java | 4 ++--
.../camel/component/weather/CurrentWeatherConsumerHtmlTest.java | 2 +-
.../camel/component/weather/CurrentWeatherConsumerTest.java | 2 +-
.../camel/component/weather/CurrentWeatherConsumerXmlTest.java | 2 +-
.../component/weather/CurrentWeatherMadridConsumerTest.java | 2 +-
.../component/weather/Forecast7WeatherMadridConsumerTest.java | 2 +-
6 files changed, 7 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/f8962911/components/camel-atmos/src/test/java/org/apache/camel/component/atmos/AtmosConsumerTest.java
----------------------------------------------------------------------
diff --git a/components/camel-atmos/src/test/java/org/apache/camel/component/atmos/AtmosConsumerTest.java b/components/camel-atmos/src/test/java/org/apache/camel/component/atmos/AtmosConsumerTest.java
index b4c339d..0cf47df 100644
--- a/components/camel-atmos/src/test/java/org/apache/camel/component/atmos/AtmosConsumerTest.java
+++ b/components/camel-atmos/src/test/java/org/apache/camel/component/atmos/AtmosConsumerTest.java
@@ -33,7 +33,7 @@ public class AtmosConsumerTest extends CamelTestSupport {
return new RouteBuilder() {
@Override
public void configure() throws Exception {
- from("atmos:foo/" + get + "?remotePath=/path").to("mock:test");
+ from("atmos:foo/get?remotePath=/path").to("mock:test");
}
};
}
@@ -41,7 +41,7 @@ public class AtmosConsumerTest extends CamelTestSupport {
@Test
public void shouldCreateGetConsumer() throws Exception {
// Given
- AtmosEndpoint atmosEndpoint = context.getEndpoint("atmos:foo/" + get + "?remotePath=/path", AtmosEndpoint.class);
+ AtmosEndpoint atmosEndpoint = context.getEndpoint("atmos:foo/get?remotePath=/path", AtmosEndpoint.class);
// When
Consumer consumer = atmosEndpoint.createConsumer(null);
http://git-wip-us.apache.org/repos/asf/camel/blob/f8962911/components/camel-weather/src/test/java/org/apache/camel/component/weather/CurrentWeatherConsumerHtmlTest.java
----------------------------------------------------------------------
diff --git a/components/camel-weather/src/test/java/org/apache/camel/component/weather/CurrentWeatherConsumerHtmlTest.java b/components/camel-weather/src/test/java/org/apache/camel/component/weather/CurrentWeatherConsumerHtmlTest.java
index fccee92..cc87bb8 100644
--- a/components/camel-weather/src/test/java/org/apache/camel/component/weather/CurrentWeatherConsumerHtmlTest.java
+++ b/components/camel-weather/src/test/java/org/apache/camel/component/weather/CurrentWeatherConsumerHtmlTest.java
@@ -35,7 +35,7 @@ public class CurrentWeatherConsumerHtmlTest extends BaseWeatherConsumerTest {
return new RouteBuilder() {
@Override
public void configure() throws Exception {
- from("weather:foo?mode=HTML").to("mock:result");
+ from("weather:foo?mode=HTML&appId=9162755b2efa555823cfe0451d7fff38").to("mock:result");
}
};
}
http://git-wip-us.apache.org/repos/asf/camel/blob/f8962911/components/camel-weather/src/test/java/org/apache/camel/component/weather/CurrentWeatherConsumerTest.java
----------------------------------------------------------------------
diff --git a/components/camel-weather/src/test/java/org/apache/camel/component/weather/CurrentWeatherConsumerTest.java b/components/camel-weather/src/test/java/org/apache/camel/component/weather/CurrentWeatherConsumerTest.java
index 79d7973..41b26d8 100644
--- a/components/camel-weather/src/test/java/org/apache/camel/component/weather/CurrentWeatherConsumerTest.java
+++ b/components/camel-weather/src/test/java/org/apache/camel/component/weather/CurrentWeatherConsumerTest.java
@@ -25,7 +25,7 @@ public class CurrentWeatherConsumerTest extends BaseWeatherConsumerTest {
return new RouteBuilder() {
@Override
public void configure() throws Exception {
- from("weather:foo").to("mock:result");
+ from("weather:foo?appId=9162755b2efa555823cfe0451d7fff38").to("mock:result");
}
};
}
http://git-wip-us.apache.org/repos/asf/camel/blob/f8962911/components/camel-weather/src/test/java/org/apache/camel/component/weather/CurrentWeatherConsumerXmlTest.java
----------------------------------------------------------------------
diff --git a/components/camel-weather/src/test/java/org/apache/camel/component/weather/CurrentWeatherConsumerXmlTest.java b/components/camel-weather/src/test/java/org/apache/camel/component/weather/CurrentWeatherConsumerXmlTest.java
index 780a053..a40785c 100644
--- a/components/camel-weather/src/test/java/org/apache/camel/component/weather/CurrentWeatherConsumerXmlTest.java
+++ b/components/camel-weather/src/test/java/org/apache/camel/component/weather/CurrentWeatherConsumerXmlTest.java
@@ -34,7 +34,7 @@ public class CurrentWeatherConsumerXmlTest extends BaseWeatherConsumerTest {
return new RouteBuilder() {
@Override
public void configure() throws Exception {
- from("weather:foo?mode=XML").to("mock:result");
+ from("weather:foo?mode=XML&appId=9162755b2efa555823cfe0451d7fff38").to("mock:result");
}
};
}
http://git-wip-us.apache.org/repos/asf/camel/blob/f8962911/components/camel-weather/src/test/java/org/apache/camel/component/weather/CurrentWeatherMadridConsumerTest.java
----------------------------------------------------------------------
diff --git a/components/camel-weather/src/test/java/org/apache/camel/component/weather/CurrentWeatherMadridConsumerTest.java b/components/camel-weather/src/test/java/org/apache/camel/component/weather/CurrentWeatherMadridConsumerTest.java
index acdde0c..e176276 100644
--- a/components/camel-weather/src/test/java/org/apache/camel/component/weather/CurrentWeatherMadridConsumerTest.java
+++ b/components/camel-weather/src/test/java/org/apache/camel/component/weather/CurrentWeatherMadridConsumerTest.java
@@ -25,7 +25,7 @@ public class CurrentWeatherMadridConsumerTest extends BaseWeatherConsumerTest {
return new RouteBuilder() {
@Override
public void configure() throws Exception {
- from("weather:foo?location=Madrid,Spain").to("mock:result");
+ from("weather:foo?location=Madrid,Spain&appId=9162755b2efa555823cfe0451d7fff38").to("mock:result");
}
};
}
http://git-wip-us.apache.org/repos/asf/camel/blob/f8962911/components/camel-weather/src/test/java/org/apache/camel/component/weather/Forecast7WeatherMadridConsumerTest.java
----------------------------------------------------------------------
diff --git a/components/camel-weather/src/test/java/org/apache/camel/component/weather/Forecast7WeatherMadridConsumerTest.java b/components/camel-weather/src/test/java/org/apache/camel/component/weather/Forecast7WeatherMadridConsumerTest.java
index 3d1e5c7..7dca7ab 100644
--- a/components/camel-weather/src/test/java/org/apache/camel/component/weather/Forecast7WeatherMadridConsumerTest.java
+++ b/components/camel-weather/src/test/java/org/apache/camel/component/weather/Forecast7WeatherMadridConsumerTest.java
@@ -25,7 +25,7 @@ public class Forecast7WeatherMadridConsumerTest extends BaseWeatherConsumerTest
return new RouteBuilder() {
@Override
public void configure() throws Exception {
- from("weather:foo?location=Madrid,Spain&period=7 days&units=IMPERIAL").to("mock:result");
+ from("weather:foo?location=Madrid,Spain&period=7 days&units=IMPERIAL&appId=9162755b2efa555823cfe0451d7fff38").to("mock:result");
}
};
}
[9/9] camel git commit: Component docs
Posted by da...@apache.org.
Component docs
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/a9cee89a
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/a9cee89a
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/a9cee89a
Branch: refs/heads/camel-2.16.x
Commit: a9cee89a522958abd2c720048b21113b4fd1a9c5
Parents: f78cecf
Author: Claus Ibsen <da...@apache.org>
Authored: Wed Jan 6 11:35:59 2016 +0100
Committer: Claus Ibsen <da...@apache.org>
Committed: Wed Jan 6 11:35:59 2016 +0100
----------------------------------------------------------------------
.../camel/component/test/TestEndpoint.java | 2 +-
.../camel/component/jbpm/JBPMConfiguration.java | 39 +-------------------
.../camel/component/jbpm/JBPMProducer.java | 2 +-
3 files changed, 4 insertions(+), 39 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/a9cee89a/camel-core/src/main/java/org/apache/camel/component/test/TestEndpoint.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/component/test/TestEndpoint.java b/camel-core/src/main/java/org/apache/camel/component/test/TestEndpoint.java
index a61efd1..f1fd29c 100644
--- a/camel-core/src/main/java/org/apache/camel/component/test/TestEndpoint.java
+++ b/camel-core/src/main/java/org/apache/camel/component/test/TestEndpoint.java
@@ -39,7 +39,7 @@ import org.slf4j.LoggerFactory;
*
* @version
*/
-@UriEndpoint(scheme = "test", title = "Test", syntax = "test:name", producerOnly = true, label = "core,testing")
+@UriEndpoint(scheme = "test", title = "Test", syntax = "test:name", producerOnly = true, label = "core,testing", lenientProperties = true)
public class TestEndpoint extends MockEndpoint {
private static final Logger LOG = LoggerFactory.getLogger(TestEndpoint.class);
private final Endpoint expectedMessageEndpoint;
http://git-wip-us.apache.org/repos/asf/camel/blob/a9cee89a/components/camel-jbpm/src/main/java/org/apache/camel/component/jbpm/JBPMConfiguration.java
----------------------------------------------------------------------
diff --git a/components/camel-jbpm/src/main/java/org/apache/camel/component/jbpm/JBPMConfiguration.java b/components/camel-jbpm/src/main/java/org/apache/camel/component/jbpm/JBPMConfiguration.java
index 556001a..d91caf4 100644
--- a/components/camel-jbpm/src/main/java/org/apache/camel/component/jbpm/JBPMConfiguration.java
+++ b/components/camel-jbpm/src/main/java/org/apache/camel/component/jbpm/JBPMConfiguration.java
@@ -19,8 +19,6 @@ package org.apache.camel.component.jbpm;
import java.net.URL;
import java.util.List;
import java.util.Map;
-import java.util.Objects;
-import javax.naming.InitialContext;
import org.apache.camel.spi.Metadata;
import org.apache.camel.spi.UriParam;
@@ -37,18 +35,6 @@ public class JBPMConfiguration {
private URL connectionURL;
@UriParam(label = "producer", defaultValue = "startProcess")
private String operation;
-<<<<<<< HEAD
- /**
- * Specifies the key to use
- */
- @UriParam
- private String key;
- /**
- * Specifies the value to use
- */
- @UriParam
- private Objects value;
-=======
@UriParam @Metadata(required = "true")
private String deploymentId;
@UriParam
@@ -56,17 +42,12 @@ public class JBPMConfiguration {
@UriParam
private Object value;
@UriParam
->>>>>>> 38d72c9... Component docs
private String processId;
@UriParam
private String eventType;
-<<<<<<< HEAD
- private String event;
-=======
@UriParam
private Object event;
@UriParam
->>>>>>> 38d72c9... Component docs
private Integer maxNumber;
@UriParam
private String identifier;
@@ -112,26 +93,14 @@ public class JBPMConfiguration {
this.operation = operation;
}
- public String getKey() {
- return key;
- }
-
- public void setKey(String key) {
- this.key = key;
- }
-
- public Objects getValue() {
+ public Object getValue() {
return value;
}
-<<<<<<< HEAD
- public void setValue(Objects value) {
-=======
/**
* the value to assign to the global identifier
*/
public void setValue(Object value) {
->>>>>>> 38d72c9... Component docs
this.value = value;
}
@@ -179,18 +148,14 @@ public class JBPMConfiguration {
this.eventType = eventType;
}
- public String getEvent() {
+ public Object getEvent() {
return event;
}
-<<<<<<< HEAD
- public void setEvent(String event) {
-=======
/**
* the data associated with this event when signalEvent operation is performed
*/
public void setEvent(Object event) {
->>>>>>> 38d72c9... Component docs
this.event = event;
}
http://git-wip-us.apache.org/repos/asf/camel/blob/a9cee89a/components/camel-jbpm/src/main/java/org/apache/camel/component/jbpm/JBPMProducer.java
----------------------------------------------------------------------
diff --git a/components/camel-jbpm/src/main/java/org/apache/camel/component/jbpm/JBPMProducer.java b/components/camel-jbpm/src/main/java/org/apache/camel/component/jbpm/JBPMProducer.java
index efccd67..8fc9fc4 100644
--- a/components/camel-jbpm/src/main/java/org/apache/camel/component/jbpm/JBPMProducer.java
+++ b/components/camel-jbpm/src/main/java/org/apache/camel/component/jbpm/JBPMProducer.java
@@ -407,7 +407,7 @@ public class JBPMProducer extends DefaultProducer {
}
Object getEvent(JBPMConfiguration configuration, Exchange exchange) {
- String event = exchange.getIn().getHeader(JBPMConstants.EVENT, String.class);
+ Object event = exchange.getIn().getHeader(JBPMConstants.EVENT);
if (event == null) {
event = configuration.getEvent();
}
[3/9] camel git commit: Fixed invalid xml file
Posted by da...@apache.org.
Fixed invalid xml file
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/bcfe7da5
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/bcfe7da5
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/bcfe7da5
Branch: refs/heads/camel-2.16.x
Commit: bcfe7da575e467ec51bf1efb36e27d174a075d0a
Parents: f896291
Author: Claus Ibsen <da...@apache.org>
Authored: Wed Jan 6 09:28:57 2016 +0100
Committer: Claus Ibsen <da...@apache.org>
Committed: Wed Jan 6 11:29:37 2016 +0100
----------------------------------------------------------------------
.../org/apache/camel/component/cxf/wsa/msg.xml | 20 --------------------
1 file changed, 20 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/bcfe7da5/components/camel-cxf/src/test/resources/org/apache/camel/component/cxf/wsa/msg.xml
----------------------------------------------------------------------
diff --git a/components/camel-cxf/src/test/resources/org/apache/camel/component/cxf/wsa/msg.xml b/components/camel-cxf/src/test/resources/org/apache/camel/component/cxf/wsa/msg.xml
index 3e9b5c8..d78d7e9 100644
--- a/components/camel-cxf/src/test/resources/org/apache/camel/component/cxf/wsa/msg.xml
+++ b/components/camel-cxf/src/test/resources/org/apache/camel/component/cxf/wsa/msg.xml
@@ -19,23 +19,3 @@
</ns1:greetMe>
</soap:Body>
</soap:Envelope>
-
-<soap:Envelope xmlns:soap="http://schemas.xmlsoap.org/soap/envelope/">
- <soap:Header>
- <Action xmlns="http://www.w3.org/2005/08/addressing">
- http://hello_world_soap_http.apache.org/GreeterPortType/greetMeResponse
- </Action>
- <MessageID xmlns="http://www.w3.org/2005/08/addressing">
- urn:uuid:ab509c5d-6c8a-49fc-b4e1-d3dc80e90812</MessageID>
- <To xmlns="http://www.w3.org/2005/08/addressing">http://www.w3.org/2005/08/addressing/anonymous
- </To>
- <RelatesTo xmlns="http://www.w3.org/2005/08/addressing">
- urn:uuid:d67279aa-9230-4e47-a57e-4166a44d9d96</RelatesTo>
- </soap:Header>
- <soap:Body>
- <ns1:greetMeResponse xmlns:ns1="http://hello_world_soap_http.apache.org/">
- <ns2:return xmlns="http://apache.org/hello_world_soap_http/types"
- xmlns:ns2="http://hello_world_soap_http.apache.org/">Hello world!</ns2:return>
- </ns1:greetMeResponse>
- </soap:Body>
-</soap:Envelope>
\ No newline at end of file
[7/9] camel git commit: Camel component docs
Posted by da...@apache.org.
Camel component docs
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/68374e1e
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/68374e1e
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/68374e1e
Branch: refs/heads/camel-2.16.x
Commit: 68374e1e49d4ed0f24d013547a0eb87ab7ef1219
Parents: cb64e2d
Author: Claus Ibsen <da...@apache.org>
Authored: Wed Jan 6 10:04:23 2016 +0100
Committer: Claus Ibsen <da...@apache.org>
Committed: Wed Jan 6 11:31:15 2016 +0100
----------------------------------------------------------------------
.../optaplanner/OptaPlannerConfiguration.java | 46 +++++++++-----------
.../optaplanner/OptaPlannerEndpoint.java | 2 +-
2 files changed, 22 insertions(+), 26 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/68374e1e/components/camel-optaplanner/src/main/java/org/apache/camel/component/optaplanner/OptaPlannerConfiguration.java
----------------------------------------------------------------------
diff --git a/components/camel-optaplanner/src/main/java/org/apache/camel/component/optaplanner/OptaPlannerConfiguration.java b/components/camel-optaplanner/src/main/java/org/apache/camel/component/optaplanner/OptaPlannerConfiguration.java
index 0e70c77..82cec1b 100644
--- a/components/camel-optaplanner/src/main/java/org/apache/camel/component/optaplanner/OptaPlannerConfiguration.java
+++ b/components/camel-optaplanner/src/main/java/org/apache/camel/component/optaplanner/OptaPlannerConfiguration.java
@@ -24,51 +24,44 @@ import org.apache.camel.spi.UriPath;
@UriParams
public class OptaPlannerConfiguration {
- /**
- * Specifies the solverId to user for the solver instance key
- */
+ @UriPath @Metadata(required = "true")
+ private String configFile;
@UriParam(label = "common", defaultValue = "DEFAULT_SOLVER")
private String solverId = OptaPlannerConstants.DEFAULT_SOLVER_ID;
-
- /**
- * Specifies the location to the solver file
- */
- @UriPath
- @Metadata(required = "true")
- private String configFile;
-
- /**
- * Specifies the thread pool size to use when async is true
- */
@UriParam(label = "producer", defaultValue = "10")
private int threadPoolSize = 10;
+ @UriParam(label = "producer")
+ private boolean async;
+
+ public String getConfigFile() {
+ return configFile;
+ }
/**
- * Specifies to perform operations in async mode
+ * Specifies the location to the solver file
*/
- @UriParam(label = "producer", defaultValue = "false")
- private boolean async;
+ public void setConfigFile(String configFile) {
+ this.configFile = configFile;
+ }
public String getSolverId() {
return solverId;
}
+ /**
+ * Specifies the solverId to user for the solver instance key
+ */
public void setSolverId(String solverId) {
this.solverId = solverId;
}
- public void setConfigFile(String configFile) {
- this.configFile = configFile;
- }
-
- public String getConfigFile() {
- return configFile;
- }
-
public int getThreadPoolSize() {
return threadPoolSize;
}
+ /**
+ * Specifies the thread pool size to use when async is true
+ */
public void setThreadPoolSize(int threadPoolSize) {
this.threadPoolSize = threadPoolSize;
}
@@ -77,6 +70,9 @@ public class OptaPlannerConfiguration {
return async;
}
+ /**
+ * Specifies to perform operations in async mode
+ */
public void setAsync(boolean async) {
this.async = async;
}
http://git-wip-us.apache.org/repos/asf/camel/blob/68374e1e/components/camel-optaplanner/src/main/java/org/apache/camel/component/optaplanner/OptaPlannerEndpoint.java
----------------------------------------------------------------------
diff --git a/components/camel-optaplanner/src/main/java/org/apache/camel/component/optaplanner/OptaPlannerEndpoint.java b/components/camel-optaplanner/src/main/java/org/apache/camel/component/optaplanner/OptaPlannerEndpoint.java
index 6eee2b8..6c23306 100644
--- a/components/camel-optaplanner/src/main/java/org/apache/camel/component/optaplanner/OptaPlannerEndpoint.java
+++ b/components/camel-optaplanner/src/main/java/org/apache/camel/component/optaplanner/OptaPlannerEndpoint.java
@@ -32,7 +32,7 @@ import org.optaplanner.core.api.solver.SolverFactory;
/**
* OptaPlanner endpoint for Camel
*/
-@UriEndpoint(scheme = "optaplanner", title = "OptaPlanner", syntax = "optaplanner:resourceUri", label = "engine,planning")
+@UriEndpoint(scheme = "optaplanner", title = "OptaPlanner", syntax = "optaplanner:configFile", label = "engine,planning")
public class OptaPlannerEndpoint extends DefaultEndpoint {
private static final Map<String, Solver> SOLVERS = new HashMap<String, Solver>();