ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sboi...@apache.org
Subject [04/45] incubator-ignite git commit: Merge branches 'ignite-704' and 'ignite-sprint-3' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-704
Date Fri, 10 Apr 2015 15:26:54 GMT
Merge branches 'ignite-704' and 'ignite-sprint-3' of https://git-wip-us.apache.org/repos/asf/incubator-ignite
into ignite-704


Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/d74e1a06
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/d74e1a06
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/d74e1a06

Branch: refs/heads/ignite-676
Commit: d74e1a066f57af74f16e789926f80dafeb5838c2
Parents: c0e6cd5 3765f5d
Author: AKuznetsov <akuznetsov@gridgain.com>
Authored: Thu Apr 9 22:22:49 2015 +0700
Committer: AKuznetsov <akuznetsov@gridgain.com>
Committed: Thu Apr 9 22:22:49 2015 +0700

----------------------------------------------------------------------
 .../apache/ignite/internal/IgniteKernal.java    |  11 +-
 .../ignite/internal/MarshallerContextImpl.java  |   3 +
 .../affinity/GridAffinityProcessor.java         |   5 +-
 .../processors/cache/GridCacheProcessor.java    |  37 +-
 .../continuous/CacheContinuousQueryManager.java |  28 --
 .../cacheobject/IgniteCacheObjectProcessor.java |   5 +-
 .../IgniteCacheObjectProcessorImpl.java         |  34 +-
 .../datastreamer/DataStreamerImpl.java          |   8 +-
 .../query/h2/sql/GridSqlQueryParser.java        |  24 +-
 .../query/h2/sql/BaseH2CompareQueryTest.java    |  12 +-
 modules/urideploy/README.txt                    |   2 +-
 modules/urideploy/licenses/edtftp-license.pdf   | Bin 58355 -> 0 bytes
 modules/urideploy/licenses/jtidy-license.txt    |  50 --
 .../urideploy/licenses/jtidy-mit-license.txt    |  50 ++
 modules/urideploy/pom.xml                       |   6 -
 .../spi/deployment/uri/UriDeploymentSpi.java    | 182 +++----
 .../uri/scanners/GridUriDeploymentScanner.java  | 286 -----------
 .../GridUriDeploymentScannerListener.java       |   2 +-
 .../uri/scanners/UriDeploymentScanner.java      |  47 ++
 .../scanners/UriDeploymentScannerContext.java   |  92 ++++
 .../scanners/UriDeploymentScannerManager.java   | 221 +++++++++
 .../file/GridUriDeploymentFileScanner.java      | 311 ------------
 .../scanners/file/UriDeploymentFileScanner.java | 327 +++++++++++++
 .../ftp/GridUriDeploymentFtpClient.java         | 199 --------
 .../ftp/GridUriDeploymentFtpConfiguration.java  | 115 -----
 .../ftp/GridUriDeploymentFtpException.java      |  43 --
 .../scanners/ftp/GridUriDeploymentFtpFile.java  | 119 -----
 .../ftp/GridUriDeploymentFtpScanner.java        | 234 ---------
 .../uri/scanners/ftp/package-info.java          |  22 -
 .../http/GridUriDeploymentHttpScanner.java      | 423 ----------------
 .../scanners/http/UriDeploymentHttpScanner.java | 478 +++++++++++++++++++
 ...loymentMultiScannersErrorThrottlingTest.java |   3 -
 .../GridUriDeploymentMultiScannersSelfTest.java |   3 +-
 .../GridFileDeploymentUndeploySelfTest.java     |   4 +-
 .../uri/scanners/ftp/GridFtpDeploymentTest.java |  46 --
 .../uri/scanners/ftp/package-info.java          |  22 -
 36 files changed, 1351 insertions(+), 2103 deletions(-)
----------------------------------------------------------------------



Mime
View raw message