svn commit: r1201495 - in /ant/ivy/core/trunk: src/java/org/apache/ivy/osgi/repo/RepoDescriptorBasedResolver.java test/java/org/apache/ivy/osgi/obr/OBRResolverTest.java

[hibou]

Author: hibou
Date: Sun Nov 13 19:52:37 2011
New Revision: 1201495

URL: http://svn.apache.org/viewvc?rev=1201495&view=rev
Log:
Fix setter for RequirementStrategy

Modified:
    
ant/ivy/core/trunk/src/java/org/apache/ivy/osgi/repo/RepoDescriptorBasedResolver.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/repo/RepoDescriptorBasedResolver.java
URL: 
http://svn.apache.org/viewvc/ant/ivy/core/trunk/src/java/org/apache/ivy/osgi/repo/RepoDescriptorBasedResolver.java?rev=1201495&r1=1201494&r2=1201495&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/RepoDescriptorBasedResolver.java
 Sun Nov 13 19:52:37 2011
@@ -80,12 +80,12 @@ public abstract class RepoDescriptorBase
 
     private RequirementStrategy requirementStrategy = 
RequirementStrategy.noambiguity;
 
-    public void setImportPackageStrategy(RequirementStrategy 
importPackageStrategy) {
+    public void setRequirementStrategy(RequirementStrategy 
importPackageStrategy) {
         this.requirementStrategy = importPackageStrategy;
     }
 
-    public void setImportPackageStrategy(String strategy) {
-        setImportPackageStrategy(RequirementStrategy.valueOf(strategy));
+    public void setRequirementStrategy(String strategy) {
+        setRequirementStrategy(RequirementStrategy.valueOf(strategy));
     }
 
     protected void setRepoDescriptor(RepoDescriptor repoDescriptor) {

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=1201495&r1=1201494&r2=1201495&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 
Sun Nov 13 19:52:37 2011
@@ -252,7 +252,7 @@ public class OBRResolverTest extends Tes
 
     public void testResolveImportAmbiguity() throws Exception {
         String jarName = 
"org.apache.ivy.osgi.testbundle.importing.ambiguity_3.2.1.jar";
-        bundleResolver.setImportPackageStrategy(RequirementStrategy.first);
+        bundleResolver.setRequirementStrategy(RequirementStrategy.first);
         genericTestResolve(jarName, "default",
             new ModuleRevisionId[] {MRID_TEST_BUNDLE_EXPORTING_AMBIGUITY}, new 
ModuleRevisionId[] {
                     MRID_TEST_BUNDLE, MRID_TEST_BUNDLE_IMPORTING_VERSION});
@@ -260,13 +260,13 @@ public class OBRResolverTest extends Tes
 
     public void testResolveImportNoAmbiguity() throws Exception {
         String jarName = 
"org.apache.ivy.osgi.testbundle.importing.ambiguity_3.2.1.jar";
-        
bundleResolver.setImportPackageStrategy(RequirementStrategy.noambiguity);
+        bundleResolver.setRequirementStrategy(RequirementStrategy.noambiguity);
         genericTestFailingResolve(jarName, "default");
     }
 
     public void testResolveRequireAmbiguity() throws Exception {
         String jarName = 
"org.apache.ivy.osgi.testbundle.require.ambiguity_1.1.1.jar";
-        
bundleResolver.setImportPackageStrategy(RequirementStrategy.noambiguity);
+        bundleResolver.setRequirementStrategy(RequirementStrategy.noambiguity);
         genericTestResolve(jarName, "default", new ModuleRevisionId[] 
{MRID_TEST_BUNDLE,
                 MRID_TEST_BUNDLE_IMPORTING_VERSION});
     }