Changeset 3153

Show
Ignore:
Timestamp:
03/05/10 20:55:42 (2 years ago)
Author:
romain.reuillon
Message:

Changed name of plugin

Location:
trunk/openmole
Files:
3 added
2 removed
17 modified
6 moved

Legend:

Unmodified
Added
Removed

  • trunk/openmole/core/org.openmole.core.commons.backgroundexecutor/pom.xml

    r3095 r3153  
    1414    </parent> 
    1515 
    16     <artifactId>org.openmole.core.transfermonitor</artifactId> 
     16    <artifactId>org.openmole.core.commons.backgroundexecutor</artifactId> 
    1717 
    1818    <dependencies> 

  • trunk/openmole/core/org.openmole.core.commons.backgroundexecutor/src/main/java/org/openmole/core/commons/backgroundexecutor/IBackgroundExecution.java

    r3149 r3153  
    33 * and open the template in the editor. 
    44 */ 
    5 package org.openmole.core.transfermonitor; 
     5package org.openmole.core.commons.backgroundexecutor; 
    66 
    77import java.io.IOException; 

  • trunk/openmole/core/org.openmole.core.commons.backgroundexecutor/src/main/java/org/openmole/core/commons/backgroundexecutor/IBackgroundExecutor.java

    r3149 r3153  
    1 package org.openmole.core.transfermonitor; 
     1package org.openmole.core.commons.backgroundexecutor; 
    22 
    3 import org.openmole.core.workflow.model.file.ITransferable; 
    4  
    5 public interface ITransferMonitor { 
    6     IBackgroundExecution createTransfert(ITransferable transferable); 
     3public interface IBackgroundExecutor { 
     4    IBackgroundExecution createBackgroundExecution(ITransferable transferable); 
    75} 

  • trunk/openmole/core/org.openmole.core.commons.backgroundexecutor/src/main/java/org/openmole/core/commons/backgroundexecutor/ITransferable.java

    r3034 r3153  
    1616 */ 
    1717 
    18 package org.openmole.core.workflow.model.file; 
     18package org.openmole.core.commons.backgroundexecutor; 
    1919 
    2020public interface ITransferable { 

  • trunk/openmole/core/org.openmole.core.commons.backgroundexecutor/src/main/java/org/openmole/core/commons/backgroundexecutor/internal/Activator.java

    r3081 r3153  
    1 package org.openmole.core.transfermonitor.internal; 
     1package org.openmole.core.commons.backgroundexecutor.internal; 
    22 
    33import org.osgi.framework.BundleActivator; 
    … …  
    77import org.openmole.misc.executorservice.IExecutorService; 
    88import org.openmole.misc.workspace.IWorkspace; 
    9 import org.openmole.core.transfermonitor.ITransferMonitor; 
     9import org.openmole.core.commons.backgroundexecutor.IBackgroundExecutor; 
    1010 
    1111public class Activator implements BundleActivator { 
    … …  
    1414    private static IExecutorService executorService; 
    1515    private static IWorkspace workspace; 
    16     private static TransfertMonitor transfertMonitor; 
     16    private static BackgroundExecutor transfertMonitor; 
    1717    private ServiceRegistration reg; 
    1818 
    … …  
    2424        Activator.context = context; 
    2525 
    26         transfertMonitor = new TransfertMonitor(); 
    27         reg = context.registerService(ITransferMonitor.class.getName(), transfertMonitor, null); 
     26        transfertMonitor = new BackgroundExecutor(); 
     27        reg = context.registerService(IBackgroundExecutor.class.getName(), transfertMonitor, null); 
    2828    } 
    2929 
    … …  
    6565    } 
    6666 
    67     public static TransfertMonitor getTransfertMonitor() { 
     67    public static BackgroundExecutor getTransfertMonitor() { 
    6868        return transfertMonitor; 
    6969    } 

  • trunk/openmole/core/org.openmole.core.commons.backgroundexecutor/src/main/java/org/openmole/core/commons/backgroundexecutor/internal/BackgroundExecution.java

    r3149 r3153  
    1 package org.openmole.core.transfermonitor.internal; 
     1package org.openmole.core.commons.backgroundexecutor.internal; 
    22 
    33import java.io.IOException; 
    44import org.openmole.misc.executorservice.ExecutorType; 
    55 
    6 import org.openmole.core.transfermonitor.IBackgroundExecution; 
    7 import org.openmole.core.workflow.model.file.ITransferable; 
     6import org.openmole.core.commons.backgroundexecutor.IBackgroundExecution; 
     7import org.openmole.core.commons.backgroundexecutor.ITransferable; 
    88 
    9 public class Transfert implements IBackgroundExecution { 
     9public class BackgroundExecution implements IBackgroundExecution { 
    1010 
    1111    final ITransferable transferable; 
    … …  
    1414    boolean started = false; 
    1515 
    16     public Transfert(ITransferable transferable) { 
     16    public BackgroundExecution(ITransferable transferable) { 
    1717        super(); 
    1818        this.transferable = transferable; 

  • trunk/openmole/core/org.openmole.core.commons.backgroundexecutor/src/main/java/org/openmole/core/commons/backgroundexecutor/internal/BackgroundExecutor.java

    r3149 r3153  
    1 package org.openmole.core.transfermonitor.internal; 
     1package org.openmole.core.commons.backgroundexecutor.internal; 
    22 
    33 
    4 import org.openmole.core.workflow.model.file.ITransferable; 
    5 import org.openmole.core.transfermonitor.ITransferMonitor; 
    6 import org.openmole.core.transfermonitor.IBackgroundExecution; 
     4import org.openmole.core.commons.backgroundexecutor.ITransferable; 
     5import org.openmole.core.commons.backgroundexecutor.IBackgroundExecutor; 
     6import org.openmole.core.commons.backgroundexecutor.IBackgroundExecution; 
    77 
    8 public class TransfertMonitor implements ITransferMonitor { 
    9  
    10  
    11     //Map<ITransferable, Transfert> transferts = new WeakHashMap<ITransferable, Transfert>(); 
    12     /*private Transfert getTransfert(ITransferable transferable) { 
    13     return transferts.get(transferable); 
    14     } 
    15  
    16     private boolean containsTransfert(ITransferable transferable) { 
    17     return  transferts.containsKey(transferable); 
    18     } 
     8public class BackgroundExecutor implements IBackgroundExecutor { 
    199 
    2010 
    2111    @Override 
    22     public Throwable getFailureCause(ITransferable transferable) { 
    23     Transfert transfert = getTransfert(transferable); 
    24     if(transfert == null) return null; 
    25     return transfert.getFailureCause(); 
    26     }*/ 
    27     @Override 
    28     public IBackgroundExecution createTransfert(ITransferable transferable) { 
    29         return new Transfert(transferable); 
     12    public IBackgroundExecution createBackgroundExecution(ITransferable transferable) { 
     13        return new BackgroundExecution(transferable); 
    3014    } 
    3115 
    32     /*private Transfert createAndGetTransfert(ITransferable transferable) { 
    33     Transfert transfert = new Transfert(transferable); 
    34  
    35     transferts.put(transferable, transfert); 
    36  
    37     return transfert; 
    38     } 
    39  
    40     @Override 
    41     public boolean transfertFailed(ITransferable transferable) { 
    42     Transfert transfert = getTransfert(transferable); 
    43     if(transfert == null) return false; 
    44     return transfert.hasFailed(); 
    45     } 
    46  
    47     @Override 
    48     public boolean transfertStarted(ITransferable transferable) { 
    49     Transfert transfert = getTransfert(transferable); 
    50     if(transfert == null) return false; 
    51     return transfert.isStarted(); 
    52     } 
    53  
    54     @Override 
    55     public boolean transfertSuccessFull(ITransferable transferable) { 
    56     Transfert transfert = getTransfert(transferable); 
    57     if(transfert == null) return false; 
    58     return transfert.isSucessFull(); 
    59     } 
    60  
    61  
    62     @Override 
    63     public synchronized boolean transfertIsSucessFullStartUploadIfNecessaryExceptionIfFailed (ITransferable transferable) throws IOException { 
    64     Transfert transfert = getTransfert(transferable); 
    65  
    66     if(transfert == null) { 
    67     transfert = createAndGetTransfert(transferable); 
    68     transfert.start(); 
    69     } 
    70  
    71  
    72     //Logger.getLogger(Logger.GLOBAL_LOGGER_NAME).log(Level.INFO, transfert.isSucessFull()  + " "+ transferable.toString()); 
    73  
    74     boolean ret = transfert.isSucessFullStartUploadIfNecessaryExceptionIfFailed(); 
    75     return ret; 
    76     }*/ 
     16    
    7717} 

  • trunk/openmole/core/org.openmole.core.file/pom.xml

    r3095 r3153  
    6161            <version>${project.version}</version> 
    6262        </dependency> 
     63        <dependency> 
     64            <groupId>${project.groupId}</groupId> 
     65            <artifactId>org.openmole.core.commons.backgroundexecutor</artifactId> 
     66            <version>${project.version}</version> 
     67        </dependency> 
    6368    </dependencies> 
    6469 
    … …  
    8489 
    8590 
     91 

  • trunk/openmole/core/org.openmole.core.file/src/main/java/org/openmole/core/file/IURIFileCopy.java

    r3034 r3153  
    2020import java.io.IOException; 
    2121 
    22 import org.openmole.core.workflow.model.file.ITransferable; 
     22import org.openmole.core.commons.backgroundexecutor.ITransferable; 
    2323import org.openmole.core.workflow.model.file.IURIFile; 
    2424 

  • trunk/openmole/core/org.openmole.core.file/src/main/java/org/openmole/core/file/URIFile.java

    r3147 r3153  
    914914    } 
    915915 
    916     @Override 
    917     public void transfert() throws Exception { 
    918         cache(); 
    919     } 
    920916 
    921917    public static long getTimeout() { 

  • trunk/openmole/core/org.openmole.core.file/src/main/java/org/openmole/core/file/URIFileCopy.java

    r3034 r3153  
    1919 
    2020import java.io.IOException; 
    21 import org.openmole.core.workflow.model.file.ITransferable; 
     21import org.openmole.core.commons.backgroundexecutor.ITransferable; 
    2222 
    2323import org.openmole.core.workflow.model.file.IURIFile; 

  • trunk/openmole/core/org.openmole.core.workflow.implementation/pom.xml

    r3095 r3153  
    7474        <dependency> 
    7575            <groupId>${project.groupId}</groupId> 
    76             <artifactId>org.openmole.core.transfermonitor</artifactId> 
     76            <artifactId>org.openmole.core.commons.backgroundexecutor</artifactId> 
    7777            <version>${project.version}</version> 
    7878        </dependency> 

  • trunk/openmole/core/org.openmole.core.workflow.implementation/src/main/java/org/openmole/core/workflow/implementation/execution/batch/BatchExecutionJob.java

    r3149 r3153  
    4242import org.openmole.misc.updater.IUpdatableFuture; 
    4343import org.openmole.misc.workspace.ConfigurationLocation; 
    44 import org.openmole.core.transfermonitor.IBackgroundExecution; 
     44import org.openmole.core.commons.backgroundexecutor.IBackgroundExecution; 
    4545import org.openmole.core.workflow.implementation.execution.ExecutionJob; 
    4646import org.openmole.core.workflow.model.capsule.IGenericTaskCapsule; 
    … …  
    172172    void tryFinalise() throws InternalProcessingError, UserBadDataError, InterruptedException, IOException { 
    173173         if (finalizeExecution == null) { 
    174             finalizeExecution = Activator.getTransferMonitor().createTransfert(getGetResult()); 
     174            finalizeExecution = Activator.getBackgroundExecutor().createBackgroundExecution(getGetResult()); 
    175175        } 
    176176 
    … …  
    206206    public void trySubmit() throws InternalProcessingError, UserBadDataError, InterruptedException, IOException { 
    207207        if (!getInitStorage().isFinished() && initStorageExec == null) { 
    208             initStorageExec = Activator.getTransferMonitor().createTransfert(getInitStorage()); 
     208            initStorageExec = Activator.getBackgroundExecutor().createBackgroundExecution(getInitStorage()); 
    209209            initStorageExec.start(ExecutorType.UPLOAD); 
    210210        } 

  • trunk/openmole/core/org.openmole.core.workflow.implementation/src/main/java/org/openmole/core/workflow/implementation/execution/batch/CopyToEnvironment.java

    r3147 r3153  
    4343import org.openmole.core.workflow.model.execution.batch.IBatchStorage; 
    4444import org.openmole.core.workflow.model.execution.batch.IRuntime; 
    45 import org.openmole.core.workflow.model.file.ITransferable; 
     45import org.openmole.core.commons.backgroundexecutor.ITransferable; 
    4646import org.openmole.core.workflow.model.file.IURIFile; 
    4747import org.openmole.core.workflow.model.job.IJob; 

  • trunk/openmole/core/org.openmole.core.workflow.implementation/src/main/java/org/openmole/core/workflow/implementation/execution/batch/GetResultFromEnvironment.java

    r3149 r3153  
    2525import org.openmole.core.workflow.model.execution.batch.IAccessToken; 
    2626import org.openmole.core.workflow.model.execution.batch.IBatchStorage; 
    27 import org.openmole.core.workflow.model.file.ITransferable; 
     27import org.openmole.core.commons.backgroundexecutor.ITransferable; 
    2828import org.openmole.core.workflow.model.file.IURIFile; 
    2929import org.openmole.core.workflow.model.job.IContext; 

  • trunk/openmole/core/org.openmole.core.workflow.implementation/src/main/java/org/openmole/core/workflow/implementation/internal/Activator.java

    r3081 r3153  
    3030import org.openmole.core.execution.replicacatalog.IReplicaCatalog; 
    3131import org.openmole.core.execution.runtimemessageserializer.IRuntimeMessageSerializer; 
    32 import org.openmole.core.transfermonitor.ITransferMonitor; 
     32import org.openmole.core.commons.backgroundexecutor.IBackgroundExecutor; 
    3333import org.openmole.misc.updater.IUpdater; 
    3434import org.openmole.misc.workspace.IWorkspace; 
    … …  
    4848    private static IJSagaSessionService jSagaSessionService; 
    4949    private static IBatchRessourceControl batchRessourceControl; 
    50     private static ITransferMonitor transferMonitor; 
     50    private static IBackgroundExecutor transferMonitor; 
    5151    private static IEventDispatcher eventDispatcher; 
    5252    private static IPluginManager pluginManager; 
    … …  
    178178    } 
    179179 
    180     public static ITransferMonitor getTransferMonitor() { 
     180    public static IBackgroundExecutor getBackgroundExecutor() { 
    181181        if (transferMonitor != null) { 
    182182            return transferMonitor; 
    … …  
    185185        synchronized (Activator.class) { 
    186186            if (transferMonitor == null) { 
    187                 ServiceReference ref = getContext().getServiceReference(ITransferMonitor.class.getName()); 
    188                 transferMonitor = (ITransferMonitor) getContext().getService(ref); 
     187                ServiceReference ref = getContext().getServiceReference(IBackgroundExecutor.class.getName()); 
     188                transferMonitor = (IBackgroundExecutor) getContext().getService(ref); 
    189189            } 
    190190            return transferMonitor; 

  • trunk/openmole/core/org.openmole.core.workflow.methods/src/main/java/org/openmole/core/workflow/methods/internal/Activator.java

    r3081 r3153  
    2121import org.osgi.framework.BundleContext; 
    2222import org.osgi.framework.ServiceReference; 
    23 import org.openmole.core.transfermonitor.ITransferMonitor; 
     23//import org.openmole.core.commons.backgroundexecutor.ITransferMonitor; 
    2424import org.openmole.misc.workspace.IWorkspace; 
    2525 
    … …  
    2828  static BundleContext context; 
    2929  private static IWorkspace workspace; 
    30   private static ITransferMonitor transferMonitor; 
     30  //private static ITransferMonitor transferMonitor; 
    3131     
    3232   
    … …  
    5656    return context; 
    5757  } 
    58  
    59   public static ITransferMonitor getTransferMonitor() { 
    60     if(transferMonitor  != null) return transferMonitor; 
    61      
    62     synchronized (Activator.class) { 
    63       if(transferMonitor  == null) { 
    64         ServiceReference ref = getContext().getServiceReference(ITransferMonitor.class.getName()); 
    65         transferMonitor = (ITransferMonitor) getContext().getService(ref); 
    66       } 
    67       return transferMonitor; 
    68     } 
    69   } 
    70  
    7158} 

  • trunk/openmole/core/org.openmole.core.workflow.model/src/main/java/org/openmole/core/workflow/model/file/IURIFile.java

    r3034 r3153  
    3131 
    3232 
    33 public interface IURIFile extends ITransferable, Comparable<IURIFile> { 
     33public interface IURIFile extends Comparable<IURIFile> { 
    3434 
    3535  boolean isDirectory() throws IOException, InterruptedException; 

  • trunk/openmole/core/pom.xml

    r3081 r3153  
    2323        <module>org.openmole.core.file</module> 
    2424        <module>org.openmole.core.batchressourcecontrol</module> 
    25         <module>org.openmole.core.transfermonitor</module> 
     25        <module>org.openmole.core.commons.backgroundexecutor</module> 
    2626        <module>org.openmole.core.workflow.model</module> 
    2727        <module>org.openmole.core.workflow.implementation</module> 

  • trunk/openmole/runtime/org.openmole.runtime/src/main/java/org/openmole/runtime/internal/Activator.java

    r3094 r3153  
    1111import org.openmole.core.execution.runtimemessageserializer.IEnvironmentDescriptionSerializer; 
    1212import org.openmole.core.execution.runtimemessageserializer.IRuntimeMessageSerializer; 
    13 import org.openmole.core.transfermonitor.ITransferMonitor; 
     13import org.openmole.core.commons.backgroundexecutor.ITransferMonitor; 
    1414import org.openmole.misc.workspace.IWorkspace; 
    1515 

  • trunk/openmole/runtime/org.openmole.runtime/src/main/resources/config.ini

    r3083 r3153  
    6767org.openmole.misc.tools,\ 
    6868org.openmole.misc.caching,\ 
    69 org.openmole.core.transfermonitor,\ 
     69org.openmole.core.commons.backgroundexecutor,\ 
    7070org.openmole.misc.updater,\ 
    7171org.openmole.misc.workspace,\ 

  • trunk/openmole/ui/org.openmole.ui.console/src/main/java/org/openmole/ui/console/internal/Activator.java

    r3081 r3153  
    55import org.osgi.framework.ServiceReference; 
    66import org.openmole.misc.pluginmanager.IPluginManager; 
    7 import org.openmole.core.transfermonitor.ITransferMonitor; 
     7import org.openmole.core.commons.backgroundexecutor.ITransferMonitor; 
    88import org.openmole.misc.workspace.IWorkspace; 
    99import org.openmole.core.execution.structuregenerator.IStructureGenerator; 

  • trunk/openmole/ui/org.openmole.ui.console/src/main/resources/config.ini

    r3081 r3153  
    6767org.openmole.misc.tools,\ 
    6868org.openmole.misc.caching,\ 
    69 org.openmole.core.transfermonitor,\ 
     69org.openmole.core.commons.backgroundexecutor,\ 
    7070org.openmole.misc.updater,\ 
    7171org.openmole.misc.workspace,\ 

logo cemagref

logo iscpif

logo lifegrid

logo region auvergne

logo patres project