Repository: karaf Updated Branches: refs/heads/master 6da94cb93 -> e31533648
[KARAF-3880] Add standard and minimal wrap features to simplify distribution assembly Project: http://git-wip-us.apache.org/repos/asf/karaf/repo Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/e3153364 Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/e3153364 Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/e3153364 Branch: refs/heads/master Commit: e31533648e55d17f0bfd0fa80872e2157b5f784b Parents: 6da94cb Author: Jean-Baptiste Onofré <[email protected]> Authored: Wed Nov 11 06:44:48 2015 +0100 Committer: Jean-Baptiste Onofré <[email protected]> Committed: Wed Nov 11 06:44:48 2015 +0100 ---------------------------------------------------------------------- .../main/resources/archetype-resources/pom.xml | 18 ++------- .../standard/src/main/feature/feature.xml | 40 ++++++++++++++++++++ .../developers-guide/custom-distribution.conf | 16 +------- 3 files changed, 45 insertions(+), 29 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/karaf/blob/e3153364/archetypes/assembly/src/main/resources/archetype-resources/pom.xml ---------------------------------------------------------------------- diff --git a/archetypes/assembly/src/main/resources/archetype-resources/pom.xml b/archetypes/assembly/src/main/resources/archetype-resources/pom.xml index 01c23fc..6a1a41d 100644 --- a/archetypes/assembly/src/main/resources/archetype-resources/pom.xml +++ b/archetypes/assembly/src/main/resources/archetype-resources/pom.xml @@ -158,20 +158,10 @@ </installedFeatures> <!-- <startupFeatures/> --> <bootFeatures> - <feature>jaas</feature> - <feature>shell</feature> - <feature>ssh</feature> - <feature>management</feature> - <feature>bundle</feature> - <feature>config</feature> - <feature>deployer</feature> - <feature>diagnostic</feature> - <feature>instance</feature> - <feature>kar</feature> - <feature>log</feature> - <feature>package</feature> - <feature>service</feature> - <feature>system</feature> + <!-- standard distribution --> + <feature>standard</feature> + <!-- minimal distribution --> + <!--<feature>minimal</feature>--> </bootFeatures> </configuration> </plugin> http://git-wip-us.apache.org/repos/asf/karaf/blob/e3153364/assemblies/features/standard/src/main/feature/feature.xml ---------------------------------------------------------------------- diff --git a/assemblies/features/standard/src/main/feature/feature.xml b/assemblies/features/standard/src/main/feature/feature.xml index 68a70ac..4e1faf4 100644 --- a/assemblies/features/standard/src/main/feature/feature.xml +++ b/assemblies/features/standard/src/main/feature/feature.xml @@ -575,4 +575,44 @@ <bundle>mvn:org.jolokia/jolokia-osgi/${jolokia.version}</bundle> </feature> + <feature name="standard" description="Wrap feature describing all features part of a standard distribution" version="${project.version}"> + <feature>wrap</feature> + <feature>aries-blueprint</feature> + <feature>shell</feature> + <feature>shell-compat</feature> + <feature>feature</feature> + <feature>jaas</feature> + <feature>ssh</feature> + <feature>management</feature> + <feature>bundle</feature> + <feature>config</feature> + <feature>deployer</feature> + <feature>diagnostic</feature> + <feature>feature</feature> + <feature>instance</feature> + <feature>kar</feature> + <feature>log</feature> + <feature>package</feature> + <feature>service</feature> + <feature>system</feature> + </feature> + + <feature name="minimal" description="Wrap feature describing all features part of a minimal distribution" version="${project.version}"> + <feature>jaas</feature> + <feature>shell</feature> + <feature>feature</feature> + <feature>ssh</feature> + <feature>management</feature> + <feature>bundle</feature> + <feature>config</feature> + <feature>deployer</feature> + <feature>diagnostic</feature> + <feature>instance</feature> + <feature>kar</feature> + <feature>log</feature> + <feature>package</feature> + <feature>service</feature> + <feature>system</feature> + </feature> + </features> http://git-wip-us.apache.org/repos/asf/karaf/blob/e3153364/manual/src/main/webapp/developers-guide/custom-distribution.conf ---------------------------------------------------------------------- diff --git a/manual/src/main/webapp/developers-guide/custom-distribution.conf b/manual/src/main/webapp/developers-guide/custom-distribution.conf index ad45a2d..7a27b5f 100644 --- a/manual/src/main/webapp/developers-guide/custom-distribution.conf +++ b/manual/src/main/webapp/developers-guide/custom-distribution.conf @@ -118,7 +118,6 @@ This is the minimal assembly pom changed to use the packaging and annotated <!-- no startupFeatures --> <bootFeatures> <feature>standard</feature> - <feature>management</feature> </bootFeatures> <!-- no installedFeatures --> </configuration> @@ -213,20 +212,7 @@ For instance, to pre-install Spring 4.0.7.RELEASE_1 feature in your custom distr <configuration> <!-- no startupFeatures --> <bootFeatures> - <feature>jaas</feature> - <feature>shell</feature> - <feature>ssh</feature> - <feature>management</feature> - <feature>bundle</feature> - <feature>config</feature> - <feature>deployer</feature> - <feature>diagnostic</feature> - <feature>instance</feature> - <feature>kar</feature> - <feature>log</feature> - <feature>package</feature> - <feature>service</feature> - <feature>system</feature> + <feature>minimal</feature> </bootFeatures> <installedFeatures> <feature>wrapper</feature>
