You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2013/01/02 16:52:17 UTC
svn commit: r1427833 - in /camel/trunk: components/camel-redis/
components/camel-redis/src/test/java/org/apache/camel/component/redis/
components/camel-redis/src/test/java/org/apache/camel/component/redis/processor/idempotent/
parent/ platforms/karaf/f...
Author: davsclaus
Date: Wed Jan 2 15:52:16 2013
New Revision: 1427833
URL: http://svn.apache.org/viewvc?rev=1427833&view=rev
Log:
CAMEL-5903: Fixed validation of karaf features. Upgraded to redis 1.0.2
Modified:
camel/trunk/components/camel-redis/pom.xml
camel/trunk/components/camel-redis/src/test/java/org/apache/camel/component/redis/RedisConsumerTest.java
camel/trunk/components/camel-redis/src/test/java/org/apache/camel/component/redis/processor/idempotent/RedisIdempotentRepositoryTest.java
camel/trunk/parent/pom.xml
camel/trunk/platforms/karaf/features/src/main/resources/features.xml
Modified: camel/trunk/components/camel-redis/pom.xml
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-redis/pom.xml?rev=1427833&r1=1427832&r2=1427833&view=diff
==============================================================================
--- camel/trunk/components/camel-redis/pom.xml (original)
+++ camel/trunk/components/camel-redis/pom.xml Wed Jan 2 15:52:16 2013
@@ -46,6 +46,7 @@
<artifactId>spring-data-redis</artifactId>
<version>${spring-data-redis-version}</version>
</dependency>
+
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-test</artifactId>
@@ -63,10 +64,6 @@
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
<scope>test</scope>
</dependency>
@@ -76,17 +73,5 @@
<scope>test</scope>
</dependency>
</dependencies>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <version>2.3.2</version>
- <configuration>
- <source>1.6</source>
- <target>1.6</target>
- </configuration>
- </plugin>
- </plugins>
- </build>
+
</project>
Modified: camel/trunk/components/camel-redis/src/test/java/org/apache/camel/component/redis/RedisConsumerTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-redis/src/test/java/org/apache/camel/component/redis/RedisConsumerTest.java?rev=1427833&r1=1427832&r2=1427833&view=diff
==============================================================================
--- camel/trunk/components/camel-redis/src/test/java/org/apache/camel/component/redis/RedisConsumerTest.java (original)
+++ camel/trunk/components/camel-redis/src/test/java/org/apache/camel/component/redis/RedisConsumerTest.java Wed Jan 2 15:52:16 2013
@@ -63,8 +63,9 @@ public class RedisConsumerTest extends C
Topic firstTopic = topicIterator.next();
Topic twoTopic = topicIterator.next();
- assertThat(firstTopic.getTopic(), is("one"));
- assertThat(twoTopic.getTopic(), is("two"));
+
+ assertEquals("one", firstTopic.getTopic());
+ assertEquals("two", twoTopic.getTopic());
}
@Test
Modified: camel/trunk/components/camel-redis/src/test/java/org/apache/camel/component/redis/processor/idempotent/RedisIdempotentRepositoryTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-redis/src/test/java/org/apache/camel/component/redis/processor/idempotent/RedisIdempotentRepositoryTest.java?rev=1427833&r1=1427832&r2=1427833&view=diff
==============================================================================
--- camel/trunk/components/camel-redis/src/test/java/org/apache/camel/component/redis/processor/idempotent/RedisIdempotentRepositoryTest.java (original)
+++ camel/trunk/components/camel-redis/src/test/java/org/apache/camel/component/redis/processor/idempotent/RedisIdempotentRepositoryTest.java Wed Jan 2 15:52:16 2013
@@ -21,8 +21,7 @@ import org.junit.Test;
import org.springframework.data.redis.core.RedisTemplate;
import org.springframework.data.redis.core.SetOperations;
-import static org.hamcrest.CoreMatchers.is;
-import static org.junit.Assert.assertThat;
+import static org.junit.Assert.assertEquals;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
@@ -63,6 +62,6 @@ public class RedisIdempotentRepositoryTe
@Test
public void shouldReturnProcessorName() {
String processorName = idempotentRepository.getProcessorName();
- assertThat(processorName, is(REPOSITORY));
+ assertEquals(REPOSITORY, processorName);
}
}
Modified: camel/trunk/parent/pom.xml
URL: http://svn.apache.org/viewvc/camel/trunk/parent/pom.xml?rev=1427833&r1=1427832&r2=1427833&view=diff
==============================================================================
--- camel/trunk/parent/pom.xml (original)
+++ camel/trunk/parent/pom.xml Wed Jan 2 15:52:16 2013
@@ -40,7 +40,8 @@
<activemq-version>5.7.0</activemq-version>
<ahc-version>1.7.9</ahc-version>
<ant-bundle-version>1.7.0_6</ant-bundle-version>
- <antlr-bundle-version>2.7.7_5</antlr-bundle-version>
+ <antlr-bundle-version>3.4_1</antlr-bundle-version>
+ <antlr-runtime-bundle-version>3.4_2</antlr-runtime-bundle-version>
<aopalliance-bundle-version>1.0_6</aopalliance-bundle-version>
<apacheds-version>1.5.7</apacheds-version>
<apache-mime4j-version>0.7.2</apache-mime4j-version>
@@ -74,7 +75,6 @@
<commons-beanutils-bundle-version>1.8.3_1</commons-beanutils-bundle-version>
<commons-codec-version>1.6</commons-codec-version>
<commons-collections-version>3.2.1</commons-collections-version>
- <commons-configuration-bundle-version>1.8_1</commons-configuration-bundle-version>
<commons-configuration-version>1.8</commons-configuration-version>
<commons-csv-bundle-version>1.0-r706900_3</commons-csv-bundle-version>
<commons-cli-version>1.2</commons-cli-version>
@@ -303,7 +303,7 @@
<solr-version>3.6.1</solr-version>
<spring-batch-version>2.1.9.RELEASE</spring-batch-version>
<spring-castor-bundle-version>1.2.0</spring-castor-bundle-version>
- <spring-data-redis-version>1.0.0.RELEASE</spring-data-redis-version>
+ <spring-data-redis-version>1.0.2.RELEASE</spring-data-redis-version>
<spring-integration-version>2.1.4.RELEASE</spring-integration-version>
<spring-javaconfig-version>1.0.0-20090215</spring-javaconfig-version>
<spring-neo4j-version>2.1.0.RELEASE</spring-neo4j-version>
Modified: camel/trunk/platforms/karaf/features/src/main/resources/features.xml
URL: http://svn.apache.org/viewvc/camel/trunk/platforms/karaf/features/src/main/resources/features.xml?rev=1427833&r1=1427832&r2=1427833&view=diff
==============================================================================
--- camel/trunk/platforms/karaf/features/src/main/resources/features.xml (original)
+++ camel/trunk/platforms/karaf/features/src/main/resources/features.xml Wed Jan 2 15:52:16 2013
@@ -371,6 +371,7 @@
<bundle dependency='true'>mvn:org.fusesource.hawtbuf/hawtbuf/${hawtbuf-version}</bundle>
<bundle>mvn:org.apache.camel/camel-hawtdb/${project.version}</bundle>
</feature>
+<!-- TODO: camel-hbase does not yet work, some osgi bundles is flawed and dont work
<feature name='camel-hbase' version='${project.version}' resolver='(obr)' start-level='50'>
<feature version='${project.version}'>camel-core</feature>
<feature>war</feature>
@@ -380,7 +381,7 @@
<bundle dependency='true'>mvn:javax.mail/mail/${javax-mail-version}</bundle>
<bundle dependency='true'>mvn:commons-codec/commons-codec/${commons-codec-version}</bundle>
<bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-beanutils/${commons-beanutils-bundle-version}</bundle>
- <bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-configuration/${commons-configuration-bundle-version}</bundle>
+ <bundle dependency='true'>mvn:commons-configuration/commons-configuration/${commons-configuration-version}</bundle>
<bundle dependency='true'>mvn:commons-collections/commons-collections/${commons-collections-version}</bundle>
<bundle dependency='true'>mvn:commons-digester/commons-digester/${commons-digester-version}</bundle>
<bundle dependency='true'>mvn:commons-jxpath/commons-jxpath/${commons-jxpath-version}</bundle>
@@ -400,6 +401,8 @@
<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.hbase/${hbase-bundle-version}</bundle>
<bundle>mvn:org.apache.camel/camel-hbase/${project.version}</bundle>
</feature>
+-->
+<!-- TODO: camel-hbase does not yet work, some osgi bundles is flawed and dont work
<feature name='camel-hdfs' version='${project.version}' resolver='(obr)' start-level='50'>
<feature version='${project.version}'>camel-core</feature>
<feature>war</feature>
@@ -408,6 +411,7 @@
<bundle dependency='true'>mvn:commons-codec/commons-codec/${commons-codec-version}</bundle>
<bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-beanutils/${commons-beanutils-bundle-version}</bundle>
<bundle dependency='true'>mvn:commons-collections/commons-collections/${commons-collections-version}</bundle>
+ <bundle dependency='true'>mvn:commons-configuration/commons-configuration/${commons-configuration-version}</bundle>
<bundle dependency='true'>mvn:commons-digester/commons-digester/${commons-digester-version}</bundle>
<bundle dependency='true'>mvn:commons-jxpath/commons-jxpath/${commons-jxpath-version}</bundle>
<bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jdom/${jdom-bundle-version}</bundle>
@@ -424,6 +428,7 @@
<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.hadoop-core/${hadoop-bundle-version}</bundle>
<bundle>mvn:org.apache.camel/camel-hdfs/${project.version}</bundle>
</feature>
+-->
<feature name='camel-hl7' version='${project.version}' resolver='(obr)' start-level='50'>
<feature version='${project.version}'>camel-core</feature>
<bundle dependency="true">mvn:org.apache.mina/mina-core/${mina2-version}</bundle>
@@ -649,11 +654,14 @@
<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.quickfix/${quickfix-bundle-version}</bundle>
<bundle>mvn:org.apache.camel/camel-quickfix/${project.version}</bundle>
</feature>
+<!-- TODO: camel-redis feature doesnt work yet
<feature name='camel-redis' version='${project.version}' resolver='(obr)' start-level='50'>
+ <feature version='[3.1,4)'>spring</feature>
<feature version='${project.version}'>camel-core</feature>
<bundle dependency='true'>mvn:org.springframework.data/spring-data-redis/${spring-data-redis-version}</bundle>
<bundle>mvn:org.apache.camel/camel-redis/${project.version}</bundle>
</feature>
+-->
<feature name='camel-restlet' version='${project.version}' resolver='(obr)' start-level='50'>
<feature version='${project.version}'>camel-core</feature>
<bundle dependency='true'>mvn:http://maven.restlet.org!org.restlet.jse/org.restlet/${restlet-version}</bundle>
@@ -820,6 +828,7 @@
<feature name='camel-string-template' version='${project.version}' resolver='(obr)' start-level='50'>
<feature version='${project.version}'>camel-core</feature>
<bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.antlr/${antlr-bundle-version}</bundle>
+ <bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.antlr-runtime/${antlr-runtime-bundle-version}</bundle>
<bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.stringtemplate/${stringtemplate-bundle-version}</bundle>
<bundle>mvn:org.apache.camel/camel-stringtemplate/${project.version}</bundle>
</feature>
@@ -844,7 +853,6 @@
<bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jdom/${jdom-bundle-version}</bundle>
<bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.ant/${ant-bundle-version}</bundle>
<bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.antlr/${antlr-bundle-version}</bundle>
- <bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.werken-xpath/${werken-xpath-bundle-version}</bundle>
<bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.oro/${oro-bundle-version}</bundle>
<bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.velocity/${velocity-bundle-version}</bundle>
<feature version='${project.version}'>camel-core</feature>