Return-Path: X-Original-To: apmail-zest-commits-archive@minotaur.apache.org Delivered-To: apmail-zest-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 60C4518BF5 for ; Thu, 17 Dec 2015 21:03:54 +0000 (UTC) Received: (qmail 39364 invoked by uid 500); 17 Dec 2015 21:03:54 -0000 Delivered-To: apmail-zest-commits-archive@zest.apache.org Received: (qmail 39343 invoked by uid 500); 17 Dec 2015 21:03:54 -0000 Mailing-List: contact commits-help@zest.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@zest.apache.org Delivered-To: mailing list commits@zest.apache.org Received: (qmail 39334 invoked by uid 99); 17 Dec 2015 21:03:54 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 17 Dec 2015 21:03:54 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 05E26E697A; Thu, 17 Dec 2015 21:03:54 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit From: soelvsten@apache.org To: commits@zest.apache.org Date: Thu, 17 Dec 2015 21:03:55 -0000 Message-Id: <1a692e700c634822a3858db1887ab686@git.apache.org> In-Reply-To: <0801fa39fa8b444da17d12eee9339e46@git.apache.org> References: <0801fa39fa8b444da17d12eee9339e46@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [3/3] zest-java git commit: Merge branch 'ZEST-135' into ZEST-132 Merge branch 'ZEST-135' into ZEST-132 Project: http://git-wip-us.apache.org/repos/asf/zest-java/repo Commit: http://git-wip-us.apache.org/repos/asf/zest-java/commit/9c0995de Tree: http://git-wip-us.apache.org/repos/asf/zest-java/tree/9c0995de Diff: http://git-wip-us.apache.org/repos/asf/zest-java/diff/9c0995de Branch: refs/heads/ZEST-132 Commit: 9c0995de4edd4caa1db8691ad398fab7961adbf8 Parents: 81561b0 6304ddb Author: Kent Sølvsten Authored: Thu Dec 17 22:02:49 2015 +0100 Committer: Kent Sølvsten Committed: Thu Dec 17 22:02:49 2015 +0100 ---------------------------------------------------------------------- .../org/apache/zest/api/dataset/DataSet.java | 36 ------ .../apache/zest/api/dataset/DataSetSource.java | 27 ---- .../java/org/apache/zest/api/dataset/Query.java | 64 ---------- .../api/dataset/iterable/IterableDataSet.java | 57 --------- .../api/dataset/iterable/IterableQuery.java | 127 ------------------- .../zest/api/dataset/iterable/package.html | 21 --- .../org/apache/zest/api/dataset/package.html | 21 --- .../zest/api/event/ZestApplicationEvent.java | 23 ++++ .../api/event/ZestApplicationEventHandler.java | 23 ++++ .../org/apache/zest/api/event/ZestEvent.java | 28 ++++ .../apache/zest/api/event/ZestEventHandler.java | 23 ++++ .../apache/zest/api/event/ZestUserEvent.java | 23 ++++ .../zest/api/event/ZestUserEventHandler.java | 23 ++++ .../dataset/iterable/IterableDataSetTest.java | 61 --------- .../zest/bootstrap/ApplicationAssembly.java | 11 ++ .../bootstrap/ApplicationAssemblyFactory.java | 11 ++ .../org/apache/zest/bootstrap/Energy4Java.java | 4 + .../zest/bootstrap/ZestAssemblyEvent.java | 25 ++++ .../bootstrap/ZestAssemblyEventHandler.java | 26 ++++ .../bootstrap/handler/ModuleAssembledEvent.java | 57 +++++++++ .../apache/zest/runtime/ZestRuntimeImpl.java | 6 +- .../ApplicationAssemblyFactoryImpl.java | 18 ++- .../bootstrap/ApplicationAssemblyImpl.java | 14 +- .../bootstrap/ApplicationModelFactoryImpl.java | 10 ++ .../org/apache/zest/runtime/event/EventBus.java | 87 +++++++++++++ .../event/ModuleAssembledRuntimeEvent.java | 66 ++++++++++ .../zest/runtime/event/ZestRuntimeEvent.java | 25 ++++ .../runtime/event/ZestRuntimeEventHandler.java | 25 ++++ .../apache/zest/test/AbstractZestBaseTest.java | 10 +- 29 files changed, 532 insertions(+), 420 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/zest-java/blob/9c0995de/core/runtime/src/main/java/org/apache/zest/runtime/ZestRuntimeImpl.java ---------------------------------------------------------------------- diff --cc core/runtime/src/main/java/org/apache/zest/runtime/ZestRuntimeImpl.java index ce9a239,d7f1ff3..3cd10b6 mode 100644,100755..100755 --- a/core/runtime/src/main/java/org/apache/zest/runtime/ZestRuntimeImpl.java +++ b/core/runtime/src/main/java/org/apache/zest/runtime/ZestRuntimeImpl.java