commit fcf2d349c3b3ab9dfddc5efe3147046c172f69dd
author Guillaume Nodet <gnodet@apache.org> Thu Jun 18 20:57:23 2009 +0000
committer Guillaume Nodet <gnodet@apache.org> Thu Jun 18 20:57:23 2009 +0000
tree 7cc69082b09080bd3155398b8afe54d9900d3431
parent 11fea1107b55b71b9ddb0c50e3483e8fa933fe05

Switch from spring-dm to blueprint

git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@786262 13f79535-47bb-0310-9956-ffa450edef68

karaf/assembly/src/main/descriptors/windows-bin.xml

diff --git a/karaf/assembly/src/main/descriptors/windows-bin.xml b/karaf/assembly/src/main/descriptors/windows-bin.xml
index 8ae133c..d693fef 100644
--- a/karaf/assembly/src/main/descriptors/windows-bin.xml
+++ b/karaf/assembly/src/main/descriptors/windows-bin.xml
@@ -139,6 +139,7 @@
                 <include>org.ops4j.pax.url:pax-url-wrap</include>
             </includes>
         </dependencySet>
+        <!--
         <dependencySet>
             <outputDirectory>/system</outputDirectory>
             <unpack>false</unpack>
@@ -162,6 +163,7 @@
                 <include>org.springframework.osgi:spring-osgi-io</include>
             </includes>
         </dependencySet>
+        -->
         <dependencySet>
             <outputDirectory>/system</outputDirectory>
             <unpack>false</unpack>
@@ -169,7 +171,9 @@
             <outputFileNameMapping>org/apache/geronimo/specs/${artifact.artifactId}/${artifact.baseVersion}/${artifact.artifactId}-${artifact.baseVersion}${dashClassifier?}.${artifact.extension}</outputFileNameMapping>
             <includes>
                 <include>org.apache.geronimo.specs:geronimo-servlet_2.5_spec</include>
+                <!--
                 <include>org.apache.geronimo.specs:geronimo-annotation_1.0_spec</include>
+                -->
             </includes>
         </dependencySet>
         <dependencySet>
@@ -178,8 +182,10 @@
             <useProjectArtifact>false</useProjectArtifact>
             <outputFileNameMapping>org/apache/servicemix/bundles/${artifact.artifactId}/${artifact.baseVersion}/${artifact.artifactId}-${artifact.baseVersion}${dashClassifier?}.${artifact.extension}</outputFileNameMapping>
             <includes>
+                <!--
                 <include>org.apache.servicemix.bundles:org.apache.servicemix.bundles.aopalliance</include>
                 <include>org.apache.servicemix.bundles:org.apache.servicemix.bundles.cglib</include>
+                -->
                 <include>org.apache.servicemix.bundles:org.apache.servicemix.bundles.jaxp-ri</include>
                 <include>org.apache.servicemix.bundles:org.apache.servicemix.bundles.oro</include>
                 <include>org.apache.servicemix.bundles:org.apache.servicemix.bundles.commons-jexl</include>
@@ -290,6 +296,15 @@
                 <include>org.eclipse:osgi</include>
             </includes>
         </dependencySet>
+        <dependencySet>
+            <outputDirectory>/system</outputDirectory>
+            <unpack>false</unpack>
+            <useProjectArtifact>false</useProjectArtifact>
+            <outputFileNameMapping>org/apache/geronimo/${artifact.artifactId}/${artifact.baseVersion}/${artifact.artifactId}-${artifact.baseVersion}${dashClassifier?}.${artifact.extension}</outputFileNameMapping>
+            <includes>
+                <include>org.apache.geronimo:blueprint-bundle</include>
+            </includes>
+        </dependencySet>
 
     </dependencySets>