CAMEL-6398: Added camel-weather to dist
Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/d12dbff0 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/d12dbff0 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/d12dbff0 Branch: refs/heads/master Commit: d12dbff0eaa47d5458c85e26ed0e4a860e33b70c Parents: d1d95bf Author: Claus Ibsen <davscl...@apache.org> Authored: Mon May 27 08:51:40 2013 +0200 Committer: Claus Ibsen <davscl...@apache.org> Committed: Mon May 27 08:51:40 2013 +0200 ---------------------------------------------------------------------- apache-camel/pom.xml | 4 +++ apache-camel/src/main/descriptors/common-bin.xml | 1 + components/camel-weather/pom.xml | 18 +++++---------- .../src/test/resources/log4j.properties | 9 ++----- 4 files changed, 14 insertions(+), 18 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/d12dbff0/apache-camel/pom.xml ---------------------------------------------------------------------- diff --git a/apache-camel/pom.xml b/apache-camel/pom.xml index bc0e744..54c2382 100644 --- a/apache-camel/pom.xml +++ b/apache-camel/pom.xml @@ -564,6 +564,10 @@ </dependency> <dependency> <groupId>org.apache.camel</groupId> + <artifactId>camel-weather</artifactId> + </dependency> + <dependency> + <groupId>org.apache.camel</groupId> <artifactId>camel-websocket</artifactId> </dependency> <dependency> http://git-wip-us.apache.org/repos/asf/camel/blob/d12dbff0/apache-camel/src/main/descriptors/common-bin.xml ---------------------------------------------------------------------- diff --git a/apache-camel/src/main/descriptors/common-bin.xml b/apache-camel/src/main/descriptors/common-bin.xml index 25ca259..0ceec51 100644 --- a/apache-camel/src/main/descriptors/common-bin.xml +++ b/apache-camel/src/main/descriptors/common-bin.xml @@ -153,6 +153,7 @@ <include>org.apache.camel:camel-twitter</include> <include>org.apache.camel:camel-urlrewrite</include> <include>org.apache.camel:camel-velocity</include> + <include>org.apache.camel:camel-veather</include> <include>org.apache.camel:camel-websocket</include> <include>org.apache.camel:camel-xmlbeans</include> <include>org.apache.camel:camel-xmljson</include> http://git-wip-us.apache.org/repos/asf/camel/blob/d12dbff0/components/camel-weather/pom.xml ---------------------------------------------------------------------- diff --git a/components/camel-weather/pom.xml b/components/camel-weather/pom.xml index a6cb07d..f9b60ad 100644 --- a/components/camel-weather/pom.xml +++ b/components/camel-weather/pom.xml @@ -31,7 +31,7 @@ <description>Camel Weather support</description> <properties> - <camel.osgi.export.pkg>org.apache.camel.component.weather.*</camel.osgi.export.pkg> + <camel.osgi.export.pkg>org.apache.camel.component.weather.*</camel.osgi.export.pkg> <camel.osgi.export.service>org.apache.camel.spi.ComponentResolver;component=weather</camel.osgi.export.service> </properties> @@ -40,12 +40,11 @@ <groupId>org.apache.camel</groupId> <artifactId>camel-core</artifactId> </dependency> - <dependency> - <groupId>org.codehaus.jackson</groupId> - <artifactId>jackson-mapper-asl</artifactId> - <version>${jackson-version}</version> - </dependency> - + <dependency> + <groupId>org.codehaus.jackson</groupId> + <artifactId>jackson-mapper-asl</artifactId> + <version>${jackson-version}</version> + </dependency> <!-- test dependencies --> <dependency> @@ -58,11 +57,6 @@ <artifactId>slf4j-log4j12</artifactId> <scope>test</scope> </dependency> - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - <scope>test</scope> - </dependency> </dependencies> </project> http://git-wip-us.apache.org/repos/asf/camel/blob/d12dbff0/components/camel-weather/src/test/resources/log4j.properties ---------------------------------------------------------------------- diff --git a/components/camel-weather/src/test/resources/log4j.properties b/components/camel-weather/src/test/resources/log4j.properties index 90db5fc..33efa4c 100644 --- a/components/camel-weather/src/test/resources/log4j.properties +++ b/components/camel-weather/src/test/resources/log4j.properties @@ -16,15 +16,12 @@ ## ------------------------------------------------------------------------ # -# The logging properties used for eclipse testing, We want to see debug output on the console. +# The logging properties used for testing. # log4j.rootLogger=INFO, file -#log4j.logger.org.apache.activemq=DEBUG #log4j.logger.org.apache.camel=DEBUG -#log4j.logger.org.apache.camel.component.rss=DEBUG - -log4j.logger.org.apache.camel.impl.converter=INFO +#log4j.logger.org.apache.camel.component.weather=DEBUG # CONSOLE appender not used by default log4j.appender.out=org.apache.log4j.ConsoleAppender @@ -36,5 +33,5 @@ log4j.appender.out.layout.ConversionPattern=[%30.30t] %-30.30c{1} %-5p %m%n log4j.appender.file=org.apache.log4j.FileAppender log4j.appender.file.layout=org.apache.log4j.PatternLayout log4j.appender.file.layout.ConversionPattern=%d [%-15.15t] %-5p %-30.30c{1} - %m%n -log4j.appender.file.file=target/camel-rss-test.log +log4j.appender.file.file=target/camel-weather-test.log log4j.appender.file.append=true
