You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@karaf.apache.org by gn...@apache.org on 2011/02/04 20:29:35 UTC

svn commit: r1067265 [1/2] - in /karaf/branches/karaf-2.2.x: ./ assemblies/ assemblies/apache-karaf/ assemblies/apache-karaf/src/ assemblies/apache-karaf/src/main/ assemblies/apache-karaf/src/main/descriptors/ assemblies/apache-karaf/src/main/distribut...

Author: gnodet
Date: Fri Feb  4 19:29:31 2011
New Revision: 1067265

URL: http://svn.apache.org/viewvc?rev=1067265&view=rev
Log:
Refactor the assemblies and delete the ones using the various packagings provided in the maven plugin (defered to 3.0)

Added:
    karaf/branches/karaf-2.2.x/assemblies/apache-karaf/src/
    karaf/branches/karaf-2.2.x/assemblies/apache-karaf/src/main/
    karaf/branches/karaf-2.2.x/assemblies/apache-karaf/src/main/descriptors/
    karaf/branches/karaf-2.2.x/assemblies/apache-karaf/src/main/descriptors/unix-bin.xml
      - copied, changed from r1067262, karaf/branches/karaf-2.2.x/assembly/src/main/descriptors/unix-bin.xml
    karaf/branches/karaf-2.2.x/assemblies/apache-karaf/src/main/descriptors/unix-minimal-bin.xml
      - copied, changed from r1067262, karaf/branches/karaf-2.2.x/assembly/src/main/descriptors/unix-minimal-bin.xml
    karaf/branches/karaf-2.2.x/assemblies/apache-karaf/src/main/descriptors/unix-src.xml
      - copied, changed from r1067262, karaf/branches/karaf-2.2.x/features/assembly/framework/src/main/descriptors/unix-src.xml
    karaf/branches/karaf-2.2.x/assemblies/apache-karaf/src/main/descriptors/windows-bin.xml
      - copied, changed from r1067262, karaf/branches/karaf-2.2.x/assembly/src/main/descriptors/windows-bin.xml
    karaf/branches/karaf-2.2.x/assemblies/apache-karaf/src/main/descriptors/windows-minimal-bin.xml
      - copied, changed from r1067262, karaf/branches/karaf-2.2.x/assembly/src/main/descriptors/windows-minimal-bin.xml
    karaf/branches/karaf-2.2.x/assemblies/apache-karaf/src/main/descriptors/windows-src.xml
      - copied, changed from r1067262, karaf/branches/karaf-2.2.x/assembly/src/main/descriptors/windows-src.xml
    karaf/branches/karaf-2.2.x/assemblies/apache-karaf/src/main/distribution/
    karaf/branches/karaf-2.2.x/assemblies/apache-karaf/src/main/distribution/text/
    karaf/branches/karaf-2.2.x/assemblies/apache-karaf/src/main/distribution/text/deploy/
    karaf/branches/karaf-2.2.x/assemblies/apache-karaf/src/main/distribution/text/deploy/README
      - copied, changed from r1067262, karaf/branches/karaf-2.2.x/assembly/src/main/distribution/text/deploy/README
    karaf/branches/karaf-2.2.x/assemblies/apache-karaf/src/main/distribution/text/etc/
    karaf/branches/karaf-2.2.x/assemblies/apache-karaf/src/main/distribution/text/etc/java.util.logging.properties
      - copied, changed from r1067262, karaf/branches/karaf-2.2.x/assembly/src/main/distribution/text/etc/java.util.logging.properties
    karaf/branches/karaf-2.2.x/assemblies/apache-karaf/src/main/distribution/text/etc/org.apache.felix.fileinstall-deploy.cfg
      - copied, changed from r1067262, karaf/branches/karaf-2.2.x/assembly/src/main/distribution/text/etc/org.apache.felix.fileinstall-deploy.cfg
    karaf/branches/karaf-2.2.x/assemblies/apache-karaf/src/main/distribution/text/etc/org.apache.karaf.jaas.cfg
      - copied, changed from r1067262, karaf/branches/karaf-2.2.x/assembly/src/main/distribution/text/etc/org.apache.karaf.jaas.cfg
    karaf/branches/karaf-2.2.x/assemblies/apache-karaf/src/main/distribution/text/etc/org.apache.karaf.log.cfg
      - copied, changed from r1067262, karaf/branches/karaf-2.2.x/assembly/src/main/distribution/text/etc/org.apache.karaf.log.cfg
    karaf/branches/karaf-2.2.x/assemblies/apache-karaf/src/main/distribution/text/etc/org.apache.karaf.management.cfg
      - copied, changed from r1067262, karaf/branches/karaf-2.2.x/assembly/src/main/distribution/text/etc/org.apache.karaf.management.cfg
    karaf/branches/karaf-2.2.x/assemblies/apache-karaf/src/main/distribution/text/etc/org.apache.karaf.shell.cfg
      - copied, changed from r1067262, karaf/branches/karaf-2.2.x/assembly/src/main/distribution/text/etc/org.apache.karaf.shell.cfg
    karaf/branches/karaf-2.2.x/assemblies/apache-karaf/src/main/distribution/text/etc/org.ops4j.pax.logging.cfg
      - copied, changed from r1067262, karaf/branches/karaf-2.2.x/assembly/src/main/distribution/text/etc/org.ops4j.pax.logging.cfg
    karaf/branches/karaf-2.2.x/assemblies/apache-karaf/src/main/distribution/text/etc/org.ops4j.pax.url.mvn.cfg
      - copied, changed from r1067262, karaf/branches/karaf-2.2.x/assembly/src/main/distribution/text/etc/org.ops4j.pax.url.mvn.cfg
    karaf/branches/karaf-2.2.x/assemblies/apache-karaf/src/main/distribution/text/etc/shell.init.script
      - copied, changed from r1067262, karaf/branches/karaf-2.2.x/assembly/src/main/distribution/text/etc/shell.init.script
    karaf/branches/karaf-2.2.x/assemblies/apache-karaf/src/main/distribution/text/etc/system.properties
      - copied, changed from r1067262, karaf/branches/karaf-2.2.x/assembly/src/main/distribution/text/etc/system.properties
    karaf/branches/karaf-2.2.x/assemblies/apache-karaf/src/main/distribution/text/etc/users.properties
      - copied, changed from r1067262, karaf/branches/karaf-2.2.x/assembly/src/main/distribution/text/etc/users.properties
    karaf/branches/karaf-2.2.x/assemblies/apache-karaf/src/main/distribution/text/lib/
    karaf/branches/karaf-2.2.x/assemblies/apache-karaf/src/main/distribution/text/lib/README
      - copied, changed from r1067262, karaf/branches/karaf-2.2.x/assembly/src/main/distribution/text/lib/README
    karaf/branches/karaf-2.2.x/assemblies/apache-karaf/src/main/distribution/text/lib/endorsed/
    karaf/branches/karaf-2.2.x/assemblies/apache-karaf/src/main/distribution/text/lib/endorsed/README
      - copied, changed from r1067262, karaf/branches/karaf-2.2.x/assembly/src/main/distribution/text/lib/endorsed/README
    karaf/branches/karaf-2.2.x/assemblies/apache-karaf/src/main/distribution/text/lib/ext/
    karaf/branches/karaf-2.2.x/assemblies/apache-karaf/src/main/distribution/text/lib/ext/README
      - copied, changed from r1067262, karaf/branches/karaf-2.2.x/assembly/src/main/distribution/text/lib/ext/README
    karaf/branches/karaf-2.2.x/assemblies/apache-karaf/src/main/filtered-resources/
    karaf/branches/karaf-2.2.x/assemblies/apache-karaf/src/main/filtered-resources/demos/
    karaf/branches/karaf-2.2.x/assemblies/apache-karaf/src/main/filtered-resources/demos/web/
    karaf/branches/karaf-2.2.x/assemblies/apache-karaf/src/main/filtered-resources/demos/web/README.txt
      - copied, changed from r1067262, karaf/branches/karaf-2.2.x/assembly/src/main/filtered-resources/demos/web/README.txt
    karaf/branches/karaf-2.2.x/assemblies/apache-karaf/src/main/filtered-resources/etc/
    karaf/branches/karaf-2.2.x/assemblies/apache-karaf/src/main/filtered-resources/etc/config.properties
      - copied, changed from r1067262, karaf/branches/karaf-2.2.x/assembly/src/main/filtered-resources/etc/config.properties
    karaf/branches/karaf-2.2.x/assemblies/apache-karaf/src/main/filtered-resources/etc/custom.properties
      - copied, changed from r1067262, karaf/branches/karaf-2.2.x/assembly/src/main/filtered-resources/etc/custom.properties
    karaf/branches/karaf-2.2.x/assemblies/apache-karaf/src/main/filtered-resources/etc/jre.properties
      - copied, changed from r1067262, karaf/branches/karaf-2.2.x/assembly/src/main/filtered-resources/etc/jre.properties
    karaf/branches/karaf-2.2.x/assemblies/apache-karaf/src/main/filtered-resources/etc/org.apache.karaf.features.cfg
      - copied, changed from r1067262, karaf/branches/karaf-2.2.x/assembly/src/main/filtered-resources/etc/org.apache.karaf.features.cfg
    karaf/branches/karaf-2.2.x/assemblies/apache-karaf/src/main/filtered-resources/etc/startup.properties
      - copied, changed from r1067262, karaf/branches/karaf-2.2.x/assembly/src/main/filtered-resources/etc/startup.properties
    karaf/branches/karaf-2.2.x/assemblies/apache-karaf/src/main/filtered-resources/minimal/
    karaf/branches/karaf-2.2.x/assemblies/apache-karaf/src/main/filtered-resources/minimal/org.apache.karaf.features.cfg
      - copied, changed from r1067262, karaf/branches/karaf-2.2.x/assembly/src/main/filtered-resources/minimal/org.apache.karaf.features.cfg
    karaf/branches/karaf-2.2.x/assemblies/apache-karaf/src/main/filtered-resources/minimal/startup.properties
      - copied, changed from r1067262, karaf/branches/karaf-2.2.x/assembly/src/main/filtered-resources/minimal/startup.properties
    karaf/branches/karaf-2.2.x/assemblies/apache-karaf/src/main/resources/
    karaf/branches/karaf-2.2.x/assemblies/apache-karaf/src/main/resources/extra/
    karaf/branches/karaf-2.2.x/assemblies/apache-karaf/src/main/resources/extra/jetty.xml
      - copied, changed from r1067262, karaf/branches/karaf-2.2.x/assembly/src/main/resources/extra/jetty.xml
    karaf/branches/karaf-2.2.x/assemblies/features/
    karaf/branches/karaf-2.2.x/assemblies/features/enterprise/
    karaf/branches/karaf-2.2.x/assemblies/features/enterprise/pom.xml
      - copied, changed from r1067262, karaf/branches/karaf-2.2.x/features/assembly/enterprise/pom.xml
    karaf/branches/karaf-2.2.x/assemblies/features/enterprise/src/
    karaf/branches/karaf-2.2.x/assemblies/features/enterprise/src/main/
    karaf/branches/karaf-2.2.x/assemblies/features/enterprise/src/main/resources/
    karaf/branches/karaf-2.2.x/assemblies/features/enterprise/src/main/resources/features.xml
      - copied, changed from r1067262, karaf/branches/karaf-2.2.x/features/assembly/enterprise/src/main/resources/features.xml
    karaf/branches/karaf-2.2.x/assemblies/features/pom.xml
      - copied, changed from r1067262, karaf/branches/karaf-2.2.x/features/assembly/pom.xml
    karaf/branches/karaf-2.2.x/assemblies/features/standard/
    karaf/branches/karaf-2.2.x/assemblies/features/standard/pom.xml
      - copied, changed from r1067262, karaf/branches/karaf-2.2.x/features/assembly/standard/pom.xml
    karaf/branches/karaf-2.2.x/assemblies/features/standard/src/
    karaf/branches/karaf-2.2.x/assemblies/features/standard/src/main/
    karaf/branches/karaf-2.2.x/assemblies/features/standard/src/main/resources/
    karaf/branches/karaf-2.2.x/assemblies/features/standard/src/main/resources/features.xml
      - copied, changed from r1067262, karaf/branches/karaf-2.2.x/features/assembly/standard/src/main/resources/features.xml
Removed:
    karaf/branches/karaf-2.2.x/assembly/NOTICE
    karaf/branches/karaf-2.2.x/assembly/pom.xml
    karaf/branches/karaf-2.2.x/assembly/src/main/descriptors/unix-bin.xml
    karaf/branches/karaf-2.2.x/assembly/src/main/descriptors/unix-minimal-bin.xml
    karaf/branches/karaf-2.2.x/assembly/src/main/descriptors/unix-src.xml
    karaf/branches/karaf-2.2.x/assembly/src/main/descriptors/windows-bin.xml
    karaf/branches/karaf-2.2.x/assembly/src/main/descriptors/windows-minimal-bin.xml
    karaf/branches/karaf-2.2.x/assembly/src/main/descriptors/windows-src.xml
    karaf/branches/karaf-2.2.x/assembly/src/main/distribution/text/deploy/README
    karaf/branches/karaf-2.2.x/assembly/src/main/distribution/text/etc/java.util.logging.properties
    karaf/branches/karaf-2.2.x/assembly/src/main/distribution/text/etc/org.apache.felix.fileinstall-deploy.cfg
    karaf/branches/karaf-2.2.x/assembly/src/main/distribution/text/etc/org.apache.karaf.jaas.cfg
    karaf/branches/karaf-2.2.x/assembly/src/main/distribution/text/etc/org.apache.karaf.log.cfg
    karaf/branches/karaf-2.2.x/assembly/src/main/distribution/text/etc/org.apache.karaf.management.cfg
    karaf/branches/karaf-2.2.x/assembly/src/main/distribution/text/etc/org.apache.karaf.shell.cfg
    karaf/branches/karaf-2.2.x/assembly/src/main/distribution/text/etc/org.ops4j.pax.logging.cfg
    karaf/branches/karaf-2.2.x/assembly/src/main/distribution/text/etc/org.ops4j.pax.url.mvn.cfg
    karaf/branches/karaf-2.2.x/assembly/src/main/distribution/text/etc/shell.init.script
    karaf/branches/karaf-2.2.x/assembly/src/main/distribution/text/etc/system.properties
    karaf/branches/karaf-2.2.x/assembly/src/main/distribution/text/etc/users.properties
    karaf/branches/karaf-2.2.x/assembly/src/main/distribution/text/lib/README
    karaf/branches/karaf-2.2.x/assembly/src/main/distribution/text/lib/endorsed/README
    karaf/branches/karaf-2.2.x/assembly/src/main/distribution/text/lib/ext/README
    karaf/branches/karaf-2.2.x/assembly/src/main/distribution/unix-shell/bin/karaf
    karaf/branches/karaf-2.2.x/assembly/src/main/distribution/unix-shell/bin/start
    karaf/branches/karaf-2.2.x/assembly/src/main/distribution/unix-shell/bin/stop
    karaf/branches/karaf-2.2.x/assembly/src/main/distribution/windows-text/bin/karaf.bat
    karaf/branches/karaf-2.2.x/assembly/src/main/distribution/windows-text/bin/start.bat
    karaf/branches/karaf-2.2.x/assembly/src/main/distribution/windows-text/bin/stop.bat
    karaf/branches/karaf-2.2.x/assembly/src/main/filtered-resources/bin/admin
    karaf/branches/karaf-2.2.x/assembly/src/main/filtered-resources/bin/admin.bat
    karaf/branches/karaf-2.2.x/assembly/src/main/filtered-resources/bin/client
    karaf/branches/karaf-2.2.x/assembly/src/main/filtered-resources/bin/client.bat
    karaf/branches/karaf-2.2.x/assembly/src/main/filtered-resources/bin/shell
    karaf/branches/karaf-2.2.x/assembly/src/main/filtered-resources/bin/shell.bat
    karaf/branches/karaf-2.2.x/assembly/src/main/filtered-resources/demos/web/README.txt
    karaf/branches/karaf-2.2.x/assembly/src/main/filtered-resources/etc/config.properties
    karaf/branches/karaf-2.2.x/assembly/src/main/filtered-resources/etc/custom.properties
    karaf/branches/karaf-2.2.x/assembly/src/main/filtered-resources/etc/jre.properties
    karaf/branches/karaf-2.2.x/assembly/src/main/filtered-resources/etc/org.apache.karaf.features.cfg
    karaf/branches/karaf-2.2.x/assembly/src/main/filtered-resources/etc/startup.properties
    karaf/branches/karaf-2.2.x/assembly/src/main/filtered-resources/minimal/org.apache.karaf.features.cfg
    karaf/branches/karaf-2.2.x/assembly/src/main/filtered-resources/minimal/startup.properties
    karaf/branches/karaf-2.2.x/assembly/src/main/resources/extra/jetty.xml
    karaf/branches/karaf-2.2.x/features/assembly/enterprise/pom.xml
    karaf/branches/karaf-2.2.x/features/assembly/enterprise/src/main/resources/features.xml
    karaf/branches/karaf-2.2.x/features/assembly/framework/NOTICE
    karaf/branches/karaf-2.2.x/features/assembly/framework/pom.xml
    karaf/branches/karaf-2.2.x/features/assembly/framework/src/main/configfiles/jetty.xml
    karaf/branches/karaf-2.2.x/features/assembly/framework/src/main/descriptors/unix-bin.xml
    karaf/branches/karaf-2.2.x/features/assembly/framework/src/main/descriptors/unix-minimal-bin.xml
    karaf/branches/karaf-2.2.x/features/assembly/framework/src/main/descriptors/unix-src.xml
    karaf/branches/karaf-2.2.x/features/assembly/framework/src/main/descriptors/windows-bin.xml
    karaf/branches/karaf-2.2.x/features/assembly/framework/src/main/descriptors/windows-minimal-bin.xml
    karaf/branches/karaf-2.2.x/features/assembly/framework/src/main/descriptors/windows-src.xml
    karaf/branches/karaf-2.2.x/features/assembly/framework/src/main/filtered-resources/resources/demos/web/README.txt
    karaf/branches/karaf-2.2.x/features/assembly/framework/src/main/filtered-resources/resources/etc/config.properties
    karaf/branches/karaf-2.2.x/features/assembly/framework/src/main/filtered-resources/resources/etc/custom.properties
    karaf/branches/karaf-2.2.x/features/assembly/framework/src/main/filtered-resources/resources/etc/jre.properties
    karaf/branches/karaf-2.2.x/features/assembly/framework/src/main/filtered-resources/resources/etc/org.apache.karaf.features.cfg
    karaf/branches/karaf-2.2.x/features/assembly/framework/src/main/filtered-resources/resources/etc/startup.properties
    karaf/branches/karaf-2.2.x/features/assembly/framework/src/main/filtered-resources/resources/minimal/org.apache.karaf.features.cfg
    karaf/branches/karaf-2.2.x/features/assembly/framework/src/main/filtered-resources/resources/minimal/startup.properties
    karaf/branches/karaf-2.2.x/features/assembly/framework/src/main/resources/resources/deploy/README
    karaf/branches/karaf-2.2.x/features/assembly/framework/src/main/resources/resources/etc/java.util.logging.properties
    karaf/branches/karaf-2.2.x/features/assembly/framework/src/main/resources/resources/etc/org.apache.felix.fileinstall-deploy.cfg
    karaf/branches/karaf-2.2.x/features/assembly/framework/src/main/resources/resources/etc/org.apache.karaf.jaas.cfg
    karaf/branches/karaf-2.2.x/features/assembly/framework/src/main/resources/resources/etc/org.apache.karaf.log.cfg
    karaf/branches/karaf-2.2.x/features/assembly/framework/src/main/resources/resources/etc/org.apache.karaf.management.cfg
    karaf/branches/karaf-2.2.x/features/assembly/framework/src/main/resources/resources/etc/org.apache.karaf.shell.cfg
    karaf/branches/karaf-2.2.x/features/assembly/framework/src/main/resources/resources/etc/org.ops4j.pax.logging.cfg
    karaf/branches/karaf-2.2.x/features/assembly/framework/src/main/resources/resources/etc/org.ops4j.pax.url.mvn.cfg
    karaf/branches/karaf-2.2.x/features/assembly/framework/src/main/resources/resources/etc/shell.init.script
    karaf/branches/karaf-2.2.x/features/assembly/framework/src/main/resources/resources/etc/system.properties
    karaf/branches/karaf-2.2.x/features/assembly/framework/src/main/resources/resources/etc/users.properties
    karaf/branches/karaf-2.2.x/features/assembly/framework/src/main/resources/resources/lib/README
    karaf/branches/karaf-2.2.x/features/assembly/framework/src/main/resources/resources/lib/endorsed/README
    karaf/branches/karaf-2.2.x/features/assembly/framework/src/main/resources/resources/lib/ext/README
    karaf/branches/karaf-2.2.x/features/assembly/pom.xml
    karaf/branches/karaf-2.2.x/features/assembly/standard/pom.xml
    karaf/branches/karaf-2.2.x/features/assembly/standard/src/main/resources/features.xml
Modified:
    karaf/branches/karaf-2.2.x/assemblies/apache-karaf/pom.xml
    karaf/branches/karaf-2.2.x/assemblies/pom.xml
    karaf/branches/karaf-2.2.x/features/pom.xml
    karaf/branches/karaf-2.2.x/pom.xml

Modified: karaf/branches/karaf-2.2.x/assemblies/apache-karaf/pom.xml
URL: http://svn.apache.org/viewvc/karaf/branches/karaf-2.2.x/assemblies/apache-karaf/pom.xml?rev=1067265&r1=1067264&r2=1067265&view=diff
==============================================================================
--- karaf/branches/karaf-2.2.x/assemblies/apache-karaf/pom.xml (original)
+++ karaf/branches/karaf-2.2.x/assemblies/apache-karaf/pom.xml Fri Feb  4 19:29:31 2011
@@ -23,14 +23,14 @@
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <groupId>org.apache.karaf.assemblies</groupId>
-        <artifactId>assemblies</artifactId>
+	    <groupId>org.apache.karaf.assemblies</groupId>
+	    <artifactId>assemblies</artifactId>
         <version>2.1.99-SNAPSHOT</version>
     </parent>
 
     <artifactId>apache-karaf</artifactId>
-    <packaging>karaf-assembly</packaging>
-    <name>Apache Karaf :: apache-karaf Assembly</name>
+    <packaging>pom</packaging>
+    <name>Apache Karaf :: Assembly</name>
 
     <properties>
         <appendedResourcesDirectory>${basedir}/../etc/appended-resources</appendedResourcesDirectory>
@@ -38,403 +38,635 @@
 
     <dependencies>
         <dependency>
-            <groupId>org.apache.karaf.features.assembly</groupId>
-            <artifactId>karaf-framework</artifactId>
-            <version>${project.version}</version>
-            <type>kar</type>
-        </dependency>
-        <!--<dependency>-->
-            <!--<groupId>org.apache.karaf</groupId>-->
-            <!--<artifactId>manual</artifactId>-->
-            <!--<type>pdf</type>-->
-        <!--</dependency>-->
-        <!--<dependency>-->
-            <!--<groupId>org.apache.karaf</groupId>-->
-            <!--<artifactId>manual</artifactId>-->
-            <!--<type>html</type>-->
-        <!--</dependency>-->
-        <!--<dependency>-->
-            <!--<groupId>org.apache.karaf</groupId>-->
-            <!--<artifactId>org.apache.karaf.main</artifactId>-->
-        <!--</dependency>-->
-        <!--<dependency>-->
-            <!--<groupId>org.apache.karaf</groupId>-->
-            <!--<artifactId>org.apache.karaf.exception</artifactId>-->
-        <!--</dependency>-->
-        <!--<dependency>-->
-            <!--<groupId>org.apache.karaf</groupId>-->
-            <!--<artifactId>org.apache.karaf.client</artifactId>-->
-        <!--</dependency>-->
-        <!--<dependency>-->
-            <!--<groupId>org.apache.karaf.deployer</groupId>-->
-            <!--<artifactId>org.apache.karaf.deployer.spring</artifactId>-->
-        <!--</dependency>-->
-        <!--<dependency>-->
-            <!--<groupId>org.apache.karaf.deployer</groupId>-->
-            <!--<artifactId>org.apache.karaf.deployer.blueprint</artifactId>-->
-        <!--</dependency>-->
-        <!--<dependency>-->
-            <!--<groupId>org.apache.karaf.deployer</groupId>-->
-            <!--<artifactId>org.apache.karaf.deployer.features</artifactId>-->
-        <!--</dependency>-->
-        <!--<dependency>-->
-            <!--<groupId>org.apache.karaf.deployer</groupId>-->
-            <!--<artifactId>org.apache.karaf.deployer.kar</artifactId>-->
-        <!--</dependency>-->
-        <!--<dependency>-->
-            <!--<groupId>org.apache.karaf.deployer</groupId>-->
-            <!--<artifactId>org.apache.karaf.deployer.war</artifactId>-->
-        <!--</dependency>-->
-        <!--&lt;!&ndash;<dependency>&ndash;&gt;-->
-            <!--&lt;!&ndash;<groupId>org.apache.karaf.deployer</groupId>&ndash;&gt;-->
-            <!--&lt;!&ndash;<artifactId>org.apache.karaf.deployer.wrap</artifactId>&ndash;&gt;-->
-        <!--&lt;!&ndash;</dependency>&ndash;&gt;-->
-        <!--<dependency>-->
-            <!--<groupId>org.apache.karaf.features</groupId>-->
-            <!--<artifactId>org.apache.karaf.features.core</artifactId>-->
-        <!--</dependency>-->
-        <!--<dependency>-->
-            <!--<groupId>org.apache.karaf.features</groupId>-->
-            <!--<artifactId>org.apache.karaf.features.command</artifactId>-->
-        <!--</dependency>-->
-        <!--<dependency>-->
-            <!--<groupId>org.apache.karaf.features</groupId>-->
-            <!--<artifactId>org.apache.karaf.features.management</artifactId>-->
-        <!--</dependency>-->
-        <!--<dependency>-->
-            <!--<groupId>org.apache.karaf.features</groupId>-->
-            <!--<artifactId>org.apache.karaf.features.obr</artifactId>-->
-        <!--</dependency>-->
-        <!--<dependency>-->
-            <!--<groupId>org.apache.karaf.diagnostic</groupId>-->
-            <!--<artifactId>org.apache.karaf.diagnostic.core</artifactId>-->
-        <!--</dependency>-->
-        <!--<dependency>-->
-            <!--<groupId>org.apache.karaf.diagnostic</groupId>-->
-            <!--<artifactId>org.apache.karaf.diagnostic.common</artifactId>-->
-        <!--</dependency>-->
-        <!--<dependency>-->
-            <!--<groupId>org.apache.karaf.diagnostic</groupId>-->
-            <!--<artifactId>org.apache.karaf.diagnostic.command</artifactId>-->
-        <!--</dependency>-->
-        <!--<dependency>-->
-            <!--<groupId>org.apache.karaf.diagnostic</groupId>-->
-            <!--<artifactId>org.apache.karaf.diagnostic.management</artifactId>-->
-        <!--</dependency>-->
-        <!--<dependency>-->
-            <!--<groupId>org.apache.karaf.admin</groupId>-->
-            <!--<artifactId>org.apache.karaf.admin.core</artifactId>-->
-        <!--</dependency>-->
-        <!--<dependency>-->
-            <!--<groupId>org.apache.karaf.admin</groupId>-->
-            <!--<artifactId>org.apache.karaf.admin.command</artifactId>-->
-        <!--</dependency>-->
-        <!--<dependency>-->
-            <!--<groupId>org.apache.karaf.admin</groupId>-->
-            <!--<artifactId>org.apache.karaf.admin.management</artifactId>-->
-        <!--</dependency>-->
-        <!--<dependency>-->
-            <!--<groupId>org.apache.karaf.shell</groupId>-->
-            <!--<artifactId>org.apache.karaf.shell.console</artifactId>-->
-        <!--</dependency>-->
-        <!--<dependency>-->
-            <!--<groupId>org.apache.karaf.shell</groupId>-->
-            <!--<artifactId>org.apache.karaf.shell.obr</artifactId>-->
-        <!--</dependency>-->
-        <!--<dependency>-->
-            <!--<groupId>org.apache.karaf.shell</groupId>-->
-            <!--<artifactId>org.apache.karaf.shell.osgi</artifactId>-->
-        <!--</dependency>-->
-        <!--<dependency>-->
-            <!--<groupId>org.apache.karaf.shell</groupId>-->
-            <!--<artifactId>org.apache.karaf.shell.log</artifactId>-->
-        <!--</dependency>-->
-        <!--<dependency>-->
-            <!--<groupId>org.apache.karaf.shell</groupId>-->
-            <!--<artifactId>org.apache.karaf.shell.config</artifactId>-->
-        <!--</dependency>-->
-        <!--<dependency>-->
-            <!--<groupId>org.apache.karaf.shell</groupId>-->
-            <!--<artifactId>org.apache.karaf.shell.packages</artifactId>-->
-        <!--</dependency>-->
-        <!--<dependency>-->
-            <!--<groupId>org.apache.karaf.shell</groupId>-->
-            <!--<artifactId>org.apache.karaf.shell.commands</artifactId>-->
-        <!--</dependency>-->
-        <!--<dependency>-->
-            <!--<groupId>org.apache.karaf.shell</groupId>-->
-            <!--<artifactId>org.apache.karaf.shell.ssh</artifactId>-->
-        <!--</dependency>-->
-        <!--<dependency>-->
-            <!--<groupId>org.apache.karaf.shell</groupId>-->
-            <!--<artifactId>org.apache.karaf.shell.dev</artifactId>-->
-        <!--</dependency>-->
-        <!--<dependency>-->
-            <!--<groupId>org.apache.karaf.jaas</groupId>-->
-            <!--<artifactId>org.apache.karaf.jaas.boot</artifactId>-->
-        <!--</dependency>-->
-        <!--<dependency>-->
-            <!--<groupId>org.apache.karaf.jaas</groupId>-->
-            <!--<artifactId>org.apache.karaf.jaas.config</artifactId>-->
-        <!--</dependency>-->
-        <!--<dependency>-->
-            <!--<groupId>org.apache.karaf.jaas</groupId>-->
-            <!--<artifactId>org.apache.karaf.jaas.modules</artifactId>-->
-        <!--</dependency>-->
-        <!--<dependency>-->
-            <!--<groupId>org.apache.karaf.jaas</groupId>-->
-            <!--<artifactId>org.apache.karaf.jaas.command</artifactId>-->
-        <!--</dependency>-->
-        <!--<dependency>-->
-            <!--<groupId>org.apache.karaf</groupId>-->
-            <!--<artifactId>org.apache.karaf.management</artifactId>-->
-        <!--</dependency>-->
-        <!--<dependency>-->
-            <!--<groupId>org.apache.karaf.webconsole</groupId>-->
-            <!--<artifactId>org.apache.karaf.webconsole.admin</artifactId>-->
-        <!--</dependency>-->
-        <!--<dependency>-->
-            <!--<groupId>org.apache.karaf.webconsole</groupId>-->
-            <!--<artifactId>org.apache.karaf.webconsole.branding</artifactId>-->
-        <!--</dependency>-->
-        <!--<dependency>-->
-            <!--<groupId>org.apache.karaf.webconsole</groupId>-->
-            <!--<artifactId>org.apache.karaf.webconsole.console</artifactId>-->
-        <!--</dependency>-->
-        <!--<dependency>-->
-            <!--<groupId>org.apache.karaf.webconsole</groupId>-->
-            <!--<artifactId>org.apache.karaf.webconsole.features</artifactId>-->
-        <!--</dependency>-->
-        <!--<dependency>-->
-            <!--<groupId>org.apache.karaf.webconsole</groupId>-->
-            <!--<artifactId>org.apache.karaf.webconsole.gogo</artifactId>-->
-        <!--</dependency>-->
-        <!--<dependency>-->
-            <!--<groupId>org.springframework.osgi</groupId>-->
-            <!--<artifactId>spring-osgi-extender</artifactId>-->
-        <!--</dependency>-->
-        <!--<dependency>-->
-            <!--<groupId>org.springframework.osgi</groupId>-->
-            <!--<artifactId>spring-osgi-core</artifactId>-->
-        <!--</dependency>-->
-        <!--<dependency>-->
-            <!--<groupId>org.springframework.osgi</groupId>-->
-            <!--<artifactId>spring-osgi-io</artifactId>-->
-        <!--</dependency>-->
-        <!--<dependency>-->
-            <!--<groupId>org.springframework.osgi</groupId>-->
-            <!--<artifactId>spring-osgi-annotation</artifactId>-->
-        <!--</dependency>-->
-        <!--<dependency>-->
-            <!--<groupId>org.springframework</groupId>-->
-            <!--<artifactId>spring-context</artifactId>-->
-        <!--</dependency>-->
-        <!--<dependency>-->
-            <!--<groupId>org.springframework</groupId>-->
-            <!--<artifactId>spring-beans</artifactId>-->
-        <!--</dependency>-->
-        <!--<dependency>-->
-            <!--<groupId>org.springframework</groupId>-->
-            <!--<artifactId>spring-core</artifactId>-->
-        <!--</dependency>-->
-        <!--<dependency>-->
-            <!--<groupId>org.springframework</groupId>-->
-            <!--<artifactId>spring-aop</artifactId>-->
-        <!--</dependency>-->
-        <!--<dependency>-->
-            <!--<groupId>org.apache.felix</groupId>-->
-            <!--<artifactId>org.apache.felix.bundlerepository</artifactId>-->
-        <!--</dependency>-->
-        <!--<dependency>-->
-            <!--<groupId>org.apache.felix</groupId>-->
-            <!--<artifactId>org.apache.felix.fileinstall</artifactId>-->
-        <!--</dependency>-->
-        <!--<dependency>-->
-            <!--<groupId>org.apache.mina</groupId>-->
-            <!--<artifactId>mina-core</artifactId>-->
-        <!--</dependency>-->
-        <!--<dependency>-->
-            <!--<groupId>org.osgi</groupId>-->
-            <!--<artifactId>org.osgi.compendium</artifactId>-->
-        <!--</dependency>-->
-        <!--<dependency>-->
-            <!--<groupId>org.apache.felix</groupId>-->
-            <!--<artifactId>org.apache.felix.configadmin</artifactId>-->
-        <!--</dependency>-->
-        <!--<dependency>-->
-            <!--<groupId>org.apache.felix</groupId>-->
-            <!--<artifactId>org.apache.felix.eventadmin</artifactId>-->
-        <!--</dependency>-->
-        <!--<dependency>-->
-            <!--<groupId>org.apache.felix</groupId>-->
-            <!--<artifactId>org.apache.felix.metatype</artifactId>-->
-        <!--</dependency>-->
-        <!--<dependency>-->
-            <!--<groupId>org.apache.felix</groupId>-->
-            <!--<artifactId>org.apache.felix.webconsole</artifactId>-->
-        <!--</dependency>-->
-        <!--<dependency>-->
-            <!--<groupId>org.ops4j.pax.logging</groupId>-->
-            <!--<artifactId>pax-logging-api</artifactId>-->
-        <!--</dependency>-->
-        <!--<dependency>-->
-            <!--<groupId>org.ops4j.pax.logging</groupId>-->
-            <!--<artifactId>pax-logging-service</artifactId>-->
-        <!--</dependency>-->
-        <!--<dependency>-->
-            <!--<groupId>org.ops4j.pax.url</groupId>-->
-            <!--<artifactId>pax-url-mvn</artifactId>-->
-        <!--</dependency>-->
-        <!--<dependency>-->
-            <!--<groupId>org.ops4j.pax.url</groupId>-->
-            <!--<artifactId>pax-url-wrap</artifactId>-->
-        <!--</dependency>-->
-        <!--<dependency>-->
-            <!--<groupId>org.apache.sshd</groupId>-->
-            <!--<artifactId>sshd-core</artifactId>-->
-        <!--</dependency>-->
-        <!--<dependency>-->
-            <!--<groupId>org.eclipse</groupId>-->
-            <!--<artifactId>osgi</artifactId>-->
-        <!--</dependency>-->
-        <!--<dependency>-->
-            <!--<groupId>org.apache.felix</groupId>-->
-            <!--<artifactId>org.apache.felix.framework</artifactId>-->
-        <!--</dependency>-->
-        <!--<dependency>-->
-            <!--<groupId>org.apache.aries.blueprint</groupId>-->
-            <!--<artifactId>org.apache.aries.blueprint</artifactId>-->
-        <!--</dependency>-->
-        <!--<dependency>-->
-            <!--<groupId>org.apache.aries.proxy</groupId>-->
-            <!--<artifactId>org.apache.aries.proxy</artifactId>-->
-        <!--</dependency>-->
-        <!--<dependency>-->
-            <!--<groupId>org.apache.aries</groupId>-->
-            <!--<artifactId>org.apache.aries.util</artifactId>-->
-        <!--</dependency>-->
-        <!--<dependency>-->
-            <!--<groupId>org.apache.aries.jmx</groupId>-->
-            <!--<artifactId>org.apache.aries.jmx</artifactId>-->
-        <!--</dependency>-->
-        <!--<dependency>-->
-            <!--<groupId>org.apache.aries.jmx</groupId>-->
-            <!--<artifactId>org.apache.aries.jmx.blueprint</artifactId>-->
-        <!--</dependency>-->
-        <!--<dependency>-->
-            <!--<groupId>org.apache.geronimo.specs</groupId>-->
-            <!--<artifactId>geronimo-servlet_2.5_spec</artifactId>-->
-            <!--<optional>true</optional>-->
-        <!--</dependency>-->
-        <!--<dependency>-->
-            <!--<groupId>org.eclipse.jetty</groupId>-->
-            <!--<artifactId>jetty-util</artifactId>-->
-        <!--</dependency>-->
-        <!--<dependency>-->
-            <!--<groupId>org.eclipse.jetty</groupId>-->
-            <!--<artifactId>jetty-io</artifactId>-->
-        <!--</dependency>-->
-        <!--<dependency>-->
-            <!--<groupId>org.eclipse.jetty</groupId>-->
-            <!--<artifactId>jetty-http</artifactId>-->
-        <!--</dependency>-->
-        <!--<dependency>-->
-            <!--<groupId>org.eclipse.jetty</groupId>-->
-            <!--<artifactId>jetty-continuation</artifactId>-->
-        <!--</dependency>-->
-        <!--<dependency>-->
-            <!--<groupId>org.eclipse.jetty</groupId>-->
-            <!--<artifactId>jetty-server</artifactId>-->
-        <!--</dependency>-->
-        <!--<dependency>-->
-            <!--<groupId>org.eclipse.jetty</groupId>-->
-            <!--<artifactId>jetty-security</artifactId>-->
-        <!--</dependency>-->
-        <!--<dependency>-->
-            <!--<groupId>org.eclipse.jetty</groupId>-->
-            <!--<artifactId>jetty-servlet</artifactId>-->
-        <!--</dependency>-->
-        <!--<dependency>-->
-            <!--<groupId>org.eclipse.jetty</groupId>-->
-            <!--<artifactId>jetty-xml</artifactId>-->
-        <!--</dependency>-->
-        <!--<dependency>-->
-            <!--<groupId>org.apache.servicemix.bundles</groupId>-->
-            <!--<artifactId>org.apache.servicemix.bundles.asm</artifactId>-->
-        <!--</dependency>-->
-        <!--<dependency>-->
-            <!--<groupId>org.ops4j.pax.web</groupId>-->
-            <!--<artifactId>pax-web-api</artifactId>-->
-            <!--<optional>true</optional>-->
-        <!--</dependency>-->
-        <!--<dependency>-->
-            <!--<groupId>org.ops4j.pax.web</groupId>-->
-            <!--<artifactId>pax-web-spi</artifactId>-->
-            <!--<optional>true</optional>-->
-        <!--</dependency>-->
-        <!--<dependency>-->
-            <!--<groupId>org.ops4j.pax.web</groupId>-->
-            <!--<artifactId>pax-web-runtime</artifactId>-->
-            <!--<optional>true</optional>-->
-        <!--</dependency>-->
-        <!--<dependency>-->
-            <!--<groupId>org.ops4j.pax.web</groupId>-->
-            <!--<artifactId>pax-web-jetty</artifactId>-->
-            <!--<optional>true</optional>-->
-        <!--</dependency>-->
-        <!--<dependency>-->
-            <!--<groupId>org.ops4j.pax.web</groupId>-->
-            <!--<artifactId>pax-web-jsp</artifactId>-->
-            <!--<optional>true</optional>-->
-        <!--</dependency>-->
-        <!--<dependency>-->
-            <!--<groupId>org.ops4j.pax.web</groupId>-->
-            <!--<artifactId>pax-web-extender-war</artifactId>-->
-            <!--<optional>true</optional>-->
-        <!--</dependency>-->
-        <!--<dependency>-->
-            <!--<groupId>org.ops4j.pax.web</groupId>-->
-            <!--<artifactId>pax-web-extender-whiteboard</artifactId>-->
-            <!--<optional>true</optional>-->
-        <!--</dependency>-->
-         <!--<dependency>-->
-            <!--<groupId>org.ops4j.pax.web</groupId>-->
-            <!--<artifactId>pax-web-deployer</artifactId>-->
-            <!--<optional>true</optional>-->
-        <!--</dependency>-->
+            <groupId>org.apache.karaf</groupId>
+            <artifactId>manual</artifactId>
+            <type>pdf</type>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.karaf</groupId>
+            <artifactId>manual</artifactId>
+            <type>html</type>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.karaf</groupId>
+            <artifactId>org.apache.karaf.main</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.karaf</groupId>
+            <artifactId>org.apache.karaf.exception</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.karaf</groupId>
+            <artifactId>org.apache.karaf.client</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.karaf.deployer</groupId>
+            <artifactId>org.apache.karaf.deployer.spring</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.karaf.deployer</groupId>
+            <artifactId>org.apache.karaf.deployer.blueprint</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.karaf.deployer</groupId>
+            <artifactId>org.apache.karaf.deployer.features</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.karaf.deployer</groupId>
+            <artifactId>org.apache.karaf.deployer.kar</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.karaf.deployer</groupId>
+            <artifactId>org.apache.karaf.deployer.war</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.karaf.deployer</groupId>
+            <artifactId>org.apache.karaf.deployer.wrap</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.karaf.features</groupId>
+            <artifactId>org.apache.karaf.features.core</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.karaf.features</groupId>
+            <artifactId>org.apache.karaf.features.command</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.karaf.features</groupId>
+            <artifactId>org.apache.karaf.features.management</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.karaf.features</groupId>
+            <artifactId>org.apache.karaf.features.obr</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.karaf.diagnostic</groupId>
+            <artifactId>org.apache.karaf.diagnostic.core</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.karaf.diagnostic</groupId>
+            <artifactId>org.apache.karaf.diagnostic.common</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.karaf.diagnostic</groupId>
+            <artifactId>org.apache.karaf.diagnostic.command</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.karaf.diagnostic</groupId>
+            <artifactId>org.apache.karaf.diagnostic.management</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.karaf.admin</groupId>
+            <artifactId>org.apache.karaf.admin.core</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.karaf.admin</groupId>
+            <artifactId>org.apache.karaf.admin.command</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.karaf.admin</groupId>
+            <artifactId>org.apache.karaf.admin.management</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.karaf.shell</groupId>
+            <artifactId>org.apache.karaf.shell.console</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.karaf.shell</groupId>
+            <artifactId>org.apache.karaf.shell.obr</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.karaf.shell</groupId>
+            <artifactId>org.apache.karaf.shell.osgi</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.karaf.shell</groupId>
+            <artifactId>org.apache.karaf.shell.log</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.karaf.shell</groupId>
+            <artifactId>org.apache.karaf.shell.config</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.karaf.shell</groupId>
+            <artifactId>org.apache.karaf.shell.packages</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.karaf.shell</groupId>
+            <artifactId>org.apache.karaf.shell.commands</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.karaf.shell</groupId>
+            <artifactId>org.apache.karaf.shell.ssh</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.karaf.shell</groupId>
+            <artifactId>org.apache.karaf.shell.dev</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.karaf.jaas</groupId>
+            <artifactId>org.apache.karaf.jaas.boot</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.karaf.jaas</groupId>
+            <artifactId>org.apache.karaf.jaas.config</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.karaf.jaas</groupId>
+            <artifactId>org.apache.karaf.jaas.modules</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.karaf.jaas</groupId>
+            <artifactId>org.apache.karaf.jaas.command</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.karaf</groupId>
+            <artifactId>org.apache.karaf.management</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.karaf.webconsole</groupId>
+            <artifactId>org.apache.karaf.webconsole.admin</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.karaf.webconsole</groupId>
+            <artifactId>org.apache.karaf.webconsole.branding</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.karaf.webconsole</groupId>
+            <artifactId>org.apache.karaf.webconsole.console</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.karaf.webconsole</groupId>
+            <artifactId>org.apache.karaf.webconsole.features</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.karaf.webconsole</groupId>
+            <artifactId>org.apache.karaf.webconsole.gogo</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.osgi</groupId>
+            <artifactId>spring-osgi-extender</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.osgi</groupId>
+            <artifactId>spring-osgi-core</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.osgi</groupId>
+            <artifactId>spring-osgi-io</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.osgi</groupId>
+            <artifactId>spring-osgi-annotation</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-context</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-beans</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-core</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-aop</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.felix</groupId>
+            <artifactId>org.apache.felix.bundlerepository</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.felix</groupId>
+            <artifactId>org.apache.felix.fileinstall</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.mina</groupId>
+            <artifactId>mina-core</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.osgi</groupId>
+            <artifactId>org.osgi.compendium</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.felix</groupId>
+            <artifactId>org.apache.felix.configadmin</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.felix</groupId>
+            <artifactId>org.apache.felix.eventadmin</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.felix</groupId>
+            <artifactId>org.apache.felix.metatype</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.felix</groupId>
+            <artifactId>org.apache.felix.webconsole</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.ops4j.pax.logging</groupId>
+            <artifactId>pax-logging-api</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.ops4j.pax.logging</groupId>
+            <artifactId>pax-logging-service</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.ops4j.pax.url</groupId>
+            <artifactId>pax-url-mvn</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.ops4j.pax.url</groupId>
+            <artifactId>pax-url-wrap</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.sshd</groupId>
+            <artifactId>sshd-core</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.eclipse</groupId>
+            <artifactId>osgi</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.felix</groupId>
+            <artifactId>org.apache.felix.framework</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.aries.blueprint</groupId>
+            <artifactId>org.apache.aries.blueprint</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.aries.proxy</groupId>
+            <artifactId>org.apache.aries.proxy</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.aries</groupId>
+            <artifactId>org.apache.aries.util</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.aries.jmx</groupId>
+            <artifactId>org.apache.aries.jmx</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.aries.jmx</groupId>
+            <artifactId>org.apache.aries.jmx.blueprint</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-servlet_2.5_spec</artifactId>
+            <optional>true</optional>
+        </dependency>
+        <dependency>
+            <groupId>org.eclipse.jetty</groupId>
+            <artifactId>jetty-util</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.eclipse.jetty</groupId>
+            <artifactId>jetty-io</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.eclipse.jetty</groupId>
+            <artifactId>jetty-http</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.eclipse.jetty</groupId>
+            <artifactId>jetty-continuation</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.eclipse.jetty</groupId>
+            <artifactId>jetty-server</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.eclipse.jetty</groupId>
+            <artifactId>jetty-security</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.eclipse.jetty</groupId>
+            <artifactId>jetty-servlet</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.eclipse.jetty</groupId>
+            <artifactId>jetty-xml</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.servicemix.bundles</groupId>
+            <artifactId>org.apache.servicemix.bundles.asm</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.ops4j.pax.web</groupId>
+            <artifactId>pax-web-api</artifactId>
+            <optional>true</optional>
+        </dependency>
+        <dependency>
+            <groupId>org.ops4j.pax.web</groupId>
+            <artifactId>pax-web-spi</artifactId>
+            <optional>true</optional>
+        </dependency>
+        <dependency>
+            <groupId>org.ops4j.pax.web</groupId>
+            <artifactId>pax-web-runtime</artifactId>
+            <optional>true</optional>
+        </dependency>
+        <dependency>
+            <groupId>org.ops4j.pax.web</groupId>
+            <artifactId>pax-web-jetty</artifactId>
+            <optional>true</optional>
+        </dependency>
+        <dependency>
+            <groupId>org.ops4j.pax.web</groupId>
+            <artifactId>pax-web-jsp</artifactId>
+            <optional>true</optional>
+        </dependency>
+        <dependency>
+            <groupId>org.ops4j.pax.web</groupId>
+            <artifactId>pax-web-extender-war</artifactId>
+            <optional>true</optional>
+        </dependency>
+        <dependency>
+            <groupId>org.ops4j.pax.web</groupId>
+            <artifactId>pax-web-extender-whiteboard</artifactId>
+            <optional>true</optional>
+        </dependency>
+         <dependency>
+            <groupId>org.ops4j.pax.web</groupId>
+            <artifactId>pax-web-deployer</artifactId>
+            <optional>true</optional>
+        </dependency>
     </dependencies>
+
     <build>
+        <resources>
+            <resource>
+                <directory>${project.basedir}/src/main/filtered-resources</directory>
+                <filtering>true</filtering>
+                <includes>
+                    <include>**/*</include>
+                </includes>
+            </resource>
+            <resource>
+                <directory>${project.basedir}/src/main/resources/extra</directory>
+                <filtering>false</filtering>
+                <excludes>
+                    <exclude>**/*</exclude>
+                </excludes>
+            </resource>
+        </resources>
         <plugins>
             <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-resources-plugin</artifactId>
+                <configuration>
+                    <useDefaultDelimiters>false</useDefaultDelimiters>
+                    <delimiters>
+                        <delimiter>${*}</delimiter>
+                    </delimiters>
+                </configuration>
+                <executions>
+                    <execution>
+                        <id>filter</id>
+                        <phase>generate-resources</phase>
+                        <goals>
+                            <goal>resources</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-dependency-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>copy</id>
+                        <phase>generate-resources</phase>
+                        <goals>
+                            <goal>copy</goal>
+                        </goals>
+                        <configuration>
+                            <artifactItems>
+                                <artifactItem>
+                                    <groupId>org.apache.karaf</groupId>
+                                    <artifactId>org.apache.karaf.main</artifactId>
+                                    <outputDirectory>target/dependencies/lib</outputDirectory>
+                                    <destFileName>karaf.jar</destFileName>
+                                </artifactItem>
+                                <artifactItem>
+                                    <groupId>org.apache.karaf</groupId>
+                                    <artifactId>org.apache.karaf.client</artifactId>
+                                    <outputDirectory>target/dependencies/lib/bin</outputDirectory>
+                                    <destFileName>karaf-client.jar</destFileName>
+                                </artifactItem>
+                                <artifactItem>
+                                    <groupId>org.apache.karaf.jaas</groupId>
+                                    <artifactId>org.apache.karaf.jaas.boot</artifactId>
+                                    <outputDirectory>target/dependencies/lib</outputDirectory>
+                                    <destFileName>karaf-jaas-boot.jar</destFileName>
+                                </artifactItem>
+                                <artifactItem>
+                                    <groupId>org.apache.karaf</groupId>
+                                    <artifactId>manual</artifactId>
+                                    <type>pdf</type>
+                                    <outputDirectory>target/dependencies</outputDirectory>
+                                    <destFileName>karaf-manual-${project.version}.pdf</destFileName>
+                                </artifactItem>
+                                <artifactItem>
+                                    <groupId>org.apache.karaf</groupId>
+                                    <artifactId>manual</artifactId>
+                                    <type>html</type>
+                                    <outputDirectory>target/dependencies</outputDirectory>
+                                    <destFileName>karaf-manual-${project.version}.html</destFileName>
+                                </artifactItem>
+                            </artifactItems>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>build-helper-maven-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>attach-artifacts</id>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>attach-artifact</goal>
+                        </goals>
+                        <configuration>
+                            <artifacts>
+                                <artifact>
+                                  <file>src/main/resources/extra/jetty.xml</file>
+                                  <type>xml</type>
+                                  <classifier>jettyconfig</classifier>
+                                </artifact>
+                            </artifacts>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-assembly-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>make-assembly</id>
+                        <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}-${project.version}</finalName>
+                            <tarLongFileMode>gnu</tarLongFileMode>
+                        </configuration>
+                    </execution>
+                    <execution>
+                        <id>unix-bin</id>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>single</goal>
+                        </goals>
+                        <configuration>
+                            <descriptors>
+                                <descriptor>src/main/descriptors/unix-bin.xml</descriptor>
+                            </descriptors>
+                            <finalName>${project.artifactId}-${project.version}</finalName>
+                            <tarLongFileMode>gnu</tarLongFileMode>
+                        </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}-${project.version}</finalName>
+                            <appendAssemblyId>true</appendAssemblyId>
+                            <assemblyId/>
+                        </configuration>
+                    </execution>
+                    <execution>
+                        <id>windows-bin</id>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>single</goal>
+                        </goals>
+                        <configuration>
+                            <descriptors>
+                                <descriptor>src/main/descriptors/windows-bin.xml</descriptor>
+                            </descriptors>
+                            <finalName>${project.artifactId}-${project.version}</finalName>
+                            <appendAssemblyId>true</appendAssemblyId>
+                            <assemblyId/>
+                        </configuration>
+                    </execution>
+                    <execution>
+                        <id>unix-src</id>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>single</goal>
+                        </goals>
+                        <configuration>
+                            <descriptors>
+                                <descriptor>src/main/descriptors/unix-src.xml</descriptor>
+                            </descriptors>
+                            <tarLongFileMode>gnu</tarLongFileMode>
+                        </configuration>
+                    </execution>
+                    <execution>
+                        <id>windows-src</id>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>single</goal>
+                        </goals>
+                        <configuration>
+                            <descriptors>
+                                <descriptor>src/main/descriptors/windows-src.xml</descriptor>
+                            </descriptors>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
                 <groupId>org.apache.karaf.tooling</groupId>
                 <artifactId>features-maven-plugin</artifactId>
                 <version>${project.version}</version>
-                <extensions>true</extensions>
-                <!--<executions>-->
-                    <!--<execution>-->
-                        <!--<id>add-features-to-repo</id>-->
-                        <!--<phase>generate-resources</phase>-->
-                        <!--<goals>-->
-                            <!--<goal>add-features-to-repo</goal>-->
-                        <!--</goals>-->
-                        <!--<configuration>-->
-                            <!--<descriptors>-->
-                              <!--<descriptor>mvn:org.apache.karaf.features.assembly/standard/${project.version}/xml/features</descriptor>-->
-                              <!--<descriptor>mvn:org.apache.karaf.features.assembly/enterprise/${project.version}/xml/features</descriptor>-->
-                            <!--</descriptors>-->
-                            <!--<features>-->
-                                <!--<feature>config</feature>-->
-                                <!--<feature>ssh</feature>-->
-                                <!--<feature>management</feature>-->
-                            <!--</features>-->
-                            <!--<includeMvnBasedDescriptors>true</includeMvnBasedDescriptors>-->
-                            <!--<repository>target/features-repo</repository>-->
-                        <!--</configuration>-->
-                    <!--</execution>-->
-                <!--</executions>-->
+                <executions>
+                    <execution>
+                        <id>add-features-to-repo</id>
+                        <phase>generate-resources</phase>
+                        <goals>
+                            <goal>add-features-to-repo</goal>
+                        </goals>
+                        <configuration>
+                            <descriptors>
+                              <descriptor>mvn:org.apache.karaf.features.assembly/standard/${project.version}/xml/features</descriptor>
+                              <descriptor>mvn:org.apache.karaf.features.assembly/enterprise/${project.version}/xml/features</descriptor>
+                            </descriptors>
+                            <features>
+                                <feature>config</feature>
+                                <feature>ssh</feature>
+                                <feature>management</feature>
+                            </features>
+                            <includeMvnBasedDescriptors>true</includeMvnBasedDescriptors>
+                            <repository>target/features-repo</repository>
+                        </configuration>
+                    </execution>
+                </executions>
             </plugin>
 
         </plugins>
     </build>
 
+    <profiles>
+        <profile>
+            <id>assembly-src</id>
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-assembly-plugin</artifactId>
+                        <executions>
+                            <execution>
+                                <id>unix-src</id>
+                                <phase>package</phase>
+                                <goals>
+                                    <goal>attached</goal>
+                                </goals>
+                                <configuration>
+                                    <descriptors>
+                                        <descriptor>src/main/descriptors/unix-src.xml</descriptor>
+                                    </descriptors>
+                                </configuration>
+                            </execution>
+                            <execution>
+                                <id>windows-src</id>
+                                <phase>package</phase>
+                                <goals>
+                                    <goal>attached</goal>
+                                </goals>
+                                <configuration>
+                                    <descriptors>
+                                        <descriptor>src/main/descriptors/windows-src.xml</descriptor>
+                                    </descriptors>
+                                </configuration>
+                            </execution>
+                        </executions>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+    </profiles>
 </project>

Copied: karaf/branches/karaf-2.2.x/assemblies/apache-karaf/src/main/descriptors/unix-bin.xml (from r1067262, karaf/branches/karaf-2.2.x/assembly/src/main/descriptors/unix-bin.xml)
URL: http://svn.apache.org/viewvc/karaf/branches/karaf-2.2.x/assemblies/apache-karaf/src/main/descriptors/unix-bin.xml?p2=karaf/branches/karaf-2.2.x/assemblies/apache-karaf/src/main/descriptors/unix-bin.xml&p1=karaf/branches/karaf-2.2.x/assembly/src/main/descriptors/unix-bin.xml&r1=1067262&r2=1067265&rev=1067265&view=diff
==============================================================================
--- karaf/branches/karaf-2.2.x/assembly/src/main/descriptors/unix-bin.xml (original)
+++ karaf/branches/karaf-2.2.x/assemblies/apache-karaf/src/main/descriptors/unix-bin.xml Fri Feb  4 19:29:31 2011
@@ -25,7 +25,7 @@
 
         <!-- Copy license and other files from root -->
         <fileSet>
-            <directory>..</directory>
+            <directory>../..</directory>
             <outputDirectory>/</outputDirectory>
             <includes>
                 <include>README</include>
@@ -110,14 +110,14 @@
 
     <files>
         <file>
-            <source>${basedir}/../LICENSE</source>
+            <source>../../LICENSE</source>
             <outputDirectory>/</outputDirectory>
             <destName>LICENSE</destName>
             <fileMode>0644</fileMode>
             <lineEnding>unix</lineEnding>
         </file>
         <file>
-            <source>${basedir}/NOTICE</source>
+            <source>NOTICE</source>
             <outputDirectory>/</outputDirectory>
             <destName>NOTICE</destName>
             <fileMode>0644</fileMode>

Copied: karaf/branches/karaf-2.2.x/assemblies/apache-karaf/src/main/descriptors/unix-minimal-bin.xml (from r1067262, karaf/branches/karaf-2.2.x/assembly/src/main/descriptors/unix-minimal-bin.xml)
URL: http://svn.apache.org/viewvc/karaf/branches/karaf-2.2.x/assemblies/apache-karaf/src/main/descriptors/unix-minimal-bin.xml?p2=karaf/branches/karaf-2.2.x/assemblies/apache-karaf/src/main/descriptors/unix-minimal-bin.xml&p1=karaf/branches/karaf-2.2.x/assembly/src/main/descriptors/unix-minimal-bin.xml&r1=1067262&r2=1067265&rev=1067265&view=diff
==============================================================================
--- karaf/branches/karaf-2.2.x/assembly/src/main/descriptors/unix-minimal-bin.xml (original)
+++ karaf/branches/karaf-2.2.x/assemblies/apache-karaf/src/main/descriptors/unix-minimal-bin.xml Fri Feb  4 19:29:31 2011
@@ -27,7 +27,7 @@
 
         <!-- Copy license and other files from root -->
         <fileSet>
-            <directory>..</directory>
+            <directory>${basedir}/../..</directory>
             <outputDirectory>/</outputDirectory>
             <includes>
                 <include>README</include>
@@ -107,14 +107,14 @@
 
     <files>
         <file>
-            <source>${basedir}/../LICENSE</source>
+            <source>../../LICENSE</source>
             <outputDirectory>/</outputDirectory>
             <destName>LICENSE</destName>
             <fileMode>0644</fileMode>
             <lineEnding>unix</lineEnding>
         </file>
         <file>
-            <source>${basedir}/NOTICE</source>
+            <source>NOTICE</source>
             <outputDirectory>/</outputDirectory>
             <destName>NOTICE</destName>
             <fileMode>0644</fileMode>

Copied: karaf/branches/karaf-2.2.x/assemblies/apache-karaf/src/main/descriptors/unix-src.xml (from r1067262, karaf/branches/karaf-2.2.x/features/assembly/framework/src/main/descriptors/unix-src.xml)
URL: http://svn.apache.org/viewvc/karaf/branches/karaf-2.2.x/assemblies/apache-karaf/src/main/descriptors/unix-src.xml?p2=karaf/branches/karaf-2.2.x/assemblies/apache-karaf/src/main/descriptors/unix-src.xml&p1=karaf/branches/karaf-2.2.x/features/assembly/framework/src/main/descriptors/unix-src.xml&r1=1067262&r2=1067265&rev=1067265&view=diff
==============================================================================
--- karaf/branches/karaf-2.2.x/features/assembly/framework/src/main/descriptors/unix-src.xml (original)
+++ karaf/branches/karaf-2.2.x/assemblies/apache-karaf/src/main/descriptors/unix-src.xml Fri Feb  4 19:29:31 2011
@@ -23,7 +23,7 @@
     <fileSets>
         <!-- Copy license and other files from root -->
         <fileSet>
-            <directory>${basedir}/..</directory>
+            <directory>../..</directory>
             <outputDirectory>/</outputDirectory>
             <includes>
                 <include>BUILDING</include>
@@ -37,7 +37,7 @@
 
         <!-- Binary Files -->
         <fileSet>
-            <directory>${basedir}/..</directory>
+            <directory>../..</directory>
             <outputDirectory>src</outputDirectory>
             <includes>
                 <include>**/*.jpeg</include>
@@ -64,7 +64,7 @@
 
         <!-- Text Files -->
         <fileSet>
-            <directory>${basedir}/..</directory>
+            <directory>../..</directory>
             <outputDirectory>src</outputDirectory>
             <includes>
                 <include>**/*</include>

Copied: karaf/branches/karaf-2.2.x/assemblies/apache-karaf/src/main/descriptors/windows-bin.xml (from r1067262, karaf/branches/karaf-2.2.x/assembly/src/main/descriptors/windows-bin.xml)
URL: http://svn.apache.org/viewvc/karaf/branches/karaf-2.2.x/assemblies/apache-karaf/src/main/descriptors/windows-bin.xml?p2=karaf/branches/karaf-2.2.x/assemblies/apache-karaf/src/main/descriptors/windows-bin.xml&p1=karaf/branches/karaf-2.2.x/assembly/src/main/descriptors/windows-bin.xml&r1=1067262&r2=1067265&rev=1067265&view=diff
==============================================================================
--- karaf/branches/karaf-2.2.x/assembly/src/main/descriptors/windows-bin.xml (original)
+++ karaf/branches/karaf-2.2.x/assemblies/apache-karaf/src/main/descriptors/windows-bin.xml Fri Feb  4 19:29:31 2011
@@ -24,7 +24,7 @@
     <fileSets>
         <!-- Copy license and other files from root -->
         <fileSet>
-            <directory>..</directory>
+            <directory>../..</directory>
             <outputDirectory>/</outputDirectory>
             <includes>
                 <include>README</include>
@@ -97,14 +97,14 @@
 
     <files>
         <file>
-            <source>${basedir}/../LICENSE</source>
+            <source>../../LICENSE</source>
             <outputDirectory>/</outputDirectory>
             <destName>LICENSE</destName>
             <fileMode>0644</fileMode>
             <lineEnding>dos</lineEnding>
         </file>
         <file>
-            <source>${basedir}/NOTICE</source>
+            <source>NOTICE</source>
             <outputDirectory>/</outputDirectory>
             <destName>NOTICE</destName>
             <fileMode>0644</fileMode>

Copied: karaf/branches/karaf-2.2.x/assemblies/apache-karaf/src/main/descriptors/windows-minimal-bin.xml (from r1067262, karaf/branches/karaf-2.2.x/assembly/src/main/descriptors/windows-minimal-bin.xml)
URL: http://svn.apache.org/viewvc/karaf/branches/karaf-2.2.x/assemblies/apache-karaf/src/main/descriptors/windows-minimal-bin.xml?p2=karaf/branches/karaf-2.2.x/assemblies/apache-karaf/src/main/descriptors/windows-minimal-bin.xml&p1=karaf/branches/karaf-2.2.x/assembly/src/main/descriptors/windows-minimal-bin.xml&r1=1067262&r2=1067265&rev=1067265&view=diff
==============================================================================
--- karaf/branches/karaf-2.2.x/assembly/src/main/descriptors/windows-minimal-bin.xml (original)
+++ karaf/branches/karaf-2.2.x/assemblies/apache-karaf/src/main/descriptors/windows-minimal-bin.xml Fri Feb  4 19:29:31 2011
@@ -26,7 +26,7 @@
 
         <!-- Copy license and other files from root -->
         <fileSet>
-            <directory>..</directory>
+            <directory>../..</directory>
             <outputDirectory>/</outputDirectory>
             <includes>
                 <include>README</include>
@@ -95,14 +95,14 @@
 
     <files>
         <file>
-            <source>${basedir}/../LICENSE</source>
+            <source>../../LICENSE</source>
             <outputDirectory>/</outputDirectory>
             <destName>LICENSE</destName>
             <fileMode>0644</fileMode>
             <lineEnding>dos</lineEnding>
         </file>
         <file>
-            <source>${basedir}/NOTICE</source>
+            <source>NOTICE</source>
             <outputDirectory>/</outputDirectory>
             <destName>NOTICE</destName>
             <fileMode>0644</fileMode>

Copied: karaf/branches/karaf-2.2.x/assemblies/apache-karaf/src/main/descriptors/windows-src.xml (from r1067262, karaf/branches/karaf-2.2.x/assembly/src/main/descriptors/windows-src.xml)
URL: http://svn.apache.org/viewvc/karaf/branches/karaf-2.2.x/assemblies/apache-karaf/src/main/descriptors/windows-src.xml?p2=karaf/branches/karaf-2.2.x/assemblies/apache-karaf/src/main/descriptors/windows-src.xml&p1=karaf/branches/karaf-2.2.x/assembly/src/main/descriptors/windows-src.xml&r1=1067262&r2=1067265&rev=1067265&view=diff
==============================================================================
--- karaf/branches/karaf-2.2.x/assembly/src/main/descriptors/windows-src.xml (original)
+++ karaf/branches/karaf-2.2.x/assemblies/apache-karaf/src/main/descriptors/windows-src.xml Fri Feb  4 19:29:31 2011
@@ -23,7 +23,7 @@
     <fileSets>
         <!-- Copy license and other files from root -->
         <fileSet>
-            <directory>${basedir}/..</directory>
+            <directory>../..</directory>
             <outputDirectory>/</outputDirectory>
             <includes>
                 <include>BUILDING</include>
@@ -37,7 +37,7 @@
 
         <!-- Binary Files -->
         <fileSet>
-            <directory>${basedir}/..</directory>
+            <directory>../..</directory>
             <outputDirectory>src</outputDirectory>
             <includes>
                 <include>**/*.jpeg</include>
@@ -64,7 +64,7 @@
 
         <!-- Text Files -->
         <fileSet>
-            <directory>${basedir}/..</directory>
+            <directory>../..</directory>
             <outputDirectory>src</outputDirectory>
             <includes>
                 <include>**/*</include>

Copied: karaf/branches/karaf-2.2.x/assemblies/apache-karaf/src/main/distribution/text/deploy/README (from r1067262, karaf/branches/karaf-2.2.x/assembly/src/main/distribution/text/deploy/README)
URL: http://svn.apache.org/viewvc/karaf/branches/karaf-2.2.x/assemblies/apache-karaf/src/main/distribution/text/deploy/README?p2=karaf/branches/karaf-2.2.x/assemblies/apache-karaf/src/main/distribution/text/deploy/README&p1=karaf/branches/karaf-2.2.x/assembly/src/main/distribution/text/deploy/README&r1=1067262&r2=1067265&rev=1067265&view=diff
==============================================================================
    (empty)

Copied: karaf/branches/karaf-2.2.x/assemblies/apache-karaf/src/main/distribution/text/etc/java.util.logging.properties (from r1067262, karaf/branches/karaf-2.2.x/assembly/src/main/distribution/text/etc/java.util.logging.properties)
URL: http://svn.apache.org/viewvc/karaf/branches/karaf-2.2.x/assemblies/apache-karaf/src/main/distribution/text/etc/java.util.logging.properties?p2=karaf/branches/karaf-2.2.x/assemblies/apache-karaf/src/main/distribution/text/etc/java.util.logging.properties&p1=karaf/branches/karaf-2.2.x/assembly/src/main/distribution/text/etc/java.util.logging.properties&r1=1067262&r2=1067265&rev=1067265&view=diff
==============================================================================
    (empty)

Copied: karaf/branches/karaf-2.2.x/assemblies/apache-karaf/src/main/distribution/text/etc/org.apache.felix.fileinstall-deploy.cfg (from r1067262, karaf/branches/karaf-2.2.x/assembly/src/main/distribution/text/etc/org.apache.felix.fileinstall-deploy.cfg)
URL: http://svn.apache.org/viewvc/karaf/branches/karaf-2.2.x/assemblies/apache-karaf/src/main/distribution/text/etc/org.apache.felix.fileinstall-deploy.cfg?p2=karaf/branches/karaf-2.2.x/assemblies/apache-karaf/src/main/distribution/text/etc/org.apache.felix.fileinstall-deploy.cfg&p1=karaf/branches/karaf-2.2.x/assembly/src/main/distribution/text/etc/org.apache.felix.fileinstall-deploy.cfg&r1=1067262&r2=1067265&rev=1067265&view=diff
==============================================================================
    (empty)

Copied: karaf/branches/karaf-2.2.x/assemblies/apache-karaf/src/main/distribution/text/etc/org.apache.karaf.jaas.cfg (from r1067262, karaf/branches/karaf-2.2.x/assembly/src/main/distribution/text/etc/org.apache.karaf.jaas.cfg)
URL: http://svn.apache.org/viewvc/karaf/branches/karaf-2.2.x/assemblies/apache-karaf/src/main/distribution/text/etc/org.apache.karaf.jaas.cfg?p2=karaf/branches/karaf-2.2.x/assemblies/apache-karaf/src/main/distribution/text/etc/org.apache.karaf.jaas.cfg&p1=karaf/branches/karaf-2.2.x/assembly/src/main/distribution/text/etc/org.apache.karaf.jaas.cfg&r1=1067262&r2=1067265&rev=1067265&view=diff
==============================================================================
    (empty)

Copied: karaf/branches/karaf-2.2.x/assemblies/apache-karaf/src/main/distribution/text/etc/org.apache.karaf.log.cfg (from r1067262, karaf/branches/karaf-2.2.x/assembly/src/main/distribution/text/etc/org.apache.karaf.log.cfg)
URL: http://svn.apache.org/viewvc/karaf/branches/karaf-2.2.x/assemblies/apache-karaf/src/main/distribution/text/etc/org.apache.karaf.log.cfg?p2=karaf/branches/karaf-2.2.x/assemblies/apache-karaf/src/main/distribution/text/etc/org.apache.karaf.log.cfg&p1=karaf/branches/karaf-2.2.x/assembly/src/main/distribution/text/etc/org.apache.karaf.log.cfg&r1=1067262&r2=1067265&rev=1067265&view=diff
==============================================================================
    (empty)

Copied: karaf/branches/karaf-2.2.x/assemblies/apache-karaf/src/main/distribution/text/etc/org.apache.karaf.management.cfg (from r1067262, karaf/branches/karaf-2.2.x/assembly/src/main/distribution/text/etc/org.apache.karaf.management.cfg)
URL: http://svn.apache.org/viewvc/karaf/branches/karaf-2.2.x/assemblies/apache-karaf/src/main/distribution/text/etc/org.apache.karaf.management.cfg?p2=karaf/branches/karaf-2.2.x/assemblies/apache-karaf/src/main/distribution/text/etc/org.apache.karaf.management.cfg&p1=karaf/branches/karaf-2.2.x/assembly/src/main/distribution/text/etc/org.apache.karaf.management.cfg&r1=1067262&r2=1067265&rev=1067265&view=diff
==============================================================================
    (empty)

Copied: karaf/branches/karaf-2.2.x/assemblies/apache-karaf/src/main/distribution/text/etc/org.apache.karaf.shell.cfg (from r1067262, karaf/branches/karaf-2.2.x/assembly/src/main/distribution/text/etc/org.apache.karaf.shell.cfg)
URL: http://svn.apache.org/viewvc/karaf/branches/karaf-2.2.x/assemblies/apache-karaf/src/main/distribution/text/etc/org.apache.karaf.shell.cfg?p2=karaf/branches/karaf-2.2.x/assemblies/apache-karaf/src/main/distribution/text/etc/org.apache.karaf.shell.cfg&p1=karaf/branches/karaf-2.2.x/assembly/src/main/distribution/text/etc/org.apache.karaf.shell.cfg&r1=1067262&r2=1067265&rev=1067265&view=diff
==============================================================================
    (empty)

Copied: karaf/branches/karaf-2.2.x/assemblies/apache-karaf/src/main/distribution/text/etc/org.ops4j.pax.logging.cfg (from r1067262, karaf/branches/karaf-2.2.x/assembly/src/main/distribution/text/etc/org.ops4j.pax.logging.cfg)
URL: http://svn.apache.org/viewvc/karaf/branches/karaf-2.2.x/assemblies/apache-karaf/src/main/distribution/text/etc/org.ops4j.pax.logging.cfg?p2=karaf/branches/karaf-2.2.x/assemblies/apache-karaf/src/main/distribution/text/etc/org.ops4j.pax.logging.cfg&p1=karaf/branches/karaf-2.2.x/assembly/src/main/distribution/text/etc/org.ops4j.pax.logging.cfg&r1=1067262&r2=1067265&rev=1067265&view=diff
==============================================================================
    (empty)

Copied: karaf/branches/karaf-2.2.x/assemblies/apache-karaf/src/main/distribution/text/etc/org.ops4j.pax.url.mvn.cfg (from r1067262, karaf/branches/karaf-2.2.x/assembly/src/main/distribution/text/etc/org.ops4j.pax.url.mvn.cfg)
URL: http://svn.apache.org/viewvc/karaf/branches/karaf-2.2.x/assemblies/apache-karaf/src/main/distribution/text/etc/org.ops4j.pax.url.mvn.cfg?p2=karaf/branches/karaf-2.2.x/assemblies/apache-karaf/src/main/distribution/text/etc/org.ops4j.pax.url.mvn.cfg&p1=karaf/branches/karaf-2.2.x/assembly/src/main/distribution/text/etc/org.ops4j.pax.url.mvn.cfg&r1=1067262&r2=1067265&rev=1067265&view=diff
==============================================================================
    (empty)

Copied: karaf/branches/karaf-2.2.x/assemblies/apache-karaf/src/main/distribution/text/etc/shell.init.script (from r1067262, karaf/branches/karaf-2.2.x/assembly/src/main/distribution/text/etc/shell.init.script)
URL: http://svn.apache.org/viewvc/karaf/branches/karaf-2.2.x/assemblies/apache-karaf/src/main/distribution/text/etc/shell.init.script?p2=karaf/branches/karaf-2.2.x/assemblies/apache-karaf/src/main/distribution/text/etc/shell.init.script&p1=karaf/branches/karaf-2.2.x/assembly/src/main/distribution/text/etc/shell.init.script&r1=1067262&r2=1067265&rev=1067265&view=diff
==============================================================================
    (empty)

Copied: karaf/branches/karaf-2.2.x/assemblies/apache-karaf/src/main/distribution/text/etc/system.properties (from r1067262, karaf/branches/karaf-2.2.x/assembly/src/main/distribution/text/etc/system.properties)
URL: http://svn.apache.org/viewvc/karaf/branches/karaf-2.2.x/assemblies/apache-karaf/src/main/distribution/text/etc/system.properties?p2=karaf/branches/karaf-2.2.x/assemblies/apache-karaf/src/main/distribution/text/etc/system.properties&p1=karaf/branches/karaf-2.2.x/assembly/src/main/distribution/text/etc/system.properties&r1=1067262&r2=1067265&rev=1067265&view=diff
==============================================================================
    (empty)

Copied: karaf/branches/karaf-2.2.x/assemblies/apache-karaf/src/main/distribution/text/etc/users.properties (from r1067262, karaf/branches/karaf-2.2.x/assembly/src/main/distribution/text/etc/users.properties)
URL: http://svn.apache.org/viewvc/karaf/branches/karaf-2.2.x/assemblies/apache-karaf/src/main/distribution/text/etc/users.properties?p2=karaf/branches/karaf-2.2.x/assemblies/apache-karaf/src/main/distribution/text/etc/users.properties&p1=karaf/branches/karaf-2.2.x/assembly/src/main/distribution/text/etc/users.properties&r1=1067262&r2=1067265&rev=1067265&view=diff
==============================================================================
    (empty)

Copied: karaf/branches/karaf-2.2.x/assemblies/apache-karaf/src/main/distribution/text/lib/README (from r1067262, karaf/branches/karaf-2.2.x/assembly/src/main/distribution/text/lib/README)
URL: http://svn.apache.org/viewvc/karaf/branches/karaf-2.2.x/assemblies/apache-karaf/src/main/distribution/text/lib/README?p2=karaf/branches/karaf-2.2.x/assemblies/apache-karaf/src/main/distribution/text/lib/README&p1=karaf/branches/karaf-2.2.x/assembly/src/main/distribution/text/lib/README&r1=1067262&r2=1067265&rev=1067265&view=diff
==============================================================================
    (empty)

Copied: karaf/branches/karaf-2.2.x/assemblies/apache-karaf/src/main/distribution/text/lib/endorsed/README (from r1067262, karaf/branches/karaf-2.2.x/assembly/src/main/distribution/text/lib/endorsed/README)
URL: http://svn.apache.org/viewvc/karaf/branches/karaf-2.2.x/assemblies/apache-karaf/src/main/distribution/text/lib/endorsed/README?p2=karaf/branches/karaf-2.2.x/assemblies/apache-karaf/src/main/distribution/text/lib/endorsed/README&p1=karaf/branches/karaf-2.2.x/assembly/src/main/distribution/text/lib/endorsed/README&r1=1067262&r2=1067265&rev=1067265&view=diff
==============================================================================
    (empty)

Copied: karaf/branches/karaf-2.2.x/assemblies/apache-karaf/src/main/distribution/text/lib/ext/README (from r1067262, karaf/branches/karaf-2.2.x/assembly/src/main/distribution/text/lib/ext/README)
URL: http://svn.apache.org/viewvc/karaf/branches/karaf-2.2.x/assemblies/apache-karaf/src/main/distribution/text/lib/ext/README?p2=karaf/branches/karaf-2.2.x/assemblies/apache-karaf/src/main/distribution/text/lib/ext/README&p1=karaf/branches/karaf-2.2.x/assembly/src/main/distribution/text/lib/ext/README&r1=1067262&r2=1067265&rev=1067265&view=diff
==============================================================================
    (empty)

Copied: karaf/branches/karaf-2.2.x/assemblies/apache-karaf/src/main/filtered-resources/demos/web/README.txt (from r1067262, karaf/branches/karaf-2.2.x/assembly/src/main/filtered-resources/demos/web/README.txt)
URL: http://svn.apache.org/viewvc/karaf/branches/karaf-2.2.x/assemblies/apache-karaf/src/main/filtered-resources/demos/web/README.txt?p2=karaf/branches/karaf-2.2.x/assemblies/apache-karaf/src/main/filtered-resources/demos/web/README.txt&p1=karaf/branches/karaf-2.2.x/assembly/src/main/filtered-resources/demos/web/README.txt&r1=1067262&r2=1067265&rev=1067265&view=diff
==============================================================================
    (empty)

Copied: karaf/branches/karaf-2.2.x/assemblies/apache-karaf/src/main/filtered-resources/etc/config.properties (from r1067262, karaf/branches/karaf-2.2.x/assembly/src/main/filtered-resources/etc/config.properties)
URL: http://svn.apache.org/viewvc/karaf/branches/karaf-2.2.x/assemblies/apache-karaf/src/main/filtered-resources/etc/config.properties?p2=karaf/branches/karaf-2.2.x/assemblies/apache-karaf/src/main/filtered-resources/etc/config.properties&p1=karaf/branches/karaf-2.2.x/assembly/src/main/filtered-resources/etc/config.properties&r1=1067262&r2=1067265&rev=1067265&view=diff
==============================================================================
    (empty)

Copied: karaf/branches/karaf-2.2.x/assemblies/apache-karaf/src/main/filtered-resources/etc/custom.properties (from r1067262, karaf/branches/karaf-2.2.x/assembly/src/main/filtered-resources/etc/custom.properties)
URL: http://svn.apache.org/viewvc/karaf/branches/karaf-2.2.x/assemblies/apache-karaf/src/main/filtered-resources/etc/custom.properties?p2=karaf/branches/karaf-2.2.x/assemblies/apache-karaf/src/main/filtered-resources/etc/custom.properties&p1=karaf/branches/karaf-2.2.x/assembly/src/main/filtered-resources/etc/custom.properties&r1=1067262&r2=1067265&rev=1067265&view=diff
==============================================================================
    (empty)

Copied: karaf/branches/karaf-2.2.x/assemblies/apache-karaf/src/main/filtered-resources/etc/jre.properties (from r1067262, karaf/branches/karaf-2.2.x/assembly/src/main/filtered-resources/etc/jre.properties)
URL: http://svn.apache.org/viewvc/karaf/branches/karaf-2.2.x/assemblies/apache-karaf/src/main/filtered-resources/etc/jre.properties?p2=karaf/branches/karaf-2.2.x/assemblies/apache-karaf/src/main/filtered-resources/etc/jre.properties&p1=karaf/branches/karaf-2.2.x/assembly/src/main/filtered-resources/etc/jre.properties&r1=1067262&r2=1067265&rev=1067265&view=diff
==============================================================================
    (empty)

Copied: karaf/branches/karaf-2.2.x/assemblies/apache-karaf/src/main/filtered-resources/etc/org.apache.karaf.features.cfg (from r1067262, karaf/branches/karaf-2.2.x/assembly/src/main/filtered-resources/etc/org.apache.karaf.features.cfg)
URL: http://svn.apache.org/viewvc/karaf/branches/karaf-2.2.x/assemblies/apache-karaf/src/main/filtered-resources/etc/org.apache.karaf.features.cfg?p2=karaf/branches/karaf-2.2.x/assemblies/apache-karaf/src/main/filtered-resources/etc/org.apache.karaf.features.cfg&p1=karaf/branches/karaf-2.2.x/assembly/src/main/filtered-resources/etc/org.apache.karaf.features.cfg&r1=1067262&r2=1067265&rev=1067265&view=diff
==============================================================================
    (empty)

Copied: karaf/branches/karaf-2.2.x/assemblies/apache-karaf/src/main/filtered-resources/etc/startup.properties (from r1067262, karaf/branches/karaf-2.2.x/assembly/src/main/filtered-resources/etc/startup.properties)
URL: http://svn.apache.org/viewvc/karaf/branches/karaf-2.2.x/assemblies/apache-karaf/src/main/filtered-resources/etc/startup.properties?p2=karaf/branches/karaf-2.2.x/assemblies/apache-karaf/src/main/filtered-resources/etc/startup.properties&p1=karaf/branches/karaf-2.2.x/assembly/src/main/filtered-resources/etc/startup.properties&r1=1067262&r2=1067265&rev=1067265&view=diff
==============================================================================
    (empty)