Author: wtam
Date: Thu Feb 12 21:59:58 2009
New Revision: 743899
URL: http://svn.apache.org/viewvc?rev=743899&view=rev
Log:
[CAMEL-1289] HeaderFilterStrategy - move from Component to Endpoint
Modified:
camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfEndpoint.java
camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfSoapComponent.java
camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfSoapEndpoint.java
camel/trunk/components/camel-jhc/src/main/java/org/apache/camel/component/jhc/JhcEndpoint.java
camel/trunk/components/camel-restlet/src/main/java/org/apache/camel/component/restlet/RestletEndpoint.java
Modified:
camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfEndpoint.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfEndpoint.java?rev=743899&r1=743898&r2=743899&view=diff
==============================================================================
---
camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfEndpoint.java
(original)
+++
camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfEndpoint.java
Thu Feb 12 21:59:58 2009
@@ -61,7 +61,7 @@
*
* @version $Revision$
*/
-public class CxfEndpoint extends DefaultEndpoint {
+public class CxfEndpoint extends DefaultEndpoint implements
HeaderFilterStrategyAware {
private static final Log LOG = LogFactory.getLog(CxfEndpoint.class);
@@ -324,6 +324,7 @@
public void setCxfBinding(CxfBinding cxfBinding) {
this.cxfBinding = cxfBinding;
+ cxfBindingInitialized.set(false);
}
public CxfBinding getCxfBinding() {
Modified:
camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfSoapComponent.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfSoapComponent.java?rev=743899&r1=743898&r2=743899&view=diff
==============================================================================
---
camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfSoapComponent.java
(original)
+++
camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfSoapComponent.java
Thu Feb 12 21:59:58 2009
@@ -19,25 +19,19 @@
import java.util.Map;
import org.apache.camel.Endpoint;
-import org.apache.camel.HeaderFilterStrategyAware;
import org.apache.camel.impl.DefaultComponent;
-import org.apache.camel.spi.HeaderFilterStrategy;
import org.apache.camel.util.CamelContextHelper;
import org.apache.camel.util.IntrospectionSupport;
import org.apache.camel.util.URISupport;
-
/**
* Defines the <a href="http://camel.apache.org/cxf.html";>SOAP Component</a>
*
* @version $Revision$
*/
-public class CxfSoapComponent extends DefaultComponent implements
HeaderFilterStrategyAware {
-
- private HeaderFilterStrategy headerFilterStrategy;
+public class CxfSoapComponent extends DefaultComponent {
public CxfSoapComponent() {
- setHeaderFilterStrategy(new CxfHeaderFilterStrategy());
}
@Override
@@ -47,7 +41,7 @@
remaining += "?" + URISupport.createQueryString(parameters);
}
Endpoint endpoint =
CamelContextHelper.getMandatoryEndpoint(getCamelContext(), remaining);
- CxfSoapEndpoint soapEndpoint = new CxfSoapEndpoint(endpoint,
getHeaderFilterStrategy());
+ CxfSoapEndpoint soapEndpoint = new CxfSoapEndpoint(endpoint);
setProperties(soapEndpoint, soapProps);
soapEndpoint.init();
return soapEndpoint;
@@ -58,13 +52,4 @@
return false;
}
- 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/CxfSoapEndpoint.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfSoapEndpoint.java?rev=743899&r1=743898&r2=743899&view=diff
==============================================================================
---
camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfSoapEndpoint.java
(original)
+++
camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfSoapEndpoint.java
Thu Feb 12 21:59:58 2009
@@ -28,6 +28,7 @@
import org.apache.camel.Endpoint;
import org.apache.camel.Exchange;
import org.apache.camel.ExchangePattern;
+import org.apache.camel.HeaderFilterStrategyAware;
import org.apache.camel.PollingConsumer;
import org.apache.camel.Processor;
import org.apache.camel.Producer;
@@ -42,7 +43,7 @@
* A CXF based SOAP endpoint which wraps an existing
* endpoint with SOAP processing.
*/
-public class CxfSoapEndpoint implements Endpoint {
+public class CxfSoapEndpoint implements Endpoint, HeaderFilterStrategyAware {
private final Endpoint endpoint;
private Resource wsdl;
@@ -52,15 +53,10 @@
private QName serviceName;
private QName endpointName;
private Bus bus;
- private HeaderFilterStrategy headerFilterStrategy;
+ private HeaderFilterStrategy headerFilterStrategy = new
CxfHeaderFilterStrategy();
public CxfSoapEndpoint(Endpoint endpoint) {
- this(endpoint, new CxfHeaderFilterStrategy());
- }
-
- public CxfSoapEndpoint(Endpoint endpoint, HeaderFilterStrategy
headerFilterStrategy) {
this.endpoint = endpoint;
- this.headerFilterStrategy = headerFilterStrategy;
}
protected Endpoint getInnerEndpoint() {
@@ -169,6 +165,10 @@
return headerFilterStrategy;
}
+ public void setHeaderFilterStrategy(HeaderFilterStrategy strategy) {
+ headerFilterStrategy = strategy;
+
+ }
public boolean isLenientProperties() {
return false;
}
Modified:
camel/trunk/components/camel-jhc/src/main/java/org/apache/camel/component/jhc/JhcEndpoint.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-jhc/src/main/java/org/apache/camel/component/jhc/JhcEndpoint.java?rev=743899&r1=743898&r2=743899&view=diff
==============================================================================
---
camel/trunk/components/camel-jhc/src/main/java/org/apache/camel/component/jhc/JhcEndpoint.java
(original)
+++
camel/trunk/components/camel-jhc/src/main/java/org/apache/camel/component/jhc/JhcEndpoint.java
Thu Feb 12 21:59:58 2009
@@ -19,6 +19,7 @@
import java.net.URI;
import org.apache.camel.Consumer;
+import org.apache.camel.HeaderFilterStrategyAware;
import org.apache.camel.Processor;
import org.apache.camel.Producer;
import org.apache.camel.impl.DefaultEndpoint;
@@ -32,11 +33,11 @@
* Time: 8:06:42 PM
* To change this template use File | Settings | File Templates.
*/
-public class JhcEndpoint extends DefaultEndpoint {
+public class JhcEndpoint extends DefaultEndpoint implements
HeaderFilterStrategyAware {
private HttpParams params;
private URI httpUri;
- private HeaderFilterStrategy headerFilterStrategy;
+ private HeaderFilterStrategy headerFilterStrategy = new
JhcHeaderFilterStrategy();
public JhcEndpoint(String endpointUri, JhcComponent component, URI
httpUri) {
super(endpointUri, component);
Modified:
camel/trunk/components/camel-restlet/src/main/java/org/apache/camel/component/restlet/RestletEndpoint.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-restlet/src/main/java/org/apache/camel/component/restlet/RestletEndpoint.java?rev=743899&r1=743898&r2=743899&view=diff
==============================================================================
---
camel/trunk/components/camel-restlet/src/main/java/org/apache/camel/component/restlet/RestletEndpoint.java
(original)
+++
camel/trunk/components/camel-restlet/src/main/java/org/apache/camel/component/restlet/RestletEndpoint.java
Thu Feb 12 21:59:58 2009
@@ -34,7 +34,7 @@
*
* @version $Revision$
*/
-public class RestletEndpoint extends DefaultEndpoint {
+public class RestletEndpoint extends DefaultEndpoint implements
HeaderFilterStrategyAware {
private static final Log LOG = LogFactory.getLog(RestletEndpoint.class);
private static final int DEFAULT_PORT = 80;
@@ -139,6 +139,7 @@
public void setRestletBinding(RestletBinding restletBinding) {
this.restletBinding = restletBinding;
+ bindingInitialized.set(false);
}
public void setHeaderFilterStrategy(HeaderFilterStrategy
headerFilterStrategy) {
