FELIX-1111: allow karaf to run on equinox
git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@771836 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/karaf/assembly/src/main/descriptors/unix-bin.xml b/karaf/assembly/src/main/descriptors/unix-bin.xml
index 5363a46..c802940 100644
--- a/karaf/assembly/src/main/descriptors/unix-bin.xml
+++ b/karaf/assembly/src/main/descriptors/unix-bin.xml
@@ -124,6 +124,7 @@
<include>org.apache.felix:org.osgi.compendium</include>
<include>org.apache.felix:org.apache.felix.configadmin</include>
<include>org.apache.felix:org.apache.felix.prefs</include>
+ <include>org.apache.felix:org.apache.felix.framework</include>
</includes>
</dependencySet>
<dependencySet>
@@ -287,6 +288,15 @@
<include>com.oracle.osgi:jmx-impl</include>
</includes>
</dependencySet>
+ <dependencySet>
+ <outputDirectory>/system</outputDirectory>
+ <unpack>false</unpack>
+ <useProjectArtifact>false</useProjectArtifact>
+ <outputFileNameMapping>org/eclipse/${artifact.artifactId}/${artifact.baseVersion}/${artifact.artifactId}-${artifact.baseVersion}${dashClassifier?}.${artifact.extension}</outputFileNameMapping>
+ <includes>
+ <include>org.eclipse:osgi</include>
+ </includes>
+ </dependencySet>
</dependencySets>
diff --git a/karaf/assembly/src/main/descriptors/windows-bin.xml b/karaf/assembly/src/main/descriptors/windows-bin.xml
index 59e1068..d920cb9 100644
--- a/karaf/assembly/src/main/descriptors/windows-bin.xml
+++ b/karaf/assembly/src/main/descriptors/windows-bin.xml
@@ -116,6 +116,7 @@
<include>org.apache.felix:org.osgi.compendium</include>
<include>org.apache.felix:org.apache.felix.configadmin</include>
<include>org.apache.felix:org.apache.felix.prefs</include>
+ <include>org.apache.felix:org.apache.felix.framework</include>
</includes>
</dependencySet>
<dependencySet>
@@ -279,6 +280,15 @@
<include>com.oracle.osgi:jmx-impl</include>
</includes>
</dependencySet>
+ <dependencySet>
+ <outputDirectory>/system</outputDirectory>
+ <unpack>false</unpack>
+ <useProjectArtifact>false</useProjectArtifact>
+ <outputFileNameMapping>org/eclipse/${artifact.artifactId}/${artifact.baseVersion}/${artifact.artifactId}-${artifact.baseVersion}${dashClassifier?}.${artifact.extension}</outputFileNameMapping>
+ <includes>
+ <include>org.eclipse:osgi</include>
+ </includes>
+ </dependencySet>
</dependencySets>