Author: davsclaus
Date: Mon Mar 11 08:57:15 2013
New Revision: 1455059
URL: http://svn.apache.org/r1455059
Log:
CAMEL-6153: Rename neo4j and redis component to include spring in their name.
Added:
camel/trunk/components/camel-spring-neo4j/
- copied from r1455023, camel/trunk/components/camel-neo4j/
camel/trunk/components/camel-spring-redis/
- copied from r1455023, camel/trunk/components/camel-redis/
camel/trunk/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelSpringNeo4jTest.java
- copied, changed from r1455023,
camel/trunk/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelNeo4jTest.java
camel/trunk/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelSpringRedisTest.java
- copied, changed from r1455023,
camel/trunk/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelRedisTest.java
Removed:
camel/trunk/components/camel-neo4j/
camel/trunk/components/camel-redis/
camel/trunk/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelNeo4jTest.java
camel/trunk/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelRedisTest.java
Modified:
camel/trunk/apache-camel/pom.xml
camel/trunk/apache-camel/src/main/descriptors/common-bin.xml
camel/trunk/components/camel-spring-neo4j/pom.xml
camel/trunk/components/camel-spring-redis/pom.xml
camel/trunk/components/pom.xml
camel/trunk/parent/pom.xml
camel/trunk/platforms/karaf/features/src/main/resources/features.xml
camel/trunk/tests/camel-itest/pom.xml
Modified: camel/trunk/apache-camel/pom.xml
URL:
http://svn.apache.org/viewvc/camel/trunk/apache-camel/pom.xml?rev=1455059&r1=1455058&r2=1455059&view=diff
==============================================================================
--- camel/trunk/apache-camel/pom.xml (original)
+++ camel/trunk/apache-camel/pom.xml Mon Mar 11 08:57:15 2013
@@ -372,10 +372,6 @@
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-neo4j</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.camel</groupId>
<artifactId>camel-netty</artifactId>
</dependency>
<dependency>
@@ -404,10 +400,6 @@
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-redis</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.camel</groupId>
<artifactId>camel-restlet</artifactId>
</dependency>
<dependency>
@@ -504,6 +496,14 @@
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
+ <artifactId>camel-spring-neo4j</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.camel</groupId>
+ <artifactId>camel-spring-redis</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.camel</groupId>
<artifactId>camel-spring-security</artifactId>
</dependency>
<dependency>
Modified: camel/trunk/apache-camel/src/main/descriptors/common-bin.xml
URL:
http://svn.apache.org/viewvc/camel/trunk/apache-camel/src/main/descriptors/common-bin.xml?rev=1455059&r1=1455058&r2=1455059&view=diff
==============================================================================
--- camel/trunk/apache-camel/src/main/descriptors/common-bin.xml (original)
+++ camel/trunk/apache-camel/src/main/descriptors/common-bin.xml Mon Mar 11
08:57:15 2013
@@ -105,7 +105,6 @@
<include>org.apache.camel:camel-mvel</include>
<include>org.apache.camel:camel-mybatis</include>
<include>org.apache.camel:camel-nagios</include>
- <include>org.apache.camel:camel-neo4j</include>
<include>org.apache.camel:camel-netty</include>
<include>org.apache.camel:camel-ognl</include>
<include>org.apache.camel:camel-paxlogging</include>
@@ -113,7 +112,6 @@
<include>org.apache.camel:camel-protobuf</include>
<include>org.apache.camel:camel-quartz</include>
<include>org.apache.camel:camel-quickfix</include>
- <include>org.apache.camel:camel-redis</include>
<include>org.apache.camel:camel-restlet</include>
<include>org.apache.camel:camel-rmi</include>
<include>org.apache.camel:camel-routebox</include>
@@ -138,6 +136,8 @@
<include>org.apache.camel:camel-spring-integration</include>
<include>org.apache.camel:camel-spring-javaconfig</include>
<include>org.apache.camel:camel-spring-ldap</include>
+ <include>org.apache.camel:camel-spring-neo4j</include>
+ <include>org.apache.camel:camel-spring-redis</include>
<include>org.apache.camel:camel-spring-security</include>
<include>org.apache.camel:camel-spring-ws</include>
<include>org.apache.camel:camel-sql</include>
Modified: camel/trunk/components/camel-spring-neo4j/pom.xml
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-spring-neo4j/pom.xml?rev=1455059&r1=1455023&r2=1455059&view=diff
==============================================================================
--- camel/trunk/components/camel-spring-neo4j/pom.xml (original)
+++ camel/trunk/components/camel-spring-neo4j/pom.xml Mon Mar 11 08:57:15 2013
@@ -25,10 +25,10 @@
<version>2.11-SNAPSHOT</version>
</parent>
- <artifactId>camel-neo4j</artifactId>
+ <artifactId>camel-spring-neo4j</artifactId>
<packaging>bundle</packaging>
<name>Camel :: Neo4j</name>
- <description>Camel Neo4j support</description>
+ <description>Camel Spring Neo4j support</description>
<properties>
<camel.osgi.export.pkg>org.apache.camel.component.neo4j.*</camel.osgi.export.pkg>
Modified: camel/trunk/components/camel-spring-redis/pom.xml
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-spring-redis/pom.xml?rev=1455059&r1=1455023&r2=1455059&view=diff
==============================================================================
--- camel/trunk/components/camel-spring-redis/pom.xml (original)
+++ camel/trunk/components/camel-spring-redis/pom.xml Mon Mar 11 08:57:15 2013
@@ -25,10 +25,10 @@
</parent>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-redis</artifactId>
+ <artifactId>camel-spring-redis</artifactId>
<packaging>bundle</packaging>
<name>Camel :: Redis</name>
- <description>Camel Redis Component</description>
+ <description>Camel Spring Redis Component</description>
<properties>
<camel.osgi.export.pkg>org.apache.camel.component.redis.*</camel.osgi.export.pkg>
Modified: camel/trunk/components/pom.xml
URL:
http://svn.apache.org/viewvc/camel/trunk/components/pom.xml?rev=1455059&r1=1455058&r2=1455059&view=diff
==============================================================================
--- camel/trunk/components/pom.xml (original)
+++ camel/trunk/components/pom.xml Mon Mar 11 08:57:15 2013
@@ -126,7 +126,6 @@
<module>camel-mvel</module>
<module>camel-mybatis</module>
<module>camel-nagios</module>
- <module>camel-neo4j</module>
<module>camel-netty</module>
<module>camel-ognl</module>
<module>camel-paxlogging</module>
@@ -134,7 +133,6 @@
<module>camel-protobuf</module>
<module>camel-quartz</module>
<module>camel-quickfix</module>
- <module>camel-redis</module>
<module>camel-restlet</module>
<module>camel-rmi</module>
<module>camel-routebox</module>
@@ -156,6 +154,8 @@
<module>camel-spring-javaconfig</module>
<module>camel-spring-integration</module>
<module>camel-spring-ldap</module>
+ <module>camel-spring-neo4j</module>
+ <module>camel-spring-redis</module>
<module>camel-spring-security</module>
<module>camel-spring-ws</module>
<module>camel-sql</module>
Modified: camel/trunk/parent/pom.xml
URL:
http://svn.apache.org/viewvc/camel/trunk/parent/pom.xml?rev=1455059&r1=1455058&r2=1455059&view=diff
==============================================================================
--- camel/trunk/parent/pom.xml (original)
+++ camel/trunk/parent/pom.xml Mon Mar 11 08:57:15 2013
@@ -878,11 +878,6 @@
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-neo4j</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.camel</groupId>
<artifactId>camel-netty</artifactId>
<version>${project.version}</version>
</dependency>
@@ -918,11 +913,6 @@
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-redis</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.camel</groupId>
<artifactId>camel-restlet</artifactId>
<version>${project.version}</version>
</dependency>
@@ -1043,6 +1033,16 @@
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
+ <artifactId>camel-spring-neo4j</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.camel</groupId>
+ <artifactId>camel-spring-redis</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.camel</groupId>
<artifactId>camel-spring-security</artifactId>
<version>${project.version}</version>
</dependency>
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=1455059&r1=1455058&r2=1455059&view=diff
==============================================================================
--- camel/trunk/platforms/karaf/features/src/main/resources/features.xml
(original)
+++ camel/trunk/platforms/karaf/features/src/main/resources/features.xml Mon
Mar 11 08:57:15 2013
@@ -651,13 +651,6 @@
<bundle
dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jsendnsca-core/${jsendnsca-bundle-version}</bundle>
<bundle>mvn:org.apache.camel/camel-nagios/${project.version}</bundle>
</feature>
-<!-- TODO: Need SMX4-1374
- <feature name='camel-neo4j' version='${project.version}' resolver='(obr)'
start-level='50'>
- <feature version='${project.version}'>camel-core</feature>
- <bundle
dependency='true'>mvn:org.springframework.data/spring-data-neo4j-rest/${spring-neo4j-version}</bundle>
- <bundle>mvn:org.apache.camel/camel-neo4j/${project.version}</bundle>
- </feature>
--->
<feature name='camel-netty' version='${project.version}' resolver='(obr)'
start-level='50'>
<feature version='${project.version}'>camel-core</feature>
<bundle dependency='true'>mvn:io.netty/netty/${netty-version}</bundle>
@@ -696,18 +689,6 @@
<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: requires Karaf 2.3.1
- <feature name='camel-redis' version='${project.version}' resolver='(obr)'
start-level='50'>
- <feature version='${project.version}'>camel-core</feature>
- <feature version='${spring-version-range}'>spring</feature>
- <feature version='${spring-version-range}'>spring-tx</feature>
- <bundle
dependency='true'>mvn:org.springframework/spring-context/${spring-version}</bundle>
- <bundle
dependency='true'>mvn:commons-pool/commons-pool/${commons-pool-version}</bundle>
- <bundle
dependency='true'>mvn:org.springframework.data/spring-data-redis/${spring-data-redis-version}</bundle>
- <bundle
dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jedis/${jedis-client-bundle-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>
@@ -859,6 +840,25 @@
<bundle>mvn:org.apache.camel/camel-spring-ldap/${project.version}</bundle>
</feature>
-->
+<!-- TODO: Need SMX4-1374
+ <feature name='camel-spring-neo4j' version='${project.version}'
resolver='(obr)' start-level='50'>
+ <feature version='${project.version}'>camel-core</feature>
+ <bundle
dependency='true'>mvn:org.springframework.data/spring-data-neo4j-rest/${spring-neo4j-version}</bundle>
+ <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>
+ <feature version='${spring-version-range}'>spring-tx</feature>
+ <bundle
dependency='true'>mvn:org.springframework/spring-context/${spring-version}</bundle>
+ <bundle
dependency='true'>mvn:commons-pool/commons-pool/${commons-pool-version}</bundle>
+ <bundle
dependency='true'>mvn:org.springframework.data/spring-data-redis/${spring-data-redis-version}</bundle>
+ <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>
Copied:
camel/trunk/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelSpringNeo4jTest.java
(from r1455023,
camel/trunk/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelNeo4jTest.java)
URL:
http://svn.apache.org/viewvc/camel/trunk/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelSpringNeo4jTest.java?p2=camel/trunk/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelSpringNeo4jTest.java&p1=camel/trunk/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelNeo4jTest.java&r1=1455023&r2=1455059&rev=1455059&view=diff
==============================================================================
---
camel/trunk/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelNeo4jTest.java
(original)
+++
camel/trunk/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelSpringNeo4jTest.java
Mon Mar 11 08:57:15 2013
@@ -23,9 +23,9 @@ import org.ops4j.pax.exam.junit.Configur
import org.ops4j.pax.exam.junit.JUnit4TestRunner;
@RunWith(JUnit4TestRunner.class)
-public class CamelNeo4jTest extends AbstractFeatureTest {
+public class CamelSpringNeo4jTest extends AbstractFeatureTest {
- public static final String COMPONENT = extractName(CamelNeo4jTest.class);
+ public static final String COMPONENT =
extractName(CamelSpringNeo4jTest.class);
@Test
public void test() throws Exception {
Copied:
camel/trunk/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelSpringRedisTest.java
(from r1455023,
camel/trunk/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelRedisTest.java)
URL:
http://svn.apache.org/viewvc/camel/trunk/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelSpringRedisTest.java?p2=camel/trunk/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelSpringRedisTest.java&p1=camel/trunk/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelRedisTest.java&r1=1455023&r2=1455059&rev=1455059&view=diff
==============================================================================
---
camel/trunk/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelRedisTest.java
(original)
+++
camel/trunk/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelSpringRedisTest.java
Mon Mar 11 08:57:15 2013
@@ -23,9 +23,9 @@ import org.ops4j.pax.exam.junit.Configur
import org.ops4j.pax.exam.junit.JUnit4TestRunner;
@RunWith(JUnit4TestRunner.class)
-public class CamelRedisTest extends AbstractFeatureTest {
+public class CamelSpringRedisTest extends AbstractFeatureTest {
- public static final String COMPONENT = extractName(CamelRedisTest.class);
+ public static final String COMPONENT =
extractName(CamelSpringRedisTest.class);
@Test
public void test() throws Exception {
Modified: camel/trunk/tests/camel-itest/pom.xml
URL:
http://svn.apache.org/viewvc/camel/trunk/tests/camel-itest/pom.xml?rev=1455059&r1=1455058&r2=1455059&view=diff
==============================================================================
--- camel/trunk/tests/camel-itest/pom.xml (original)
+++ camel/trunk/tests/camel-itest/pom.xml Mon Mar 11 08:57:15 2013
@@ -119,7 +119,7 @@
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-redis</artifactId>
+ <artifactId>camel-spring-redis</artifactId>
<scope>test</scope>
</dependency>
<dependency>
