ant-notifications mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hi...@apache.org
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 GMT
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;



Mime
View raw message