Author: davsclaus
Date: Tue Mar 12 08:52:57 2013
New Revision: 1455443
URL: http://svn.apache.org/r1455443
Log:
camel-spring-ldap feature seems to work now
Added:
camel/trunk/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelSpringLdapTest.java
- copied, changed from r1455420,
camel/trunk/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelSpringBatchTest.java
Modified:
camel/trunk/parent/pom.xml
camel/trunk/platforms/karaf/features/src/main/resources/features.xml
Modified: camel/trunk/parent/pom.xml
URL:
http://svn.apache.org/viewvc/camel/trunk/parent/pom.xml?rev=1455443&r1=1455442&r2=1455443&view=diff
==============================================================================
--- camel/trunk/parent/pom.xml (original)
+++ camel/trunk/parent/pom.xml Tue Mar 12 08:52:57 2013
@@ -345,6 +345,7 @@
<spring-integration-version>2.2.2.RELEASE</spring-integration-version>
<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 -->
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=1455443&r1=1455442&r2=1455443&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 08:52:57 2013
@@ -827,19 +827,17 @@
<feature version='${spring-version-range}'>spring-test</feature>
<bundle>mvn:org.apache.camel/camel-spring-javaconfig/${project.version}</bundle>
</feature>
-<!-- does not work due https://issues.apache.org/jira/browse/SMX4-1379
<feature name='camel-spring-ldap' version='${project.version}'
resolver='(obr)' start-level='50'>
<feature version='${project.version}'>camel-spring</feature>
<feature version='${spring-version-range}'>spring-tx</feature>
<feature version='${spring-version-range}'>spring-jdbc</feature>
<bundle
dependency='true'>mvn:commons-lang/commons-lang/${commons-lang-version}</bundle>
<bundle
dependency='true'>mvn:commons-pool/commons-pool/${commons-pool-version}</bundle>
- <bundle
dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-ldap/${spring-ldap-version}_1</bundle>
+ <bundle
dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-ldap/${spring-ldap-bundle-version}</bundle>
<bundle
dependency='true'>mvn:org.springframework.batch/spring-batch-core/${spring-batch-version}</bundle>
<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>
Copied:
camel/trunk/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelSpringLdapTest.java
(from r1455420,
camel/trunk/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelSpringBatchTest.java)
URL:
http://svn.apache.org/viewvc/camel/trunk/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelSpringLdapTest.java?p2=camel/trunk/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelSpringLdapTest.java&p1=camel/trunk/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelSpringBatchTest.java&r1=1455420&r2=1455443&rev=1455443&view=diff
==============================================================================
---
camel/trunk/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelSpringBatchTest.java
(original)
+++
camel/trunk/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelSpringLdapTest.java
Tue Mar 12 08:52:57 2013
@@ -23,9 +23,9 @@ import org.ops4j.pax.exam.junit.Configur
import org.ops4j.pax.exam.junit.JUnit4TestRunner;
@RunWith(JUnit4TestRunner.class)
-public class CamelSpringBatchTest extends AbstractFeatureTest {
+public class CamelSpringLdapTest extends AbstractFeatureTest {
- public static final String COMPONENT =
extractName(CamelSpringBatchTest.class);
+ public static final String COMPONENT =
extractName(CamelSpringLdapTest.class);
@Test
public void test() throws Exception {
