commit 9c136368efe150f957a39ab919c35176557b11e1
author Guillaume Nodet <gnodet@apache.org> Tue Jul 22 15:51:21 2014 +0000
committer Guillaume Nodet <gnodet@apache.org> Tue Jul 22 15:51:21 2014 +0000
tree 7a8c8fa834a39d7c6f2bc6ba99a1f3200914c491
parent 102c1a4073e269b7b240084449c255cf64f45ce0

[FELIX-4576] Bad Require-Capability generation when the SCR target filter has no parentheses

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

bundleplugin/src/main/resources/org/apache/felix/bundleplugin/scr.xsl

diff --git a/bundleplugin/src/main/resources/org/apache/felix/bundleplugin/scr.xsl b/bundleplugin/src/main/resources/org/apache/felix/bundleplugin/scr.xsl
index c233cc9..bc9caf0 100644
--- a/bundleplugin/src/main/resources/org/apache/felix/bundleplugin/scr.xsl
+++ b/bundleplugin/src/main/resources/org/apache/felix/bundleplugin/scr.xsl
@@ -68,7 +68,14 @@
             </xsl:choose>
             <xsl:choose>
                 <xsl:when test="@target">
-                    <xsl:value-of select="concat('filter:=&quot;(&amp;(objectClass=', @interface, ')', @target, ')&quot;')"/>
+                    <xsl:choose>
+                        <xsl:when test="starts-with(@target, '(')">
+                            <xsl:value-of select="concat('filter:=&quot;(&amp;(objectClass=', @interface, ')', @target, ')&quot;')"/>
+                        </xsl:when>
+                        <xsl:otherwise>
+                            <xsl:value-of select="concat('filter:=&quot;(&amp;(objectClass=', @interface, ')(', @target, '))&quot;')"/>
+                        </xsl:otherwise>
+                    </xsl:choose>
                 </xsl:when>
                 <xsl:otherwise>
                     <xsl:value-of select="concat('filter:=&quot;(objectClass=', @interface, ')&quot;')"/>