Author: cmueller
Date: Thu Mar 28 08:57:46 2013
New Revision: 1461997
URL: http://svn.apache.org/r1461997
Log:
Revert CAMEL-5483: Component for neo4j - because of possible license issue
Removed:
camel/trunk/components/camel-spring-neo4j/pom.xml
camel/trunk/components/camel-spring-neo4j/src/main/java/org/apache/camel/component/neo4j/BasicRelationship.java
camel/trunk/components/camel-spring-neo4j/src/main/java/org/apache/camel/component/neo4j/Neo4jComponent.java
camel/trunk/components/camel-spring-neo4j/src/main/java/org/apache/camel/component/neo4j/Neo4jEndpoint.java
camel/trunk/components/camel-spring-neo4j/src/main/java/org/apache/camel/component/neo4j/Neo4jException.java
camel/trunk/components/camel-spring-neo4j/src/main/java/org/apache/camel/component/neo4j/Neo4jOperation.java
camel/trunk/components/camel-spring-neo4j/src/main/java/org/apache/camel/component/neo4j/Neo4jProducer.java
camel/trunk/components/camel-spring-neo4j/src/main/java/org/apache/camel/component/neo4j/SpringDataRelationship.java
camel/trunk/components/camel-spring-neo4j/src/main/resources/META-INF/LICENSE.txt
camel/trunk/components/camel-spring-neo4j/src/main/resources/META-INF/NOTICE.txt
camel/trunk/components/camel-spring-neo4j/src/main/resources/META-INF/services/org/apache/camel/component/spring-neo4j
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/Neo4jProducerTest.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-neo4j/src/test/resources/log4j.properties
camel/trunk/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelSpringNeo4jTest.java
Modified:
camel/trunk/apache-camel/pom.xml
camel/trunk/apache-camel/src/main/descriptors/common-bin.xml
camel/trunk/components/pom.xml
camel/trunk/parent/pom.xml
camel/trunk/platforms/karaf/features/src/main/resources/features.xml
Modified: camel/trunk/apache-camel/pom.xml
URL:
http://svn.apache.org/viewvc/camel/trunk/apache-camel/pom.xml?rev=1461997&r1=1461996&r2=1461997&view=diff
==============================================================================
--- camel/trunk/apache-camel/pom.xml (original)
+++ camel/trunk/apache-camel/pom.xml Thu Mar 28 08:57:46 2013
@@ -496,10 +496,6 @@
</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>
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=1461997&r1=1461996&r2=1461997&view=diff
==============================================================================
--- camel/trunk/apache-camel/src/main/descriptors/common-bin.xml (original)
+++ camel/trunk/apache-camel/src/main/descriptors/common-bin.xml Thu Mar 28
08:57:46 2013
@@ -136,7 +136,6 @@
<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>
Modified: camel/trunk/components/pom.xml
URL:
http://svn.apache.org/viewvc/camel/trunk/components/pom.xml?rev=1461997&r1=1461996&r2=1461997&view=diff
==============================================================================
--- camel/trunk/components/pom.xml (original)
+++ camel/trunk/components/pom.xml Thu Mar 28 08:57:46 2013
@@ -154,7 +154,6 @@
<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>
Modified: camel/trunk/parent/pom.xml
URL:
http://svn.apache.org/viewvc/camel/trunk/parent/pom.xml?rev=1461997&r1=1461996&r2=1461997&view=diff
==============================================================================
--- camel/trunk/parent/pom.xml (original)
+++ camel/trunk/parent/pom.xml Thu Mar 28 08:57:46 2013
@@ -271,8 +271,6 @@
<maven-surefire-report-plugin-version>2.13</maven-surefire-report-plugin-version>
<maven-war-plugin-version>2.3</maven-war-plugin-version>
<maven-version>2.0</maven-version>
- <neo4j-version>1.8</neo4j-version>
- <neo4j-bundle-version>1.8_1</neo4j-bundle-version>
<mina-bundle-version>1.1.7_6</mina-bundle-version>
<mina-version>1.1.7</mina-version>
<mina2-version>2.0.7</mina2-version>
@@ -348,7 +346,6 @@
<spring-javaconfig-version>1.0.0-20090215</spring-javaconfig-version>
<spring-ldap-version>1.3.1.RELEASE</spring-ldap-version>
<spring-ldap-bundle-version>1.3.1.RELEASE_2</spring-ldap-bundle-version>
- <spring-neo4j-version>2.2.0.RELEASE</spring-neo4j-version>
<spring-retry-version>1.0.2.RELEASE</spring-retry-version>
<!-- CAMEL-5768 using spring3.1.x by default -->
<spring-version-range>[3.1,3.3)</spring-version-range>
@@ -1041,11 +1038,6 @@
</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>
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=1461997&r1=1461996&r2=1461997&view=diff
==============================================================================
--- camel/trunk/platforms/karaf/features/src/main/resources/features.xml
(original)
+++ camel/trunk/platforms/karaf/features/src/main/resources/features.xml Thu
Mar 28 08:57:46 2013
@@ -847,30 +847,6 @@
<bundle
dependency='true'>mvn:org.springframework.batch/spring-batch-infrastructure/${spring-batch-version}</bundle>
<bundle>mvn:org.apache.camel/camel-spring-ldap/${project.version}</bundle>
</feature>
- <!-- TODO: does not work due SMX4-1400
- <feature name='camel-spring-neo4j' version='${project.version}'
resolver='(obr)' start-level='50'>
- <feature version='${project.version}'>camel-spring</feature>
- <bundle
dependency='true'>mvn:org.springframework.data/spring-data-neo4j/${spring-neo4j-version}</bundle>
- <bundle
dependency='true'>mvn:org.springframework.data/spring-data-neo4j-rest/${spring-neo4j-version}</bundle>
- <bundle
dependency='true'>mvn:org.springframework.data/spring-data-commons/${spring-data-commons-version}</bundle>
- <bundle
dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.neo4j/${neo4j-bundle-version}</bundle>
- <bundle
dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.lucene/${lucene-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: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.jdom/${jdom-bundle-version}</bundle>
- <bundle
dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.xmlresolver/${xmlresolver-bundle-version}</bundle>
- <bundle
dependency='true'>mvn:org.apache.geronimo.specs/geronimo-el_1.0_spec/${geronimo-el-spec-version}</bundle>
- <bundle
dependency='true'>mvn:org.apache.geronimo.specs/geronimo-jsp_2.2_spec/${geronimo-jsp-spec-version}</bundle>
- <bundle
dependency='true'>mvn:org.apache.geronimo.specs/geronimo-servlet_2.5_spec/${geronimo-servlet-spec-version}</bundle>
- <bundle
dependency='true'>mvn:commons-lang/commons-lang/${commons-lang-version-xmljson}</bundle>
- <bundle
dependency='true'>mvn:commons-codec/commons-codec/${commons-codec-version}</bundle>
- <bundle
dependency='true'>mvn:commons-collections/commons-collections/${commons-collections-version}</bundle>
- <bundle
dependency='true'>mvn:commons-digester/commons-digester/${commons-digester-1x-version}</bundle>
- <bundle
dependency='true'>mvn:commons-jxpath/commons-jxpath/${commons-jxpath-version}</bundle>
- <bundle
dependency='true'>mvn:org.apache.commons/commons-jexl/${commons-jexl2-version}</bundle>
- <bundle>mvn:org.apache.camel/camel-spring-neo4j/${project.version}</bundle>
- </feature>
--->
<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>
