Author: ningjiang
Date: Thu Jul 10 21:45:40 2008
New Revision: 675833
URL: http://svn.apache.org/viewvc?rev=675833&view=rev
Log:
CAMEL-694 applied patch with thank to William
Modified:
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/language/bean/BeanExpression.java
activemq/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/transport/CamelTransportFactory.java
Modified:
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/language/bean/BeanExpression.java
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/language/bean/BeanExpression.java?rev=675833&r1=675832&r2=675833&view=diff
==============================================================================
---
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/language/bean/BeanExpression.java
(original)
+++
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/language/bean/BeanExpression.java
Thu Jul 10 21:45:40 2008
@@ -53,7 +53,7 @@
try {
Exchange newExchange = exchange.copy();
// The BeanExperession always has a result regardless of the
ExchangePattern,
- // so I add a checker here to make sure we can get the result .
+ // so I add a checker here to make sure we can get the result.
if (!newExchange.getPattern().isOutCapable()) {
newExchange.setPattern(ExchangePattern.InOut);
}
Modified:
activemq/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/transport/CamelTransportFactory.java
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/transport/CamelTransportFactory.java?rev=675833&r1=675832&r2=675833&view=diff
==============================================================================
---
activemq/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/transport/CamelTransportFactory.java
(original)
+++
activemq/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/transport/CamelTransportFactory.java
Thu Jul 10 21:45:40 2008
@@ -26,7 +26,6 @@
import org.apache.camel.CamelContext;
import org.apache.cxf.Bus;
-import org.apache.cxf.configuration.Configurer;
import org.apache.cxf.service.model.EndpointInfo;
import org.apache.cxf.transport.AbstractTransportFactory;
import org.apache.cxf.transport.Conduit;
@@ -68,7 +67,7 @@
public void setActivationNamespaces(Collection<String> ans) {
activationNamespaces = ans;
}
-
+
public CamelContext getCamelContext() {
return camelContext;
}
@@ -87,18 +86,13 @@
}
public Destination getDestination(EndpointInfo endpointInfo) throws
IOException {
- CamelDestination destination = new CamelDestination(camelContext, bus,
this, endpointInfo);
- Configurer configurer = bus.getExtension(Configurer.class);
- if (null != configurer) {
- configurer.configureBean(destination);
- }
- return destination;
+ return new CamelDestination(camelContext, bus, this, endpointInfo);
}
public Set<String> getUriPrefixes() {
return URI_PREFIXES;
}
-
+
@PostConstruct
void registerWithBindingManager() {
if (null == bus) {