#ignite-164:removing gridgain from comments.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/e782115b Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/e782115b Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/e782115b Branch: refs/heads/sprint-1 Commit: e782115b8472daf833937ac53df3d5b3938b7a36 Parents: 15e8b40 Author: ivasilinets <[email protected]> Authored: Thu Feb 5 13:07:58 2015 +0300 Committer: ivasilinets <[email protected]> Committed: Thu Feb 5 13:07:58 2015 +0300 ---------------------------------------------------------------------- .../gridify/GridifySetToXXXNonSpringAopSelfTest.java | 4 ++-- .../ignite/gridify/GridifySetToXXXSpringAopSelfTest.java | 4 ++-- .../org/apache/ignite/gridify/NonSpringAopSelfTest.java | 4 ++-- .../org/test/gridify/ExternalNonSpringAopSelfTest.java | 4 ++-- modules/clients/src/test/resources/log4j.xml | 6 +++--- modules/clients/src/test/resources/spring-router-ssl.xml | 4 ++-- modules/clients/src/test/resources/spring-router.xml | 6 +++--- modules/clients/src/test/resources/spring-server-node.xml | 2 +- .../clients/src/test/resources/spring-server-ssl-node.xml | 2 +- .../apache/ignite/configuration/IgniteDeploymentMode.java | 8 ++++---- .../java/org/apache/ignite/fs/IgniteFsConfiguration.java | 10 +++++----- .../internal/processors/spring/IgniteSpringProcessor.java | 4 ++-- .../java/org/apache/ignite/internal/util/IgniteUtils.java | 2 +- .../java/org/apache/ignite/jdbc/IgniteJdbcDriver.java | 4 ++-- .../org/apache/ignite/marshaller/IgniteMarshaller.java | 2 +- .../org/apache/ignite/spi/IgniteSpiManagementMBean.java | 4 ++-- .../apache/ignite/spi/securesession/SecureSessionSpi.java | 2 +- .../org/apache/ignite/spi/swapspace/SwapSpaceSpi.java | 2 +- .../org/apache/ignite/testframework/GridTestUtils.java | 4 ++-- .../testframework/junits/logger/GridTestLog4jLogger.java | 2 +- .../ignite/testsuites/IgniteCacheFailoverTestSuite.java | 2 +- .../apache/ignite/testsuites/IgniteLangSelfTestSuite.java | 2 +- .../near/GridCachePartitionedHitsAndMissesSelfTest.java | 2 +- .../org/apache/ignite/logger/log4j/IgniteLog4jLogger.java | 2 +- .../processors/spring/IgniteSpringProcessorImpl.java | 2 +- .../ignite/testsuites/IgniteResourceSelfTestSuite.java | 2 +- .../org/apache/ignite/tools/javadoc/IgniteLinkTaglet.java | 4 ++-- .../ignite/spi/deployment/uri/UriDeploymentSpi.java | 6 +++--- modules/visor-plugins/pom.xml | 4 ++-- .../ignite/startup/servlet/IgniteServletStartup.java | 2 +- 30 files changed, 54 insertions(+), 54 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/e782115b/modules/aop/src/test/java/org/apache/ignite/gridify/GridifySetToXXXNonSpringAopSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/aop/src/test/java/org/apache/ignite/gridify/GridifySetToXXXNonSpringAopSelfTest.java b/modules/aop/src/test/java/org/apache/ignite/gridify/GridifySetToXXXNonSpringAopSelfTest.java index 525fb39..237c91e 100644 --- a/modules/aop/src/test/java/org/apache/ignite/gridify/GridifySetToXXXNonSpringAopSelfTest.java +++ b/modules/aop/src/test/java/org/apache/ignite/gridify/GridifySetToXXXNonSpringAopSelfTest.java @@ -27,8 +27,8 @@ import java.util.*; * 1. The JVM is started with following parameters to enable jboss online weaving * (replace ${IGNITE_HOME} to you $IGNITE_HOME): * -javaagent:${IGNITE_HOME}libs/jboss-aop-jdk50-4.0.4.jar - * -Djboss.aop.class.path=[path to grid compiled classes (Idea out folder) or path to gridgain.jar] - * -Djboss.aop.exclude=org,com -Djboss.aop.include=org.gridgain + * -Djboss.aop.class.path=[path to grid compiled classes (Idea out folder) or path to ignite.jar] + * -Djboss.aop.exclude=org,com -Djboss.aop.include=org.apache.ignite * * 2. The following jars should be in a classpath: * ${IGNITE_HOME}libs/javassist-3.x.x.jar http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/e782115b/modules/aop/src/test/java/org/apache/ignite/gridify/GridifySetToXXXSpringAopSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/aop/src/test/java/org/apache/ignite/gridify/GridifySetToXXXSpringAopSelfTest.java b/modules/aop/src/test/java/org/apache/ignite/gridify/GridifySetToXXXSpringAopSelfTest.java index fc921dc..e4e2c69 100644 --- a/modules/aop/src/test/java/org/apache/ignite/gridify/GridifySetToXXXSpringAopSelfTest.java +++ b/modules/aop/src/test/java/org/apache/ignite/gridify/GridifySetToXXXSpringAopSelfTest.java @@ -28,8 +28,8 @@ import java.util.*; * 1. The JVM is started with following parameters to enable jboss online weaving * (replace ${IGNITE_HOME} to you $IGNITE_HOME): * -javaagent:${IGNITE_HOME}libs/jboss-aop-jdk50-4.0.4.jar - * -Djboss.aop.class.path=[path to grid compiled classes (Idea out folder) or path to gridgain.jar] - * -Djboss.aop.exclude=org,com -Djboss.aop.include=org.gridgain + * -Djboss.aop.class.path=[path to grid compiled classes (Idea out folder) or path to ignite.jar] + * -Djboss.aop.exclude=org,com -Djboss.aop.include=org.apache.ignite * * 2. The following jars should be in a classpath: * ${IGNITE_HOME}libs/javassist-3.x.x.jar http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/e782115b/modules/aop/src/test/java/org/apache/ignite/gridify/NonSpringAopSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/aop/src/test/java/org/apache/ignite/gridify/NonSpringAopSelfTest.java b/modules/aop/src/test/java/org/apache/ignite/gridify/NonSpringAopSelfTest.java index 1a1ac44..aa58118 100644 --- a/modules/aop/src/test/java/org/apache/ignite/gridify/NonSpringAopSelfTest.java +++ b/modules/aop/src/test/java/org/apache/ignite/gridify/NonSpringAopSelfTest.java @@ -25,8 +25,8 @@ import org.apache.ignite.testframework.junits.common.*; * 1. The JVM is started with following parameters to enable jboss online weaving * (replace ${IGNITE_HOME} to you $IGNITE_HOME): * -javaagent:${IGNITE_HOME}libs/jboss-aop-jdk50-4.0.4.jar - * -Djboss.aop.class.path=[path to grid compiled classes (Idea out folder) or path to gridgain.jar] - * -Djboss.aop.exclude=org,com -Djboss.aop.include=org.gridgain + * -Djboss.aop.class.path=[path to grid compiled classes (Idea out folder) or path to ignite.jar] + * -Djboss.aop.exclude=org,com -Djboss.aop.include=org.apache.ignite * * 2. The following jars should be in a classpath: * ${IGNITE_HOME}libs/javassist-3.x.x.jar http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/e782115b/modules/aop/src/test/java/org/test/gridify/ExternalNonSpringAopSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/aop/src/test/java/org/test/gridify/ExternalNonSpringAopSelfTest.java b/modules/aop/src/test/java/org/test/gridify/ExternalNonSpringAopSelfTest.java index 8ff16d5..6e91fb2 100644 --- a/modules/aop/src/test/java/org/test/gridify/ExternalNonSpringAopSelfTest.java +++ b/modules/aop/src/test/java/org/test/gridify/ExternalNonSpringAopSelfTest.java @@ -30,8 +30,8 @@ import org.apache.ignite.testframework.junits.common.*; * 1. The JVM is started with following parameters to enable jboss online weaving * (replace ${IGNITE_HOME} to you $IGNITE_HOME): * -javaagent:${IGNITE_HOME}libs/jboss-aop-jdk50-4.0.4.jar - * -Djboss.aop.class.path=[path to grid compiled classes (Idea out folder) or path to gridgain.jar] - * -Djboss.aop.exclude=org,com -Djboss.aop.include=org.gridgain + * -Djboss.aop.class.path=[path to grid compiled classes (Idea out folder) or path to ignite.jar] + * -Djboss.aop.exclude=org,com -Djboss.aop.include=org.apache.ignite * * 2. The following jars should be in a classpath: * ${IGNITE_HOME}libs/javassist-3.x.x.jar http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/e782115b/modules/clients/src/test/resources/log4j.xml ---------------------------------------------------------------------- diff --git a/modules/clients/src/test/resources/log4j.xml b/modules/clients/src/test/resources/log4j.xml index 616efe8..e4e8298 100644 --- a/modules/clients/src/test/resources/log4j.xml +++ b/modules/clients/src/test/resources/log4j.xml @@ -83,7 +83,7 @@ Uncomment to enable Ignite debugging. --> <!-- - <category name="org.gridgain"> + <category name="org.apache.ignite"> <level value="DEBUG"/> </category> --> @@ -93,7 +93,7 @@ query execution tracing. --> <!-- - <category name="org.gridgain.cache.queries"> + <category name="org.apache.ignite.cache.queries"> <level value="DEBUG"/> </category> --> @@ -102,7 +102,7 @@ Uncomment to enable DGC tracing. --> <!-- - <category name="org.gridgain.grid.kernal.processors.cache.GridCacheDgcManager.trace"> + <category name="org.apache.ignite.grid.kernal.processors.cache.GridCacheDgcManager.trace"> <level value="DEBUG"/> </category> --> http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/e782115b/modules/clients/src/test/resources/spring-router-ssl.xml ---------------------------------------------------------------------- diff --git a/modules/clients/src/test/resources/spring-router-ssl.xml b/modules/clients/src/test/resources/spring-router-ssl.xml index bf1a342..e27b360 100644 --- a/modules/clients/src/test/resources/spring-router-ssl.xml +++ b/modules/clients/src/test/resources/spring-router-ssl.xml @@ -22,8 +22,8 @@ This file is automatically scanned by $IGNITE_HOME/bin/igniterouter.sh and $IGNITE_HOME/bin/igniterouter.bat - for org.gridgain.client.router.GridTcpRestRouterConfiguration and - org.gridgain.client.router.GridHttpRestRouterConfiguration bean definitions. + for org.apache.ignite.client.router.GridTcpRestRouterConfiguration and + org.apache.ignite.client.router.GridHttpRestRouterConfiguration bean definitions. First found are used to start corresponding router instances. You can also use org.gridgain.client.router.GridRouterFactory to http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/e782115b/modules/clients/src/test/resources/spring-router.xml ---------------------------------------------------------------------- diff --git a/modules/clients/src/test/resources/spring-router.xml b/modules/clients/src/test/resources/spring-router.xml index ba078f5..eb610d8 100644 --- a/modules/clients/src/test/resources/spring-router.xml +++ b/modules/clients/src/test/resources/spring-router.xml @@ -22,11 +22,11 @@ This file is automatically scanned by $IGNITE_HOME/bin/igniterouter.sh and $IGNITE_HOME/bin/igniterouter.bat - for org.gridgain.client.router.GridTcpRestRouterConfiguration and - org.gridgain.client.router.GridHttpRestRouterConfiguration bean definitions. + for org.apache.ignite.client.router.GridTcpRestRouterConfiguration and + org.apache.ignite.client.router.GridHttpRestRouterConfiguration bean definitions. First found are used to start corresponding router instances. - You can also use org.gridgain.client.router.GridRouterFactory to + You can also use org.apache.ignite.client.router.GridRouterFactory to programmatically start and stop router instances inside your application. Please refer to javadoc for more details. --> http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/e782115b/modules/clients/src/test/resources/spring-server-node.xml ---------------------------------------------------------------------- diff --git a/modules/clients/src/test/resources/spring-server-node.xml b/modules/clients/src/test/resources/spring-server-node.xml index cd62c8f..7c5fa19 100644 --- a/modules/clients/src/test/resources/spring-server-node.xml +++ b/modules/clients/src/test/resources/spring-server-node.xml @@ -264,7 +264,7 @@ Use passcode authentication SPI. - -> <property name="authenticationSpi"> - <bean class="org.gridgain.grid.spi.authentication.passcode.GridPasscodeAuthenticationSpi"> + <bean class="org.apache.ignite.grid.spi.authentication.passcode.GridPasscodeAuthenticationSpi"> <property name="passcodes"> <map> <entry key="REMOTE_NODE" value="s3cret"/> http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/e782115b/modules/clients/src/test/resources/spring-server-ssl-node.xml ---------------------------------------------------------------------- diff --git a/modules/clients/src/test/resources/spring-server-ssl-node.xml b/modules/clients/src/test/resources/spring-server-ssl-node.xml index 9d99e58..8a07f6e 100644 --- a/modules/clients/src/test/resources/spring-server-ssl-node.xml +++ b/modules/clients/src/test/resources/spring-server-ssl-node.xml @@ -231,7 +231,7 @@ Use passcode authentication SPI. - -> <property name="authenticationSpi"> - <bean class="org.gridgain.grid.spi.authentication.passcode.GridPasscodeAuthenticationSpi"> + <bean class="org.apache.ignite.grid.spi.authentication.passcode.GridPasscodeAuthenticationSpi"> <property name="passcodes"> <map> <entry key="REMOTE_NODE" value="s3cret"/> http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/e782115b/modules/core/src/main/java/org/apache/ignite/configuration/IgniteDeploymentMode.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/configuration/IgniteDeploymentMode.java b/modules/core/src/main/java/org/apache/ignite/configuration/IgniteDeploymentMode.java index 9ef56fe..1797cbf 100644 --- a/modules/core/src/main/java/org/apache/ignite/configuration/IgniteDeploymentMode.java +++ b/modules/core/src/main/java/org/apache/ignite/configuration/IgniteDeploymentMode.java @@ -47,10 +47,10 @@ import org.jetbrains.annotations.*; * <constructor-arg value="0"/> * </bean> * </pre> - * By default, all gridgain startup scripts ({@code gridgain.sh} or {@code gridgain.bat}) + * By default, all ignite startup scripts ({@code gridgain.sh} or {@code gridgain.bat}) * pick up user version from {@code IGNITE_HOME/config/userversion} folder. Usually, it * is just enough to update user version under that folder, however, in case of {@code GAR} - * or {@code JAR} deployment, you should remember to provide {@code META-INF/gridgain.xml} + * or {@code JAR} deployment, you should remember to provide {@code META-INF/ignite.xml} * file with desired user version in it. * <p> * <h1 class="header">Always-Local Development</h1> @@ -131,7 +131,7 @@ public enum IgniteDeploymentMode { * <p> * Note that classes deployed in this mode will be undeployed if * all master nodes left grid or if user version changed. User version can - * be specified in {@code META-INF/gridgain.xml} file as a Spring bean + * be specified in {@code META-INF/ignite.xml} file as a Spring bean * property with name {@code userVersion}. This file has to be in the class * path of the class used for task execution. * <p> @@ -160,7 +160,7 @@ public enum IgniteDeploymentMode { * <p> * Note that classes deployed in <tt>CONTINUOUS</tt> mode will be undeployed * only if user version changes. User version can be specified in - * {@code META-INF/gridgain.xml} file as a Spring bean property with name + * {@code META-INF/ignite.xml} file as a Spring bean property with name * {@code userVersion}. This file has to be in the class * path of the class used for task execution. */ http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/e782115b/modules/core/src/main/java/org/apache/ignite/fs/IgniteFsConfiguration.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/fs/IgniteFsConfiguration.java b/modules/core/src/main/java/org/apache/ignite/fs/IgniteFsConfiguration.java index 7f379a1..2d5d64b 100644 --- a/modules/core/src/main/java/org/apache/ignite/fs/IgniteFsConfiguration.java +++ b/modules/core/src/main/java/org/apache/ignite/fs/IgniteFsConfiguration.java @@ -536,13 +536,13 @@ public class IgniteFsConfiguration { * If path doesn't correspond to any specified prefix or mappings are not provided, then * {@link #getDefaultMode()} is used. * <p> - * Several folders under {@code '/gridgain'} folder have predefined mappings which cannot be overridden. - * <li>{@code /gridgain/primary} and all it's sub-folders will always work in {@code PRIMARY} mode.</li> + * Several folders under {@code '/apache/ignite'} folder have predefined mappings which cannot be overridden. + * <li>{@code /apache/ignite/primary} and all it's sub-folders will always work in {@code PRIMARY} mode.</li> * <p> * And in case secondary file system URI is provided: - * <li>{@code /gridgain/proxy} and all it's sub-folders will always work in {@code PROXY} mode.</li> - * <li>{@code /gridgain/sync} and all it's sub-folders will always work in {@code DUAL_SYNC} mode.</li> - * <li>{@code /gridgain/async} and all it's sub-folders will always work in {@code DUAL_ASYNC} mode.</li> + * <li>{@code /apache/ignite/proxy} and all it's sub-folders will always work in {@code PROXY} mode.</li> + * <li>{@code /apache/ignite/sync} and all it's sub-folders will always work in {@code DUAL_SYNC} mode.</li> + * <li>{@code /apache/ignite/async} and all it's sub-folders will always work in {@code DUAL_ASYNC} mode.</li> * * @return Map of paths to {@code GGFS} modes. */ http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/e782115b/modules/core/src/main/java/org/apache/ignite/internal/processors/spring/IgniteSpringProcessor.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/spring/IgniteSpringProcessor.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/spring/IgniteSpringProcessor.java index 4ad36a4..d0167fe 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/spring/IgniteSpringProcessor.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/spring/IgniteSpringProcessor.java @@ -60,8 +60,8 @@ public interface IgniteSpringProcessor { /** * Gets user version for given class loader by checking - * {@code META-INF/gridgain.xml} file for {@code userVersion} attribute. If - * {@code gridgain.xml} file is not found, or user version is not specified there, + * {@code META-INF/ignite.xml} file for {@code userVersion} attribute. If + * {@code ignite.xml} file is not found, or user version is not specified there, * then default version (empty string) is returned. * * @param ldr Class loader. http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/e782115b/modules/core/src/main/java/org/apache/ignite/internal/util/IgniteUtils.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/IgniteUtils.java b/modules/core/src/main/java/org/apache/ignite/internal/util/IgniteUtils.java index a5ff2f6..d6425e7 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/util/IgniteUtils.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/util/IgniteUtils.java @@ -238,7 +238,7 @@ public abstract class IgniteUtils { /** Name of the JVM implementation. */ private static String jvmImplName; - /** JMX domain as 'xxx.gridgain'. */ + /** JMX domain as 'xxx.apache.ignite'. */ public static final String JMX_DOMAIN = IgniteUtils.class.getName().substring(0, IgniteUtils.class.getName(). indexOf('.', IgniteUtils.class.getName().indexOf('.') + 1)); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/e782115b/modules/core/src/main/java/org/apache/ignite/jdbc/IgniteJdbcDriver.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/jdbc/IgniteJdbcDriver.java b/modules/core/src/main/java/org/apache/ignite/jdbc/IgniteJdbcDriver.java index 476ac45..b1075f7 100644 --- a/modules/core/src/main/java/org/apache/ignite/jdbc/IgniteJdbcDriver.java +++ b/modules/core/src/main/java/org/apache/ignite/jdbc/IgniteJdbcDriver.java @@ -73,7 +73,7 @@ import java.util.logging.*; * configuration properties can be applied to JDBC connection. * <p> * JDBC connection URL has the following pattern: - * {@code jdbc:gridgain://<hostname>:<port>/<cache_name>?nodeId=<UUID>}<br> + * {@code jdbc:ignite://<hostname>:<port>/<cache_name>?nodeId=<UUID>}<br> * Note the following: * <ul> * <li>Hostname is required.</li> @@ -203,7 +203,7 @@ import java.util.logging.*; * Class.forName("org.apache.ignite.jdbc.IgniteJdbcDriver"); * * // Open JDBC connection. - * Connection conn = DriverManager.getConnection("jdbc:gridgain://localhost/cache"); + * Connection conn = DriverManager.getConnection("jdbc:ignite://localhost/cache"); * * // Query persons' names * ResultSet rs = conn.createStatement().executeQuery("select name from Person"); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/e782115b/modules/core/src/main/java/org/apache/ignite/marshaller/IgniteMarshaller.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/marshaller/IgniteMarshaller.java b/modules/core/src/main/java/org/apache/ignite/marshaller/IgniteMarshaller.java index ff57702..4bd5a7f 100644 --- a/modules/core/src/main/java/org/apache/ignite/marshaller/IgniteMarshaller.java +++ b/modules/core/src/main/java/org/apache/ignite/marshaller/IgniteMarshaller.java @@ -27,7 +27,7 @@ import java.io.*; * serialization/deserialization mechanism for all instances that are sent across networks * or are otherwise serialized. * <p> - * Gridgain provides the following {@code GridMarshaller} implementations: + * Ignite provides the following {@code GridMarshaller} implementations: * <ul> * <li>{@link org.apache.ignite.marshaller.optimized.IgniteOptimizedMarshaller} - default</li> * <li>{@link org.apache.ignite.marshaller.jdk.IgniteJdkMarshaller}</li> http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/e782115b/modules/core/src/main/java/org/apache/ignite/spi/IgniteSpiManagementMBean.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/spi/IgniteSpiManagementMBean.java b/modules/core/src/main/java/org/apache/ignite/spi/IgniteSpiManagementMBean.java index 4e5cf4a..9caaf8a 100644 --- a/modules/core/src/main/java/org/apache/ignite/spi/IgniteSpiManagementMBean.java +++ b/modules/core/src/main/java/org/apache/ignite/spi/IgniteSpiManagementMBean.java @@ -60,9 +60,9 @@ public interface IgniteSpiManagementMBean { public long getUpTime(); /** - * Gets Gridgain installation home folder (i.e. ${IGNITE_HOME}); + * Gets Ignite installation home folder (i.e. ${IGNITE_HOME}); * - * @return Gridgain installation home folder. + * @return Ignite installation home folder. */ @IgniteMXBeanDescription("Gridgain installation home folder.") public String getGridGainHome(); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/e782115b/modules/core/src/main/java/org/apache/ignite/spi/securesession/SecureSessionSpi.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/spi/securesession/SecureSessionSpi.java b/modules/core/src/main/java/org/apache/ignite/spi/securesession/SecureSessionSpi.java index b7fcdaf..ba4cef9 100644 --- a/modules/core/src/main/java/org/apache/ignite/spi/securesession/SecureSessionSpi.java +++ b/modules/core/src/main/java/org/apache/ignite/spi/securesession/SecureSessionSpi.java @@ -32,7 +32,7 @@ import java.util.*; * The default secure session SPI is {@link org.apache.ignite.spi.securesession.noop.NoopSecureSessionSpi} * which permits any request. * <p> - * Gridgain provides the following {@code GridSecureSessionSpi} implementations: + * Ignite provides the following {@code GridSecureSessionSpi} implementations: * <ul> * <li> * {@link org.apache.ignite.spi.securesession.noop.NoopSecureSessionSpi} - permits any request. http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/e782115b/modules/core/src/main/java/org/apache/ignite/spi/swapspace/SwapSpaceSpi.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/spi/swapspace/SwapSpaceSpi.java b/modules/core/src/main/java/org/apache/ignite/spi/swapspace/SwapSpaceSpi.java index b3d1475..b3ad1db 100644 --- a/modules/core/src/main/java/org/apache/ignite/spi/swapspace/SwapSpaceSpi.java +++ b/modules/core/src/main/java/org/apache/ignite/spi/swapspace/SwapSpaceSpi.java @@ -34,7 +34,7 @@ import java.util.*; * The default swap space SPI is {@link org.apache.ignite.spi.swapspace.file.FileSwapSpaceSpi} which stores values on disk in files and keeps keys in * memory. * <p> - * Gridgain provides the following {@code GridSwapSpaceSpi} implementations: + * Ignite provides the following {@code GridSwapSpaceSpi} implementations: * <ul> * <li> * {@link org.apache.ignite.spi.swapspace.file.FileSwapSpaceSpi} - pure Java implementation with in-memory keys. This SPI is used by default. http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/e782115b/modules/core/src/test/java/org/apache/ignite/testframework/GridTestUtils.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/testframework/GridTestUtils.java b/modules/core/src/test/java/org/apache/ignite/testframework/GridTestUtils.java index 300cdce..929e80f 100644 --- a/modules/core/src/test/java/org/apache/ignite/testframework/GridTestUtils.java +++ b/modules/core/src/test/java/org/apache/ignite/testframework/GridTestUtils.java @@ -806,7 +806,7 @@ public final class GridTestUtils { } /** - * @param ggHome Optional gridgain home path. + * @param ggHome Optional ignite home path. * @param path Path to resolve. * @return Resolved path, or {@code null} if file cannot be resolved. */ @@ -817,7 +817,7 @@ public final class GridTestUtils { } /** - * @param ggHome Optional gridgain home path. + * @param ggHome Optional ignite home path. * @param path Path to resolve. * @return Resolved path, or {@code null} if file cannot be resolved. */ http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/e782115b/modules/core/src/test/java/org/apache/ignite/testframework/junits/logger/GridTestLog4jLogger.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/testframework/junits/logger/GridTestLog4jLogger.java b/modules/core/src/test/java/org/apache/ignite/testframework/junits/logger/GridTestLog4jLogger.java index e9d5f04..db49975 100644 --- a/modules/core/src/test/java/org/apache/ignite/testframework/junits/logger/GridTestLog4jLogger.java +++ b/modules/core/src/test/java/org/apache/ignite/testframework/junits/logger/GridTestLog4jLogger.java @@ -329,7 +329,7 @@ public class GridTestLog4jLogger implements IgniteLogger, IgniteLoggerNodeIdAwar // Console appender not found => we've looked through all categories up to root. assert rootCategory != null; - // User launched gridgain in verbose mode and did not add console appender with INFO level + // User launched ignite in verbose mode and did not add console appender with INFO level // to configuration and did not set IGNITE_CONSOLE_APPENDER to false. if (errAppender != null) { rootCategory.addAppender(createConsoleAppender(Level.INFO)); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/e782115b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheFailoverTestSuite.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheFailoverTestSuite.java b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheFailoverTestSuite.java index 21cb83e..45b15ab 100644 --- a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheFailoverTestSuite.java +++ b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheFailoverTestSuite.java @@ -27,7 +27,7 @@ import org.apache.ignite.internal.processors.cache.distributed.near.*; */ public class IgniteCacheFailoverTestSuite extends TestSuite { /** - * @return Gridgain Cache Group Lock Failover test suite. + * @return Ignite Cache Group Lock Failover test suite. * @throws Exception Thrown in case of the failure. */ public static TestSuite suite() throws Exception { http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/e782115b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteLangSelfTestSuite.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteLangSelfTestSuite.java b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteLangSelfTestSuite.java index d4df45a..5aac816 100644 --- a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteLangSelfTestSuite.java +++ b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteLangSelfTestSuite.java @@ -26,7 +26,7 @@ import org.apache.ignite.lang.utils.*; import org.apache.ignite.util.*; /** - * Gridgain language test suite. + * Ignite language test suite. */ public class IgniteLangSelfTestSuite extends TestSuite { /** http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/e782115b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedHitsAndMissesSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedHitsAndMissesSelfTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedHitsAndMissesSelfTest.java index 166a0dd..1e2b6e8 100644 --- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedHitsAndMissesSelfTest.java +++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedHitsAndMissesSelfTest.java @@ -102,7 +102,7 @@ public class GridCachePartitionedHitsAndMissesSelfTest extends GridCommonAbstrac } /** - * This test is just a wrapper for org.gridgain.examples1.data.realtime.GridPopularNumbersRealTimeExample + * This test is just a wrapper for org.apache.ignite.examples.datagrid.CachePopularNumbersExample * * @throws Exception If failed. */ http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/e782115b/modules/log4j/src/main/java/org/apache/ignite/logger/log4j/IgniteLog4jLogger.java ---------------------------------------------------------------------- diff --git a/modules/log4j/src/main/java/org/apache/ignite/logger/log4j/IgniteLog4jLogger.java b/modules/log4j/src/main/java/org/apache/ignite/logger/log4j/IgniteLog4jLogger.java index 2c867b8..0d3598e 100644 --- a/modules/log4j/src/main/java/org/apache/ignite/logger/log4j/IgniteLog4jLogger.java +++ b/modules/log4j/src/main/java/org/apache/ignite/logger/log4j/IgniteLog4jLogger.java @@ -42,7 +42,7 @@ import static org.apache.ignite.IgniteSystemProperties.*; * Here is a typical example of configuring log4j logger in Ignite configuration file: * <pre name="code" class="xml"> * <property name="gridLogger"> - * <bean class="org.gridgain.grid.logger.log4j.GridLog4jLogger"> + * <bean class="org.apache.ignite.grid.logger.log4j.GridLog4jLogger"> * <constructor-arg type="java.lang.String" value="config/ignite-log4j.xml"/> * </bean> * </property> http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/e782115b/modules/spring/src/main/java/org/apache/ignite/internal/processors/spring/IgniteSpringProcessorImpl.java ---------------------------------------------------------------------- diff --git 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 index 5561aa1..dfc5201 100644 --- 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,7 +42,7 @@ 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"; /** System class loader user version. */ http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/e782115b/modules/spring/src/test/java/org/apache/ignite/testsuites/IgniteResourceSelfTestSuite.java ---------------------------------------------------------------------- diff --git a/modules/spring/src/test/java/org/apache/ignite/testsuites/IgniteResourceSelfTestSuite.java b/modules/spring/src/test/java/org/apache/ignite/testsuites/IgniteResourceSelfTestSuite.java index 1c2003f..2e38f19 100644 --- a/modules/spring/src/test/java/org/apache/ignite/testsuites/IgniteResourceSelfTestSuite.java +++ b/modules/spring/src/test/java/org/apache/ignite/testsuites/IgniteResourceSelfTestSuite.java @@ -21,7 +21,7 @@ import junit.framework.*; import org.apache.ignite.internal.processors.resource.*; /** - * Gridgain resource injection test Suite. + * Ignite resource injection test Suite. */ @SuppressWarnings({"ProhibitedExceptionDeclared"}) public class IgniteResourceSelfTestSuite extends TestSuite { http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/e782115b/modules/tools/src/main/java/org/apache/ignite/tools/javadoc/IgniteLinkTaglet.java ---------------------------------------------------------------------- diff --git a/modules/tools/src/main/java/org/apache/ignite/tools/javadoc/IgniteLinkTaglet.java b/modules/tools/src/main/java/org/apache/ignite/tools/javadoc/IgniteLinkTaglet.java index 06aab1f..51487ea 100644 --- a/modules/tools/src/main/java/org/apache/ignite/tools/javadoc/IgniteLinkTaglet.java +++ b/modules/tools/src/main/java/org/apache/ignite/tools/javadoc/IgniteLinkTaglet.java @@ -109,9 +109,9 @@ public class IgniteLinkTaglet implements Taglet { /** * Given the <code>Tag</code> representation of this custom tag, return its string representation. * <p> - * Input: org.gridgain.grid.spi.indexing.h2.GridH2IndexingSpi#setIndexCustomFunctionClasses(Class[]) + * Input: org.apache.ignite.grid.spi.indexing.h2.GridH2IndexingSpi#setIndexCustomFunctionClasses(Class[]) * <p> - * Output: <a href="../../../../../org/gridgain/grid/spi/indexing/h2/GridH2IndexingSpi.html# + * Output: <a href="../../../../../org/apache/ignite/grid/spi/indexing/h2/GridH2IndexingSpi.html# * setIndexCustomFunctionClasses(java.lang.Class...)"> * <code>GridH2IndexingSpi.setIndexCustomFunctionClasses(java.lang.Class[])</code></a> * http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/e782115b/modules/urideploy/src/main/java/org/apache/ignite/spi/deployment/uri/UriDeploymentSpi.java ---------------------------------------------------------------------- diff --git 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 index deb551e..80300a6 100644 --- 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 @@ -71,7 +71,7 @@ import java.util.Map.*; * <pre class="snippet"> * META-INF/ * | - * - gridgain.xml + * - ignite.xml * - ... * lib/ * | @@ -81,7 +81,7 @@ import java.util.Map.*; * ...</pre> * <ul> * <li> - * {@code META-INF/} entry may contain {@code gridgain.xml} file which is a + * {@code META-INF/} entry may contain {@code ignite.xml} file which is a * task descriptor file. The purpose of task descriptor XML file is to specify * all tasks to be deployed. This file is a regular * <a href="http://www.springframework.org/documentation";>Spring</a> XML @@ -328,7 +328,7 @@ public class UriDeploymentSpi extends IgniteSpiAdapter implements DeploymentSpi, /** 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"; /** http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/e782115b/modules/visor-plugins/pom.xml ---------------------------------------------------------------------- diff --git a/modules/visor-plugins/pom.xml b/modules/visor-plugins/pom.xml index 07b1c58..2697826 100644 --- a/modules/visor-plugins/pom.xml +++ b/modules/visor-plugins/pom.xml @@ -36,13 +36,13 @@ <artifactId>ignite-visor-plugins</artifactId> <dependencies> - <!-- Gridgain dependencies --> + <!-- Ignite dependencies --> <dependency> <groupId>org.apache.ignite</groupId> <artifactId>ignite-core</artifactId> <version>${ignite.version}</version> </dependency> - <!-- Gridgain dependencies --> + <!-- Ignite dependencies --> <!-- Third party dependencies --> <dependency> http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/e782115b/modules/web/src/main/java/org/apache/ignite/startup/servlet/IgniteServletStartup.java ---------------------------------------------------------------------- diff --git a/modules/web/src/main/java/org/apache/ignite/startup/servlet/IgniteServletStartup.java b/modules/web/src/main/java/org/apache/ignite/startup/servlet/IgniteServletStartup.java index b4ff6ae..6aa86a4 100644 --- a/modules/web/src/main/java/org/apache/ignite/startup/servlet/IgniteServletStartup.java +++ b/modules/web/src/main/java/org/apache/ignite/startup/servlet/IgniteServletStartup.java @@ -62,7 +62,7 @@ import java.util.*; * <ol> * <li>Add Ignite libraries in Tomcat common loader. * Add in file {@code $TOMCAT_HOME/conf/catalina.properties} for property {@code shared.loader} - * the following {@code $IGNITE_HOME/gridgain.jar,$IGNITE_HOME/libs/*.jar} + * the following {@code $IGNITE_HOME/ignite.jar,$IGNITE_HOME/libs/*.jar} * (replace {@code $IGNITE_HOME} with absolute path). * </li> * <li>Configure startup in {@code $TOMCAT_HOME/conf/web.xml}
