/[Apache-SVN]

Revision 1240351

Jump to revision:
Author:	iocanel
Date:	Fri Feb 3 21:41:13 2012 UTC (12 years, 3 months ago)
Changed paths:	91
Log Message:	Merge branch 'trunk' of git://git.apache.org/camel into trunk-avro Conflicts: components/pom.xml

Changed paths

Path	Details
camel/trunk/camel-core/src/main/java/org/apache/camel/builder/DataFormatClause.java	modified , text changed
camel/trunk/camel-core/src/main/java/org/apache/camel/model/MarshalDefinition.java	modified , text changed
camel/trunk/camel-core/src/main/java/org/apache/camel/model/UnmarshalDefinition.java	modified , text changed
camel/trunk/camel-core/src/main/java/org/apache/camel/model/dataformat/AvroDataFormat.java	added
camel/trunk/camel-core/src/main/resources/org/apache/camel/model/dataformat/jaxb.index	modified , text changed
camel/trunk/components/camel-avro/	added
camel/trunk/components/camel-avro/pom.xml	added
camel/trunk/components/camel-avro/src/	added
camel/trunk/components/camel-avro/src/main/	added
camel/trunk/components/camel-avro/src/main/java/	added
camel/trunk/components/camel-avro/src/main/java/org/	added
camel/trunk/components/camel-avro/src/main/java/org/apache/	added
camel/trunk/components/camel-avro/src/main/java/org/apache/camel/	added
camel/trunk/components/camel-avro/src/main/java/org/apache/camel/component/	added
camel/trunk/components/camel-avro/src/main/java/org/apache/camel/component/avro/	added
camel/trunk/components/camel-avro/src/main/java/org/apache/camel/component/avro/AvroComponent.java	added
camel/trunk/components/camel-avro/src/main/java/org/apache/camel/component/avro/AvroConfiguration.java	added
camel/trunk/components/camel-avro/src/main/java/org/apache/camel/component/avro/AvroConstants.java	added
camel/trunk/components/camel-avro/src/main/java/org/apache/camel/component/avro/AvroConsumer.java	added
camel/trunk/components/camel-avro/src/main/java/org/apache/camel/component/avro/AvroEndpoint.java	added
camel/trunk/components/camel-avro/src/main/java/org/apache/camel/component/avro/AvroHttpConsumer.java	added
camel/trunk/components/camel-avro/src/main/java/org/apache/camel/component/avro/AvroHttpEndpoint.java	added
camel/trunk/components/camel-avro/src/main/java/org/apache/camel/component/avro/AvroHttpProducer.java	added
camel/trunk/components/camel-avro/src/main/java/org/apache/camel/component/avro/AvroNettyConsumer.java	added
camel/trunk/components/camel-avro/src/main/java/org/apache/camel/component/avro/AvroNettyEndpoint.java	added
camel/trunk/components/camel-avro/src/main/java/org/apache/camel/component/avro/AvroNettyProducer.java	added
camel/trunk/components/camel-avro/src/main/java/org/apache/camel/component/avro/AvroProducer.java	added
camel/trunk/components/camel-avro/src/main/java/org/apache/camel/component/avro/AvroRequestor.java	added
camel/trunk/components/camel-avro/src/main/java/org/apache/camel/component/avro/AvroResponder.java	added
camel/trunk/components/camel-avro/src/main/java/org/apache/camel/dataformat/	added
camel/trunk/components/camel-avro/src/main/java/org/apache/camel/dataformat/avro/	added
camel/trunk/components/camel-avro/src/main/java/org/apache/camel/dataformat/avro/AvroDataFormat.java	added
camel/trunk/components/camel-avro/src/main/resources/	added
camel/trunk/components/camel-avro/src/main/resources/META-INF/	added
camel/trunk/components/camel-avro/src/main/resources/META-INF/services/	added
camel/trunk/components/camel-avro/src/main/resources/META-INF/services/org/	added
camel/trunk/components/camel-avro/src/main/resources/META-INF/services/org/apache/	added
camel/trunk/components/camel-avro/src/main/resources/META-INF/services/org/apache/camel/	added
camel/trunk/components/camel-avro/src/main/resources/META-INF/services/org/apache/camel/component/	added
camel/trunk/components/camel-avro/src/main/resources/META-INF/services/org/apache/camel/component/avro	added
camel/trunk/components/camel-avro/src/main/resources/META-INF/services/org/apache/camel/dataformat/	added
camel/trunk/components/camel-avro/src/main/resources/META-INF/services/org/apache/camel/dataformat/avro	added
camel/trunk/components/camel-avro/src/test/	added
camel/trunk/components/camel-avro/src/test/avro/	added
camel/trunk/components/camel-avro/src/test/avro/test.avpr	added
camel/trunk/components/camel-avro/src/test/java/	added
camel/trunk/components/camel-avro/src/test/java/org/	added
camel/trunk/components/camel-avro/src/test/java/org/apache/	added
camel/trunk/components/camel-avro/src/test/java/org/apache/camel/	added
camel/trunk/components/camel-avro/src/test/java/org/apache/camel/avro/	added
camel/trunk/components/camel-avro/src/test/java/org/apache/camel/avro/generated/	added
camel/trunk/components/camel-avro/src/test/java/org/apache/camel/avro/generated/Key.java	added
camel/trunk/components/camel-avro/src/test/java/org/apache/camel/avro/generated/KeyValueProtocol.java	added
camel/trunk/components/camel-avro/src/test/java/org/apache/camel/avro/generated/Value.java	added
camel/trunk/components/camel-avro/src/test/java/org/apache/camel/avro/impl/	added
camel/trunk/components/camel-avro/src/test/java/org/apache/camel/avro/impl/KeyValueProtocolImpl.java	added
camel/trunk/components/camel-avro/src/test/java/org/apache/camel/component/	added
camel/trunk/components/camel-avro/src/test/java/org/apache/camel/component/avro/	added
camel/trunk/components/camel-avro/src/test/java/org/apache/camel/component/avro/AvroConsumerTestSupport.java	added
camel/trunk/components/camel-avro/src/test/java/org/apache/camel/component/avro/AvroHttpConsumerTest.java	added
camel/trunk/components/camel-avro/src/test/java/org/apache/camel/component/avro/AvroHttpProducerTest.java	added
camel/trunk/components/camel-avro/src/test/java/org/apache/camel/component/avro/AvroHttpSpringProducerTest.java	added
camel/trunk/components/camel-avro/src/test/java/org/apache/camel/component/avro/AvroNettyConsumerTest.java	added
camel/trunk/components/camel-avro/src/test/java/org/apache/camel/component/avro/AvroNettyProducerTest.java	added
camel/trunk/components/camel-avro/src/test/java/org/apache/camel/component/avro/AvroNettySpringConsumerTest.java	added
camel/trunk/components/camel-avro/src/test/java/org/apache/camel/component/avro/AvroNettySpringProducerTest.java	added
camel/trunk/components/camel-avro/src/test/java/org/apache/camel/component/avro/AvroProducerTestSupport.java	added
camel/trunk/components/camel-avro/src/test/java/org/apache/camel/component/avro/AvroTestSupport.java	added
camel/trunk/components/camel-avro/src/test/java/org/apache/camel/component/avro/processors/	added
camel/trunk/components/camel-avro/src/test/java/org/apache/camel/component/avro/processors/GetProcessor.java	added
camel/trunk/components/camel-avro/src/test/java/org/apache/camel/component/avro/processors/PutProcessor.java	added
camel/trunk/components/camel-avro/src/test/java/org/apache/camel/dataformat/	added
camel/trunk/components/camel-avro/src/test/java/org/apache/camel/dataformat/avro/	added
camel/trunk/components/camel-avro/src/test/java/org/apache/camel/dataformat/avro/AvroMarshalAndUnmarshalSpringTest.java	added
camel/trunk/components/camel-avro/src/test/java/org/apache/camel/dataformat/avro/AvroMarshalAndUnmarshallTest.java	added
camel/trunk/components/camel-avro/src/test/resources/	added
camel/trunk/components/camel-avro/src/test/resources/org/	added
camel/trunk/components/camel-avro/src/test/resources/org/apache/	added
camel/trunk/components/camel-avro/src/test/resources/org/apache/camel/	added
camel/trunk/components/camel-avro/src/test/resources/org/apache/camel/component/	added
camel/trunk/components/camel-avro/src/test/resources/org/apache/camel/component/avro/	added
camel/trunk/components/camel-avro/src/test/resources/org/apache/camel/component/avro/avro-http-consumer.xml	added
camel/trunk/components/camel-avro/src/test/resources/org/apache/camel/component/avro/avro-http-producer.xml	added
camel/trunk/components/camel-avro/src/test/resources/org/apache/camel/component/avro/avro-netty-consumer.xml	added
camel/trunk/components/camel-avro/src/test/resources/org/apache/camel/component/avro/avro-netty-producer.xml	added
camel/trunk/components/camel-avro/src/test/resources/org/apache/camel/dataformat/	added
camel/trunk/components/camel-avro/src/test/resources/org/apache/camel/dataformat/avro/	added
camel/trunk/components/camel-avro/src/test/resources/org/apache/camel/dataformat/avro/springDataFormat.xml	added
camel/trunk/components/pom.xml	modified , text changed
camel/trunk/parent/pom.xml	modified , text changed
camel/trunk/platforms/karaf/features/src/main/resources/features.xml	modified , text changed

infrastructure at apache.org	ViewVC Help
Powered by ViewVC 1.1.26