svn commit: r885197 - in /camel/trunk/camel-core/src/main/java/org/apache/camel: model/ processor/ processor/interceptor/
Author: davsclaus
Date: Sun Nov 29 07:41:50 2009
New Revision: 885197
URL: http://svn.apache.org/viewvc?rev=885197&view=rev
Log:
CAMEL-2235: Polished tracer a bit and fixed CBR not setting parent on when and
otherwise
Modified:
camel/trunk/camel-core/src/main/java/org/apache/camel/model/ChoiceDefinition.java
camel/trunk/camel-core/src/main/java/org/apache/camel/model/InterceptSendToEndpointDefinition.java
camel/trunk/camel-core/src/main/java/org/apache/camel/processor/SendProcessor.java
camel/trunk/camel-core/src/main/java/org/apache/camel/processor/ThrowExceptionProcessor.java
camel/trunk/camel-core/src/main/java/org/apache/camel/processor/WireTapProcessor.java
camel/trunk/camel-core/src/main/java/org/apache/camel/processor/interceptor/DefaultTraceFormatter.java
Modified:
camel/trunk/camel-core/src/main/java/org/apache/camel/model/ChoiceDefinition.java
URL:
http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/model/ChoiceDefinition.java?rev=885197&r1=885196&r2=885197&view=diff
==
---
camel/trunk/camel-core/src/main/java/org/apache/camel/model/ChoiceDefinition.java
(original)
+++
camel/trunk/camel-core/src/main/java/org/apache/camel/model/ChoiceDefinition.java
Sun Nov 29 07:41:50 2009
@@ -84,7 +84,9 @@
* @return the builder
*/
public ChoiceDefinition when(Predicate predicate) {
-getWhenClauses().add(new WhenDefinition(predicate));
+WhenDefinition when = new WhenDefinition(predicate);
+when.setParent(this);
+getWhenClauses().add(when);
return this;
}
@@ -95,6 +97,7 @@
*/
public ExpressionClause when() {
WhenDefinition when = new WhenDefinition();
+when.setParent(this);
getWhenClauses().add(when);
ExpressionClause clause = new
ExpressionClause(this);
when.setExpression(clause);
@@ -108,6 +111,7 @@
*/
public ChoiceDefinition otherwise() {
OtherwiseDefinition answer = new OtherwiseDefinition();
+answer.setParent(this);
setOtherwise(answer);
return this;
}
Modified:
camel/trunk/camel-core/src/main/java/org/apache/camel/model/InterceptSendToEndpointDefinition.java
URL:
http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/model/InterceptSendToEndpointDefinition.java?rev=885197&r1=885196&r2=885197&view=diff
==
---
camel/trunk/camel-core/src/main/java/org/apache/camel/model/InterceptSendToEndpointDefinition.java
(original)
+++
camel/trunk/camel-core/src/main/java/org/apache/camel/model/InterceptSendToEndpointDefinition.java
Sun Nov 29 07:41:50 2009
@@ -44,7 +44,7 @@
// TODO: interceptSendToEndpoint needs to proxy the endpoints at very first
// so when other processors uses an endpoint its already proxied, see
workaround in SendProcessor
-// needed when we havent proxied beforehand. This requires some work in
the route builder in Camel
+// needed when we haven't proxied beforehand. This requires some work in
the route builder in Camel
// to implement so that should be a part of a bigger rework/improvement in
the future
@XmlAttribute(required = true)
Modified:
camel/trunk/camel-core/src/main/java/org/apache/camel/processor/SendProcessor.java
URL:
http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/SendProcessor.java?rev=885197&r1=885196&r2=885197&view=diff
==
---
camel/trunk/camel-core/src/main/java/org/apache/camel/processor/SendProcessor.java
(original)
+++
camel/trunk/camel-core/src/main/java/org/apache/camel/processor/SendProcessor.java
Sun Nov 29 07:41:50 2009
@@ -62,7 +62,7 @@
}
public String getTraceLabel() {
-return destination.getEndpointUri();
+return "to(" + destination.getEndpointUri() + ")";
}
public void process(final Exchange exchange) throws Exception {
Modified:
camel/trunk/camel-core/src/main/java/org/apache/camel/processor/ThrowExceptionProcessor.java
URL:
http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/ThrowExceptionProcessor.java?rev=885197&r1=885196&r2=885197&view=diff
==
---
camel/trunk/camel-core/src/main/java/org/apache/camel/processor/ThrowExceptionProcessor.java
(original)
+++
camel/trunk/camel-core/src/main/java/org/apache/camel/processor/ThrowExceptionProcessor.java
Sun Nov 29 07:41:50 2009
@@ -22,7 +22,7 @@
/**
* The processor which implements the ThrowException DSL
*/
-public class ThrowExceptionProcessor implements Processor {
+public class ThrowExceptionProcessor implements Processor, Traceable {
private final Exception exception;
svn commit: r885196 - in /camel/trunk/examples/camel-example-guice-jms/src/main/java/org/apache/camel/example/guice/jms: MyModule.java MyOSGiModule.java MyRouteBuilder.java Printer.java SomeBean.java
Author: ningjiang
Date: Sun Nov 29 07:00:51 2009
New Revision: 885196
URL: http://svn.apache.org/viewvc?rev=885196&view=rev
Log:
Updated the camel-example-guice-jms according to the user request
Added:
camel/trunk/examples/camel-example-guice-jms/src/main/java/org/apache/camel/example/guice/jms/Printer.java
(with props)
Modified:
camel/trunk/examples/camel-example-guice-jms/src/main/java/org/apache/camel/example/guice/jms/MyModule.java
camel/trunk/examples/camel-example-guice-jms/src/main/java/org/apache/camel/example/guice/jms/MyOSGiModule.java
camel/trunk/examples/camel-example-guice-jms/src/main/java/org/apache/camel/example/guice/jms/MyRouteBuilder.java
camel/trunk/examples/camel-example-guice-jms/src/main/java/org/apache/camel/example/guice/jms/SomeBean.java
Modified:
camel/trunk/examples/camel-example-guice-jms/src/main/java/org/apache/camel/example/guice/jms/MyModule.java
URL:
http://svn.apache.org/viewvc/camel/trunk/examples/camel-example-guice-jms/src/main/java/org/apache/camel/example/guice/jms/MyModule.java?rev=885196&r1=885195&r2=885196&view=diff
==
---
camel/trunk/examples/camel-example-guice-jms/src/main/java/org/apache/camel/example/guice/jms/MyModule.java
(original)
+++
camel/trunk/examples/camel-example-guice-jms/src/main/java/org/apache/camel/example/guice/jms/MyModule.java
Sun Nov 29 07:00:51 2009
@@ -16,6 +16,7 @@
*/
package org.apache.camel.example.guice.jms;
+import com.google.inject.Injector;
import com.google.inject.Provides;
import com.google.inject.name.Named;
import org.apache.activemq.ActiveMQConnectionFactory;
@@ -37,6 +38,7 @@
// lets add in any RouteBuilder instances we want to use
bind(MyRouteBuilder.class);
+bind(Printer.class);
}
/**
@@ -48,4 +50,10 @@
JmsComponent jms(@Named("activemq.brokerURL") String brokerUrl) {
return JmsComponent.jmsComponent(new
ActiveMQConnectionFactory(brokerUrl));
}
+
+@Provides
+@JndiBind("myBean")
+SomeBean someBean(Injector injector) {
+return injector.getInstance(SomeBean.class);
+}
}
Modified:
camel/trunk/examples/camel-example-guice-jms/src/main/java/org/apache/camel/example/guice/jms/MyOSGiModule.java
URL:
http://svn.apache.org/viewvc/camel/trunk/examples/camel-example-guice-jms/src/main/java/org/apache/camel/example/guice/jms/MyOSGiModule.java?rev=885196&r1=885195&r2=885196&view=diff
==
---
camel/trunk/examples/camel-example-guice-jms/src/main/java/org/apache/camel/example/guice/jms/MyOSGiModule.java
(original)
+++
camel/trunk/examples/camel-example-guice-jms/src/main/java/org/apache/camel/example/guice/jms/MyOSGiModule.java
Sun Nov 29 07:00:51 2009
@@ -22,6 +22,7 @@
import java.net.URL;
import java.util.Properties;
+import com.google.inject.Injector;
import com.google.inject.Provides;
import com.google.inject.name.Names;
import org.apache.activemq.ActiveMQConnectionFactory;
@@ -71,6 +72,7 @@
@Override
protected void configure() {
+// loading the properties into Guice Context
Names.bindProperties(binder(), properties);
super.configure();
}
Modified:
camel/trunk/examples/camel-example-guice-jms/src/main/java/org/apache/camel/example/guice/jms/MyRouteBuilder.java
URL:
http://svn.apache.org/viewvc/camel/trunk/examples/camel-example-guice-jms/src/main/java/org/apache/camel/example/guice/jms/MyRouteBuilder.java?rev=885196&r1=885195&r2=885196&view=diff
==
---
camel/trunk/examples/camel-example-guice-jms/src/main/java/org/apache/camel/example/guice/jms/MyRouteBuilder.java
(original)
+++
camel/trunk/examples/camel-example-guice-jms/src/main/java/org/apache/camel/example/guice/jms/MyRouteBuilder.java
Sun Nov 29 07:00:51 2009
@@ -45,8 +45,7 @@
to("file://target/routeOutput");
// set up a listener on the file component
-from("file://target/routeOutput?noop=true").
-bean(new SomeBean());
+from("file://target/routeOutput?noop=true").beanRef("myBean");
}
}
\ No newline at end of file
Added:
camel/trunk/examples/camel-example-guice-jms/src/main/java/org/apache/camel/example/guice/jms/Printer.java
URL:
http://svn.apache.org/viewvc/camel/trunk/examples/camel-example-guice-jms/src/main/java/org/apache/camel/example/guice/jms/Printer.java?rev=885196&view=auto
==
---
camel/trunk/examples/camel-example-guice-jms/src/main/java/org/apache/camel/example/guice/jms/Printer.java
(added)
+++
camel/trunk/examples/camel-example-guice-jms/src/main/java/org/apache/camel/example/guice/jms/Printer.java
Sun Nov 29 07:00:51 2009
@@ -0,0 +1,25 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF
svn commit: r885153 - /camel/trunk/components/camel-juel/src/main/java/org/apache/camel/language/juel/JuelExpression.java
Author: gertv
Date: Sat Nov 28 21:47:46 2009
New Revision: 885153
URL: http://svn.apache.org/viewvc?rev=885153&view=rev
Log:
CAMEL-1567: Use JUEL ExpressionFactoryImpl instead of using the EL lookup
mechanism
Modified:
camel/trunk/components/camel-juel/src/main/java/org/apache/camel/language/juel/JuelExpression.java
Modified:
camel/trunk/components/camel-juel/src/main/java/org/apache/camel/language/juel/JuelExpression.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-juel/src/main/java/org/apache/camel/language/juel/JuelExpression.java?rev=885153&r1=885152&r2=885153&view=diff
==
---
camel/trunk/components/camel-juel/src/main/java/org/apache/camel/language/juel/JuelExpression.java
(original)
+++
camel/trunk/components/camel-juel/src/main/java/org/apache/camel/language/juel/JuelExpression.java
Sat Nov 28 21:47:46 2009
@@ -27,6 +27,7 @@
import javax.el.MapELResolver;
import javax.el.ResourceBundleELResolver;
import javax.el.ValueExpression;
+import de.odysseus.el.ExpressionFactoryImpl;
import de.odysseus.el.util.SimpleContext;
import org.apache.camel.Exchange;
import org.apache.camel.Message;
@@ -65,7 +66,7 @@
public ExpressionFactory getExpressionFactory() {
if (expressionFactory == null) {
Properties properties = getExpressionFactoryProperties();
-expressionFactory = ExpressionFactory.newInstance(properties);
+expressionFactory = new ExpressionFactoryImpl(properties);
}
return expressionFactory;
}
[CONF] Apache Camel > Camel 2.0.0 Release
Camel 2.0.0 Release
Page edited by Jonathan Anstey
Fixing broken download links for 2.0.0 release
Fixing broken download links for 2.0.0 release
Camel 2.0.0 release
New and Noteworthy
Welcome to the 2.0.0 release which approx 760 issues resolved (new features, improvements and bug fixes such as...)
Introduced type converter registry to allow end users to programmatic get access to this registry
major improvements to Jetty for better handling of exception/faults and easier end-user customization how response should be written
major improvements to File for consuming files, now supporting pluggable sorting, filtering and idempotent repositories.
major refactor and improvements to FTP, aligning it with the File component.
minor improvements to JDBC, SQL, HTTP and MINA
major refactor and improvements to CXF component. CxfBinding, HeaderFilterStrategy, Bus can be looked up from registry and configured at the endpoint level.
File and FTP producers added option to write files using a temporary name and then rename it to the real name after the write completes
SFTP added support for knownhosts and privatekey files
Mail now supports setting additional SUN java mail properties
MINA now supports setting text line delimiters for textline codec.
MINA producer now throws CamelExchangeException in case no response received from remote server when in sync mode (sync=true)
RedeliveryPolicy added support for ref attribute to reference a existing policy in the Registry
RedeliveryPolicy added delayPattern option for using a special pattern for setting different delay based on intervals
Added onWhen and retryUntil predicates to Exception Clause
List component renamed to Browse
Exception Clause is much smarter as it will use caused by exception hierarchy for matching as well (will use bottom ups)
Dead Letter Channel and Exception Clause now have onRedeliver to allow custom processing an Exchange before its being redelivered. Allowing you to work on the message being sent.
Added support for # syntax in Endpoint URI's to allow endpoint URI's to refer to bean in the Registry.
consumer. prefix can be omitted for scheduled polling consumers such as File, FTP consumers. Thus the URI options is more simpler and you don't have to remember which requires consumer. prefix and which doesn't.
Tracer improved to allow custom routing and processing of TraceEventMessage so you can store trace logs as you like, for instance in a database.
Tracer now also displays the previous node so you can see where the Exchange is coming from.
Quartz has added support for stateful jobs.
Introduced @FallbackConverter for using annotation based fallback type converters
Extended content enrichment support via the enrich DSL element.
Simple language now supports a basic set of operators.
Aggregator now supports grouped exchanges out of the box, so you can combine all aggregated exchanges into a single grouped exchange going out.
Multiple inputs can be define as input to routes: from("activemq:queue:order", "file://order").to("bean:handleOrder");
CXF component supports a new "cxfbean" endpoint that allows RESTful requests to be routed to JAXRS annotated service beans.
Setting cron _expression_ in camel-quartz improved.
Better handling of interrupts while shutting down.
The JMSReplyTo destination is available as Exchange property when consuming JMS messages.
Better support for InOptionalOut Message Exchange Pattern.
Pluggable Class Resolvers SPI for class resolvers allowing third party platforms such as JBoss to provide integration with Camel.
Refined API to reduce package tangling.
Introduced wireTap node for the Wire Tap EIP pattern, supporting the traditional tapping and sending a new message.
Added fromF and toF in the Java DSL to build uri strings using String.format with arguments, e.g.: fromF("ftp://%...@myserver?password=%s", user, password)..to
Improved tooling being able to retrieve more runtime information from the CamelContext
Scala DSL is improved
Added JmsMessageType option to JMS to allow you to set which javax.jms.Message implementation to use for sending a JMS message.
Fixed a rare bug when JMX is disabled, a Dead Letter Channel could mistakenly be added to some routes, when a global noErrorHandler was configured.
JMS is now able to preserve hyphen in JMS keys (eg Content-Type can be sent as a Message header). Introduced pluggable strategy to allow end users to use their custom key formatter for encode/decode.
Added option transferExchange to JMS so you can transfer the Exchange over the wire. Can be used to use JMS queues for Dead Letter Channel to preserve all information from the failed Exchange including the original exception with stack trace.
Added option transferException to JMS so when using Request Reply messaging with JMS, any caused exception on the server side will be returned as response to the clie
svn commit: r885088 - /camel/trunk/platforms/karaf/features/pom.xml
Author: gertv Date: Sat Nov 28 12:24:12 2009 New Revision: 885088 URL: http://svn.apache.org/viewvc?rev=885088&view=rev Log: CAMEL-1567: Upgrade to juel bundle 2.1.2_1-SNAPSHOT Modified: camel/trunk/platforms/karaf/features/pom.xml Modified: camel/trunk/platforms/karaf/features/pom.xml URL: http://svn.apache.org/viewvc/camel/trunk/platforms/karaf/features/pom.xml?rev=885088&r1=885087&r2=885088&view=diff == --- camel/trunk/platforms/karaf/features/pom.xml (original) +++ camel/trunk/platforms/karaf/features/pom.xml Sat Nov 28 12:24:12 2009 @@ -80,7 +80,7 @@ 1.5_3 0.1.31_3 1.0.1 - 2.1.0_2 + 2.1.2_1-SNAPSHOT 4.7_1 2.0.8_3 1.1.7_3
svn commit: r885081 - in /camel/trunk/tests/test-bundles: mock-javamail_1.7/pom.xml pom.xml
Author: davsclaus
Date: Sat Nov 28 10:22:47 2009
New Revision: 885081
URL: http://svn.apache.org/viewvc?rev=885081&view=rev
Log:
Polished name in pom to be aligned with the others
Modified:
camel/trunk/tests/test-bundles/mock-javamail_1.7/pom.xml
camel/trunk/tests/test-bundles/pom.xml
Modified: camel/trunk/tests/test-bundles/mock-javamail_1.7/pom.xml
URL:
http://svn.apache.org/viewvc/camel/trunk/tests/test-bundles/mock-javamail_1.7/pom.xml?rev=885081&r1=885080&r2=885081&view=diff
==
--- camel/trunk/tests/test-bundles/mock-javamail_1.7/pom.xml (original)
+++ camel/trunk/tests/test-bundles/mock-javamail_1.7/pom.xml Sat Nov 28
10:22:47 2009
@@ -30,7 +30,7 @@
org.apache.camel.tests.mock-javamail_1.7
2.1-SNAPSHOT
bundle
-Apache Camel Test Bundles: ${pkgArtifactId}-${pkgVersion}
+Camel :: Test Bundles: ${pkgArtifactId}-${pkgVersion}
This bundle simply wraps ${pkgArtifactId}-${pkgVersion}.jar.
Modified: camel/trunk/tests/test-bundles/pom.xml
URL:
http://svn.apache.org/viewvc/camel/trunk/tests/test-bundles/pom.xml?rev=885081&r1=885080&r2=885081&view=diff
==
--- camel/trunk/tests/test-bundles/pom.xml (original)
+++ camel/trunk/tests/test-bundles/pom.xml Sat Nov 28 10:22:47 2009
@@ -30,7 +30,7 @@
bundles-pom
pom
2.1-SNAPSHOT
-Apache Camel Tests Bundles
+Camel :: Tests Bundles
1.0
