You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2014/06/24 08:47:06 UTC
[1/2] git commit: Fix for CAMEL-7529 Modify
HeaderFilterStrategyComponent to extend UriEndpointComponent instead of
DefaultComponent
Repository: camel
Updated Branches:
refs/heads/master 0c6db0c90 -> 7a0afad25
Fix for CAMEL-7529 Modify HeaderFilterStrategyComponent to extend UriEndpointComponent instead of DefaultComponent
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/26f72c6f
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/26f72c6f
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/26f72c6f
Branch: refs/heads/master
Commit: 26f72c6fa5b2df324b5d457793143820535871a1
Parents: 042e324
Author: Kevin Earls <ke...@kevinearls.com>
Authored: Mon Jun 23 14:38:08 2014 +0200
Committer: Kevin Earls <ke...@kevinearls.com>
Committed: Mon Jun 23 14:38:57 2014 +0200
----------------------------------------------------------------------
.../apache/camel/impl/HeaderFilterStrategyComponent.java | 9 +++++----
.../camel/impl/HeaderFilterStrategyComponentTest.java | 8 ++++++--
.../java/org/apache/camel/component/ahc/AhcComponent.java | 4 ++++
.../java/org/apache/camel/component/cxf/CxfComponent.java | 3 ++-
.../camel/component/cxf/cxfbean/CxfBeanComponent.java | 6 +++++-
.../apache/camel/component/cxf/jaxrs/CxfRsComponent.java | 3 ++-
.../java/org/apache/camel/component/http/HttpComponent.java | 4 ++++
.../org/apache/camel/component/http4/HttpComponent.java | 4 ++++
.../apache/camel/component/restlet/RestletComponent.java | 1 +
9 files changed, 33 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/26f72c6f/camel-core/src/main/java/org/apache/camel/impl/HeaderFilterStrategyComponent.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/impl/HeaderFilterStrategyComponent.java b/camel-core/src/main/java/org/apache/camel/impl/HeaderFilterStrategyComponent.java
index 8c7f0e4..cabfe44 100644
--- a/camel-core/src/main/java/org/apache/camel/impl/HeaderFilterStrategyComponent.java
+++ b/camel-core/src/main/java/org/apache/camel/impl/HeaderFilterStrategyComponent.java
@@ -21,15 +21,16 @@ import org.apache.camel.Endpoint;
import org.apache.camel.spi.HeaderFilterStrategy;
import org.apache.camel.spi.HeaderFilterStrategyAware;
-public abstract class HeaderFilterStrategyComponent extends DefaultComponent implements HeaderFilterStrategyAware {
+public abstract class HeaderFilterStrategyComponent extends UriEndpointComponent implements HeaderFilterStrategyAware {
private HeaderFilterStrategy headerFilterStrategy;
- public HeaderFilterStrategyComponent() {
+ public HeaderFilterStrategyComponent(Class<? extends Endpoint> endpointClass) {
+ super(endpointClass);
}
- public HeaderFilterStrategyComponent(CamelContext context) {
- super(context);
+ public HeaderFilterStrategyComponent(CamelContext context, Class<? extends Endpoint> endpointClass) {
+ super(context, endpointClass);
}
public HeaderFilterStrategy getHeaderFilterStrategy() {
http://git-wip-us.apache.org/repos/asf/camel/blob/26f72c6f/camel-core/src/test/java/org/apache/camel/impl/HeaderFilterStrategyComponentTest.java
----------------------------------------------------------------------
diff --git a/camel-core/src/test/java/org/apache/camel/impl/HeaderFilterStrategyComponentTest.java b/camel-core/src/test/java/org/apache/camel/impl/HeaderFilterStrategyComponentTest.java
index 59a85ed..2dc8f39 100644
--- a/camel-core/src/test/java/org/apache/camel/impl/HeaderFilterStrategyComponentTest.java
+++ b/camel-core/src/test/java/org/apache/camel/impl/HeaderFilterStrategyComponentTest.java
@@ -33,6 +33,10 @@ public class HeaderFilterStrategyComponentTest extends TestCase {
private static class MyComponent extends HeaderFilterStrategyComponent {
+ public MyComponent(Class<? extends Endpoint> endpointClass) {
+ super(endpointClass);
+ }
+
protected Endpoint createEndpoint(String uri, String remaining, Map<String, Object> parameters) throws Exception {
return null;
}
@@ -64,7 +68,7 @@ public class HeaderFilterStrategyComponentTest extends TestCase {
}
public void testHeaderFilterStrategyComponent() {
- MyComponent comp = new MyComponent();
+ MyComponent comp = new MyComponent(MyEndpoint.class);
assertNull(comp.getHeaderFilterStrategy());
HeaderFilterStrategy strategy = new DefaultHeaderFilterStrategy();
@@ -74,7 +78,7 @@ public class HeaderFilterStrategyComponentTest extends TestCase {
}
public void testHeaderFilterStrategyAware() {
- MyComponent comp = new MyComponent();
+ MyComponent comp = new MyComponent(MyEndpoint.class);
assertNull(comp.getHeaderFilterStrategy());
HeaderFilterStrategy strategy = new DefaultHeaderFilterStrategy();
http://git-wip-us.apache.org/repos/asf/camel/blob/26f72c6f/components/camel-ahc/src/main/java/org/apache/camel/component/ahc/AhcComponent.java
----------------------------------------------------------------------
diff --git a/components/camel-ahc/src/main/java/org/apache/camel/component/ahc/AhcComponent.java b/components/camel-ahc/src/main/java/org/apache/camel/component/ahc/AhcComponent.java
index 98ddb1c..22264c6 100644
--- a/components/camel-ahc/src/main/java/org/apache/camel/component/ahc/AhcComponent.java
+++ b/components/camel-ahc/src/main/java/org/apache/camel/component/ahc/AhcComponent.java
@@ -48,6 +48,10 @@ public class AhcComponent extends HeaderFilterStrategyComponent {
private AhcBinding binding;
private SSLContextParameters sslContextParameters;
+ public AhcComponent() {
+ super(AhcEndpoint.class);
+ }
+
@Override
protected Endpoint createEndpoint(String uri, String remaining, Map<String, Object> parameters) throws Exception {
String addressUri = createAddressUri(uri, remaining);
http://git-wip-us.apache.org/repos/asf/camel/blob/26f72c6f/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfComponent.java
----------------------------------------------------------------------
diff --git a/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfComponent.java b/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfComponent.java
index 80c087e..b2af474 100644
--- a/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfComponent.java
+++ b/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfComponent.java
@@ -33,10 +33,11 @@ public class CxfComponent extends HeaderFilterStrategyComponent {
Boolean allowStreaming;
public CxfComponent() {
+ super(CxfEndpoint.class);
}
public CxfComponent(CamelContext context) {
- super(context);
+ super(context, CxfEndpoint.class);
}
public void setAllowStreaming(Boolean b) {
http://git-wip-us.apache.org/repos/asf/camel/blob/26f72c6f/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/cxfbean/CxfBeanComponent.java
----------------------------------------------------------------------
diff --git a/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/cxfbean/CxfBeanComponent.java b/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/cxfbean/CxfBeanComponent.java
index 7636324..d5d9ff4 100644
--- a/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/cxfbean/CxfBeanComponent.java
+++ b/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/cxfbean/CxfBeanComponent.java
@@ -33,7 +33,11 @@ import org.apache.camel.impl.HeaderFilterStrategyComponent;
public class CxfBeanComponent extends HeaderFilterStrategyComponent {
private Map<String, CxfBeanEndpoint> endpoints = new HashMap<String, CxfBeanEndpoint>();
-
+
+ public CxfBeanComponent() {
+ super(CxfBeanEndpoint.class);
+ }
+
@Override
protected Endpoint createEndpoint(String uri, String remaining,
Map<String, Object> parameters) throws Exception {
http://git-wip-us.apache.org/repos/asf/camel/blob/26f72c6f/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/jaxrs/CxfRsComponent.java
----------------------------------------------------------------------
diff --git a/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/jaxrs/CxfRsComponent.java b/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/jaxrs/CxfRsComponent.java
index 371997e..270773f 100644
--- a/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/jaxrs/CxfRsComponent.java
+++ b/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/jaxrs/CxfRsComponent.java
@@ -36,10 +36,11 @@ import org.apache.cxf.jaxrs.AbstractJAXRSFactoryBean;
public class CxfRsComponent extends HeaderFilterStrategyComponent {
public CxfRsComponent() {
+ super(CxfRsEndpoint.class);
}
public CxfRsComponent(CamelContext context) {
- super(context);
+ super(context, CxfRsEndpoint.class);
}
@Override
http://git-wip-us.apache.org/repos/asf/camel/blob/26f72c6f/components/camel-http/src/main/java/org/apache/camel/component/http/HttpComponent.java
----------------------------------------------------------------------
diff --git a/components/camel-http/src/main/java/org/apache/camel/component/http/HttpComponent.java b/components/camel-http/src/main/java/org/apache/camel/component/http/HttpComponent.java
index fc82cf9..a7f0719 100644
--- a/components/camel-http/src/main/java/org/apache/camel/component/http/HttpComponent.java
+++ b/components/camel-http/src/main/java/org/apache/camel/component/http/HttpComponent.java
@@ -48,6 +48,10 @@ public class HttpComponent extends HeaderFilterStrategyComponent {
protected HttpBinding httpBinding;
protected HttpConfiguration httpConfiguration;
+ public HttpComponent() {
+ super(HttpEndpoint.class);
+ }
+
/**
* Connects the URL specified on the endpoint to the specified processor.
*
http://git-wip-us.apache.org/repos/asf/camel/blob/26f72c6f/components/camel-http4/src/main/java/org/apache/camel/component/http4/HttpComponent.java
----------------------------------------------------------------------
diff --git a/components/camel-http4/src/main/java/org/apache/camel/component/http4/HttpComponent.java b/components/camel-http4/src/main/java/org/apache/camel/component/http4/HttpComponent.java
index bd65044..b5fc46e 100644
--- a/components/camel-http4/src/main/java/org/apache/camel/component/http4/HttpComponent.java
+++ b/components/camel-http4/src/main/java/org/apache/camel/component/http4/HttpComponent.java
@@ -73,6 +73,10 @@ public class HttpComponent extends HeaderFilterStrategyComponent {
// It's MILLISECONDS, the default value is always keep alive
protected long connectionTimeToLive = -1;
+ public HttpComponent() {
+ super(HttpEndpoint.class);
+ }
+
/**
* Connects the URL specified on the endpoint to the specified processor.
*
http://git-wip-us.apache.org/repos/asf/camel/blob/26f72c6f/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 6eae3df..429c318 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
@@ -75,6 +75,7 @@ public class RestletComponent extends HeaderFilterStrategyComponent {
public RestletComponent(Component component) {
// Allow the Component to be injected, so that the RestletServlet may be
// configured within a webapp
+ super(RestletEndpoint.class);
this.component = component;
}
[2/2] git commit: Merge branch 'CAMEL-7529' of
https://github.com/kevinearls/camel
Posted by da...@apache.org.
Merge branch 'CAMEL-7529' of https://github.com/kevinearls/camel
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/7a0afad2
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/7a0afad2
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/7a0afad2
Branch: refs/heads/master
Commit: 7a0afad25f22a3a9366174dbfad224be6d9c7a80
Parents: 0c6db0c 26f72c6
Author: Claus Ibsen <da...@apache.org>
Authored: Tue Jun 24 08:46:50 2014 +0200
Committer: Claus Ibsen <da...@apache.org>
Committed: Tue Jun 24 08:46:50 2014 +0200
----------------------------------------------------------------------
.../apache/camel/impl/HeaderFilterStrategyComponent.java | 9 +++++----
.../camel/impl/HeaderFilterStrategyComponentTest.java | 8 ++++++--
.../java/org/apache/camel/component/ahc/AhcComponent.java | 4 ++++
.../java/org/apache/camel/component/cxf/CxfComponent.java | 3 ++-
.../camel/component/cxf/cxfbean/CxfBeanComponent.java | 6 +++++-
.../apache/camel/component/cxf/jaxrs/CxfRsComponent.java | 3 ++-
.../java/org/apache/camel/component/http/HttpComponent.java | 4 ++++
.../org/apache/camel/component/http4/HttpComponent.java | 4 ++++
.../apache/camel/component/restlet/RestletComponent.java | 1 +
9 files changed, 33 insertions(+), 9 deletions(-)
----------------------------------------------------------------------