# ignite-164 : [core] org.gridgain -> org.apache.ignite
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/1989b2c9 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/1989b2c9 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/1989b2c9 Branch: refs/heads/ignite-164 Commit: 1989b2c9c346c92b248662e70a38991e8ade39b8 Parents: 608192e Author: Artem SHutak <ashu...@gridgain.com> Authored: Wed Feb 4 15:32:18 2015 +0300 Committer: Artem SHutak <ashu...@gridgain.com> Committed: Wed Feb 4 15:32:18 2015 +0300 ---------------------------------------------------------------------- .../main/java/org/apache/ignite/IgnitePortables.java | 4 ++-- .../ignite/client/router/impl/GridTcpRouterImpl.java | 2 +- .../java/org/apache/ignite/cluster/ClusterNode.java | 14 +++++++------- .../org/apache/ignite/compute/gridify/Gridify.java | 2 +- .../ignite/compute/gridify/GridifySetToSet.java | 2 +- .../ignite/compute/gridify/GridifySetToValue.java | 2 +- .../ignite/configuration/IgniteConfiguration.java | 2 +- .../apache/ignite/internal/IgniteNodeAttributes.java | 2 +- .../rest/handlers/top/GridTopologyCommandHandler.java | 2 +- .../java/org/apache/ignite/jdbc/IgniteJdbcDriver.java | 2 +- modules/core/src/test/config/log4j-test.xml | 4 ++-- .../internal/GridNodeVisorAttributesSelfTest.java | 2 +- .../ignite/loadtest/GridSingleExecutionTest.java | 2 +- .../loadtests/cache/GridCacheAbstractLoadTest.java | 2 +- .../ignite/testframework/junits/GridAbstractTest.java | 3 +-- 15 files changed, 23 insertions(+), 24 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1989b2c9/modules/core/src/main/java/org/apache/ignite/IgnitePortables.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/IgnitePortables.java b/modules/core/src/main/java/org/apache/ignite/IgnitePortables.java index d571dc6..aebc31b 100644 --- a/modules/core/src/main/java/org/apache/ignite/IgnitePortables.java +++ b/modules/core/src/main/java/org/apache/ignite/IgnitePortables.java @@ -161,7 +161,7 @@ import java.util.Date; * <property name="classNames"> * <list> * <value>my.package.for.portable.objects.*</value> - * <value>org.gridgain.examples.client.portable.Employee</value> + * <value>org.apache.ignite.examples.client.portable.Employee</value> * </list> * </property> * </bean> @@ -197,7 +197,7 @@ import java.util.Date; * <property name="typeConfigurations"> * <list> * <bean class="org.apache.ignite.portables.PortableTypeConfiguration"> - * <property name="className" value="org.gridgain.examples.client.portable.EmployeeKey"/> + * <property name="className" value="org.apache.ignite.examples.client.portable.EmployeeKey"/> * <property name="affinityKeyFieldName" value="organizationId"/> * </bean> * </list> http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1989b2c9/modules/core/src/main/java/org/apache/ignite/client/router/impl/GridTcpRouterImpl.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/client/router/impl/GridTcpRouterImpl.java b/modules/core/src/main/java/org/apache/ignite/client/router/impl/GridTcpRouterImpl.java index 8cfae95..b866c29 100644 --- a/modules/core/src/main/java/org/apache/ignite/client/router/impl/GridTcpRouterImpl.java +++ b/modules/core/src/main/java/org/apache/ignite/client/router/impl/GridTcpRouterImpl.java @@ -42,7 +42,7 @@ import java.util.*; */ public class GridTcpRouterImpl implements GridTcpRouter, GridTcpRouterMBean, LifecycleAware { /** */ - private static final String ENT_NIO_LSNR_CLS = "org.gridgain.client.router.impl.GridTcpRouterNioListenerEntImpl"; + private static final String ENT_NIO_LSNR_CLS = "org.apache.ignite.client.router.impl.GridTcpRouterNioListenerEntImpl"; /** Id. */ private final UUID id = UUID.randomUUID(); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1989b2c9/modules/core/src/main/java/org/apache/ignite/cluster/ClusterNode.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/cluster/ClusterNode.java b/modules/core/src/main/java/org/apache/ignite/cluster/ClusterNode.java index 41aa34c..84afe00 100644 --- a/modules/core/src/main/java/org/apache/ignite/cluster/ClusterNode.java +++ b/modules/core/src/main/java/org/apache/ignite/cluster/ClusterNode.java @@ -56,16 +56,16 @@ import java.util.*; * <li>{@code {@link System#getProperties()}} - All system properties.</li> * <li>{@code {@link System#getenv(String)}} - All environment properties.</li> * <li>{@code org.ignite.build.ver} - Ignite build version.</li> - * <li>{@code org.gridgain.jit.name} - Name of JIT compiler used.</li> - * <li>{@code org.gridgain.net.itf.name} - Name of network interface.</li> - * <li>{@code org.gridgain.user.name} - Operating system user name.</li> - * <li>{@code org.gridgain.ignite.name} - Grid name (see {@link org.apache.ignite.Ignite#name()}).</li> + * <li>{@code org.apache.ignite.jit.name} - Name of JIT compiler used.</li> + * <li>{@code org.apache.ignite.net.itf.name} - Name of network interface.</li> + * <li>{@code org.apache.ignite.user.name} - Operating system user name.</li> + * <li>{@code org.apache.ignite.ignite.name} - Grid name (see {@link org.apache.ignite.Ignite#name()}).</li> * <li> - * {@code spiName.org.gridgain.spi.class} - SPI implementation class for every SPI, + * {@code spiName.org.apache.ignite.spi.class} - SPI implementation class for every SPI, * where {@code spiName} is the name of the SPI (see {@link org.apache.ignite.spi.IgniteSpi#getName()}. * </li> * <li> - * {@code spiName.org.gridgain.spi.ver} - SPI version for every SPI, + * {@code spiName.org.apache.ignite.spi.ver} - SPI version for every SPI, * where {@code spiName} is the name of the SPI (see {@link org.apache.ignite.spi.IgniteSpi#getName()}. * </li> * </ul> @@ -136,7 +136,7 @@ public interface ClusterNode { * * @param <T> Attribute Type. * @param name Attribute name. <b>Note</b> that attribute names starting with - * {@code org.gridgain} are reserved for internal use. + * {@code org.apache.ignite} are reserved for internal use. * @return Attribute value or {@code null}. */ @Nullable public <T> T attribute(String name); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1989b2c9/modules/core/src/main/java/org/apache/ignite/compute/gridify/Gridify.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/compute/gridify/Gridify.java b/modules/core/src/main/java/org/apache/ignite/compute/gridify/Gridify.java index 4014b9d..90d05a6 100644 --- a/modules/core/src/main/java/org/apache/ignite/compute/gridify/Gridify.java +++ b/modules/core/src/main/java/org/apache/ignite/compute/gridify/Gridify.java @@ -108,7 +108,7 @@ import java.lang.annotation.*; * <ul> * <li>{@code -javaagent:[path to jboss-aop-jdk50-4.x.x.jar]}</li> * <li>{@code -Djboss.aop.class.path=[path to gridgain.jar]}</li> - * <li>{@code -Djboss.aop.exclude=org,com -Djboss.aop.include=org.gridgain.examples}</li> + * <li>{@code -Djboss.aop.exclude=org,com -Djboss.aop.include=org.apache.ignite.examples}</li> * </ul> * </li> * <li> http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1989b2c9/modules/core/src/main/java/org/apache/ignite/compute/gridify/GridifySetToSet.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/compute/gridify/GridifySetToSet.java b/modules/core/src/main/java/org/apache/ignite/compute/gridify/GridifySetToSet.java index 592385b..11ef0d7 100644 --- a/modules/core/src/main/java/org/apache/ignite/compute/gridify/GridifySetToSet.java +++ b/modules/core/src/main/java/org/apache/ignite/compute/gridify/GridifySetToSet.java @@ -104,7 +104,7 @@ import java.lang.annotation.*; * <ul> * <li>{@code -javaagent:[path to jboss-aop-jdk50-4.x.x.jar]}</li> * <li>{@code -Djboss.aop.class.path=[path to gridgain.jar]}</li> - * <li>{@code -Djboss.aop.exclude=org,com -Djboss.aop.include=org.gridgain.examples}</li> + * <li>{@code -Djboss.aop.exclude=org,com -Djboss.aop.include=org.apache.ignite.examples}</li> * </ul> * </li> * <li> http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1989b2c9/modules/core/src/main/java/org/apache/ignite/compute/gridify/GridifySetToValue.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/compute/gridify/GridifySetToValue.java b/modules/core/src/main/java/org/apache/ignite/compute/gridify/GridifySetToValue.java index df975b0..3a77af2 100644 --- a/modules/core/src/main/java/org/apache/ignite/compute/gridify/GridifySetToValue.java +++ b/modules/core/src/main/java/org/apache/ignite/compute/gridify/GridifySetToValue.java @@ -102,7 +102,7 @@ import java.lang.annotation.*; * <ul> * <li>{@code -javaagent:[path to jboss-aop-jdk50-4.x.x.jar]}</li> * <li>{@code -Djboss.aop.class.path=[path to gridgain.jar]}</li> - * <li>{@code -Djboss.aop.exclude=org,com -Djboss.aop.include=org.gridgain.examples}</li> + * <li>{@code -Djboss.aop.exclude=org,com -Djboss.aop.include=org.apache.ignite.examples}</li> * </ul> * </li> * <li> http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1989b2c9/modules/core/src/main/java/org/apache/ignite/configuration/IgniteConfiguration.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/configuration/IgniteConfiguration.java b/modules/core/src/main/java/org/apache/ignite/configuration/IgniteConfiguration.java index 1db0e11..2698ae1 100644 --- a/modules/core/src/main/java/org/apache/ignite/configuration/IgniteConfiguration.java +++ b/modules/core/src/main/java/org/apache/ignite/configuration/IgniteConfiguration.java @@ -1046,7 +1046,7 @@ public class IgniteConfiguration { * to grid node attributes also. SPIs may also add node attributes that are * used for SPI implementation. * <p> - * <b>NOTE:</b> attributes names starting with {@code org.gridgain} are reserved + * <b>NOTE:</b> attributes names starting with {@code org.apache.ignite} are reserved * for internal use. * * @return User defined attributes for this node. http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1989b2c9/modules/core/src/main/java/org/apache/ignite/internal/IgniteNodeAttributes.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/IgniteNodeAttributes.java b/modules/core/src/main/java/org/apache/ignite/internal/IgniteNodeAttributes.java index ae643e5..f6b9431 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/IgniteNodeAttributes.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/IgniteNodeAttributes.java @@ -22,7 +22,7 @@ package org.apache.ignite.internal; */ public final class IgniteNodeAttributes { /** Prefix for internally reserved attribute names. */ - public static final String ATTR_PREFIX = "org.gridgain"; + public static final String ATTR_PREFIX = "org.apache.ignite"; /** Node compound version. */ public static final String ATTR_BUILD_VER = ATTR_PREFIX + ".build.ver"; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1989b2c9/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/top/GridTopologyCommandHandler.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/top/GridTopologyCommandHandler.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/top/GridTopologyCommandHandler.java index 5d184b3..a986d5e 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/top/GridTopologyCommandHandler.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/top/GridTopologyCommandHandler.java @@ -269,7 +269,7 @@ public class GridTopologyCommandHandler extends GridRestCommandHandlerAdapter { for (Iterator<Map.Entry<String, Object>> i = attrs.entrySet().iterator(); i.hasNext();) { Map.Entry<String, Object> e = i.next(); - if (!e.getKey().startsWith("org.gridgain.") && System.getProperty(e.getKey()) == null) { + if (!e.getKey().startsWith("org.apache.ignite.") && System.getProperty(e.getKey()) == null) { i.remove(); continue; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1989b2c9/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 8ea267c..73f7cd2 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 @@ -200,7 +200,7 @@ import java.util.logging.*; * <h1 class="header">Example</h1> * <pre name="code" class="java"> * // Register JDBC driver. - * Class.forName("org.gridgain.jdbc.IgniteJdbcDriver"); + * Class.forName("org.apache.ignite.jdbc.IgniteJdbcDriver"); * * // Open JDBC connection. * Connection conn = DriverManager.getConnection("jdbc:gridgain://localhost/cache"); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1989b2c9/modules/core/src/test/config/log4j-test.xml ---------------------------------------------------------------------- diff --git a/modules/core/src/test/config/log4j-test.xml b/modules/core/src/test/config/log4j-test.xml index 984e973..42e1230 100644 --- a/modules/core/src/test/config/log4j-test.xml +++ b/modules/core/src/test/config/log4j-test.xml @@ -79,13 +79,13 @@ Uncomment to enable GridGain query execution debugging. --> <!-- - <category name="org.gridgain.cache.queries"> + <category name="org.apache.ignite.cache.query"> <level value="DEBUG"/> </category> --> <!-- Enable Gridgain debugging. - <category name="org.gridgain"> + <category name="org.apache.ignite"> <level value="DEBUG"/> </category> --> http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1989b2c9/modules/core/src/test/java/org/apache/ignite/internal/GridNodeVisorAttributesSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/GridNodeVisorAttributesSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/GridNodeVisorAttributesSelfTest.java index 5418bde..f1c0ac3 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/GridNodeVisorAttributesSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/GridNodeVisorAttributesSelfTest.java @@ -38,7 +38,7 @@ public class GridNodeVisorAttributesSelfTest extends GridCommonAbstractTest { /** GridGain-specific properties required by Visor. */ private static final String[] IGNITE_PROPS = new String[] { - "org.gridgain.jvm.pid" + "org.apache.ignite.jvm.pid" }; /** System and environment properties to include. */ http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1989b2c9/modules/core/src/test/java/org/apache/ignite/loadtest/GridSingleExecutionTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/loadtest/GridSingleExecutionTest.java b/modules/core/src/test/java/org/apache/ignite/loadtest/GridSingleExecutionTest.java index cd7d8e7..e2a49da 100644 --- a/modules/core/src/test/java/org/apache/ignite/loadtest/GridSingleExecutionTest.java +++ b/modules/core/src/test/java/org/apache/ignite/loadtest/GridSingleExecutionTest.java @@ -165,7 +165,7 @@ public final class GridSingleExecutionTest { impl.setLevel(Level.INFO); - Logger.getLogger("org.gridgain").setLevel(Level.DEBUG); + Logger.getLogger("org.apache.ignite").setLevel(Level.DEBUG); return new GridTestLog4jLogger(false); } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1989b2c9/modules/core/src/test/java/org/apache/ignite/loadtests/cache/GridCacheAbstractLoadTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/loadtests/cache/GridCacheAbstractLoadTest.java b/modules/core/src/test/java/org/apache/ignite/loadtests/cache/GridCacheAbstractLoadTest.java index 7d45be9..e86b79e 100644 --- a/modules/core/src/test/java/org/apache/ignite/loadtests/cache/GridCacheAbstractLoadTest.java +++ b/modules/core/src/test/java/org/apache/ignite/loadtests/cache/GridCacheAbstractLoadTest.java @@ -303,7 +303,7 @@ abstract class GridCacheAbstractLoadTest { impl.setLevel(Level.INFO); - //Logger.getLogger("org.gridgain").setLevel(Level.INFO); + //Logger.getLogger("org.apache.ignite").setLevel(Level.INFO); //Logger.getLogger(GridCacheVersionManager.class).setLevel(Level.DEBUG); return new GridTestLog4jLogger(false); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1989b2c9/modules/core/src/test/java/org/apache/ignite/testframework/junits/GridAbstractTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/testframework/junits/GridAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/testframework/junits/GridAbstractTest.java index 4c9285c..e4f131b 100644 --- a/modules/core/src/test/java/org/apache/ignite/testframework/junits/GridAbstractTest.java +++ b/modules/core/src/test/java/org/apache/ignite/testframework/junits/GridAbstractTest.java @@ -1417,8 +1417,7 @@ public abstract class GridAbstractTest extends TestCase { int cnt = 0; for (Method m : GridAbstractTest.this.getClass().getMethods()) - if (m.getDeclaringClass().getName().startsWith("org.gridgain") || - m.getDeclaringClass().getName().startsWith("org.apache.ignite")) { + if (m.getDeclaringClass().getName().startsWith("org.apache.ignite")) { if (m.getName().startsWith("test") && Modifier.isPublic(m.getModifiers())) cnt++; }
