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 15:22:30 UTC
svn commit: r1383403 - in /karaf/trunk:
assemblies/features/spring/src/main/feature/feature.xml
itests/src/test/java/org/apache/karaf/itests/SpringFeaturesTest.java pom.xml
Author: jbonofre
Date: Tue Sep 11 13:22:30 2012
New Revision: 1383403
URL: http://svn.apache.org/viewvc?rev=1383403&view=rev
Log:
[KARAF-1809] Fix spring-web-portlet feature
Modified:
karaf/trunk/assemblies/features/spring/src/main/feature/feature.xml
karaf/trunk/itests/src/test/java/org/apache/karaf/itests/SpringFeaturesTest.java
karaf/trunk/pom.xml
Modified: karaf/trunk/assemblies/features/spring/src/main/feature/feature.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/assemblies/features/spring/src/main/feature/feature.xml?rev=1383403&r1=1383402&r2=1383403&view=diff
==============================================================================
--- karaf/trunk/assemblies/features/spring/src/main/feature/feature.xml (original)
+++ karaf/trunk/assemblies/features/spring/src/main/feature/feature.xml Tue Sep 11 13:22:30 2012
@@ -111,6 +111,7 @@
<feature name="spring-web-portlet" description="Spring Web Portlet support" version="${spring.version}" resolver="(obr)">
<feature version="${spring.version}">spring-web</feature>
+ <bundle dependency="true" start-level="30">mvn:javax.portlet/portlet-api/${portlet-api.version}</bundle>
<bundle start-level="30">mvn:org.springframework/spring-webmvc-portlet/${spring.version}</bundle>
</feature>
Modified: karaf/trunk/itests/src/test/java/org/apache/karaf/itests/SpringFeaturesTest.java
URL: http://svn.apache.org/viewvc/karaf/trunk/itests/src/test/java/org/apache/karaf/itests/SpringFeaturesTest.java?rev=1383403&r1=1383402&r2=1383403&view=diff
==============================================================================
--- karaf/trunk/itests/src/test/java/org/apache/karaf/itests/SpringFeaturesTest.java (original)
+++ karaf/trunk/itests/src/test/java/org/apache/karaf/itests/SpringFeaturesTest.java Tue Sep 11 13:22:30 2012
@@ -118,8 +118,6 @@ public class SpringFeaturesTest extends
}
@Test
- @Ignore
- // TODO fix the spring-web-portlet feature
public void installSpringWebPortletFeature() throws Exception {
executeCommand("feature:install spring-web-portlet");
String springWebPortletFeatureStatus = executeCommand("feature:list -i | grep spring-web-portlet");
Modified: karaf/trunk/pom.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/pom.xml?rev=1383403&r1=1383402&r2=1383403&view=diff
==============================================================================
--- karaf/trunk/pom.xml (original)
+++ karaf/trunk/pom.xml Tue Sep 11 13:22:30 2012
@@ -198,6 +198,7 @@
<pax.web.version>2.1.0</pax.web.version>
<pax.swissbox.version>1.5.1</pax.swissbox.version>
<pax.tinybundle.version>1.0.0</pax.tinybundle.version>
+ <portlet-api.version>2.0</portlet-api.version>
<servlet.api.version>3.0</servlet.api.version>
<slf4j.version>1.6.6</slf4j.version>
<servicemix.specs.version>2.0.0</servicemix.specs.version>