[1/3] git commit: CAMEL-7696: camel-metrics - Add a route policy to expose route stats as codehale metrics. Work in progress.
Repository: camel
Updated Branches:
refs/heads/master b2c3b31bb - c672d44b4
CAMEL-7696: camel-metrics - Add a route policy to expose route stats as
codehale metrics. Work in progress.
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/c672d44b
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/c672d44b
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/c672d44b
Branch: refs/heads/master
Commit: c672d44b4f46a9a128216759059b134fc6f793ab
Parents: fa7e225
Author: Claus Ibsen davscl...@apache.org
Authored: Thu Aug 14 08:55:11 2014 +0200
Committer: Claus Ibsen davscl...@apache.org
Committed: Thu Aug 14 08:55:22 2014 +0200
--
.../routepolicy/MetricsRegistryService.java | 64 ++
.../metrics/routepolicy/MetricsRoutePolicy.java | 124 +++
.../routepolicy/MetricsRoutePolicyTest.java | 65 ++
3 files changed, 253 insertions(+)
--
http://git-wip-us.apache.org/repos/asf/camel/blob/c672d44b/components/camel-metrics/src/main/java/org/apache/camel/component/metrics/routepolicy/MetricsRegistryService.java
--
diff --git
a/components/camel-metrics/src/main/java/org/apache/camel/component/metrics/routepolicy/MetricsRegistryService.java
b/components/camel-metrics/src/main/java/org/apache/camel/component/metrics/routepolicy/MetricsRegistryService.java
new file mode 100644
index 000..efa3663
--- /dev/null
+++
b/components/camel-metrics/src/main/java/org/apache/camel/component/metrics/routepolicy/MetricsRegistryService.java
@@ -0,0 +1,64 @@
+/**
+ * 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.metrics.routepolicy;
+
+import javax.management.MBeanServer;
+
+import com.codahale.metrics.JmxReporter;
+import com.codahale.metrics.MetricRegistry;
+import org.apache.camel.CamelContext;
+import org.apache.camel.CamelContextAware;
+import org.apache.camel.support.ServiceSupport;
+
+public final class MetricsRegistryService extends ServiceSupport implements
CamelContextAware {
+
+private CamelContext camelContext;
+private MetricRegistry registry;
+private JmxReporter reporter;
+
+public MetricRegistry getRegistry() {
+return registry;
+}
+
+public CamelContext getCamelContext() {
+return camelContext;
+}
+
+public void setCamelContext(CamelContext camelContext) {
+this.camelContext = camelContext;
+}
+
+@Override
+protected void doStart() throws Exception {
+registry = new MetricRegistry();
+
+MBeanServer server =
getCamelContext().getManagementStrategy().getManagementAgent().getMBeanServer();
+if (server != null) {
+String domain = org.apache.camel.metrics. +
getCamelContext().getManagementName();
+reporter =
JmxReporter.forRegistry(registry).registerWith(server).inDomain(domain).build();
+reporter.start();
+}
+}
+
+@Override
+protected void doStop() throws Exception {
+if (reporter != null) {
+reporter.stop();
+reporter = null;
+}
+}
+}
http://git-wip-us.apache.org/repos/asf/camel/blob/c672d44b/components/camel-metrics/src/main/java/org/apache/camel/component/metrics/routepolicy/MetricsRoutePolicy.java
--
diff --git
a/components/camel-metrics/src/main/java/org/apache/camel/component/metrics/routepolicy/MetricsRoutePolicy.java
b/components/camel-metrics/src/main/java/org/apache/camel/component/metrics/routepolicy/MetricsRoutePolicy.java
new file mode 100644
index 000..f194ccb
--- /dev/null
+++
b/components/camel-metrics/src/main/java/org/apache/camel/component/metrics/routepolicy/MetricsRoutePolicy.java
@@ -0,0 +1,124 @@
+/**
+ * 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
[3/3] git commit: Polished
Polished
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/76c39dcb
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/76c39dcb
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/76c39dcb
Branch: refs/heads/master
Commit: 76c39dcbe1226be9ed995f7a807702cb965e1208
Parents: b2c3b31
Author: Claus Ibsen davscl...@apache.org
Authored: Wed Aug 13 16:16:34 2014 +0200
Committer: Claus Ibsen davscl...@apache.org
Committed: Thu Aug 14 08:55:22 2014 +0200
--
.../apache/camel/processor/binding/RestBindingProcessor.java| 5 -
1 file changed, 5 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/camel/blob/76c39dcb/camel-core/src/main/java/org/apache/camel/processor/binding/RestBindingProcessor.java
--
diff --git
a/camel-core/src/main/java/org/apache/camel/processor/binding/RestBindingProcessor.java
b/camel-core/src/main/java/org/apache/camel/processor/binding/RestBindingProcessor.java
index ec1af34..429c005 100644
---
a/camel-core/src/main/java/org/apache/camel/processor/binding/RestBindingProcessor.java
+++
b/camel-core/src/main/java/org/apache/camel/processor/binding/RestBindingProcessor.java
@@ -41,11 +41,6 @@ import org.apache.camel.util.ObjectHelper;
*/
public class RestBindingProcessor extends ServiceSupport implements
AsyncProcessor {
-// TODO: consumes/produces can be a list of media types, and prioritized
1st to last. (eg the q=weight option)
-// TODO: use content-type from produces/consumes if possible to set as
Content-Type if missing
-
-//
text/html,application/xhtml+xml,application/xml;q=0.9,image/webp,*/*;q=0.8
-
private final AsyncProcessor jsonUnmarshal;
private final AsyncProcessor xmlUnmarshal;
private final AsyncProcessor jsonMarshal;
[2/3] git commit: CAMEL-7695: CamelContext - Allow to check if a service by its type has been added
CAMEL-7695: CamelContext - Allow to check if a service by its type has been
added
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/fa7e2254
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/fa7e2254
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/fa7e2254
Branch: refs/heads/master
Commit: fa7e2254f065f3e3e7bf28d73ca218c914676487
Parents: 76c39dc
Author: Claus Ibsen davscl...@apache.org
Authored: Thu Aug 14 08:52:51 2014 +0200
Committer: Claus Ibsen davscl...@apache.org
Committed: Thu Aug 14 08:55:22 2014 +0200
--
.../src/main/java/org/apache/camel/CamelContext.java | 8
.../org/apache/camel/impl/DefaultCamelContext.java | 13 -
.../org/apache/camel/impl/DefaultCamelContextTest.java | 13 +
3 files changed, 33 insertions(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/camel/blob/fa7e2254/camel-core/src/main/java/org/apache/camel/CamelContext.java
--
diff --git a/camel-core/src/main/java/org/apache/camel/CamelContext.java
b/camel-core/src/main/java/org/apache/camel/CamelContext.java
index 5b175a3..8a3c31b 100644
--- a/camel-core/src/main/java/org/apache/camel/CamelContext.java
+++ b/camel-core/src/main/java/org/apache/camel/CamelContext.java
@@ -230,6 +230,14 @@ public interface CamelContext extends SuspendableService,
RuntimeConfiguration {
boolean hasService(Object object);
/**
+ * Has the given service type already been added to this context?
+ *
+ * @param type the class type
+ * @return the service instance or ttnull/tt if not already added.
+ */
+public T T hasService(ClassT type);
+
+/**
* Adds the given listener to be invoked when {@link CamelContext} have
just been started.
* p/
* This allows listeners to do any custom work after the routes and other
services have been started and are running.
http://git-wip-us.apache.org/repos/asf/camel/blob/fa7e2254/camel-core/src/main/java/org/apache/camel/impl/DefaultCamelContext.java
--
diff --git
a/camel-core/src/main/java/org/apache/camel/impl/DefaultCamelContext.java
b/camel-core/src/main/java/org/apache/camel/impl/DefaultCamelContext.java
index dab1eaa..72defeb 100644
--- a/camel-core/src/main/java/org/apache/camel/impl/DefaultCamelContext.java
+++ b/camel-core/src/main/java/org/apache/camel/impl/DefaultCamelContext.java
@@ -66,6 +66,7 @@ import org.apache.camel.ShutdownRunningTask;
import org.apache.camel.StartupListener;
import org.apache.camel.StatefulService;
import org.apache.camel.SuspendableService;
+import org.apache.camel.TypeConversionException;
import org.apache.camel.TypeConverter;
import org.apache.camel.VetoCamelContextStartException;
import org.apache.camel.builder.ErrorHandlerBuilder;
@@ -161,7 +162,7 @@ public class DefaultCamelContext extends ServiceSupport
implements ModelCamelCon
private final ListEndpointStrategy endpointStrategies = new
ArrayListEndpointStrategy();
private final MapString, Component components = new HashMapString,
Component();
private final SetRoute routes = new LinkedHashSetRoute();
-private final ListService servicesToClose = new ArrayListService();
+private final ListService servicesToClose = new
CopyOnWriteArrayListService();
private final SetStartupListener startupListeners = new
LinkedHashSetStartupListener();
private TypeConverter typeConverter;
private TypeConverterRegistry typeConverterRegistry;
@@ -1031,6 +1032,16 @@ public class DefaultCamelContext extends ServiceSupport
implements ModelCamelCon
return false;
}
+@Override
+public T T hasService(ClassT type) {
+for (Service service : servicesToClose) {
+if (type.isInstance(service)) {
+return type.cast(service);
+}
+}
+return null;
+}
+
public void addStartupListener(StartupListener listener) throws Exception {
// either add to listener so we can invoke then later when
CamelContext has been started
// or invoke the callback right now
http://git-wip-us.apache.org/repos/asf/camel/blob/fa7e2254/camel-core/src/test/java/org/apache/camel/impl/DefaultCamelContextTest.java
--
diff --git
a/camel-core/src/test/java/org/apache/camel/impl/DefaultCamelContextTest.java
b/camel-core/src/test/java/org/apache/camel/impl/DefaultCamelContextTest.java
index b7f51ae..3403ae4 100644
---
a/camel-core/src/test/java/org/apache/camel/impl/DefaultCamelContextTest.java
+++
b/camel-core/src/test/java/org/apache/camel/impl/DefaultCamelContextTest.java
@@ -335,6 +335,19 @@ public
git commit: CAMEL-7696: camel-metrics - Add a route policy to expose route stats as codehale metrics. Work in progress.
Repository: camel
Updated Branches:
refs/heads/master c672d44b4 - 92b4365a1
CAMEL-7696: camel-metrics - Add a route policy to expose route stats as
codehale metrics. Work in progress.
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/92b4365a
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/92b4365a
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/92b4365a
Branch: refs/heads/master
Commit: 92b4365a11836ea24cd4699739e003accc607d3a
Parents: c672d44
Author: Claus Ibsen davscl...@apache.org
Authored: Thu Aug 14 08:56:55 2014 +0200
Committer: Claus Ibsen davscl...@apache.org
Committed: Thu Aug 14 08:56:55 2014 +0200
--
.../camel/component/metrics/routepolicy/MetricsRoutePolicy.java| 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/camel/blob/92b4365a/components/camel-metrics/src/main/java/org/apache/camel/component/metrics/routepolicy/MetricsRoutePolicy.java
--
diff --git
a/components/camel-metrics/src/main/java/org/apache/camel/component/metrics/routepolicy/MetricsRoutePolicy.java
b/components/camel-metrics/src/main/java/org/apache/camel/component/metrics/routepolicy/MetricsRoutePolicy.java
index f194ccb..4d7334a 100644
---
a/components/camel-metrics/src/main/java/org/apache/camel/component/metrics/routepolicy/MetricsRoutePolicy.java
+++
b/components/camel-metrics/src/main/java/org/apache/camel/component/metrics/routepolicy/MetricsRoutePolicy.java
@@ -81,7 +81,7 @@ public class MetricsRoutePolicy extends RoutePolicySupport {
this.route = route;
try {
-registry =
route.getRouteContext().getCamelContext().hasServiceByType(MetricsRegistryService.class);
+registry =
route.getRouteContext().getCamelContext().hasService(MetricsRegistryService.class);
if (registry == null) {
registry = new MetricsRegistryService();
route.getRouteContext().getCamelContext().addService(registry);
[2/2] git commit: Fixed the CS error in camel-core
Fixed the CS error in camel-core
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/8a2e278a
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/8a2e278a
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/8a2e278a
Branch: refs/heads/master
Commit: 8a2e278a044b2441803c0c5ab849528c12f81ec8
Parents: 7299670
Author: Willem Jiang willem.ji...@gmail.com
Authored: Thu Aug 14 17:36:47 2014 +0800
Committer: Willem Jiang willem.ji...@gmail.com
Committed: Thu Aug 14 17:36:47 2014 +0800
--
camel-core/src/main/java/org/apache/camel/CamelContext.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/camel/blob/8a2e278a/camel-core/src/main/java/org/apache/camel/CamelContext.java
--
diff --git a/camel-core/src/main/java/org/apache/camel/CamelContext.java
b/camel-core/src/main/java/org/apache/camel/CamelContext.java
index 8a3c31b..022ae36 100644
--- a/camel-core/src/main/java/org/apache/camel/CamelContext.java
+++ b/camel-core/src/main/java/org/apache/camel/CamelContext.java
@@ -235,7 +235,7 @@ public interface CamelContext extends SuspendableService,
RuntimeConfiguration {
* @param type the class type
* @return the service instance or ttnull/tt if not already added.
*/
-public T T hasService(ClassT type);
+T T hasService(ClassT type);
/**
* Adds the given listener to be invoked when {@link CamelContext} have
just been started.
[1/2] git commit: CAMEL-7662 Enable the MQTTProducerTest
Repository: camel Updated Branches: refs/heads/master 92b4365a1 - 8a2e278a0 CAMEL-7662 Enable the MQTTProducerTest Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/7299670e Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/7299670e Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/7299670e Branch: refs/heads/master Commit: 7299670e4ad409107f58010a3d790f82c7916df2 Parents: 92b4365 Author: Willem Jiang willem.ji...@gmail.com Authored: Thu Aug 14 16:54:06 2014 +0800 Committer: Willem Jiang willem.ji...@gmail.com Committed: Thu Aug 14 16:55:44 2014 +0800 -- components/camel-mqtt/pom.xml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) -- http://git-wip-us.apache.org/repos/asf/camel/blob/7299670e/components/camel-mqtt/pom.xml -- diff --git a/components/camel-mqtt/pom.xml b/components/camel-mqtt/pom.xml index 106c45f..33d4f86 100644 --- a/components/camel-mqtt/pom.xml +++ b/components/camel-mqtt/pom.xml @@ -80,9 +80,8 @@ artifactIdmaven-surefire-plugin/artifactId configuration forkModeperTest/forkMode -excludes -exclude**/MQTTProducerTest.*/exclude -/excludes +!--CAMEL-7662 disabling the assertion this time-- +enableAssertionsfalse/enableAssertions /configuration /plugin plugin
git commit: CAMEL-7693 Added an unit test for it
Repository: camel
Updated Branches:
refs/heads/master 8a2e278a0 - a6fce3d99
CAMEL-7693 Added an unit test for it
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/a6fce3d9
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/a6fce3d9
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/a6fce3d9
Branch: refs/heads/master
Commit: a6fce3d9977cfcc46aac3f66657502c3c5d85e73
Parents: 8a2e278
Author: Willem Jiang willem.ji...@gmail.com
Authored: Thu Aug 14 18:20:44 2014 +0800
Committer: Willem Jiang willem.ji...@gmail.com
Committed: Thu Aug 14 18:20:44 2014 +0800
--
.../properties/PropertiesComponentNestPropertiesTest.java | 5 +
1 file changed, 5 insertions(+)
--
http://git-wip-us.apache.org/repos/asf/camel/blob/a6fce3d9/camel-core/src/test/java/org/apache/camel/component/properties/PropertiesComponentNestPropertiesTest.java
--
diff --git
a/camel-core/src/test/java/org/apache/camel/component/properties/PropertiesComponentNestPropertiesTest.java
b/camel-core/src/test/java/org/apache/camel/component/properties/PropertiesComponentNestPropertiesTest.java
index 0e334c6..aec9283 100644
---
a/camel-core/src/test/java/org/apache/camel/component/properties/PropertiesComponentNestPropertiesTest.java
+++
b/camel-core/src/test/java/org/apache/camel/component/properties/PropertiesComponentNestPropertiesTest.java
@@ -47,13 +47,18 @@ public class PropertiesComponentNestPropertiesTest extends
ContextTestSupport {
public void configure() throws Exception {
from(direct:start).setBody(simple(${properties:someproperty}${body}))
.to(mock:result);
+
+
from(direct:start2).setBody(simple({json:{value:${properties:someproperty}}}))
+.to(mock:result2);
}
});
context.start();
getMockEndpoint(mock:result).expectedBodiesReceived(junitTest);
+
getMockEndpoint(mock:result2).expectedBodiesReceived({json:{value:junit}});
template.sendBody(direct:start, Test);
+template.sendBody(direct:start2, Test);
assertMockEndpointsSatisfied();
}
[1/3] git commit: Minor update to start making things easier for Jetty9
Repository: camel
Updated Branches:
refs/heads/master a6fce3d99 - d5253916c
Minor update to start making things easier for Jetty9
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/22f62928
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/22f62928
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/22f62928
Branch: refs/heads/master
Commit: 22f629287623f6d78625ef264281a2f4f21eb18f
Parents: 4c69278
Author: Daniel Kulp dk...@apache.org
Authored: Thu Aug 14 09:09:08 2014 -0400
Committer: Daniel Kulp dk...@apache.org
Committed: Thu Aug 14 09:09:24 2014 -0400
--
.../camel/component/jetty/JettyHttpComponent.java | 12 ++--
1 file changed, 6 insertions(+), 6 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/camel/blob/22f62928/components/camel-jetty/src/main/java/org/apache/camel/component/jetty/JettyHttpComponent.java
--
diff --git
a/components/camel-jetty/src/main/java/org/apache/camel/component/jetty/JettyHttpComponent.java
b/components/camel-jetty/src/main/java/org/apache/camel/component/jetty/JettyHttpComponent.java
index 4f0e5b8..0c51eb6d 100644
---
a/components/camel-jetty/src/main/java/org/apache/camel/component/jetty/JettyHttpComponent.java
+++
b/components/camel-jetty/src/main/java/org/apache/camel/component/jetty/JettyHttpComponent.java
@@ -486,8 +486,8 @@ public class JettyHttpComponent extends HttpComponent
implements RestConsumerFac
return sslKeystore;
}
-protected SslSelectChannelConnector
getSslSocketConnector(JettyHttpEndpoint endpoint) throws Exception {
-SslSelectChannelConnector answer = null;
+protected Connector getSslSocketConnector(JettyHttpEndpoint endpoint)
throws Exception {
+Connector answer = null;
if (sslSocketConnectors != null) {
answer = sslSocketConnectors.get(endpoint.getPort());
}
@@ -497,7 +497,7 @@ public class JettyHttpComponent extends HttpComponent
implements RestConsumerFac
return answer;
}
-protected SslSelectChannelConnector
createSslSocketConnector(JettyHttpEndpoint endpoint) throws Exception {
+protected Connector createSslSocketConnector(JettyHttpEndpoint endpoint)
throws Exception {
SslSelectChannelConnector answer = null;
// Note that this was set on the endpoint when it was constructed. It
was
@@ -642,8 +642,8 @@ public class JettyHttpComponent extends HttpComponent
implements RestConsumerFac
sslSocketConnectors = connectors;
}
-public SelectChannelConnector getSocketConnector(int port) throws
Exception {
-SelectChannelConnector answer = null;
+public Connector getSocketConnector(int port) throws Exception {
+Connector answer = null;
if (socketConnectors != null) {
answer = socketConnectors.get(port);
}
@@ -653,7 +653,7 @@ public class JettyHttpComponent extends HttpComponent
implements RestConsumerFac
return answer;
}
-protected SelectChannelConnector createSocketConnector() throws Exception {
+protected Connector createSocketConnector() throws Exception {
SelectChannelConnector answer = new SelectChannelConnector();
if (getSocketConnectorProperties() != null) {
// must copy the map otherwise it will be deleted
[3/3] git commit: Fix a BUNCH of eclipse warnings. Still a ton to go.
Fix a BUNCH of eclipse warnings. Still a ton to go.
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/d5253916
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/d5253916
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/d5253916
Branch: refs/heads/master
Commit: d5253916c76736fa97cd43c7d7140e9d6482ef8c
Parents: 22f6292
Author: Daniel Kulp dk...@apache.org
Authored: Thu Aug 14 11:28:03 2014 -0400
Committer: Daniel Kulp dk...@apache.org
Committed: Thu Aug 14 11:28:03 2014 -0400
--
.../java/org/apache/camel/builder/AdviceWithTasks.java | 13 ++---
.../org/apache/camel/component/log/LogComponent.java | 3 ---
.../org/apache/camel/component/seda/SedaEndpoint.java | 4 +++-
.../org/apache/camel/impl/DefaultCamelContext.java | 1 -
.../java/org/apache/camel/impl/DefaultProducer.java| 1 +
.../org/apache/camel/impl/DefaultRestRegistry.java | 1 +
.../org/apache/camel/impl/InterceptSendToEndpoint.java | 2 ++
.../apache/camel/impl/SynchronousDelegateProducer.java | 1 +
.../apache/camel/impl/UriEndpointConfiguration.java| 12 ++--
.../impl/converter/BaseTypeConverterRegistry.java | 6 +++---
.../management/DefaultManagementMBeanAssembler.java| 2 +-
.../apache/camel/management/MBeanInfoAssembler.java| 5 +++--
.../management/mbean/ManagedTypeConverterRegistry.java | 4 ++--
.../apache/camel/model/rest/RestBindingDefinition.java | 2 +-
.../org/apache/camel/model/rest/VerbDefinition.java| 6 +++---
.../main/java/org/apache/camel/processor/Splitter.java | 3 ---
.../processor/ThrottlerRejectedExecutionException.java | 2 ++
.../org/apache/camel/processor/UnitOfWorkProducer.java | 1 +
.../aggregate/AggregationStrategyBeanAdapter.java | 2 +-
.../aggregate/AggregationStrategyBeanInfo.java | 8 +---
.../aggregate/AggregationStrategyMethodInfo.java | 11 +++
.../camel/processor/binding/BindingException.java | 2 ++
.../camel/processor/interceptor/BacklogDebugger.java | 12
.../camel/processor/interceptor/DefaultChannel.java| 1 +
.../org/apache/camel/spi/TypeConverterRegistry.java| 2 +-
.../org/apache/camel/support/DefaultTimeoutMap.java| 2 +-
.../src/main/java/org/apache/camel/util/HostUtils.java | 4 ++--
.../camel/util/component/AbstractApiComponent.java | 2 +-
.../camel/util/component/AbstractApiProducer.java | 7 ++-
.../org/apache/camel/util/component/ApiCollection.java | 1 -
.../apache/camel/util/component/ApiConsumerHelper.java | 2 +-
.../org/apache/camel/util/component/ApiMethod.java | 1 +
.../apache/camel/util/component/ApiMethodHelper.java | 8
.../apache/camel/util/component/ApiMethodParser.java | 4 ++--
.../org/apache/camel/view/GraphGeneratorSupport.java | 1 -
.../org/apache/camel/component/box/BoxProducer.java| 1 -
.../camel/core/osgi/OsgiCamelContextPublisher.java | 11 ++-
.../apache/camel/core/osgi/OsgiEventAdminNotifier.java | 6 +++---
.../org/apache/camel/core/osgi/OsgiNamingHelper.java | 4 ++--
.../org/apache/camel/core/osgi/OsgiTypeConverter.java | 2 +-
.../apache/camel/core/osgi/CamelMockBundleContext.java | 3 ++-
.../core/osgi/test/MockTypeConverterRegistry.java | 2 +-
.../metrics/routepolicy/MetricsRoutePolicy.java| 2 +-
43 files changed, 87 insertions(+), 83 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/camel/blob/d5253916/camel-core/src/main/java/org/apache/camel/builder/AdviceWithTasks.java
--
diff --git
a/camel-core/src/main/java/org/apache/camel/builder/AdviceWithTasks.java
b/camel-core/src/main/java/org/apache/camel/builder/AdviceWithTasks.java
index 694841c..311f9b2 100644
--- a/camel-core/src/main/java/org/apache/camel/builder/AdviceWithTasks.java
+++ b/camel-core/src/main/java/org/apache/camel/builder/AdviceWithTasks.java
@@ -143,7 +143,7 @@ public final class AdviceWithTasks {
while (it.hasNext()) {
ProcessorDefinition? output = it.next();
if (matchBy.match(output)) {
-ListProcessorDefinition outputs =
getParentOutputs(output.getParent());
+ListProcessorDefinition? outputs =
getParentOutputs(output.getParent());
if (outputs != null) {
int index = outputs.indexOf(output);
if (index != -1) {
@@ -192,7 +192,7 @@ public final class AdviceWithTasks {
while (it.hasNext()) {
ProcessorDefinition? output = it.next();
if (matchBy.match(output)) {
-ListProcessorDefinition outputs =
[2/3] git commit: Force the current websocket stuff to use Jetty8 for now.
Force the current websocket stuff to use Jetty8 for now.
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/4c692780
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/4c692780
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/4c692780
Branch: refs/heads/master
Commit: 4c6927800df3a8dcdf8bb4ba07ec72d73d04d208
Parents: a6fce3d
Author: Daniel Kulp dk...@apache.org
Authored: Wed Aug 13 13:02:07 2014 -0400
Committer: Daniel Kulp dk...@apache.org
Committed: Thu Aug 14 09:09:24 2014 -0400
--
components/camel-ahc-ws/pom.xml | 5 +++--
components/camel-atmosphere-websocket/pom.xml | 5 +++--
components/camel-web-standalone/pom.xml | 3 ++-
components/camel-web/pom.xml | 2 +-
components/camel-websocket/pom.xml| 5 -
parent/pom.xml| 4 +++-
6 files changed, 16 insertions(+), 8 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/camel/blob/4c692780/components/camel-ahc-ws/pom.xml
--
diff --git a/components/camel-ahc-ws/pom.xml b/components/camel-ahc-ws/pom.xml
index d6f80f3..d4e3b1c 100644
--- a/components/camel-ahc-ws/pom.xml
+++ b/components/camel-ahc-ws/pom.xml
@@ -68,16 +68,17 @@
scopetest/scope
/dependency
-!-- Jetty for testing--
+!-- Jetty8 for testing--
dependency
groupIdorg.eclipse.jetty/groupId
artifactIdjetty-websocket/artifactId
- version${jetty-version}/version
+ version${jetty8-version}/version
scopetest/scope
/dependency
dependency
groupIdorg.eclipse.jetty/groupId
artifactIdjetty-servlet/artifactId
+ version${jetty8-version}/version
scopetest/scope
/dependency
http://git-wip-us.apache.org/repos/asf/camel/blob/4c692780/components/camel-atmosphere-websocket/pom.xml
--
diff --git a/components/camel-atmosphere-websocket/pom.xml
b/components/camel-atmosphere-websocket/pom.xml
index 3060d3f..f37519c 100644
--- a/components/camel-atmosphere-websocket/pom.xml
+++ b/components/camel-atmosphere-websocket/pom.xml
@@ -96,16 +96,17 @@
scopetest/scope
/dependency
-!-- Jetty for testing--
+!-- Jetty 8 for testing--
dependency
groupIdorg.eclipse.jetty/groupId
artifactIdjetty-websocket/artifactId
-version${jetty-version}/version
+version${jetty8-version}/version
scopetest/scope
/dependency
dependency
groupIdorg.eclipse.jetty/groupId
artifactIdjetty-servlet/artifactId
+version${jetty8-version}/version
scopetest/scope
/dependency
http://git-wip-us.apache.org/repos/asf/camel/blob/4c692780/components/camel-web-standalone/pom.xml
--
diff --git a/components/camel-web-standalone/pom.xml
b/components/camel-web-standalone/pom.xml
index 4f3c82d..16fa9b3 100755
--- a/components/camel-web-standalone/pom.xml
+++ b/components/camel-web-standalone/pom.xml
@@ -41,7 +41,7 @@
dependency
!-- not org.eclipse.jetty at present --
- groupIdorg.mortbay.jetty/groupId
+ groupId${jetty-runner-groupId}/groupId
artifactIdjetty-runner/artifactId
version${jetty-version}/version
/dependency
@@ -52,6 +52,7 @@
/dependency
/dependencies
+
build
plugins
plugin
http://git-wip-us.apache.org/repos/asf/camel/blob/4c692780/components/camel-web/pom.xml
--
diff --git a/components/camel-web/pom.xml b/components/camel-web/pom.xml
index 5520824..66d2fbc 100644
--- a/components/camel-web/pom.xml
+++ b/components/camel-web/pom.xml
@@ -252,7 +252,7 @@
!-- mvn jetty:run --
plugin
-groupIdorg.mortbay.jetty/groupId
+groupId${jetty-runner-groupId}/groupId
artifactIdjetty-maven-plugin/artifactId
configuration
!--
http://git-wip-us.apache.org/repos/asf/camel/blob/4c692780/components/camel-websocket/pom.xml
--
diff --git a/components/camel-websocket/pom.xml
b/components/camel-websocket/pom.xml
index 7ab0507..951c5c2 100644
--- a/components/camel-websocket/pom.xml
+++ b/components/camel-websocket/pom.xml
@@ -54,19 +54,22 @@
dependency
groupIdorg.eclipse.jetty/groupId
artifactIdjetty-websocket/artifactId
-version${jetty-version}/version
+version${jetty8-version}/version
/dependency
git commit: CAMEL-7700: Limit the SQL component maxMessagesPerPoll option by using the jdbcTemplate.setMaxRows(size) method
Repository: camel
Updated Branches:
refs/heads/master d5253916c - 7764a5193
CAMEL-7700: Limit the SQL component maxMessagesPerPoll option by using the
jdbcTemplate.setMaxRows(size) method
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/7764a519
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/7764a519
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/7764a519
Branch: refs/heads/master
Commit: 7764a519355bdd0b13c36817022a2a4819eeb93a
Parents: d525391
Author: cmueller cmuel...@apache.org
Authored: Thu Aug 14 23:35:58 2014 +0200
Committer: cmueller cmuel...@apache.org
Committed: Thu Aug 14 23:36:04 2014 +0200
--
.../apache/camel/component/sql/SqlConsumer.java | 17 ++--
.../sql/SqlConsumerMaxMessagesPerPollTest.java | 101 +++
.../sql/createAndPopulateDatabase4.sql | 21
3 files changed, 133 insertions(+), 6 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/camel/blob/7764a519/components/camel-sql/src/main/java/org/apache/camel/component/sql/SqlConsumer.java
--
diff --git
a/components/camel-sql/src/main/java/org/apache/camel/component/sql/SqlConsumer.java
b/components/camel-sql/src/main/java/org/apache/camel/component/sql/SqlConsumer.java
index 57e80e5..8f9800c 100644
---
a/components/camel-sql/src/main/java/org/apache/camel/component/sql/SqlConsumer.java
+++
b/components/camel-sql/src/main/java/org/apache/camel/component/sql/SqlConsumer.java
@@ -36,9 +36,6 @@ import org.springframework.dao.DataAccessException;
import org.springframework.jdbc.core.JdbcTemplate;
import org.springframework.jdbc.core.PreparedStatementCallback;
-/**
- *
- */
public class SqlConsumer extends ScheduledBatchPollingConsumer {
private final String query;
@@ -165,9 +162,8 @@ public class SqlConsumer extends
ScheduledBatchPollingConsumer {
int total = exchanges.size();
// limit if needed
-if (maxMessagesPerPoll 0 total maxMessagesPerPoll) {
-log.debug(Limiting to maximum messages to poll +
maxMessagesPerPoll + as there was + total + messages in this poll.);
-total = maxMessagesPerPoll;
+if (maxMessagesPerPoll 0 total == maxMessagesPerPoll) {
+log.debug(Limiting to maximum messages to poll +
maxMessagesPerPoll + as there was more messages in this poll.);
}
for (int index = 0; index total isBatchAllowed(); index++) {
@@ -311,4 +307,13 @@ public class SqlConsumer extends
ScheduledBatchPollingConsumer {
public void setBreakBatchOnConsumeFail(boolean breakBatchOnConsumeFail) {
this.breakBatchOnConsumeFail = breakBatchOnConsumeFail;
}
+
+@Override
+public void setMaxMessagesPerPoll(int maxMessagesPerPoll) {
+super.setMaxMessagesPerPoll(maxMessagesPerPoll);
+
+if (jdbcTemplate != null) {
+jdbcTemplate.setMaxRows(maxMessagesPerPoll);
+}
+}
}
http://git-wip-us.apache.org/repos/asf/camel/blob/7764a519/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlConsumerMaxMessagesPerPollTest.java
--
diff --git
a/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlConsumerMaxMessagesPerPollTest.java
b/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlConsumerMaxMessagesPerPollTest.java
new file mode 100644
index 000..51a7bb0
--- /dev/null
+++
b/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlConsumerMaxMessagesPerPollTest.java
@@ -0,0 +1,101 @@
+/**
+ * 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.sql;
+
+import java.util.List;
+import java.util.Map;
+
+import org.apache.camel.Exchange;
+import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.component.mock.MockEndpoint;
+import org.apache.camel.test.junit4.CamelTestSupport;
+import org.junit.After;
+import org.junit.Before;
+import
[CONF] Apache Camel File2
Claus Ibsen edited the page: File2 ... div class confluenceTableSmall Name Default Value Description initialDelay 1000 Milliseconds before polling the file/directory starts. delay 500 Milliseconds before the next poll of the file/directory. useFixedDelay Controls if fixed delay or fixed rate is used. See ScheduledExecutorService in JDK for details. In Camel 2.7.x or older the default value is false. From Camel 2.8 onwards the default value is true.
[3/3] git commit: CAMEL-7701 Fixed the CS errors and added the content-type header back as it could be used later
CAMEL-7701 Fixed the CS errors and added the content-type header back as it
could be used later
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/94efbceb
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/94efbceb
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/94efbceb
Branch: refs/heads/master
Commit: 94efbceb989224c8bb9dbe1fd16ef2bb03188bc7
Parents: 29c40d5
Author: Willem Jiang willem.ji...@gmail.com
Authored: Fri Aug 15 12:27:28 2014 +0800
Committer: Willem Jiang willem.ji...@gmail.com
Committed: Fri Aug 15 12:27:28 2014 +0800
--
.../component/cxf/jaxrs/CxfRsProducer.java | 16 +-
.../cxf/jaxrs/DefaultCxfRsBinding.java | 1 +
.../component/cxf/jaxrs/CxfRsRelayTest.java | 202 +--
.../component/cxf/jaxrs/UploadService.java | 35
4 files changed, 108 insertions(+), 146 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/camel/blob/94efbceb/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/jaxrs/CxfRsProducer.java
--
diff --git
a/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/jaxrs/CxfRsProducer.java
b/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/jaxrs/CxfRsProducer.java
index 4f365e7..804a51cf 100644
---
a/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/jaxrs/CxfRsProducer.java
+++
b/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/jaxrs/CxfRsProducer.java
@@ -281,16 +281,20 @@ public class CxfRsProducer extends DefaultProducer {
return answer;
}
-private Method findRightMethod(ListClass? resourceClasses, String
methodName, Class?[] parameterTypes) throws NoSuchMethodException {
+private Method findRightMethod(ListClass? resourceClasses, String
methodName,
+ Class?[] parameterTypes) throws
NoSuchMethodException {
for (Class? clazz : resourceClasses) {
try {
Method[] m = clazz.getMethods();
-iterate_on_methods: for (Method method : m) {
-if (!method.getName().equals(methodName))
+iterate_on_methods:
+for (Method method : m) {
+if (!method.getName().equals(methodName)) {
continue;
+}
Class?[] params = method.getParameterTypes();
-if (params.length != parameterTypes.length)
+if (params.length != parameterTypes.length) {
continue;
+}
for (int i = 0; i parameterTypes.length; i++) {
if (!params[i].isAssignableFrom(parameterTypes[i])) {
continue iterate_on_methods;
@@ -302,7 +306,9 @@ public class CxfRsProducer extends DefaultProducer {
// keep looking
}
}
-throw new NoSuchMethodException(Cannot find method with name: +
methodName + having parameters assignable from: +
arrayToString(parameterTypes));
+throw new NoSuchMethodException(Cannot find method with name: +
methodName
++ having parameters assignable from:
++ arrayToString(parameterTypes));
}
private Class?[] getParameterTypes(Object[] objects) {
http://git-wip-us.apache.org/repos/asf/camel/blob/94efbceb/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/jaxrs/DefaultCxfRsBinding.java
--
diff --git
a/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/jaxrs/DefaultCxfRsBinding.java
b/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/jaxrs/DefaultCxfRsBinding.java
index 54f5e93..e31cdac 100644
---
a/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/jaxrs/DefaultCxfRsBinding.java
+++
b/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/jaxrs/DefaultCxfRsBinding.java
@@ -59,6 +59,7 @@ public class DefaultCxfRsBinding implements CxfRsBinding,
HeaderFilterStrategyAw
camelToCxfHeaderMap.put(Exchange.HTTP_URI,
org.apache.cxf.message.Message.REQUEST_URI);
camelToCxfHeaderMap.put(Exchange.HTTP_METHOD,
org.apache.cxf.message.Message.HTTP_REQUEST_METHOD);
camelToCxfHeaderMap.put(Exchange.HTTP_PATH,
org.apache.cxf.message.Message.PATH_INFO);
+camelToCxfHeaderMap.put(Exchange.CONTENT_TYPE,
org.apache.cxf.message.Message.CONTENT_TYPE);
camelToCxfHeaderMap.put(Exchange.HTTP_CHARACTER_ENCODING,
org.apache.cxf.message.Message.ENCODING);
[1/3] git commit: CAMEL-7701
Repository: camel
Updated Branches:
refs/heads/master 7764a5193 - 94efbceb9
CAMEL-7701
- more liberal choice of right method in proxy-client cxfrs
- remove Content-Type header propagation from Camel to CXFRS
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/4bf33d2f
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/4bf33d2f
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/4bf33d2f
Branch: refs/heads/master
Commit: 4bf33d2f8134d69a0efb88290d1677934beb2695
Parents: 7764a51
Author: Benjamin BONNET benjamin.bon...@m4x.org
Authored: Thu Aug 14 23:55:31 2014 +0200
Committer: Willem Jiang willem.ji...@gmail.com
Committed: Fri Aug 15 10:58:02 2014 +0800
--
.../component/cxf/jaxrs/CxfRsProducer.java | 23 +--
.../cxf/jaxrs/DefaultCxfRsBinding.java | 1 -
.../component/cxf/jaxrs/CxfRsRelayTest.java | 140 +++
.../component/cxf/jaxrs/UploadService.java | 35 +
.../component/cxf/jaxrs/CxfRsSpringRelay.xml| 28
5 files changed, 218 insertions(+), 9 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/camel/blob/4bf33d2f/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/jaxrs/CxfRsProducer.java
--
diff --git
a/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/jaxrs/CxfRsProducer.java
b/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/jaxrs/CxfRsProducer.java
index e99101f..4f365e7 100644
---
a/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/jaxrs/CxfRsProducer.java
+++
b/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/jaxrs/CxfRsProducer.java
@@ -282,20 +282,27 @@ public class CxfRsProducer extends DefaultProducer {
}
private Method findRightMethod(ListClass? resourceClasses, String
methodName, Class?[] parameterTypes) throws NoSuchMethodException {
-Method answer = null;
for (Class? clazz : resourceClasses) {
try {
-answer = clazz.getMethod(methodName, parameterTypes);
-} catch (NoSuchMethodException ex) {
-// keep looking
+Method[] m = clazz.getMethods();
+iterate_on_methods: for (Method method : m) {
+if (!method.getName().equals(methodName))
+continue;
+Class?[] params = method.getParameterTypes();
+if (params.length != parameterTypes.length)
+continue;
+for (int i = 0; i parameterTypes.length; i++) {
+if (!params[i].isAssignableFrom(parameterTypes[i])) {
+continue iterate_on_methods;
+}
+}
+return method;
+}
} catch (SecurityException ex) {
// keep looking
}
-if (answer != null) {
-return answer;
-}
}
-throw new NoSuchMethodException(Cannot find method with name: +
methodName + having parameters: + arrayToString(parameterTypes));
+throw new NoSuchMethodException(Cannot find method with name: +
methodName + having parameters assignable from: +
arrayToString(parameterTypes));
}
private Class?[] getParameterTypes(Object[] objects) {
http://git-wip-us.apache.org/repos/asf/camel/blob/4bf33d2f/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/jaxrs/DefaultCxfRsBinding.java
--
diff --git
a/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/jaxrs/DefaultCxfRsBinding.java
b/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/jaxrs/DefaultCxfRsBinding.java
index e31cdac..54f5e93 100644
---
a/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/jaxrs/DefaultCxfRsBinding.java
+++
b/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/jaxrs/DefaultCxfRsBinding.java
@@ -59,7 +59,6 @@ public class DefaultCxfRsBinding implements CxfRsBinding,
HeaderFilterStrategyAw
camelToCxfHeaderMap.put(Exchange.HTTP_URI,
org.apache.cxf.message.Message.REQUEST_URI);
camelToCxfHeaderMap.put(Exchange.HTTP_METHOD,
org.apache.cxf.message.Message.HTTP_REQUEST_METHOD);
camelToCxfHeaderMap.put(Exchange.HTTP_PATH,
org.apache.cxf.message.Message.PATH_INFO);
-camelToCxfHeaderMap.put(Exchange.CONTENT_TYPE,
org.apache.cxf.message.Message.CONTENT_TYPE);
camelToCxfHeaderMap.put(Exchange.HTTP_CHARACTER_ENCODING,
org.apache.cxf.message.Message.ENCODING);
camelToCxfHeaderMap.put(Exchange.HTTP_QUERY,
[2/3] git commit: CAMEL-7701 added Apache file-header
CAMEL-7701 added Apache file-header Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/29c40d50 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/29c40d50 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/29c40d50 Branch: refs/heads/master Commit: 29c40d503b4f6ba3d45c5d62c971c6d19961e574 Parents: 4bf33d2 Author: Benjamin BONNET benjamin.bon...@m4x.org Authored: Fri Aug 15 00:08:19 2014 +0200 Committer: Willem Jiang willem.ji...@gmail.com Committed: Fri Aug 15 10:58:42 2014 +0800 -- .../camel/component/cxf/jaxrs/CxfRsRelayTest.java | 16 .../camel/component/cxf/jaxrs/CxfRsSpringRelay.xml | 16 2 files changed, 32 insertions(+) -- http://git-wip-us.apache.org/repos/asf/camel/blob/29c40d50/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/jaxrs/CxfRsRelayTest.java -- diff --git a/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/jaxrs/CxfRsRelayTest.java b/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/jaxrs/CxfRsRelayTest.java index 6c5c227..c6dbe91 100644 --- a/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/jaxrs/CxfRsRelayTest.java +++ b/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/jaxrs/CxfRsRelayTest.java @@ -1,3 +1,19 @@ +/** + * 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.jaxrs; import java.io.InputStream; http://git-wip-us.apache.org/repos/asf/camel/blob/29c40d50/components/camel-cxf/src/test/resources/org/apache/camel/component/cxf/jaxrs/CxfRsSpringRelay.xml -- diff --git a/components/camel-cxf/src/test/resources/org/apache/camel/component/cxf/jaxrs/CxfRsSpringRelay.xml b/components/camel-cxf/src/test/resources/org/apache/camel/component/cxf/jaxrs/CxfRsSpringRelay.xml index c5a844e..a7d5adc 100644 --- a/components/camel-cxf/src/test/resources/org/apache/camel/component/cxf/jaxrs/CxfRsSpringRelay.xml +++ b/components/camel-cxf/src/test/resources/org/apache/camel/component/cxf/jaxrs/CxfRsSpringRelay.xml @@ -1,4 +1,20 @@ ?xml version=1.0 encoding=UTF-8? +!-- +Licensed to the Apache Software Foundation (ASF) under one or more +contributor license agreements. See the NOTICE file distributed with +this work for additional information regarding copyright ownership. +The ASF licenses this file to You under the Apache License, Version 2.0 +(the License); you may not use this file except in compliance with +the License. You may obtain a copy of the License at + +http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an AS IS BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. +-- beans xmlns=http://www.springframework.org/schema/beans; xmlns:xsi=http://www.w3.org/2001/XMLSchema-instance; xmlns:camel=http://camel.apache.org/schema/spring; xmlns:cxf=http://camel.apache.org/schema/cxf;
