camel git commit: Remove DOS line delimiters at camel-cxf
Repository: camel
Updated Branches:
refs/heads/master cd3f66e99 - 194dd3579
Remove DOS line delimiters at camel-cxf
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/194dd357
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/194dd357
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/194dd357
Branch: refs/heads/master
Commit: 194dd3579de3c8f7be67c5190b889c1d14e85591
Parents: cd3f66e
Author: Akitoshi Yoshida a...@apache.org
Authored: Mon May 11 12:25:56 2015 +0200
Committer: Akitoshi Yoshida a...@apache.org
Committed: Mon May 11 12:25:56 2015 +0200
--
.../cxf/converter/CachedCxfPayload.java | 302 +--
.../cxf/converter/CachedCxfPayloadTest.java | 206 ++---
2 files changed, 254 insertions(+), 254 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/camel/blob/194dd357/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/converter/CachedCxfPayload.java
--
diff --git
a/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/converter/CachedCxfPayload.java
b/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/converter/CachedCxfPayload.java
index d03ef55..b480a73 100644
---
a/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/converter/CachedCxfPayload.java
+++
b/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/converter/CachedCxfPayload.java
@@ -1,151 +1,151 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the License); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an AS IS BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.camel.component.cxf.converter;
-
-import java.io.IOException;
-import java.io.OutputStream;
-import java.util.ArrayList;
-import java.util.ListIterator;
-import java.util.Map;
-
-import javax.xml.stream.XMLStreamReader;
-import javax.xml.transform.Source;
-import javax.xml.transform.TransformerException;
-import javax.xml.transform.dom.DOMSource;
-import javax.xml.transform.stax.StAXSource;
-import javax.xml.transform.stream.StreamResult;
-
-import org.w3c.dom.Document;
-
-import org.apache.camel.Exchange;
-import org.apache.camel.StreamCache;
-import org.apache.camel.component.cxf.CxfPayload;
-import org.apache.camel.converter.jaxp.XmlConverter;
-import org.apache.camel.converter.stream.CachedOutputStream;
-import org.apache.camel.converter.stream.StreamSourceCache;
-import org.apache.cxf.staxutils.StaxSource;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-
-public class CachedCxfPayloadT extends CxfPayloadT implements StreamCache {
-private static final Logger LOG =
LoggerFactory.getLogger(CachedCxfPayload.class);
-private final XmlConverter xml;
-
-public CachedCxfPayload(CxfPayloadT orig, Exchange exchange,
XmlConverter xml) {
-super(orig.getHeaders(), new ArrayListSource(orig.getBodySources()),
orig.getNsMap());
-ListIteratorSource li = getBodySources().listIterator();
-this.xml = xml;
-while (li.hasNext()) {
-Source source = li.next();
-XMLStreamReader reader = null;
-// namespace definitions that are on the SOAP envelope can get
lost, if this is
-// not a DOM (there is special coding on the
CXFPayload.getBody().get() method for
-// this, that only works on DOM nodes.
-// We have to do some delegation on the XMLStreamReader for
StAXSource and StaxSource
-// that re-injects the missing namespaces into the XMLStreamReader.
-// Replace all other Sources that are not DOMSources with
DOMSources.
-if (source instanceof StaxSource) {
-reader = ((StaxSource) source).getXMLStreamReader();
-} else if (source instanceof StAXSource) {
-reader = ((StAXSource) source).getXMLStreamReader();
-}
-if (reader != null) {
-MapString, String nsmap = getNsMap();
-if (nsmap != null !(reader instanceof
DelegatingXMLStreamReader)) {
-source = new
camel git commit: Component docs
Repository: camel
Updated Branches:
refs/heads/master 4cc3541be - cd3f66e99
Component docs
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/cd3f66e9
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/cd3f66e9
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/cd3f66e9
Branch: refs/heads/master
Commit: cd3f66e99927d5ec3301e949d4f85b3bc79486e2
Parents: 4cc3541
Author: Claus Ibsen davscl...@apache.org
Authored: Mon May 11 11:37:28 2015 +0200
Committer: Claus Ibsen davscl...@apache.org
Committed: Mon May 11 11:37:28 2015 +0200
--
.../component/restlet/RestletComponent.java | 67 +
.../component/restlet/RestletEndpoint.java | 76
2 files changed, 131 insertions(+), 12 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/camel/blob/cd3f66e9/components/camel-restlet/src/main/java/org/apache/camel/component/restlet/RestletComponent.java
--
diff --git
a/components/camel-restlet/src/main/java/org/apache/camel/component/restlet/RestletComponent.java
b/components/camel-restlet/src/main/java/org/apache/camel/component/restlet/RestletComponent.java
index aef1c24..3aefcc9 100644
---
a/components/camel-restlet/src/main/java/org/apache/camel/component/restlet/RestletComponent.java
+++
b/components/camel-restlet/src/main/java/org/apache/camel/component/restlet/RestletComponent.java
@@ -451,6 +451,9 @@ public class RestletComponent extends
HeaderFilterStrategyComponent implements R
return controllerDaemon;
}
+/**
+ * Indicates if the controller thread should be a daemon (not blocking JVM
exit).
+ */
public void setControllerDaemon(Boolean controllerDaemon) {
this.controllerDaemon = controllerDaemon;
}
@@ -459,6 +462,9 @@ public class RestletComponent extends
HeaderFilterStrategyComponent implements R
return controllerSleepTimeMs;
}
+/**
+ * Time for the controller thread to sleep between each control.
+ */
public void setControllerSleepTimeMs(Integer controllerSleepTimeMs) {
this.controllerSleepTimeMs = controllerSleepTimeMs;
}
@@ -467,6 +473,9 @@ public class RestletComponent extends
HeaderFilterStrategyComponent implements R
return inboundBufferSize;
}
+/**
+ * The size of the buffer when reading messages.
+ */
public void setInboundBufferSize(Integer inboundBufferSize) {
this.inboundBufferSize = inboundBufferSize;
}
@@ -475,6 +484,9 @@ public class RestletComponent extends
HeaderFilterStrategyComponent implements R
return maxConnectionsPerHost;
}
+/**
+ * Maximum number of concurrent connections per host (IP address).
+ */
public void setMaxConnectionsPerHost(Integer maxConnectionsPerHost) {
this.maxConnectionsPerHost = maxConnectionsPerHost;
}
@@ -483,6 +495,9 @@ public class RestletComponent extends
HeaderFilterStrategyComponent implements R
return maxThreads;
}
+/**
+ * Maximum threads that will service requests.
+ */
public void setMaxThreads(Integer maxThreads) {
this.maxThreads = maxThreads;
}
@@ -491,6 +506,9 @@ public class RestletComponent extends
HeaderFilterStrategyComponent implements R
return lowThreads;
}
+/**
+ * Number of worker threads determining when the connector is considered
overloaded.
+ */
public void setLowThreads(Integer lowThreads) {
this.lowThreads = lowThreads;
}
@@ -499,6 +517,9 @@ public class RestletComponent extends
HeaderFilterStrategyComponent implements R
return maxTotalConnections;
}
+/**
+ * Maximum number of concurrent connections in total.
+ */
public void setMaxTotalConnections(Integer maxTotalConnections) {
this.maxTotalConnections = maxTotalConnections;
}
@@ -507,6 +528,9 @@ public class RestletComponent extends
HeaderFilterStrategyComponent implements R
return minThreads;
}
+/**
+ * Minimum threads waiting to service requests.
+ */
public void setMinThreads(Integer minThreads) {
this.minThreads = minThreads;
}
@@ -515,6 +539,9 @@ public class RestletComponent extends
HeaderFilterStrategyComponent implements R
return outboundBufferSize;
}
+/**
+ * The size of the buffer when writing messages.
+ */
public void setOutboundBufferSize(Integer outboundBufferSize) {
this.outboundBufferSize = outboundBufferSize;
}
@@ -523,6 +550,9 @@ public class RestletComponent extends
HeaderFilterStrategyComponent implements R
return persistingConnections;
}
+/**
+ * Indicates if connections should be kept
camel git commit: Component docs
Repository: camel
Updated Branches:
refs/heads/master 194dd3579 - ef55316f2
Component docs
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/ef55316f
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/ef55316f
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/ef55316f
Branch: refs/heads/master
Commit: ef55316f270ece05b5df978da43afaa60c66cf6d
Parents: 194dd35
Author: Claus Ibsen davscl...@apache.org
Authored: Mon May 11 13:19:13 2015 +0200
Committer: Claus Ibsen davscl...@apache.org
Committed: Mon May 11 13:19:32 2015 +0200
--
.../routebox/RouteboxConfiguration.java | 95 +++-
1 file changed, 53 insertions(+), 42 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/camel/blob/ef55316f/components/camel-routebox/src/main/java/org/apache/camel/component/routebox/RouteboxConfiguration.java
--
diff --git
a/components/camel-routebox/src/main/java/org/apache/camel/component/routebox/RouteboxConfiguration.java
b/components/camel-routebox/src/main/java/org/apache/camel/component/routebox/RouteboxConfiguration.java
index 34c8a23..567a4c3 100644
---
a/components/camel-routebox/src/main/java/org/apache/camel/component/routebox/RouteboxConfiguration.java
+++
b/components/camel-routebox/src/main/java/org/apache/camel/component/routebox/RouteboxConfiguration.java
@@ -38,37 +38,33 @@ import org.slf4j.LoggerFactory;
@UriParams
public class RouteboxConfiguration {
private static final Logger LOG =
LoggerFactory.getLogger(RouteboxConfiguration.class);
+
+private CamelContext innerContext;
+private ListRouteBuilder routeBuilders = new ArrayListRouteBuilder();
+private Registry innerRegistry;
private URI uri;
private String authority;
+private ProducerTemplate innerProducerTemplate;
+
@UriPath @Metadata(required = true)
private String routeboxName;
@UriParam
-private URI consumerUri;
-@UriParam
-private URI producerUri;
-@UriParam
private RouteboxDispatchStrategy dispatchStrategy;
@UriParam
private MapString, String dispatchMap;
-private CamelContext innerContext;
-private ListRouteBuilder routeBuilders = new ArrayListRouteBuilder();
-private Registry innerRegistry;
@UriParam(defaultValue = true)
private boolean forkContext = true;
-@UriParam(defaultValue = true)
-private boolean local = true;
-@UriParam(defaultValue = 2)
+@UriParam(label = producer, defaultValue = 2)
private long connectionTimeout = 2;
-@UriParam(defaultValue = 1000)
+@UriParam(label = consumer, defaultValue = 1000)
private long pollInterval = 1000;
-@UriParam(defaultValue = direct)
+@UriParam(defaultValue = direct, enums = direct,seda)
private String innerProtocol = direct;
-@UriParam(defaultValue = 20)
+@UriParam(label = consumer, defaultValue = 20)
private int threads = 20;
@UriParam
private int queueSize;
-private ProducerTemplate innerProducerTemplate;
-@UriParam(defaultValue = true)
+@UriParam(label = producer, defaultValue = true)
private boolean sendToConsumer = true;
public RouteboxConfiguration() {
@@ -148,9 +144,7 @@ public class RouteboxConfiguration {
innerProducerTemplate = innerContext.createProducerTemplate();
setQueueSize(component.getAndRemoveParameter(parameters, size,
Integer.class, 0));
-consumerUri = component.resolveAndRemoveReferenceParameter(parameters,
consumerUri, URI.class, new URI(routebox: + getRouteboxName()));
-producerUri = component.resolveAndRemoveReferenceParameter(parameters,
producerUri, URI.class, new URI(routebox: + getRouteboxName()));
-
+
dispatchStrategy =
component.resolveAndRemoveReferenceParameter(parameters, dispatchStrategy,
RouteboxDispatchStrategy.class, null);
dispatchMap = component.resolveAndRemoveReferenceParameter(parameters,
dispatchMap, HashMap.class, new HashMapString, String());
if (dispatchStrategy == null dispatchMap == null) {
@@ -190,6 +184,9 @@ public class RouteboxConfiguration {
return routeBuilders;
}
+/**
+ * Whether to fork and create a new inner CamelContext instead of reusing
the same CamelContext.
+ */
public void setForkContext(boolean forkContext) {
this.forkContext = forkContext;
}
@@ -198,6 +195,9 @@ public class RouteboxConfiguration {
return forkContext;
}
+/**
+ * Number of threads to be used by the routebox to receive requests.
+ */
public void setThreads(int threads) {
this.threads = threads;
}
@@ -206,6 +206,9 @@ public class RouteboxConfiguration {
return threads;
[1/4] camel git commit: Component docs
Repository: camel
Updated Branches:
refs/heads/master 8d6a94ea0 - 4cc3541be
Component docs
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/5b6134ba
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/5b6134ba
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/5b6134ba
Branch: refs/heads/master
Commit: 5b6134baeabc72b9607f25577685dba7280db10b
Parents: 8d6a94e
Author: Claus Ibsen davscl...@apache.org
Authored: Mon May 11 09:05:18 2015 +0200
Committer: Claus Ibsen davscl...@apache.org
Committed: Mon May 11 09:05:18 2015 +0200
--
.../camel/component/cache/CacheComponent.java | 5 ++
.../component/cache/CacheConfiguration.java | 57 ++--
.../camel/component/cache/CacheEndpoint.java| 14 +
3 files changed, 72 insertions(+), 4 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/camel/blob/5b6134ba/components/camel-cache/src/main/java/org/apache/camel/component/cache/CacheComponent.java
--
diff --git
a/components/camel-cache/src/main/java/org/apache/camel/component/cache/CacheComponent.java
b/components/camel-cache/src/main/java/org/apache/camel/component/cache/CacheComponent.java
index c19d0c0..d46f40c 100755
---
a/components/camel-cache/src/main/java/org/apache/camel/component/cache/CacheComponent.java
+++
b/components/camel-cache/src/main/java/org/apache/camel/component/cache/CacheComponent.java
@@ -62,6 +62,11 @@ public class CacheComponent extends UriEndpointComponent {
return cacheManagerFactory;
}
+/**
+ * To use the given CacheManagerFactory for creating the CacheManager.
+ * p/
+ * By default the DefaultCacheManagerFactory is used.
+ */
public void setCacheManagerFactory(CacheManagerFactory
cacheManagerFactory) {
this.cacheManagerFactory = cacheManagerFactory;
}
http://git-wip-us.apache.org/repos/asf/camel/blob/5b6134ba/components/camel-cache/src/main/java/org/apache/camel/component/cache/CacheConfiguration.java
--
diff --git
a/components/camel-cache/src/main/java/org/apache/camel/component/cache/CacheConfiguration.java
b/components/camel-cache/src/main/java/org/apache/camel/component/cache/CacheConfiguration.java
index e55d6c4..fe5d99f 100755
---
a/components/camel-cache/src/main/java/org/apache/camel/component/cache/CacheConfiguration.java
+++
b/components/camel-cache/src/main/java/org/apache/camel/component/cache/CacheConfiguration.java
@@ -21,6 +21,7 @@ import java.util.Map;
import net.sf.ehcache.store.MemoryStoreEvictionPolicy;
import org.apache.camel.RuntimeCamelException;
+import org.apache.camel.spi.Metadata;
import org.apache.camel.spi.UriParam;
import org.apache.camel.spi.UriParams;
import org.apache.camel.spi.UriPath;
@@ -28,15 +29,16 @@ import org.apache.camel.util.URISupport;
@UriParams
public class CacheConfiguration implements Cloneable {
-@UriPath
+@UriPath @Metadata(required = true)
private String cacheName;
@UriParam(defaultValue = 1000)
private int maxElementsInMemory = 1000;
-@UriParam(defaultValue = LFU, enums = LRU,LFU,FIFO,CLOCK)
+@UriParam(defaultValue = LFU, enums = LRU,LFU,FIFO)
private MemoryStoreEvictionPolicy memoryStoreEvictionPolicy =
MemoryStoreEvictionPolicy.LFU;
@UriParam(defaultValue = true)
private boolean overflowToDisk = true;
@UriParam
+@Deprecated
private String diskStorePath;
@UriParam
private boolean eternal;
@@ -125,6 +127,9 @@ public class CacheConfiguration implements Cloneable {
return cacheName;
}
+/**
+ * Name of the cache
+ */
public void setCacheName(String cacheName) {
this.cacheName = cacheName;
}
@@ -133,6 +138,9 @@ public class CacheConfiguration implements Cloneable {
return maxElementsInMemory;
}
+/**
+ * The number of elements that may be stored in the defined cache in
memory.
+ */
public void setMaxElementsInMemory(int maxElementsInMemory) {
this.maxElementsInMemory = maxElementsInMemory;
}
@@ -141,8 +149,16 @@ public class CacheConfiguration implements Cloneable {
return memoryStoreEvictionPolicy;
}
-public void setMemoryStoreEvictionPolicy(
-MemoryStoreEvictionPolicy memoryStoreEvictionPolicy) {
+/**
+ * Which eviction strategy to use when maximum number of elements in
memory is reached. The strategy defines
+ * which elements to be removed.
+ * ul
+ * liLRU - Lest Recently Used/li
+ * liLFU - Lest Frequently Used/li
+ * liFIFO - First In First Out/li
+ * /ul
+ */
+public void setMemoryStoreEvictionPolicy(MemoryStoreEvictionPolicy
[4/4] camel git commit: Component docs
Component docs
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/4cc3541b
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/4cc3541b
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/4cc3541b
Branch: refs/heads/master
Commit: 4cc3541bef457d2b2a6c02f51bda2270a2082047
Parents: 5d66a29
Author: Claus Ibsen davscl...@apache.org
Authored: Mon May 11 09:31:13 2015 +0200
Committer: Claus Ibsen davscl...@apache.org
Committed: Mon May 11 09:31:13 2015 +0200
--
.../component/cassandra/CassandraEndpoint.java | 36
1 file changed, 36 insertions(+)
--
http://git-wip-us.apache.org/repos/asf/camel/blob/4cc3541b/components/camel-cassandraql/src/main/java/org/apache/camel/component/cassandra/CassandraEndpoint.java
--
diff --git
a/components/camel-cassandraql/src/main/java/org/apache/camel/component/cassandra/CassandraEndpoint.java
b/components/camel-cassandraql/src/main/java/org/apache/camel/component/cassandra/CassandraEndpoint.java
index a1d1495..0e28d9f 100644
---
a/components/camel-cassandraql/src/main/java/org/apache/camel/component/cassandra/CassandraEndpoint.java
+++
b/components/camel-cassandraql/src/main/java/org/apache/camel/component/cassandra/CassandraEndpoint.java
@@ -185,6 +185,9 @@ public class CassandraEndpoint extends DefaultEndpoint {
return beanRef;
}
+/**
+ * Instead of using a hostname:port, refer to an existing configured
Session or Cluster from the Camel registry to be used.
+ */
public void setBean(String beanRef) {
this.beanRef = beanRef;
}
@@ -203,6 +206,9 @@ public class CassandraEndpoint extends DefaultEndpoint {
return hosts;
}
+/**
+ * Hostname(s) cassansdra server(s). Multiple hosts can be separated by
comma.
+ */
public void setHosts(String hosts) {
this.hosts = hosts;
}
@@ -211,6 +217,9 @@ public class CassandraEndpoint extends DefaultEndpoint {
return port;
}
+/**
+ * Port number of cassansdra server(s)
+ */
public void setPort(Integer port) {
this.port = port;
}
@@ -219,6 +228,9 @@ public class CassandraEndpoint extends DefaultEndpoint {
return keyspace;
}
+/**
+ * Keyspace to use
+ */
public void setKeyspace(String keyspace) {
this.keyspace = keyspace;
}
@@ -227,6 +239,9 @@ public class CassandraEndpoint extends DefaultEndpoint {
return cql;
}
+/**
+ * CQL query to perform. Can be overridden with the message header with
key CamelCqlQuery.
+ */
public void setCql(String cql) {
this.cql = cql;
}
@@ -235,6 +250,9 @@ public class CassandraEndpoint extends DefaultEndpoint {
return cluster;
}
+/**
+ * To use the Cluster instance (you would normally not use this option)
+ */
public void setCluster(Cluster cluster) {
this.cluster = cluster;
}
@@ -247,6 +265,9 @@ public class CassandraEndpoint extends DefaultEndpoint {
}
}
+/**
+ * To use the Session instance (you would normally not use this option)
+ */
public void setSession(Session session) {
this.session = session;
}
@@ -255,6 +276,9 @@ public class CassandraEndpoint extends DefaultEndpoint {
return clusterName;
}
+/**
+ * Cluster name
+ */
public void setClusterName(String clusterName) {
this.clusterName = clusterName;
}
@@ -263,6 +287,9 @@ public class CassandraEndpoint extends DefaultEndpoint {
return username;
}
+/**
+ * Username for session authentication
+ */
public void setUsername(String username) {
this.username = username;
}
@@ -271,6 +298,9 @@ public class CassandraEndpoint extends DefaultEndpoint {
return password;
}
+/**
+ * Password for session authentication
+ */
public void setPassword(String password) {
this.password = password;
}
@@ -279,6 +309,9 @@ public class CassandraEndpoint extends DefaultEndpoint {
return consistencyLevel;
}
+/**
+ * Consistency level to use
+ */
public void setConsistencyLevel(ConsistencyLevel consistencyLevel) {
this.consistencyLevel = consistencyLevel;
}
@@ -287,6 +320,9 @@ public class CassandraEndpoint extends DefaultEndpoint {
return resultSetConversionStrategy;
}
+/**
+ * To use a custom class that implements logic for converting ResultSet
into message body ALL, ONE, LIMIT_10, LIMIT_100...
+ */
public void setResultSetConversionStrategy(ResultSetConversionStrategy
resultSetConversionStrategy) {
this.resultSetConversionStrategy =
[3/4] camel git commit: Component docs
Component docs
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/5d66a295
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/5d66a295
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/5d66a295
Branch: refs/heads/master
Commit: 5d66a295bea2daac555395349a43b880c0e1baa5
Parents: 89706cd
Author: Claus Ibsen davscl...@apache.org
Authored: Mon May 11 09:23:12 2015 +0200
Committer: Claus Ibsen davscl...@apache.org
Committed: Mon May 11 09:23:12 2015 +0200
--
.../apache/camel/component/context/ContextEndpoint.java | 10 ++
.../camel/component/context/LocalContextComponent.java| 3 +++
2 files changed, 13 insertions(+)
--
http://git-wip-us.apache.org/repos/asf/camel/blob/5d66a295/components/camel-context/src/main/java/org/apache/camel/component/context/ContextEndpoint.java
--
diff --git
a/components/camel-context/src/main/java/org/apache/camel/component/context/ContextEndpoint.java
b/components/camel-context/src/main/java/org/apache/camel/component/context/ContextEndpoint.java
index 34f9cc7..49dfddd 100644
---
a/components/camel-context/src/main/java/org/apache/camel/component/context/ContextEndpoint.java
+++
b/components/camel-context/src/main/java/org/apache/camel/component/context/ContextEndpoint.java
@@ -51,6 +51,9 @@ public class ContextEndpoint extends DefaultEndpoint
implements DelegateEndpoint
return contextId;
}
+/**
+ * Is the ID you used to register the CamelContext into the Registry.
+ */
public void setContextId(String contextId) {
this.contextId = contextId;
}
@@ -59,6 +62,13 @@ public class ContextEndpoint extends DefaultEndpoint
implements DelegateEndpoint
return localEndpointUrl;
}
+/**
+ * Can be a valid Camel URI evaluated within the black box CamelContext.
+ * Or it can be a logical name which is mapped to any local endpoints.
+ * For example if you locally have endpoints like direct:invoices and
seda:purchaseOrders
+ * inside a CamelContext of id supplyChain, then you can just use the URIs
supplyChain:invoices
+ * or supplyChain:purchaseOrders to omit the physical endpoint kind and
use pure logical URIs.
+ */
public void setLocalEndpointUrl(String localEndpointUrl) {
this.localEndpointUrl = localEndpointUrl;
}
http://git-wip-us.apache.org/repos/asf/camel/blob/5d66a295/components/camel-context/src/main/java/org/apache/camel/component/context/LocalContextComponent.java
--
diff --git
a/components/camel-context/src/main/java/org/apache/camel/component/context/LocalContextComponent.java
b/components/camel-context/src/main/java/org/apache/camel/component/context/LocalContextComponent.java
index 0c75bcc..d341b4b 100644
---
a/components/camel-context/src/main/java/org/apache/camel/component/context/LocalContextComponent.java
+++
b/components/camel-context/src/main/java/org/apache/camel/component/context/LocalContextComponent.java
@@ -58,6 +58,9 @@ public class LocalContextComponent extends DefaultComponent {
return localCamelContext;
}
+/**
+ * Sets the local CamelContext to use.
+ */
public void setLocalCamelContext(CamelContext localCamelContext) {
this.localCamelContext = localCamelContext;
}
svn commit: r950909 [2/3] - in /websites/production/camel/content: book-component-appendix.html book-in-one-page.html cache/main.pageCache file2.html raspberrypi.html
Modified: websites/production/camel/content/book-in-one-page.html
==
--- websites/production/camel/content/book-in-one-page.html (original)
+++ websites/production/camel/content/book-in-one-page.html Mon May 11 11:20:00
2015
@@ -4040,11 +4040,11 @@ While not actual tutorials you might fin
/div
/div
h2 id=BookInOnePage-PrefacePreface/h2pThis tutorial aims to guide the
reader through the stages of creating a project which uses Camel to facilitate
the routing of messages from a JMS queue to a a shape=rect
class=external-link href=http://www.springramework.org;
rel=nofollowSpring/a service. The route works in a synchronous fashion
returning a response to the client./ppstyle type=text/css/*![CDATA[*/
-div.rbtoc1431256729047 {padding: 0px;}
-div.rbtoc1431256729047 ul {list-style: disc;margin-left: 0px;}
-div.rbtoc1431256729047 li {margin-left: 0px;padding-left: 0px;}
+div.rbtoc1431343133797 {padding: 0px;}
+div.rbtoc1431343133797 ul {list-style: disc;margin-left: 0px;}
+div.rbtoc1431343133797 li {margin-left: 0px;padding-left: 0px;}
-/*]]*//style/pdiv class=toc-macro rbtoc1431256729047
+/*]]*//style/pdiv class=toc-macro rbtoc1431343133797
ul class=toc-indentationlia shape=rect
href=#Tutorial-JmsRemoting-TutorialonSpringRemotingwithJMSTutorial on Spring
Remoting with JMS/a/lilia shape=rect
href=#Tutorial-JmsRemoting-PrefacePreface/a/lilia shape=rect
href=#Tutorial-JmsRemoting-PrerequisitesPrerequisites/a/lilia
shape=rect
href=#Tutorial-JmsRemoting-DistributionDistribution/a/lilia
shape=rect href=#Tutorial-JmsRemoting-AboutAbout/a/lilia
shape=rect href=#Tutorial-JmsRemoting-CreatetheCamelProjectCreate the
Camel Project/a
ul class=toc-indentationlia shape=rect
href=#Tutorial-JmsRemoting-UpdatethePOMwithDependenciesUpdate the POM with
Dependencies/a/li/ul
/lilia shape=rect href=#Tutorial-JmsRemoting-WritingtheServerWriting
the Server/a
@@ -6230,11 +6230,11 @@ So we completed the last piece in the pi
style type=text/css/*![CDATA[*/
-div.rbtoc1431256729304 {padding: 0px;}
-div.rbtoc1431256729304 ul {list-style: disc;margin-left: 0px;}
-div.rbtoc1431256729304 li {margin-left: 0px;padding-left: 0px;}
+div.rbtoc1431343133933 {padding: 0px;}
+div.rbtoc1431343133933 ul {list-style: disc;margin-left: 0px;}
+div.rbtoc1431343133933 li {margin-left: 0px;padding-left: 0px;}
-/*]]*//stylediv class=toc-macro rbtoc1431256729304
+/*]]*//stylediv class=toc-macro rbtoc1431343133933
ul class=toc-indentationlia shape=rect
href=#Tutorial-AXIS-Camel-TutorialusingAxis1.4withApacheCamelTutorial using
Axis 1.4 with Apache Camel/a
ul class=toc-indentationlia shape=rect
href=#Tutorial-AXIS-Camel-PrerequisitesPrerequisites/a/lilia
shape=rect
href=#Tutorial-AXIS-Camel-DistributionDistribution/a/lilia
shape=rect
href=#Tutorial-AXIS-Camel-IntroductionIntroduction/a/lilia
shape=rect href=#Tutorial-AXIS-Camel-SettinguptheprojecttorunAxisSetting
up the project to run Axis/a
ul class=toc-indentationlia shape=rect
href=#Tutorial-AXIS-Camel-Maven2Maven 2/a/lilia shape=rect
href=#Tutorial-AXIS-Camel-wsdlwsdl/a/lilia shape=rect
href=#Tutorial-AXIS-Camel-ConfiguringAxisConfiguring Axis/a/lilia
shape=rect href=#Tutorial-AXIS-Camel-RunningtheExampleRunning the
Example/a/li/ul
@@ -18817,11 +18817,11 @@ template.send(quot;direct:alias-verify
/div
/div
pThe strongcxf:/strong component provides integration with a
shape=rect href=http://cxf.apache.org;Apache CXF/a for connecting to
JAX-WS services hosted in CXF./ppstyle type=text/css/*![CDATA[*/
-div.rbtoc1431256740307 {padding: 0px;}
-div.rbtoc1431256740307 ul {list-style: disc;margin-left: 0px;}
-div.rbtoc1431256740307 li {margin-left: 0px;padding-left: 0px;}
+div.rbtoc1431343151400 {padding: 0px;}
+div.rbtoc1431343151400 ul {list-style: disc;margin-left: 0px;}
+div.rbtoc1431343151400 li {margin-left: 0px;padding-left: 0px;}
-/*]]*//style/pdiv class=toc-macro rbtoc1431256740307
+/*]]*//style/pdiv class=toc-macro rbtoc1431343151400
ul class=toc-indentationlia shape=rect href=#CXF-CXFComponentCXF
Component/a
ul class=toc-indentationlia shape=rect href=#CXF-URIformatURI
format/a/lilia shape=rect href=#CXF-OptionsOptions/a
ul class=toc-indentationlia shape=rect
href=#CXF-ThedescriptionsofthedataformatsThe descriptions of the
dataformats/a
@@ -20101,7 +20101,7 @@ To configure Esper via a configuration f
/div
h3 id=BookInOnePage-URIOptions.1URI Options/h3h4
id=BookInOnePage-CommonCommon/h4div class=confluenceTableSmalldiv
class=table-wraptable class=confluenceTabletbodytrth colspan=1
rowspan=1 class=confluenceThpName/p/thth colspan=1 rowspan=1
class=confluenceThpDefault Value/p/thth colspan=1 rowspan=1
class=confluenceThpDescription/p/th/trtrtd colspan=1
rowspan=1 class=confluenceTdpcodeautoCreate/code/p/tdtd
colspan=1 rowspan=1 class=confluenceTdpcodetrue/code/p/tdtd
colspan=1 rowspan=1
svn commit: r950909 [3/3] - in /websites/production/camel/content: book-component-appendix.html book-in-one-page.html cache/main.pageCache file2.html raspberrypi.html
Modified: websites/production/camel/content/file2.html
==
--- websites/production/camel/content/file2.html (original)
+++ websites/production/camel/content/file2.html Mon May 11 11:20:00 2015
@@ -108,7 +108,7 @@
/div
h3 id=File2-URIOptionsURI Options/h3h4
id=File2-CommonCommon/h4div class=confluenceTableSmalldiv
class=table-wraptable class=confluenceTabletbodytrth colspan=1
rowspan=1 class=confluenceThpName/p/thth colspan=1 rowspan=1
class=confluenceThpDefault Value/p/thth colspan=1 rowspan=1
class=confluenceThpDescription/p/th/trtrtd colspan=1
rowspan=1 class=confluenceTdpcodeautoCreate/code/p/tdtd
colspan=1 rowspan=1 class=confluenceTdpcodetrue/code/p/tdtd
colspan=1 rowspan=1 class=confluenceTdpAutomatically create missing
directories in the file's pathname. For the file consumer, that means creating
the starting directory. For the file producer, it means the directory the files
should be written to./p/td/trtrtd colspan=1 rowspan=1
class=confluenceTdpcodebufferSize/code/p/tdtd colspan=1
rowspan=1 class=confluenceTdp128kb/p/tdtd colspan
=1 rowspan=1 class=confluenceTdpWrite buffer sized in
bytes./p/td/trtrtd colspan=1 rowspan=1
class=confluenceTdpcodefileName/code/p/tdtd colspan=1
rowspan=1 class=confluenceTdpcodenull/code/p/tdtd colspan=1
rowspan=1 class=confluenceTdpUse a shape=rect
href=expression.htmlExpression/a such as a shape=rect
href=file-language.htmlFile Language/a to dynamically set the filename.
For consumers, it's used as a filename filter. For producers, it's used to
evaluate the filename to write. If an expression is set, it take precedence
over the codeCamelFileName/code header. (strongNote:/strong The header
itself can also be an a shape=rect href=expression.htmlExpression/a).
The expression options support both codeString/code and
codeExpression/code types. If the expression is a codeString/code type,
it is strongalways/strong evaluated using the a shape=rect
href=file-language.html
File Language/a. If the expression is an codeExpression/code type, the
specified codeExpression/code type is used - this allows you, for
instance, to use a shape=rect href=ognl.htmlOGNL/a expressions. For
the consumer, you can use it to filter filenames, so you can for instance
consume today's file using the a shape=rect href=file-language.htmlFile
Language/a syntax: codemydata-${date:now:MMdd}.txt/code. From
strongCamel 2.11/strong onwards the producers support the
codeCamelOverruleFileName/code header which takes precedence over any
existing codeCamelFileName/code header; the
codeCamelOverruleFileName/code is a header that is used only once, and
makes it easier as this avoids to temporary store codeCamelFileName/code
and have to restore it afterwards./p/td/trtrtd colspan=1
rowspan=1 class=confluenceTdpcodeflatten/code/p/tdtd
colspan=1 rowspan=1 class=confluenceTdpcodefalse/code/p/td
td colspan=1 rowspan=1 class=confluenceTdpFlatten is used to flatten
the file name path to strip any leading paths, so it's just the file name. This
allows you to consume recursively into sub-directories, but when you eg write
the files to another directory they will be written in a single directory.
Setting this to codetrue/code on the producer enforces that any file name
recived in codeCamelFileName/code header will be stripped for any leading
paths./p/td/trtrtd colspan=1 rowspan=1
class=confluenceTdpcodecharset/code/p/tdtd colspan=1
rowspan=1 class=confluenceTdpcodenull/code/p/tdtd colspan=1
rowspan=1 class=confluenceTdpstrongCamel 2.9.3:/strong this option
is used to specify the encoding of the file. You can use this on the consumer,
to specify the encodings of the files, which allow Camel to know the charset it
should load the file content in case the file content is being accessed.
Likewise when writing
a file, you can use this option to specify which charset to write the file as
well. See further below for a examples and more important
details./p/td/trtrtd colspan=1 rowspan=1
class=confluenceTdpcodecopyAndDeleteOnRenameFail/code/p/tdtd
colspan=1 rowspan=1 class=confluenceTdpcodetrue/code/p/tdtd
colspan=1 rowspan=1 class=confluenceTdpstrongCamel 2.9/strong:
whether to fallback and do a copy and delete file, in case the file could not
be renamed directly. This option is not available for the a shape=rect
href=ftp2.htmlFTP/a component./p/td/trtrtd colspan=1
rowspan=1 class=confluenceTdpcoderenameUsingCopy/code/p/tdtd
colspan=1 rowspan=1 class=confluenceTdpcodefalse/code/p/tdtd
colspan=1 rowspan=1 class=confluenceTdpstrongCamel 2.13.1/strong:
Perform rename operations using a copy and delete strategy. This is primarily
used in environments where the regular rena
me operation is unreliable (e.g. across different file systems or networks).
This option takes precedence over the codecopyAndDeleteOnRenameFail/code
parameter that will automatically fall back
svn commit: r950909 [1/3] - in /websites/production/camel/content: book-component-appendix.html book-in-one-page.html cache/main.pageCache file2.html raspberrypi.html
Author: buildbot
Date: Mon May 11 11:20:00 2015
New Revision: 950909
Log:
Production update by buildbot for camel
Modified:
websites/production/camel/content/book-component-appendix.html
websites/production/camel/content/book-in-one-page.html
websites/production/camel/content/cache/main.pageCache
websites/production/camel/content/file2.html
websites/production/camel/content/raspberrypi.html
Modified: websites/production/camel/content/book-component-appendix.html
==
--- websites/production/camel/content/book-component-appendix.html (original)
+++ websites/production/camel/content/book-component-appendix.html Mon May 11
11:20:00 2015
@@ -1334,11 +1334,11 @@ template.send(quot;direct:alias-verify
/div
/div
pThe strongcxf:/strong component provides integration with a
shape=rect href=http://cxf.apache.org;Apache CXF/a for connecting to
JAX-WS services hosted in CXF./ppstyle type=text/css/*![CDATA[*/
-div.rbtoc1431094680972 {padding: 0px;}
-div.rbtoc1431094680972 ul {list-style: disc;margin-left: 0px;}
-div.rbtoc1431094680972 li {margin-left: 0px;padding-left: 0px;}
+div.rbtoc1431343114117 {padding: 0px;}
+div.rbtoc1431343114117 ul {list-style: disc;margin-left: 0px;}
+div.rbtoc1431343114117 li {margin-left: 0px;padding-left: 0px;}
-/*]]*//style/pdiv class=toc-macro rbtoc1431094680972
+/*]]*//style/pdiv class=toc-macro rbtoc1431343114117
ul class=toc-indentationlia shape=rect href=#CXF-CXFComponentCXF
Component/a
ul class=toc-indentationlia shape=rect href=#CXF-URIformatURI
format/a/lilia shape=rect href=#CXF-OptionsOptions/a
ul class=toc-indentationlia shape=rect
href=#CXF-ThedescriptionsofthedataformatsThe descriptions of the
dataformats/a
@@ -2618,7 +2618,7 @@ To configure Esper via a configuration f
/div
h3 id=BookComponentAppendix-URIOptions.1URI Options/h3h4
id=BookComponentAppendix-CommonCommon/h4div
class=confluenceTableSmalldiv class=table-wraptable
class=confluenceTabletbodytrth colspan=1 rowspan=1
class=confluenceThpName/p/thth colspan=1 rowspan=1
class=confluenceThpDefault Value/p/thth colspan=1 rowspan=1
class=confluenceThpDescription/p/th/trtrtd colspan=1
rowspan=1 class=confluenceTdpcodeautoCreate/code/p/tdtd
colspan=1 rowspan=1 class=confluenceTdpcodetrue/code/p/tdtd
colspan=1 rowspan=1 class=confluenceTdpAutomatically create missing
directories in the file's pathname. For the file consumer, that means creating
the starting directory. For the file producer, it means the directory the files
should be written to./p/td/trtrtd colspan=1 rowspan=1
class=confluenceTdpcodebufferSize/code/p/tdtd colspan=1
rowspan=1 class=confluen
ceTdp128kb/p/tdtd colspan=1 rowspan=1
class=confluenceTdpWrite buffer sized in bytes./p/td/trtrtd
colspan=1 rowspan=1
class=confluenceTdpcodefileName/code/p/tdtd colspan=1
rowspan=1 class=confluenceTdpcodenull/code/p/tdtd colspan=1
rowspan=1 class=confluenceTdpUse a shape=rect
href=expression.htmlExpression/a such as a shape=rect
href=file-language.htmlFile Language/a to dynamically set the filename.
For consumers, it's used as a filename filter. For producers, it's used to
evaluate the filename to write. If an expression is set, it take precedence
over the codeCamelFileName/code header. (strongNote:/strong The header
itself can also be an a shape=rect href=expression.htmlExpression/a).
The expression options support both codeString/code and
codeExpression/code types. If the expression is a codeString/code type,
it is strongalways/strong evaluated using the a shap
e=rect href=file-language.htmlFile Language/a. If the expression is an
codeExpression/code type, the specified codeExpression/code type is
used - this allows you, for instance, to use a shape=rect
href=ognl.htmlOGNL/a expressions. For the consumer, you can use it to
filter filenames, so you can for instance consume today's file using the a
shape=rect href=file-language.htmlFile Language/a syntax:
codemydata-${date:now:MMdd}.txt/code. From strongCamel 2.11/strong
onwards the producers support the codeCamelOverruleFileName/code header
which takes precedence over any existing codeCamelFileName/code header; the
codeCamelOverruleFileName/code is a header that is used only once, and
makes it easier as this avoids to temporary store codeCamelFileName/code
and have to restore it afterwards./p/td/trtrtd colspan=1 rowspan=1
class=confluenceTdpcodeflatten/code/p/tdtd colspan=1
rowspan=1 class=confluenceT
dpcodefalse/code/p/tdtd colspan=1 rowspan=1
class=confluenceTdpFlatten is used to flatten the file name path to strip
any leading paths, so it's just the file name. This allows you to consume
recursively into sub-directories, but when you eg write the files to another
directory they will be written in a single directory. Setting this to
codetrue/code on the producer enforces that any file name recived in
codeCamelFileName/code header
camel git commit: Component docs
Repository: camel
Updated Branches:
refs/heads/master ef55316f2 - 02361967c
Component docs
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/02361967
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/02361967
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/02361967
Branch: refs/heads/master
Commit: 02361967cfaa0264c4afe9562f32f3a2624b1f44
Parents: ef55316
Author: Claus Ibsen davscl...@apache.org
Authored: Mon May 11 14:04:12 2015 +0200
Committer: Claus Ibsen davscl...@apache.org
Committed: Mon May 11 14:04:12 2015 +0200
--
.../component/linkedin/LinkedInComponent.java | 10 +++
.../linkedin/LinkedInConfiguration.java | 73 +++-
.../component/linkedin/LinkedInEndpoint.java| 8 ---
3 files changed, 81 insertions(+), 10 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/camel/blob/02361967/components/camel-linkedin/camel-linkedin-component/src/main/java/org/apache/camel/component/linkedin/LinkedInComponent.java
--
diff --git
a/components/camel-linkedin/camel-linkedin-component/src/main/java/org/apache/camel/component/linkedin/LinkedInComponent.java
b/components/camel-linkedin/camel-linkedin-component/src/main/java/org/apache/camel/component/linkedin/LinkedInComponent.java
index a4c65d2..aad21e9 100644
---
a/components/camel-linkedin/camel-linkedin-component/src/main/java/org/apache/camel/component/linkedin/LinkedInComponent.java
+++
b/components/camel-linkedin/camel-linkedin-component/src/main/java/org/apache/camel/component/linkedin/LinkedInComponent.java
@@ -55,9 +55,19 @@ public class LinkedInComponent extends
AbstractApiComponentLinkedInApiName, Lin
return LinkedInApiName.fromValue(apiNameStr);
}
+/**
+ * To use the shared configuration
+ */
+@Override
+public void setConfiguration(LinkedInConfiguration configuration) {
+super.setConfiguration(configuration);
+}
+
@Override
protected Endpoint createEndpoint(String uri, String methodName,
LinkedInApiName apiName,
LinkedInConfiguration
endpointConfiguration) {
+endpointConfiguration.setApiName(apiName);
+endpointConfiguration.setMethodName(methodName);
return new LinkedInEndpoint(uri, this, apiName, methodName,
endpointConfiguration);
}
http://git-wip-us.apache.org/repos/asf/camel/blob/02361967/components/camel-linkedin/camel-linkedin-component/src/main/java/org/apache/camel/component/linkedin/LinkedInConfiguration.java
--
diff --git
a/components/camel-linkedin/camel-linkedin-component/src/main/java/org/apache/camel/component/linkedin/LinkedInConfiguration.java
b/components/camel-linkedin/camel-linkedin-component/src/main/java/org/apache/camel/component/linkedin/LinkedInConfiguration.java
index 3a043bd..83560cb 100644
---
a/components/camel-linkedin/camel-linkedin-component/src/main/java/org/apache/camel/component/linkedin/LinkedInConfiguration.java
+++
b/components/camel-linkedin/camel-linkedin-component/src/main/java/org/apache/camel/component/linkedin/LinkedInConfiguration.java
@@ -21,8 +21,11 @@ import java.util.Map;
import org.apache.camel.component.linkedin.api.OAuthScope;
import org.apache.camel.component.linkedin.api.OAuthSecureStorage;
+import org.apache.camel.component.linkedin.internal.LinkedInApiName;
+import org.apache.camel.spi.Metadata;
import org.apache.camel.spi.UriParam;
import org.apache.camel.spi.UriParams;
+import org.apache.camel.spi.UriPath;
import org.apache.camel.util.ObjectHelper;
import org.apache.commons.lang3.builder.HashCodeBuilder;
@@ -32,9 +35,23 @@ import org.apache.commons.lang3.builder.HashCodeBuilder;
@UriParams
public class LinkedInConfiguration {
-@UriParam
+@UriPath
+@Metadata(required = true)
+private LinkedInApiName apiName;
+@UriPath(enums =
addActivity,addComment,addCompanyUpdateComment,addCompanyUpdateCommentAsCompany,addGroupMembership,addInvite
++
,addJob,addJobBookmark,addPost,addShare,addUpdateComment,editJob,flagCategory,followCompany,followPost,getComment
++
,getCompanies,getCompanyById,getCompanyByName,getCompanyUpdateComments,getCompanyUpdateLikes,getCompanyUpdates
++
,getConnections,getConnectionsById,getConnectionsByUrl,getFollowedCompanies,getGroup,getGroupMemberships,getGroupMembershipSettings
++
,getHistoricalFollowStatistics,getHistoricalStatusUpdateStatistics,getJob,getJobBookmarks,getNetworkStats,getNetworkUpdates
++
,getNetworkUpdatesById,getNumberOfFollowers,getPerson,getPersonById,getPersonByUrl,getPost,getPostComments,getPosts
++
camel git commit: Component docs
Repository: camel
Updated Branches:
refs/heads/master 02361967c - 21541cf65
Component docs
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/21541cf6
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/21541cf6
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/21541cf6
Branch: refs/heads/master
Commit: 21541cf65b7680710174cf6a0c39b077a0e727d0
Parents: 0236196
Author: Claus Ibsen davscl...@apache.org
Authored: Mon May 11 14:25:35 2015 +0200
Committer: Claus Ibsen davscl...@apache.org
Committed: Mon May 11 14:52:55 2015 +0200
--
.../component/facebook/FacebookComponent.java | 3 +
.../component/facebook/FacebookConsumer.java| 4 +-
.../component/facebook/FacebookEndpoint.java| 49 ++---
.../component/facebook/FacebookProducer.java| 4 +-
.../facebook/config/FacebookConfiguration.java | 117 ++--
.../config/FacebookEndpointConfiguration.java | 183 +++
6 files changed, 317 insertions(+), 43 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/camel/blob/21541cf6/components/camel-facebook/src/main/java/org/apache/camel/component/facebook/FacebookComponent.java
--
diff --git
a/components/camel-facebook/src/main/java/org/apache/camel/component/facebook/FacebookComponent.java
b/components/camel-facebook/src/main/java/org/apache/camel/component/facebook/FacebookComponent.java
index 729a410..69f7ab6 100644
---
a/components/camel-facebook/src/main/java/org/apache/camel/component/facebook/FacebookComponent.java
+++
b/components/camel-facebook/src/main/java/org/apache/camel/component/facebook/FacebookComponent.java
@@ -72,6 +72,9 @@ public class FacebookComponent extends UriEndpointComponent {
return configuration;
}
+/**
+ * To use the shared configuration
+ */
public void setConfiguration(FacebookConfiguration configuration) {
this.configuration = configuration;
}
http://git-wip-us.apache.org/repos/asf/camel/blob/21541cf6/components/camel-facebook/src/main/java/org/apache/camel/component/facebook/FacebookConsumer.java
--
diff --git
a/components/camel-facebook/src/main/java/org/apache/camel/component/facebook/FacebookConsumer.java
b/components/camel-facebook/src/main/java/org/apache/camel/component/facebook/FacebookConsumer.java
index bbe121b..c1e27c9 100644
---
a/components/camel-facebook/src/main/java/org/apache/camel/component/facebook/FacebookConsumer.java
+++
b/components/camel-facebook/src/main/java/org/apache/camel/component/facebook/FacebookConsumer.java
@@ -129,8 +129,8 @@ public class FacebookConsumer extends ScheduledPollConsumer
{
if (filteredMethods.isEmpty()) {
throw new IllegalArgumentException(
String.format(Missing properties for %s, need one or more
from %s,
-endpoint.getMethodName(),
-getMissingProperties(endpoint.getMethodName(),
endpoint.getNameStyle(), argNames)));
+endpoint.getMethod(),
+getMissingProperties(endpoint.getMethod(),
endpoint.getNameStyle(), argNames)));
} else if (filteredMethods.size() == 1) {
// single match
result = filteredMethods.get(0);
http://git-wip-us.apache.org/repos/asf/camel/blob/21541cf6/components/camel-facebook/src/main/java/org/apache/camel/component/facebook/FacebookEndpoint.java
--
diff --git
a/components/camel-facebook/src/main/java/org/apache/camel/component/facebook/FacebookEndpoint.java
b/components/camel-facebook/src/main/java/org/apache/camel/component/facebook/FacebookEndpoint.java
index 01c4b72..740ce85 100644
---
a/components/camel-facebook/src/main/java/org/apache/camel/component/facebook/FacebookEndpoint.java
+++
b/components/camel-facebook/src/main/java/org/apache/camel/component/facebook/FacebookEndpoint.java
@@ -24,6 +24,7 @@ import java.util.Map;
import java.util.Set;
import org.apache.camel.Consumer;
+import org.apache.camel.NoTypeConversionAvailableException;
import org.apache.camel.Processor;
import org.apache.camel.Producer;
import
org.apache.camel.component.facebook.config.FacebookEndpointConfiguration;
@@ -54,15 +55,14 @@ public class FacebookEndpoint extends DefaultEndpoint
implements FacebookConstan
private static final Logger LOG =
LoggerFactory.getLogger(FacebookEndpoint.class);
-// Facebook4J method name
-@UriPath @Metadata(required = true)
-private final String methodName;
private FacebookNameStyle nameStyle;
+private String method;
+// Facebook4J method name
+@UriPath(description = What operation
[2/3] camel git commit: CAMEL-8760: Upgrade netty 3
CAMEL-8760: Upgrade netty 3 Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/a9201e41 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/a9201e41 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/a9201e41 Branch: refs/heads/camel-2.15.x Commit: a9201e41efe9dc4c1782106d20ed55bec23cfa3a Parents: 3200147 Author: Claus Ibsen davscl...@apache.org Authored: Mon May 11 17:43:58 2015 +0200 Committer: Claus Ibsen davscl...@apache.org Committed: Mon May 11 17:43:58 2015 +0200 -- parent/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/camel/blob/a9201e41/parent/pom.xml -- diff --git a/parent/pom.xml b/parent/pom.xml index 4b77a1f..6d7ea07 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -354,7 +354,7 @@ mvel-version2.2.1.Final/mvel-version mybatis-version3.2.8/mybatis-version neethi-bundle-version3.0.1/neethi-bundle-version -netty3-version3.9.6.Final/netty3-version +netty3-version3.9.8.Final/netty3-version netty-version4.0.28.Final/netty-version noggit-bundle-version0.5_1/noggit-bundle-version !-- should be in-sync with deltaspike --
[1/3] camel git commit: CAMEL-8760: Upgrade netty 3
Repository: camel Updated Branches: refs/heads/camel-2.14.x 6ecbdbca5 - 1e9f2f850 refs/heads/camel-2.15.x 320014713 - a9201e41e refs/heads/master ae91e61ec - a38f5af92 CAMEL-8760: Upgrade netty 3 Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/a38f5af9 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/a38f5af9 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/a38f5af9 Branch: refs/heads/master Commit: a38f5af92b1e8c09eedf7f785a33a28373bd36cc Parents: ae91e61 Author: Claus Ibsen davscl...@apache.org Authored: Mon May 11 17:43:21 2015 +0200 Committer: Claus Ibsen davscl...@apache.org Committed: Mon May 11 17:43:21 2015 +0200 -- parent/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/camel/blob/a38f5af9/parent/pom.xml -- diff --git a/parent/pom.xml b/parent/pom.xml index 067c95b..7dc6a2e 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -357,7 +357,7 @@ mvel-version2.2.4.Final/mvel-version mybatis-version3.2.8/mybatis-version neethi-bundle-version3.0.1/neethi-bundle-version -netty3-version3.10.1.Final/netty3-version +netty3-version3.10.3.Final/netty3-version netty-version4.0.28.Final/netty-version noggit-bundle-version0.5_1/noggit-bundle-version !-- should be in-sync with deltaspike --
[3/3] camel git commit: Upgrade Netty
Upgrade Netty Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/1e9f2f85 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/1e9f2f85 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/1e9f2f85 Branch: refs/heads/camel-2.14.x Commit: 1e9f2f85028a36ca32fd204c42f4d0ca898d031a Parents: 6ecbdbc Author: Claus Ibsen davscl...@apache.org Authored: Mon May 11 17:44:59 2015 +0200 Committer: Claus Ibsen davscl...@apache.org Committed: Mon May 11 17:44:59 2015 +0200 -- parent/pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -- http://git-wip-us.apache.org/repos/asf/camel/blob/1e9f2f85/parent/pom.xml -- diff --git a/parent/pom.xml b/parent/pom.xml index 2d7cbba..f14ef36 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -328,8 +328,8 @@ mvel-version2.2.1.Final/mvel-version mybatis-version3.2.7/mybatis-version neethi-bundle-version3.0.1/neethi-bundle-version -netty3-version3.9.4.Final/netty3-version -netty-version4.0.24.Final/netty-version +netty3-version3.9.8.Final/netty3-version +netty-version4.0.28.Final/netty-version noggit-bundle-version0.5_1/noggit-bundle-version !-- should be in-sync with deltaspike -- openwebbeans-version1.2.0/openwebbeans-version
camel git commit: CAMEL-8695 Update apns library to 1.0.0.Beta6
Repository: camel
Updated Branches:
refs/heads/master a38f5af92 - 8b5b1abf4
CAMEL-8695 Update apns library to 1.0.0.Beta6
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/8b5b1abf
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/8b5b1abf
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/8b5b1abf
Branch: refs/heads/master
Commit: 8b5b1abf43b24ea8b1afc5f0a92b28a652360704
Parents: a38f5af
Author: Andrea Cosentino anco...@gmail.com
Authored: Mon May 11 21:44:57 2015 +0200
Committer: Andrea Cosentino anco...@gmail.com
Committed: Mon May 11 21:44:57 2015 +0200
--
.../apns/ApnsConsumerIdleMessageTest.java | 3 +-
.../camel/component/apns/ApnsConsumerTest.java | 5 ++--
.../camel/component/apns/ApnsProducerTest.java | 12
.../ApnsProducerWithoutTokensHeaderTest.java| 7 +++--
.../apns/factory/ApnsServiceFactoryTest.java| 10 +++
.../apns/spring/SpringApnsConsumerTest.java | 5 ++--
.../camel/component/apns/util/ApnsUtils.java| 12
.../component/apns/util/TestConstants.java | 31
parent/pom.xml | 4 +--
9 files changed, 62 insertions(+), 27 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/camel/blob/8b5b1abf/components/camel-apns/src/test/java/org/apache/camel/component/apns/ApnsConsumerIdleMessageTest.java
--
diff --git
a/components/camel-apns/src/test/java/org/apache/camel/component/apns/ApnsConsumerIdleMessageTest.java
b/components/camel-apns/src/test/java/org/apache/camel/component/apns/ApnsConsumerIdleMessageTest.java
index 55b3cc9..eaeaaad 100644
---
a/components/camel-apns/src/test/java/org/apache/camel/component/apns/ApnsConsumerIdleMessageTest.java
+++
b/components/camel-apns/src/test/java/org/apache/camel/component/apns/ApnsConsumerIdleMessageTest.java
@@ -24,6 +24,7 @@ import org.apache.camel.CamelContext;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.apns.factory.ApnsServiceFactory;
import org.apache.camel.component.apns.util.ApnsUtils;
+import org.apache.camel.component.apns.util.TestConstants;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.test.junit4.CamelTestSupport;
import org.junit.After;
@@ -42,7 +43,7 @@ public class ApnsConsumerIdleMessageTest extends
CamelTestSupport {
@Before
public void startup() throws InterruptedException {
-server =
ApnsUtils.prepareAndStartServer(FixedCertificates.TEST_GATEWAY_PORT,
FixedCertificates.TEST_FEEDBACK_PORT);
+server =
ApnsUtils.prepareAndStartServer(TestConstants.TEST_GATEWAY_PORT,
TestConstants.TEST_FEEDBACK_PORT);
}
@After
http://git-wip-us.apache.org/repos/asf/camel/blob/8b5b1abf/components/camel-apns/src/test/java/org/apache/camel/component/apns/ApnsConsumerTest.java
--
diff --git
a/components/camel-apns/src/test/java/org/apache/camel/component/apns/ApnsConsumerTest.java
b/components/camel-apns/src/test/java/org/apache/camel/component/apns/ApnsConsumerTest.java
index 0aa36ff..e07b2af 100644
---
a/components/camel-apns/src/test/java/org/apache/camel/component/apns/ApnsConsumerTest.java
+++
b/components/camel-apns/src/test/java/org/apache/camel/component/apns/ApnsConsumerTest.java
@@ -25,6 +25,7 @@ import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.apns.factory.ApnsServiceFactory;
import org.apache.camel.component.apns.model.InactiveDevice;
import org.apache.camel.component.apns.util.ApnsUtils;
+import org.apache.camel.component.apns.util.TestConstants;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.test.junit4.CamelTestSupport;
import org.junit.After;
@@ -41,7 +42,7 @@ public class ApnsConsumerTest extends CamelTestSupport {
@Before
public void startup() throws InterruptedException {
-server =
ApnsUtils.prepareAndStartServer(FixedCertificates.TEST_GATEWAY_PORT,
FixedCertificates.TEST_FEEDBACK_PORT);
+server =
ApnsUtils.prepareAndStartServer(TestConstants.TEST_GATEWAY_PORT,
TestConstants.TEST_FEEDBACK_PORT);
}
@After
@@ -60,7 +61,7 @@ public class ApnsConsumerTest extends CamelTestSupport {
mock.message(0).body().isInstanceOf(InactiveDevice.class);
byte[] feedBackBytes =
ApnsUtils.generateFeedbackBytes(deviceTokenBytes);
-server.toSend.write(feedBackBytes);
+server.getToSend().write(feedBackBytes);
Thread.sleep(1000);
http://git-wip-us.apache.org/repos/asf/camel/blob/8b5b1abf/components/camel-apns/src/test/java/org/apache/camel/component/apns/ApnsProducerTest.java
