Author: davsclaus
Date: Tue Feb 19 09:14:19 2013
New Revision: 1447643
URL: http://svn.apache.org/r1447643
Log:
CAMEL-5817: New camel-spring-ldap component. Thanks to Leonid Kof for the
contribution.
Modified:
camel/trunk/components/camel-spring-ldap/pom.xml
camel/trunk/platforms/karaf/features/src/main/resources/features.xml
Modified: camel/trunk/components/camel-spring-ldap/pom.xml
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-spring-ldap/pom.xml?rev=1447643&r1=1447642&r2=1447643&view=diff
==============================================================================
--- camel/trunk/components/camel-spring-ldap/pom.xml (original)
+++ camel/trunk/components/camel-spring-ldap/pom.xml Tue Feb 19 09:14:19 2013
@@ -25,7 +25,8 @@
<properties>
<camel.osgi.import.before.defaults>
- org.springframework.ldap.*;version="[1.3,1.4)"
+ org.springframework.ldap.*;version="[1.3,1.4)",
+ org.springframework.transaction.compensating.*;version="[1.3,1.4)"
</camel.osgi.import.before.defaults>
<camel.osgi.export.pkg>org.apache.camel.component.springldap.*</camel.osgi.export.pkg>
<camel.osgi.export.service>
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=1447643&r1=1447642&r2=1447643&view=diff
==============================================================================
--- camel/trunk/platforms/karaf/features/src/main/resources/features.xml
(original)
+++ camel/trunk/platforms/karaf/features/src/main/resources/features.xml Tue
Feb 19 09:14:19 2013
@@ -845,17 +845,19 @@
<feature version='${spring-version-range}'>spring-test</feature>
<bundle>mvn:org.apache.camel/camel-spring-javaconfig/${project.version}</bundle>
</feature>
-<!-- TODO: spring-ldap is not OSGI bundles
+<!-- 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>
- <bundle
dependency='true'>mvn:org.springframework.ldap/spring-ldap-core/${spring-ldap-version}</bundle>
- <bundle
dependency='true'>mvn:org.springframework.ldap/spring-ldap-core-tiger/${spring-ldap-version}</bundle>
- <bundle
dependency='true'>mvn:org.springframework.ldap/spring-ldap-odm/${spring-ldap-version}</bundle>
- <bundle
dependency='true'>mvn:org.springframework.ldap/spring-ldap-ldif-core/${spring-ldap-version}</bundle>
- <bundle
dependency='true'>mvn:org.springframework.ldap/spring-ldap-ldif-batch/${spring-ldap-version}</bundle>
+ <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.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>
--->
+-->
<feature name='camel-spring-security' version='${project.version}'
resolver='(obr)' start-level='50'>
<feature>http</feature>
<feature version='${project.version}'>camel-spring</feature>
