Author: eric
Date: Fri Feb 8 10:30:13 2013
New Revision: 1443923
URL: http://svn.apache.org/r1443923
Log:
Impact karaf module with spring integration in one module (JAMES-1478)
Modified:
james/server/trunk/karaf/features/src/main/resources/features.xml
Modified: james/server/trunk/karaf/features/src/main/resources/features.xml
URL:
http://svn.apache.org/viewvc/james/server/trunk/karaf/features/src/main/resources/features.xml?rev=1443923&r1=1443922&r2=1443923&view=diff
==============================================================================
--- james/server/trunk/karaf/features/src/main/resources/features.xml (original)
+++ james/server/trunk/karaf/features/src/main/resources/features.xml Fri Feb
8 10:30:13 2013
@@ -26,16 +26,6 @@
<bundle>mvn:org.apache.geronimo.javamail/geronimo-javamail_1.4_mail/${geronimo-javamail.version}</bundle>
</feature>
- <feature name="james-server-lifecycle-spring" version="${project.version}">
- <feature
version="${project.version}">james-server-lifecycle-api</feature>
- <feature
version="${project.version}">james-server-filesystem-api</feature>
- <feature version="${project.version}">james-server-data-api</feature>
- <feature version="${spring.version}">spring31</feature>
-
<bundle>mvn:org.apache.geronimo.specs/geronimo-annotation_1.1_spec/${geronimo-annotation-spec.version}
- </bundle>
-
<bundle>mvn:org.apache.geronimo.specs/geronimo-jpa_2.0_spec/${geronimo-jpa-spec.version}</bundle>
- </feature>
-
<feature name="james-server-mailetcontainer-api"
version="${project.version}">
<bundle>mvn:org.apache.james/james-server-mailetcontainer-api/${project.version}</bundle>
<bundle>mvn:org.apache.james/apache-mailet-api/${mailet.version}</bundle>
@@ -68,9 +58,8 @@
<bundle>mvn:org.apache.geronimo.specs/geronimo-activation_1.1_spec/${geronimo-activation-spec.version}</bundle>
</feature>
- <feature name="james-server-container-spring" version="${project.version}">
-
<bundle>mvn:org.apache.james/james-server-container-spring/${project.version}</bundle>
- <feature
version="${project.version}">james-server-lifecycle-spring</feature>
+ <feature name="james-server-spring" version="${project.version}">
+
<bundle>mvn:org.apache.james/james-server-spring/${project.version}</bundle>
<feature
version="${project.version}">james-server-lifecycle-api</feature>
<feature
version="${project.version}">james-server-filesystem-api</feature>
<feature
version="${project.version}">james-server-mailetcontainer-api</feature>
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org
For additional commands, e-mail: server-dev-h...@james.apache.org
