Merge branch 'master' into 9-dev

openmole/build.sbt

@@ -154,7 +154,9 @@ def allCore = Seq(
   csv)
 
 
-lazy val keyword = OsgiProject(coreDir, "org.openmole.core.keyword", imports = Seq("*")) settings (coreSettings: _*)
+lazy val keyword = OsgiProject(coreDir, "org.openmole.core.keyword", imports = Seq("*")) settings (coreSettings: _*) settings (
+  defaultActivator
+  ) dependsOn(pluginManager, preference)
 
 lazy val context = OsgiProject(coreDir, "org.openmole.core.context", imports = Seq("*")) settings(
   libraryDependencies ++= Seq(Libraries.cats, Libraries.sourceCode), defaultActivator

openmole/core/org.openmole.core.keyword/src/main/scala/org/openmole/core/keyword/Activator.scala

+package org.openmole.core.keyword
+
+import org.openmole.core.pluginmanager._
+import org.openmole.core.pluginmanager.KeyWord._
+import org.openmole.core.preference.ConfigurationInfo
+import org.osgi.framework.{ BundleActivator, BundleContext }
+
+class Activator extends BundleActivator {
+
+  override def stop(context: BundleContext): Unit = {
+    ConfigurationInfo.unregister(this)
+    PluginInfo.unregister(this)
+  }
+  override def start(context: BundleContext): Unit = {
+
+    val keyWords = {
+      Vector(
+        WordKeyWord("under"),
+        WordKeyWord("in"),
+        WordKeyWord(":=")
+      )
+    }
+
+    PluginInfo.register(this, Vector(this.getClass.getPackage), keyWords = keyWords)
+    ConfigurationInfo.register(
+      this,
+      ConfigurationInfo.list()
+    )
+  }
+}

openmole/core/org.openmole.core.workflow/src/main/scala/org/openmole/core/workflow/Activator.scala

@@ -37,6 +37,7 @@ class Activator extends BundleActivator {
         WordKeyWord("inputs"),
         WordKeyWord("outputs"),
         WordKeyWord("hook"),
+        WordKeyWord("display"),
         WordKeyWord("workDirectory"),
         WordKeyWord("plugins"),
         WordKeyWord("pluginsOf"),

openmole/core/org.openmole.core.workflow/src/main/scala/org/openmole/core/workflow/composition/package.scala

@@ -27,7 +27,7 @@ package composition {
   import java.io.PrintStream
 
   import org.openmole.core.context.{ Context, Val }
-  import org.openmole.core.expansion.Condition
+  import org.openmole.core.expansion.{ Condition, FromContext }
   import org.openmole.core.outputmanager.OutputManager
   import org.openmole.core.workflow.builder.DefinitionScope
   import org.openmole.core.workflow.execution.{ EnvironmentProvider, LocalEnvironmentProvider }
@@ -138,7 +138,11 @@ package composition {
     def on(environment: EnvironmentProvider) = copy(environment = Some(environment))
     def by(strategy: Grouping) = copy(grouping = Some(strategy))
     def hook(hooks: Hook*) = copy(hooks = this.hooks ++ hooks)
-    def hook(output: WritableOutput, values: Val[_]*)(implicit definitionScope: DefinitionScope): TaskNode = hook(CSVHook(output = output, values: _*))
+    def hook(
+      output:     WritableOutput,
+      values:     Seq[Val[_]]                           = Vector.empty,
+      header:     OptionalArgument[FromContext[String]] = None,
+      arrayOnRow: Boolean                               = false)(implicit definitionScope: DefinitionScope): TaskNode = hook(CSVHook(output, values = values, header = header, arrayOnRow = arrayOnRow))
     def source(sources: Source*) = copy(sources = this.sources ++ sources)
   }