Changeset 3138
- Timestamp:
- 03/02/10 11:28:24 (2 years ago)
- Location:
- trunk/openmole
- Files:
-
- 52 added
- 2 removed
- 19 modified
- 6 copied
- 3 moved
-
core/org.openmole.core.workflow.implementation/src/main/java/org/openmole/core/workflow/implementation/execution/jobgroup (deleted)
-
core/org.openmole.core.workflow.implementation/src/main/java/org/openmole/core/workflow/implementation/execution/local/LocalExecuter.java (modified) (2 diffs)
-
core/org.openmole.core.workflow.implementation/src/main/java/org/openmole/core/workflow/implementation/mole/Mole.java (modified) (6 diffs)
-
core/org.openmole.core.workflow.implementation/src/main/java/org/openmole/core/workflow/implementation/mole/execution/MoleExecution.java (modified) (9 diffs)
-
core/org.openmole.core.workflow.implementation/src/main/java/org/openmole/core/workflow/implementation/resource/FileResource.java (modified) (1 diff)
-
core/org.openmole.core.workflow.implementation/src/main/java/org/openmole/core/workflow/implementation/task/GenericTask.java (modified) (2 diffs)
-
core/org.openmole.core.workflow.implementation/src/main/java/org/openmole/core/workflow/implementation/tools/LevelComputing.java (modified) (1 diff)
-
core/org.openmole.core.workflow.implementation/src/main/java/org/openmole/core/workflow/implementation/transition/TransitionFactory.java (moved) (moved from trunk/openmole/core/org.openmole.core.workflow.implementation/src/main/java/org/openmole/core/workflow/implementation/mole/TransitionFactory.java) (1 diff)
-
core/org.openmole.core.workflow.methods/src/main/java/org/openmole/core/workflow/methods/libraries/Library.java (copied) (copied from trunk/openmole/core/org.openmole.core.workflow.model/src/main/java/org/openmole/core/workflow/model/libraries/Library.java) (1 diff)
-
core/org.openmole.core.workflow.methods/src/main/java/org/openmole/core/workflow/methods/libraries/MethodDeclaration.java (copied) (copied from trunk/openmole/core/org.openmole.core.workflow.model/src/main/java/org/openmole/core/workflow/model/libraries/MethodDeclaration.java) (1 diff)
-
core/org.openmole.core.workflow.methods/src/main/java/org/openmole/core/workflow/methods/libraries/MethodDomain.java (moved) (moved from trunk/openmole/core/org.openmole.core.workflow.implementation/src/main/java/org/openmole/core/workflow/implementation/plan/MethodDomain.java) (2 diffs)
-
core/org.openmole.core.workflow.methods/src/main/java/org/openmole/core/workflow/methods/libraries/MethodInstance.java (copied) (copied from trunk/openmole/core/org.openmole.core.workflow.model/src/main/java/org/openmole/core/workflow/model/libraries/MethodInstance.java) (2 diffs)
-
core/org.openmole.core.workflow.methods/src/main/java/org/openmole/core/workflow/methods/libraries/ParameterDeclaration.java (copied) (copied from trunk/openmole/core/org.openmole.core.workflow.model/src/main/java/org/openmole/core/workflow/model/libraries/ParameterDeclaration.java) (1 diff)
-
core/org.openmole.core.workflow.methods/src/main/java/org/openmole/core/workflow/methods/libraries/ParameterInstance.java (copied) (copied from trunk/openmole/core/org.openmole.core.workflow.model/src/main/java/org/openmole/core/workflow/model/libraries/ParameterInstance.java) (1 diff)
-
core/org.openmole.core.workflow.methods/src/main/java/org/openmole/core/workflow/methods/libraries/Platform.java (copied) (copied from trunk/openmole/core/org.openmole.core.workflow.model/src/main/java/org/openmole/core/workflow/model/libraries/Platform.java) (1 diff)
-
core/org.openmole.core.workflow.methods/src/main/java/org/openmole/core/workflow/methods/libraries/PlatformDakota.java (modified) (1 diff)
-
core/org.openmole.core.workflow.methods/src/main/java/org/openmole/core/workflow/methods/libraries/PlatformJava.java (modified) (1 diff)
-
core/org.openmole.core.workflow.methods/src/main/java/org/openmole/core/workflow/methods/libraries/PlatformLHSDRV.java (modified) (1 diff)
-
core/org.openmole.core.workflow.methods/src/main/java/org/openmole/core/workflow/methods/libraries/PlatformR.java (modified) (1 diff)
-
core/org.openmole.core.workflow.model/src/main/java/org/openmole/core/workflow/model/capsule/IGenericTaskCapsule.java (modified) (1 diff)
-
core/org.openmole.core.workflow.model/src/main/java/org/openmole/core/workflow/model/execution/batch/IMoleJobCategory.java (modified) (1 diff)
-
core/org.openmole.core.workflow.model/src/main/java/org/openmole/core/workflow/model/job/IMoleJobGroupingStrategy.java (moved) (moved from trunk/openmole/core/org.openmole.core.workflow.model/src/main/java/org/openmole/core/workflow/model/execution/batch/IJobGroupingStrategy.java) (1 diff)
-
core/org.openmole.core.workflow.model/src/main/java/org/openmole/core/workflow/model/libraries (deleted)
-
core/org.openmole.core.workflow.model/src/main/java/org/openmole/core/workflow/model/mole/IMole.java (modified) (3 diffs)
-
misc/org.openmole.misc.pluginmanager/src/main/java/org/openmole/misc/pluginmanager/internal/PluginManager.java (modified) (1 diff)
-
plugins (modified) (1 prop)
-
plugins/jars/pom.xml (modified) (1 diff)
-
plugins/org.openmole.plugin.molejobgroupingstrategy.onfactor (added)
-
plugins/org.openmole.plugin.molejobgroupingstrategy.onfactor/pom.xml (added)
-
plugins/org.openmole.plugin.molejobgroupingstrategy.onfactor/src (added)
-
plugins/org.openmole.plugin.molejobgroupingstrategy.onfactor/src/main (added)
-
plugins/org.openmole.plugin.molejobgroupingstrategy.onfactor/src/main/java (added)
-
plugins/org.openmole.plugin.molejobgroupingstrategy.onfactor/src/main/java/org (added)
-
plugins/org.openmole.plugin.molejobgroupingstrategy.onfactor/src/main/java/org/openmole (added)
-
plugins/org.openmole.plugin.molejobgroupingstrategy.onfactor/src/main/java/org/openmole/plugin (added)
-
plugins/org.openmole.plugin.molejobgroupingstrategy.onfactor/src/main/java/org/openmole/plugin/molejobgroupingstrategy (added)
-
plugins/org.openmole.plugin.molejobgroupingstrategy.onfactor/src/main/java/org/openmole/plugin/molejobgroupingstrategy/onfactor (added)
-
plugins/org.openmole.plugin.molejobgroupingstrategy.onfactor/src/main/java/org/openmole/plugin/molejobgroupingstrategy/onfactor/FactorCategory.java (added)
-
plugins/org.openmole.plugin.molejobgroupingstrategy.onfactor/src/main/java/org/openmole/plugin/molejobgroupingstrategy/onfactor/OnFactorStrategy.java (added)
-
plugins/org.openmole.plugin.molejobgroupingstrategy.onfactor/src/main/resources (added)
-
plugins/org.openmole.plugin.molejobgroupingstrategy.onfactor/src/test (added)
-
plugins/org.openmole.plugin.molejobgroupingstrategy.onfactor/target (added)
-
plugins/org.openmole.plugin.molejobgroupingstrategy.onfactor/target/META-INF (added)
-
plugins/org.openmole.plugin.molejobgroupingstrategy.onfactor/target/META-INF/MANIFEST.MF (added)
-
plugins/org.openmole.plugin.molejobgroupingstrategy.onfactor/target/classes (added)
-
plugins/org.openmole.plugin.molejobgroupingstrategy.onfactor/target/classes/builddef.lst (added)
-
plugins/org.openmole.plugin.molejobgroupingstrategy.onfactor/target/classes/org (added)
-
plugins/org.openmole.plugin.molejobgroupingstrategy.onfactor/target/classes/org/openmole (added)
-
plugins/org.openmole.plugin.molejobgroupingstrategy.onfactor/target/classes/org/openmole/plugin (added)
-
plugins/org.openmole.plugin.molejobgroupingstrategy.onfactor/target/classes/org/openmole/plugin/molejobgroupingstrategy (added)
-
plugins/org.openmole.plugin.molejobgroupingstrategy.onfactor/target/classes/org/openmole/plugin/molejobgroupingstrategy/onfactor (added)
-
plugins/org.openmole.plugin.molejobgroupingstrategy.onfactor/target/classes/org/openmole/plugin/molejobgroupingstrategy/onfactor/FactorCategory.class (added)
-
plugins/org.openmole.plugin.molejobgroupingstrategy.onfactor/target/classes/org/openmole/plugin/molejobgroupingstrategy/onfactor/OnFactorStrategy.class (added)
-
plugins/org.openmole.plugin.molejobgroupingstrategy.onfactor/target/org.openmole.plugin.molejobgroupingstrategy.onfactor-0.3.jar (added)
-
plugins/org.openmole.plugin.specializedhellotask/src/main/java/org/openmole/plugin/specializedhellotask/SpecializedHelloTask.java (modified) (4 diffs)
-
plugins/org.openmole.plugin.task.netlogotask (added)
-
plugins/org.openmole.plugin.task.netlogotask/pom.xml (added)
-
plugins/org.openmole.plugin.task.netlogotask/src (added)
-
plugins/org.openmole.plugin.task.netlogotask/src/main (added)
-
plugins/org.openmole.plugin.task.netlogotask/src/main/java (added)
-
plugins/org.openmole.plugin.task.netlogotask/src/main/java/org (added)
-
plugins/org.openmole.plugin.task.netlogotask/src/main/java/org/openmole (added)
-
plugins/org.openmole.plugin.task.netlogotask/src/main/java/org/openmole/plugin (added)
-
plugins/org.openmole.plugin.task.netlogotask/src/main/java/org/openmole/plugin/task (added)
-
plugins/org.openmole.plugin.task.netlogotask/src/main/java/org/openmole/plugin/task/netlogotask (added)
-
plugins/org.openmole.plugin.task.netlogotask/src/main/java/org/openmole/plugin/task/netlogotask/NetLogoTask.java (added)
-
plugins/org.openmole.plugin.task.netlogotask/src/main/resources (added)
-
plugins/org.openmole.plugin.task.netlogotask/src/test (added)
-
plugins/org.openmole.plugin.task.netlogotask/target (added)
-
plugins/org.openmole.plugin.task.netlogotask/target/META-INF (added)
-
plugins/org.openmole.plugin.task.netlogotask/target/META-INF/MANIFEST.MF (added)
-
plugins/org.openmole.plugin.task.netlogotask/target/classes (added)
-
plugins/org.openmole.plugin.task.netlogotask/target/classes/builddef.lst (added)
-
plugins/org.openmole.plugin.task.netlogotask/target/classes/org (added)
-
plugins/org.openmole.plugin.task.netlogotask/target/classes/org/openmole (added)
-
plugins/org.openmole.plugin.task.netlogotask/target/classes/org/openmole/plugin (added)
-
plugins/org.openmole.plugin.task.netlogotask/target/classes/org/openmole/plugin/task (added)
-
plugins/org.openmole.plugin.task.netlogotask/target/classes/org/openmole/plugin/task/netlogotask (added)
-
plugins/org.openmole.plugin.task.netlogotask/target/classes/org/openmole/plugin/task/netlogotask/NetLogoTask.class (added)
-
plugins/org.openmole.plugin.task.netlogotask/target/org.openmole.plugin.task.netlogotask-0.3.jar (added)
-
plugins/pom.xml (modified) (1 diff)
-
pom.xml (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
-
trunk/openmole/core/org.openmole.core.workflow.implementation/src/main/java/org/openmole/core/workflow/implementation/execution/local/LocalExecuter.java
r3134 r3138 48 48 while (!stop) { 49 49 LocalExecutionJob executionJob = null; 50 IProgress progress = new Progress(); 51 Activator.getEventDispatcher().registerListener(progress, new LocalExecuterAdapter(this)); 52 50 53 51 try { 54 52 executionJob = localEnvironment.takeNextjob(); … … 59 57 for(IMoleJob moleJob : job.getMoleJobs()) { 60 58 LOGGER.finer("New job group taken for execution: " + moleJob); 59 IProgress progress = new Progress(); 60 Activator.getEventDispatcher().registerListener(progress, new LocalExecuterAdapter(this)); 61 61 62 62 moleJob.perform(localEnvironment.getRealEnvironment(), executionContext, progress); -
trunk/openmole/core/org.openmole.core.workflow.implementation/src/main/java/org/openmole/core/workflow/implementation/mole/Mole.java
r3134 r3138 24 24 import org.openmole.core.workflow.implementation.mole.execution.ExecutionContext; 25 25 import java.util.Collection; 26 import java.util.HashMap; 26 27 import java.util.HashSet; 27 28 import java.util.LinkedList; 29 import java.util.Map; 28 30 import java.util.Queue; 29 31 import java.util.Set; … … 38 40 import org.openmole.core.workflow.model.job.IContext; 39 41 import org.openmole.core.workflow.model.capsule.IGenericTaskCapsule; 40 import org.openmole.core.workflow.model.job.ITicket;41 42 import org.openmole.misc.tools.IVisitor; 42 43 import org.openmole.core.workflow.implementation.execution.local.LocalExecutionEnvironment; 43 44 import org.openmole.core.workflow.implementation.mole.execution.FixedEnvironmentStrategy; 44 import org.openmole.core.workflow.implementation.mole.execution.SubMoleExecution; 45 import org.openmole.core.workflow.model.capsule.IExplorationTaskCapsule; 46 import org.openmole.core.workflow.model.job.IMoleJobGroupingStrategy; 45 47 import org.openmole.core.workflow.model.mole.IMole; 46 48 import org.openmole.core.workflow.model.mole.execution.IEnvironmentSelectionStrategy; … … 51 53 import org.openmole.core.workflow.model.task.IMoleTask; 52 54 import org.openmole.core.workflow.model.transition.ITransition; 55 import org.openmole.misc.tools.Duo; 53 56 54 57 /** … … 59 62 60 63 private IGenericTaskCapsule<?, ?> root; 64 private Map<IGenericTaskCapsule<?, ?>, Duo<IMoleJobGroupingStrategy, IExplorationTaskCapsule>> groupers = new HashMap<IGenericTaskCapsule<?, ?>, Duo<IMoleJobGroupingStrategy, IExplorationTaskCapsule>>(); 61 65 62 66 public Mole(IGenericTaskCapsule<?, ?> root) { … … 110 114 IContext rootContext = new Context(); 111 115 112 ILocalFileCache localFileCache = new LocalFileCache(); 113 IExecutionContext exec = new ExecutionContext(localFileCache, strategy); 116 IExecutionContext exec = new ExecutionContext(fileCache, strategy); 114 117 115 118 return createExecution(rootContext, exec); … … 217 220 } 218 221 222 public Duo<IMoleJobGroupingStrategy, IExplorationTaskCapsule> getMoleJobGroupingStrategy(IGenericTaskCapsule key) { 223 return groupers.get(key); 224 } 225 226 @Override 227 public void setMoleJobGroupingStrategy(IGenericTaskCapsule forCapsule, IMoleJobGroupingStrategy strategy, IExplorationTaskCapsule explorationTaskCapsule) { 228 groupers.put(forCapsule, new Duo<IMoleJobGroupingStrategy, IExplorationTaskCapsule>(strategy, explorationTaskCapsule)); 229 } 230 231 232 219 233 } -
trunk/openmole/core/org.openmole.core.workflow.implementation/src/main/java/org/openmole/core/workflow/implementation/mole/execution/MoleExecution.java
r3134 r3138 28 28 import java.util.logging.Level; 29 29 import java.util.logging.Logger; 30 import org.openmole.core.workflow.implementation.execution.jobgroup.JobCategorizer;31 30 32 31 import org.openmole.misc.exception.InternalProcessingError; … … 41 40 import org.openmole.core.workflow.implementation.job.JobBuild; 42 41 import org.openmole.core.workflow.implementation.job.MoleJobId; 42 import org.openmole.core.workflow.implementation.mole.Mole; 43 43 import org.openmole.core.workflow.implementation.tools.LevelComputing; 44 44 import org.openmole.core.workflow.implementation.tools.RegistryWithTicket; 45 45 import org.openmole.core.workflow.model.capsule.IExplorationTaskCapsule; 46 import org.openmole.core.workflow.model. execution.batch.IJobGroupingStrategy;46 import org.openmole.core.workflow.model.job.IMoleJobGroupingStrategy; 47 47 import org.openmole.core.workflow.model.mole.execution.ISubMoleExecution; 48 48 import org.openmole.core.workflow.model.job.IContext; … … 64 64 private static final Logger LOGGER = Logger.getLogger(MoleExecution.class.getName()); 65 65 66 IMole mole;66 Mole mole; 67 67 BlockingQueue<Trio<IJob, IEnvironment<?>, IGenericTaskCapsule<?, ?>>> jobs = new LinkedBlockingQueue<Trio<IJob, IEnvironment<?>, IGenericTaskCapsule<?, ?>>>(); 68 68 Map<IMoleJob, ISubMoleExecution> inProgress = Collections.synchronizedMap(new TreeMap<IMoleJob, ISubMoleExecution>()); … … 72 72 IExecutionContext executionContext; 73 73 74 Map<IGenericTaskCapsule<?, ?>, Duo<IJobGroupingStrategy, IExplorationTaskCapsule>> groupers = new HashMap<IGenericTaskCapsule<?, ?>, Duo<IJobGroupingStrategy, IExplorationTaskCapsule>>();75 74 IRegistryWithTicket<IGenericTaskCapsule, JobCategorizer> categorizers = new RegistryWithTicket<IGenericTaskCapsule, JobCategorizer>(); 76 75 … … 78 77 //transient Semaphore oneJobFinished; 79 78 80 public MoleExecution( IMole mole, IContext rootContext, IExecutionContext executionContext) throws InternalProcessingError, UserBadDataError {79 public MoleExecution(Mole mole, IContext rootContext, IExecutionContext executionContext) throws InternalProcessingError, UserBadDataError { 81 80 this.mole = mole; 82 81 this.localCommunication = new LocalCommunication(); … … 101 100 102 101 @Override 103 public synchronized void submit(IMoleJob job, IGenericTaskCapsule<?, ?> capsule, IExecutionContext execution, ISubMoleExecution subMole) throws UserBadDataError,InternalProcessingError {102 public synchronized void submit(IMoleJob job, IGenericTaskCapsule<?, ?> capsule, IExecutionContext execution, ISubMoleExecution subMole) throws InternalProcessingError { 104 103 ExecutionInfoRegistry.GetInstance().register(job, this); 105 104 Activator.getEventDispatcher().registerListener(job, getLevel(), new MoleExecutionAdapter(this), MoleJob.stateChanged); … … 119 118 } 120 119 121 private synchronized JobBuild group(IMoleJob job, IGenericTaskCapsule<?, ?> capsule) throws UserBadDataError, InternalProcessingError { 122 if (groupers.containsKey(capsule)) { 123 Duo<IJobGroupingStrategy, IExplorationTaskCapsule> strategy = groupers.get(capsule); 120 private synchronized JobBuild group(IMoleJob job, IGenericTaskCapsule<?, ?> capsule) throws InternalProcessingError { 121 Duo<IMoleJobGroupingStrategy, IExplorationTaskCapsule> strategy = mole.getMoleJobGroupingStrategy(capsule); 122 123 if (strategy != null) { 124 124 125 LevelComputing levelComputing = LevelComputing.getLevelComputing(this); 125 126 … … 127 128 Integer levelOfCapsule = levelComputing.getLevel(capsule); 128 129 129 if (levelOfExploration >= levelOfCapsule) { 130 throw new UserBadDataError("Level of the exploration capsule is higher or the same than the one of the capsule, can't group."); 130 if (levelOfExploration != levelOfCapsule - 1) { 131 LOGGER.warning("The exploration capsule is not just under the capsule to group on, can't group."); 132 return new JobBuild(job); 131 133 } 132 134 … … 158 160 return group; 159 161 } else { 160 JobBuild group = new JobBuild(1);161 group.addJob(job);162 return group;163 } 164 } 162 return new JobBuild(job); 163 } 164 } 165 166 165 167 166 168 @Override -
trunk/openmole/core/org.openmole.core.workflow.implementation/src/main/java/org/openmole/core/workflow/implementation/resource/FileResource.java
r3134 r3138 26 26 import org.openmole.core.workflow.model.execution.IEnvironment; 27 27 28 import org.openmole.core.workflow.model.resource.IFileResource;29 28 import org.openmole.core.workflow.model.resource.ILocalFileCache; 30 29 import org.openmole.core.workflow.model.resource.IResource; -
trunk/openmole/core/org.openmole.core.workflow.implementation/src/main/java/org/openmole/core/workflow/implementation/task/GenericTask.java
r3134 r3138 88 88 vars.add(var); 89 89 } else { 90 Logger.getLogger(Logger.GLOBAL_LOGGER_NAME).log(Level.WARNING, "Variable " + p.getName() + " of type " + p.getType().getName() + " has been found but type doesn't match : " + var.getType() + " in task " + getName() + ".");90 Logger.getLogger(Logger.GLOBAL_LOGGER_NAME).log(Level.WARNING, "Variable " + p.getName() + " of type " + p.getType().getName() + " has been found but type doesn't match : " + var.getType().getName() + " in task " + getName() + "."); 91 91 } 92 92 } else { … … 261 261 } 262 262 263 public Iterable<Data<?>> getUserInput() { 264 return input; 265 } 266 267 public Iterable<Data<?>> getUserOutput() { 268 return output; 269 } 270 263 271 private void verifyNotDuplicate(Iterable<Data<?>> data, String place) { 264 272 Set<String> processed = new HashSet<String>(); -
trunk/openmole/core/org.openmole.core.workflow.implementation/src/main/java/org/openmole/core/workflow/implementation/tools/LevelComputing.java
r3034 r3138 60 60 61 61 //TODO derecurisivate 62 @Override 62 63 public int getLevel(IGenericTaskCapsule<?, ?> capsule) { 63 64 -
trunk/openmole/core/org.openmole.core.workflow.implementation/src/main/java/org/openmole/core/workflow/implementation/transition/TransitionFactory.java
r3034 r3138 16 16 */ 17 17 18 package org.openmole.core.workflow.implementation. mole;18 package org.openmole.core.workflow.implementation.transition; 19 19 20 20 import org.apache.commons.lang.ArrayUtils; 21 21 import org.openmole.core.workflow.implementation.capsule.TaskCapsule; 22 import org.openmole.core.workflow.implementation. transition.AggregationTransition;23 import org.openmole.core.workflow.implementation. transition.ExplorationTransition;24 import org.openmole.core.workflow.implementation. transition.SingleTransition;22 import org.openmole.core.workflow.implementation.mole.PuzzleFirst; 23 import org.openmole.core.workflow.implementation.mole.PuzzleFirstAndLast; 24 import org.openmole.core.workflow.implementation.mole.PuzzleLast; 25 25 import org.openmole.core.workflow.model.capsule.ITaskCapsule; 26 26 import org.openmole.core.workflow.model.capsule.IExplorationTaskCapsule; -
trunk/openmole/core/org.openmole.core.workflow.methods/src/main/java/org/openmole/core/workflow/methods/libraries/Library.java
r3034 r3138 17 17 * MA 02110-1301 USA 18 18 */ 19 package org.openmole.core.workflow.m odel.libraries;19 package org.openmole.core.workflow.methods.libraries; 20 20 21 import org.openmole.core.workflow.m odel.libraries.Platform.Type;21 import org.openmole.core.workflow.methods.libraries.Platform.Type; 22 22 23 23 import java.net.URI; -
trunk/openmole/core/org.openmole.core.workflow.methods/src/main/java/org/openmole/core/workflow/methods/libraries/MethodDeclaration.java
r3058 r3138 17 17 * MA 02110-1301 USA 18 18 */ 19 package org.openmole.core.workflow.m odel.libraries;19 package org.openmole.core.workflow.methods.libraries; 20 20 21 21 import java.util.ArrayList; -
trunk/openmole/core/org.openmole.core.workflow.methods/src/main/java/org/openmole/core/workflow/methods/libraries/MethodDomain.java
r3058 r3138 17 17 * MA 02110-1301 USA 18 18 */ 19 package org.openmole.core.workflow. implementation.plan;19 package org.openmole.core.workflow.methods.libraries; 20 20 21 21 import java.util.Iterator; … … 23 23 import org.openmole.misc.exception.InternalProcessingError; 24 24 import org.openmole.misc.exception.UserBadDataError; 25 import org.openmole.core.workflow.m odel.libraries.Library;26 import org.openmole.core.workflow.m odel.libraries.MethodDeclaration;27 import org.openmole.core.workflow.m odel.libraries.MethodInstance;28 import org.openmole.core.workflow.m odel.libraries.Platform;25 import org.openmole.core.workflow.methods.libraries.Library; 26 import org.openmole.core.workflow.methods.libraries.MethodDeclaration; 27 import org.openmole.core.workflow.methods.libraries.MethodInstance; 28 import org.openmole.core.workflow.methods.libraries.Platform; 29 29 import org.openmole.core.workflow.model.plan.IDomain; 30 30 import org.openmole.core.workflow.model.job.IContext; -
trunk/openmole/core/org.openmole.core.workflow.methods/src/main/java/org/openmole/core/workflow/methods/libraries/MethodInstance.java
r3058 r3138 17 17 * MA 02110-1301 USA 18 18 */ 19 package org.openmole.core.workflow.m odel.libraries;19 package org.openmole.core.workflow.methods.libraries; 20 20 21 21 import java.net.URI; … … 23 23 import org.openmole.misc.exception.InternalProcessingError; 24 24 import org.openmole.core.workflow.model.data.Prototype; 25 import org.openmole.core.workflow.m odel.libraries.Platform.Type;25 import org.openmole.core.workflow.methods.libraries.Platform.Type; 26 26 import org.openmole.misc.tools.CachedArrayList; 27 27 -
trunk/openmole/core/org.openmole.core.workflow.methods/src/main/java/org/openmole/core/workflow/methods/libraries/ParameterDeclaration.java
r3034 r3138 17 17 * MA 02110-1301 USA 18 18 */ 19 package org.openmole.core.workflow.m odel.libraries;19 package org.openmole.core.workflow.methods.libraries; 20 20 21 21 import org.openmole.core.workflow.model.data.Prototype; -
trunk/openmole/core/org.openmole.core.workflow.methods/src/main/java/org/openmole/core/workflow/methods/libraries/ParameterInstance.java
r3034 r3138 17 17 * MA 02110-1301 USA 18 18 */ 19 package org.openmole.core.workflow.m odel.libraries;19 package org.openmole.core.workflow.methods.libraries; 20 20 21 21 public class ParameterInstance { -
trunk/openmole/core/org.openmole.core.workflow.methods/src/main/java/org/openmole/core/workflow/methods/libraries/Platform.java
r3034 r3138 1 package org.openmole.core.workflow.m odel.libraries;1 package org.openmole.core.workflow.methods.libraries; 2 2 3 3 import org.openmole.core.workflow.model.job.IContext; -
trunk/openmole/core/org.openmole.core.workflow.methods/src/main/java/org/openmole/core/workflow/methods/libraries/PlatformDakota.java
r3034 r3138 36 36 import org.apache.commons.httpclient.methods.multipart.StringPart; 37 37 import org.apache.commons.httpclient.params.HttpMethodParams; 38 import org.openmole.core.workflow.model.libraries.Library;39 import org.openmole.core.workflow.model.libraries.MethodInstance;40 import org.openmole.core.workflow.model.libraries.Platform;41 38 import org.openmole.core.workflow.model.job.IContext; 42 39 -
trunk/openmole/core/org.openmole.core.workflow.methods/src/main/java/org/openmole/core/workflow/methods/libraries/PlatformJava.java
r3058 r3138 19 19 package org.openmole.core.workflow.methods.libraries; 20 20 21 import org.openmole.core.workflow.model.libraries.Library;22 import org.openmole.core.workflow.model.libraries.MethodInstance;23 import org.openmole.core.workflow.model.libraries.Platform;24 21 import org.openmole.core.workflow.model.job.IContext; 25 22 -
trunk/openmole/core/org.openmole.core.workflow.methods/src/main/java/org/openmole/core/workflow/methods/libraries/PlatformLHSDRV.java
r3034 r3138 27 27 import org.apache.commons.httpclient.methods.PostMethod; 28 28 import org.apache.commons.httpclient.params.HttpMethodParams; 29 import org.openmole.core.workflow.model.libraries.Library;30 import org.openmole.core.workflow.model.libraries.MethodInstance;31 import org.openmole.core.workflow.model.libraries.Platform;32 29 import org.openmole.core.workflow.model.job.IContext; 33 30 -
trunk/openmole/core/org.openmole.core.workflow.methods/src/main/java/org/openmole/core/workflow/methods/libraries/PlatformR.java
r3034 r3138 21 21 import org.openmole.core.workflow.methods.r.RConnectionInfo; 22 22 import org.openmole.core.workflow.methods.r.RConnectionManager; 23 import org.openmole.core.workflow.model.libraries.Library;24 import org.openmole.core.workflow.model.libraries.MethodInstance;25 import org.openmole.core.workflow.model.libraries.Platform;26 23 import org.openmole.core.workflow.model.job.IContext; 27 24 -
trunk/openmole/core/org.openmole.core.workflow.model/src/main/java/org/openmole/core/workflow/model/capsule/IGenericTaskCapsule.java
r3134 r3138 21 21 import org.openmole.core.workflow.model.data.IDataChannel; 22 22 import org.openmole.core.workflow.model.job.ITicket; 23 import org.openmole.core.workflow.model.mole.execution.IExecutionContext;24 23 25 24 import org.openmole.misc.exception.InternalProcessingError; -
trunk/openmole/core/org.openmole.core.workflow.model/src/main/java/org/openmole/core/workflow/model/execution/batch/IMoleJobCategory.java
r3134 r3138 18 18 package org.openmole.core.workflow.model.execution.batch; 19 19 20 public interface IMoleJobCategory extends Comparable { 21 20 public interface IMoleJobCategory { 21 boolean equals(IMoleJobCategory category); 22 int hash(); 22 23 } -
trunk/openmole/core/org.openmole.core.workflow.model/src/main/java/org/openmole/core/workflow/model/job/IMoleJobGroupingStrategy.java
r3134 r3138 16 16 */ 17 17 18 package org.openmole.core.workflow.model. execution.batch;18 package org.openmole.core.workflow.model.job; 19 19 20 import org.openmole.core.workflow.model.execution.batch.IMoleJobCategory; 20 21 import org.openmole.core.workflow.model.plan.IFactorValues; 21 22 22 public interface I JobGroupingStrategy {23 public interface IMoleJobGroupingStrategy { 23 24 IMoleJobCategory getCategory(IFactorValues values); 24 25 } -
trunk/openmole/core/org.openmole.core.workflow.model/src/main/java/org/openmole/core/workflow/model/mole/IMole.java
r3058 r3138 18 18 package org.openmole.core.workflow.model.mole; 19 19 20 import org.openmole.core.workflow.model.capsule.IExplorationTaskCapsule; 20 21 import org.openmole.core.workflow.model.capsule.IGenericTaskCapsule; 21 22 import org.openmole.misc.exception.InternalProcessingError; 22 23 import org.openmole.misc.exception.UserBadDataError; 23 24 import org.openmole.core.workflow.model.job.IContext; 25 import org.openmole.core.workflow.model.job.IMoleJobGroupingStrategy; 24 26 import org.openmole.misc.tools.IVisitable; 25 27 import org.openmole.core.workflow.model.mole.execution.IEnvironmentSelectionStrategy; … … 27 29 import org.openmole.core.workflow.model.mole.execution.IMoleExecution; 28 30 import org.openmole.core.workflow.model.resource.IResource; 31 import org.openmole.misc.tools.Duo; 29 32 30 33 public interface IMole extends IVisitable<IGenericTaskCapsule> { … … 50 53 void setRoot(IGenericTaskCapsule<?, ?> root); 51 54 55 public void setMoleJobGroupingStrategy(IGenericTaskCapsule forCapsule, IMoleJobGroupingStrategy strategy, IExplorationTaskCapsule explorationTaskCapsule); 56 52 57 } -
trunk/openmole/misc/org.openmole.misc.pluginmanager/src/main/java/org/openmole/misc/pluginmanager/internal/PluginManager.java
r3082 r3138 232 232 ExportedPackage[] exportedPackages = Activator.getPackageAdmin().getExportedPackages(b); 233 233 234 for (ExportedPackage exportedPackage : exportedPackages) { 235 for (Bundle ib : exportedPackage.getImportingBundles()) { 236 ret.add(ib); 237 } 238 } 234 if(exportedPackages != null) { 235 for (ExportedPackage exportedPackage : exportedPackages) { 236 for (Bundle ib : exportedPackage.getImportingBundles()) { 237 ret.add(ib); 238 } 239 } 240 } 241 239 242 return ret; 240 243 } -
trunk/openmole/plugins
-
Property
svn:ignore set
to
.pom.xml.swp
-
Property
svn:ignore set
to
-
trunk/openmole/plugins/jars/pom.xml
r3095 r3138 41 41 <scope>runtime</scope> 42 42 </dependency> 43 43 <dependency> 44 <groupId>${project.groupId}</groupId> 45 <artifactId>org.openmole.plugin.molejobgroupingstrategy.onfactor</artifactId> 46 <version>${project.version}</version> 47 <scope>runtime</scope> 48 </dependency> 49 <dependency> 50 <groupId>${project.groupId}</groupId> 51 <artifactId>org.openmole.plugin.task.netlogotask</artifactId> 52 <version>${project.version}</version> 53 <scope>runtime</scope> 54 </dependency> 44 55 </dependencies> 45 56 -
trunk/openmole/plugins/org.openmole.plugin.specializedhellotask/src/main/java/org/openmole/plugin/specializedhellotask/SpecializedHelloTask.java
r3058 r3138 6 6 package org.openmole.plugin.specializedhellotask; 7 7 8 import java.math.BigDecimal; 9 import org.openmole.core.workflow.model.data.Data; 10 import org.openmole.core.workflow.model.data.Prototype; 8 11 import org.openmole.misc.exception.InternalProcessingError; 9 12 import org.openmole.misc.exception.UserBadDataError; … … 12 15 import org.openmole.core.workflow.model.job.IContext; 13 16 import org.openmole.core.workflow.model.mole.execution.IExecutionContext; 17 import org.openmole.core.workflow.model.task.annotations.Output; 14 18 15 19 /** … … 18 22 */ 19 23 public class SpecializedHelloTask extends HelloTask { 24 25 @Output 26 Data<BigDecimal> hello = new Data<BigDecimal>("hello", BigDecimal.class); 20 27 21 28 public SpecializedHelloTask(String name) throws UserBadDataError, InternalProcessingError { … … 26 33 protected void process(IContext context, IExecutionContext executionContext, IProgress progress) throws UserBadDataError, InternalProcessingError, InterruptedException { 27 34 super.process(context, executionContext, progress); 35 28 36 System.out.println("Specialized"); 37 38 context.setValue(hello.getPrototype(), new BigDecimal(20.0)); 29 39 } 30 40 -
trunk/openmole/plugins/pom.xml
r3039 r3138 21 21 <module>org.openmole.plugin.environmentprovider.jsaga</module> 22 22 <module>org.openmole.plugin.environmentprovider.glite</module> 23 <module>org.openmole.plugin.molejobgroupingstrategy.onfactor</module> 24 <module>org.openmole.plugin.task.netlogotask</module> 23 25 <module>jars</module> 24 26 </modules> -
trunk/openmole/pom.xml
r3108 r3138 550 550 <Import-Package>${import.packages}</Import-Package> 551 551 <Export-Package>${export.packages}</Export-Package> 552 <Embed-Dependency>${embed-dep}</Embed-Dependency> 553 <Embed-Transitive>${embed-transitive}</Embed-Transitive> 552 554 <!--<Embed-Dependency>true</Embed-Dependency>--> 553 555 <!--<Embed-Transitive>true</Embed-Transitive>-->





