Merge remote-tracking branch 'origin/ignite-45' into ignite-45
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/214109fc Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/214109fc Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/214109fc Branch: refs/heads/ignite-471 Commit: 214109fc5425cba3637d8a6e76da60a5b3c35915 Parents: 5d46399 b981d20 Author: sboikov <sboi...@gridgain.com> Authored: Tue Mar 24 13:50:06 2015 +0300 Committer: sboikov <sboi...@gridgain.com> Committed: Tue Mar 24 13:50:06 2015 +0300 ---------------------------------------------------------------------- examples/schema-import/README.txt | 9 +- .../java/org/apache/ignite/schema/Demo.java | 10 ++ .../org/apache/ignite/schema/PersonKey.java | 7 ++ .../org/apache/ignite/IgniteDataStreamer.java | 24 +++-- .../ignite/cache/affinity/CacheAffinity.java | 14 +-- .../cache/query/annotations/package-info.java | 22 ++++ .../org/apache/ignite/cluster/package-info.java | 22 ++++ .../ignite/configuration/package-info.java | 22 ++++ .../distributed/dht/GridDhtLockFuture.java | 2 +- .../apache/ignite/lifecycle/package-info.java | 22 ++++ .../org/apache/ignite/plugin/package-info.java | 22 ++++ .../ignite/transactions/package-info.java | 22 ++++ .../cache/GridCacheLifecycleAwareSelfTest.java | 10 +- .../GridAbstractLifecycleAwareSelfTest.java | 7 ++ .../ignite/schema/generator/CodeGenerator.java | 107 ++++++++++++++++--- .../ignite/schema/generator/XmlGenerator.java | 12 +-- .../apache/ignite/schema/model/IndexItem.java | 16 +-- .../ignite/schema/model/PojoDescriptor.java | 16 +-- .../ignite/schema/ui/ConfirmCallable.java | 2 +- .../org/apache/ignite/schema/ui/MessageBox.java | 21 ++-- 20 files changed, 314 insertions(+), 75 deletions(-) ----------------------------------------------------------------------
