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/08/22 08:06:14 UTC
svn commit: r1160118 - in /karaf/trunk: ./ assemblies/apache-karaf-full/
assemblies/apache-karaf-minimal/ assemblies/apache-karaf/
assemblies/features/enterprise/
assemblies/features/enterprise/src/main/feature/
assemblies/features/framework/ assemblie...
Author: djencks
Date: Mon Aug 22 06:06:13 2011
New Revision: 1160118
URL: http://svn.apache.org/viewvc?rev=1160118&view=rev
Log:
KARAF-819 use full symbolic-name style names for features and feature repositories. This commit changes them all to start with org.apache.karaf.feature.
Modified:
karaf/trunk/assemblies/apache-karaf-full/pom.xml
karaf/trunk/assemblies/apache-karaf-minimal/pom.xml
karaf/trunk/assemblies/apache-karaf/pom.xml
karaf/trunk/assemblies/features/enterprise/pom.xml
karaf/trunk/assemblies/features/enterprise/src/main/feature/feature.xml
karaf/trunk/assemblies/features/framework/pom.xml
karaf/trunk/assemblies/features/framework/src/main/feature/feature.xml
karaf/trunk/assemblies/features/full/pom.xml
karaf/trunk/assemblies/features/standard/pom.xml
karaf/trunk/assemblies/features/standard/src/main/feature/feature.xml
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/assemblies/apache-karaf-full/pom.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/assemblies/apache-karaf-full/pom.xml?rev=1160118&r1=1160117&r2=1160118&view=diff
==============================================================================
--- karaf/trunk/assemblies/apache-karaf-full/pom.xml (original)
+++ karaf/trunk/assemblies/apache-karaf-full/pom.xml Mon Aug 22 06:06:13 2011
@@ -38,25 +38,25 @@
<dependencies>
<dependency>
<groupId>org.apache.karaf.assemblies.features</groupId>
- <artifactId>karaf-framework</artifactId>
+ <artifactId>org.apache.karaf.feature.karaf-framework</artifactId>
<type>kar</type>
</dependency>
<dependency>
<groupId>org.apache.karaf.assemblies.features</groupId>
- <artifactId>karaf-full</artifactId>
+ <artifactId>org.apache.karaf.feature.karaf-full</artifactId>
<type>kar</type>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>org.apache.karaf.assemblies.features</groupId>
- <artifactId>standard</artifactId>
+ <artifactId>org.apache.karaf.feature.standard</artifactId>
<classifier>features</classifier>
<type>xml</type>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>org.apache.karaf.assemblies.features</groupId>
- <artifactId>enterprise</artifactId>
+ <artifactId>org.apache.karaf.feature.enterprise</artifactId>
<classifier>features</classifier>
<type>xml</type>
<scope>runtime</scope>
@@ -86,11 +86,11 @@
</executions>
<configuration>
<bootFeatures>
- <feature>management</feature>
- <feature>standard</feature>
- <feature>karaf-full</feature>
- <feature>ssh</feature>
- <feature>config</feature>
+ <feature>org.apache.karaf.feature.management</feature>
+ <feature>org.apache.karaf.feature.standard</feature>
+ <feature>org.apache.karaf.feature.karaf-full</feature>
+ <feature>org.apache.karaf.feature.ssh</feature>
+ <feature>org.apache.karaf.feature.config</feature>
</bootFeatures>
</configuration>
</plugin>
Modified: karaf/trunk/assemblies/apache-karaf-minimal/pom.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/assemblies/apache-karaf-minimal/pom.xml?rev=1160118&r1=1160117&r2=1160118&view=diff
==============================================================================
--- karaf/trunk/assemblies/apache-karaf-minimal/pom.xml (original)
+++ karaf/trunk/assemblies/apache-karaf-minimal/pom.xml Mon Aug 22 06:06:13 2011
@@ -38,13 +38,13 @@
<dependencies>
<dependency>
<groupId>org.apache.karaf.assemblies.features</groupId>
- <artifactId>karaf-framework</artifactId>
+ <artifactId>org.apache.karaf.feature.karaf-framework</artifactId>
<version>${project.version}</version>
<type>kar</type>
</dependency>
<dependency>
<groupId>org.apache.karaf.assemblies.features</groupId>
- <artifactId>standard</artifactId>
+ <artifactId>org.apache.karaf.feature.standard</artifactId>
<classifier>features</classifier>
<type>xml</type>
<scope>runtime</scope>
@@ -74,8 +74,8 @@
</executions>
<configuration>
<bootFeatures>
- <feature>management</feature>
- <feature>standard</feature>
+ <feature>org.apache.karaf.feature.management</feature>
+ <feature>org.apache.karaf.feature.standard</feature>
</bootFeatures>
</configuration>
</plugin>
Modified: karaf/trunk/assemblies/apache-karaf/pom.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/assemblies/apache-karaf/pom.xml?rev=1160118&r1=1160117&r2=1160118&view=diff
==============================================================================
--- karaf/trunk/assemblies/apache-karaf/pom.xml (original)
+++ karaf/trunk/assemblies/apache-karaf/pom.xml Mon Aug 22 06:06:13 2011
@@ -585,13 +585,13 @@
</goals>
<configuration>
<descriptors>
- <descriptor>mvn:org.apache.karaf.assemblies.features/standard/${project.version}/xml/features</descriptor>
- <descriptor>mvn:org.apache.karaf.assemblies.features/enterprise/${project.version}/xml/features</descriptor>
+ <descriptor>mvn:org.apache.karaf.assemblies.features/org.apache.karaf.feature.standard/${project.version}/xml/features</descriptor>
+ <descriptor>mvn:org.apache.karaf.assemblies.features/org.apache.karaf.feature.enterprise/${project.version}/xml/features</descriptor>
</descriptors>
<features>
- <feature>config</feature>
- <feature>ssh</feature>
- <feature>management</feature>
+ <feature>org.apache.karaf.feature.config</feature>
+ <feature>org.apache.karaf.feature.ssh</feature>
+ <feature>org.apache.karaf.feature.management</feature>
</features>
<includeMvnBasedDescriptors>true</includeMvnBasedDescriptors>
<repository>target/features-repo</repository>
Modified: karaf/trunk/assemblies/features/enterprise/pom.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/assemblies/features/enterprise/pom.xml?rev=1160118&r1=1160117&r2=1160118&view=diff
==============================================================================
--- karaf/trunk/assemblies/features/enterprise/pom.xml (original)
+++ karaf/trunk/assemblies/features/enterprise/pom.xml Mon Aug 22 06:06:13 2011
@@ -27,7 +27,7 @@
<version>3.0.0-SNAPSHOT</version>
</parent>
- <artifactId>enterprise</artifactId>
+ <artifactId>org.apache.karaf.feature.enterprise</artifactId>
<packaging>pom</packaging>
<name>Apache Karaf :: Assemblies :: Features :: Enterprise</name>
Modified: karaf/trunk/assemblies/features/enterprise/src/main/feature/feature.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/assemblies/features/enterprise/src/main/feature/feature.xml?rev=1160118&r1=1160117&r2=1160118&view=diff
==============================================================================
--- karaf/trunk/assemblies/features/enterprise/src/main/feature/feature.xml (original)
+++ karaf/trunk/assemblies/features/enterprise/src/main/feature/feature.xml Mon Aug 22 06:06:13 2011
@@ -18,8 +18,8 @@
limitations under the License.
-->
-<features name="karaf-enterprise-${project.version}" xmlns="http://karaf.apache.org/xmlns/features/v1.0.0">
- <feature name='transaction' description='OSGi Transaction Manager' version='${aries.transaction.version}'
+<features name="org.apache.karaf.feature.karaf-enterprise-${project.version}" xmlns="http://karaf.apache.org/xmlns/features/v1.0.0">
+ <feature name='org.apache.karaf.feature.transaction' description='OSGi Transaction Manager' version='${aries.transaction.version}'
resolver='(obr)' start-level='30'>
<details>The Aries JTA</details>
<bundle dependency='true'>mvn:org.apache.geronimo.specs/geronimo-jta_1.1_spec/${geronimo.jta-spec.version}</bundle>
@@ -28,7 +28,7 @@
<bundle>mvn:org.apache.aries.transaction/org.apache.aries.transaction.wrappers/${aries.transaction.version}</bundle>
</feature>
- <feature name='jpa' description='OSGi Persistence Container' version='${aries.jpa.version}'
+ <feature name='org.apache.karaf.feature.jpa' description='OSGi Persistence Container' version='${aries.jpa.version}'
resolver='(obr)' start-level='30'>
<bundle dependency='true'>mvn:org.apache.geronimo.specs/geronimo-jta_1.1_spec/${geronimo.jta-spec.version}</bundle>
<bundle dependency='true'>mvn:org.apache.geronimo.specs/geronimo-jpa_2.0_spec/${geronimo.jpa-spec.version}</bundle>
@@ -39,7 +39,7 @@
<bundle>mvn:org.apache.aries.jpa/org.apache.aries.jpa.container.context/${aries.jpa.version}</bundle>
</feature>
- <feature name='jndi' description='OSGi Service Registry JNDI access' version='${aries.jndi.version}'
+ <feature name='org.apache.karaf.feature.jndi' description='OSGi Service Registry JNDI access' version='${aries.jndi.version}'
resolver='(obr)' start-level='30'>
<bundle>mvn:org.apache.aries/org.apache.aries.util/${aries.util.version}</bundle>
<bundle>mvn:org.apache.aries.jndi/org.apache.aries.jndi.api/${aries.jndi.version}</bundle>
@@ -49,7 +49,7 @@
<bundle>mvn:org.apache.aries.jndi/org.apache.aries.jndi.legacy.support/${aries.jndi.version}</bundle>
</feature>
- <feature name="application-without-isolation" version="${aries.application.version}" start-level='30'>
+ <feature name="org.apache.karaf.feature.application-without-isolation" version="${aries.application.version}" start-level='30'>
<!-- pre-requisites-->
<bundle>mvn:org.apache.aries.blueprint/org.apache.aries.blueprint/${aries.blueprint.version}</bundle>
<bundle>mvn:org.apache.aries.proxy/org.apache.aries.proxy/${aries.proxy.version}</bundle>
Modified: karaf/trunk/assemblies/features/framework/pom.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/assemblies/features/framework/pom.xml?rev=1160118&r1=1160117&r2=1160118&view=diff
==============================================================================
--- karaf/trunk/assemblies/features/framework/pom.xml (original)
+++ karaf/trunk/assemblies/features/framework/pom.xml Mon Aug 22 06:06:13 2011
@@ -27,7 +27,7 @@
<version>3.0.0-SNAPSHOT</version>
</parent>
- <artifactId>karaf-framework</artifactId>
+ <artifactId>org.apache.karaf.feature.karaf-framework</artifactId>
<packaging>pom</packaging>
<!--<packaging>kar</packaging>-->
<name>Apache Karaf :: Assemblies :: Framework KAR</name>
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=1160118&r1=1160117&r2=1160118&view=diff
==============================================================================
--- karaf/trunk/assemblies/features/framework/src/main/feature/feature.xml (original)
+++ karaf/trunk/assemblies/features/framework/src/main/feature/feature.xml Mon Aug 22 06:06:13 2011
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<features xmlns="http://karaf.apache.org/xmlns/features/v1.0.0" name="framework">
- <feature version="2.99.99-SNAPSHOT" name="karaf-framework">
+<features xmlns="http://karaf.apache.org/xmlns/features/v1.0.0" name="org.apache.karaf.feature.framework">
+ <feature version="2.99.99-SNAPSHOT" name="org.apache.karaf.feature.karaf-framework">
<bundle dependency="false" start="true" start-level="5">mvn:org.ops4j.pax.url/pax-url-aether/${pax.url.version}</bundle>
<bundle dependency="false" start="true" start-level="5">mvn:org.ops4j.pax.url/pax-url-wrap/${pax.url.version}</bundle>
<bundle dependency="false" start="true" start-level="8">mvn:org.ops4j.pax.logging/pax-logging-api/${pax.logging.version}</bundle>
Modified: karaf/trunk/assemblies/features/full/pom.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/assemblies/features/full/pom.xml?rev=1160118&r1=1160117&r2=1160118&view=diff
==============================================================================
--- karaf/trunk/assemblies/features/full/pom.xml (original)
+++ karaf/trunk/assemblies/features/full/pom.xml Mon Aug 22 06:06:13 2011
@@ -27,7 +27,7 @@
<version>3.0.0-SNAPSHOT</version>
</parent>
- <artifactId>karaf-full</artifactId>
+ <artifactId>org.apache.karaf.feature.karaf-full</artifactId>
<packaging>pom</packaging>
<!--<packaging>kar</packaging>-->
<name>Apache Karaf :: Assemblies :: Full KAR</name>
Modified: karaf/trunk/assemblies/features/standard/pom.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/assemblies/features/standard/pom.xml?rev=1160118&r1=1160117&r2=1160118&view=diff
==============================================================================
--- karaf/trunk/assemblies/features/standard/pom.xml (original)
+++ karaf/trunk/assemblies/features/standard/pom.xml Mon Aug 22 06:06:13 2011
@@ -27,7 +27,7 @@
<version>3.0.0-SNAPSHOT</version>
</parent>
- <artifactId>standard</artifactId>
+ <artifactId>org.apache.karaf.feature.standard</artifactId>
<packaging>pom</packaging>
<name>Apache Karaf :: Assemblies :: Features :: Standard</name>
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=1160118&r1=1160117&r2=1160118&view=diff
==============================================================================
--- karaf/trunk/assemblies/features/standard/src/main/feature/feature.xml (original)
+++ karaf/trunk/assemblies/features/standard/src/main/feature/feature.xml Mon Aug 22 06:06:13 2011
@@ -16,8 +16,8 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<features name="karaf-${project.version}" xmlns="http://karaf.apache.org/xmlns/features/v1.0.0">
- <feature name="spring" version="${spring.version}" resolver="(obr)" start-level='30'>
+<features name="org.apache.karaf.feature.karaf-${project.version}" xmlns="http://karaf.apache.org/xmlns/features/v1.0.0">
+ <feature name="org.apache.karaf.feature.spring" version="${spring.version}" resolver="(obr)" start-level='30'>
<bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.aopalliance/${aopalliance.bundle.version}</bundle>
<bundle>mvn:org.springframework/spring-core/${spring.version}</bundle>
<bundle>mvn:org.springframework/spring-asm/${spring.version}</bundle>
@@ -27,14 +27,14 @@
<bundle>mvn:org.springframework/spring-context/${spring.version}</bundle>
<bundle>mvn:org.springframework/spring-context-support/${spring.version}</bundle>
</feature>
- <feature name="spring-web" version="${spring.version}" resolver="(obr)" start-level='30'>
- <feature version="${spring.version}">spring</feature>
- <feature version="${project.version}">http</feature>
+ <feature name="org.apache.karaf.feature.spring-web" version="${spring.version}" resolver="(obr)" start-level='30'>
+ <feature version="${spring.version}">org.apache.karaf.feature.spring</feature>
+ <feature version="${project.version}">org.apache.karaf.feature.http</feature>
<bundle>mvn:org.springframework/spring-web/${spring.version}</bundle>
<bundle>mvn:org.springframework/spring-webmvc/${spring.version}</bundle>
</feature>
- <feature name="spring-dm" version="${spring.osgi.version}" resolver="(obr)" start-level='30'>
- <feature version="[2.5.6,4)">spring</feature>
+ <feature name="org.apache.karaf.feature.spring-dm" version="${spring.osgi.version}" resolver="(obr)" start-level='30'>
+ <feature version="[2.5.6,4)">org.apache.karaf.feature.spring</feature>
<bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.cglib/${cglib.bundle.version}</bundle>
<bundle>mvn:org.springframework.osgi/spring-osgi-io/${spring.osgi.version}</bundle>
<bundle>mvn:org.springframework.osgi/spring-osgi-core/${spring.osgi.version}</bundle>
@@ -42,26 +42,26 @@
<bundle>mvn:org.springframework.osgi/spring-osgi-annotation/${spring.osgi.version}</bundle>
<bundle>mvn:org.apache.karaf.deployer/org.apache.karaf.deployer.spring/${project.version}</bundle>
</feature>
- <feature name="spring-dm-web" version="${spring.osgi.version}" resolver="(obr)" start-level='30'>
- <feature version="${spring.osgi.version}">spring-dm</feature>
- <feature version="[2.5.6,4)">spring-web</feature>
- <feature version="${project.version}">http</feature>
+ <feature name="org.apache.karaf.feature.spring-dm-web" version="${spring.osgi.version}" resolver="(obr)" start-level='30'>
+ <feature version="${spring.osgi.version}">org.apache.karaf.feature.spring-dm</feature>
+ <feature version="[2.5.6,4)">vspring-web</feature>
+ <feature version="${project.version}">org.apache.karaf.feature.http</feature>
<bundle>mvn:org.springframework.osgi/spring-osgi-web/${spring.osgi.version}</bundle>
</feature>
- <feature name="wrapper" version="${project.version}" start-level='30'>
+ <feature name="org.apache.karaf.feature.wrapper" version="${project.version}" start-level='30'>
<bundle>mvn:org.apache.karaf.shell/org.apache.karaf.shell.wrapper/${project.version}</bundle>
</feature>
- <feature name="obr" version="${project.version}" start-level='30'>
+ <feature name="org.apache.karaf.feature.obr" version="${project.version}" start-level='30'>
<bundle>mvn:org.apache.felix/org.osgi.service.obr/${felix.obr.version}</bundle>
<bundle>mvn:org.apache.felix/org.apache.felix.bundlerepository/${felix.bundlerepository.version}</bundle>
<bundle>mvn:org.apache.karaf.shell/org.apache.karaf.shell.obr/${project.version}</bundle>
<bundle>mvn:org.apache.karaf.features/org.apache.karaf.features.obr/${project.version}</bundle>
<bundle>mvn:org.ops4j.pax.url/pax-url-obr/${pax.url.version}</bundle>
</feature>
- <feature name="config" version="${project.version}" start-level='30'>
+ <feature name="org.apache.karaf.feature.config" version="${project.version}" start-level='30'>
<bundle start-level='30' start='true'>mvn:org.apache.karaf.shell/org.apache.karaf.shell.config/${project.version}</bundle>
</feature>
- <feature name="jetty" version="${jetty.version}" resolver="(obr)" start-level='30'>
+ <feature name="org.apache.karaf.feature.jetty" version="${jetty.version}" resolver="(obr)" start-level='30'>
<bundle dependency='true'>mvn:org.apache.geronimo.specs/geronimo-activation_1.1_spec/${geronimo.activation.version}</bundle>
<bundle dependency='true'>mvn:org.apache.geronimo.specs/geronimo-servlet_2.5_spec/${geronimo.servlet.version}</bundle>
<bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.asm/${asm.bundle.version}</bundle>
@@ -82,7 +82,7 @@
<bundle>mvn:org.eclipse.jetty/jetty-jndi/${jetty.version}</bundle>
<bundle>mvn:org.eclipse.jetty/jetty-plus/${jetty.version}</bundle>
</feature>
- <feature name="http" version="${project.version}" resolver="(obr)" start-level='30' description="Implementation of the OSGI HTTP Service">
+ <feature name="org.apache.karaf.feature.http" version="${project.version}" resolver="(obr)" start-level='30' description="Implementation of the OSGI HTTP Service">
<details>Allows to publish servlets using pax web and jetty</details>
<configfile finalname="/etc/jetty.xml">mvn:org.apache.karaf.assemblies/apache-karaf/${project.version}/xml/jettyconfig</configfile>
<config name="org.ops4j.pax.web">
@@ -90,49 +90,49 @@
javax.servlet.context.tempdir=${karaf.data}/pax-web-jsp
org.ops4j.pax.web.config.file=${karaf.base}/etc/jetty.xml
</config>
- <feature version="[7.0,8.0)">jetty</feature>
+ <feature version="[7.0,8.0)">org.apache.karaf.feature.jetty</feature>
<bundle>mvn:org.ops4j.pax.web/pax-web-api/${pax.web.version}</bundle>
<bundle>mvn:org.ops4j.pax.web/pax-web-spi/${pax.web.version}</bundle>
<bundle>mvn:org.ops4j.pax.web/pax-web-runtime/${pax.web.version}</bundle>
<bundle>mvn:org.ops4j.pax.web/pax-web-jetty/${pax.web.version}</bundle>
<bundle start-level="30">mvn:org.apache.karaf.shell/org.apache.karaf.shell.http/${project.version}</bundle>
</feature>
- <feature name="http-whiteboard" version="${project.version}" resolver="(obr)" start-level='30'>
- <feature>http</feature>
+ <feature name="org.apache.karaf.feature.http-whiteboard" version="${project.version}" resolver="(obr)" start-level='30'>
+ <feature>org.apache.karaf.feature.http</feature>
<bundle>mvn:org.ops4j.pax.web/pax-web-jsp/${pax.web.version}</bundle>
<bundle>mvn:org.ops4j.pax.web/pax-web-extender-whiteboard/${pax.web.version}</bundle>
</feature>
- <feature name="war" version="${project.version}" resolver="(obr)" start-level='30'>
+ <feature name="org.apache.karaf.feature.war" version="${project.version}" resolver="(obr)" start-level='30'>
<config name="org.ops4j.pax.url.war">
org.ops4j.pax.url.war.importPaxLoggingPackages=true
</config>
- <feature>http-whiteboard</feature>
+ <feature>org.apache.karaf.feature.http-whiteboard</feature>
<bundle start-level='30'>mvn:org.apache.karaf.shell/org.apache.karaf.shell.web/${project.version}</bundle>
<bundle>mvn:org.ops4j.pax.web/pax-web-extender-war/${pax.web.version}</bundle>
<bundle>mvn:org.ops4j.pax.web/pax-web-deployer/${pax.web.version}</bundle>
<bundle>mvn:org.ops4j.pax.url/pax-url-war/${pax.url.version}</bundle>
</feature>
- <feature name="kar" version="${project.version}" start-level='30'>
+ <feature name="org.apache.karaf.feature.kar" version="${project.version}" start-level='30'>
<bundle>mvn:org.apache.karaf.deployer/org.apache.karaf.deployer.kar/${project.version}</bundle>
</feature>
- <feature name="webconsole-base" version="${project.version}" start-level='30'>
+ <feature name="org.apache.karaf.feature.webconsole-base" version="${project.version}" start-level='30'>
<config name="org.apache.karaf.webconsole">
realm=karaf
</config>
- <feature version="${project.version}">http</feature>
+ <feature version="${project.version}">org.apache.karaf.feature.http</feature>
<bundle>mvn:org.apache.felix/org.apache.felix.metatype/${felix.metatype.version}</bundle>
<bundle>mvn:org.apache.karaf.webconsole/org.apache.karaf.webconsole.branding/${project.version}</bundle>
<bundle>mvn:org.apache.karaf.webconsole/org.apache.karaf.webconsole.console/${project.version}</bundle>
</feature>
- <feature name="webconsole" version="${project.version}" start-level='30'>
- <feature version="${project.version}">webconsole-base</feature>
+ <feature name="org.apache.karaf.feature.webconsole" version="${project.version}" start-level='30'>
+ <feature version="${project.version}">org.apache.karaf.feature.webconsole-base</feature>
<bundle>mvn:org.apache.karaf.webconsole/org.apache.karaf.webconsole.admin/${project.version}</bundle>
<bundle>mvn:org.apache.karaf.webconsole/org.apache.karaf.webconsole.features/${project.version}</bundle>
<bundle>mvn:org.apache.karaf.webconsole/org.apache.karaf.webconsole.gogo/${project.version}</bundle>
<bundle>mvn:org.apache.karaf.webconsole/org.apache.karaf.webconsole.http/${project.version}</bundle>
<bundle>mvn:org.apache.felix/org.apache.felix.webconsole.plugins.event/${felix.eventadmin-plugin.version}</bundle>
</feature>
- <feature name="ssh" version="${project.version}" start-level='30'>
+ <feature name="org.apache.karaf.feature.ssh" version="${project.version}" start-level='30'>
<config name="org.apache.karaf.shell">
sshPort=8101
sshHost=0.0.0.0
@@ -143,18 +143,18 @@
<bundle>mvn:org.apache.sshd/sshd-core/${sshd.version}</bundle>
<bundle>mvn:org.apache.karaf.shell/org.apache.karaf.shell.ssh/${project.version}</bundle>
</feature>
- <feature name="management" version="${project.version}" start-level='30'>
+ <feature name="org.apache.karaf.feature.management" version="${project.version}" start-level='30'>
<bundle>mvn:org.apache.karaf/org.apache.karaf.management/${project.version}</bundle>
<bundle>mvn:org.apache.aries.jmx/org.apache.aries.jmx/${aries.jmx.version}</bundle>
<bundle>mvn:org.apache.aries.jmx/org.apache.aries.jmx.blueprint/${aries.jmx.version}</bundle>
</feature>
- <feature name="scheduler" version="${project.version}" start-level='30'>
+ <feature name="org.apache.karaf.feature.scheduler" version="${project.version}" start-level='30'>
<bundle>mvn:org.apache.karaf.scheduler/org.apache.karaf.scheduler.core/${project.version}</bundle>
</feature>
- <feature name="eventadmin" version="${project.version}" start-level='30'>
+ <feature name="org.apache.karaf.feature.eventadmin" version="${project.version}" start-level='30'>
<bundle start-level='30'>mvn:org.apache.felix/org.apache.felix.eventadmin/${felix.eventadmin.version}</bundle>
</feature>
- <feature name="jasypt-encryption" version="${project.version}" resolver="(obr)" start-level='30'>
+ <feature name="org.apache.karaf.feature.jasypt-encryption" version="${project.version}" resolver="(obr)" start-level='30'>
<bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-codec/${commons-codec.bundle.version}</bundle>
<bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-lang/${commons-lang.bundle.version}</bundle>
<bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jasypt/${jasypt.bundle.version}</bundle>
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=1160118&r1=1160117&r2=1160118&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 Mon Aug 22 06:06:13 2011
@@ -60,7 +60,7 @@ public class FeaturesTest extends Abstra
Helper.setLogLevel("DEBUG")),
// add two features
- Helper.loadKarafStandardFeatures("obr", "wrapper"),
+ Helper.loadKarafStandardFeatures("org.apache.karaf.feature.obr", "org.apache.karaf.feature.wrapper"),
workingDirectory("target/paxrunner/features/"),
Modified: karaf/trunk/pom.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/pom.xml?rev=1160118&r1=1160117&r2=1160118&view=diff
==============================================================================
--- karaf/trunk/pom.xml (original)
+++ karaf/trunk/pom.xml Mon Aug 22 06:06:13 2011
@@ -500,26 +500,26 @@
</dependency>
<dependency>
<groupId>org.apache.karaf.assemblies.features</groupId>
- <artifactId>standard</artifactId>
+ <artifactId>org.apache.karaf.feature.standard</artifactId>
<type>xml</type>
<classifier>features</classifier>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.karaf.assemblies.features</groupId>
- <artifactId>karaf-framework</artifactId>
+ <artifactId>org.apache.karaf.feature.karaf-framework</artifactId>
<type>kar</type>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.karaf.assemblies.features</groupId>
- <artifactId>karaf-full</artifactId>
+ <artifactId>org.apache.karaf.feature.karaf-full</artifactId>
<type>kar</type>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.karaf.assemblies.features</groupId>
- <artifactId>enterprise</artifactId>
+ <artifactId>org.apache.karaf.feature.enterprise</artifactId>
<type>xml</type>
<classifier>features</classifier>
<version>${project.version}</version>
Modified: karaf/trunk/tooling/testing/pom.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/tooling/testing/pom.xml?rev=1160118&r1=1160117&r2=1160118&view=diff
==============================================================================
--- karaf/trunk/tooling/testing/pom.xml (original)
+++ karaf/trunk/tooling/testing/pom.xml Mon Aug 22 06:06:13 2011
@@ -49,13 +49,13 @@
<!-- Feature Files -->
<dependency>
<groupId>org.apache.karaf.assemblies.features</groupId>
- <artifactId>standard</artifactId>
+ <artifactId>org.apache.karaf.feature.standard</artifactId>
<type>xml</type>
<classifier>features</classifier>
</dependency>
<dependency>
<groupId>org.apache.karaf.assemblies.features</groupId>
- <artifactId>enterprise</artifactId>
+ <artifactId>org.apache.karaf.feature.enterprise</artifactId>
<type>xml</type>
<classifier>features</classifier>
</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=1160118&r1=1160117&r2=1160118&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 Mon Aug 22 06:06:13 2011
@@ -361,7 +361,7 @@ public final class Helper {
*/
public static FeaturesScannerProvisionOption loadKarafStandardFeatures(String... features) {
return scanFeatures(
- maven().groupId("org.apache.karaf.assemblies.features").artifactId("standard").type("xml")
+ maven().groupId("org.apache.karaf.assemblies.features").artifactId("org.apache.karaf.feature.standard").type("xml")
.classifier("features").versionAsInProject(), features);
}
@@ -373,7 +373,7 @@ public final class Helper {
*/
public static FeaturesScannerProvisionOption loadKarafEnterpriseFeatures(String... features) {
return scanFeatures(
- maven().groupId("org.apache.karaf.assemblies.features").artifactId("enterprise").type("xml")
+ maven().groupId("org.apache.karaf.assemblies.features").artifactId("org.apache.karaf.feature.enterprise").type("xml")
.classifier("features").versionAsInProject(), features);
}