You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@karaf.apache.org by dj...@apache.org on 2011/12/05 23:24:48 UTC
svn commit: r1210675 - in /karaf/trunk: assemblies/apache-karaf/
assemblies/features/framework/src/main/feature/
assemblies/features/spring/src/main/feature/
assemblies/features/standard/src/main/feature/ shell/bundles/
shell/console/ tooling/exam/regr...
Author: djencks
Date: Mon Dec 5 22:24:48 2011
New Revision: 1210675
URL: http://svn.apache.org/viewvc?rev=1210675&view=rev
Log:
KARAF-1090 deployers feature
Modified:
karaf/trunk/assemblies/apache-karaf/pom.xml
karaf/trunk/assemblies/features/framework/src/main/feature/feature.xml
karaf/trunk/assemblies/features/spring/src/main/feature/feature.xml
karaf/trunk/assemblies/features/standard/src/main/feature/feature.xml
karaf/trunk/shell/bundles/pom.xml
karaf/trunk/shell/console/pom.xml
karaf/trunk/tooling/exam/regression/src/test/java/org/apache/karaf/tooling/exam/regression/FeaturesScannerProvisionTest.java
Modified: karaf/trunk/assemblies/apache-karaf/pom.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/assemblies/apache-karaf/pom.xml?rev=1210675&r1=1210674&r2=1210675&view=diff
==============================================================================
--- karaf/trunk/assemblies/apache-karaf/pom.xml (original)
+++ karaf/trunk/assemblies/apache-karaf/pom.xml Mon Dec 5 22:24:48 2011
@@ -145,7 +145,7 @@
<feature>management</feature>
<feature>ssh</feature>
<feature>config</feature>
- <feature>kar</feature>
+ <feature>deployers</feature>
<feature>region</feature>
</bootFeatures>
</configuration>
Modified: karaf/trunk/assemblies/features/framework/src/main/feature/feature.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/assemblies/features/framework/src/main/feature/feature.xml?rev=1210675&r1=1210674&r2=1210675&view=diff
==============================================================================
--- karaf/trunk/assemblies/features/framework/src/main/feature/feature.xml (original)
+++ karaf/trunk/assemblies/features/framework/src/main/feature/feature.xml Mon Dec 5 22:24:48 2011
@@ -46,11 +46,6 @@
<bundle start="true" start-level="30">mvn:org.eclipse.equinox/region/1.0.0.v20110506</bundle>
<bundle start="true" start-level="30">mvn:org.apache.karaf.region/org.apache.karaf.region.persist/${project.version}</bundle>
<bundle start="true" start-level="25">mvn:org.apache.karaf.features/org.apache.karaf.features.core/${project.version}</bundle>
- <bundle start="true" start-level="30">mvn:org.apache.karaf.deployer/org.apache.karaf.deployer.spring/${project.version}</bundle>
- <bundle start="true" start-level="30">mvn:org.apache.karaf.deployer/org.apache.karaf.deployer.blueprint/${project.version}</bundle>
- <bundle start="true" start-level="30">mvn:org.apache.karaf.deployer/org.apache.karaf.deployer.features/${project.version}</bundle>
- <bundle start="true" start-level="30">mvn:org.apache.karaf.deployer/org.apache.karaf.deployer.kar/${project.version}</bundle>
- <bundle start="true" start-level="30">mvn:org.apache.karaf.deployer/org.apache.karaf.deployer.wrap/${project.version}</bundle>
</feature>
</features>
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=1210675&r1=1210674&r2=1210675&view=diff
==============================================================================
--- karaf/trunk/assemblies/features/spring/src/main/feature/feature.xml (original)
+++ karaf/trunk/assemblies/features/spring/src/main/feature/feature.xml Mon Dec 5 22:24:48 2011
@@ -29,6 +29,7 @@
<bundle start-level="30">mvn:org.springframework/spring-aop/${spring.version}</bundle>
<bundle start-level="30">mvn:org.springframework/spring-context/${spring.version}</bundle>
<bundle start-level="30">mvn:org.springframework/spring-context-support/${spring.version}</bundle>
+ <bundle start-level="30">mvn:org.apache.karaf.deployer/org.apache.karaf.deployer.spring/${project.version}</bundle>
</feature>
<feature name="spring-aspects" description="Spring AOP support" version="${spring.version}" resolver="(obr)">
Modified: karaf/trunk/assemblies/features/standard/src/main/feature/feature.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/assemblies/features/standard/src/main/feature/feature.xml?rev=1210675&r1=1210674&r2=1210675&view=diff
==============================================================================
--- karaf/trunk/assemblies/features/standard/src/main/feature/feature.xml (original)
+++ karaf/trunk/assemblies/features/standard/src/main/feature/feature.xml Mon Dec 5 22:24:48 2011
@@ -101,8 +101,11 @@
<bundle start-level="30">mvn:org.apache.karaf.web/org.apache.karaf.web.management/${project.version}</bundle>
</feature>
- <feature name="kar" description="Provide KAR (Karaf Archive) artifacts support" version="${project.version}" resolver="(obr)">
+ <feature name="deployers" description="Provide KAR (Karaf Archive) artifacts support" version="${project.version}" resolver="(obr)">
+ <bundle start-level="30">mvn:org.apache.karaf.deployer/org.apache.karaf.deployer.blueprint/${project.version}</bundle>
+ <bundle start-level="30">mvn:org.apache.karaf.deployer/org.apache.karaf.deployer.features/${project.version}</bundle>
<bundle start-level="30">mvn:org.apache.karaf.deployer/org.apache.karaf.deployer.kar/${project.version}</bundle>
+ <bundle start-level="30">mvn:org.apache.karaf.deployer/org.apache.karaf.deployer.wrap/${project.version}</bundle>
</feature>
<feature name="webconsole-base" description="Base support of the Karaf WebConsole" version="${project.version}" resolver="(obr)">
Modified: karaf/trunk/shell/bundles/pom.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/shell/bundles/pom.xml?rev=1210675&r1=1210674&r2=1210675&view=diff
==============================================================================
--- karaf/trunk/shell/bundles/pom.xml (original)
+++ karaf/trunk/shell/bundles/pom.xml Mon Dec 5 22:24:48 2011
@@ -49,6 +49,12 @@
</dependency>
<dependency>
+ <groupId>org.apache.aries.blueprint</groupId>
+ <artifactId>org.apache.aries.blueprint.api</artifactId>
+ <scope>provided</scope>
+ </dependency>
+
+ <dependency>
<groupId>org.osgi</groupId>
<artifactId>org.osgi.core</artifactId>
<scope>provided</scope>
Modified: karaf/trunk/shell/console/pom.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/shell/console/pom.xml?rev=1210675&r1=1210674&r2=1210675&view=diff
==============================================================================
--- karaf/trunk/shell/console/pom.xml (original)
+++ karaf/trunk/shell/console/pom.xml Mon Dec 5 22:24:48 2011
@@ -76,6 +76,7 @@
<dependency>
<groupId>org.apache.aries.blueprint</groupId>
<artifactId>org.apache.aries.blueprint.api</artifactId>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.aries.blueprint</groupId>
Modified: karaf/trunk/tooling/exam/regression/src/test/java/org/apache/karaf/tooling/exam/regression/FeaturesScannerProvisionTest.java
URL: http://svn.apache.org/viewvc/karaf/trunk/tooling/exam/regression/src/test/java/org/apache/karaf/tooling/exam/regression/FeaturesScannerProvisionTest.java?rev=1210675&r1=1210674&r2=1210675&view=diff
==============================================================================
--- karaf/trunk/tooling/exam/regression/src/test/java/org/apache/karaf/tooling/exam/regression/FeaturesScannerProvisionTest.java (original)
+++ karaf/trunk/tooling/exam/regression/src/test/java/org/apache/karaf/tooling/exam/regression/FeaturesScannerProvisionTest.java Mon Dec 5 22:24:48 2011
@@ -48,12 +48,12 @@ public class FeaturesScannerProvisionTes
.versionAsInProject()),
scanFeatures(
maven().groupId("org.apache.karaf.assemblies.features").artifactId("standard").type("xml")
- .classifier("features").version("2.2.4"), "kar", "wrapper").start() };
+ .classifier("features").version("2.2.4"), "deployers", "wrapper").start() };
}
@Test
public void test() throws Exception {
- assertTrue(featuresService.isInstalled(featuresService.getFeature("kar")));
+ assertTrue(featuresService.isInstalled(featuresService.getFeature("deployers")));
assertTrue(featuresService.isInstalled(featuresService.getFeature("wrapper")));
}