Adapt to changes in Spring and OSGi (mostly generics)

[gpl/argeo-slc.git] / org.argeo.slc.core / src / org / argeo / slc / core / execution / DefaultAgent.java

diff --git a/org.argeo.slc.core/src/org/argeo/slc/core/execution/DefaultAgent.java b/org.argeo.slc.core/src/org/argeo/slc/core/execution/DefaultAgent.java
index aaa687fd77ccc9a78eba7eecf5601e4efb7f7a91..c692820e7cfc4d294b2a5aeda89109f49289a9a6 100644 (file)
--- a/org.argeo.slc.core/src/org/argeo/slc/core/execution/DefaultAgent.java
+++ b/org.argeo.slc.core/src/org/argeo/slc/core/execution/DefaultAgent.java
@@ -26,7 +26,7 @@ import java.util.List;
 import java.util.Map;
 import java.util.UUID;
 
-import org.argeo.slc.BasicNameVersion;
+import org.argeo.slc.DefaultNameVersion;
 import org.argeo.slc.NameVersion;
 import org.argeo.slc.SlcException;
 import org.argeo.slc.execution.ExecutionModuleDescriptor;
@@ -95,7 +95,7 @@ public class DefaultAgent implements SlcAgent {
                        String[] path = uri.getPath().split("/");
                        if (path.length < 3)
                                throw new SlcException("Badly formatted URI: " + uri);
-                       NameVersion nameVersion = new BasicNameVersion(path[1]);
+                       NameVersion nameVersion = new DefaultNameVersion(path[1]);
                        StringBuilder flow = new StringBuilder();
                        for (int i = 2; i < path.length; i++)
                                flow.append('/').append(path[i]);
@@ -149,13 +149,13 @@ public class DefaultAgent implements SlcAgent {
                ExecutionModuleDescriptor emd;
                try {
                        modulesManager
-                                       .start(new BasicNameVersion(moduleName, moduleVersion));
+                                       .start(new DefaultNameVersion(moduleName, moduleVersion));
                        emd = modulesManager.getExecutionModuleDescriptor(moduleName,
                                        moduleVersion);
                } catch (SlcException e) {
                        if (defaultModulePrefix != null) {
                                moduleName = defaultModulePrefix + "." + moduleName;
-                               modulesManager.start(new BasicNameVersion(moduleName,
+                               modulesManager.start(new DefaultNameVersion(moduleName,
                                                moduleVersion));
                                emd = modulesManager.getExecutionModuleDescriptor(moduleName,
                                                moduleVersion);