Merge branch 'ignite-164v2' of
https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-164v2
Conflicts:
modules/spring/src/main/java/org/apache/ignite/internal/processors/spring/IgniteSpringProcessorImpl.java
modules/urideploy/src/main/java/org/apache/ignite/spi/deployment/uri/UriDeploymentSpi.java
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/c39deb5d
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/c39deb5d
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/c39deb5d
Branch: refs/heads/sprint-1
Commit: c39deb5d286f1cf6fa979687c32de8e69096961b
Parents: e782115 0b7b251
Author: ivasilinets <[email protected]>
Authored: Thu Feb 5 13:09:28 2015 +0300
Committer: ivasilinets <[email protected]>
Committed: Thu Feb 5 13:09:28 2015 +0300
----------------------------------------------------------------------
.../integration/ClientAbstractSelfTest.java | 8 +--
.../rest/RestBinaryProtocolSelfTest.java | 2 +-
.../ignite/internal/GridKernalContextImpl.java | 2 +-
.../org/apache/ignite/internal/IgnitionEx.java | 4 +-
.../handlers/log/GridLogCommandHandler.java | 2 +-
.../internal/util/GridConfigurationFinder.java | 6 +--
.../ignite/internal/util/IgniteUtils.java | 16 +++---
...artupWithSpecifiedWorkDirectorySelfTest.java | 8 +--
...tartupWithUndefinedGridGainHomeSelfTest.java | 10 ++--
.../ipc/shmem/GgfsSharedMemoryTestServer.java | 2 +-
.../IpcSharedMemoryCrashDetectionSelfTest.java | 2 +-
.../loadtest/GridSingleExecutionTest.java | 2 +-
.../cache/GridCacheAbstractLoadTest.java | 2 +-
.../logger/java/IgniteJavaLoggerTest.java | 2 +-
...redFsCheckpointSpiMultiThreadedSelfTest.java | 2 +-
.../GridAbstractCommunicationSelfTest.java | 2 +-
...cpCommunicationSpiMultithreadedSelfTest.java | 2 +-
.../GridSwapSpaceSpiAbstractSelfTest.java | 2 +-
.../cmdline/GridCommandLineLoaderTest.java | 2 +-
.../ignite/testframework/GridTestUtils.java | 4 +-
.../junits/IgniteTestResources.java | 6 +--
.../junits/spi/GridSpiAbstractTest.java | 2 +-
modules/core/src/test/webapp/WEB-INF/web.xml | 4 +-
.../apache/ignite/hadoop/GridHadoopSetup.java | 8 +--
.../GridHadoopExternalTaskExecutor.java | 2 +-
.../child/GridHadoopExternalProcessStarter.java | 2 +-
...ridGgfsHadoopFileSystemAbstractSelfTest.java | 4 +-
.../GridGgfsHadoopFileSystemLoggerSelfTest.java | 2 +-
...GgfsHadoopFileSystemLoggerStateSelfTest.java | 4 +-
.../hadoop/GridHadoopPopularWordsTest.java | 2 +-
.../spring/IgniteSpringProcessorImpl.java | 2 +-
.../GridProjectionStartStopRestartSelfTest.java | 52 ++++++++++----------
.../util/antgar/IgniteDeploymentGarAntTask.java | 2 +-
.../spi/deployment/uri/UriDeploymentSpi.java | 2 +-
34 files changed, 88 insertions(+), 88 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c39deb5d/modules/core/src/main/java/org/apache/ignite/internal/util/IgniteUtils.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c39deb5d/modules/core/src/test/java/org/apache/ignite/testframework/GridTestUtils.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c39deb5d/modules/spring/src/main/java/org/apache/ignite/internal/processors/spring/IgniteSpringProcessorImpl.java
----------------------------------------------------------------------
diff --cc
modules/spring/src/main/java/org/apache/ignite/internal/processors/spring/IgniteSpringProcessorImpl.java
index dfc5201,efc7bf2..2049b05
---
a/modules/spring/src/main/java/org/apache/ignite/internal/processors/spring/IgniteSpringProcessorImpl.java
+++
b/modules/spring/src/main/java/org/apache/ignite/internal/processors/spring/IgniteSpringProcessorImpl.java
@@@ -42,8 -42,8 +42,8 @@@ import java.util.concurrent.atomic.*
* Spring configuration processor.
*/
public class IgniteSpringProcessorImpl implements IgniteSpringProcessor {
- /** Path to {@code gridgain.xml} file. */
+ /** Path to {@code ignite.xml} file. */
- public static final String IGNITE_XML_PATH = "META-INF/gridgain.xml";
+ public static final String IGNITE_XML_PATH = "META-INF/ignite.xml";
/** System class loader user version. */
private static final AtomicReference<String> SYS_LDR_VER = new
AtomicReference<>(null);
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c39deb5d/modules/urideploy/src/main/java/org/apache/ignite/spi/deployment/uri/UriDeploymentSpi.java
----------------------------------------------------------------------
diff --cc
modules/urideploy/src/main/java/org/apache/ignite/spi/deployment/uri/UriDeploymentSpi.java
index 80300a6,ee66f85..34392d1
---
a/modules/urideploy/src/main/java/org/apache/ignite/spi/deployment/uri/UriDeploymentSpi.java
+++
b/modules/urideploy/src/main/java/org/apache/ignite/spi/deployment/uri/UriDeploymentSpi.java
@@@ -328,8 -328,8 +328,8 @@@ public class UriDeploymentSpi extends I
/** Default scan frequency for {@code http://} protocol (value is {@code
300000}). */
public static final int DFLT_HTTP_SCAN_FREQUENCY = 300000;
- /** Default task description file path and name (value is {@code
META-INF/gridgain.xml}). */
+ /** Default task description file path and name (value is {@code
META-INF/ignite.xml}). */
- public static final String XML_DESCRIPTOR_PATH = "META-INF/gridgain.xml";
+ public static final String XML_DESCRIPTOR_PATH = "META-INF/ignite.xml";
/**
* Default temporary directory name relative to file path
