Author: davsclaus
Date: Tue Mar 12 09:06:27 2013
New Revision: 1455458
URL: http://svn.apache.org/r1455458
Log:
CAMEL-6153: Rename neo4j and redis component to include spring in their name.
Added:
camel/trunk/components/camel-spring-neo4j/src/main/resources/META-INF/services/org/apache/camel/component/spring-neo4j
- copied unchanged from r1455420,
camel/trunk/components/camel-spring-neo4j/src/main/resources/META-INF/services/org/apache/camel/component/neo4j
camel/trunk/components/camel-spring-redis/src/main/resources/META-INF/services/org/apache/camel/component/spring-redis
- copied unchanged from r1455420,
camel/trunk/components/camel-spring-redis/src/main/resources/META-INF/services/org/apache/camel/component/redis
Removed:
camel/trunk/components/camel-spring-neo4j/src/main/resources/META-INF/services/org/apache/camel/component/neo4j
camel/trunk/components/camel-spring-redis/src/main/resources/META-INF/services/org/apache/camel/component/redis
Modified:
camel/trunk/components/camel-spring-neo4j/src/main/java/org/apache/camel/component/neo4j/Neo4jComponent.java
camel/trunk/components/camel-spring-neo4j/src/test/java/org/apache/camel/component/neo4j/Neo4jComponentTest.java
camel/trunk/components/camel-spring-neo4j/src/test/java/org/apache/camel/component/neo4j/Neo4jEndpointTest.java
camel/trunk/components/camel-spring-neo4j/src/test/java/org/apache/camel/component/neo4j/RestNeo4jProducerCreateNodeIntegrationTest.java
camel/trunk/components/camel-spring-neo4j/src/test/java/org/apache/camel/component/neo4j/RestNeo4jProducerCreateRelationshipIntegrationTest.java
camel/trunk/components/camel-spring-redis/src/main/java/org/apache/camel/component/redis/processor/idempotent/RedisIdempotentRepository.java
camel/trunk/components/camel-spring-redis/src/main/resources/log4j.properties
camel/trunk/components/camel-spring-redis/src/test/java/org/apache/camel/component/redis/RedisConsumerIntegrationTest.java
camel/trunk/components/camel-spring-redis/src/test/java/org/apache/camel/component/redis/RedisConsumerTest.java
camel/trunk/components/camel-spring-redis/src/test/java/org/apache/camel/component/redis/RedisTestSupport.java
camel/trunk/components/camel-spring-redis/src/test/resources/RedisComponentSpringTest-context.xml
camel/trunk/platforms/karaf/features/src/main/resources/features.xml
Modified:
camel/trunk/components/camel-spring-neo4j/src/main/java/org/apache/camel/component/neo4j/Neo4jComponent.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-spring-neo4j/src/main/java/org/apache/camel/component/neo4j/Neo4jComponent.java?rev=1455458&r1=1455457&r2=1455458&view=diff
==============================================================================
---
camel/trunk/components/camel-spring-neo4j/src/main/java/org/apache/camel/component/neo4j/Neo4jComponent.java
(original)
+++
camel/trunk/components/camel-spring-neo4j/src/main/java/org/apache/camel/component/neo4j/Neo4jComponent.java
Tue Mar 12 09:06:27 2013
@@ -20,13 +20,9 @@ import java.util.Map;
import org.apache.camel.CamelContext;
import org.apache.camel.impl.DefaultComponent;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
public class Neo4jComponent extends DefaultComponent {
- private static final Logger LOGGER =
LoggerFactory.getLogger(Neo4jComponent.class);
-
public Neo4jComponent() {
}
@@ -35,11 +31,9 @@ public class Neo4jComponent extends Defa
}
@Override
- protected Neo4jEndpoint createEndpoint(String uri, String remaining,
Map<String, Object> params)
- throws Exception {
- Neo4jEndpoint e = new Neo4jEndpoint(uri, remaining, this);
- setProperties(e, params);
- LOGGER.info("Created Neo4j Endpoint [{}]", e);
- return e;
+ protected Neo4jEndpoint createEndpoint(String uri, String remaining,
Map<String, Object> params) throws Exception {
+ Neo4jEndpoint endpoint = new Neo4jEndpoint(uri, remaining, this);
+ setProperties(endpoint, params);
+ return endpoint;
}
}
Modified:
camel/trunk/components/camel-spring-neo4j/src/test/java/org/apache/camel/component/neo4j/Neo4jComponentTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-spring-neo4j/src/test/java/org/apache/camel/component/neo4j/Neo4jComponentTest.java?rev=1455458&r1=1455457&r2=1455458&view=diff
==============================================================================
---
camel/trunk/components/camel-spring-neo4j/src/test/java/org/apache/camel/component/neo4j/Neo4jComponentTest.java
(original)
+++
camel/trunk/components/camel-spring-neo4j/src/test/java/org/apache/camel/component/neo4j/Neo4jComponentTest.java
Tue Mar 12 09:06:27 2013
@@ -38,7 +38,7 @@ public class Neo4jComponentTest {
public void testEndpointCreated() throws Exception {
Map<String, Object> params = new HashMap<String, Object>();
- String uri = "neo4j:http://localhost:5984/db";;
+ String uri = "spring-neo4j:http://localhost:5984/db";;
String remaining = "http://localhost:5984/db";;
Endpoint endpoint = new Neo4jComponent(context).createEndpoint(uri,
remaining, params);
Modified:
camel/trunk/components/camel-spring-neo4j/src/test/java/org/apache/camel/component/neo4j/Neo4jEndpointTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-spring-neo4j/src/test/java/org/apache/camel/component/neo4j/Neo4jEndpointTest.java?rev=1455458&r1=1455457&r2=1455458&view=diff
==============================================================================
---
camel/trunk/components/camel-spring-neo4j/src/test/java/org/apache/camel/component/neo4j/Neo4jEndpointTest.java
(original)
+++
camel/trunk/components/camel-spring-neo4j/src/test/java/org/apache/camel/component/neo4j/Neo4jEndpointTest.java
Tue Mar 12 09:06:27 2013
@@ -27,7 +27,7 @@ public class Neo4jEndpointTest {
@Test
public void assertSingleton() throws URISyntaxException {
- Neo4jEndpoint endpoint = new
Neo4jEndpoint("neo4j:http://localhost/db";, "http://localhost/db";, new
Neo4jComponent());
+ Neo4jEndpoint endpoint = new
Neo4jEndpoint("spring-neo4j:http://localhost/db";, "http://localhost/db";, new
Neo4jComponent());
assertTrue(endpoint.isSingleton());
}
Modified:
camel/trunk/components/camel-spring-neo4j/src/test/java/org/apache/camel/component/neo4j/RestNeo4jProducerCreateNodeIntegrationTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-spring-neo4j/src/test/java/org/apache/camel/component/neo4j/RestNeo4jProducerCreateNodeIntegrationTest.java?rev=1455458&r1=1455457&r2=1455458&view=diff
==============================================================================
---
camel/trunk/components/camel-spring-neo4j/src/test/java/org/apache/camel/component/neo4j/RestNeo4jProducerCreateNodeIntegrationTest.java
(original)
+++
camel/trunk/components/camel-spring-neo4j/src/test/java/org/apache/camel/component/neo4j/RestNeo4jProducerCreateNodeIntegrationTest.java
Tue Mar 12 09:06:27 2013
@@ -36,7 +36,7 @@ public class RestNeo4jProducerCreateNode
@Produce(uri = "direct:start")
protected ProducerTemplate template;
- private final String neo4jEndpoint =
"neo4j:http://localhost:7474/db/data/";;
+ private final String neo4jEndpoint =
"spring-neo4j:http://localhost:7474/db/data/";;
private final SpringRestGraphDatabase db = new
SpringRestGraphDatabase("http://localhost:7474/db/data/";);
Modified:
camel/trunk/components/camel-spring-neo4j/src/test/java/org/apache/camel/component/neo4j/RestNeo4jProducerCreateRelationshipIntegrationTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-spring-neo4j/src/test/java/org/apache/camel/component/neo4j/RestNeo4jProducerCreateRelationshipIntegrationTest.java?rev=1455458&r1=1455457&r2=1455458&view=diff
==============================================================================
---
camel/trunk/components/camel-spring-neo4j/src/test/java/org/apache/camel/component/neo4j/RestNeo4jProducerCreateRelationshipIntegrationTest.java
(original)
+++
camel/trunk/components/camel-spring-neo4j/src/test/java/org/apache/camel/component/neo4j/RestNeo4jProducerCreateRelationshipIntegrationTest.java
Tue Mar 12 09:06:27 2013
@@ -38,7 +38,7 @@ public class RestNeo4jProducerCreateRela
@Produce(uri = "direct:start")
protected ProducerTemplate template;
- private final String neo4jEndpoint =
"neo4j:http://localhost:7474/db/data/";;
+ private final String neo4jEndpoint =
"spring-neo4j:http://localhost:7474/db/data/";;
private final Neo4jTemplate neo = new Neo4jTemplate((GraphDatabase) new
SpringRestGraphDatabase("http://localhost:7474/db/data/";));
Modified:
camel/trunk/components/camel-spring-redis/src/main/java/org/apache/camel/component/redis/processor/idempotent/RedisIdempotentRepository.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-spring-redis/src/main/java/org/apache/camel/component/redis/processor/idempotent/RedisIdempotentRepository.java?rev=1455458&r1=1455457&r2=1455458&view=diff
==============================================================================
---
camel/trunk/components/camel-spring-redis/src/main/java/org/apache/camel/component/redis/processor/idempotent/RedisIdempotentRepository.java
(original)
+++
camel/trunk/components/camel-spring-redis/src/main/java/org/apache/camel/component/redis/processor/idempotent/RedisIdempotentRepository.java
Tue Mar 12 09:06:27 2013
@@ -22,12 +22,10 @@ import org.apache.camel.api.management.M
import org.apache.camel.component.redis.RedisConfiguration;
import org.apache.camel.spi.IdempotentRepository;
import org.apache.camel.support.ServiceSupport;
-import org.springframework.data.redis.connection.RedisConnectionFactory;
-import org.springframework.data.redis.connection.jedis.JedisConnectionFactory;
import org.springframework.data.redis.core.RedisTemplate;
import org.springframework.data.redis.core.SetOperations;
-@ManagedResource(description = "Redis based message id repository")
+@ManagedResource(description = "Spring Redis based message id repository")
public class RedisIdempotentRepository extends ServiceSupport implements
IdempotentRepository<String> {
private final SetOperations<String, String> setOperations;
private final String processorName;
@@ -78,17 +76,19 @@ public class RedisIdempotentRepository e
return true;
}
+ protected void doStart() throws Exception {
+ // noop
+ }
+
+ protected void doStop() throws Exception {
+ // noop
+ }
+
protected void doShutdown() throws Exception {
super.doShutdown();
if (redisConfiguration != null) {
redisConfiguration.stop();
}
}
-
- protected void doStart() throws Exception {
- }
-
- protected void doStop() throws Exception {
- }
}
Modified:
camel/trunk/components/camel-spring-redis/src/main/resources/log4j.properties
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-spring-redis/src/main/resources/log4j.properties?rev=1455458&r1=1455457&r2=1455458&view=diff
==============================================================================
---
camel/trunk/components/camel-spring-redis/src/main/resources/log4j.properties
(original)
+++
camel/trunk/components/camel-spring-redis/src/main/resources/log4j.properties
Tue Mar 12 09:06:27 2013
@@ -31,5 +31,5 @@ log4j.appender.stdout.layout.ConversionP
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-redis-test.log
+log4j.appender.file.file=target/camel-spring-redis-test.log
log4j.appender.file.append=false
Modified:
camel/trunk/components/camel-spring-redis/src/test/java/org/apache/camel/component/redis/RedisConsumerIntegrationTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-spring-redis/src/test/java/org/apache/camel/component/redis/RedisConsumerIntegrationTest.java?rev=1455458&r1=1455457&r2=1455458&view=diff
==============================================================================
---
camel/trunk/components/camel-spring-redis/src/test/java/org/apache/camel/component/redis/RedisConsumerIntegrationTest.java
(original)
+++
camel/trunk/components/camel-spring-redis/src/test/java/org/apache/camel/component/redis/RedisConsumerIntegrationTest.java
Tue Mar 12 09:06:27 2013
@@ -53,11 +53,11 @@ public class RedisConsumerIntegrationTes
protected RouteBuilder createRouteBuilder() {
return new RouteBuilder() {
public void configure() {
-
from("redis://localhost:6379?command=SUBSCRIBE&channels=one,two&listenerContainer=#listenerContainer&redisTemplate=#redisTemplate")
+
from("spring-redis://localhost:6379?command=SUBSCRIBE&channels=one,two&listenerContainer=#listenerContainer&redisTemplate=#redisTemplate")
.to("mock:result");
from("direct:start")
-
.to("redis://localhost:6379?redisTemplate=#redisTemplate");
+
.to("spring-redis://localhost:6379?redisTemplate=#redisTemplate");
}
};
}
Modified:
camel/trunk/components/camel-spring-redis/src/test/java/org/apache/camel/component/redis/RedisConsumerTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-spring-redis/src/test/java/org/apache/camel/component/redis/RedisConsumerTest.java?rev=1455458&r1=1455457&r2=1455458&view=diff
==============================================================================
---
camel/trunk/components/camel-spring-redis/src/test/java/org/apache/camel/component/redis/RedisConsumerTest.java
(original)
+++
camel/trunk/components/camel-spring-redis/src/test/java/org/apache/camel/component/redis/RedisConsumerTest.java
Tue Mar 12 09:06:27 2013
@@ -87,7 +87,7 @@ public class RedisConsumerTest extends C
protected RouteBuilder createRouteBuilder() {
return new RouteBuilder() {
public void configure() {
-
from("redis://localhost:6379?command=SUBSCRIBE&channels=one,two&listenerContainer=#listenerContainer")
+
from("spring-redis://localhost:6379?command=SUBSCRIBE&channels=one,two&listenerContainer=#listenerContainer")
.to("mock:result");
}
};
Modified:
camel/trunk/components/camel-spring-redis/src/test/java/org/apache/camel/component/redis/RedisTestSupport.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-spring-redis/src/test/java/org/apache/camel/component/redis/RedisTestSupport.java?rev=1455458&r1=1455457&r2=1455458&view=diff
==============================================================================
---
camel/trunk/components/camel-spring-redis/src/test/java/org/apache/camel/component/redis/RedisTestSupport.java
(original)
+++
camel/trunk/components/camel-spring-redis/src/test/java/org/apache/camel/component/redis/RedisTestSupport.java
Tue Mar 12 09:06:27 2013
@@ -36,7 +36,7 @@ public class RedisTestSupport extends Ca
return new RouteBuilder() {
public void configure() {
from("direct:start")
-
.to("redis://localhost:6379?redisTemplate=#redisTemplate");
+
.to("spring-redis://localhost:6379?redisTemplate=#redisTemplate");
}
};
}
Modified:
camel/trunk/components/camel-spring-redis/src/test/resources/RedisComponentSpringTest-context.xml
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-spring-redis/src/test/resources/RedisComponentSpringTest-context.xml?rev=1455458&r1=1455457&r2=1455458&view=diff
==============================================================================
---
camel/trunk/components/camel-spring-redis/src/test/resources/RedisComponentSpringTest-context.xml
(original)
+++
camel/trunk/components/camel-spring-redis/src/test/resources/RedisComponentSpringTest-context.xml
Tue Mar 12 09:06:27 2013
@@ -26,7 +26,7 @@
<camelContext id="camel" xmlns="http://camel.apache.org/schema/spring";>
<route startupOrder="1">
- <from
uri="redis://localhost:6379?command=SUBSCRIBE&channels=testChannel"/>
+ <from
uri="spring-redis://localhost:6379?command=SUBSCRIBE&channels=testChannel"/>
<idempotentConsumer messageIdRepositoryRef="idempotentRepository">
<simple>${in.body}</simple>
<to uri="mock:result"/>
@@ -38,7 +38,7 @@
<delay><!-- give time to listener above to start -->
<constant>2000</constant>
</delay>
- <to uri="redis://localhost:6379"/>
+ <to uri="spring-redis://localhost:6379"/>
</route>
</camelContext>
</beans>
\ No newline at end of file
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=1455458&r1=1455457&r2=1455458&view=diff
==============================================================================
--- camel/trunk/platforms/karaf/features/src/main/resources/features.xml
(original)
+++ camel/trunk/platforms/karaf/features/src/main/resources/features.xml Tue
Mar 12 09:06:27 2013
@@ -862,7 +862,6 @@
<bundle>mvn:org.apache.camel/camel-spring-neo4j/${project.version}</bundle>
</feature>
-->
-<!-- TODO: requires Karaf 2.3.1
<feature name='camel-spring-redis' version='${project.version}'
resolver='(obr)' start-level='50'>
<feature version='${project.version}'>camel-core</feature>
<feature version='${spring-version-range}'>spring</feature>
@@ -873,7 +872,6 @@
<bundle
dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jedis/${jedis-client-bundle-version}</bundle>
<bundle>mvn:org.apache.camel/camel-spring-redis/${project.version}</bundle>
</feature>
--->
<feature name='camel-spring-security' version='${project.version}'
resolver='(obr)' start-level='50'>
<feature>http</feature>
<feature version='${project.version}'>camel-spring</feature>
