felix-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From gno...@apache.org
Subject svn commit: r1628630 - /felix/trunk/bundleplugin/src/main/resources/org/apache/felix/bundleplugin/scr.xsl
Date Wed, 01 Oct 2014 07:43:04 GMT
Author: gnodet
Date: Wed Oct  1 07:43:04 2014
New Revision: 1628630

URL: http://svn.apache.org/r1628630
Log:
[FELIX-4659] The maven bundle plugin incorrectly reports cardinality on service references
in the generated generic requirements

Modified:
    felix/trunk/bundleplugin/src/main/resources/org/apache/felix/bundleplugin/scr.xsl

Modified: felix/trunk/bundleplugin/src/main/resources/org/apache/felix/bundleplugin/scr.xsl
URL: http://svn.apache.org/viewvc/felix/trunk/bundleplugin/src/main/resources/org/apache/felix/bundleplugin/scr.xsl?rev=1628630&r1=1628629&r2=1628630&view=diff
==============================================================================
--- felix/trunk/bundleplugin/src/main/resources/org/apache/felix/bundleplugin/scr.xsl (original)
+++ felix/trunk/bundleplugin/src/main/resources/org/apache/felix/bundleplugin/scr.xsl Wed
Oct  1 07:43:04 2014
@@ -62,9 +62,15 @@
                               //scr12:component/reference">
             <xsl:value-of select="'Require-Capability: osgi.service;effective:=active;'"
/>
             <xsl:choose>
-                <xsl:when test="@cardinality = '0..1' or @cardinality = '0..n'">
+                <xsl:when test="@cardinality = '0..1'">
                     <xsl:value-of select="'resolution:=optional;'" />
                 </xsl:when>
+                <xsl:when test="@cardinality = '0..n'">
+                    <xsl:value-of select="'resolution:=optional;cardinality:=multiple;'"
/>
+                </xsl:when>
+                <xsl:when test="@cardinality = '1..n'">
+                    <xsl:value-of select="'cardinality:=multiple;'" />
+                </xsl:when>
             </xsl:choose>
             <xsl:choose>
                 <xsl:when test="@target">



Mime
View raw message