Author: davsclaus Date: Thu Jan 22 05:30:32 2009 New Revision: 736637 URL: http://svn.apache.org/viewvc?rev=736637&view=rev Log: Merged revisions 736617,736619-736620 via svnmerge from https://svn.apache.org/repos/asf/camel/trunk
........ r736617 | davsclaus | 2009-01-22 13:17:44 +0100 (Thu, 22 Jan 2009) | 1 line CAMEL-1287: Added freemarker component. ........ r736619 | davsclaus | 2009-01-22 13:21:16 +0100 (Thu, 22 Jan 2009) | 1 line CAMEL-1287: freemarker component. ........ r736620 | davsclaus | 2009-01-22 13:27:59 +0100 (Thu, 22 Jan 2009) | 1 line CAMEL-1287: freemarker component. ........ Added: camel/branches/camel-1.x/components/camel-freemarker/ (props changed) - copied from r736620, camel/trunk/components/camel-freemarker/ camel/branches/camel-1.x/components/camel-freemarker/pom.xml - copied, changed from r736620, camel/trunk/components/camel-freemarker/pom.xml camel/branches/camel-1.x/components/camel-freemarker/src/ - copied from r736620, camel/trunk/components/camel-freemarker/src/ camel/branches/camel-1.x/components/camel-freemarker/src/main/ - copied from r736620, camel/trunk/components/camel-freemarker/src/main/ camel/branches/camel-1.x/components/camel-freemarker/src/main/java/ - copied from r736620, camel/trunk/components/camel-freemarker/src/main/java/ camel/branches/camel-1.x/components/camel-freemarker/src/main/java/org/ - copied from r736620, camel/trunk/components/camel-freemarker/src/main/java/org/ camel/branches/camel-1.x/components/camel-freemarker/src/main/java/org/apache/ - copied from r736620, camel/trunk/components/camel-freemarker/src/main/java/org/apache/ camel/branches/camel-1.x/components/camel-freemarker/src/main/java/org/apache/camel/ - copied from r736620, camel/trunk/components/camel-freemarker/src/main/java/org/apache/camel/ camel/branches/camel-1.x/components/camel-freemarker/src/main/java/org/apache/camel/component/ - copied from r736620, camel/trunk/components/camel-freemarker/src/main/java/org/apache/camel/component/ camel/branches/camel-1.x/components/camel-freemarker/src/main/java/org/apache/camel/component/freemarker/ - copied from r736620, camel/trunk/components/camel-freemarker/src/main/java/org/apache/camel/component/freemarker/ camel/branches/camel-1.x/components/camel-freemarker/src/main/java/org/apache/camel/component/freemarker/FreemarkerComponent.java - copied, changed from r736620, camel/trunk/components/camel-freemarker/src/main/java/org/apache/camel/component/freemarker/FreemarkerComponent.java camel/branches/camel-1.x/components/camel-freemarker/src/main/java/org/apache/camel/component/freemarker/FreemarkerEndpoint.java - copied unchanged from r736620, camel/trunk/components/camel-freemarker/src/main/java/org/apache/camel/component/freemarker/FreemarkerEndpoint.java camel/branches/camel-1.x/components/camel-freemarker/src/main/java/org/apache/camel/component/freemarker/NoCacheStorage.java - copied unchanged from r736620, camel/trunk/components/camel-freemarker/src/main/java/org/apache/camel/component/freemarker/NoCacheStorage.java camel/branches/camel-1.x/components/camel-freemarker/src/main/resources/ - copied from r736620, camel/trunk/components/camel-freemarker/src/main/resources/ camel/branches/camel-1.x/components/camel-freemarker/src/main/resources/META-INF/ - copied from r736620, camel/trunk/components/camel-freemarker/src/main/resources/META-INF/ camel/branches/camel-1.x/components/camel-freemarker/src/main/resources/META-INF/LICENSE.txt - copied unchanged from r736620, camel/trunk/components/camel-freemarker/src/main/resources/META-INF/LICENSE.txt camel/branches/camel-1.x/components/camel-freemarker/src/main/resources/META-INF/NOTICE.txt - copied unchanged from r736620, camel/trunk/components/camel-freemarker/src/main/resources/META-INF/NOTICE.txt camel/branches/camel-1.x/components/camel-freemarker/src/main/resources/META-INF/services/ - copied from r736620, camel/trunk/components/camel-freemarker/src/main/resources/META-INF/services/ camel/branches/camel-1.x/components/camel-freemarker/src/main/resources/META-INF/services/org/ - copied from r736620, camel/trunk/components/camel-freemarker/src/main/resources/META-INF/services/org/ camel/branches/camel-1.x/components/camel-freemarker/src/main/resources/META-INF/services/org/apache/ - copied from r736620, camel/trunk/components/camel-freemarker/src/main/resources/META-INF/services/org/apache/ camel/branches/camel-1.x/components/camel-freemarker/src/main/resources/META-INF/services/org/apache/camel/ - copied from r736620, camel/trunk/components/camel-freemarker/src/main/resources/META-INF/services/org/apache/camel/ camel/branches/camel-1.x/components/camel-freemarker/src/main/resources/META-INF/services/org/apache/camel/component/ - copied from r736620, camel/trunk/components/camel-freemarker/src/main/resources/META-INF/services/org/apache/camel/component/ camel/branches/camel-1.x/components/camel-freemarker/src/main/resources/META-INF/services/org/apache/camel/component/freemarker - copied unchanged from r736620, camel/trunk/components/camel-freemarker/src/main/resources/META-INF/services/org/apache/camel/component/freemarker camel/branches/camel-1.x/components/camel-freemarker/src/test/ - copied from r736620, camel/trunk/components/camel-freemarker/src/test/ camel/branches/camel-1.x/components/camel-freemarker/src/test/java/ - copied from r736620, camel/trunk/components/camel-freemarker/src/test/java/ camel/branches/camel-1.x/components/camel-freemarker/src/test/java/org/ - copied from r736620, camel/trunk/components/camel-freemarker/src/test/java/org/ camel/branches/camel-1.x/components/camel-freemarker/src/test/java/org/apache/ - copied from r736620, camel/trunk/components/camel-freemarker/src/test/java/org/apache/ camel/branches/camel-1.x/components/camel-freemarker/src/test/java/org/apache/camel/ - copied from r736620, camel/trunk/components/camel-freemarker/src/test/java/org/apache/camel/ camel/branches/camel-1.x/components/camel-freemarker/src/test/java/org/apache/camel/component/ - copied from r736620, camel/trunk/components/camel-freemarker/src/test/java/org/apache/camel/component/ camel/branches/camel-1.x/components/camel-freemarker/src/test/java/org/apache/camel/component/freemarker/ - copied from r736620, camel/trunk/components/camel-freemarker/src/test/java/org/apache/camel/component/freemarker/ camel/branches/camel-1.x/components/camel-freemarker/src/test/java/org/apache/camel/component/freemarker/FreemarkerBodyAsDomainObjectTest.java - copied unchanged from r736620, camel/trunk/components/camel-freemarker/src/test/java/org/apache/camel/component/freemarker/FreemarkerBodyAsDomainObjectTest.java camel/branches/camel-1.x/components/camel-freemarker/src/test/java/org/apache/camel/component/freemarker/FreemarkerContentCacheTest.java - copied unchanged from r736620, camel/trunk/components/camel-freemarker/src/test/java/org/apache/camel/component/freemarker/FreemarkerContentCacheTest.java camel/branches/camel-1.x/components/camel-freemarker/src/test/java/org/apache/camel/component/freemarker/FreemarkerEncodingTest.java - copied unchanged from r736620, camel/trunk/components/camel-freemarker/src/test/java/org/apache/camel/component/freemarker/FreemarkerEncodingTest.java camel/branches/camel-1.x/components/camel-freemarker/src/test/java/org/apache/camel/component/freemarker/FreemarkerLetterTest.java - copied unchanged from r736620, camel/trunk/components/camel-freemarker/src/test/java/org/apache/camel/component/freemarker/FreemarkerLetterTest.java camel/branches/camel-1.x/components/camel-freemarker/src/test/java/org/apache/camel/component/freemarker/FreemarkerSetHeaderTest.java - copied unchanged from r736620, camel/trunk/components/camel-freemarker/src/test/java/org/apache/camel/component/freemarker/FreemarkerSetHeaderTest.java camel/branches/camel-1.x/components/camel-freemarker/src/test/java/org/apache/camel/component/freemarker/FreemarkerTest.java - copied unchanged from r736620, camel/trunk/components/camel-freemarker/src/test/java/org/apache/camel/component/freemarker/FreemarkerTest.java camel/branches/camel-1.x/components/camel-freemarker/src/test/java/org/apache/camel/component/freemarker/FruitFilter.java - copied unchanged from r736620, camel/trunk/components/camel-freemarker/src/test/java/org/apache/camel/component/freemarker/FruitFilter.java camel/branches/camel-1.x/components/camel-freemarker/src/test/resources/ - copied from r736620, camel/trunk/components/camel-freemarker/src/test/resources/ camel/branches/camel-1.x/components/camel-freemarker/src/test/resources/log4j.properties - copied unchanged from r736620, camel/trunk/components/camel-freemarker/src/test/resources/log4j.properties camel/branches/camel-1.x/components/camel-freemarker/src/test/resources/org/ - copied from r736620, camel/trunk/components/camel-freemarker/src/test/resources/org/ camel/branches/camel-1.x/components/camel-freemarker/src/test/resources/org/apache/ - copied from r736620, camel/trunk/components/camel-freemarker/src/test/resources/org/apache/ camel/branches/camel-1.x/components/camel-freemarker/src/test/resources/org/apache/camel/ - copied from r736620, camel/trunk/components/camel-freemarker/src/test/resources/org/apache/camel/ camel/branches/camel-1.x/components/camel-freemarker/src/test/resources/org/apache/camel/component/ - copied from r736620, camel/trunk/components/camel-freemarker/src/test/resources/org/apache/camel/component/ camel/branches/camel-1.x/components/camel-freemarker/src/test/resources/org/apache/camel/component/freemarker/ - copied from r736620, camel/trunk/components/camel-freemarker/src/test/resources/org/apache/camel/component/freemarker/ camel/branches/camel-1.x/components/camel-freemarker/src/test/resources/org/apache/camel/component/freemarker/AppleTemplate.ftl - copied unchanged from r736620, camel/trunk/components/camel-freemarker/src/test/resources/org/apache/camel/component/freemarker/AppleTemplate.ftl camel/branches/camel-1.x/components/camel-freemarker/src/test/resources/org/apache/camel/component/freemarker/BodyAsDomainObject.ftl - copied unchanged from r736620, camel/trunk/components/camel-freemarker/src/test/resources/org/apache/camel/component/freemarker/BodyAsDomainObject.ftl camel/branches/camel-1.x/components/camel-freemarker/src/test/resources/org/apache/camel/component/freemarker/OrangeTemplate.ftl - copied unchanged from r736620, camel/trunk/components/camel-freemarker/src/test/resources/org/apache/camel/component/freemarker/OrangeTemplate.ftl camel/branches/camel-1.x/components/camel-freemarker/src/test/resources/org/apache/camel/component/freemarker/camel-context.xml - copied, changed from r736620, camel/trunk/components/camel-freemarker/src/test/resources/org/apache/camel/component/freemarker/camel-context.xml camel/branches/camel-1.x/components/camel-freemarker/src/test/resources/org/apache/camel/component/freemarker/example.ftl - copied unchanged from r736620, camel/trunk/components/camel-freemarker/src/test/resources/org/apache/camel/component/freemarker/example.ftl camel/branches/camel-1.x/components/camel-freemarker/src/test/resources/org/apache/camel/component/freemarker/letter-utf16.ftl - copied unchanged from r736620, camel/trunk/components/camel-freemarker/src/test/resources/org/apache/camel/component/freemarker/letter-utf16.ftl camel/branches/camel-1.x/components/camel-freemarker/src/test/resources/org/apache/camel/component/freemarker/letter.ftl - copied unchanged from r736620, camel/trunk/components/camel-freemarker/src/test/resources/org/apache/camel/component/freemarker/letter.ftl Modified: camel/branches/camel-1.x/ (props changed) camel/branches/camel-1.x/apache-camel/bundle/pom.xml camel/branches/camel-1.x/apache-camel/pom.xml camel/branches/camel-1.x/apache-camel/src/main/descriptors/common-bin.xml camel/branches/camel-1.x/components/camel-spring/src/main/java/org/apache/camel/component/ResourceBasedEndpoint.java camel/branches/camel-1.x/components/pom.xml camel/branches/camel-1.x/pom.xml Propchange: camel/branches/camel-1.x/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Thu Jan 22 05:30:32 2009 @@ -1,2 +1,2 @@ /activemq/camel/trunk:732943,733749,734053,734057-734058,734064,734130,734309,734340-734342,734348,734392,734422,734727,734903,734932,735421,735427,735732 -/camel/trunk:735847,735888,736227 +/camel/trunk:735847,735888,736227,736617-736620 Propchange: camel/branches/camel-1.x/ ------------------------------------------------------------------------------ Binary property 'svnmerge-integrated' - no diff available. Modified: camel/branches/camel-1.x/apache-camel/bundle/pom.xml URL: http://svn.apache.org/viewvc/camel/branches/camel-1.x/apache-camel/bundle/pom.xml?rev=736637&r1=736636&r2=736637&view=diff ============================================================================== --- camel/branches/camel-1.x/apache-camel/bundle/pom.xml (original) +++ camel/branches/camel-1.x/apache-camel/bundle/pom.xml Thu Jan 22 05:30:32 2009 @@ -75,6 +75,10 @@ </dependency> <dependency> <groupId>org.apache.camel</groupId> + <artifactId>camel-freemarker</artifactId> + </dependency> + <dependency> + <groupId>org.apache.camel</groupId> <artifactId>camel-ftp</artifactId> </dependency> <dependency> Modified: camel/branches/camel-1.x/apache-camel/pom.xml URL: http://svn.apache.org/viewvc/camel/branches/camel-1.x/apache-camel/pom.xml?rev=736637&r1=736636&r2=736637&view=diff ============================================================================== --- camel/branches/camel-1.x/apache-camel/pom.xml (original) +++ camel/branches/camel-1.x/apache-camel/pom.xml Thu Jan 22 05:30:32 2009 @@ -85,6 +85,10 @@ </dependency> <dependency> <groupId>org.apache.camel</groupId> + <artifactId>camel-freemarker</artifactId> + </dependency> + <dependency> + <groupId>org.apache.camel</groupId> <artifactId>camel-groovy</artifactId> </dependency> <dependency> Modified: camel/branches/camel-1.x/apache-camel/src/main/descriptors/common-bin.xml URL: http://svn.apache.org/viewvc/camel/branches/camel-1.x/apache-camel/src/main/descriptors/common-bin.xml?rev=736637&r1=736636&r2=736637&view=diff ============================================================================== --- camel/branches/camel-1.x/apache-camel/src/main/descriptors/common-bin.xml (original) +++ camel/branches/camel-1.x/apache-camel/src/main/descriptors/common-bin.xml Thu Jan 22 05:30:32 2009 @@ -48,6 +48,7 @@ <include>org.apache.camel:camel-csv</include> <include>org.apache.camel:camel-cxf</include> <include>org.apache.camel:camel-flatpack</include> + <include>org.apache.camel:camel-freemarker</include> <include>org.apache.camel:camel-ftp</include> <include>org.apache.camel:camel-groovy</include> <include>org.apache.camel:camel-guice</include> Propchange: camel/branches/camel-1.x/components/camel-freemarker/ ------------------------------------------------------------------------------ --- svn:ignore (added) +++ svn:ignore Thu Jan 22 05:30:32 2009 @@ -0,0 +1,9 @@ +.project +.checkstyle +.pmd +.classpath +target +.settings +eclipse-classes +velocity.log +*.i?? Copied: camel/branches/camel-1.x/components/camel-freemarker/pom.xml (from r736620, camel/trunk/components/camel-freemarker/pom.xml) URL: http://svn.apache.org/viewvc/camel/branches/camel-1.x/components/camel-freemarker/pom.xml?p2=camel/branches/camel-1.x/components/camel-freemarker/pom.xml&p1=camel/trunk/components/camel-freemarker/pom.xml&r1=736620&r2=736637&rev=736637&view=diff ============================================================================== --- camel/trunk/components/camel-freemarker/pom.xml (original) +++ camel/branches/camel-1.x/components/camel-freemarker/pom.xml Thu Jan 22 05:30:32 2009 @@ -25,7 +25,7 @@ <parent> <groupId>org.apache.camel</groupId> <artifactId>camel-parent</artifactId> - <version>2.0-SNAPSHOT</version> + <version>1.5.1-SNAPSHOT</version> </parent> <artifactId>camel-freemarker</artifactId> Copied: camel/branches/camel-1.x/components/camel-freemarker/src/main/java/org/apache/camel/component/freemarker/FreemarkerComponent.java (from r736620, camel/trunk/components/camel-freemarker/src/main/java/org/apache/camel/component/freemarker/FreemarkerComponent.java) URL: http://svn.apache.org/viewvc/camel/branches/camel-1.x/components/camel-freemarker/src/main/java/org/apache/camel/component/freemarker/FreemarkerComponent.java?p2=camel/branches/camel-1.x/components/camel-freemarker/src/main/java/org/apache/camel/component/freemarker/FreemarkerComponent.java&p1=camel/trunk/components/camel-freemarker/src/main/java/org/apache/camel/component/freemarker/FreemarkerComponent.java&r1=736620&r2=736637&rev=736637&view=diff ============================================================================== --- camel/trunk/components/camel-freemarker/src/main/java/org/apache/camel/component/freemarker/FreemarkerComponent.java (original) +++ camel/branches/camel-1.x/components/camel-freemarker/src/main/java/org/apache/camel/component/freemarker/FreemarkerComponent.java Thu Jan 22 05:30:32 2009 @@ -37,7 +37,7 @@ // should we use regular configuration or no cache (content cache is default true) Configuration config; - boolean cache = getAndRemoveParameter(parameters, "contentCache", Boolean.class, Boolean.TRUE); + boolean cache = (Boolean) getAndRemoveParameter(parameters, "contentCache", Boolean.class, Boolean.TRUE); if (cache) { config = getConfiguraiton(); } else { Copied: camel/branches/camel-1.x/components/camel-freemarker/src/test/resources/org/apache/camel/component/freemarker/camel-context.xml (from r736620, camel/trunk/components/camel-freemarker/src/test/resources/org/apache/camel/component/freemarker/camel-context.xml) URL: http://svn.apache.org/viewvc/camel/branches/camel-1.x/components/camel-freemarker/src/test/resources/org/apache/camel/component/freemarker/camel-context.xml?p2=camel/branches/camel-1.x/components/camel-freemarker/src/test/resources/org/apache/camel/component/freemarker/camel-context.xml&p1=camel/trunk/components/camel-freemarker/src/test/resources/org/apache/camel/component/freemarker/camel-context.xml&r1=736620&r2=736637&rev=736637&view=diff ============================================================================== --- camel/trunk/components/camel-freemarker/src/test/resources/org/apache/camel/component/freemarker/camel-context.xml (original) +++ camel/branches/camel-1.x/components/camel-freemarker/src/test/resources/org/apache/camel/component/freemarker/camel-context.xml Thu Jan 22 05:30:32 2009 @@ -25,12 +25,12 @@ <route> <from uri="direct:start"/> <filter> - <method bean="fruitFilter" method="isApple"/> + <methodCall bean="fruitFilter" method="isApple"/> <to uri="freemarker:org/apache/camel/component/freemarker/AppleTemplate.ftl" /> <to uri="mock:result" /> </filter> <filter> - <method bean="fruitFilter" method="isOrange"/> + <methodCall bean="fruitFilter" method="isOrange"/> <to uri="freemarker:org/apache/camel/component/freemarker/OrangeTemplate.ftl" /> <to uri="mock:result" /> </filter> Modified: camel/branches/camel-1.x/components/camel-spring/src/main/java/org/apache/camel/component/ResourceBasedEndpoint.java URL: http://svn.apache.org/viewvc/camel/branches/camel-1.x/components/camel-spring/src/main/java/org/apache/camel/component/ResourceBasedEndpoint.java?rev=736637&r1=736636&r2=736637&view=diff ============================================================================== --- camel/branches/camel-1.x/components/camel-spring/src/main/java/org/apache/camel/component/ResourceBasedEndpoint.java (original) +++ camel/branches/camel-1.x/components/camel-spring/src/main/java/org/apache/camel/component/ResourceBasedEndpoint.java Thu Jan 22 05:30:32 2009 @@ -119,4 +119,7 @@ this.resourceLoader = resourceLoader; } + public String getResourceUri() { + return resourceUri; + } } \ No newline at end of file Modified: camel/branches/camel-1.x/components/pom.xml URL: http://svn.apache.org/viewvc/camel/branches/camel-1.x/components/pom.xml?rev=736637&r1=736636&r2=736637&view=diff ============================================================================== --- camel/branches/camel-1.x/components/pom.xml (original) +++ camel/branches/camel-1.x/components/pom.xml Thu Jan 22 05:30:32 2009 @@ -40,6 +40,7 @@ <module>camel-csv</module> <module>camel-cxf</module> <module>camel-flatpack</module> + <module>camel-freemarker</module> <module>camel-ftp</module> <module>camel-guice</module> <module>camel-groovy</module> Modified: camel/branches/camel-1.x/pom.xml URL: http://svn.apache.org/viewvc/camel/branches/camel-1.x/pom.xml?rev=736637&r1=736636&r2=736637&view=diff ============================================================================== --- camel/branches/camel-1.x/pom.xml (original) +++ camel/branches/camel-1.x/pom.xml Thu Jan 22 05:30:32 2009 @@ -243,6 +243,11 @@ </dependency> <dependency> <groupId>org.apache.camel</groupId> + <artifactId>camel-freemarker</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>org.apache.camel</groupId> <artifactId>camel-ftp</artifactId> <version>${project.version}</version> </dependency>