From notifications-return-16427-apmail-ant-notifications-archive=ant.apache.org@ant.apache.org Wed Jul 13 08:53:41 2011 Return-Path: X-Original-To: apmail-ant-notifications-archive@minotaur.apache.org Delivered-To: apmail-ant-notifications-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 66E124828 for ; Wed, 13 Jul 2011 08:53:41 +0000 (UTC) Received: (qmail 35697 invoked by uid 500); 13 Jul 2011 08:53:34 -0000 Delivered-To: apmail-ant-notifications-archive@ant.apache.org Received: (qmail 35135 invoked by uid 500); 13 Jul 2011 08:53:26 -0000 Mailing-List: contact notifications-help@ant.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@ant.apache.org Delivered-To: mailing list notifications@ant.apache.org Received: (qmail 35103 invoked by uid 99); 13 Jul 2011 08:53:21 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 13 Jul 2011 08:53:21 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 13 Jul 2011 08:53:18 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id E32032388980 for ; Wed, 13 Jul 2011 08:52:57 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1145911 - /ant/ivy/core/trunk/src/java/org/apache/ivy/osgi/obr/xml/OBRXMLWriter.java Date: Wed, 13 Jul 2011 08:52:57 -0000 To: notifications@ant.apache.org From: hibou@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20110713085257.E32032388980@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: hibou Date: Wed Jul 13 08:52:57 2011 New Revision: 1145911 URL: http://svn.apache.org/viewvc?rev=1145911&view=rev Log: IVY-1304: - make the buildobr Ant task generate OBR XML that is not compatible with Felix bundlerepository Modified: ant/ivy/core/trunk/src/java/org/apache/ivy/osgi/obr/xml/OBRXMLWriter.java Modified: ant/ivy/core/trunk/src/java/org/apache/ivy/osgi/obr/xml/OBRXMLWriter.java URL: http://svn.apache.org/viewvc/ant/ivy/core/trunk/src/java/org/apache/ivy/osgi/obr/xml/OBRXMLWriter.java?rev=1145911&r1=1145910&r2=1145911&view=diff ============================================================================== --- ant/ivy/core/trunk/src/java/org/apache/ivy/osgi/obr/xml/OBRXMLWriter.java (original) +++ ant/ivy/core/trunk/src/java/org/apache/ivy/osgi/obr/xml/OBRXMLWriter.java Wed Jul 13 08:52:57 2011 @@ -225,21 +225,29 @@ public class OBRXMLWriter { filter.append("(&"); Version start = v.getStartVersion(); if (start != null) { - filter.append("(version>"); if (!v.isStartExclusive()) { - filter.append('='); + filter.append("(version>="); + filter.append(start.toString()); + filter.append(')'); + } else { + filter.append("(!"); + filter.append("(version<="); + filter.append(start.toString()); + filter.append("))"); } - filter.append(start.toString()); - filter.append(')'); } Version end = v.getEndVersion(); if (end != null) { - filter.append("(version<"); if (!v.isEndExclusive()) { - filter.append('='); + filter.append("(version<="); + filter.append(end.toString()); + filter.append(')'); + } else { + filter.append("(!"); + filter.append("(version>="); + filter.append(end.toString()); + filter.append("))"); } - filter.append(end.toString()); - filter.append(')'); } }