Author: wtam
Date: Tue Dec 30 07:54:30 2008
New Revision: 730158
URL: http://svn.apache.org/viewvc?rev=730158&view=rev
Log:
Merged revisions 730154 via svnmerge from
https://svn.apache.org/repos/asf/activemq/camel/trunk
........
r730154 | wtam | 2008-12-30 10:36:40 -0500 (Tue, 30 Dec 2008) | 1 line
[CAMEL-1203] REST Restlet component (thanks to Przemyslaw Budzik's
constribution)
........
Added:
activemq/camel/branches/camel-1.x/components/camel-restlet/
- copied from r730154, activemq/camel/trunk/components/camel-restlet/
activemq/camel/branches/camel-1.x/components/camel-restlet/pom.xml
- copied unchanged from r730154,
activemq/camel/trunk/components/camel-restlet/pom.xml
activemq/camel/branches/camel-1.x/components/camel-restlet/src/
- copied from r730154, activemq/camel/trunk/components/camel-restlet/src/
activemq/camel/branches/camel-1.x/components/camel-restlet/src/main/
- copied from r730154,
activemq/camel/trunk/components/camel-restlet/src/main/
activemq/camel/branches/camel-1.x/components/camel-restlet/src/main/java/
- copied from r730154,
activemq/camel/trunk/components/camel-restlet/src/main/java/
activemq/camel/branches/camel-1.x/components/camel-restlet/src/main/java/org/
- copied from r730154,
activemq/camel/trunk/components/camel-restlet/src/main/java/org/
activemq/camel/branches/camel-1.x/components/camel-restlet/src/main/java/org/apache/
- copied from r730154,
activemq/camel/trunk/components/camel-restlet/src/main/java/org/apache/
activemq/camel/branches/camel-1.x/components/camel-restlet/src/main/java/org/apache/camel/
- copied from r730154,
activemq/camel/trunk/components/camel-restlet/src/main/java/org/apache/camel/
activemq/camel/branches/camel-1.x/components/camel-restlet/src/main/java/org/apache/camel/component/
- copied from r730154,
activemq/camel/trunk/components/camel-restlet/src/main/java/org/apache/camel/component/
activemq/camel/branches/camel-1.x/components/camel-restlet/src/main/java/org/apache/camel/component/restlet/
- copied from r730154,
activemq/camel/trunk/components/camel-restlet/src/main/java/org/apache/camel/component/restlet/
activemq/camel/branches/camel-1.x/components/camel-restlet/src/main/java/org/apache/camel/component/restlet/DefaultRestletBinding.java
- copied unchanged from r730154,
activemq/camel/trunk/components/camel-restlet/src/main/java/org/apache/camel/component/restlet/DefaultRestletBinding.java
activemq/camel/branches/camel-1.x/components/camel-restlet/src/main/java/org/apache/camel/component/restlet/MethodBasedRouter.java
- copied unchanged from r730154,
activemq/camel/trunk/components/camel-restlet/src/main/java/org/apache/camel/component/restlet/MethodBasedRouter.java
activemq/camel/branches/camel-1.x/components/camel-restlet/src/main/java/org/apache/camel/component/restlet/RestletBinding.java
- copied unchanged from r730154,
activemq/camel/trunk/components/camel-restlet/src/main/java/org/apache/camel/component/restlet/RestletBinding.java
activemq/camel/branches/camel-1.x/components/camel-restlet/src/main/java/org/apache/camel/component/restlet/RestletComponent.java
- copied unchanged from r730154,
activemq/camel/trunk/components/camel-restlet/src/main/java/org/apache/camel/component/restlet/RestletComponent.java
activemq/camel/branches/camel-1.x/components/camel-restlet/src/main/java/org/apache/camel/component/restlet/RestletConsumer.java
- copied unchanged from r730154,
activemq/camel/trunk/components/camel-restlet/src/main/java/org/apache/camel/component/restlet/RestletConsumer.java
activemq/camel/branches/camel-1.x/components/camel-restlet/src/main/java/org/apache/camel/component/restlet/RestletEndpoint.java
- copied unchanged from r730154,
activemq/camel/trunk/components/camel-restlet/src/main/java/org/apache/camel/component/restlet/RestletEndpoint.java
activemq/camel/branches/camel-1.x/components/camel-restlet/src/main/java/org/apache/camel/component/restlet/RestletProducer.java
- copied unchanged from r730154,
activemq/camel/trunk/components/camel-restlet/src/main/java/org/apache/camel/component/restlet/RestletProducer.java
activemq/camel/branches/camel-1.x/components/camel-restlet/src/main/java/org/apache/camel/component/restlet/converter/
- copied from r730154,
activemq/camel/trunk/components/camel-restlet/src/main/java/org/apache/camel/component/restlet/converter/
activemq/camel/branches/camel-1.x/components/camel-restlet/src/main/java/org/apache/camel/component/restlet/converter/RestletConverter.java
- copied unchanged from r730154,
activemq/camel/trunk/components/camel-restlet/src/main/java/org/apache/camel/component/restlet/converter/RestletConverter.java
activemq/camel/branches/camel-1.x/components/camel-restlet/src/main/resources/
- copied from r730154,
activemq/camel/trunk/components/camel-restlet/src/main/resources/
activemq/camel/branches/camel-1.x/components/camel-restlet/src/main/resources/META-INF/
- copied from r730154,
activemq/camel/trunk/components/camel-restlet/src/main/resources/META-INF/
activemq/camel/branches/camel-1.x/components/camel-restlet/src/main/resources/META-INF/LICENSE.txt
- copied unchanged from r730154,
activemq/camel/trunk/components/camel-restlet/src/main/resources/META-INF/LICENSE.txt
activemq/camel/branches/camel-1.x/components/camel-restlet/src/main/resources/META-INF/NOTICE.txt
- copied unchanged from r730154,
activemq/camel/trunk/components/camel-restlet/src/main/resources/META-INF/NOTICE.txt
activemq/camel/branches/camel-1.x/components/camel-restlet/src/main/resources/META-INF/services/
- copied from r730154,
activemq/camel/trunk/components/camel-restlet/src/main/resources/META-INF/services/
activemq/camel/branches/camel-1.x/components/camel-restlet/src/main/resources/META-INF/services/org/
- copied from r730154,
activemq/camel/trunk/components/camel-restlet/src/main/resources/META-INF/services/org/
activemq/camel/branches/camel-1.x/components/camel-restlet/src/main/resources/META-INF/services/org/apache/
- copied from r730154,
activemq/camel/trunk/components/camel-restlet/src/main/resources/META-INF/services/org/apache/
activemq/camel/branches/camel-1.x/components/camel-restlet/src/main/resources/META-INF/services/org/apache/camel/
- copied from r730154,
activemq/camel/trunk/components/camel-restlet/src/main/resources/META-INF/services/org/apache/camel/
activemq/camel/branches/camel-1.x/components/camel-restlet/src/main/resources/META-INF/services/org/apache/camel/TypeConverter
- copied unchanged from r730154,
activemq/camel/trunk/components/camel-restlet/src/main/resources/META-INF/services/org/apache/camel/TypeConverter
activemq/camel/branches/camel-1.x/components/camel-restlet/src/main/resources/META-INF/services/org/apache/camel/component/
- copied from r730154,
activemq/camel/trunk/components/camel-restlet/src/main/resources/META-INF/services/org/apache/camel/component/
activemq/camel/branches/camel-1.x/components/camel-restlet/src/main/resources/META-INF/services/org/apache/camel/component/restlet
- copied unchanged from r730154,
activemq/camel/trunk/components/camel-restlet/src/main/resources/META-INF/services/org/apache/camel/component/restlet
activemq/camel/branches/camel-1.x/components/camel-restlet/src/test/
- copied from r730154,
activemq/camel/trunk/components/camel-restlet/src/test/
activemq/camel/branches/camel-1.x/components/camel-restlet/src/test/java/
- copied from r730154,
activemq/camel/trunk/components/camel-restlet/src/test/java/
activemq/camel/branches/camel-1.x/components/camel-restlet/src/test/java/org/
- copied from r730154,
activemq/camel/trunk/components/camel-restlet/src/test/java/org/
activemq/camel/branches/camel-1.x/components/camel-restlet/src/test/java/org/apache/
- copied from r730154,
activemq/camel/trunk/components/camel-restlet/src/test/java/org/apache/
activemq/camel/branches/camel-1.x/components/camel-restlet/src/test/java/org/apache/camel/
- copied from r730154,
activemq/camel/trunk/components/camel-restlet/src/test/java/org/apache/camel/
activemq/camel/branches/camel-1.x/components/camel-restlet/src/test/java/org/apache/camel/component/
- copied from r730154,
activemq/camel/trunk/components/camel-restlet/src/test/java/org/apache/camel/component/
activemq/camel/branches/camel-1.x/components/camel-restlet/src/test/java/org/apache/camel/component/restlet/
- copied from r730154,
activemq/camel/trunk/components/camel-restlet/src/test/java/org/apache/camel/component/restlet/
activemq/camel/branches/camel-1.x/components/camel-restlet/src/test/java/org/apache/camel/component/restlet/RestRouteBuilderTest.java
- copied unchanged from r730154,
activemq/camel/trunk/components/camel-restlet/src/test/java/org/apache/camel/component/restlet/RestRouteBuilderTest.java
activemq/camel/branches/camel-1.x/components/camel-restlet/src/test/resources/
- copied from r730154,
activemq/camel/trunk/components/camel-restlet/src/test/resources/
activemq/camel/branches/camel-1.x/components/camel-restlet/src/test/resources/log4j.properties
- copied unchanged from r730154,
activemq/camel/trunk/components/camel-restlet/src/test/resources/log4j.properties
Modified:
activemq/camel/branches/camel-1.x/ (props changed)
activemq/camel/branches/camel-1.x/components/pom.xml
Propchange: activemq/camel/branches/camel-1.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Dec 30 07:54:30 2008
@@ -1 +1 @@
-/activemq/camel/trunk:709850,711200,711206,711219-711220,711523,711531,711756,711784,711859,711874,711962,711971,712064,712119,712148,712662,712692,712925,713013,713107,713136,713273,713290,713292,713295,713314,713475,713625,713932,713944,714032,717965,717989,718242,718273,718312-718515,719163-719184,719334,719339,719524,719662,719848,719851,719855,719864,719978-719979,720207,720435-720437,720806,721272,721331,721333-721334,721360,721669,721764,721813,721985,722005,722070,722110,722415,722438,722726,722845,722878,723264,723314,723325-723327,723409,723835,723966,724122,724619,724681,725040,725309-725320,725340,725351,725569-725572,725612,725652-725660,725715,725883,726339,726640-726645,726932,727113,727375,727377,727624,727713,727946,729401,729892
+/activemq/camel/trunk:709850,711200,711206,711219-711220,711523,711531,711756,711784,711859,711874,711962,711971,712064,712119,712148,712662,712692,712925,713013,713107,713136,713273,713290,713292,713295,713314,713475,713625,713932,713944,714032,717965,717989,718242,718273,718312-718515,719163-719184,719334,719339,719524,719662,719848,719851,719855,719864,719978-719979,720207,720435-720437,720806,721272,721331,721333-721334,721360,721669,721764,721813,721985,722005,722070,722110,722415,722438,722726,722845,722878,723264,723314,723325-723327,723409,723835,723966,724122,724619,724681,725040,725309-725320,725340,725351,725569-725572,725612,725652-725660,725715,725883,726339,726640-726645,726932,727113,727375,727377,727624,727713,727946,729401,729892,730154
Propchange: activemq/camel/branches/camel-1.x/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified: activemq/camel/branches/camel-1.x/components/pom.xml
URL:
http://svn.apache.org/viewvc/activemq/camel/branches/camel-1.x/components/pom.xml?rev=730158&r1=730157&r2=730158&view=diff
==============================================================================
--- activemq/camel/branches/camel-1.x/components/pom.xml (original)
+++ activemq/camel/branches/camel-1.x/components/pom.xml Tue Dec 30 07:54:30
2008
@@ -88,5 +88,6 @@
<module>camel-xmpp</module>
<module>camel-xstream</module>
<module>camel-tagsoup</module>
+ <module>camel-restlet</module>
</modules>
</project>