svn commit: r908377 - in /camel/trunk: camel-core/src/main/java/org/apache/camel/ camel-core/src/main/java/org/apache/camel/impl/converter/ camel-core/src/main/java/org/apache/camel/model/ camel-core/
Author: ningjiang Date: Wed Feb 10 07:57:06 2010 New Revision: 908377 URL: http://svn.apache.org/viewvc?rev=908377&view=rev Log: Removed the useless svn:mergeinfo Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/FallbackConverter.java (props changed) camel/trunk/camel-core/src/main/java/org/apache/camel/impl/converter/InstanceMethodFallbackTypeConverter.java (props changed) camel/trunk/camel-core/src/main/java/org/apache/camel/impl/converter/StaticMethodFallbackTypeConverter.java (props changed) camel/trunk/camel-core/src/main/java/org/apache/camel/model/DataFormatDefinition.java (props changed) camel/trunk/camel-core/src/main/java/org/apache/camel/model/LoadBalancerDefinition.java (props changed) camel/trunk/camel-core/src/test/java/org/apache/camel/processor/TraceableUnitOfWorkTest.java (props changed) camel/trunk/components/camel-atom/src/test/java/org/apache/camel/component/atom/AtomEndpointTest.java (props changed) camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/cxfbean/CxfBeanTest.java (props changed) camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/jaxrs/testbean/Customer.java (props changed) camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/jaxrs/testbean/CustomerService.java (props changed) camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/jaxrs/testbean/Order.java (props changed) camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/jaxrs/testbean/Product.java (props changed) camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/mtom/CxfMtomConsumerTest.java (props changed) camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/soap/headers/Constants.java (props changed) camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/soap/headers/CustomHeaderFilter.java (props changed) camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/soap/headers/CxfMessageHeadersRelayTest.java (props changed) camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/soap/headers/HeaderTesterImpl.java (props changed) camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/transport/CamelTransportTestSupport.java (props changed) camel/trunk/components/camel-guice/src/test/java/org/apache/camel/guice/CollectionOfCustomRoutesTest.java (props changed) camel/trunk/components/camel-http/src/test/java/org/apache/camel/component/http/HttpInvalidHttpClientConfigurationTest.java (props changed) camel/trunk/components/camel-jdbc/src/test/java/org/apache/camel/component/jdbc/JdbcEndpointTest.java (props changed) camel/trunk/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaInOutWithForcedNoResponseTest.java (props changed) camel/trunk/components/camel-osgi/src/test/java/org/apache/camel/osgi/ServiceRegistryTest.java (props changed) camel/trunk/components/camel-quartz/src/test/java/org/apache/camel/component/quartz/QuartzEndpointTest.java (props changed) camel/trunk/components/camel-quickfix/src/main/java/org/apache/camel/component/quickfix/converter/QuickFixConverter.java (props changed) camel/trunk/components/camel-quickfix/src/test/java/org/apache/camel/component/quickfix/example/ (props changed) camel/trunk/components/camel-restlet/src/test/java/org/apache/camel/component/restlet/RestletRouteBuilderTest.java (props changed) camel/trunk/components/camel-rss/src/test/java/org/apache/camel/component/rss/RssEndpointTest.java (props changed) camel/trunk/components/camel-servlet/src/test/resources/log4j.properties (props changed) camel/trunk/components/camel-soap/src/main/java/org/apache/camel/dataformat/soap/SoapJaxbDataFormat.java (props changed) camel/trunk/components/camel-soap/src/main/java/org/apache/camel/dataformat/soap/name/ (props changed) camel/trunk/components/camel-soap/src/test/java/org/apache/camel/dataformat/soap/CustomerServerBean.java (props changed) camel/trunk/components/camel-soap/src/test/java/org/apache/camel/dataformat/soap/SoapClientTest.java (props changed) camel/trunk/components/camel-soap/src/test/java/org/apache/camel/dataformat/soap/SoapMarshalSetterTest.java (props changed) camel/trunk/components/camel-soap/src/test/java/org/apache/camel/dataformat/soap/SoapMarshalTest.java (props changed) camel/trunk/components/camel-soap/src/test/java/org/apache/camel/dataformat/soap/SoapRoundtripTest.java (props changed) camel/trunk/components/camel-soap/src/test/java/org/apache/camel/dataformat/soap/SoapServerTest.java (props changed) camel/trunk/components/camel-soap/src/test/java/org/apache/camel/dataformat/so
svn commit: r908374 - /camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/spring/CxfEndpointBeanWithBusTest.java
Author: ningjiang
Date: Wed Feb 10 07:51:49 2010
New Revision: 908374
URL: http://svn.apache.org/viewvc?rev=908374&view=rev
Log:
Revert the code which should not be committed
Modified:
camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/spring/CxfEndpointBeanWithBusTest.java
Modified:
camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/spring/CxfEndpointBeanWithBusTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/spring/CxfEndpointBeanWithBusTest.java?rev=908374&r1=908373&r2=908374&view=diff
==
---
camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/spring/CxfEndpointBeanWithBusTest.java
(original)
+++
camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/spring/CxfEndpointBeanWithBusTest.java
Wed Feb 10 07:51:49 2010
@@ -19,7 +19,6 @@
import org.apache.camel.CamelContext;
import org.apache.camel.component.cxf.CxfEndpoint;
-import org.apache.cxf.Bus;
import org.apache.cxf.interceptor.LoggingInInterceptor;
import org.junit.Before;
import org.junit.Test;
@@ -41,20 +40,13 @@
@Test
public void testBusInjectedBySpring() throws Exception {
CamelContext camelContext = (CamelContext) ctx.getBean("camel");
-Bus bus = (Bus)camelContext.getRegistry().lookup("cxf");
-System.out.println("bus cxf is " + bus.getId());
-
CxfEndpoint endpoint =
(CxfEndpoint)camelContext.getEndpoint("cxf:bean:routerEndpoint");
-System.out.println("endpoint bus id " + endpoint.getBus().getId());
-
-endpoint =
(CxfEndpoint)camelContext.getEndpoint("cxf:bean:serviceEndpoint");
// verify the interceptor that is added by the logging feature
// Spring 3.0.0 has an issue of SPR-6589 which will call the
BusApplicationListener twice for the same event,
// so we will get more one InInterceptors here
-/*assertTrue(endpoint.getBus().getInInterceptors().size() >= 1);
-assertEquals(LoggingInInterceptor.class,
endpoint.getBus().getInInterceptors().get(0).getClass());*/
-System.out.println("endpoint bus id " + endpoint.getBus().getId());
+assertTrue(endpoint.getBus().getInInterceptors().size() >= 1);
+assertEquals(LoggingInInterceptor.class,
endpoint.getBus().getInInterceptors().get(0).getClass());
}
}
svn commit: r908365 - in /camel/trunk/components/camel-cxf/src/test: java/org/apache/camel/component/cxf/spring/ resources/org/apache/camel/component/cxf/spring/
Author: ningjiang
Date: Wed Feb 10 06:46:46 2010
New Revision: 908365
URL: http://svn.apache.org/viewvc?rev=908365&view=rev
Log:
Added test code for setting different CXF buses to the cxfEndpoints
Added:
camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/spring/CxfEndpointBeanBusSettingTest.java
(with props)
camel/trunk/components/camel-cxf/src/test/resources/org/apache/camel/component/cxf/spring/CxfEndpointBeansBusSetting.xml
(with props)
Modified:
camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/spring/CxfEndpointBeanWithBusTest.java
Added:
camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/spring/CxfEndpointBeanBusSettingTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/spring/CxfEndpointBeanBusSettingTest.java?rev=908365&view=auto
==
---
camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/spring/CxfEndpointBeanBusSettingTest.java
(added)
+++
camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/spring/CxfEndpointBeanBusSettingTest.java
Wed Feb 10 06:46:46 2010
@@ -0,0 +1,48 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.camel.component.cxf.spring;
+
+import org.apache.camel.CamelContext;
+import org.apache.camel.component.cxf.CxfEndpoint;
+import org.apache.cxf.Bus;
+import org.junit.Test;
+
+public class CxfEndpointBeanBusSettingTest extends
AbstractSpringBeanTestSupport {
+
+@Override
+protected String[] getApplicationContextFiles() {
+return new
String[]{"org/apache/camel/component/cxf/spring/CxfEndpointBeansBusSetting.xml"};
+}
+
+@Test
+public void testBusInjectedBySpring() throws Exception {
+CamelContext camelContext = (CamelContext) ctx.getBean("camel");
+
+CxfEndpoint endpoint =
(CxfEndpoint)camelContext.getEndpoint("cxf:bean:routerEndpoint");
+Bus cxf1 = endpoint.getBus();
+
+assertTrue(cxf1.getOutInterceptors().size() >= 1);
+assertTrue(cxf1.getInInterceptors().size() == 0);
+
+endpoint =
(CxfEndpoint)camelContext.getEndpoint("cxf:bean:serviceEndpoint");
+Bus cxf2 = endpoint.getBus();
+assertTrue(cxf2.getInInterceptors().size() >= 1);
+assertTrue(cxf2.getOutInterceptors().size() == 0);
+
+}
+
+}
Propchange:
camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/spring/CxfEndpointBeanBusSettingTest.java
--
svn:eol-style = native
Propchange:
camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/spring/CxfEndpointBeanBusSettingTest.java
--
svn:keywords = Rev Date
Modified:
camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/spring/CxfEndpointBeanWithBusTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/spring/CxfEndpointBeanWithBusTest.java?rev=908365&r1=908364&r2=908365&view=diff
==
---
camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/spring/CxfEndpointBeanWithBusTest.java
(original)
+++
camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/spring/CxfEndpointBeanWithBusTest.java
Wed Feb 10 06:46:46 2010
@@ -19,6 +19,7 @@
import org.apache.camel.CamelContext;
import org.apache.camel.component.cxf.CxfEndpoint;
+import org.apache.cxf.Bus;
import org.apache.cxf.interceptor.LoggingInInterceptor;
import org.junit.Before;
import org.junit.Test;
@@ -40,13 +41,20 @@
@Test
public void testBusInjectedBySpring() throws Exception {
CamelContext camelContext = (CamelContext) ctx.getBean("camel");
+Bus bus = (Bus)camelContext.getRegistry().lookup("cxf");
+System.out.println("bus cxf is " + bus.getId(
svn commit: r908326 - in /camel/trunk/components/camel-jms/src/main/java/org/apache/camel/component/jms: JmsTemporaryQueueEndpoint.java JmsTemporaryTopicEndpoint.java
Author: ningjiang
Date: Wed Feb 10 02:39:35 2010
New Revision: 908326
URL: http://svn.apache.org/viewvc?rev=908326&view=rev
Log:
CAMEL-2456 added ManagedResource annotation on JmsTemporaryQueueEndpoint and
JmsTemporaryTopicEndpoint
Modified:
camel/trunk/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsTemporaryQueueEndpoint.java
camel/trunk/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsTemporaryTopicEndpoint.java
Modified:
camel/trunk/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsTemporaryQueueEndpoint.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsTemporaryQueueEndpoint.java?rev=908326&r1=908325&r2=908326&view=diff
==
---
camel/trunk/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsTemporaryQueueEndpoint.java
(original)
+++
camel/trunk/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsTemporaryQueueEndpoint.java
Wed Feb 10 02:39:35 2010
@@ -21,6 +21,8 @@
import javax.jms.Session;
import javax.jms.TemporaryQueue;
+import org.springframework.jmx.export.annotation.ManagedResource;
+
/**
* A http://activemq.apache.org/jms.html";>JMS Endpoint
* for working with a {...@link TemporaryQueue}
@@ -28,6 +30,7 @@
* @version $Revision$
*/
// TODO need to be really careful to always use the same Connection otherwise
the destination goes stale
+...@managedresource(description = "Managed JMS Temporary Queue Endpoint")
public class JmsTemporaryQueueEndpoint extends JmsQueueEndpoint implements
DestinationEndpoint {
private Destination jmsDestination;
Modified:
camel/trunk/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsTemporaryTopicEndpoint.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsTemporaryTopicEndpoint.java?rev=908326&r1=908325&r2=908326&view=diff
==
---
camel/trunk/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsTemporaryTopicEndpoint.java
(original)
+++
camel/trunk/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsTemporaryTopicEndpoint.java
Wed Feb 10 02:39:35 2010
@@ -21,6 +21,8 @@
import javax.jms.Session;
import javax.jms.TemporaryTopic;
+import org.springframework.jmx.export.annotation.ManagedResource;
+
/**
* A http://activemq.apache.org/jms.html";>JMS Endpoint
* for working with a {...@link TemporaryTopic}
@@ -28,6 +30,7 @@
* @version $Revision$
*/
// TODO need to be really careful to always use the same Connection otherwise
the destination goes stale
+...@managedresource(description = "Managed JMS Temporay Topic Endpoint")
public class JmsTemporaryTopicEndpoint extends JmsEndpoint implements
DestinationEndpoint {
private Destination jmsDestination;
svn commit: r908073 - in /camel/trunk/camel-core/src: main/java/org/apache/camel/processor/MulticastProcessor.java main/java/org/apache/camel/processor/Splitter.java test/java/org/apache/camel/issues/
Author: davsclaus
Date: Tue Feb 9 15:33:14 2010
New Revision: 908073
URL: http://svn.apache.org/viewvc?rev=908073&view=rev
Log:
CAMEL-2360: Fixed issue error handler in recipient list in parallel mode in
rare case had a timing condition causing error handler not be properly
initialized.
Modified:
camel/trunk/camel-core/src/main/java/org/apache/camel/processor/MulticastProcessor.java
camel/trunk/camel-core/src/main/java/org/apache/camel/processor/Splitter.java
camel/trunk/camel-core/src/test/java/org/apache/camel/issues/RetryRouteScopedUntilRecipientListIssueTest.java
Modified:
camel/trunk/camel-core/src/main/java/org/apache/camel/processor/MulticastProcessor.java
URL:
http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/MulticastProcessor.java?rev=908073&r1=908072&r2=908073&view=diff
==
---
camel/trunk/camel-core/src/main/java/org/apache/camel/processor/MulticastProcessor.java
(original)
+++
camel/trunk/camel-core/src/main/java/org/apache/camel/processor/MulticastProcessor.java
Tue Feb 9 15:33:14 2010
@@ -42,6 +42,7 @@
import org.apache.camel.spi.TracedRouteNodes;
import org.apache.camel.util.EventHelper;
import org.apache.camel.util.ExchangeHelper;
+import org.apache.camel.util.ObjectHelper;
import org.apache.camel.util.ServiceHelper;
import org.apache.camel.util.concurrent.AtomicExchange;
import org.apache.camel.util.concurrent.ExecutorServiceHelper;
@@ -68,10 +69,21 @@
*/
static class ProcessorExchangePair {
private final Processor processor;
+private final Processor prepared;
private final Exchange exchange;
-public ProcessorExchangePair(Processor processor, Exchange exchange) {
+/**
+ * Private constructor as you must use the static creator
+ * {...@link
org.apache.camel.processor.MulticastProcessor#createProcessorExchangePair(org.apache.camel.Processor,
+ *org.apache.camel.Exchange)} which prepares the processor
before its ready to be used.
+ *
+ * @param processor the original processor
+ * @param prepared the prepared processor
+ * @param exchange the exchange
+ */
+private ProcessorExchangePair(Processor processor, Processor prepared,
Exchange exchange) {
this.processor = processor;
+this.prepared = prepared;
this.exchange = exchange;
}
@@ -79,6 +91,10 @@
return processor;
}
+public Processor getPrepared() {
+return prepared;
+}
+
public Exchange getExchange() {
return exchange;
}
@@ -166,7 +182,8 @@
final AtomicInteger total = new AtomicInteger(0);
for (ProcessorExchangePair pair : pairs) {
-final Processor producer = pair.getProcessor();
+final Processor processor = pair.getProcessor();
+final Processor prepared = pair.getPrepared();
final Exchange subExchange = pair.getExchange();
updateNewExchange(subExchange, total.intValue(), pairs);
@@ -177,7 +194,7 @@
return subExchange;
}
-doProcess(producer, subExchange);
+doProcess(processor, prepared, subExchange);
// should we stop in case of an exception occurred during
processing?
if (stopOnException && subExchange.getException() != null)
{
@@ -213,11 +230,12 @@
int total = 0;
for (ProcessorExchangePair pair : pairs) {
-Processor producer = pair.getProcessor();
+Processor processor = pair.getProcessor();
+Processor prepared = pair.getPrepared();
Exchange subExchange = pair.getExchange();
updateNewExchange(subExchange, total, pairs);
-doProcess(producer, subExchange);
+doProcess(processor, prepared, subExchange);
// should we stop in case of an exception occurred during
processing?
if (stopOnException && subExchange.getException() != null) {
@@ -239,12 +257,12 @@
}
}
-private void doProcess(Processor producer, Exchange exchange) {
+private void doProcess(Processor processor, Processor prepared, Exchange
exchange) {
TracedRouteNodes traced = exchange.getUnitOfWork() != null ?
exchange.getUnitOfWork().getTracedRouteNodes() : null;
// compute time taken if sending to another endpoint
long start = 0;
-if (producer instanceof Producer) {
+if (processor instanceof Producer) {
start = System.currentTimeMillis();
}
@@ -254,26 +272,8 @@
traced.pushBlock();
}
-// set property which endpoint we send to
-setToEndpoint(exchange, producer);
-
-
[CONF] Apache Camel > Camel 2.3.0 Release
Camel 2.3.0 Release Page edited by willem jiang Camel 2.3.0 release (currently in progress) New and Noteworthy Welcome to the 2.3.0 release which approx XXX issues resolved (new features, improvements and bug fixes such as...) Property placeholders in endpoint uris is not natively supported in camel-core which means you no long need to use Spring for that. It works therefore in any environment as its provided out of the box in camel-core. Added ExchangeSentEvent to EventNotifier which contains time taken and is emitted when an Exchange is sent to an Endpoint. This allows end users to easily gather performance stats for Exchange send to endpoints. Added disconnect option to MINA to close Mina session right after usage. Supported to get the HttpServletRequest and HttpServletResponse from the message header. New Enterprise Integration Patterns New Components camel-nagios for sending passive checks to Nagios properties for using property placeholders to resolve endpoint uris. camel-gae extensions gauth component for implementing OAuth consumers. glogin component for programmatic login to Google App Engine applications from Java clients. New DSL New Annotations New Data Formats camel soap New Languages New Examples API breaking Mina The header key MinaConsumer.HEADER_CLOSE_SESSION_WHEN_COMPLETE is moved to MinaConstants.MINA_CLOSE_SESSION_WHEN_COMPLETE Known Issues See known issues from previous releases. Important changes to consider when upgrading Getting the Distributions Binary Distributions Description Download Link PGP Signature file of download Windows Distribution apache-camel-2.3.0.zip apache-camel-2.3.0.zip.asc Unix/Linux/Cygwin Distribution apache-camel-2.3.0.tar.gz apache-camel-2.3.0.tar.gz.asc The above URLs use redirectionThe above URLs use the Apache Mirror system to redirect you to a suitable mirror for your download. Some users have experienced issues with some versions of browsers (e.g. some Safari browsers). If the download doesn't seem to work for you from the above URL then try using FireFox Source Distributions Description Download Link PGP Signature file of download Source for Windows apache-camel-2.3.0-src.zip apache-camel-2.3.0-src.zip.asc Source for Unix/Linux/Cygwin apache-camel-2.3.0-src.tar.gz apache-camel-2.3.0-src.tar.gz.asc Getting the Binaries using Maven 2 To use this release in your maven project, the proper dependency configuration that you should use in your Maven POM is: org.apache.camel camel-core 2.3.0 SVN Tag Checkout svn co http://svn.apache.org/repos/asf/camel/tags/camel-2.3.0 Changelog For a more detailed view of new features and bug fixes, see the: TODO: Fix for 2.3.0 release notes for 2.3.0 Change Notification Preferences View Online | View Change | Add Comment
[CONF] Apache Camel > Camel 2.3.0 Release
Camel 2.3.0 Release Page edited by Claus Ibsen Camel 2.3.0 release (currently in progress) New and Noteworthy Welcome to the 2.3.0 release which approx XXX issues resolved (new features, improvements and bug fixes such as...) Property placeholders in endpoint uris is not natively supported in camel-core which means you no long need to use Spring for that. It works therefore in any environment as its provided out of the box in camel-core. Added ExchangeSentEvent to EventNotifier which contains time taken and is emitted when an Exchange is sent to an Endpoint. This allows end users to easily gather performance stats for Exchange send to endpoints. Added disconnect option to MINA to close Mina session right after usage. New Enterprise Integration Patterns New Components camel-nagios for sending passive checks to Nagios properties for using property placeholders to resolve endpoint uris. camel-gae extensions gauth component for implementing OAuth consumers. glogin component for programmatic login to Google App Engine applications from Java clients. New DSL New Annotations New Data Formats New Languages New Examples API breaking Mina The header key MinaConsumer.HEADER_CLOSE_SESSION_WHEN_COMPLETE is moved to MinaConstants.MINA_CLOSE_SESSION_WHEN_COMPLETE Known Issues See known issues from previous releases. Important changes to consider when upgrading Getting the Distributions Binary Distributions Description Download Link PGP Signature file of download Windows Distribution apache-camel-2.3.0.zip apache-camel-2.3.0.zip.asc Unix/Linux/Cygwin Distribution apache-camel-2.3.0.tar.gz apache-camel-2.3.0.tar.gz.asc The above URLs use redirectionThe above URLs use the Apache Mirror system to redirect you to a suitable mirror for your download. Some users have experienced issues with some versions of browsers (e.g. some Safari browsers). If the download doesn't seem to work for you from the above URL then try using FireFox Source Distributions Description Download Link PGP Signature file of download Source for Windows apache-camel-2.3.0-src.zip apache-camel-2.3.0-src.zip.asc Source for Unix/Linux/Cygwin apache-camel-2.3.0-src.tar.gz apache-camel-2.3.0-src.tar.gz.asc Getting the Binaries using Maven 2 To use this release in your maven project, the proper dependency configuration that you should use in your Maven POM is: org.apache.camel camel-core 2.3.0 SVN Tag Checkout svn co http://svn.apache.org/repos/asf/camel/tags/camel-2.3.0 Changelog For a more detailed view of new features and bug fixes, see the: TODO: Fix for 2.3.0 release notes for 2.3.0 Change Notification Preferences View Online | View Change | Add Comment
svn commit: r907996 - in /camel/trunk/components/camel-mina/src: main/java/org/apache/camel/component/mina/ test/java/org/apache/camel/component/mina/
Author: davsclaus
Date: Tue Feb 9 10:42:18 2010
New Revision: 907996
URL: http://svn.apache.org/viewvc?rev=907996&view=rev
Log:
CAMEL-2455: Added disconnect option to close the mina session right after use.
Added:
camel/trunk/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaDisconnectTest.java
- copied, changed from r907986,
camel/trunk/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaInOutCloseSessionWhenCompleteTest.java
Modified:
camel/trunk/components/camel-mina/src/main/java/org/apache/camel/component/mina/MinaConfiguration.java
camel/trunk/components/camel-mina/src/main/java/org/apache/camel/component/mina/MinaConsumer.java
camel/trunk/components/camel-mina/src/main/java/org/apache/camel/component/mina/MinaProducer.java
camel/trunk/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaInOutCloseSessionWhenCompleteTest.java
Modified:
camel/trunk/components/camel-mina/src/main/java/org/apache/camel/component/mina/MinaConfiguration.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-mina/src/main/java/org/apache/camel/component/mina/MinaConfiguration.java?rev=907996&r1=907995&r2=907996&view=diff
==
---
camel/trunk/components/camel-mina/src/main/java/org/apache/camel/component/mina/MinaConfiguration.java
(original)
+++
camel/trunk/components/camel-mina/src/main/java/org/apache/camel/component/mina/MinaConfiguration.java
Tue Feb 9 10:42:18 2010
@@ -43,6 +43,7 @@
private int decoderMaxLineLength = -1;
private List filters;
private boolean allowDefaultCodec = true;
+private boolean disconnect;
/**
* Returns a copy of this configuration
@@ -198,4 +199,12 @@
public boolean isAllowDefaultCodec() {
return allowDefaultCodec;
}
+
+public boolean isDisconnect() {
+return disconnect;
+}
+
+public void setDisconnect(boolean disconnect) {
+this.disconnect = disconnect;
+}
}
Modified:
camel/trunk/components/camel-mina/src/main/java/org/apache/camel/component/mina/MinaConsumer.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-mina/src/main/java/org/apache/camel/component/mina/MinaConsumer.java?rev=907996&r1=907995&r2=907996&view=diff
==
---
camel/trunk/components/camel-mina/src/main/java/org/apache/camel/component/mina/MinaConsumer.java
(original)
+++
camel/trunk/components/camel-mina/src/main/java/org/apache/camel/component/mina/MinaConsumer.java
Tue Feb 9 10:42:18 2010
@@ -36,8 +36,6 @@
* @version $Revision$
*/
public class MinaConsumer extends DefaultConsumer {
-public static final transient String HEADER_CLOSE_SESSION_WHEN_COMPLETE =
"CamelMinaCloseSessionWhenComplete";
-
private static final transient Log LOG =
LogFactory.getLog(MinaConsumer.class);
private final MinaEndpoint endpoint;
@@ -145,15 +143,24 @@
// should session be closed after complete?
Boolean close;
if (ExchangeHelper.isOutCapable(exchange)) {
-close =
exchange.getOut().getHeader(HEADER_CLOSE_SESSION_WHEN_COMPLETE, Boolean.class);
+close =
exchange.getOut().getHeader(MinaConstants.MINA_CLOSE_SESSION_WHEN_COMPLETE,
Boolean.class);
} else {
-close =
exchange.getIn().getHeader(HEADER_CLOSE_SESSION_WHEN_COMPLETE, Boolean.class);
+close =
exchange.getIn().getHeader(MinaConstants.MINA_CLOSE_SESSION_WHEN_COMPLETE,
Boolean.class);
}
-if (close != null && close) {
-LOG.debug("Closing session when complete");
+// should we disconnect, the header can override the configuration
+boolean disconnect = endpoint.getConfiguration().isDisconnect();
+if (close != null) {
+disconnect = close;
+}
+if (disconnect) {
+if (LOG.isDebugEnabled()) {
+LOG.debug("Closing session when complete at address: " +
address);
+}
session.close();
}
}
}
+
}
+
Modified:
camel/trunk/components/camel-mina/src/main/java/org/apache/camel/component/mina/MinaProducer.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-mina/src/main/java/org/apache/camel/component/mina/MinaProducer.java?rev=907996&r1=907995&r2=907996&view=diff
==
---
camel/trunk/components/camel-mina/src/main/java/org/apache/camel/component/mina/MinaProducer.java
(original)
+++
camel/trunk/components/camel-mina/src/main/java/org/apache/camel/component/mina/MinaProducer.java
Tue Feb 9 10:42:18 2010
@@ -129,6 +129,26 @@
}
}
}
+
+// should session be clo
[CONF] Apache Camel > MINA
MINA Page edited by Claus Ibsen MINA Component The mina: component is a transport for working with Apache MINA URI format mina:tcp://hostname[:port][?options] mina:udp://hostname[:port][?options] mina:multicast://hostname[:port][?options] mina:vm://hostname[:port][?options] From Camel 1.3 onwards you can specify a codec in the Registry using the codec option. If you are using TCP and no codec is specified then the textline flag is used to determine if text line based codec or object serialization should be used instead. By default the object serialization is used. For UDP/Multicast if no codec is specified the default uses a basic ByteBuffer based codec. Multicast also has a shorthand notation mcast. The VM protocol is used as a direct forwarding mechanism in the same JVM. See the MINA VM-Pipe API documentation for details. A Mina producer has a default timeout value of 30 seconds, while it waits for a response from the remote server. In normal use, camel-mina only supports marshalling the body content—message headers and exchange properties are not sent. However, the option, transferExchange, does allow you to transfer the exchange itself over the wire. See options below. You can append query options to the URI in the following format, ?option=value&option=value&... Options Option Default Value Description codec null As of 1.3, you can refer to a named ProtocolCodecFactory instance in your Registry such as your Spring ApplicationContext, which is then used for the marshalling. codec null Camel 2.0: You must use the # notation to look up your codec in the Registry. For example, use #myCodec to look up a bean with the id value, myCodec. disconnect false Camel 2.3: Whether or not to disconnect from Mina session right after use. Can be used for both consumer and producer. textline false Only used for TCP. If no codec is specified, you can use this flag in 1.3 or later to indicate a text line based codec; if not specified or the value is false, then Object Serialization is assumed over TCP. textlineDelimiter DEFAULT Camel 1.6.0/2.0 Only used for TCP and if textline=true. Sets the text line delimiter to use. Possible values are: DEFAULT, AUTO, WINDOWS, UNIX or MAC. If none provided, Camel will use DEFAULT. This delimiter is used to mark the end of text. sync false/true As of 1.3, you can configure the exchange pattern to be either InOnly (default) or InOut. Setting sync=true means a synchronous exchange (InOut), where the client can read the response from MINA (the exchange Out message). The default value has changed in Camel 1.5 to true. In older releases, the default value is false. lazySessionCreation See description As of 1.3, sessions can be lazily created to avoid exceptions, if the remote server is not up and running when the Camel producer is started. From Camel 2.0 onwards, the default is true. In Camel 1.x, the default is false. timeout 3 As of 1.3, you can configure the timeout that specifies how long to wait for a response from a remote server. The timeout unit is in milliseconds, so 6 is 60 seconds. The timeout is only used for Mina producer. encoding JVM Default As of 1.3, you can configure the encoding (a charset name) to use for the TCP textline codec and the UDP protocol. If not provided, Camel will use the JVM default Charset. transferExchange false Only used for TCP. As of 1.3, you can transfer the exchange over the wire instead of just the body. The following fields are transferred: In body, Out body, fault body, In headers, Out headers, fault headers, exchange properties, exchange exception. This requires that the objects are serializable. Camel will exclude any non-serializable objects and log it at WARN level. minaLogger false As of 1.3, you can enable the Apache MINA logging filter. Apache MINA uses slf4j logging at INFO level to log all input and output. filters null As of 2.0, you can set a list of Mina IoFilters to register. The filters value must be one of the following: Camel 2.2: comma-separated list of bean references (e.g. #filterBean1,#filterBean2) where each bean must be of type org.apache.mina.common.IoFilter. Camel 2.0: a reference to a bean of type List. encoderMaxLineLength -1 As of 2.1, you can set the textline protocol encoder max line length. By default the default value of Mina itself is used which are Integer.MAX_VALUE. decorderMaxLineLength -1 As of 2.1, you can set the textline protocol decoder max line length. By default the default value of Mina itself is used which are 1024. producerPoolSize 16 1.6.2 (only in 1.6.x): The TCP producer is now thread safe and supports concurrency much better. This option allows you to configure the number of threads in its thread pool for concurrent producers. Note: Camel 2.0 have a pooled service which ensured it was
[CONF] Apache Camel > MINA
MINA Page edited by Claus Ibsen MINA Component The mina: component is a transport for working with Apache MINA URI format mina:tcp://hostname[:port][?options] mina:udp://hostname[:port][?options] mina:multicast://hostname[:port][?options] mina:vm://hostname[:port][?options] From Camel 1.3 onwards you can specify a codec in the Registry using the codec option. If you are using TCP and no codec is specified then the textline flag is used to determine if text line based codec or object serialization should be used instead. By default the object serialization is used. For UDP/Multicast if no codec is specified the default uses a basic ByteBuffer based codec. Multicast also has a shorthand notation mcast. The VM protocol is used as a direct forwarding mechanism in the same JVM. See the MINA VM-Pipe API documentation for details. A Mina producer has a default timeout value of 30 seconds, while it waits for a response from the remote server. In normal use, camel-mina only supports marshalling the body content—message headers and exchange properties are not sent. However, the option, transferExchange, does allow you to transfer the exchange itself over the wire. See options below. You can append query options to the URI in the following format, ?option=value&option=value&... Options Option Default Value Description codec null As of 1.3, you can refer to a named ProtocolCodecFactory instance in your Registry such as your Spring ApplicationContext, which is then used for the marshalling. codec null Camel 2.0: You must use the # notation to look up your codec in the Registry. For example, use #myCodec to look up a bean with the id value, myCodec. disconnect false Camel 2.3: Whether or not to disconnect from Mina session right after use. Can be used for both consumer and producer. textline false Only used for TCP. If no codec is specified, you can use this flag in 1.3 or later to indicate a text line based codec; if not specified or the value is false, then Object Serialization is assumed over TCP. textlineDelimiter DEFAULT Camel 1.5.1/2.0 Only used for TCP and if textline=true. Sets the text line delimiter to use. Possible values are: DEFAULT, AUTO, WINDOWS, UNIX or MAC. If none provided, Camel will use DEFAULT. This delimiter is used to mark the end of text. sync false/true As of 1.3, you can configure the exchange pattern to be either InOnly (default) or InOut. Setting sync=true means a synchronous exchange (InOut), where the client can read the response from MINA (the exchange Out message). The default value has changed in Camel 1.5 to true. In older releases, the default value is false. lazySessionCreation See description As of 1.3, sessions can be lazily created to avoid exceptions, if the remote server is not up and running when the Camel producer is started. From Camel 2.0 onwards, the default is true. In Camel 1.x, the default is false. timeout 3 As of 1.3, you can configure the timeout that specifies how long to wait for a response from a remote server. The timeout unit is in milliseconds, so 6 is 60 seconds. The timeout is only used for Mina producer. encoding JVM Default As of 1.3, you can configure the encoding (a charset name) to use for the TCP textline codec and the UDP protocol. If not provided, Camel will use the JVM default Charset. transferExchange false Only used for TCP. As of 1.3, you can transfer the exchange over the wire instead of just the body. The following fields are transferred: In body, Out body, fault body, In headers, Out headers, fault headers, exchange properties, exchange exception. This requires that the objects are serializable. Camel will exclude any non-serializable objects and log it at WARN level. minaLogger false As of 1.3, you can enable the Apache MINA logging filter. Apache MINA uses slf4j logging at INFO level to log all input and output. filters null As of 2.0, you can set a list of Mina IoFilters to register. The filters value must be one of the following: Camel 2.2: comma-separated list of bean references (e.g. #filterBean1,#filterBean2) where each bean must be of type org.apache.mina.common.IoFilter. Camel 2.0: a reference to a bean of type List. encoderMaxLineLength -1 As of 2.1, you can set the textline protocol encoder max line length. By default the default value of Mina itself is used which are Integer.MAX_VALUE. decorderMaxLineLength -1 As of 2.1, you can set the textline protocol decoder max line length. By default the default value of Mina itself is used which are 1024. producerPoolSize 16 1.6.2 (only in 1.6.x): The TCP producer is now thread safe and supports concurrency much better. This option allows you to configure the number of threads in its thread pool for concurrent producers. Note: Camel 2.0 have a pooled service which ensured it was
svn commit: r907988 - /camel/trunk/components/camel-http/src/main/java/org/apache/camel/component/http/HttpConverter.java
Author: ningjiang
Date: Tue Feb 9 10:08:12 2010
New Revision: 907988
URL: http://svn.apache.org/viewvc?rev=907988&view=rev
Log:
CAMEL-2453 revert part changes of HttpConverter which introduced conflicts to
the camel core converters
Modified:
camel/trunk/components/camel-http/src/main/java/org/apache/camel/component/http/HttpConverter.java
Modified:
camel/trunk/components/camel-http/src/main/java/org/apache/camel/component/http/HttpConverter.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-http/src/main/java/org/apache/camel/component/http/HttpConverter.java?rev=907988&r1=907987&r2=907988&view=diff
==
---
camel/trunk/components/camel-http/src/main/java/org/apache/camel/component/http/HttpConverter.java
(original)
+++
camel/trunk/components/camel-http/src/main/java/org/apache/camel/component/http/HttpConverter.java
Tue Feb 9 10:08:12 2010
@@ -60,7 +60,7 @@
@Converter
-public static ServletInputStream toServletInputStream(Message message)
throws IOException {
+public static ServletInputStream toServletInputStream(HttpMessage message)
throws IOException {
HttpServletRequest request = toServletRequest(message);
if (request != null) {
return request.getInputStream();
@@ -69,12 +69,12 @@
}
@Converter
-public static InputStream toInputStream(Message message) throws Exception {
+public static InputStream toInputStream(HttpMessage message) throws
Exception {
return toInputStream(toServletRequest(message));
}
@Converter
-public static BufferedReader toReader(Message message) throws IOException {
+public static BufferedReader toReader(HttpMessage message) throws
IOException {
HttpServletRequest request = toServletRequest(message);
if (request != null) {
return request.getReader();
svn commit: r907986 - in /camel/trunk/examples/camel-example-gae/src/main/resources/META-INF: ./ LICENSE.txt NOTICE.txt
Author: krasserm Date: Tue Feb 9 09:40:38 2010 New Revision: 907986 URL: http://svn.apache.org/viewvc?rev=907986&view=rev Log: added missing LICENSE.txt and NOTICE.txt Added: camel/trunk/examples/camel-example-gae/src/main/resources/META-INF/ camel/trunk/examples/camel-example-gae/src/main/resources/META-INF/LICENSE.txt (with props) camel/trunk/examples/camel-example-gae/src/main/resources/META-INF/NOTICE.txt (with props) Added: camel/trunk/examples/camel-example-gae/src/main/resources/META-INF/LICENSE.txt URL: http://svn.apache.org/viewvc/camel/trunk/examples/camel-example-gae/src/main/resources/META-INF/LICENSE.txt?rev=907986&view=auto == --- camel/trunk/examples/camel-example-gae/src/main/resources/META-INF/LICENSE.txt (added) +++ camel/trunk/examples/camel-example-gae/src/main/resources/META-INF/LICENSE.txt Tue Feb 9 09:40:38 2010 @@ -0,0 +1,203 @@ + + Apache License + Version 2.0, January 2004 +http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Su
[CONF] Apache Camel > HTTP
HTTP Page edited by willem jiang CAMEL-2453 CAMEL-2453 HTTP Component The http: component provides HTTP based endpoints for consuming external HTTP resources (as a client to call external servers using HTTP). URI format http:hostname[:port][/resourceUri][?options] Will by default use port 80 for HTTP and 443 for HTTPS. You can append query options to the URI in the following format, ?option=value&option=value&... camel-http vs camel-jettyYou can only produce to endpoints generated by the HTTP component. Therefore it should never be used as input into your camel Routes. To bind/expose an HTTP endpoint via a HTTP server as input to a camel route, you can use the Jetty Component Options Name Default Value Description throwExceptionOnFailure true Camel 2.0: Option to disable throwing the HttpOperationFailedException in case of failed responses from the remote server. This allows you to get all responses regardles of the HTTP status code. bridgeEndpoint false Camel 2.1: If the option is true , HttpProducer will ignore the Exchange.HTTP_URI header, and use the endpoint's URI for request. You may also set the throwExcpetionOnFailure to be false to let the HttpProducer send all the fault response back. httpBindingRef null Reference to a org.apache.camel.component.http.HttpBinding in the Registry. username null Username for Basic HTTP/NTML Authentication. password null Password for Basic HTTP/NTML Authentication. domain null Camel 2.1: Domain for NTML Authentication. This option must be used to force NTML authentication. proxyHost null The proxy host name * only for >= Camel 1.6.2 *. proxyPort null The proxy port number * only for >= Camel 1.6.2 *. proxyUsername null Username for proxy authentication * only for >= Camel 1.6.2 *. proxyPassword null Password for proxy authentication * only for >= Camel 1.6.2 *. httpClientConfigurerRef null Reference to a org.apache.camel.component.http.HttpClientConfigurer in the Registry. httpClient.XXX null Setting options on the HttpClientParams. For instance httpClient.soTimeout=5000 will set the SO_TIMEOUT to 5 seconds. Message Headers Camel 1.x Name Type Description HttpProducer.HTTP_URI String Camel 1.5.1: URI to call. Will override existing URI set directly on the endpoint. Is set on the In message. HttpProducer.HTTP_RESPONSE_CODE int The HTTP response code from the external server. Is 200 for OK. Is set on the Out message. HttpProducer.QUERY String URI parameters. Will override existing URI parameters set directly on the endpoint. Is set on the In message. Camel 2.0 Name Type Description Exchange.HTTP_URI String URI to call. Will override existing URI set directly on the endpoint. Exchange.HTTP_PATH String Request URI's path. Exchange.HTTP_QUERY String URI parameters. Will override existing URI parameters set directly on the endpoint. Exchange.HTTP_RESPONSE_CODE int The HTTP response code from the external server. Is 200 for OK. Exchange.HTTP_CHARACTER_ENCODING String Character encoding. Exchange.CONTENT_TYPE String The HTTP content type. Is set on both the IN and OUT message to provide a content type, such as text/html. Exchange.CONTENT_ENCODING String The HTTP content encoding. Is set on both the IN and OUT message to provide a content encoding, such as gzip. Exchange.HTTP_SERVLET_REQUEST HttpServletRequest From Camel 2.3.0, you can get the HttpServletRequest object from the message header, Exchange.HTTP_SERVLET_RESPONSE HttpServletResponse From Camel 2.3.0, you can get the HttpServletResponse object from the message header. Message Body Camel will store the HTTP response from the external server on the OUT body. All headers from the IN message will be copied to the OUT message, so headers are preserved during routing. Additionally Camel will add the HTTP response headers as well to the OUT message headers. Response code Camel will handle according to the HTTP response code: Response code is in the range 100..299, Camel regards it as a success response. Response code is in the range 300..399, Camel regards it as a redirection response and will throw a HttpOperationFailedException with the information. Response code is 400+, Camel regards it as an external server failure and will throw a HttpOperationFailedException with the information. throwExceptionOnFailureThe option, throwExceptionOnFailure, can be set to false to prevent the HttpOperationFailedException from being thrown for failed response codes. This allows you to get any response from the remote server. There is a sample below demonstrating this. HttpOperationFailedException This exception contains the following information: The HTTP status code The HTTP status line (text of the s
svn commit: r907982 - /camel/scripts/check_camel_release.sh
Author: gertv
Date: Tue Feb 9 09:24:45 2010
New Revision: 907982
URL: http://svn.apache.org/viewvc?rev=907982&view=rev
Log:
Adding a script to validate signatures/hashes on a staged release
Added:
camel/scripts/check_camel_release.sh (with props)
Added: camel/scripts/check_camel_release.sh
URL:
http://svn.apache.org/viewvc/camel/scripts/check_camel_release.sh?rev=907982&view=auto
==
--- camel/scripts/check_camel_release.sh (added)
+++ camel/scripts/check_camel_release.sh Tue Feb 9 09:24:45 2010
@@ -0,0 +1,60 @@
+#!/bin/sh
+
+STAGING=${1}
+DOWNLOAD=${2:-/tmp/camel-staging}
+mkdir ${DOWNLOAD} 2>/dev/null
+
+# The following code automatically imports the signing KEYS, but it may
actually be
+# better to download them from a key server and/or let the user choose what
keys
+# he wants to import.
+wget --no-check-certificate -P "${DOWNLOAD}"
http://www.apache.org/dist/camel/apache-camel/KEYS
+gpg --import "${DOWNLOAD}/KEYS"
+
+if [ -z "${STAGING}" -o ! -d "${DOWNLOAD}" ]
+then
+ echo "Usage: check_staged_release.sh [temp-directory]"
+ exit
+fi
+
+if [ ! -e "${DOWNLOAD}/${STAGING}" ]
+then
+ echo
""
+ echo " DOWNLOAD STAGED REPOSITORY
"
+ echo
""
+
+ wget \
+ -r -np "--reject=html,txt" "--follow-tags=" \
+ -P "${DOWNLOAD}/${STAGING}" -nH "--cut-dirs=3" --ignore-length
--no-check-certificate \
+
"http://repository.apache.org/content/repositories/orgapachecamel-${STAGING}/org/apache/camel/";
+
+else
+ echo
""
+ echo " USING EXISTING STAGED REPOSITORY
"
+ echo
""
+ echo "${DOWNLOAD}/${STAGING}"
+fi
+
+echo
""
+echo " CHECK SIGNATURES AND DIGESTS
"
+echo
""
+
+for i in `find "${DOWNLOAD}/${STAGING}" -type f | grep -v
'\.\(asc\|sha1\|md5\)$'`
+do
+ f=`echo $i | sed 's/\.asc$//'`
+ echo "$f"
+ gpg --verify $f.asc 2>/dev/null
+ if [ "$?" = "0" ]; then CHKSUM="GOOD"; else CHKSUM="BAD"; fi
+ if [ ! -f "$f.asc" ]; then CHKSUM=""; fi
+ echo "gpg: ${CHKSUM}"
+ if [ "`cat $f.md5 2>/dev/null`" = "`openssl md5 < $f 2>/dev/null`" ]; then
CHKSUM="GOOD"; else CHKSUM="BAD"; fi
+ if [ ! -f "$f.md5" ]; then CHKSUM=""; fi
+ echo "md5: ${CHKSUM}"
+ if [ "`cat $f.sha1 2>/dev/null`" = "`openssl sha1 < $f 2>/dev/null`" ]; then
CHKSUM="GOOD"; else CHKSUM="BAD"; fi
+ if [ ! -f "$f.sha1" ]; then CHKSUM=""; fi
+ echo "sha1: ${CHKSUM}"
+done
+
+if [ -z "${CHKSUM}" ]; then echo "WARNING: no files found!"; fi
+
+echo
""
+
Propchange: camel/scripts/check_camel_release.sh
--
svn:eol-style = native
Propchange: camel/scripts/check_camel_release.sh
--
svn:executable = *
svn commit: r907980 - /camel/scripts/
Author: gertv Date: Tue Feb 9 09:19:30 2010 New Revision: 907980 URL: http://svn.apache.org/viewvc?rev=907980&view=rev Log: Creating a directory for storing scripts used by the Camel team Added: camel/scripts/
svn commit: r907978 - in /camel/trunk: camel-core/src/main/java/org/apache/camel/ components/camel-http/src/main/java/org/apache/camel/component/http/
Author: ningjiang
Date: Tue Feb 9 09:06:51 2010
New Revision: 907978
URL: http://svn.apache.org/viewvc?rev=907978&view=rev
Log:
CAMEL-2453 put the HttpServletRequest and HttpServletResponse into HttpMessage
header.
Modified:
camel/trunk/camel-core/src/main/java/org/apache/camel/Exchange.java
camel/trunk/components/camel-http/src/main/java/org/apache/camel/component/http/HttpConverter.java
camel/trunk/components/camel-http/src/main/java/org/apache/camel/component/http/HttpMessage.java
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/Exchange.java
URL:
http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/Exchange.java?rev=907978&r1=907977&r2=907978&view=diff
==
--- camel/trunk/camel-core/src/main/java/org/apache/camel/Exchange.java
(original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/Exchange.java Tue Feb
9 09:06:51 2010
@@ -116,6 +116,9 @@
String TRACE_EVENT_EXCHANGE = "CamelTraceEventExchange";
String SOAP_ACTION = "CamelSoapAction";
+
+String HTTP_SERVLET_REQUEST = "CamelHttpServletRequest";
+String HTTP_SERVLET_RESPONSE = "CamelHttpServletResponse";
/**
* Returns the {...@link ExchangePattern} (MEP) of this exchange.
Modified:
camel/trunk/components/camel-http/src/main/java/org/apache/camel/component/http/HttpConverter.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-http/src/main/java/org/apache/camel/component/http/HttpConverter.java?rev=907978&r1=907977&r2=907978&view=diff
==
---
camel/trunk/components/camel-http/src/main/java/org/apache/camel/component/http/HttpConverter.java
(original)
+++
camel/trunk/components/camel-http/src/main/java/org/apache/camel/component/http/HttpConverter.java
Tue Feb 9 09:06:51 2010
@@ -19,12 +19,14 @@
import java.io.BufferedReader;
import java.io.IOException;
import java.io.InputStream;
+
import javax.servlet.ServletInputStream;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import org.apache.camel.Converter;
import org.apache.camel.Exchange;
+import org.apache.camel.Message;
import org.apache.camel.component.http.helper.GZIPHelper;
/**
@@ -40,23 +42,25 @@
}
@Converter
-public static HttpServletRequest toServletRequest(HttpMessage message) {
+public static HttpServletRequest toServletRequest(Message message) {
if (message == null) {
return null;
}
-return message.getRequest();
+return message.getHeader(Exchange.HTTP_SERVLET_REQUEST,
HttpServletRequest.class);
}
@Converter
-public static HttpServletResponse toServletResponse(HttpMessage message) {
+public static HttpServletResponse toServletResponse(Message message) {
if (message == null) {
return null;
}
-return message.getResponse();
+return message.getHeader(Exchange.HTTP_SERVLET_RESPONSE,
HttpServletResponse.class);
}
+
+
@Converter
-public static ServletInputStream toServletInputStream(HttpMessage message)
throws IOException {
+public static ServletInputStream toServletInputStream(Message message)
throws IOException {
HttpServletRequest request = toServletRequest(message);
if (request != null) {
return request.getInputStream();
@@ -65,12 +69,12 @@
}
@Converter
-public static InputStream toInputStream(HttpMessage message) throws
Exception {
+public static InputStream toInputStream(Message message) throws Exception {
return toInputStream(toServletRequest(message));
}
@Converter
-public static BufferedReader toReader(HttpMessage message) throws
IOException {
+public static BufferedReader toReader(Message message) throws IOException {
HttpServletRequest request = toServletRequest(message);
if (request != null) {
return request.getReader();
Modified:
camel/trunk/components/camel-http/src/main/java/org/apache/camel/component/http/HttpMessage.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-http/src/main/java/org/apache/camel/component/http/HttpMessage.java?rev=907978&r1=907977&r2=907978&view=diff
==
---
camel/trunk/components/camel-http/src/main/java/org/apache/camel/component/http/HttpMessage.java
(original)
+++
camel/trunk/components/camel-http/src/main/java/org/apache/camel/component/http/HttpMessage.java
Tue Feb 9 09:06:51 2010
@@ -37,6 +37,9 @@
setExchange(exchange);
this.request = request;
this.response = response;
+// Put the request and response into the message header
+this.setHeader(Exchange.HTTP_SERVLET_REQUEST, request);
+this.s
svn commit: r907972 - in /camel/trunk: components/camel-jaxb/pom.xml components/camel-soap/pom.xml components/camel-xstream/pom.xml parent/pom.xml
Author: davsclaus
Date: Tue Feb 9 08:51:05 2010
New Revision: 907972
URL: http://svn.apache.org/viewvc?rev=907972&view=rev
Log:
CAMEL-2454: Upgrade to woodstox 4.0.7.
Modified:
camel/trunk/components/camel-jaxb/pom.xml
camel/trunk/components/camel-soap/pom.xml
camel/trunk/components/camel-xstream/pom.xml
camel/trunk/parent/pom.xml
Modified: camel/trunk/components/camel-jaxb/pom.xml
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-jaxb/pom.xml?rev=907972&r1=907971&r2=907972&view=diff
==
--- camel/trunk/components/camel-jaxb/pom.xml (original)
+++ camel/trunk/components/camel-jaxb/pom.xml Tue Feb 9 08:51:05 2010
@@ -84,8 +84,8 @@
org.codehaus.woodstox
- wstx-asl
- 3.2.9
+ woodstox-core-asl
+ ${woodstox-version}
test
Modified: camel/trunk/components/camel-soap/pom.xml
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-soap/pom.xml?rev=907972&r1=907971&r2=907972&view=diff
==
--- camel/trunk/components/camel-soap/pom.xml (original)
+++ camel/trunk/components/camel-soap/pom.xml Tue Feb 9 08:51:05 2010
@@ -107,8 +107,8 @@
org.codehaus.woodstox
-wstx-asl
-3.2.9
+woodstox-core-asl
+${woodstox-version}
test
Modified: camel/trunk/components/camel-xstream/pom.xml
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-xstream/pom.xml?rev=907972&r1=907971&r2=907972&view=diff
==
--- camel/trunk/components/camel-xstream/pom.xml (original)
+++ camel/trunk/components/camel-xstream/pom.xml Tue Feb 9 08:51:05 2010
@@ -61,8 +61,8 @@
org.codehaus.woodstox
- wstx-asl
- 3.2.9
+ woodstox-core-asl
+ ${woodstox-version}
Modified: camel/trunk/parent/pom.xml
URL:
http://svn.apache.org/viewvc/camel/trunk/parent/pom.xml?rev=907972&r1=907971&r2=907972&view=diff
==
--- camel/trunk/parent/pom.xml (original)
+++ camel/trunk/parent/pom.xml Tue Feb 9 08:51:05 2010
@@ -109,6 +109,7 @@
1.2
5.8
1.6.2
+4.0.7
3.5
1.3.1
1.4.2
svn commit: r907963 - in /camel/trunk/camel-core/src/test/java/org/apache/camel: component/file/FileConvertBodyToUTF8Test.java impl/DefaultCamelContextTest.java
Author: davsclaus
Date: Tue Feb 9 08:22:40 2010
New Revision: 907963
URL: http://svn.apache.org/viewvc?rev=907963&view=rev
Log:
Fixed tests on other boxes.
Modified:
camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConvertBodyToUTF8Test.java
camel/trunk/camel-core/src/test/java/org/apache/camel/impl/DefaultCamelContextTest.java
Modified:
camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConvertBodyToUTF8Test.java
URL:
http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConvertBodyToUTF8Test.java?rev=907963&r1=907962&r2=907963&view=diff
==
---
camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConvertBodyToUTF8Test.java
(original)
+++
camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConvertBodyToUTF8Test.java
Tue Feb 9 08:22:40 2010
@@ -66,25 +66,4 @@
assertTrue("Should be same byte data", same);
}
-public void testFileUTF8ConvertDefaultCharset() throws Exception {
-context.addRoutes(new RouteBuilder() {
-@Override
-public void configure() throws Exception {
-from("file://target/utf8")
-.convertBodyTo(String.class)
-.to("mock:result");
-}
-});
-context.start();
-
-MockEndpoint mock = getMockEndpoint("mock:result");
-mock.expectedMessageCount(1);
-
-assertMockEndpointsSatisfied();
-
-byte[] data =
mock.getReceivedExchanges().get(0).getIn().getBody(byte[].class);
-boolean same = ObjectHelper.equal(body, data);
-assertTrue("Should NOT be same byte data", same);
-}
-
}
Modified:
camel/trunk/camel-core/src/test/java/org/apache/camel/impl/DefaultCamelContextTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/impl/DefaultCamelContextTest.java?rev=907963&r1=907962&r2=907963&view=diff
==
---
camel/trunk/camel-core/src/test/java/org/apache/camel/impl/DefaultCamelContextTest.java
(original)
+++
camel/trunk/camel-core/src/test/java/org/apache/camel/impl/DefaultCamelContextTest.java
Tue Feb 9 08:22:40 2010
@@ -167,8 +167,8 @@
assertNull(ctx.hasEndpoint("mock://bar"));
try {
-ctx.hasEndpoint(null);
-fail("Should have thrown exception");
+Endpoint endpoint = ctx.hasEndpoint(null);
+assertNull("Should not have endpoint", endpoint);
} catch (ResolveEndpointFailedException e) {
// expected
}
svn commit: r907958 - in /camel/trunk: apache-camel/pom.xml apache-camel/src/main/descriptors/common-bin.xml parent/pom.xml
Author: ningjiang
Date: Tue Feb 9 08:15:14 2010
New Revision: 907958
URL: http://svn.apache.org/viewvc?rev=907958&view=rev
Log:
CAMEL-2396 added camel-soap into apache-camel kit
Modified:
camel/trunk/apache-camel/pom.xml
camel/trunk/apache-camel/src/main/descriptors/common-bin.xml
camel/trunk/parent/pom.xml
Modified: camel/trunk/apache-camel/pom.xml
URL:
http://svn.apache.org/viewvc/camel/trunk/apache-camel/pom.xml?rev=907958&r1=907957&r2=907958&view=diff
==
--- camel/trunk/apache-camel/pom.xml (original)
+++ camel/trunk/apache-camel/pom.xml Tue Feb 9 08:15:14 2010
@@ -252,6 +252,15 @@
org.apache.camel
+ camel-soap
+
+
+ org.apache.camel
+ camel-snmp
+
+
+
+ org.apache.camel
camel-spring
Modified: camel/trunk/apache-camel/src/main/descriptors/common-bin.xml
URL:
http://svn.apache.org/viewvc/camel/trunk/apache-camel/src/main/descriptors/common-bin.xml?rev=907958&r1=907957&r2=907958&view=diff
==
--- camel/trunk/apache-camel/src/main/descriptors/common-bin.xml (original)
+++ camel/trunk/apache-camel/src/main/descriptors/common-bin.xml Tue Feb 9
08:15:14 2010
@@ -90,7 +90,8 @@
org.apache.camel:camel-servlet
org.apache.camel:camel-smpp
org.apache.camel:camel-snmp
-org.apache.camel:camel-spring
+org.apache.camel:camel-soap
+ org.apache.camel:camel-spring
org.apache.camel:camel-spring-integration
org.apache.camel:camel-spring-osgi
org.apache.camel:camel-sql
Modified: camel/trunk/parent/pom.xml
URL:
http://svn.apache.org/viewvc/camel/trunk/parent/pom.xml?rev=907958&r1=907957&r2=907958&view=diff
==
--- camel/trunk/parent/pom.xml (original)
+++ camel/trunk/parent/pom.xml Tue Feb 9 08:15:14 2010
@@ -449,6 +449,11 @@
org.apache.camel
+camel-soap
+${project.version}
+
+
+org.apache.camel
camel-snmp
${project.version}
svn commit: r907957 - /camel/trunk/camel-core/src/test/java/org/apache/camel/issues/RetryRouteScopedUntilRecipientListIssueTest.java
Author: davsclaus
Date: Tue Feb 9 08:13:48 2010
New Revision: 907957
URL: http://svn.apache.org/viewvc?rev=907957&view=rev
Log:
CAMEL-2360: Fixed test on other boxes.
Modified:
camel/trunk/camel-core/src/test/java/org/apache/camel/issues/RetryRouteScopedUntilRecipientListIssueTest.java
Modified:
camel/trunk/camel-core/src/test/java/org/apache/camel/issues/RetryRouteScopedUntilRecipientListIssueTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/issues/RetryRouteScopedUntilRecipientListIssueTest.java?rev=907957&r1=907956&r2=907957&view=diff
==
---
camel/trunk/camel-core/src/test/java/org/apache/camel/issues/RetryRouteScopedUntilRecipientListIssueTest.java
(original)
+++
camel/trunk/camel-core/src/test/java/org/apache/camel/issues/RetryRouteScopedUntilRecipientListIssueTest.java
Tue Feb 9 08:13:48 2010
@@ -16,6 +16,7 @@
*/
package org.apache.camel.issues;
+import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicInteger;
import org.apache.camel.Body;
@@ -27,6 +28,7 @@
import org.apache.camel.Header;
import org.apache.camel.Processor;
import org.apache.camel.Producer;
+import org.apache.camel.builder.NotifyBuilder;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.impl.DefaultEndpoint;
import org.apache.camel.impl.DefaultProducer;
@@ -117,6 +119,8 @@
public void testRetryUntilRecipientListFailOnly() throws Exception {
invoked.set(0);
+NotifyBuilder notify = new NotifyBuilder(context).whenDone(1).create();
+
getMockEndpoint("mock:result").expectedMessageCount(0);
getMockEndpoint("mock:foo").expectedMessageCount(0);
@@ -124,6 +128,9 @@
assertMockEndpointsSatisfied();
+// wait until its done before we stop and check that retry was invoked
+notify.matches(5, TimeUnit.SECONDS);
+
context.stop();
assertEquals(3, invoked.get());
@@ -132,6 +139,8 @@
public void testRetryUntilRecipientListFailAndOk() throws Exception {
invoked.set(0);
+NotifyBuilder notify = new NotifyBuilder(context).whenDone(1).create();
+
getMockEndpoint("mock:result").expectedMessageCount(0);
getMockEndpoint("mock:foo").expectedMinimumMessageCount(0);
@@ -139,6 +148,9 @@
assertMockEndpointsSatisfied();
+// wait until its done before we stop and check that retry was invoked
+notify.matches(5, TimeUnit.SECONDS);
+
context.stop();
assertEquals(3, invoked.get());
@@ -147,6 +159,8 @@
public void testRetryUntilRecipientListOkAndFail() throws Exception {
invoked.set(0);
+NotifyBuilder notify = new NotifyBuilder(context).whenDone(1).create();
+
getMockEndpoint("mock:result").expectedMessageCount(0);
getMockEndpoint("mock:foo").expectedMinimumMessageCount(0);
@@ -154,6 +168,9 @@
assertMockEndpointsSatisfied();
+// wait until its done before we stop and check that retry was invoked
+notify.matches(5, TimeUnit.SECONDS);
+
context.stop();
assertEquals(3, invoked.get());
@@ -177,6 +194,8 @@
public void testRetryUntilRecipientFailAndNotFail() throws Exception {
invoked.set(0);
+NotifyBuilder notify = new NotifyBuilder(context).whenDone(1).create();
+
getMockEndpoint("mock:result").expectedMessageCount(0);
getMockEndpoint("mock:foo").expectedMinimumMessageCount(0);
@@ -184,6 +203,9 @@
assertMockEndpointsSatisfied();
+// wait until its done before we stop and check that retry was invoked
+notify.matches(5, TimeUnit.SECONDS);
+
context.stop();
assertEquals(3, invoked.get());
@@ -192,6 +214,8 @@
public void testRetryUntilRecipientNotFailAndFail() throws Exception {
invoked.set(0);
+NotifyBuilder notify = new NotifyBuilder(context).whenDone(1).create();
+
getMockEndpoint("mock:result").expectedMessageCount(0);
getMockEndpoint("mock:foo").expectedMinimumMessageCount(0);
@@ -199,6 +223,9 @@
assertMockEndpointsSatisfied();
+// wait until its done before we stop and check that retry was invoked
+notify.matches(5, TimeUnit.SECONDS);
+
context.stop();
assertEquals(3, invoked.get());
svn commit: r907955 - /camel/trunk/components/camel-soap/src/test/resources/org/apache/camel/dataformat/soap/SoapSpringRoundtripContext.xml
Author: ningjiang Date: Tue Feb 9 08:07:55 2010 New Revision: 907955 URL: http://svn.apache.org/viewvc?rev=907955&view=rev Log: CAMEL-2396 Added the file which I got to add in my last commit Added: camel/trunk/components/camel-soap/src/test/resources/org/apache/camel/dataformat/soap/SoapSpringRoundtripContext.xml (with props) Added: camel/trunk/components/camel-soap/src/test/resources/org/apache/camel/dataformat/soap/SoapSpringRoundtripContext.xml URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-soap/src/test/resources/org/apache/camel/dataformat/soap/SoapSpringRoundtripContext.xml?rev=907955&view=auto == --- camel/trunk/components/camel-soap/src/test/resources/org/apache/camel/dataformat/soap/SoapSpringRoundtripContext.xml (added) +++ camel/trunk/components/camel-soap/src/test/resources/org/apache/camel/dataformat/soap/SoapSpringRoundtripContext.xml Tue Feb 9 08:07:55 2010 @@ -0,0 +1,43 @@ + + +http://www.springframework.org/schema/beans"; + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; + xsi:schemaLocation=" + http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd + http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd +"> + + +http://camel.apache.org/schema/spring";> + + + + + + + + + + + + + + + + + Propchange: camel/trunk/components/camel-soap/src/test/resources/org/apache/camel/dataformat/soap/SoapSpringRoundtripContext.xml -- svn:eol-style = native Propchange: camel/trunk/components/camel-soap/src/test/resources/org/apache/camel/dataformat/soap/SoapSpringRoundtripContext.xml -- svn:keywords = Rev Date Propchange: camel/trunk/components/camel-soap/src/test/resources/org/apache/camel/dataformat/soap/SoapSpringRoundtripContext.xml -- svn:mime-type = text/xml
svn commit: r907954 - in /camel/trunk: camel-core/src/main/java/org/apache/camel/builder/ camel-core/src/main/java/org/apache/camel/model/dataformat/ components/camel-soap/ components/camel-soap/src/m
Author: ningjiang Date: Tue Feb 9 08:06:32 2010 New Revision: 907954 URL: http://svn.apache.org/viewvc?rev=907954&view=rev Log: CAMEL-2396 added spring and DSL support of the camel-soap Added: camel/trunk/camel-core/src/main/java/org/apache/camel/model/dataformat/SoapJaxbDataFormat.java (with props) camel/trunk/components/camel-soap/src/main/java/org/apache/camel/dataformat/ camel/trunk/components/camel-soap/src/main/java/org/apache/camel/dataformat/soap/ camel/trunk/components/camel-soap/src/main/java/org/apache/camel/dataformat/soap/SoapJaxbDataFormat.java (contents, props changed) - copied, changed from r907881, camel/trunk/components/camel-soap/src/main/java/org/apache/camel/converter/soap/SoapJaxbDataFormat.java camel/trunk/components/camel-soap/src/main/java/org/apache/camel/dataformat/soap/name/ (props changed) - copied from r907857, camel/trunk/components/camel-soap/src/main/java/org/apache/camel/converter/soap/name/ camel/trunk/components/camel-soap/src/main/java/org/apache/camel/dataformat/soap/name/ElementNameStrategy.java - copied, changed from r907881, camel/trunk/components/camel-soap/src/main/java/org/apache/camel/converter/soap/name/ElementNameStrategy.java camel/trunk/components/camel-soap/src/main/java/org/apache/camel/dataformat/soap/name/ExceptionNameStrategy.java - copied, changed from r907881, camel/trunk/components/camel-soap/src/main/java/org/apache/camel/converter/soap/name/ExceptionNameStrategy.java camel/trunk/components/camel-soap/src/main/java/org/apache/camel/dataformat/soap/name/QNameStrategy.java - copied, changed from r907881, camel/trunk/components/camel-soap/src/main/java/org/apache/camel/converter/soap/name/QNameStrategy.java camel/trunk/components/camel-soap/src/main/java/org/apache/camel/dataformat/soap/name/ServiceInterfaceStrategy.java - copied, changed from r907881, camel/trunk/components/camel-soap/src/main/java/org/apache/camel/converter/soap/name/ServiceInterfaceStrategy.java camel/trunk/components/camel-soap/src/main/java/org/apache/camel/dataformat/soap/name/TypeNameStrategy.java - copied, changed from r907881, camel/trunk/components/camel-soap/src/main/java/org/apache/camel/converter/soap/name/TypeNameStrategy.java camel/trunk/components/camel-soap/src/test/java/org/apache/camel/dataformat/ camel/trunk/components/camel-soap/src/test/java/org/apache/camel/dataformat/soap/ camel/trunk/components/camel-soap/src/test/java/org/apache/camel/dataformat/soap/CustomerServerBean.java (contents, props changed) - copied, changed from r907857, camel/trunk/components/camel-soap/src/test/java/org/apache/camel/converter/soap/CustomerServerBean.java camel/trunk/components/camel-soap/src/test/java/org/apache/camel/dataformat/soap/SoapClientTest.java (contents, props changed) - copied, changed from r907857, camel/trunk/components/camel-soap/src/test/java/org/apache/camel/converter/soap/SoapClientTest.java camel/trunk/components/camel-soap/src/test/java/org/apache/camel/dataformat/soap/SoapMarshalSetterTest.java (contents, props changed) - copied, changed from r907857, camel/trunk/components/camel-soap/src/test/java/org/apache/camel/converter/soap/SoapMarshalSetterTest.java camel/trunk/components/camel-soap/src/test/java/org/apache/camel/dataformat/soap/SoapMarshalTest.java (contents, props changed) - copied, changed from r907857, camel/trunk/components/camel-soap/src/test/java/org/apache/camel/converter/soap/SoapMarshalTest.java camel/trunk/components/camel-soap/src/test/java/org/apache/camel/dataformat/soap/SoapRoundtripTest.java (contents, props changed) - copied, changed from r907857, camel/trunk/components/camel-soap/src/test/java/org/apache/camel/converter/soap/SoapRoundtripTest.java camel/trunk/components/camel-soap/src/test/java/org/apache/camel/dataformat/soap/SoapServerTest.java (contents, props changed) - copied, changed from r907857, camel/trunk/components/camel-soap/src/test/java/org/apache/camel/converter/soap/SoapServerTest.java camel/trunk/components/camel-soap/src/test/java/org/apache/camel/dataformat/soap/SoapSpringRoundtripTest.java (with props) camel/trunk/components/camel-soap/src/test/java/org/apache/camel/dataformat/soap/SoapUnMarshalTest.java (contents, props changed) - copied, changed from r907857, camel/trunk/components/camel-soap/src/test/java/org/apache/camel/converter/soap/SoapUnMarshalTest.java camel/trunk/components/camel-soap/src/test/java/org/apache/camel/dataformat/soap/TestUtil.java (contents, props changed) - copied, changed from r907857, camel/trunk/components/camel-soap/src/test/java/org/apache/camel/converter/soap/TestUtil.java camel/trunk/components/camel-soap/src/test/resources/org/apache/camel/dataformat/ camel/trunk/components/camel-soap/src/test/resources/org/apache/camel/dataformat/s
svn commit: r907953 - /camel/trunk/components/camel-protobuf/src/main/java/org/apache/camel/dataformat/protobuf/ProtobufDataFormat.java
Author: ningjiang
Date: Tue Feb 9 08:03:30 2010
New Revision: 907953
URL: http://svn.apache.org/viewvc?rev=907953&view=rev
Log:
Updated the exception message of camel-protobuf
Modified:
camel/trunk/components/camel-protobuf/src/main/java/org/apache/camel/dataformat/protobuf/ProtobufDataFormat.java
Modified:
camel/trunk/components/camel-protobuf/src/main/java/org/apache/camel/dataformat/protobuf/ProtobufDataFormat.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-protobuf/src/main/java/org/apache/camel/dataformat/protobuf/ProtobufDataFormat.java?rev=907953&r1=907952&r2=907953&view=diff
==
---
camel/trunk/components/camel-protobuf/src/main/java/org/apache/camel/dataformat/protobuf/ProtobufDataFormat.java
(original)
+++
camel/trunk/components/camel-protobuf/src/main/java/org/apache/camel/dataformat/protobuf/ProtobufDataFormat.java
Tue Feb 9 08:03:30 2010
@@ -57,7 +57,7 @@
if (instance instanceof Message) {
this.defaultInstance = (Message) instance;
} else {
-throw new IllegalArgumentException("The instance should be
subClass of com.google.protobuf.Message");
+throw new IllegalArgumentException("The argument for
setDefaultInstance should be subClass of com.google.protobuf.Message");
}
}
