Property changes on: assembly/src
___________________________________________________________________
Added: svn:ignore
   + .directory


Index: assembly/src/main/descriptors/windows-bin.xml
===================================================================
--- assembly/src/main/descriptors/windows-bin.xml	(revision 967008)
+++ assembly/src/main/descriptors/windows-bin.xml	(working copy)
@@ -21,44 +21,41 @@
         <format>zip</format>
     </formats>
     <fileSets>
-
-
       <!-- Copy license and other files from root -->
-      <fileSet>
-          <directory>..</directory>
-          <outputDirectory>/</outputDirectory>
-          <includes>
-              <include>README</include>
-              <include>RELEASE*</include>
-          </includes>
-          <lineEnding>dos</lineEnding>
-      </fileSet>
+        <fileSet>
+            <directory>..</directory>
+            <outputDirectory>/</outputDirectory>
+            <includes>
+                <include>README</include>
+                <include>RELEASE*</include>
+            </includes>
+            <lineEnding>dos</lineEnding>
+        </fileSet>
 
       <!-- Copy over everything that needs to get dos line endings -->
-      <fileSet>
-          <directory>src/main/distribution/text</directory>
-          <outputDirectory>/</outputDirectory>
-          <lineEnding>dos</lineEnding>
-      </fileSet>        
-      <fileSet>
-          <directory>src/main/distribution/windows-text</directory>
-          <outputDirectory>/</outputDirectory>
-          <lineEnding>dos</lineEnding>
-      </fileSet>        
-      <fileSet>
-          <directory>target/classes/bin</directory>
-          <outputDirectory>/bin/</outputDirectory>
-          <lineEnding>dos</lineEnding>
-          <includes>
-              <include>admin.bat</include>
-          </includes>
-      </fileSet>
-      <fileSet>
-          <directory>target/classes/etc</directory>
-          <outputDirectory>/etc/</outputDirectory>
-          <lineEnding>dos</lineEnding>
-      </fileSet>
-
+        <fileSet>
+            <directory>src/main/distribution/text</directory>
+            <outputDirectory>/</outputDirectory>
+            <lineEnding>dos</lineEnding>
+        </fileSet>
+        <fileSet>
+            <directory>src/main/distribution/windows-text</directory>
+            <outputDirectory>/</outputDirectory>
+            <lineEnding>dos</lineEnding>
+        </fileSet>
+        <fileSet>
+            <directory>target/classes/bin</directory>
+            <outputDirectory>/bin/</outputDirectory>
+            <lineEnding>dos</lineEnding>
+            <includes>
+                <include>admin.bat</include>
+            </includes>
+        </fileSet>
+        <fileSet>
+            <directory>target/classes/etc</directory>
+            <outputDirectory>/etc/</outputDirectory>
+            <lineEnding>dos</lineEnding>
+        </fileSet>        
         <!-- Copy over the examples -->
         <fileSet>
             <directory>target/classes/demos</directory>
@@ -76,22 +73,22 @@
         </fileSet>
 
       <!-- Copy over files that should not get the line endings converted -->
-      <fileSet>
-          <directory>src/main/distribution/binary</directory>
-          <outputDirectory>/</outputDirectory>
-      </fileSet>
+        <fileSet>
+            <directory>src/main/distribution/binary</directory>
+            <outputDirectory>/</outputDirectory>
+        </fileSet>
 
       <!-- Copy over the files that should not get the line endings converted but need to be chmod to 755 -->
-      <fileSet>
-          <directory>src/main/distribution/windows-binary</directory>
-          <outputDirectory>/</outputDirectory>
-      </fileSet>
+        <fileSet>
+            <directory>src/main/distribution/windows-binary</directory>
+            <outputDirectory>/</outputDirectory>
+        </fileSet>
       
       <!-- Copy over jar files -->
-      <fileSet>
-          <directory>target/dependencies</directory>
-          <outputDirectory>/</outputDirectory>
-      </fileSet>
+        <fileSet>
+            <directory>target/dependencies</directory>
+            <outputDirectory>/</outputDirectory>
+        </fileSet>
 
     </fileSets>
 
Index: assembly/src/main/descriptors/windows-minimal-bin.xml
===================================================================
--- assembly/src/main/descriptors/windows-minimal-bin.xml	(revision 0)
+++ assembly/src/main/descriptors/windows-minimal-bin.xml	(revision 0)
@@ -0,0 +1,285 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+<assembly>
+    <id>minimal</id> <!-- Used as artifact discriminator -->
+    <formats>
+        <format>zip</format>
+    </formats>
+    <fileSets>
+
+
+      <!-- Copy license and other files from root -->
+        <fileSet>
+            <directory>..</directory>
+            <outputDirectory>/</outputDirectory>
+            <includes>
+                <include>README</include>
+                <include>RELEASE*</include>
+            </includes>
+            <lineEnding>dos</lineEnding>
+        </fileSet>
+
+      <!-- Copy over everything that needs to get dos line endings -->
+        <fileSet>
+            <directory>target/classes/text</directory>
+            <outputDirectory>/</outputDirectory>
+            <lineEnding>dos</lineEnding>
+        </fileSet>
+        <fileSet>
+            <directory>src/main/distribution/windows-text</directory>
+            <outputDirectory>/</outputDirectory>
+            <lineEnding>dos</lineEnding>
+        </fileSet>
+        <fileSet>
+            <directory>target/classes/bin</directory>
+            <outputDirectory>/bin/</outputDirectory>
+            <lineEnding>dos</lineEnding>
+            <includes>
+                <include>admin.bat</include>
+            </includes>
+        </fileSet>
+        <fileSet>
+            <directory>target/classes/etc</directory>
+			<excludes>
+				<exclude>org.apache.karaf.features.cfg</exclude>
+				<exclude>startup.properties</exclude>
+			</excludes>
+            <outputDirectory>/etc/</outputDirectory>
+            <lineEnding>dos</lineEnding>
+        </fileSet>
+        <fileSet>
+            <directory>target/classes/minimal</directory>
+            <outputDirectory>/etc/</outputDirectory>
+            <lineEnding>dos</lineEnding>
+        </fileSet>
+
+        <!-- Copy over the examples -->
+        <fileSet>
+            <directory>target/classes/demos</directory>
+            <outputDirectory>/demos/</outputDirectory>
+            <lineEnding>dos</lineEnding>
+        </fileSet>
+
+        <fileSet>
+            <directory>../demos</directory>
+            <outputDirectory>/demos/</outputDirectory>
+            <lineEnding>dos</lineEnding>
+            <excludes>
+                <exclude>**/target/**</exclude>
+            </excludes>
+        </fileSet>
+
+      <!-- Copy over files that should not get the line endings converted -->
+        <fileSet>
+            <directory>src/main/distribution/binary</directory>
+            <outputDirectory>/</outputDirectory>
+        </fileSet>
+
+      <!-- Copy over the files that should not get the line endings converted but need to be chmod to 755 -->
+        <fileSet>
+            <directory>src/main/distribution/windows-binary</directory>
+            <outputDirectory>/</outputDirectory>
+        </fileSet>
+      
+      <!-- Copy over jar files -->
+        <fileSet>
+            <directory>target/dependencies</directory>
+            <outputDirectory>/</outputDirectory>
+        </fileSet>
+
+    </fileSets>
+
+    <files>
+        <file>
+            <source>${basedir}/../LICENSE</source>
+            <outputDirectory>/</outputDirectory>
+            <destName>LICENSE</destName>
+            <fileMode>0644</fileMode>
+            <lineEnding>dos</lineEnding>
+        </file>
+        <file>
+            <source>${basedir}/NOTICE</source>
+            <outputDirectory>/</outputDirectory>
+            <destName>NOTICE</destName>
+            <fileMode>0644</fileMode>
+            <lineEnding>dos</lineEnding>
+        </file>
+        <file>
+            <source>${basedir}/target/classes/features.xml</source>
+            <outputDirectory>/system/org/apache/karaf/apache-karaf/${project.version}</outputDirectory>
+            <destName>apache-karaf-${project.version}-features.xml</destName>
+            <fileMode>0644</fileMode>
+            <lineEnding>dos</lineEnding>
+        </file>
+    </files>
+
+    <dependencySets>
+        <dependencySet>
+            <outputDirectory>/lib/endorsed</outputDirectory>
+            <unpack>false</unpack>
+            <useProjectArtifact>false</useProjectArtifact>
+            <includes>
+                <include>org.apache.karaf:org.apache.karaf.exception</include>
+            </includes>
+        </dependencySet>
+
+        <dependencySet>
+            <outputDirectory>/system</outputDirectory>
+            <unpack>false</unpack>
+            <useProjectArtifact>false</useProjectArtifact>
+            <outputFileNameMapping>org/apache/felix/${artifact.artifactId}/${artifact.baseVersion}/${artifact.artifactId}-${artifact.baseVersion}${dashClassifier?}.${artifact.extension}</outputFileNameMapping>
+            <includes>
+                <include>org.apache.felix:org.apache.felix.configadmin</include>
+                <include>org.apache.felix:org.apache.felix.framework</include>
+                <include>org.apache.felix:org.apache.felix.fileinstall</include>
+            </includes>
+        </dependencySet>
+        <dependencySet>
+            <outputDirectory>/system</outputDirectory>
+            <unpack>false</unpack>
+            <useProjectArtifact>false</useProjectArtifact>
+            <outputFileNameMapping>org/apache/felix/gogo/${artifact.artifactId}/${artifact.baseVersion}/${artifact.artifactId}-${artifact.baseVersion}${dashClassifier?}.${artifact.extension}</outputFileNameMapping>
+            <includes>
+                <include>org.apache.felix.gogo:org.apache.felix.gogo.runtime</include>
+            </includes>
+        </dependencySet>
+        <dependencySet>
+            <outputDirectory>/system</outputDirectory>
+            <unpack>false</unpack>
+            <useProjectArtifact>false</useProjectArtifact>
+            <outputFileNameMapping>org/apache/felix/${artifact.artifactId}/${artifact.baseVersion}/${artifact.artifactId}-${artifact.baseVersion}${dashClassifier?}.${artifact.extension}</outputFileNameMapping>
+            <includes>
+                <include>org.apache.felix:org.apache.felix.metatype</include>
+            </includes>
+        </dependencySet>
+        <dependencySet>
+            <outputDirectory>/system</outputDirectory>
+            <unpack>false</unpack>
+            <useProjectArtifact>false</useProjectArtifact>
+            <outputFileNameMapping>org/apache/felix/${artifact.artifactId}/${artifact.baseVersion}/${artifact.artifactId}-${artifact.baseVersion}${dashClassifier?}.${artifact.extension}</outputFileNameMapping>
+            <includes>
+                <include>org.apache.felix:org.apache.felix.webconsole</include>
+            </includes>
+        </dependencySet>
+        <dependencySet>
+            <outputDirectory>/system</outputDirectory>
+            <unpack>false</unpack>
+            <useProjectArtifact>false</useProjectArtifact>
+            <outputFileNameMapping>org/ops4j/pax/logging/${artifact.artifactId}/${artifact.baseVersion}/${artifact.artifactId}-${artifact.baseVersion}${dashClassifier?}.${artifact.extension}</outputFileNameMapping>
+            <includes>
+                <include>org.ops4j.pax.logging:pax-logging-api</include>
+                <include>org.ops4j.pax.logging:pax-logging-service</include>
+            </includes>
+        </dependencySet>
+        <dependencySet>
+            <outputDirectory>/system</outputDirectory>
+            <unpack>false</unpack>
+            <useProjectArtifact>false</useProjectArtifact>
+            <outputFileNameMapping>org/ops4j/pax/url/${artifact.artifactId}/${artifact.baseVersion}/${artifact.artifactId}-${artifact.baseVersion}${dashClassifier?}.${artifact.extension}</outputFileNameMapping>
+            <includes>
+                <include>org.ops4j.pax.url:pax-url-mvn</include>
+                <include>org.ops4j.pax.url:pax-url-wrap</include>
+            </includes>
+        </dependencySet>
+        <dependencySet>
+            <outputDirectory>/system</outputDirectory>
+            <unpack>false</unpack>
+            <useProjectArtifact>false</useProjectArtifact>
+            <outputFileNameMapping>org/apache/karaf/${artifact.artifactId}/${artifact.baseVersion}/${artifact.artifactId}-${artifact.baseVersion}${dashClassifier?}.${artifact.extension}</outputFileNameMapping>
+            <includes>
+                <include>org.apache.karaf:org.apache.karaf.management</include>
+            </includes>
+        </dependencySet>
+        <dependencySet>
+            <outputDirectory>/system</outputDirectory>
+            <unpack>false</unpack>
+            <useProjectArtifact>false</useProjectArtifact>
+            <outputFileNameMapping>org/apache/karaf/features/${artifact.artifactId}/${artifact.baseVersion}/${artifact.artifactId}-${artifact.baseVersion}${dashClassifier?}.${artifact.extension}</outputFileNameMapping>
+            <includes>
+                <include>org.apache.karaf.features:org.apache.karaf.features.core</include>
+                <include>org.apache.karaf.features:org.apache.karaf.features.command</include>
+                <include>org.apache.karaf.features:org.apache.karaf.features.management</include>
+            </includes>
+        </dependencySet>
+        <dependencySet>
+            <outputDirectory>/system</outputDirectory>
+            <unpack>false</unpack>
+            <useProjectArtifact>false</useProjectArtifact>
+            <outputFileNameMapping>org/apache/karaf/shell/${artifact.artifactId}/${artifact.baseVersion}/${artifact.artifactId}-${artifact.baseVersion}${dashClassifier?}.${artifact.extension}</outputFileNameMapping>
+            <includes>
+                <include>org.apache.karaf.shell:org.apache.karaf.shell.console</include>
+                <include>org.apache.karaf.shell:org.apache.karaf.shell.dev</include>
+                <include>org.apache.karaf.shell:org.apache.karaf.shell.osgi</include>
+                <include>org.apache.karaf.shell:org.apache.karaf.shell.log</include>
+                <include>org.apache.karaf.shell:org.apache.karaf.shell.config</include>
+                <include>org.apache.karaf.shell:org.apache.karaf.shell.packages</include>
+                <include>org.apache.karaf.shell:org.apache.karaf.shell.ssh</include>
+                <include>org.apache.karaf.shell:org.apache.karaf.shell.commands</include>
+            </includes>
+        </dependencySet>
+        <dependencySet>
+            <outputDirectory>/system</outputDirectory>
+            <unpack>false</unpack>
+            <useProjectArtifact>false</useProjectArtifact>
+            <outputFileNameMapping>org/apache/karaf/jaas/${artifact.artifactId}/${artifact.baseVersion}/${artifact.artifactId}-${artifact.baseVersion}${dashClassifier?}.${artifact.extension}</outputFileNameMapping>
+            <includes>
+                <include>org.apache.karaf.jaas:org.apache.karaf.jaas.config</include>
+                <include>org.apache.karaf.jaas:org.apache.karaf.jaas.modules</include>
+            </includes>
+        </dependencySet>
+        <dependencySet>
+            <outputDirectory>/system</outputDirectory>
+            <unpack>false</unpack>
+            <useProjectArtifact>false</useProjectArtifact>
+            <outputFileNameMapping>org/apache/sshd/${artifact.artifactId}/${artifact.baseVersion}/${artifact.artifactId}-${artifact.baseVersion}${dashClassifier?}.${artifact.extension}</outputFileNameMapping>
+            <includes>
+                <include>org.apache.sshd:sshd-core</include>
+            </includes>
+        </dependencySet>
+        <dependencySet>
+            <outputDirectory>/system</outputDirectory>
+            <unpack>false</unpack>
+            <useProjectArtifact>false</useProjectArtifact>
+            <outputFileNameMapping>org/eclipse/${artifact.artifactId}/${artifact.baseVersion}/${artifact.artifactId}-${artifact.baseVersion}${dashClassifier?}.${artifact.extension}</outputFileNameMapping>
+            <includes>
+                <include>org.eclipse:osgi</include>
+            </includes>
+        </dependencySet>
+        <dependencySet>
+            <outputDirectory>/system</outputDirectory>
+            <unpack>false</unpack>
+            <useProjectArtifact>false</useProjectArtifact>
+            <outputFileNameMapping>org/apache/aries/blueprint/${artifact.artifactId}/${artifact.baseVersion}/${artifact.artifactId}-${artifact.baseVersion}${dashClassifier?}.${artifact.extension}</outputFileNameMapping>
+            <includes>
+                <include>org.apache.aries.blueprint:org.apache.aries.blueprint</include>
+            </includes>
+        </dependencySet>
+        <dependencySet>
+            <outputDirectory>/system</outputDirectory>
+            <unpack>false</unpack>
+            <useProjectArtifact>false</useProjectArtifact>
+            <outputFileNameMapping>org/apache/aries/jmx/${artifact.artifactId}/${artifact.baseVersion}/${artifact.artifactId}-${artifact.baseVersion}${dashClassifier?}.${artifact.extension}</outputFileNameMapping>
+            <includes>
+                <include>org.apache.aries.jmx:org.apache.aries.jmx</include>
+                <include>org.apache.aries.jmx:org.apache.aries.jmx.blueprint</include>
+            </includes>
+        </dependencySet>
+
+    </dependencySets>
+
+</assembly>
Index: assembly/src/main/descriptors/unix-bin.xml
===================================================================
--- assembly/src/main/descriptors/unix-bin.xml	(revision 967008)
+++ assembly/src/main/descriptors/unix-bin.xml	(working copy)
@@ -38,12 +38,12 @@
             <directory>src/main/distribution/text</directory>
             <outputDirectory>/</outputDirectory>
             <lineEnding>unix</lineEnding>
-        </fileSet>        
+        </fileSet>
         <fileSet>
             <directory>src/main/distribution/unix-text</directory>
             <outputDirectory>/</outputDirectory>
             <lineEnding>unix</lineEnding>
-        </fileSet>        
+        </fileSet>
         <fileSet>
             <directory>target/classes/bin</directory>
             <outputDirectory>/bin/</outputDirectory>
@@ -58,7 +58,6 @@
             <outputDirectory>/etc/</outputDirectory>
             <lineEnding>unix</lineEnding>
         </fileSet>
-
         <!-- Copy over the examples -->
         <fileSet>
             <directory>target/classes/demos</directory>
Index: assembly/src/main/descriptors/unix-minimal-bin.xml
===================================================================
--- assembly/src/main/descriptors/unix-minimal-bin.xml	(revision 0)
+++ assembly/src/main/descriptors/unix-minimal-bin.xml	(revision 0)
@@ -0,0 +1,285 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+<assembly xmlns='http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.1'
+          xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'
+          xsi:schemaLocation='http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.1 http://maven.apache.org/xsd/assembly-1.1.1.xsd'>
+    <id>minimal</id> <!-- Used as artifact discriminator -->
+    <formats>
+        <format>tar.gz</format>
+    </formats>
+    <fileSets>
+
+        <!-- Copy license and other files from root -->
+        <fileSet>
+            <directory>..</directory>
+            <outputDirectory>/</outputDirectory>
+            <includes>
+                <include>README</include>
+                <include>RELEASE*</include>
+            </includes>
+            <lineEnding>unix</lineEnding>
+        </fileSet>
+
+        <!-- Copy over everything that needs to get unix line endings -->
+        <fileSet>
+            <directory>src/main/distribution/text</directory>
+            <outputDirectory>/</outputDirectory>
+            <lineEnding>unix</lineEnding>
+        </fileSet>
+        <fileSet>
+            <directory>src/main/distribution/unix-text</directory>
+            <outputDirectory>/</outputDirectory>
+            <lineEnding>unix</lineEnding>
+        </fileSet>
+        <fileSet>
+            <directory>target/classes/bin</directory>
+            <outputDirectory>/bin/</outputDirectory>
+            <lineEnding>unix</lineEnding>
+            <fileMode>0755</fileMode>
+            <includes>
+                <include>admin</include>
+            </includes>
+        </fileSet>
+        <fileSet>
+            <directory>target/classes/etc</directory>
+            <excludes>
+                <exclude>org.apache.karaf.features.cfg</exclude>
+                <exclude>startup.properties</exclude>
+            </excludes>
+            <outputDirectory>/etc/</outputDirectory>
+            <lineEnding>unix</lineEnding>
+        </fileSet>
+        
+        <fileSet>
+            <directory>target/classes/minimal</directory>
+            <outputDirectory>/etc/</outputDirectory>
+            <lineEnding>unix</lineEnding>
+        </fileSet>
+
+
+        <!-- Copy over the examples -->
+        <fileSet>
+            <directory>target/classes/demos</directory>
+            <outputDirectory>/demos/</outputDirectory>
+            <lineEnding>unix</lineEnding>
+        </fileSet>
+        <fileSet>
+            <directory>../demos</directory>
+            <outputDirectory>/demos/</outputDirectory>
+            <lineEnding>unix</lineEnding>
+            <excludes>
+                <exclude>**/target/**</exclude>
+            </excludes>
+        </fileSet>
+
+        <!-- Copy over files that should not get the line endings converted -->
+        <fileSet>
+            <directory>src/main/distribution/binary</directory>
+            <outputDirectory>/</outputDirectory>
+        </fileSet>
+
+        <!-- Copy over the files that should not get the line endings converted but need to be chmod to 755 -->
+        <fileSet>
+            <directory>src/main/distribution/unix-binary</directory>
+            <outputDirectory>/</outputDirectory>
+            <fileMode>0755</fileMode>
+        </fileSet>
+
+        <!-- Copy over the files that need unix line endings and also chmod to 755 -->
+        <fileSet>
+            <directory>src/main/distribution/unix-shell</directory>
+            <outputDirectory>/</outputDirectory>
+            <lineEnding>unix</lineEnding>
+            <fileMode>0755</fileMode>
+        </fileSet>
+
+        <!-- Copy over jar files -->
+        <fileSet>
+            <directory>target/dependencies</directory>
+            <outputDirectory>/</outputDirectory>
+        </fileSet>
+
+    </fileSets>
+
+    <files>
+        <file>
+            <source>${basedir}/../LICENSE</source>
+            <outputDirectory>/</outputDirectory>
+            <destName>LICENSE</destName>
+            <fileMode>0644</fileMode>
+            <lineEnding>unix</lineEnding>
+        </file>
+        <file>
+            <source>${basedir}/NOTICE</source>
+            <outputDirectory>/</outputDirectory>
+            <destName>NOTICE</destName>
+            <fileMode>0644</fileMode>
+            <lineEnding>unix</lineEnding>
+        </file>
+        <file>
+            <source>${basedir}/target/classes/features.xml</source>
+            <outputDirectory>/system/org/apache/karaf/apache-karaf/${project.version}</outputDirectory>
+            <destName>apache-karaf-${project.version}-features.xml</destName>
+            <fileMode>0644</fileMode>
+            <lineEnding>unix</lineEnding>
+        </file>
+    </files>
+
+    <dependencySets>
+        <dependencySet>
+            <outputDirectory>/lib/endorsed</outputDirectory>
+            <unpack>false</unpack>
+            <useProjectArtifact>false</useProjectArtifact>
+            <includes>
+                <include>org.apache.karaf:org.apache.karaf.exception</include>
+            </includes>
+        </dependencySet>
+
+        <dependencySet>
+            <outputDirectory>/system</outputDirectory>
+            <unpack>false</unpack>
+            <useProjectArtifact>false</useProjectArtifact>
+            <outputFileNameMapping>org/apache/felix/${artifact.artifactId}/${artifact.baseVersion}/${artifact.artifactId}-${artifact.baseVersion}${dashClassifier?}.${artifact.extension}</outputFileNameMapping>
+            <includes>
+                <include>org.apache.felix:org.apache.felix.configadmin</include>
+                <include>org.apache.felix:org.apache.felix.framework</include>
+                <include>org.apache.felix:org.apache.felix.fileinstall</include>
+            </includes>
+        </dependencySet>
+        <dependencySet>
+            <outputDirectory>/system</outputDirectory>
+            <unpack>false</unpack>
+            <useProjectArtifact>false</useProjectArtifact>
+            <outputFileNameMapping>org/apache/felix/gogo/${artifact.artifactId}/${artifact.baseVersion}/${artifact.artifactId}-${artifact.baseVersion}${dashClassifier?}.${artifact.extension}</outputFileNameMapping>
+            <includes>
+                <include>org.apache.felix.gogo:org.apache.felix.gogo.runtime</include>
+            </includes>
+        </dependencySet>
+        <dependencySet>
+            <outputDirectory>/system</outputDirectory>
+            <unpack>false</unpack>
+            <useProjectArtifact>false</useProjectArtifact>
+            <outputFileNameMapping>org/apache/felix/${artifact.artifactId}/${artifact.baseVersion}/${artifact.artifactId}-${artifact.baseVersion}${dashClassifier?}.${artifact.extension}</outputFileNameMapping>
+            <includes>
+                <include>org.apache.felix:org.apache.felix.metatype</include>
+            </includes>
+        </dependencySet>
+        <dependencySet>
+            <outputDirectory>/system</outputDirectory>
+            <unpack>false</unpack>
+            <useProjectArtifact>false</useProjectArtifact>
+            <outputFileNameMapping>org/apache/felix/${artifact.artifactId}/${artifact.baseVersion}/${artifact.artifactId}-${artifact.baseVersion}${dashClassifier?}.${artifact.extension}</outputFileNameMapping>
+            <includes>
+                <include>org.apache.felix:org.apache.felix.webconsole</include>
+            </includes>
+        </dependencySet>
+        <dependencySet>
+            <outputDirectory>/system</outputDirectory>
+            <unpack>false</unpack>
+            <useProjectArtifact>false</useProjectArtifact>
+            <outputFileNameMapping>org/ops4j/pax/logging/${artifact.artifactId}/${artifact.baseVersion}/${artifact.artifactId}-${artifact.baseVersion}${dashClassifier?}.${artifact.extension}</outputFileNameMapping>
+            <includes>
+                <include>org.ops4j.pax.logging:pax-logging-api</include>
+                <include>org.ops4j.pax.logging:pax-logging-service</include>
+            </includes>
+        </dependencySet>
+        <dependencySet>
+            <outputDirectory>/system</outputDirectory>
+            <unpack>false</unpack>
+            <useProjectArtifact>false</useProjectArtifact>
+            <outputFileNameMapping>org/ops4j/pax/url/${artifact.artifactId}/${artifact.baseVersion}/${artifact.artifactId}-${artifact.baseVersion}${dashClassifier?}.${artifact.extension}</outputFileNameMapping>
+            <includes>
+                <include>org.ops4j.pax.url:pax-url-mvn</include>
+                <include>org.ops4j.pax.url:pax-url-wrap</include>
+            </includes>
+        </dependencySet>
+        <dependencySet>
+            <outputDirectory>/system</outputDirectory>
+            <unpack>false</unpack>
+            <useProjectArtifact>false</useProjectArtifact>
+            <outputFileNameMapping>org/apache/karaf/${artifact.artifactId}/${artifact.baseVersion}/${artifact.artifactId}-${artifact.baseVersion}${dashClassifier?}.${artifact.extension}</outputFileNameMapping>
+            <includes>
+                <include>org.apache.karaf:org.apache.karaf.management</include>
+            </includes>
+        </dependencySet>
+        <dependencySet>
+            <outputDirectory>/system</outputDirectory>
+            <unpack>false</unpack>
+            <useProjectArtifact>false</useProjectArtifact>
+            <outputFileNameMapping>org/apache/karaf/features/${artifact.artifactId}/${artifact.baseVersion}/${artifact.artifactId}-${artifact.baseVersion}${dashClassifier?}.${artifact.extension}</outputFileNameMapping>
+            <includes>
+                <include>org.apache.karaf.features:org.apache.karaf.features.core</include>
+                <include>org.apache.karaf.features:org.apache.karaf.features.command</include>
+                <include>org.apache.karaf.features:org.apache.karaf.features.management</include>
+            </includes>
+        </dependencySet>
+        <dependencySet>
+            <outputDirectory>/system</outputDirectory>
+            <unpack>false</unpack>
+            <useProjectArtifact>false</useProjectArtifact>
+            <outputFileNameMapping>org/apache/karaf/shell/${artifact.artifactId}/${artifact.baseVersion}/${artifact.artifactId}-${artifact.baseVersion}${dashClassifier?}.${artifact.extension}</outputFileNameMapping>
+            <includes>
+                <include>org.apache.karaf.shell:org.apache.karaf.shell.console</include>
+                <include>org.apache.karaf.shell:org.apache.karaf.shell.dev</include>
+                <include>org.apache.karaf.shell:org.apache.karaf.shell.osgi</include>
+                <include>org.apache.karaf.shell:org.apache.karaf.shell.log</include>
+                <include>org.apache.karaf.shell:org.apache.karaf.shell.config</include>
+                <include>org.apache.karaf.shell:org.apache.karaf.shell.packages</include>
+                <include>org.apache.karaf.shell:org.apache.karaf.shell.commands</include>
+            </includes>
+        </dependencySet>
+        <dependencySet>
+            <outputDirectory>/system</outputDirectory>
+            <unpack>false</unpack>
+            <useProjectArtifact>false</useProjectArtifact>
+            <outputFileNameMapping>org/apache/karaf/jaas/${artifact.artifactId}/${artifact.baseVersion}/${artifact.artifactId}-${artifact.baseVersion}${dashClassifier?}.${artifact.extension}</outputFileNameMapping>
+            <includes>
+                <include>org.apache.karaf.jaas:org.apache.karaf.jaas.config</include>
+                <include>org.apache.karaf.jaas:org.apache.karaf.jaas.modules</include>
+            </includes>
+        </dependencySet>
+        <dependencySet>
+            <outputDirectory>/system</outputDirectory>
+            <unpack>false</unpack>
+            <useProjectArtifact>false</useProjectArtifact>
+            <outputFileNameMapping>org/eclipse/${artifact.artifactId}/${artifact.baseVersion}/${artifact.artifactId}-${artifact.baseVersion}${dashClassifier?}.${artifact.extension}</outputFileNameMapping>
+            <includes>
+                <include>org.eclipse:osgi</include>
+            </includes>
+        </dependencySet>
+        <dependencySet>
+            <outputDirectory>/system</outputDirectory>
+            <unpack>false</unpack>
+            <useProjectArtifact>false</useProjectArtifact>
+            <outputFileNameMapping>org/apache/aries/blueprint/${artifact.artifactId}/${artifact.baseVersion}/${artifact.artifactId}-${artifact.baseVersion}${dashClassifier?}.${artifact.extension}</outputFileNameMapping>
+            <includes>
+                <include>org.apache.aries.blueprint:org.apache.aries.blueprint</include>
+            </includes>
+        </dependencySet>
+        <dependencySet>
+            <outputDirectory>/system</outputDirectory>
+            <unpack>false</unpack>
+            <useProjectArtifact>false</useProjectArtifact>
+            <outputFileNameMapping>org/apache/aries/jmx/${artifact.artifactId}/${artifact.baseVersion}/${artifact.artifactId}-${artifact.baseVersion}${dashClassifier?}.${artifact.extension}</outputFileNameMapping>
+            <includes>
+                <include>org.apache.aries.jmx:org.apache.aries.jmx</include>
+                <include>org.apache.aries.jmx:org.apache.aries.jmx.blueprint</include>
+            </includes>
+        </dependencySet>
+    </dependencySets>
+</assembly>
Index: assembly/src/main/filtered-resources/minimal/org.apache.karaf.features.cfg
===================================================================
--- assembly/src/main/filtered-resources/minimal/org.apache.karaf.features.cfg	(revision 0)
+++ assembly/src/main/filtered-resources/minimal/org.apache.karaf.features.cfg	(revision 0)
@@ -0,0 +1,28 @@
+################################################################################
+#
+#    Licensed to the Apache Software Foundation (ASF) under one or more
+#    contributor license agreements.  See the NOTICE file distributed with
+#    this work for additional information regarding copyright ownership.
+#    The ASF licenses this file to You under the Apache License, Version 2.0
+#    (the "License"); you may not use this file except in compliance with
+#    the License.  You may obtain a copy of the License at
+#
+#       http://www.apache.org/licenses/LICENSE-2.0
+#
+#    Unless required by applicable law or agreed to in writing, software
+#    distributed under the License is distributed on an "AS IS" BASIS,
+#    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#    See the License for the specific language governing permissions and
+#    limitations under the License.
+#
+################################################################################
+
+#
+# Comma separated list of features repositories to register by default
+#
+featuresRepositories=mvn:org.apache.karaf/apache-karaf/${project.version}/xml/features
+
+#
+# Comma separated list of features to install at startup
+#
+featuresBoot=management
Index: assembly/src/main/filtered-resources/minimal/startup.properties
===================================================================
--- assembly/src/main/filtered-resources/minimal/startup.properties	(revision 0)
+++ assembly/src/main/filtered-resources/minimal/startup.properties	(revision 0)
@@ -0,0 +1,54 @@
+################################################################################
+#
+#    Licensed to the Apache Software Foundation (ASF) under one or more
+#    contributor license agreements.  See the NOTICE file distributed with
+#    this work for additional information regarding copyright ownership.
+#    The ASF licenses this file to You under the Apache License, Version 2.0
+#    (the "License"); you may not use this file except in compliance with
+#    the License.  You may obtain a copy of the License at
+#
+#       http://www.apache.org/licenses/LICENSE-2.0
+#
+#    Unless required by applicable law or agreed to in writing, software
+#    distributed under the License is distributed on an "AS IS" BASIS,
+#    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#    See the License for the specific language governing permissions and
+#    limitations under the License.
+#
+################################################################################
+
+# This file allows you to control the start level of each bundle.
+#
+
+#
+# Startup core services like logging
+#
+org/ops4j/pax/url/pax-url-mvn/${pax.url.version}/pax-url-mvn-${pax.url.version}.jar=5
+org/ops4j/pax/url/pax-url-wrap/${pax.url.version}/pax-url-wrap-${pax.url.version}.jar=5
+org/ops4j/pax/logging/pax-logging-api/${pax.logging.version}/pax-logging-api-${pax.logging.version}.jar=8
+org/ops4j/pax/logging/pax-logging-service/${pax.logging.version}/pax-logging-service-${pax.logging.version}.jar=8
+org/apache/felix/org.apache.felix.configadmin/${felix.configadmin.version}/org.apache.felix.configadmin-${felix.configadmin.version}.jar=10
+org/apache/felix/org.apache.felix.fileinstall/${felix.fileinstall.version}/org.apache.felix.fileinstall-${felix.fileinstall.version}.jar=11
+
+#
+# The rest of the services..
+#
+org/apache/aries/blueprint/org.apache.aries.blueprint/${aries.blueprint.version}/org.apache.aries.blueprint-${aries.blueprint.version}.jar=20
+
+org/apache/felix/gogo/org.apache.felix.gogo.runtime/${felix.gogo.version}/org.apache.felix.gogo.runtime-${felix.gogo.version}.jar=30
+org/apache/karaf/shell/org.apache.karaf.shell.console/${project.version}/org.apache.karaf.shell.console-${project.version}.jar=30
+org/apache/karaf/shell/org.apache.karaf.shell.osgi/${project.version}/org.apache.karaf.shell.osgi-${project.version}.jar=30
+org/apache/karaf/shell/org.apache.karaf.shell.log/${project.version}/org.apache.karaf.shell.log-${project.version}.jar=30
+org/apache/karaf/shell/org.apache.karaf.shell.config/${project.version}/org.apache.karaf.shell.config-${project.version}.jar=30
+org/apache/karaf/shell/org.apache.karaf.shell.packages/${project.version}/org.apache.karaf.shell.packages-${project.version}.jar=30
+org/apache/karaf/shell/org.apache.karaf.shell.commands/${project.version}/org.apache.karaf.shell.commands-${project.version}.jar=30
+org/apache/karaf/shell/org.apache.karaf.shell.dev/${project.version}/org.apache.karaf.shell.dev-${project.version}.jar=30
+org/apache/karaf/jaas/org.apache.karaf.jaas.config/${project.version}/org.apache.karaf.jaas.config-${project.version}.jar=30
+org/apache/karaf/jaas/org.apache.karaf.jaas.modules/${project.version}/org.apache.karaf.jaas.modules-${project.version}.jar=30
+org/apache/karaf/features/org.apache.karaf.features.core/${project.version}/org.apache.karaf.features.core-${project.version}.jar=30
+org/apache/karaf/features/org.apache.karaf.features.command/${project.version}/org.apache.karaf.features.command-${project.version}.jar=30
+org/apache/karaf/features/org.apache.karaf.features.management/${project.version}/org.apache.karaf.features.management-${project.version}.jar=30
+
+org/apache/karaf/org.apache.karaf.management/${project.version}/org.apache.karaf.management-${project.version}.jar=30
+org/apache/aries/jmx/org.apache.aries.jmx/${aries.jmx.version}/org.apache.aries.jmx-${aries.jmx.version}.jar=30
+org/apache/aries/jmx/org.apache.aries.jmx.blueprint/${aries.jmx.version}/org.apache.aries.jmx.blueprint-${aries.jmx.version}.jar=30
\ No newline at end of file
Index: assembly/src/main/filtered-resources/etc/startup.properties
===================================================================
--- assembly/src/main/filtered-resources/etc/startup.properties	(revision 967008)
+++ assembly/src/main/filtered-resources/etc/startup.properties	(working copy)
@@ -37,9 +37,6 @@
 
 org/apache/felix/gogo/org.apache.felix.gogo.runtime/${felix.gogo.version}/org.apache.felix.gogo.runtime-${felix.gogo.version}.jar=30
 org/apache/karaf/shell/org.apache.karaf.shell.console/${project.version}/org.apache.karaf.shell.console-${project.version}.jar=30
-org/apache/karaf/deployer/org.apache.karaf.deployer.spring/${project.version}/org.apache.karaf.deployer.spring-${project.version}.jar=30
-org/apache/karaf/deployer/org.apache.karaf.deployer.blueprint/${project.version}/org.apache.karaf.deployer.blueprint-${project.version}.jar=30
-org/apache/karaf/deployer/org.apache.karaf.deployer.features/${project.version}/org.apache.karaf.deployer.features-${project.version}.jar=30
 org/apache/karaf/shell/org.apache.karaf.shell.osgi/${project.version}/org.apache.karaf.shell.osgi-${project.version}.jar=30
 org/apache/karaf/shell/org.apache.karaf.shell.log/${project.version}/org.apache.karaf.shell.log-${project.version}.jar=30
 org/apache/karaf/shell/org.apache.karaf.shell.config/${project.version}/org.apache.karaf.shell.config-${project.version}.jar=30
@@ -48,9 +45,6 @@
 org/apache/karaf/shell/org.apache.karaf.shell.dev/${project.version}/org.apache.karaf.shell.dev-${project.version}.jar=30
 org/apache/karaf/jaas/org.apache.karaf.jaas.config/${project.version}/org.apache.karaf.jaas.config-${project.version}.jar=30
 org/apache/karaf/jaas/org.apache.karaf.jaas.modules/${project.version}/org.apache.karaf.jaas.modules-${project.version}.jar=30
-org/apache/karaf/admin/org.apache.karaf.admin.core/${project.version}/org.apache.karaf.admin.core-${project.version}.jar=30
-org/apache/karaf/admin/org.apache.karaf.admin.command/${project.version}/org.apache.karaf.admin.command-${project.version}.jar=30
-org/apache/karaf/admin/org.apache.karaf.admin.management/${project.version}/org.apache.karaf.admin.management-${project.version}.jar=30
 org/apache/karaf/features/org.apache.karaf.features.core/${project.version}/org.apache.karaf.features.core-${project.version}.jar=30
 org/apache/karaf/features/org.apache.karaf.features.command/${project.version}/org.apache.karaf.features.command-${project.version}.jar=30
 org/apache/karaf/features/org.apache.karaf.features.management/${project.version}/org.apache.karaf.features.management-${project.version}.jar=30
@@ -59,6 +53,14 @@
 org/apache/aries/jmx/org.apache.aries.jmx/${aries.jmx.version}/org.apache.aries.jmx-${aries.jmx.version}.jar=30
 org/apache/aries/jmx/org.apache.aries.jmx.blueprint/${aries.jmx.version}/org.apache.aries.jmx.blueprint-${aries.jmx.version}.jar=30
 
+org/apache/karaf/admin/org.apache.karaf.admin.core/${project.version}/org.apache.karaf.admin.core-${project.version}.jar=30
+org/apache/karaf/admin/org.apache.karaf.admin.command/${project.version}/org.apache.karaf.admin.command-${project.version}.jar=30
+org/apache/karaf/admin/org.apache.karaf.admin.management/${project.version}/org.apache.karaf.admin.management-${project.version}.jar=30
+
 org/apache/mina/mina-core/${mina.version}/mina-core-${mina.version}.jar=30
 org/apache/sshd/sshd-core/${sshd.version}/sshd-core-${sshd.version}.jar=30
 org/apache/karaf/shell/org.apache.karaf.shell.ssh/${project.version}/org.apache.karaf.shell.ssh-${project.version}.jar=30
+
+org/apache/karaf/deployer/org.apache.karaf.deployer.spring/${project.version}/org.apache.karaf.deployer.spring-${project.version}.jar=30
+org/apache/karaf/deployer/org.apache.karaf.deployer.blueprint/${project.version}/org.apache.karaf.deployer.blueprint-${project.version}.jar=30
+org/apache/karaf/deployer/org.apache.karaf.deployer.features/${project.version}/org.apache.karaf.deployer.features-${project.version}.jar=30
Index: assembly/src/main/filtered-resources/features.xml
===================================================================
--- assembly/src/main/filtered-resources/features.xml	(revision 967008)
+++ assembly/src/main/filtered-resources/features.xml	(working copy)
@@ -17,77 +17,87 @@
       limitations under the License.
 -->
 <features name="karaf-${project.version}">
-    <feature name="spring" version="${spring.version}">
-        <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.aopalliance/${aopalliance.version}</bundle>
-        <bundle>mvn:org.springframework/spring-core/${spring.version}</bundle>
-        <bundle>mvn:org.springframework/spring-asm/${spring.version}</bundle>
-        <bundle>mvn:org.springframework/spring-expression/${spring.version}</bundle>
-        <bundle>mvn:org.springframework/spring-beans/${spring.version}</bundle>
-        <bundle>mvn:org.springframework/spring-aop/${spring.version}</bundle>
-        <bundle>mvn:org.springframework/spring-context/${spring.version}</bundle>
-        <bundle>mvn:org.springframework/spring-context-support/${spring.version}</bundle>
-    </feature>
-    <feature name="spring-dm" version="${spring.osgi.version}">
-        <feature version="${spring.version}">spring</feature>
-        <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.cglib/${cglib.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>
-        <bundle>mvn:org.springframework.osgi/spring-osgi-extender/${spring.osgi.version}</bundle>
-        <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="wrapper" version="${project.version}">
-        <bundle>mvn:org.apache.karaf.shell/org.apache.karaf.shell.wrapper/${project.version}</bundle>
-    </feature>
-    <feature name="obr" version="${project.version}">
-        <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>
-    </feature>
-    <feature name="http" version="${project.version}">
-        <config name="org.ops4j.pax.web">
+	<feature name="spring" version="${spring.version}">
+		<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.aopalliance/${aopalliance.version}</bundle>
+		<bundle>mvn:org.springframework/spring-core/${spring.version}</bundle>
+		<bundle>mvn:org.springframework/spring-asm/${spring.version}</bundle>
+		<bundle>mvn:org.springframework/spring-expression/${spring.version}</bundle>
+		<bundle>mvn:org.springframework/spring-beans/${spring.version}</bundle>
+		<bundle>mvn:org.springframework/spring-aop/${spring.version}</bundle>
+		<bundle>mvn:org.springframework/spring-context/${spring.version}</bundle>
+		<bundle>mvn:org.springframework/spring-context-support/${spring.version}</bundle>
+	</feature>
+	<feature name="spring-dm" version="${spring.osgi.version}">
+		<feature version="${spring.version}">spring</feature>
+		<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.cglib/${cglib.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>
+		<bundle>mvn:org.springframework.osgi/spring-osgi-extender/${spring.osgi.version}</bundle>
+		<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="wrapper" version="${project.version}">
+		<bundle>mvn:org.apache.karaf.shell/org.apache.karaf.shell.wrapper/${project.version}</bundle>
+	</feature>
+	<feature name="obr" version="${project.version}">
+		<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>
+	</feature>
+	<feature name="http" version="${project.version}">
+		<config name="org.ops4j.pax.web">
             org.osgi.service.http.port=8181
-        </config>
-        <bundle>mvn:org.apache.geronimo.specs/geronimo-servlet_2.5_spec/${geronimo.servlet.version}</bundle>
-        <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jetty-bundle/${jetty.bundle.version}</bundle>
-        <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>
-    </feature>
-    <feature name="war" version="${project.version}">
-        <feature version="${project.version}">http</feature>
-        <bundle>mvn:org.ops4j.pax.web/pax-web-jsp/${pax.web.version}</bundle>
-        <bundle>mvn:org.ops4j.pax.web/pax-web-extender-war/${pax.web.version}</bundle>
-        <bundle>mvn:org.ops4j.pax.web/pax-web-extender-whiteboard/${pax.web.version}</bundle>
-        <bundle>mvn:org.ops4j.pax.url/pax-url-war/${pax.url.version}</bundle>
-        <bundle>mvn:org.apache.karaf.deployer/org.apache.karaf.deployer.war/${project.version}</bundle>
-    </feature>
-    <feature name="webconsole" version="${project.version}">
-        <feature version="${project.version}">http</feature>
-        <config name="org.apache.karaf.webconsole">
+		</config>
+		<bundle>mvn:org.apache.geronimo.specs/geronimo-servlet_2.5_spec/${geronimo.servlet.version}</bundle>
+		<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jetty-bundle/${jetty.bundle.version}</bundle>
+		<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>
+	</feature>
+	<feature name="war" version="${project.version}">
+		<feature version="${project.version}">http</feature>
+		<bundle>mvn:org.ops4j.pax.web/pax-web-jsp/${pax.web.version}</bundle>
+		<bundle>mvn:org.ops4j.pax.web/pax-web-extender-war/${pax.web.version}</bundle>
+		<bundle>mvn:org.ops4j.pax.web/pax-web-extender-whiteboard/${pax.web.version}</bundle>
+		<bundle>mvn:org.ops4j.pax.url/pax-url-war/${pax.url.version}</bundle>
+		<bundle>mvn:org.apache.karaf.deployer/org.apache.karaf.deployer.war/${project.version}</bundle>
+	</feature>
+	<feature name="webconsole" version="${project.version}">
+		<feature version="${project.version}">http</feature>
+		<config name="org.apache.karaf.webconsole">
             realm=karaf
-        </config>
-        <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.felix/org.apache.felix.webconsole/${felix.webconsole.version}</bundle>
-        <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>
-    </feature>
-    <feature name="ssh" version="${project.version}">
-        <config name="org.apache.karaf.shell.ssh">
+		</config>
+		<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.felix/org.apache.felix.webconsole/${felix.webconsole.version}</bundle>
+		<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>
+	</feature>
+	<feature name="ssh" version="${project.version}">
+		<config name="org.apache.karaf.shell.ssh">
             sshPort=8101
             sshHost=0.0.0.0
             sshRealm=karaf
-        </config>
-        <bundle>mvn:org.apache.mina/mina-core/${mina.version}</bundle>
-        <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}">
-        <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>
+		</config>
+		<bundle>mvn:org.apache.mina/mina-core/${mina.version}</bundle>
+		<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}">
+		<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="administration" version="${project.version}">
+		<bundle>mvn:org.apache.karaf.admin/org.apache.karaf.admin.core/${project.version}</bundle>
+		<bundle>mvn:org.apache.karaf.admin/org.apache.karaf.admin.command/${project.version}</bundle>
+		<bundle>mvn:org.apache.karaf.admin/org.apache.karaf.admin.management/${project.version}</bundle>
+	</feature>
+	<feature name="deployer" version="${project.version}">
+		<bundle>mvn:org.apache.karaf.deployer/org.apache.karaf.deployer.spring/${project.version}</bundle>
+		<bundle>mvn:org.apache.karaf.deployer/org.apache.karaf.deployer.blueprint/${project.version}</bundle>
+		<bundle>mvn:org.apache.karaf.deployer/org.apache.karaf.deployer.features/${project.version}</bundle>
+	</feature>
 </features>
Index: assembly/pom.xml
===================================================================
--- assembly/pom.xml	(revision 967008)
+++ assembly/pom.xml	(working copy)
@@ -1,3 +1,4 @@
+
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 
     <!--
@@ -138,7 +139,7 @@
         <dependency>
             <groupId>org.apache.karaf.shell</groupId>
             <artifactId>org.apache.karaf.shell.dev</artifactId>
-        </dependency>      
+        </dependency>
         <dependency>
             <groupId>org.apache.karaf.jaas</groupId>
             <artifactId>org.apache.karaf.jaas.boot</artifactId>
@@ -425,6 +426,20 @@
                         <phase>none</phase>
                     </execution>
                     <execution>
+                        <id>unix-minimal-bin</id>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>single</goal>
+                        </goals>
+                        <configuration>
+                            <descriptors>
+                                <descriptor>src/main/descriptors/unix-minimal-bin.xml</descriptor>
+                            </descriptors>
+                            <finalName>${project.artifactId}-minimal-${project.version}</finalName>
+                            <tarLongFileMode>gnu</tarLongFileMode>
+                        </configuration>
+                    </execution>
+                    <execution>
                         <id>unix-bin</id>
                         <phase>package</phase>
                         <goals>
@@ -439,6 +454,21 @@
                         </configuration>
                     </execution>
                     <execution>
+                        <id>windows-minimal-bin</id>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>single</goal>
+                        </goals>
+                        <configuration>
+                            <descriptors>
+                                <descriptor>src/main/descriptors/windows-minimal-bin.xml</descriptor>
+                            </descriptors>
+                            <finalName>${project.artifactId}-minimal-${project.version}</finalName>
+                            <appendAssemblyId>true</appendAssemblyId>
+                            <assemblyId />
+                        </configuration>
+                    </execution>
+                    <execution>
                         <id>windows-bin</id>
                         <phase>package</phase>
                         <goals>