Merge remote-tracking branch 'remotes/origin/ignite-1.5' into ignite-1537
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/345ee82e Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/345ee82e Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/345ee82e Branch: refs/heads/ignite-1537 Commit: 345ee82ed5af7304bafd4657c519d0b030b4abbf Parents: 172a90f baab3d2 Author: sboikov <sboi...@gridgain.com> Authored: Fri Dec 4 09:51:57 2015 +0300 Committer: sboikov <sboi...@gridgain.com> Committed: Fri Dec 4 09:51:57 2015 +0300 ---------------------------------------------------------------------- examples/pom.xml | 2 +- examples/schema-import/pom.xml | 2 +- modules/aop/pom.xml | 12 +- modules/aws/pom.xml | 18 +- modules/camel/pom.xml | 11 +- modules/core/pom.xml | 28 +- .../processors/cache/GridCacheIoManager.java | 2 +- .../GridDhtPartitionsExchangeFuture.java | 9 +- .../dht/GridCacheTxNodeFailureSelfTest.java | 2 + .../dht/GridNearCacheTxNodeFailureSelfTest.java | 4 - .../testsuites/IgniteCacheTestSuite2.java | 2 + modules/flume/pom.xml | 16 +- modules/geospatial/pom.xml | 20 ++ modules/hadoop/pom.xml | 2 +- modules/hibernate/pom.xml | 10 +- modules/indexing/pom.xml | 22 +- modules/jcl/pom.xml | 11 + modules/jms11/pom.xml | 20 +- modules/jta/pom.xml | 17 + modules/kafka/pom.xml | 16 +- modules/log4j/pom.xml | 10 + modules/log4j2/pom.xml | 11 + modules/mqtt/pom.xml | 24 +- modules/osgi-karaf/README.txt | 18 + modules/osgi-karaf/licenses/apache-2.0.txt | 202 ++++++++++++ modules/osgi-karaf/pom.xml | 84 +++++ .../osgi-karaf/src/main/resources/features.xml | 327 +++++++++++++++++++ modules/osgi-paxlogging/README.txt | 12 + modules/osgi-paxlogging/licenses/apache-2.0.txt | 202 ++++++++++++ modules/osgi-paxlogging/pom.xml | 69 ++++ modules/osgi/README.txt | 65 ++++ modules/osgi/licenses/apache-2.0.txt | 202 ++++++++++++ modules/osgi/pom.xml | 171 ++++++++++ .../IgniteAbstractOsgiContextActivator.java | 238 ++++++++++++++ .../org/apache/ignite/osgi/IgniteOsgiUtils.java | 69 ++++ .../BundleDelegatingClassLoader.java | 147 +++++++++ .../classloaders/ContainerSweepClassLoader.java | 134 ++++++++ .../OsgiClassLoadingStrategyType.java | 29 ++ .../ignite/osgi/AbstractIgniteKarafTest.java | 109 +++++++ .../IgniteKarafFeaturesInstallationTest.java | 100 ++++++ .../ignite/osgi/IgniteOsgiServiceTest.java | 131 ++++++++ .../apache/ignite/osgi/IgniteOsgiTestSuite.java | 32 ++ .../activators/BasicIgniteTestActivator.java | 76 +++++ .../ignite/osgi/activators/TestOsgiFlags.java | 53 +++ .../osgi/activators/TestOsgiFlagsImpl.java | 83 +++++ modules/rest-http/pom.xml | 34 +- modules/scalar-2.10/pom.xml | 9 +- modules/scalar/pom.xml | 9 +- modules/schedule/pom.xml | 25 +- modules/schema-import/pom.xml | 2 +- modules/slf4j/pom.xml | 12 +- modules/spark-2.10/pom.xml | 2 +- modules/spring/pom.xml | 30 +- modules/ssh/pom.xml | 19 +- modules/twitter/pom.xml | 12 +- modules/urideploy/pom.xml | 17 +- modules/visor-console-2.10/pom.xml | 4 +- modules/visor-console/pom.xml | 2 +- modules/visor-plugins/pom.xml | 4 +- modules/web/pom.xml | 13 +- ...IgniteTransactionalInvokeRetryBenchmark.java | 4 +- ...IgniteTransactionalWriteInvokeBenchmark.java | 6 +- modules/zookeeper/pom.xml | 14 +- parent/pom.xml | 136 +++++++- pom.xml | 44 ++- 65 files changed, 3120 insertions(+), 102 deletions(-) ----------------------------------------------------------------------
