You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ni...@apache.org on 2009/05/17 09:14:40 UTC
svn commit: r775588 - in /camel/trunk/components:
camel-cxf/src/main/java/org/apache/camel/component/cxf/
camel-cxf/src/main/java/org/apache/camel/component/cxf/cxfbean/
camel-http/src/main/java/org/apache/camel/component/http/
camel-jetty/src/main/jav...
Author: ningjiang
Date: Sun May 17 07:14:40 2009
New Revision: 775588
URL: http://svn.apache.org/viewvc?rev=775588&view=rev
Log:
CAMEL-1617 suppor to set the HeaderFilterStrategy from component
Modified:
camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfComponent.java
camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/cxfbean/CxfBeanComponent.java
camel/trunk/components/camel-http/src/main/java/org/apache/camel/component/http/HttpComponent.java
camel/trunk/components/camel-jetty/src/main/java/org/apache/camel/component/jetty/JettyHttpComponent.java
camel/trunk/components/camel-jhc/src/main/java/org/apache/camel/component/jhc/JhcComponent.java
camel/trunk/components/camel-restlet/src/main/java/org/apache/camel/component/restlet/RestletComponent.java
camel/trunk/components/camel-spring-integration/src/main/java/org/apache/camel/component/spring/integration/adapter/CamelSourceAdapter.java
Modified: camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfComponent.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfComponent.java?rev=775588&r1=775587&r2=775588&view=diff
==============================================================================
--- camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfComponent.java (original)
+++ camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfComponent.java Sun May 17 07:14:40 2009
@@ -23,6 +23,8 @@
import org.apache.camel.Endpoint;
import org.apache.camel.component.cxf.spring.CxfEndpointBean;
import org.apache.camel.impl.DefaultComponent;
+import org.apache.camel.spi.HeaderFilterStrategy;
+import org.apache.camel.spi.HeaderFilterStrategyAware;
import org.apache.camel.util.CamelContextHelper;
/**
@@ -30,8 +32,9 @@
*
* @version $Revision$
*/
-public class CxfComponent extends DefaultComponent {
-
+public class CxfComponent extends DefaultComponent implements HeaderFilterStrategyAware{
+ private HeaderFilterStrategy headerFilterStrategy;
+
public CxfComponent() {
}
@@ -61,6 +64,9 @@
CxfEndpointBean.class);
result = new CxfSpringEndpoint(this, bean);
+ if (getHeaderFilterStrategy() != null) {
+ result.setHeaderFilterStrategy(headerFilterStrategy);
+ }
// Apply Spring bean properties (including # notation referenced bean). Note that the
// Spring bean properties values can be overridden by property defined in URI query.
@@ -79,5 +85,13 @@
return result;
}
+
+ public HeaderFilterStrategy getHeaderFilterStrategy() {
+ return headerFilterStrategy;
+ }
+
+ public void setHeaderFilterStrategy(HeaderFilterStrategy strategy) {
+ headerFilterStrategy = strategy;
+ }
}
Modified: camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/cxfbean/CxfBeanComponent.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/cxfbean/CxfBeanComponent.java?rev=775588&r1=775587&r2=775588&view=diff
==============================================================================
--- camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/cxfbean/CxfBeanComponent.java (original)
+++ camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/cxfbean/CxfBeanComponent.java Sun May 17 07:14:40 2009
@@ -21,6 +21,8 @@
import org.apache.camel.Endpoint;
import org.apache.camel.impl.DefaultComponent;
+import org.apache.camel.spi.HeaderFilterStrategy;
+import org.apache.camel.spi.HeaderFilterStrategyAware;
/**
* CXF Bean component creates {@link CxfBeanEndpoint} which represents a
@@ -29,15 +31,19 @@
*
* @version $Revision$
*/
-public class CxfBeanComponent extends DefaultComponent {
+public class CxfBeanComponent extends DefaultComponent implements HeaderFilterStrategyAware{
private Map<String, CxfBeanEndpoint> endpoints = new HashMap<String, CxfBeanEndpoint>();
+ private HeaderFilterStrategy headerFilterStrategy;
@SuppressWarnings("unchecked")
@Override
protected Endpoint createEndpoint(String uri, String remaining,
Map parameters) throws Exception {
CxfBeanEndpoint answer = new CxfBeanEndpoint(remaining, this);
+ if (getHeaderFilterStrategy() != null) {
+ answer.setHeaderFilterStrategy(getHeaderFilterStrategy());
+ }
setProperties(answer, parameters);
// add to the endpoints map before calling the endpoint's init() method to
@@ -75,5 +81,13 @@
return endpoints.get(endpointUri);
}
+ public HeaderFilterStrategy getHeaderFilterStrategy() {
+ return headerFilterStrategy;
+ }
+
+ public void setHeaderFilterStrategy(HeaderFilterStrategy strategy) {
+ headerFilterStrategy = strategy;
+ }
+
}
Modified: camel/trunk/components/camel-http/src/main/java/org/apache/camel/component/http/HttpComponent.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-http/src/main/java/org/apache/camel/component/http/HttpComponent.java?rev=775588&r1=775587&r2=775588&view=diff
==============================================================================
--- camel/trunk/components/camel-http/src/main/java/org/apache/camel/component/http/HttpComponent.java (original)
+++ camel/trunk/components/camel-http/src/main/java/org/apache/camel/component/http/HttpComponent.java Sun May 17 07:14:40 2009
@@ -22,6 +22,8 @@
import org.apache.camel.Endpoint;
import org.apache.camel.ResolveEndpointFailedException;
import org.apache.camel.impl.DefaultComponent;
+import org.apache.camel.spi.HeaderFilterStrategy;
+import org.apache.camel.spi.HeaderFilterStrategyAware;
import org.apache.camel.util.CamelContextHelper;
import org.apache.camel.util.IntrospectionSupport;
import org.apache.camel.util.URISupport;
@@ -35,11 +37,12 @@
*
* @version $Revision$
*/
-public class HttpComponent extends DefaultComponent {
+public class HttpComponent extends DefaultComponent implements HeaderFilterStrategyAware {
protected HttpClientConfigurer httpClientConfigurer;
protected HttpConnectionManager httpConnectionManager = new MultiThreadedHttpConnectionManager();
protected HttpBinding httpBinding;
private boolean matchOnUriPrefix;
+ private HeaderFilterStrategy headerFilterstrategy;
/**
* Connects the URL specified on the endpoint to the specified processor.
@@ -122,9 +125,13 @@
if (httpBinding != null) {
endpoint.setBinding(httpBinding);
}
+ if (getHeaderFilterStrategy() != null) {
+ endpoint.setHeaderFilterStrategy(getHeaderFilterStrategy());
+ }
if (throwExceptionOnFailure != null) {
endpoint.setThrowExceptionOnFailure(throwExceptionOnFailure);
}
+ setProperties(endpoint, parameters);
return endpoint;
}
@@ -160,5 +167,14 @@
public boolean isMatchOnUriPrefix() {
return matchOnUriPrefix;
}
+
+ public HeaderFilterStrategy getHeaderFilterStrategy() {
+ return headerFilterstrategy;
+ }
+
+ public void setHeaderFilterStrategy(HeaderFilterStrategy strategy) {
+ headerFilterstrategy = strategy;
+
+ }
}
Modified: camel/trunk/components/camel-jetty/src/main/java/org/apache/camel/component/jetty/JettyHttpComponent.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-jetty/src/main/java/org/apache/camel/component/jetty/JettyHttpComponent.java?rev=775588&r1=775587&r2=775588&view=diff
==============================================================================
--- camel/trunk/components/camel-jetty/src/main/java/org/apache/camel/component/jetty/JettyHttpComponent.java (original)
+++ camel/trunk/components/camel-jetty/src/main/java/org/apache/camel/component/jetty/JettyHttpComponent.java Sun May 17 07:14:40 2009
@@ -113,6 +113,9 @@
if (httpBinding != null) {
result.setBinding(httpBinding);
}
+ if (getHeaderFilterStrategy() != null) {
+ result.setHeaderFilterStrategy(getHeaderFilterStrategy());
+ }
if (handlerList.size() > 0) {
result.setHandlers(handlerList);
}
Modified: camel/trunk/components/camel-jhc/src/main/java/org/apache/camel/component/jhc/JhcComponent.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-jhc/src/main/java/org/apache/camel/component/jhc/JhcComponent.java?rev=775588&r1=775587&r2=775588&view=diff
==============================================================================
--- camel/trunk/components/camel-jhc/src/main/java/org/apache/camel/component/jhc/JhcComponent.java (original)
+++ camel/trunk/components/camel-jhc/src/main/java/org/apache/camel/component/jhc/JhcComponent.java Sun May 17 07:14:40 2009
@@ -21,14 +21,17 @@
import org.apache.camel.Endpoint;
import org.apache.camel.impl.DefaultComponent;
+import org.apache.camel.spi.HeaderFilterStrategy;
+import org.apache.camel.spi.HeaderFilterStrategyAware;
import org.apache.http.params.BasicHttpParams;
import org.apache.http.params.HttpConnectionParams;
import org.apache.http.params.HttpParams;
import org.apache.http.params.HttpProtocolParams;
-public class JhcComponent extends DefaultComponent {
+public class JhcComponent extends DefaultComponent implements HeaderFilterStrategyAware {
private HttpParams params;
+ private HeaderFilterStrategy headerFilterStrategy;
public JhcComponent() {
@@ -50,7 +53,19 @@
}
protected Endpoint createEndpoint(String uri, String remaining, Map parameters) throws Exception {
- return new JhcEndpoint(uri, this, new URI(uri.substring(uri.indexOf(':') + 1)));
+ JhcEndpoint jhcEndpoint = new JhcEndpoint(uri, this, new URI(uri.substring(uri.indexOf(':') + 1)));
+ if (getHeaderFilterStrategy() != null) {
+ jhcEndpoint.setHeaderFilterStrategy(getHeaderFilterStrategy());
+ }
+ return jhcEndpoint;
+ }
+
+ public HeaderFilterStrategy getHeaderFilterStrategy() {
+ return headerFilterStrategy;
+ }
+
+ public void setHeaderFilterStrategy(HeaderFilterStrategy strategy) {
+ headerFilterStrategy = strategy;
}
}
Modified: camel/trunk/components/camel-restlet/src/main/java/org/apache/camel/component/restlet/RestletComponent.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-restlet/src/main/java/org/apache/camel/component/restlet/RestletComponent.java?rev=775588&r1=775587&r2=775588&view=diff
==============================================================================
--- camel/trunk/components/camel-restlet/src/main/java/org/apache/camel/component/restlet/RestletComponent.java (original)
+++ camel/trunk/components/camel-restlet/src/main/java/org/apache/camel/component/restlet/RestletComponent.java Sun May 17 07:14:40 2009
@@ -22,6 +22,8 @@
import org.apache.camel.Endpoint;
import org.apache.camel.impl.DefaultComponent;
+import org.apache.camel.spi.HeaderFilterStrategy;
+import org.apache.camel.spi.HeaderFilterStrategyAware;
import org.apache.camel.util.URISupport;
import org.apache.camel.util.UnsafeUriCharactersEncoder;
import org.apache.commons.logging.Log;
@@ -38,18 +40,22 @@
*
* @version $Revision$
*/
-public class RestletComponent extends DefaultComponent {
+public class RestletComponent extends DefaultComponent implements HeaderFilterStrategyAware {
private static final Log LOG = LogFactory.getLog(RestletComponent.class);
private final Map<String, Server> servers = new HashMap<String, Server>();
private final Map<String, MethodBasedRouter> routers = new HashMap<String, MethodBasedRouter>();
private final Component component = new Component();
+ private HeaderFilterStrategy headerFilterStrategy;
@Override
@SuppressWarnings("unchecked")
protected Endpoint createEndpoint(String uri, String remaining, Map parameters) throws Exception {
RestletEndpoint result = new RestletEndpoint(this, remaining);
+ if (getHeaderFilterStrategy() != null) {
+ result.setHeaderFilterStrategy(getHeaderFilterStrategy());
+ }
setProperties(result, parameters);
// construct URI so we can use it to get the splitted information
@@ -175,6 +181,14 @@
private static String buildKey(RestletEndpoint endpoint) {
return endpoint.getHost() + ":" + endpoint.getPort();
}
+
+ public HeaderFilterStrategy getHeaderFilterStrategy() {
+ return headerFilterStrategy;
+ }
+
+ public void setHeaderFilterStrategy(HeaderFilterStrategy strategy) {
+ headerFilterStrategy = strategy;
+ }
}
Modified: camel/trunk/components/camel-spring-integration/src/main/java/org/apache/camel/component/spring/integration/adapter/CamelSourceAdapter.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-spring-integration/src/main/java/org/apache/camel/component/spring/integration/adapter/CamelSourceAdapter.java?rev=775588&r1=775587&r2=775588&view=diff
==============================================================================
--- camel/trunk/components/camel-spring-integration/src/main/java/org/apache/camel/component/spring/integration/adapter/CamelSourceAdapter.java (original)
+++ camel/trunk/components/camel-spring-integration/src/main/java/org/apache/camel/component/spring/integration/adapter/CamelSourceAdapter.java Sun May 17 07:14:40 2009
@@ -42,7 +42,7 @@
* @version $Revision$
*/
public class CamelSourceAdapter extends AbstractCamelAdapter implements InitializingBean, DisposableBean {
- private final static Log LOG = LogFactory.getLog(CamelSourceAdapter.class);
+ private static final Log LOG = LogFactory.getLog(CamelSourceAdapter.class);
private Consumer consumer;
private Endpoint camelEndpoint;