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 C3EFF9F8D for ; Thu, 12 Apr 2012 08:00:10 +0000 (UTC) Received: (qmail 76806 invoked by uid 500); 12 Apr 2012 08:00:10 -0000 Delivered-To: apmail-ant-notifications-archive@ant.apache.org Received: (qmail 76732 invoked by uid 500); 12 Apr 2012 08:00:10 -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 76713 invoked by uid 99); 12 Apr 2012 08:00:10 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 12 Apr 2012 08:00:10 +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; Thu, 12 Apr 2012 08:00:08 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id A0ADC23889E3 for ; Thu, 12 Apr 2012 07:59:48 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1325150 - in /ant/ivy/core/trunk: src/java/org/apache/ivy/osgi/obr/ src/java/org/apache/ivy/osgi/repo/ src/java/org/apache/ivy/osgi/updatesite/ test/java/org/apache/ivy/osgi/obr/ Date: Thu, 12 Apr 2012 07:59:48 -0000 To: notifications@ant.apache.org From: hibou@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20120412075948.A0ADC23889E3@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: hibou Date: Thu Apr 12 07:59:47 2012 New Revision: 1325150 URL: http://svn.apache.org/viewvc?rev=1325150&view=rev Log: Use Java 1.4 APIs Added: ant/ivy/core/trunk/src/java/org/apache/ivy/osgi/repo/AbstractOSGiResolver.java - copied, changed from r1324865, ant/ivy/core/trunk/src/java/org/apache/ivy/osgi/repo/RepoDescriptorBasedResolver.java Removed: ant/ivy/core/trunk/src/java/org/apache/ivy/osgi/repo/RepoDescriptorBasedResolver.java Modified: ant/ivy/core/trunk/src/java/org/apache/ivy/osgi/obr/OBRResolver.java ant/ivy/core/trunk/src/java/org/apache/ivy/osgi/updatesite/UpdateSiteResolver.java ant/ivy/core/trunk/test/java/org/apache/ivy/osgi/obr/OBRResolverTest.java Modified: ant/ivy/core/trunk/src/java/org/apache/ivy/osgi/obr/OBRResolver.java URL: http://svn.apache.org/viewvc/ant/ivy/core/trunk/src/java/org/apache/ivy/osgi/obr/OBRResolver.java?rev=1325150&r1=1325149&r2=1325150&view=diff ============================================================================== --- ant/ivy/core/trunk/src/java/org/apache/ivy/osgi/obr/OBRResolver.java (original) +++ ant/ivy/core/trunk/src/java/org/apache/ivy/osgi/obr/OBRResolver.java Thu Apr 12 07:59:47 2012 @@ -31,12 +31,12 @@ import org.apache.ivy.core.cache.CacheRe import org.apache.ivy.core.event.EventManager; import org.apache.ivy.core.report.ArtifactDownloadReport; import org.apache.ivy.osgi.obr.xml.OBRXMLParser; -import org.apache.ivy.osgi.repo.RepoDescriptorBasedResolver; +import org.apache.ivy.osgi.repo.AbstractOSGiResolver; import org.apache.ivy.plugins.repository.Resource; import org.apache.ivy.plugins.repository.url.URLResource; import org.xml.sax.SAXException; -public class OBRResolver extends RepoDescriptorBasedResolver { +public class OBRResolver extends AbstractOSGiResolver { private String repoXmlURL; Copied: ant/ivy/core/trunk/src/java/org/apache/ivy/osgi/repo/AbstractOSGiResolver.java (from r1324865, ant/ivy/core/trunk/src/java/org/apache/ivy/osgi/repo/RepoDescriptorBasedResolver.java) URL: http://svn.apache.org/viewvc/ant/ivy/core/trunk/src/java/org/apache/ivy/osgi/repo/AbstractOSGiResolver.java?p2=ant/ivy/core/trunk/src/java/org/apache/ivy/osgi/repo/AbstractOSGiResolver.java&p1=ant/ivy/core/trunk/src/java/org/apache/ivy/osgi/repo/RepoDescriptorBasedResolver.java&r1=1324865&r2=1325150&rev=1325150&view=diff ============================================================================== --- ant/ivy/core/trunk/src/java/org/apache/ivy/osgi/repo/RepoDescriptorBasedResolver.java (original) +++ ant/ivy/core/trunk/src/java/org/apache/ivy/osgi/repo/AbstractOSGiResolver.java Thu Apr 12 07:59:47 2012 @@ -59,7 +59,7 @@ import org.apache.ivy.plugins.resolver.u import org.apache.ivy.plugins.resolver.util.ResourceMDParser; import org.apache.ivy.util.Message; -public abstract class RepoDescriptorBasedResolver extends BasicResolver { +public abstract class AbstractOSGiResolver extends BasicResolver { private static final String CAPABILITY_EXTRA_ATTR = "osgi_bundle"; @@ -322,7 +322,7 @@ public abstract class RepoDescriptorBase String osgiType = (String) tokenValues.get(IvyPatternHelper.ORGANISATION_KEY); if (osgiType == null || osgiType.length() == 0) { - return Collections.emptyList(); + return Collections.EMPTY_LIST; } String rev = (String) tokenValues.get(IvyPatternHelper.REVISION_KEY); @@ -457,7 +457,7 @@ public abstract class RepoDescriptorBase tokenSet.remove(IvyPatternHelper.ORGANISATION_KEY); String osgiType = (String) criteria.get(IvyPatternHelper.ORGANISATION_KEY); if (osgiType == null || osgiType.length() == 0) { - return Collections.emptySet(); + return Collections.EMPTY_SET; } values.put(IvyPatternHelper.ORGANISATION_KEY, osgiType); Modified: ant/ivy/core/trunk/src/java/org/apache/ivy/osgi/updatesite/UpdateSiteResolver.java URL: http://svn.apache.org/viewvc/ant/ivy/core/trunk/src/java/org/apache/ivy/osgi/updatesite/UpdateSiteResolver.java?rev=1325150&r1=1325149&r2=1325150&view=diff ============================================================================== --- ant/ivy/core/trunk/src/java/org/apache/ivy/osgi/updatesite/UpdateSiteResolver.java (original) +++ ant/ivy/core/trunk/src/java/org/apache/ivy/osgi/updatesite/UpdateSiteResolver.java Thu Apr 12 07:59:47 2012 @@ -23,10 +23,10 @@ import java.net.URISyntaxException; import java.text.ParseException; import org.apache.ivy.core.cache.CacheResourceOptions; -import org.apache.ivy.osgi.repo.RepoDescriptorBasedResolver; +import org.apache.ivy.osgi.repo.AbstractOSGiResolver; import org.xml.sax.SAXException; -public class UpdateSiteResolver extends RepoDescriptorBasedResolver { +public class UpdateSiteResolver extends AbstractOSGiResolver { private String url; Modified: ant/ivy/core/trunk/test/java/org/apache/ivy/osgi/obr/OBRResolverTest.java URL: http://svn.apache.org/viewvc/ant/ivy/core/trunk/test/java/org/apache/ivy/osgi/obr/OBRResolverTest.java?rev=1325150&r1=1325149&r2=1325150&view=diff ============================================================================== --- ant/ivy/core/trunk/test/java/org/apache/ivy/osgi/obr/OBRResolverTest.java (original) +++ ant/ivy/core/trunk/test/java/org/apache/ivy/osgi/obr/OBRResolverTest.java Thu Apr 12 07:59:47 2012 @@ -48,7 +48,7 @@ import org.apache.ivy.core.settings.IvyS import org.apache.ivy.osgi.core.BundleInfo; import org.apache.ivy.osgi.core.BundleInfoAdapter; import org.apache.ivy.osgi.core.ManifestParser; -import org.apache.ivy.osgi.repo.RepoDescriptorBasedResolver.RequirementStrategy; +import org.apache.ivy.osgi.repo.AbstractOSGiResolver.RequirementStrategy; import org.apache.ivy.plugins.resolver.DependencyResolver; import org.apache.ivy.plugins.resolver.DualResolver; import org.apache.ivy.plugins.resolver.FileSystemResolver;