Author: pieber
Date: Sat Jan 22 00:48:40 2011
New Revision: 1062079
URL: http://svn.apache.org/viewvc?rev=1062079&view=rev
Log:
[KARAF-387] changed features.xml files still pointing to apache-karaf features
file
Signed-off-by: Andreas Pieber <anpie...@gmail.com>
Modified:
karaf/trunk/itests/tests/src/test/java/org/apache/karaf/shell/itests/FeaturesTest.java
karaf/trunk/pom.xml
karaf/trunk/tooling/testing/pom.xml
karaf/trunk/tooling/testing/src/main/java/org/apache/karaf/testing/Helper.java
Modified:
karaf/trunk/itests/tests/src/test/java/org/apache/karaf/shell/itests/FeaturesTest.java
URL:
http://svn.apache.org/viewvc/karaf/trunk/itests/tests/src/test/java/org/apache/karaf/shell/itests/FeaturesTest.java?rev=1062079&r1=1062078&r2=1062079&view=diff
==============================================================================
---
karaf/trunk/itests/tests/src/test/java/org/apache/karaf/shell/itests/FeaturesTest.java
(original)
+++
karaf/trunk/itests/tests/src/test/java/org/apache/karaf/shell/itests/FeaturesTest.java
Sat Jan 22 00:48:40 2011
@@ -60,7 +60,7 @@ public class FeaturesTest extends Abstra
Helper.setLogLevel("DEBUG")),
// add two features
- Helper.loadKarafFeatures("obr", "wrapper"),
+ Helper.loadKarafStandardFeatures("obr", "wrapper"),
workingDirectory("target/paxrunner/features/"),
Modified: karaf/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/karaf/trunk/pom.xml?rev=1062079&r1=1062078&r2=1062079&view=diff
==============================================================================
--- karaf/trunk/pom.xml (original)
+++ karaf/trunk/pom.xml Sat Jan 22 00:48:40 2011
@@ -459,6 +459,7 @@
<groupId>org.apache.karaf</groupId>
<artifactId>apache-karaf</artifactId>
<version>${project.version}</version>
+ <type>pom</type>
</dependency>
<dependency>
<groupId>org.apache.karaf</groupId>
@@ -473,11 +474,18 @@
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.karaf</groupId>
- <artifactId>apache-karaf</artifactId>
- <classifier>features</classifier>
- <type>xml</type>
- <version>${project.version}</version>
+ <groupId>org.apache.karaf.features.assembly</groupId>
+ <artifactId>standard</artifactId>
+ <type>xml</type>
+ <classifier>features</classifier>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.karaf.features.assembly</groupId>
+ <artifactId>enterprise</artifactId>
+ <type>xml</type>
+ <classifier>features</classifier>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.karaf.tooling</groupId>
Modified: karaf/trunk/tooling/testing/pom.xml
URL:
http://svn.apache.org/viewvc/karaf/trunk/tooling/testing/pom.xml?rev=1062079&r1=1062078&r2=1062079&view=diff
==============================================================================
--- karaf/trunk/tooling/testing/pom.xml (original)
+++ karaf/trunk/tooling/testing/pom.xml Sat Jan 22 00:48:40 2011
@@ -42,10 +42,22 @@
<dependencies>
<!-- The assembly and all the dependencies -->
<dependency>
- <groupId>org.apache.karaf</groupId>
- <artifactId>apache-karaf</artifactId>
- <type>xml</type>
- <classifier>features</classifier>
+ <groupId>org.apache.karaf</groupId>
+ <artifactId>apache-karaf</artifactId>
+ <type>pom</type>
+ </dependency>
+ <!-- Feature Files -->
+ <dependency>
+ <groupId>org.apache.karaf.features.assembly</groupId>
+ <artifactId>standard</artifactId>
+ <type>xml</type>
+ <classifier>features</classifier>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.karaf.features.assembly</groupId>
+ <artifactId>enterprise</artifactId>
+ <type>xml</type>
+ <classifier>features</classifier>
</dependency>
<!-- Pax EXAM -->
<dependency>
Modified:
karaf/trunk/tooling/testing/src/main/java/org/apache/karaf/testing/Helper.java
URL:
http://svn.apache.org/viewvc/karaf/trunk/tooling/testing/src/main/java/org/apache/karaf/testing/Helper.java?rev=1062079&r1=1062078&r2=1062079&view=diff
==============================================================================
---
karaf/trunk/tooling/testing/src/main/java/org/apache/karaf/testing/Helper.java
(original)
+++
karaf/trunk/tooling/testing/src/main/java/org/apache/karaf/testing/Helper.java
Sat Jan 22 00:48:40 2011
@@ -354,15 +354,27 @@ public final class Helper {
}
/**
- * Method to directly register Karaf features.
+ * Method to directly register Karaf standard features.
*
- * @param features a list of features which should be loaded from the
Karaf feature file.
+ * @param features a list of features which should be loaded from the
Karaf standard feature file.
* @return a pax-exam option
*/
- public static FeaturesScannerProvisionOption loadKarafFeatures(String...
features) {
+ public static FeaturesScannerProvisionOption
loadKarafStandardFeatures(String... features) {
return scanFeatures(
-
maven().groupId("org.apache.karaf").artifactId("apache-karaf").type("xml").classifier("features")
- .versionAsInProject(), features);
+
maven().groupId("org.apache.karaf.features.assembly").artifactId("standard").type("xml")
+ .classifier("features").versionAsInProject(), features);
+ }
+
+ /**
+ * Method to directly register Karaf enterprise features.
+ *
+ * @param features a list of features which should be loaded from the
Karaf enterprise feature file.
+ * @return a pax-exam option
+ */
+ public static FeaturesScannerProvisionOption
loadKarafEnterpriseFeatures(String... features) {
+ return scanFeatures(
+
maven().groupId("org.apache.karaf.features.assembly").artifactId("enterprise").type("xml")
+ .classifier("features").versionAsInProject(), features);
}
/**
