You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@karaf.apache.org by jb...@apache.org on 2012/09/11 14:26:45 UTC
svn commit: r1383377 - in /karaf/branches/karaf-2.2.x:
assemblies/features/standard/pom.xml
assemblies/features/standard/src/main/resources/features.xml pom.xml
Author: jbonofre
Date: Tue Sep 11 12:26:45 2012
New Revision: 1383377
URL: http://svn.apache.org/viewvc?rev=1383377&view=rev
Log:
[KARAF-1736] Fix spring-struts feature
Modified:
karaf/branches/karaf-2.2.x/assemblies/features/standard/pom.xml
karaf/branches/karaf-2.2.x/assemblies/features/standard/src/main/resources/features.xml
karaf/branches/karaf-2.2.x/pom.xml
Modified: karaf/branches/karaf-2.2.x/assemblies/features/standard/pom.xml
URL: http://svn.apache.org/viewvc/karaf/branches/karaf-2.2.x/assemblies/features/standard/pom.xml?rev=1383377&r1=1383376&r2=1383377&view=diff
==============================================================================
--- karaf/branches/karaf-2.2.x/assemblies/features/standard/pom.xml (original)
+++ karaf/branches/karaf-2.2.x/assemblies/features/standard/pom.xml Tue Sep 11 12:26:45 2012
@@ -32,7 +32,7 @@
<name>Apache Karaf :: Assemblies :: Features :: Standard</name>
<properties>
- <appendedResourcesDirectory>${basedir}/../../../etc/appended-resources</appendedResourcesDirectory>
+ <appendedResourcesDirectory>${basedir}/../../../etc/appended-resources</appendedResourcesDirectory>
</properties>
<build>
Modified: karaf/branches/karaf-2.2.x/assemblies/features/standard/src/main/resources/features.xml
URL: http://svn.apache.org/viewvc/karaf/branches/karaf-2.2.x/assemblies/features/standard/src/main/resources/features.xml?rev=1383377&r1=1383376&r2=1383377&view=diff
==============================================================================
--- karaf/branches/karaf-2.2.x/assemblies/features/standard/src/main/resources/features.xml (original)
+++ karaf/branches/karaf-2.2.x/assemblies/features/standard/src/main/resources/features.xml Tue Sep 11 12:26:45 2012
@@ -116,7 +116,10 @@
<feature name="spring-struts" description="Spring Struts support" version="${spring.version}" resolver="(obr)">
<feature version="${spring.version}">spring-web</feature>
+ <feature>war</feature>
+ <bundle dependency="true" start-level="30">mvn:commons-collections/commons-collections/${commons-collections.version}</bundle>
<bundle dependency="true" start-level="30">mvn:commons-beanutils/commons-beanutils/${commons-beanutils.version}</bundle>
+ <bundle dependency="true" start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.struts/${struts.bundle.version}</bundle>
<bundle start-level="30">mvn:org.springframework/spring-struts/${spring.version}</bundle>
</feature>
Modified: karaf/branches/karaf-2.2.x/pom.xml
URL: http://svn.apache.org/viewvc/karaf/branches/karaf-2.2.x/pom.xml?rev=1383377&r1=1383376&r2=1383377&view=diff
==============================================================================
--- karaf/branches/karaf-2.2.x/pom.xml (original)
+++ karaf/branches/karaf-2.2.x/pom.xml Tue Sep 11 12:26:45 2012
@@ -169,6 +169,7 @@
<spring2.version>2.5.6.SEC02</spring2.version>
<spring.version>3.0.7.RELEASE</spring.version>
<sshd.version>0.7.0</sshd.version>
+ <struts.bundle.version>1.3.10_1-SNAPSHOT</struts.bundle.version>
<xbean.version>3.11.1</xbean.version>
<javax.mail.version>1.4.5</javax.mail.version>
<http.feature.version>[2,3)</http.feature.version>