You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@karaf.apache.org by jb...@apache.org on 2011/03/04 19:14:03 UTC
svn commit: r1078084 [1/2] - in /karaf/trunk: ./ admin/core/ assemblies/
assemblies/apache-karaf/ assemblies/apache-karaf/src/
assemblies/apache-karaf/src/main/
assemblies/apache-karaf/src/main/descriptors/
assemblies/apache-karaf/src/main/distribution...
Author: jbonofre
Date: Fri Mar 4 18:13:58 2011
New Revision: 1078084
URL: http://svn.apache.org/viewvc?rev=1078084&view=rev
Log:
[KARAF-457] Merge 2.2.x assemblies structure to trunk.
Added:
karaf/trunk/assemblies/apache-karaf/src/
karaf/trunk/assemblies/apache-karaf/src/main/
karaf/trunk/assemblies/apache-karaf/src/main/descriptors/
karaf/trunk/assemblies/apache-karaf/src/main/descriptors/unix-bin.xml
- copied, changed from r1077873, karaf/trunk/assembly/src/main/descriptors/unix-bin.xml
karaf/trunk/assemblies/apache-karaf/src/main/descriptors/unix-minimal-bin.xml
- copied, changed from r1077873, karaf/trunk/assembly/src/main/descriptors/unix-minimal-bin.xml
karaf/trunk/assemblies/apache-karaf/src/main/descriptors/unix-src.xml
- copied, changed from r1077873, karaf/trunk/assembly/src/main/descriptors/unix-src.xml
karaf/trunk/assemblies/apache-karaf/src/main/descriptors/windows-bin.xml
- copied, changed from r1077873, karaf/trunk/features/assembly/framework/src/main/descriptors/windows-bin.xml
karaf/trunk/assemblies/apache-karaf/src/main/descriptors/windows-minimal-bin.xml
- copied, changed from r1077873, karaf/trunk/assembly/src/main/descriptors/windows-minimal-bin.xml
karaf/trunk/assemblies/apache-karaf/src/main/descriptors/windows-src.xml
- copied, changed from r1077873, karaf/trunk/assembly/src/main/descriptors/windows-src.xml
karaf/trunk/assemblies/apache-karaf/src/main/distribution/
karaf/trunk/assemblies/apache-karaf/src/main/distribution/text/
karaf/trunk/assemblies/apache-karaf/src/main/distribution/text/deploy/
karaf/trunk/assemblies/apache-karaf/src/main/distribution/text/deploy/README
- copied, changed from r1077873, karaf/trunk/assembly/src/main/distribution/text/deploy/README
karaf/trunk/assemblies/apache-karaf/src/main/distribution/text/etc/
karaf/trunk/assemblies/apache-karaf/src/main/distribution/text/etc/java.util.logging.properties
- copied, changed from r1077873, karaf/trunk/assembly/src/main/distribution/text/etc/java.util.logging.properties
karaf/trunk/assemblies/apache-karaf/src/main/distribution/text/etc/org.apache.felix.fileinstall-deploy.cfg
- copied, changed from r1077873, karaf/trunk/assembly/src/main/distribution/text/etc/org.apache.felix.fileinstall-deploy.cfg
karaf/trunk/assemblies/apache-karaf/src/main/distribution/text/etc/org.apache.karaf.jaas.cfg
- copied, changed from r1077873, karaf/trunk/assembly/src/main/distribution/text/etc/org.apache.karaf.jaas.cfg
karaf/trunk/assemblies/apache-karaf/src/main/distribution/text/etc/org.apache.karaf.log.cfg
- copied, changed from r1077873, karaf/trunk/assembly/src/main/distribution/text/etc/org.apache.karaf.log.cfg
karaf/trunk/assemblies/apache-karaf/src/main/distribution/text/etc/org.apache.karaf.management.cfg
- copied, changed from r1077873, karaf/trunk/assembly/src/main/distribution/text/etc/org.apache.karaf.management.cfg
karaf/trunk/assemblies/apache-karaf/src/main/distribution/text/etc/org.apache.karaf.shell.cfg
- copied, changed from r1077873, karaf/trunk/assembly/src/main/distribution/text/etc/org.apache.karaf.shell.cfg
karaf/trunk/assemblies/apache-karaf/src/main/distribution/text/etc/org.ops4j.pax.logging.cfg
- copied, changed from r1077873, karaf/trunk/assembly/src/main/distribution/text/etc/org.ops4j.pax.logging.cfg
karaf/trunk/assemblies/apache-karaf/src/main/distribution/text/etc/org.ops4j.pax.url.mvn.cfg
- copied, changed from r1077873, karaf/trunk/assembly/src/main/distribution/text/etc/org.ops4j.pax.url.mvn.cfg
karaf/trunk/assemblies/apache-karaf/src/main/distribution/text/etc/shell.init.script
- copied, changed from r1077873, karaf/trunk/assembly/src/main/distribution/text/etc/shell.init.script
karaf/trunk/assemblies/apache-karaf/src/main/distribution/text/etc/system.properties
- copied, changed from r1077873, karaf/trunk/assembly/src/main/distribution/text/etc/system.properties
karaf/trunk/assemblies/apache-karaf/src/main/distribution/text/etc/users.properties
- copied, changed from r1077873, karaf/trunk/assembly/src/main/distribution/text/etc/users.properties
karaf/trunk/assemblies/apache-karaf/src/main/distribution/text/lib/
karaf/trunk/assemblies/apache-karaf/src/main/distribution/text/lib/README
- copied, changed from r1077873, karaf/trunk/assembly/src/main/distribution/text/lib/README
karaf/trunk/assemblies/apache-karaf/src/main/distribution/text/lib/endorsed/
karaf/trunk/assemblies/apache-karaf/src/main/distribution/text/lib/endorsed/README
- copied, changed from r1077873, karaf/trunk/assembly/src/main/distribution/text/lib/endorsed/README
karaf/trunk/assemblies/apache-karaf/src/main/distribution/text/lib/ext/
karaf/trunk/assemblies/apache-karaf/src/main/distribution/text/lib/ext/README
- copied, changed from r1077873, karaf/trunk/assembly/src/main/distribution/text/lib/ext/README
karaf/trunk/assemblies/apache-karaf/src/main/filtered-resources/
karaf/trunk/assemblies/apache-karaf/src/main/filtered-resources/demos/
karaf/trunk/assemblies/apache-karaf/src/main/filtered-resources/demos/web/
karaf/trunk/assemblies/apache-karaf/src/main/filtered-resources/demos/web/README.txt
- copied, changed from r1077873, karaf/trunk/assembly/src/main/filtered-resources/demos/web/README.txt
karaf/trunk/assemblies/apache-karaf/src/main/filtered-resources/etc/
karaf/trunk/assemblies/apache-karaf/src/main/filtered-resources/etc/config.properties
- copied, changed from r1077873, karaf/trunk/assembly/src/main/filtered-resources/etc/config.properties
karaf/trunk/assemblies/apache-karaf/src/main/filtered-resources/etc/custom.properties
- copied, changed from r1077873, karaf/trunk/assembly/src/main/filtered-resources/etc/custom.properties
karaf/trunk/assemblies/apache-karaf/src/main/filtered-resources/etc/jre.properties
- copied, changed from r1077873, karaf/trunk/assembly/src/main/filtered-resources/etc/jre.properties
karaf/trunk/assemblies/apache-karaf/src/main/filtered-resources/etc/org.apache.karaf.features.cfg
- copied, changed from r1077873, karaf/trunk/features/assembly/framework/src/main/filtered-resources/resources/etc/org.apache.karaf.features.cfg
karaf/trunk/assemblies/apache-karaf/src/main/filtered-resources/etc/startup.properties
- copied, changed from r1077873, karaf/trunk/assembly/src/main/filtered-resources/etc/startup.properties
karaf/trunk/assemblies/apache-karaf/src/main/filtered-resources/minimal/
karaf/trunk/assemblies/apache-karaf/src/main/filtered-resources/minimal/org.apache.karaf.features.cfg
- copied, changed from r1077873, karaf/trunk/features/assembly/framework/src/main/filtered-resources/resources/minimal/org.apache.karaf.features.cfg
karaf/trunk/assemblies/apache-karaf/src/main/filtered-resources/minimal/startup.properties
- copied, changed from r1077873, karaf/trunk/assembly/src/main/filtered-resources/minimal/startup.properties
karaf/trunk/assemblies/apache-karaf/src/main/resources/
karaf/trunk/assemblies/apache-karaf/src/main/resources/extra/
karaf/trunk/assemblies/apache-karaf/src/main/resources/extra/jetty.xml
- copied, changed from r1077873, karaf/trunk/assembly/src/main/resources/extra/jetty.xml
karaf/trunk/assemblies/features/
karaf/trunk/assemblies/features/enterprise/
karaf/trunk/assemblies/features/enterprise/pom.xml
karaf/trunk/assemblies/features/enterprise/src/
karaf/trunk/assemblies/features/enterprise/src/main/
karaf/trunk/assemblies/features/enterprise/src/main/resources/
karaf/trunk/assemblies/features/enterprise/src/main/resources/features.xml
- copied, changed from r1077873, karaf/trunk/features/assembly/enterprise/src/main/resources/features.xml
karaf/trunk/assemblies/features/framework/
karaf/trunk/assemblies/features/framework/pom.xml
karaf/trunk/assemblies/features/framework/src/
karaf/trunk/assemblies/features/framework/src/main/
karaf/trunk/assemblies/features/framework/src/main/filtered-resources/
karaf/trunk/assemblies/features/framework/src/main/filtered-resources/resources/
karaf/trunk/assemblies/features/framework/src/main/filtered-resources/resources/demos/
karaf/trunk/assemblies/features/framework/src/main/filtered-resources/resources/demos/web/
karaf/trunk/assemblies/features/framework/src/main/filtered-resources/resources/demos/web/README.txt
- copied, changed from r1077873, karaf/trunk/features/assembly/framework/src/main/filtered-resources/resources/demos/web/README.txt
karaf/trunk/assemblies/features/framework/src/main/filtered-resources/resources/etc/
karaf/trunk/assemblies/features/framework/src/main/filtered-resources/resources/etc/config.properties
- copied, changed from r1077873, karaf/trunk/features/assembly/framework/src/main/filtered-resources/resources/etc/config.properties
karaf/trunk/assemblies/features/framework/src/main/filtered-resources/resources/etc/custom.properties
- copied, changed from r1077873, karaf/trunk/features/assembly/framework/src/main/filtered-resources/resources/etc/custom.properties
karaf/trunk/assemblies/features/framework/src/main/filtered-resources/resources/etc/jre.properties
- copied, changed from r1077873, karaf/trunk/features/assembly/framework/src/main/filtered-resources/resources/etc/jre.properties
karaf/trunk/assemblies/features/framework/src/main/filtered-resources/resources/etc/org.apache.karaf.features.cfg
- copied, changed from r1077873, karaf/trunk/assembly/src/main/filtered-resources/etc/org.apache.karaf.features.cfg
karaf/trunk/assemblies/features/framework/src/main/filtered-resources/resources/etc/startup.properties
- copied, changed from r1077873, karaf/trunk/features/assembly/framework/src/main/filtered-resources/resources/etc/startup.properties
karaf/trunk/assemblies/features/framework/src/main/filtered-resources/resources/minimal/
karaf/trunk/assemblies/features/framework/src/main/filtered-resources/resources/minimal/org.apache.karaf.features.cfg
- copied, changed from r1077873, karaf/trunk/assembly/src/main/filtered-resources/minimal/org.apache.karaf.features.cfg
karaf/trunk/assemblies/features/framework/src/main/filtered-resources/resources/minimal/startup.properties
- copied, changed from r1077873, karaf/trunk/features/assembly/framework/src/main/filtered-resources/resources/minimal/startup.properties
karaf/trunk/assemblies/features/framework/src/main/resources/
karaf/trunk/assemblies/features/framework/src/main/resources/resources/
karaf/trunk/assemblies/features/framework/src/main/resources/resources/deploy/
karaf/trunk/assemblies/features/framework/src/main/resources/resources/deploy/README
- copied, changed from r1077873, karaf/trunk/features/assembly/framework/src/main/resources/resources/deploy/README
karaf/trunk/assemblies/features/framework/src/main/resources/resources/etc/
karaf/trunk/assemblies/features/framework/src/main/resources/resources/etc/java.util.logging.properties
- copied, changed from r1077873, karaf/trunk/features/assembly/framework/src/main/resources/resources/etc/java.util.logging.properties
karaf/trunk/assemblies/features/framework/src/main/resources/resources/etc/org.apache.felix.fileinstall-deploy.cfg
- copied, changed from r1077873, karaf/trunk/features/assembly/framework/src/main/resources/resources/etc/org.apache.felix.fileinstall-deploy.cfg
karaf/trunk/assemblies/features/framework/src/main/resources/resources/etc/org.apache.karaf.jaas.cfg
- copied, changed from r1077873, karaf/trunk/features/assembly/framework/src/main/resources/resources/etc/org.apache.karaf.jaas.cfg
karaf/trunk/assemblies/features/framework/src/main/resources/resources/etc/org.apache.karaf.log.cfg
- copied, changed from r1077873, karaf/trunk/features/assembly/framework/src/main/resources/resources/etc/org.apache.karaf.log.cfg
karaf/trunk/assemblies/features/framework/src/main/resources/resources/etc/org.apache.karaf.management.cfg
- copied, changed from r1077873, karaf/trunk/features/assembly/framework/src/main/resources/resources/etc/org.apache.karaf.management.cfg
karaf/trunk/assemblies/features/framework/src/main/resources/resources/etc/org.apache.karaf.shell.cfg
- copied, changed from r1077873, karaf/trunk/features/assembly/framework/src/main/resources/resources/etc/org.apache.karaf.shell.cfg
karaf/trunk/assemblies/features/framework/src/main/resources/resources/etc/org.ops4j.pax.logging.cfg
- copied, changed from r1077873, karaf/trunk/features/assembly/framework/src/main/resources/resources/etc/org.ops4j.pax.logging.cfg
karaf/trunk/assemblies/features/framework/src/main/resources/resources/etc/org.ops4j.pax.url.mvn.cfg
- copied, changed from r1077873, karaf/trunk/features/assembly/framework/src/main/resources/resources/etc/org.ops4j.pax.url.mvn.cfg
karaf/trunk/assemblies/features/framework/src/main/resources/resources/etc/shell.init.script
- copied, changed from r1077873, karaf/trunk/features/assembly/framework/src/main/resources/resources/etc/shell.init.script
karaf/trunk/assemblies/features/framework/src/main/resources/resources/etc/system.properties
- copied, changed from r1077873, karaf/trunk/features/assembly/framework/src/main/resources/resources/etc/system.properties
karaf/trunk/assemblies/features/framework/src/main/resources/resources/etc/users.properties
- copied, changed from r1077873, karaf/trunk/features/assembly/framework/src/main/resources/resources/etc/users.properties
karaf/trunk/assemblies/features/framework/src/main/resources/resources/lib/
karaf/trunk/assemblies/features/framework/src/main/resources/resources/lib/README
- copied, changed from r1077873, karaf/trunk/features/assembly/framework/src/main/resources/resources/lib/README
karaf/trunk/assemblies/features/framework/src/main/resources/resources/lib/endorsed/
karaf/trunk/assemblies/features/framework/src/main/resources/resources/lib/endorsed/README
- copied, changed from r1077873, karaf/trunk/features/assembly/framework/src/main/resources/resources/lib/endorsed/README
karaf/trunk/assemblies/features/framework/src/main/resources/resources/lib/ext/
karaf/trunk/assemblies/features/framework/src/main/resources/resources/lib/ext/README
- copied, changed from r1077873, karaf/trunk/features/assembly/framework/src/main/resources/resources/lib/ext/README
karaf/trunk/assemblies/features/pom.xml
- copied, changed from r1077873, karaf/trunk/features/assembly/pom.xml
karaf/trunk/assemblies/features/standard/
karaf/trunk/assemblies/features/standard/pom.xml
karaf/trunk/assemblies/features/standard/src/
karaf/trunk/assemblies/features/standard/src/main/
karaf/trunk/assemblies/features/standard/src/main/resources/
karaf/trunk/assemblies/features/standard/src/main/resources/features.xml
- copied, changed from r1077873, karaf/trunk/features/assembly/standard/src/main/resources/features.xml
Removed:
karaf/trunk/assemblies/apache-karaf/NOTICE
karaf/trunk/assembly/NOTICE
karaf/trunk/assembly/pom.xml
karaf/trunk/assembly/src/main/descriptors/unix-bin.xml
karaf/trunk/assembly/src/main/descriptors/unix-minimal-bin.xml
karaf/trunk/assembly/src/main/descriptors/unix-src.xml
karaf/trunk/assembly/src/main/descriptors/windows-bin.xml
karaf/trunk/assembly/src/main/descriptors/windows-minimal-bin.xml
karaf/trunk/assembly/src/main/descriptors/windows-src.xml
karaf/trunk/assembly/src/main/distribution/text/deploy/README
karaf/trunk/assembly/src/main/distribution/text/etc/java.util.logging.properties
karaf/trunk/assembly/src/main/distribution/text/etc/org.apache.felix.fileinstall-deploy.cfg
karaf/trunk/assembly/src/main/distribution/text/etc/org.apache.karaf.jaas.cfg
karaf/trunk/assembly/src/main/distribution/text/etc/org.apache.karaf.log.cfg
karaf/trunk/assembly/src/main/distribution/text/etc/org.apache.karaf.management.cfg
karaf/trunk/assembly/src/main/distribution/text/etc/org.apache.karaf.shell.cfg
karaf/trunk/assembly/src/main/distribution/text/etc/org.ops4j.pax.logging.cfg
karaf/trunk/assembly/src/main/distribution/text/etc/org.ops4j.pax.url.mvn.cfg
karaf/trunk/assembly/src/main/distribution/text/etc/shell.init.script
karaf/trunk/assembly/src/main/distribution/text/etc/system.properties
karaf/trunk/assembly/src/main/distribution/text/etc/users.properties
karaf/trunk/assembly/src/main/distribution/text/lib/README
karaf/trunk/assembly/src/main/distribution/text/lib/endorsed/README
karaf/trunk/assembly/src/main/distribution/text/lib/ext/README
karaf/trunk/assembly/src/main/distribution/unix-shell/bin/karaf
karaf/trunk/assembly/src/main/distribution/unix-shell/bin/start
karaf/trunk/assembly/src/main/distribution/unix-shell/bin/stop
karaf/trunk/assembly/src/main/distribution/windows-text/bin/karaf.bat
karaf/trunk/assembly/src/main/distribution/windows-text/bin/start.bat
karaf/trunk/assembly/src/main/distribution/windows-text/bin/stop.bat
karaf/trunk/assembly/src/main/filtered-resources/bin/admin
karaf/trunk/assembly/src/main/filtered-resources/bin/admin.bat
karaf/trunk/assembly/src/main/filtered-resources/bin/client
karaf/trunk/assembly/src/main/filtered-resources/bin/client.bat
karaf/trunk/assembly/src/main/filtered-resources/bin/shell
karaf/trunk/assembly/src/main/filtered-resources/bin/shell.bat
karaf/trunk/assembly/src/main/filtered-resources/demos/web/README.txt
karaf/trunk/assembly/src/main/filtered-resources/etc/config.properties
karaf/trunk/assembly/src/main/filtered-resources/etc/custom.properties
karaf/trunk/assembly/src/main/filtered-resources/etc/jre.properties
karaf/trunk/assembly/src/main/filtered-resources/etc/org.apache.karaf.features.cfg
karaf/trunk/assembly/src/main/filtered-resources/etc/startup.properties
karaf/trunk/assembly/src/main/filtered-resources/minimal/org.apache.karaf.features.cfg
karaf/trunk/assembly/src/main/filtered-resources/minimal/startup.properties
karaf/trunk/assembly/src/main/resources/extra/jetty.xml
karaf/trunk/features/assembly/enterprise/pom.xml
karaf/trunk/features/assembly/enterprise/src/main/resources/features.xml
karaf/trunk/features/assembly/framework/NOTICE
karaf/trunk/features/assembly/framework/pom.xml
karaf/trunk/features/assembly/framework/src/main/configfiles/jetty.xml
karaf/trunk/features/assembly/framework/src/main/descriptors/unix-bin.xml
karaf/trunk/features/assembly/framework/src/main/descriptors/unix-minimal-bin.xml
karaf/trunk/features/assembly/framework/src/main/descriptors/unix-src.xml
karaf/trunk/features/assembly/framework/src/main/descriptors/windows-bin.xml
karaf/trunk/features/assembly/framework/src/main/descriptors/windows-minimal-bin.xml
karaf/trunk/features/assembly/framework/src/main/descriptors/windows-src.xml
karaf/trunk/features/assembly/framework/src/main/filtered-resources/resources/demos/web/README.txt
karaf/trunk/features/assembly/framework/src/main/filtered-resources/resources/etc/config.properties
karaf/trunk/features/assembly/framework/src/main/filtered-resources/resources/etc/custom.properties
karaf/trunk/features/assembly/framework/src/main/filtered-resources/resources/etc/jre.properties
karaf/trunk/features/assembly/framework/src/main/filtered-resources/resources/etc/org.apache.karaf.features.cfg
karaf/trunk/features/assembly/framework/src/main/filtered-resources/resources/etc/startup.properties
karaf/trunk/features/assembly/framework/src/main/filtered-resources/resources/minimal/org.apache.karaf.features.cfg
karaf/trunk/features/assembly/framework/src/main/filtered-resources/resources/minimal/startup.properties
karaf/trunk/features/assembly/framework/src/main/resources/resources/deploy/README
karaf/trunk/features/assembly/framework/src/main/resources/resources/etc/java.util.logging.properties
karaf/trunk/features/assembly/framework/src/main/resources/resources/etc/org.apache.felix.fileinstall-deploy.cfg
karaf/trunk/features/assembly/framework/src/main/resources/resources/etc/org.apache.karaf.jaas.cfg
karaf/trunk/features/assembly/framework/src/main/resources/resources/etc/org.apache.karaf.log.cfg
karaf/trunk/features/assembly/framework/src/main/resources/resources/etc/org.apache.karaf.management.cfg
karaf/trunk/features/assembly/framework/src/main/resources/resources/etc/org.apache.karaf.shell.cfg
karaf/trunk/features/assembly/framework/src/main/resources/resources/etc/org.ops4j.pax.logging.cfg
karaf/trunk/features/assembly/framework/src/main/resources/resources/etc/org.ops4j.pax.url.mvn.cfg
karaf/trunk/features/assembly/framework/src/main/resources/resources/etc/shell.init.script
karaf/trunk/features/assembly/framework/src/main/resources/resources/etc/system.properties
karaf/trunk/features/assembly/framework/src/main/resources/resources/etc/users.properties
karaf/trunk/features/assembly/framework/src/main/resources/resources/lib/README
karaf/trunk/features/assembly/framework/src/main/resources/resources/lib/endorsed/README
karaf/trunk/features/assembly/framework/src/main/resources/resources/lib/ext/README
karaf/trunk/features/assembly/pom.xml
karaf/trunk/features/assembly/standard/pom.xml
karaf/trunk/features/assembly/standard/src/main/resources/features.xml
Modified:
karaf/trunk/admin/core/pom.xml
karaf/trunk/assemblies/apache-karaf/pom.xml
karaf/trunk/assemblies/pom.xml
karaf/trunk/features/pom.xml
karaf/trunk/pom.xml
karaf/trunk/tooling/testing/pom.xml
karaf/trunk/tooling/testing/src/main/java/org/apache/karaf/testing/Helper.java
Modified: karaf/trunk/admin/core/pom.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/admin/core/pom.xml?rev=1078084&r1=1078083&r2=1078084&view=diff
==============================================================================
--- karaf/trunk/admin/core/pom.xml (original)
+++ karaf/trunk/admin/core/pom.xml Fri Mar 4 18:13:58 2011
@@ -123,7 +123,7 @@
<outputDirectory>${basedir}/target/classes/org/apache/karaf/admin/etc</outputDirectory>
<resources>
<resource>
- <directory>../../assembly/src/main/distribution/text/etc/</directory>
+ <directory>../../assemblies/apache-karaf/src/main/distribution/text/etc/</directory>
<includes>
<include>*.properties</include>
<include>*.cfg</include>
@@ -148,7 +148,7 @@
<outputDirectory>${basedir}/target/classes/org/apache/karaf/admin/etc</outputDirectory>
<resources>
<resource>
- <directory>../../assembly/src/main/filtered-resources/etc</directory>
+ <directory>../../assemblies/apache-karaf/src/main/filtered-resources/etc</directory>
<filtering>true</filtering>
<includes>
<include>*.properties</include>
Modified: karaf/trunk/assemblies/apache-karaf/pom.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/assemblies/apache-karaf/pom.xml?rev=1078084&r1=1078083&r2=1078084&view=diff
==============================================================================
--- karaf/trunk/assemblies/apache-karaf/pom.xml (original)
+++ karaf/trunk/assemblies/apache-karaf/pom.xml Fri Mar 4 18:13:58 2011
@@ -1,6 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<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/xsd/maven-4.0.0.xsd">
+<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/xsd/maven-4.0.0.xsd">
<!--
@@ -29,408 +28,645 @@
</parent>
<artifactId>apache-karaf</artifactId>
- <packaging>karaf-assembly</packaging>
- <name>Apache Karaf :: apache-karaf Assembly</name>
+ <packaging>pom</packaging>
+ <name>Apache Karaf :: Assemblies :: Distributions</name>
<properties>
<appendedResourcesDirectory>${basedir}/../etc/appended-resources</appendedResourcesDirectory>
</properties>
<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.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>-->
+ <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.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.assemblies.features/standard/${project.version}/xml/features</descriptor>
+ <descriptor>mvn:org.apache.karaf.assemblies.features/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/trunk/assemblies/apache-karaf/src/main/descriptors/unix-bin.xml (from r1077873, karaf/trunk/assembly/src/main/descriptors/unix-bin.xml)
URL: http://svn.apache.org/viewvc/karaf/trunk/assemblies/apache-karaf/src/main/descriptors/unix-bin.xml?p2=karaf/trunk/assemblies/apache-karaf/src/main/descriptors/unix-bin.xml&p1=karaf/trunk/assembly/src/main/descriptors/unix-bin.xml&r1=1077873&r2=1078084&rev=1078084&view=diff
==============================================================================
--- karaf/trunk/assembly/src/main/descriptors/unix-bin.xml (original)
+++ karaf/trunk/assemblies/apache-karaf/src/main/descriptors/unix-bin.xml Fri Mar 4 18:13:58 2011
@@ -25,11 +25,13 @@
<!-- Copy license and other files from root -->
<fileSet>
- <directory>..</directory>
+ <directory>../..</directory>
<outputDirectory>/</outputDirectory>
<includes>
<include>README</include>
<include>RELEASE*</include>
+ <include>LICENSE</include>
+ <include>NOTICE</include>
</includes>
<lineEnding>unix</lineEnding>
</fileSet>
@@ -68,7 +70,7 @@
<lineEnding>unix</lineEnding>
</fileSet>
<fileSet>
- <directory>../demos</directory>
+ <directory>../../demos</directory>
<outputDirectory>/demos/</outputDirectory>
<lineEnding>unix</lineEnding>
<excludes>
@@ -108,23 +110,6 @@
</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>
- </files>
-
<dependencySets>
<dependencySet>
<outputDirectory>/lib/endorsed</outputDirectory>
Copied: karaf/trunk/assemblies/apache-karaf/src/main/descriptors/unix-minimal-bin.xml (from r1077873, karaf/trunk/assembly/src/main/descriptors/unix-minimal-bin.xml)
URL: http://svn.apache.org/viewvc/karaf/trunk/assemblies/apache-karaf/src/main/descriptors/unix-minimal-bin.xml?p2=karaf/trunk/assemblies/apache-karaf/src/main/descriptors/unix-minimal-bin.xml&p1=karaf/trunk/assembly/src/main/descriptors/unix-minimal-bin.xml&r1=1077873&r2=1078084&rev=1078084&view=diff
==============================================================================
--- karaf/trunk/assembly/src/main/descriptors/unix-minimal-bin.xml (original)
+++ karaf/trunk/assemblies/apache-karaf/src/main/descriptors/unix-minimal-bin.xml Fri Mar 4 18:13:58 2011
@@ -27,11 +27,13 @@
<!-- Copy license and other files from root -->
<fileSet>
- <directory>..</directory>
+ <directory>../..</directory>
<outputDirectory>/</outputDirectory>
<includes>
<include>README</include>
<include>RELEASE*</include>
+ <include>LICENSE</include>
+ <include>NOTICE</include>
</includes>
<lineEnding>unix</lineEnding>
</fileSet>
@@ -105,23 +107,6 @@
</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>
- </files>
-
<dependencySets>
<dependencySet>
<outputDirectory>/lib/endorsed</outputDirectory>
Copied: karaf/trunk/assemblies/apache-karaf/src/main/descriptors/unix-src.xml (from r1077873, karaf/trunk/assembly/src/main/descriptors/unix-src.xml)
URL: http://svn.apache.org/viewvc/karaf/trunk/assemblies/apache-karaf/src/main/descriptors/unix-src.xml?p2=karaf/trunk/assemblies/apache-karaf/src/main/descriptors/unix-src.xml&p1=karaf/trunk/assembly/src/main/descriptors/unix-src.xml&r1=1077873&r2=1078084&rev=1078084&view=diff
==============================================================================
--- karaf/trunk/assembly/src/main/descriptors/unix-src.xml (original)
+++ karaf/trunk/assemblies/apache-karaf/src/main/descriptors/unix-src.xml Fri Mar 4 18:13:58 2011
@@ -21,9 +21,10 @@
<format>tar.gz</format>
</formats>
<fileSets>
+
<!-- Copy license and other files from root -->
<fileSet>
- <directory>${basedir}/..</directory>
+ <directory>../..</directory>
<outputDirectory>/</outputDirectory>
<includes>
<include>BUILDING</include>
@@ -37,7 +38,7 @@
<!-- Binary Files -->
<fileSet>
- <directory>${basedir}/..</directory>
+ <directory>../..</directory>
<outputDirectory>src</outputDirectory>
<includes>
<include>**/*.jpeg</include>
@@ -64,7 +65,7 @@
<!-- Text Files -->
<fileSet>
- <directory>${basedir}/..</directory>
+ <directory>../..</directory>
<outputDirectory>src</outputDirectory>
<includes>
<include>**/*</include>
@@ -106,4 +107,5 @@
<lineEnding>unix</lineEnding>
</fileSet>
</fileSets>
+
</assembly>
Copied: karaf/trunk/assemblies/apache-karaf/src/main/descriptors/windows-bin.xml (from r1077873, karaf/trunk/features/assembly/framework/src/main/descriptors/windows-bin.xml)
URL: http://svn.apache.org/viewvc/karaf/trunk/assemblies/apache-karaf/src/main/descriptors/windows-bin.xml?p2=karaf/trunk/assemblies/apache-karaf/src/main/descriptors/windows-bin.xml&p1=karaf/trunk/features/assembly/framework/src/main/descriptors/windows-bin.xml&r1=1077873&r2=1078084&rev=1078084&view=diff
==============================================================================
--- karaf/trunk/features/assembly/framework/src/main/descriptors/windows-bin.xml (original)
+++ karaf/trunk/assemblies/apache-karaf/src/main/descriptors/windows-bin.xml Fri Mar 4 18:13:58 2011
@@ -24,11 +24,13 @@
<fileSets>
<!-- Copy license and other files from root -->
<fileSet>
- <directory>..</directory>
+ <directory>../..</directory>
<outputDirectory>/</outputDirectory>
<includes>
<include>README</include>
<include>RELEASE*</include>
+ <include>LICENSE</include>
+ <include>NOTICE</include>
</includes>
<lineEnding>dos</lineEnding>
</fileSet>
@@ -67,7 +69,7 @@
</fileSet>
<fileSet>
- <directory>../demos</directory>
+ <directory>../../demos</directory>
<outputDirectory>/demos/</outputDirectory>
<lineEnding>dos</lineEnding>
<excludes>
@@ -95,23 +97,6 @@
</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>
- </files>
-
<dependencySets>
<dependencySet>
<outputDirectory>/lib/endorsed</outputDirectory>
Copied: karaf/trunk/assemblies/apache-karaf/src/main/descriptors/windows-minimal-bin.xml (from r1077873, karaf/trunk/assembly/src/main/descriptors/windows-minimal-bin.xml)
URL: http://svn.apache.org/viewvc/karaf/trunk/assemblies/apache-karaf/src/main/descriptors/windows-minimal-bin.xml?p2=karaf/trunk/assemblies/apache-karaf/src/main/descriptors/windows-minimal-bin.xml&p1=karaf/trunk/assembly/src/main/descriptors/windows-minimal-bin.xml&r1=1077873&r2=1078084&rev=1078084&view=diff
==============================================================================
--- karaf/trunk/assembly/src/main/descriptors/windows-minimal-bin.xml (original)
+++ karaf/trunk/assemblies/apache-karaf/src/main/descriptors/windows-minimal-bin.xml Fri Mar 4 18:13:58 2011
@@ -26,11 +26,13 @@
<!-- Copy license and other files from root -->
<fileSet>
- <directory>..</directory>
+ <directory>../..</directory>
<outputDirectory>/</outputDirectory>
<includes>
<include>README</include>
<include>RELEASE*</include>
+ <include>LICENSE</include>
+ <include>NOTICE</include>
</includes>
<lineEnding>dos</lineEnding>
</fileSet>
@@ -93,23 +95,6 @@
</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>
- </files>
-
<dependencySets>
<dependencySet>
<outputDirectory>/lib/endorsed</outputDirectory>
Copied: karaf/trunk/assemblies/apache-karaf/src/main/descriptors/windows-src.xml (from r1077873, karaf/trunk/assembly/src/main/descriptors/windows-src.xml)
URL: http://svn.apache.org/viewvc/karaf/trunk/assemblies/apache-karaf/src/main/descriptors/windows-src.xml?p2=karaf/trunk/assemblies/apache-karaf/src/main/descriptors/windows-src.xml&p1=karaf/trunk/assembly/src/main/descriptors/windows-src.xml&r1=1077873&r2=1078084&rev=1078084&view=diff
==============================================================================
--- karaf/trunk/assembly/src/main/descriptors/windows-src.xml (original)
+++ karaf/trunk/assemblies/apache-karaf/src/main/descriptors/windows-src.xml Fri Mar 4 18:13:58 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/trunk/assemblies/apache-karaf/src/main/distribution/text/deploy/README (from r1077873, karaf/trunk/assembly/src/main/distribution/text/deploy/README)
URL: http://svn.apache.org/viewvc/karaf/trunk/assemblies/apache-karaf/src/main/distribution/text/deploy/README?p2=karaf/trunk/assemblies/apache-karaf/src/main/distribution/text/deploy/README&p1=karaf/trunk/assembly/src/main/distribution/text/deploy/README&r1=1077873&r2=1078084&rev=1078084&view=diff
==============================================================================
(empty)
Copied: karaf/trunk/assemblies/apache-karaf/src/main/distribution/text/etc/java.util.logging.properties (from r1077873, karaf/trunk/assembly/src/main/distribution/text/etc/java.util.logging.properties)
URL: http://svn.apache.org/viewvc/karaf/trunk/assemblies/apache-karaf/src/main/distribution/text/etc/java.util.logging.properties?p2=karaf/trunk/assemblies/apache-karaf/src/main/distribution/text/etc/java.util.logging.properties&p1=karaf/trunk/assembly/src/main/distribution/text/etc/java.util.logging.properties&r1=1077873&r2=1078084&rev=1078084&view=diff
==============================================================================
(empty)
Copied: karaf/trunk/assemblies/apache-karaf/src/main/distribution/text/etc/org.apache.felix.fileinstall-deploy.cfg (from r1077873, karaf/trunk/assembly/src/main/distribution/text/etc/org.apache.felix.fileinstall-deploy.cfg)
URL: http://svn.apache.org/viewvc/karaf/trunk/assemblies/apache-karaf/src/main/distribution/text/etc/org.apache.felix.fileinstall-deploy.cfg?p2=karaf/trunk/assemblies/apache-karaf/src/main/distribution/text/etc/org.apache.felix.fileinstall-deploy.cfg&p1=karaf/trunk/assembly/src/main/distribution/text/etc/org.apache.felix.fileinstall-deploy.cfg&r1=1077873&r2=1078084&rev=1078084&view=diff
==============================================================================
(empty)
Copied: karaf/trunk/assemblies/apache-karaf/src/main/distribution/text/etc/org.apache.karaf.jaas.cfg (from r1077873, karaf/trunk/assembly/src/main/distribution/text/etc/org.apache.karaf.jaas.cfg)
URL: http://svn.apache.org/viewvc/karaf/trunk/assemblies/apache-karaf/src/main/distribution/text/etc/org.apache.karaf.jaas.cfg?p2=karaf/trunk/assemblies/apache-karaf/src/main/distribution/text/etc/org.apache.karaf.jaas.cfg&p1=karaf/trunk/assembly/src/main/distribution/text/etc/org.apache.karaf.jaas.cfg&r1=1077873&r2=1078084&rev=1078084&view=diff
==============================================================================
(empty)
Copied: karaf/trunk/assemblies/apache-karaf/src/main/distribution/text/etc/org.apache.karaf.log.cfg (from r1077873, karaf/trunk/assembly/src/main/distribution/text/etc/org.apache.karaf.log.cfg)
URL: http://svn.apache.org/viewvc/karaf/trunk/assemblies/apache-karaf/src/main/distribution/text/etc/org.apache.karaf.log.cfg?p2=karaf/trunk/assemblies/apache-karaf/src/main/distribution/text/etc/org.apache.karaf.log.cfg&p1=karaf/trunk/assembly/src/main/distribution/text/etc/org.apache.karaf.log.cfg&r1=1077873&r2=1078084&rev=1078084&view=diff
==============================================================================
(empty)
Copied: karaf/trunk/assemblies/apache-karaf/src/main/distribution/text/etc/org.apache.karaf.management.cfg (from r1077873, karaf/trunk/assembly/src/main/distribution/text/etc/org.apache.karaf.management.cfg)
URL: http://svn.apache.org/viewvc/karaf/trunk/assemblies/apache-karaf/src/main/distribution/text/etc/org.apache.karaf.management.cfg?p2=karaf/trunk/assemblies/apache-karaf/src/main/distribution/text/etc/org.apache.karaf.management.cfg&p1=karaf/trunk/assembly/src/main/distribution/text/etc/org.apache.karaf.management.cfg&r1=1077873&r2=1078084&rev=1078084&view=diff
==============================================================================
(empty)
Copied: karaf/trunk/assemblies/apache-karaf/src/main/distribution/text/etc/org.apache.karaf.shell.cfg (from r1077873, karaf/trunk/assembly/src/main/distribution/text/etc/org.apache.karaf.shell.cfg)
URL: http://svn.apache.org/viewvc/karaf/trunk/assemblies/apache-karaf/src/main/distribution/text/etc/org.apache.karaf.shell.cfg?p2=karaf/trunk/assemblies/apache-karaf/src/main/distribution/text/etc/org.apache.karaf.shell.cfg&p1=karaf/trunk/assembly/src/main/distribution/text/etc/org.apache.karaf.shell.cfg&r1=1077873&r2=1078084&rev=1078084&view=diff
==============================================================================
(empty)
Copied: karaf/trunk/assemblies/apache-karaf/src/main/distribution/text/etc/org.ops4j.pax.logging.cfg (from r1077873, karaf/trunk/assembly/src/main/distribution/text/etc/org.ops4j.pax.logging.cfg)
URL: http://svn.apache.org/viewvc/karaf/trunk/assemblies/apache-karaf/src/main/distribution/text/etc/org.ops4j.pax.logging.cfg?p2=karaf/trunk/assemblies/apache-karaf/src/main/distribution/text/etc/org.ops4j.pax.logging.cfg&p1=karaf/trunk/assembly/src/main/distribution/text/etc/org.ops4j.pax.logging.cfg&r1=1077873&r2=1078084&rev=1078084&view=diff
==============================================================================
(empty)
Copied: karaf/trunk/assemblies/apache-karaf/src/main/distribution/text/etc/org.ops4j.pax.url.mvn.cfg (from r1077873, karaf/trunk/assembly/src/main/distribution/text/etc/org.ops4j.pax.url.mvn.cfg)
URL: http://svn.apache.org/viewvc/karaf/trunk/assemblies/apache-karaf/src/main/distribution/text/etc/org.ops4j.pax.url.mvn.cfg?p2=karaf/trunk/assemblies/apache-karaf/src/main/distribution/text/etc/org.ops4j.pax.url.mvn.cfg&p1=karaf/trunk/assembly/src/main/distribution/text/etc/org.ops4j.pax.url.mvn.cfg&r1=1077873&r2=1078084&rev=1078084&view=diff
==============================================================================
(empty)
Copied: karaf/trunk/assemblies/apache-karaf/src/main/distribution/text/etc/shell.init.script (from r1077873, karaf/trunk/assembly/src/main/distribution/text/etc/shell.init.script)
URL: http://svn.apache.org/viewvc/karaf/trunk/assemblies/apache-karaf/src/main/distribution/text/etc/shell.init.script?p2=karaf/trunk/assemblies/apache-karaf/src/main/distribution/text/etc/shell.init.script&p1=karaf/trunk/assembly/src/main/distribution/text/etc/shell.init.script&r1=1077873&r2=1078084&rev=1078084&view=diff
==============================================================================
(empty)
Copied: karaf/trunk/assemblies/apache-karaf/src/main/distribution/text/etc/system.properties (from r1077873, karaf/trunk/assembly/src/main/distribution/text/etc/system.properties)
URL: http://svn.apache.org/viewvc/karaf/trunk/assemblies/apache-karaf/src/main/distribution/text/etc/system.properties?p2=karaf/trunk/assemblies/apache-karaf/src/main/distribution/text/etc/system.properties&p1=karaf/trunk/assembly/src/main/distribution/text/etc/system.properties&r1=1077873&r2=1078084&rev=1078084&view=diff
==============================================================================
(empty)
Re: svn commit: r1078084 [1/2] - in /karaf/trunk: ./ admin/core/assemblies/ assemblies/apache-karaf/ assemblies/apache-karaf/src/ assemblies/apache-karaf/src/main/assemblies/apache-karaf/src/main/descriptors/ assemblies/apache-karaf/src/main/distribution.
Posted by jb...@nanthrax.net.
Indeed, I will add this also.
Regards
JB
-----Original Message-----
From: Achim Nierbeck <bc...@googlemail.com>
Date: Mon, 07 Mar 2011 00:20:08
To: <de...@karaf.apache.org>
Reply-To: dev@karaf.apache.org
Subject: Re: svn commit: r1078084 [1/2] - in /karaf/trunk: ./ admin/core/
assemblies/ assemblies/apache-karaf/ assemblies/apache-karaf/src/ assemblies/apache-karaf/src/main/
assemblies/apache-karaf/src/main/descriptors/ assemblies/apache-karaf/src/main/distribution...
Oh and another strange thing,
didn't we used to have "client" and "shell" scripts for windows and *nix?
Those are gone to, and I don't find them in the filtered-resources sources.
These are available in 2.2.x branch thoug.
Regards, Achim
> Hi David,
>
> I added the scripts in
> assemblies/apache-karaf/src/main/distribution/unix-shell and
> assemblies/apache-karaf/src/main/distribution/windows-text.
>
> It should be ok now (I'm making a test) :)
> Revision 1078538.
>
> Regards
> JB
>
> On 03/06/2011 12:03 AM, David Jencks wrote:
>> Maybe I did something strange locally but I can't find the files
>> below in my checkout or in the assembly I build.... making it rather
>> hard to start karaf.
>>
>> ??
>>
>> thanks
>> david jencks
>>
>> On Mar 4, 2011, at 10:14 AM, jbonofre@apache.org wrote:
>>
>>> Author: jbonofre
>>> Date: Fri Mar 4 18:13:58 2011
>>> New Revision: 1078084
>>>
>>> URL: http://svn.apache.org/viewvc?rev=1078084&view=rev
>>> Log:
>>> [KARAF-457] Merge 2.2.x assemblies structure to trunk.
>>>
>> ...
>>> Removed:
>> ...
>>> karaf/trunk/assembly/src/main/distribution/unix-shell/bin/karaf
>>> karaf/trunk/assembly/src/main/distribution/unix-shell/bin/start
>>> karaf/trunk/assembly/src/main/distribution/unix-shell/bin/stop
>>>
>>> karaf/trunk/assembly/src/main/distribution/windows-text/bin/karaf.bat
>>>
>>> karaf/trunk/assembly/src/main/distribution/windows-text/bin/start.bat
>>>
>>> karaf/trunk/assembly/src/main/distribution/windows-text/bin/stop.bat
>>
Re: svn commit: r1078084 [1/2] - in /karaf/trunk: ./ admin/core/assemblies/ assemblies/apache-karaf/ assemblies/apache-karaf/src/ assemblies/apache-karaf/src/main/assemblies/apache-karaf/src/main/descriptors/ assemblies/apache-karaf/src/main/distribution.
Posted by jb...@nanthrax.net.
I got really a weird behavior with git: it didn't push the files on svn.
Regards
JB
-----Original Message-----
From: Achim Nierbeck <bc...@googlemail.com>
Date: Mon, 07 Mar 2011 00:20:08
To: <de...@karaf.apache.org>
Reply-To: dev@karaf.apache.org
Subject: Re: svn commit: r1078084 [1/2] - in /karaf/trunk: ./ admin/core/
assemblies/ assemblies/apache-karaf/ assemblies/apache-karaf/src/ assemblies/apache-karaf/src/main/
assemblies/apache-karaf/src/main/descriptors/ assemblies/apache-karaf/src/main/distribution...
Oh and another strange thing,
didn't we used to have "client" and "shell" scripts for windows and *nix?
Those are gone to, and I don't find them in the filtered-resources sources.
These are available in 2.2.x branch thoug.
Regards, Achim
> Hi David,
>
> I added the scripts in
> assemblies/apache-karaf/src/main/distribution/unix-shell and
> assemblies/apache-karaf/src/main/distribution/windows-text.
>
> It should be ok now (I'm making a test) :)
> Revision 1078538.
>
> Regards
> JB
>
> On 03/06/2011 12:03 AM, David Jencks wrote:
>> Maybe I did something strange locally but I can't find the files
>> below in my checkout or in the assembly I build.... making it rather
>> hard to start karaf.
>>
>> ??
>>
>> thanks
>> david jencks
>>
>> On Mar 4, 2011, at 10:14 AM, jbonofre@apache.org wrote:
>>
>>> Author: jbonofre
>>> Date: Fri Mar 4 18:13:58 2011
>>> New Revision: 1078084
>>>
>>> URL: http://svn.apache.org/viewvc?rev=1078084&view=rev
>>> Log:
>>> [KARAF-457] Merge 2.2.x assemblies structure to trunk.
>>>
>> ...
>>> Removed:
>> ...
>>> karaf/trunk/assembly/src/main/distribution/unix-shell/bin/karaf
>>> karaf/trunk/assembly/src/main/distribution/unix-shell/bin/start
>>> karaf/trunk/assembly/src/main/distribution/unix-shell/bin/stop
>>>
>>> karaf/trunk/assembly/src/main/distribution/windows-text/bin/karaf.bat
>>>
>>> karaf/trunk/assembly/src/main/distribution/windows-text/bin/start.bat
>>>
>>> karaf/trunk/assembly/src/main/distribution/windows-text/bin/stop.bat
>>
Re: svn commit: r1078084 [1/2] - in /karaf/trunk: ./ admin/core/
assemblies/ assemblies/apache-karaf/ assemblies/apache-karaf/src/ assemblies/apache-karaf/src/main/
assemblies/apache-karaf/src/main/descriptors/ assemblies/apache-karaf/src/main/distribution...
Posted by Achim Nierbeck <bc...@googlemail.com>.
Oh and another strange thing,
didn't we used to have "client" and "shell" scripts for windows and *nix?
Those are gone to, and I don't find them in the filtered-resources sources.
These are available in 2.2.x branch thoug.
Regards, Achim
> Hi David,
>
> I added the scripts in
> assemblies/apache-karaf/src/main/distribution/unix-shell and
> assemblies/apache-karaf/src/main/distribution/windows-text.
>
> It should be ok now (I'm making a test) :)
> Revision 1078538.
>
> Regards
> JB
>
> On 03/06/2011 12:03 AM, David Jencks wrote:
>> Maybe I did something strange locally but I can't find the files
>> below in my checkout or in the assembly I build.... making it rather
>> hard to start karaf.
>>
>> ??
>>
>> thanks
>> david jencks
>>
>> On Mar 4, 2011, at 10:14 AM, jbonofre@apache.org wrote:
>>
>>> Author: jbonofre
>>> Date: Fri Mar 4 18:13:58 2011
>>> New Revision: 1078084
>>>
>>> URL: http://svn.apache.org/viewvc?rev=1078084&view=rev
>>> Log:
>>> [KARAF-457] Merge 2.2.x assemblies structure to trunk.
>>>
>> ...
>>> Removed:
>> ...
>>> karaf/trunk/assembly/src/main/distribution/unix-shell/bin/karaf
>>> karaf/trunk/assembly/src/main/distribution/unix-shell/bin/start
>>> karaf/trunk/assembly/src/main/distribution/unix-shell/bin/stop
>>>
>>> karaf/trunk/assembly/src/main/distribution/windows-text/bin/karaf.bat
>>>
>>> karaf/trunk/assembly/src/main/distribution/windows-text/bin/start.bat
>>>
>>> karaf/trunk/assembly/src/main/distribution/windows-text/bin/stop.bat
>>
Re: svn commit: r1078084 [1/2] - in /karaf/trunk: ./ admin/core/
assemblies/ assemblies/apache-karaf/ assemblies/apache-karaf/src/ assemblies/apache-karaf/src/main/
assemblies/apache-karaf/src/main/descriptors/ assemblies/apache-karaf/src/main/distribution...
Posted by Achim Nierbeck <bc...@googlemail.com>.
Hi JB,
could it be that the features aren't included in the assembled karaf.
That way a edit on the features.xml is not possible after build :(
Regards, Achim
> Hi David,
>
> I added the scripts in
> assemblies/apache-karaf/src/main/distribution/unix-shell and
> assemblies/apache-karaf/src/main/distribution/windows-text.
>
> It should be ok now (I'm making a test) :)
> Revision 1078538.
>
> Regards
> JB
>
> On 03/06/2011 12:03 AM, David Jencks wrote:
>> Maybe I did something strange locally but I can't find the files
>> below in my checkout or in the assembly I build.... making it rather
>> hard to start karaf.
>>
>> ??
>>
>> thanks
>> david jencks
>>
>> On Mar 4, 2011, at 10:14 AM, jbonofre@apache.org wrote:
>>
>>> Author: jbonofre
>>> Date: Fri Mar 4 18:13:58 2011
>>> New Revision: 1078084
>>>
>>> URL: http://svn.apache.org/viewvc?rev=1078084&view=rev
>>> Log:
>>> [KARAF-457] Merge 2.2.x assemblies structure to trunk.
>>>
>> ...
>>> Removed:
>> ...
>>> karaf/trunk/assembly/src/main/distribution/unix-shell/bin/karaf
>>> karaf/trunk/assembly/src/main/distribution/unix-shell/bin/start
>>> karaf/trunk/assembly/src/main/distribution/unix-shell/bin/stop
>>>
>>> karaf/trunk/assembly/src/main/distribution/windows-text/bin/karaf.bat
>>>
>>> karaf/trunk/assembly/src/main/distribution/windows-text/bin/start.bat
>>>
>>> karaf/trunk/assembly/src/main/distribution/windows-text/bin/stop.bat
>>
Re: svn commit: r1078084 [1/2] - in /karaf/trunk: ./ admin/core/
assemblies/ assemblies/apache-karaf/ assemblies/apache-karaf/src/ assemblies/apache-karaf/src/main/
assemblies/apache-karaf/src/main/descriptors/ assemblies/apache-karaf/src/main/distribution...
Posted by Jean-Baptiste Onofré <jb...@nanthrax.net>.
Hi David,
I added the scripts in
assemblies/apache-karaf/src/main/distribution/unix-shell and
assemblies/apache-karaf/src/main/distribution/windows-text.
It should be ok now (I'm making a test) :)
Revision 1078538.
Regards
JB
On 03/06/2011 12:03 AM, David Jencks wrote:
> Maybe I did something strange locally but I can't find the files below in my checkout or in the assembly I build.... making it rather hard to start karaf.
>
> ??
>
> thanks
> david jencks
>
> On Mar 4, 2011, at 10:14 AM, jbonofre@apache.org wrote:
>
>> Author: jbonofre
>> Date: Fri Mar 4 18:13:58 2011
>> New Revision: 1078084
>>
>> URL: http://svn.apache.org/viewvc?rev=1078084&view=rev
>> Log:
>> [KARAF-457] Merge 2.2.x assemblies structure to trunk.
>>
> ...
>> Removed:
> ...
>> karaf/trunk/assembly/src/main/distribution/unix-shell/bin/karaf
>> karaf/trunk/assembly/src/main/distribution/unix-shell/bin/start
>> karaf/trunk/assembly/src/main/distribution/unix-shell/bin/stop
>> karaf/trunk/assembly/src/main/distribution/windows-text/bin/karaf.bat
>> karaf/trunk/assembly/src/main/distribution/windows-text/bin/start.bat
>> karaf/trunk/assembly/src/main/distribution/windows-text/bin/stop.bat
>
Re: svn commit: r1078084 [1/2] - in /karaf/trunk: ./ admin/core/ assemblies/ assemblies/apache-karaf/ assemblies/apache-karaf/src/ assemblies/apache-karaf/src/main/ assemblies/apache-karaf/src/main/descriptors/ assemblies/apache-karaf/src/main/distributio
Posted by jb...@nanthrax.net.
I'm gonna check but I made a complete build including start from the assembly.
Regards
JB
-----Original Message-----
From: David Jencks <da...@yahoo.com>
Date: Sat, 5 Mar 2011 15:03:12
To: <de...@karaf.apache.org>
Reply-To: dev@karaf.apache.org
Subject: Re: svn commit: r1078084 [1/2] - in /karaf/trunk: ./ admin/core/ assemblies/ assemblies/apache-karaf/ assemblies/apache-karaf/src/ assemblies/apache-karaf/src/main/ assemblies/apache-karaf/src/main/descriptors/ assemblies/apache-karaf/src/main/distribution...
Maybe I did something strange locally but I can't find the files below in my checkout or in the assembly I build.... making it rather hard to start karaf.
??
thanks
david jencks
On Mar 4, 2011, at 10:14 AM, jbonofre@apache.org wrote:
> Author: jbonofre
> Date: Fri Mar 4 18:13:58 2011
> New Revision: 1078084
>
> URL: http://svn.apache.org/viewvc?rev=1078084&view=rev
> Log:
> [KARAF-457] Merge 2.2.x assemblies structure to trunk.
>
...
> Removed:
...
> karaf/trunk/assembly/src/main/distribution/unix-shell/bin/karaf
> karaf/trunk/assembly/src/main/distribution/unix-shell/bin/start
> karaf/trunk/assembly/src/main/distribution/unix-shell/bin/stop
> karaf/trunk/assembly/src/main/distribution/windows-text/bin/karaf.bat
> karaf/trunk/assembly/src/main/distribution/windows-text/bin/start.bat
> karaf/trunk/assembly/src/main/distribution/windows-text/bin/stop.bat
Re: svn commit: r1078084 [1/2] - in /karaf/trunk: ./ admin/core/ assemblies/ assemblies/apache-karaf/ assemblies/apache-karaf/src/ assemblies/apache-karaf/src/main/ assemblies/apache-karaf/src/main/descriptors/ assemblies/apache-karaf/src/main/distribution...
Posted by David Jencks <da...@yahoo.com>.
Maybe I did something strange locally but I can't find the files below in my checkout or in the assembly I build.... making it rather hard to start karaf.
??
thanks
david jencks
On Mar 4, 2011, at 10:14 AM, jbonofre@apache.org wrote:
> Author: jbonofre
> Date: Fri Mar 4 18:13:58 2011
> New Revision: 1078084
>
> URL: http://svn.apache.org/viewvc?rev=1078084&view=rev
> Log:
> [KARAF-457] Merge 2.2.x assemblies structure to trunk.
>
...
> Removed:
...
> karaf/trunk/assembly/src/main/distribution/unix-shell/bin/karaf
> karaf/trunk/assembly/src/main/distribution/unix-shell/bin/start
> karaf/trunk/assembly/src/main/distribution/unix-shell/bin/stop
> karaf/trunk/assembly/src/main/distribution/windows-text/bin/karaf.bat
> karaf/trunk/assembly/src/main/distribution/windows-text/bin/start.bat
> karaf/trunk/assembly/src/main/distribution/windows-text/bin/stop.bat