You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@iota.apache.org by to...@apache.org on 2017/01/31 22:29:15 UTC
[12/12] incubator-iota git commit: Merge branch 'IOTA-36' of
https://github.com/barbaragomes/incubator-iota
Merge branch 'IOTA-36' of https://github.com/barbaragomes/incubator-iota
Project: http://git-wip-us.apache.org/repos/asf/incubator-iota/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-iota/commit/49138d68
Tree: http://git-wip-us.apache.org/repos/asf/incubator-iota/tree/49138d68
Diff: http://git-wip-us.apache.org/repos/asf/incubator-iota/diff/49138d68
Branch: refs/heads/master
Commit: 49138d689ba7c3f73cd3d2dbd71bfe6f4bcece89
Parents: 4775f99 7896e36
Author: tonyfaustini <to...@yahoo.com>
Authored: Tue Jan 31 14:26:50 2017 -0800
Committer: tonyfaustini <to...@yahoo.com>
Committed: Tue Jan 31 14:26:50 2017 -0800
----------------------------------------------------------------------
.../resources/fey-json-schema-validator.json | 95 ++++++++++
.../scala/org/apache/iota/fey/Ensemble.scala | 28 ++-
.../scala/org/apache/iota/fey/FeyCore.scala | 35 ++--
.../org/apache/iota/fey/GlobalPerformer.scala | 186 +++++++++++++++++++
.../org/apache/iota/fey/Orchestration.scala | 53 +++++-
.../main/scala/org/apache/iota/fey/Utils.scala | 3 +
.../scala/org/apache/iota/fey/FeyCoreSpec.scala | 81 ++++++++
.../apache/iota/fey/GlobalPerformerSpec.scala | 156 ++++++++++++++++
.../scala/org/apache/iota/fey/UtilsSpec.scala | 2 +
.../org/apache/iota/fey/Utils_JSONTest.scala | 57 ++++++
10 files changed, 671 insertions(+), 25 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-iota/blob/49138d68/fey-core/src/main/scala/org/apache/iota/fey/FeyCore.scala
----------------------------------------------------------------------
diff --cc fey-core/src/main/scala/org/apache/iota/fey/FeyCore.scala
index 0acedda,5dc6f7d..14c4cc0
--- a/fey-core/src/main/scala/org/apache/iota/fey/FeyCore.scala
+++ b/fey-core/src/main/scala/org/apache/iota/fey/FeyCore.scala
@@@ -23,9 -23,8 +23,9 @@@ import akka.actor.SupervisorStrategy.
import akka.actor.{Actor, ActorLogging, ActorRef, OneForOneStrategy, PoisonPill, Props, Terminated}
import akka.routing.GetRoutees
import com.eclipsesource.schema._
+import org.apache.iota.fey.GlobalWatchService.REGISTER_WATCHER_PERFORMER
import org.apache.iota.fey.JSON_PATH._
- import org.apache.iota.fey.Orchestration.{CREATE_ENSEMBLES, DELETE_ENSEMBLES, UPDATE_ENSEMBLES}
+ import org.apache.iota.fey.Orchestration.{CREATE_ENSEMBLES, CREATE_GLOBAL_PERFORMERS_AND_ENSEMBLES, DELETE_ENSEMBLES, UPDATE_ENSEMBLES}
import org.apache.iota.fey.Utils._
import play.api.libs.json._
http://git-wip-us.apache.org/repos/asf/incubator-iota/blob/49138d68/fey-core/src/test/scala/org/apache/iota/fey/FeyCoreSpec.scala
----------------------------------------------------------------------