#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/7dd91ec7 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/7dd91ec7 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/7dd91ec7 Branch: refs/heads/sprint-1 Commit: 7dd91ec725840816e305a1dfe9abffd2fa3c43a2 Parents: bfc08d5 Author: ivasilinets <[email protected]> Authored: Thu Feb 5 12:48:05 2015 +0300 Committer: ivasilinets <[email protected]> Committed: Thu Feb 5 12:48:05 2015 +0300 ---------------------------------------------------------------------- config/java.util.logging.properties | 2 +- config/router/default-router.xml | 4 ++-- modules/aop/src/test/config/aop/jboss/jboss-gridgain-aop.xml | 2 +- .../java/org/apache/ignite/client/GridClientCompute.java | 4 ++-- .../java/org/apache/ignite/compute/ComputeJobContext.java | 2 +- .../main/java/org/apache/ignite/compute/gridify/Gridify.java | 2 +- .../org/apache/ignite/compute/gridify/GridifySetToSet.java | 2 +- .../org/apache/ignite/compute/gridify/GridifySetToValue.java | 2 +- .../org/apache/ignite/configuration/IgniteConfiguration.java | 4 ++-- .../apache/ignite/configuration/IgniteDeploymentMode.java | 2 +- .../java/org/apache/ignite/internal/GridKernalContext.java | 4 ++-- .../apache/ignite/spi/authentication/AuthenticationSpi.java | 2 +- .../java/org/apache/ignite/spi/deployment/DeploymentSpi.java | 2 +- .../java/org/apache/ignite/spi/discovery/DiscoverySpi.java | 2 +- .../core/src/test/config/load/dsi-49-server-production.xml | 2 +- modules/core/src/test/config/log4j-test.xml | 2 +- .../apache/ignite/fs/hadoop/GridGgfsHadoopParameters.java | 2 +- .../apache/ignite/fs/hadoop/v1/GridGgfsHadoopFileSystem.java | 2 +- .../apache/ignite/fs/hadoop/v2/GridGgfsHadoopFileSystem.java | 2 +- .../ignite/cache/hibernate/GridHibernateRegionFactory.java | 8 ++++---- .../ignite/util/antgar/IgniteDeploymentGarAntTask.java | 2 +- .../apache/ignite/cache/websession/GridWebSessionFilter.java | 6 +++--- 22 files changed, 31 insertions(+), 31 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7dd91ec7/config/java.util.logging.properties ---------------------------------------------------------------------- diff --git a/config/java.util.logging.properties b/config/java.util.logging.properties index dfabf10..a905a8d 100644 --- a/config/java.util.logging.properties +++ b/config/java.util.logging.properties @@ -48,7 +48,7 @@ handlers=java.util.logging.ConsoleHandler, org.apache.ignite.logger.java.IgniteJ # # Uncomment this line to enable cache query execution tracing. # -#org.gridgain.cache.queries.level=FINE +#org.apache.ignite.cache.queries.level=FINE # # Uncomment to disable courtesy notices, such as SPI configuration http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7dd91ec7/config/router/default-router.xml ---------------------------------------------------------------------- diff --git a/config/router/default-router.xml b/config/router/default-router.xml index e40a31f..30bb873 100644 --- a/config/router/default-router.xml +++ b/config/router/default-router.xml @@ -22,10 +22,10 @@ This file is automatically scanned by $IGNITE_HOME/bin/igniterouter.sh and $IGNITE_HOME/bin/igniterouter.bat - for org.gridgain.client.router.GridTcpRestRouterConfiguration bean definition. + for org.apache.ignite.client.router.GridTcpRouterConfiguration bean definition. First found is used to start router instance. - 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/7dd91ec7/modules/aop/src/test/config/aop/jboss/jboss-gridgain-aop.xml ---------------------------------------------------------------------- diff --git a/modules/aop/src/test/config/aop/jboss/jboss-gridgain-aop.xml b/modules/aop/src/test/config/aop/jboss/jboss-gridgain-aop.xml index e48d1fa..f0ff304 100644 --- a/modules/aop/src/test/config/aop/jboss/jboss-gridgain-aop.xml +++ b/modules/aop/src/test/config/aop/jboss/jboss-gridgain-aop.xml @@ -21,7 +21,7 @@ <!-- Ignite aspect definition to be used with JBoss AS. Identical file called 'jboss-aop.xml' - is already included into gridgain-x.x.x.sar JBoss archive that is shipped with Ignite. + is already included into ignite-x.x.x.sar JBoss archive that is shipped with Ignite. However, when doing your own custom deployment, you will need to copy this file into JBoss 'deploy' folder to enable AOP-based grid-enabling with @Gridify annotation. --> http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7dd91ec7/modules/core/src/main/java/org/apache/ignite/client/GridClientCompute.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/client/GridClientCompute.java b/modules/core/src/main/java/org/apache/ignite/client/GridClientCompute.java index 803e2a5..c6a6558 100644 --- a/modules/core/src/main/java/org/apache/ignite/client/GridClientCompute.java +++ b/modules/core/src/main/java/org/apache/ignite/client/GridClientCompute.java @@ -413,7 +413,7 @@ public interface GridClientCompute { public GridClientFuture<List<GridClientNode>> refreshTopologyAsync(boolean includeAttrs, boolean includeMetrics); /** - * Gets contents of default log file ({@code IGNITE_HOME/work/log/gridgain.log}). + * Gets contents of default log file ({@code IGNITE_HOME/work/log/ignite.log}). * Note that backward reading (with negative line indexes) supported for only 8-bit character encodings. * * @param lineFrom Index of line from which log is get, inclusive. Negative values mean line numbers @@ -429,7 +429,7 @@ public interface GridClientCompute { /** * Asynchronously gets contents of default log file - * ({@code IGNITE_HOME/work/log/gridgain.log}). + * ({@code IGNITE_HOME/work/log/ignite.log}). * Note that backward reading (with negative line indexes) supported for only 8-bit character encodings. * * @param lineFrom Index of line from which log is get, inclusive. Negative values mean line numbers http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7dd91ec7/modules/core/src/main/java/org/apache/ignite/compute/ComputeJobContext.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/compute/ComputeJobContext.java b/modules/core/src/main/java/org/apache/ignite/compute/ComputeJobContext.java index 5ea90e7..a948edf 100644 --- a/modules/core/src/main/java/org/apache/ignite/compute/ComputeJobContext.java +++ b/modules/core/src/main/java/org/apache/ignite/compute/ComputeJobContext.java @@ -54,7 +54,7 @@ import java.util.concurrent.*; * annotation. Refer to the {@link org.apache.ignite.resources.IgniteJobContextResource} * documentation for coding examples on how to inject job context. * <p> - * Attribute names that start with {@code "gridgain:"} are reserved for internal system use. + * Attribute names that start with {@code "apache.ignite:"} are reserved for internal system use. */ public interface ComputeJobContext extends ComputeJobContinuation { /** http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7dd91ec7/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 8585f0c..3e4d379 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 @@ -107,7 +107,7 @@ import java.lang.annotation.*; * The following JVM configuration must be present: * <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.class.path=[path to ignite.jar]}</li> * <li>{@code -Djboss.aop.exclude=org,com -Djboss.aop.include=org.apache.ignite.examples}</li> * </ul> * </li> http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7dd91ec7/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 889b2f9..878d9be 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 @@ -103,7 +103,7 @@ import java.lang.annotation.*; * The following JVM configuration must be present: * <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.class.path=[path to ignite.jar]}</li> * <li>{@code -Djboss.aop.exclude=org,com -Djboss.aop.include=org.apache.ignite.examples}</li> * </ul> * </li> http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7dd91ec7/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 1cb41cf..85bb907 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 @@ -101,7 +101,7 @@ import java.lang.annotation.*; * The following JVM configuration must be present: * <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.class.path=[path to ignite.jar]}</li> * <li>{@code -Djboss.aop.exclude=org,com -Djboss.aop.include=org.apache.ignite.examples}</li> * </ul> * </li> http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7dd91ec7/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 92c6b48..ede3b9f 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 @@ -261,10 +261,10 @@ public class IgniteConfiguration { /** Executor service. */ private ExecutorService p2pSvc; - /** Gridgain installation folder. */ + /** Ignite installation folder. */ private String ggHome; - /** Gridgain work folder. */ + /** Ignite work folder. */ private String ggWork; /** MBean server. */ http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7dd91ec7/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 774a5a4..9ef56fe 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 @@ -40,7 +40,7 @@ import org.jetbrains.annotations.*; * case of {@link #CONTINUOUS} mode to kill the ever living deployment, you should * change the user version. * <p> - * User version is specified in {@code META-INF/gridgain.xml} file as follows: + * User version is specified in {@code META-INF/ignite.xml} file as follows: * <pre name="code" class="xml"> * <!-- User version. --> * <bean id="userVersion" class="java.lang.String"> http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7dd91ec7/modules/core/src/main/java/org/apache/ignite/internal/GridKernalContext.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/GridKernalContext.java b/modules/core/src/main/java/org/apache/ignite/internal/GridKernalContext.java index 3c05669..5f55b98 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/GridKernalContext.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/GridKernalContext.java @@ -469,8 +469,8 @@ public interface GridKernalContext extends Iterable<GridComponent> { /** * 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/7dd91ec7/modules/core/src/main/java/org/apache/ignite/spi/authentication/AuthenticationSpi.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/spi/authentication/AuthenticationSpi.java b/modules/core/src/main/java/org/apache/ignite/spi/authentication/AuthenticationSpi.java index dc238db..ec71d84 100644 --- a/modules/core/src/main/java/org/apache/ignite/spi/authentication/AuthenticationSpi.java +++ b/modules/core/src/main/java/org/apache/ignite/spi/authentication/AuthenticationSpi.java @@ -28,7 +28,7 @@ import org.apache.ignite.spi.*; * The default authentication SPI is {@link org.apache.ignite.spi.authentication.noop.NoopAuthenticationSpi} * which permits any request. * <p> - * Gridgain provides the following {@code GridAuthenticationSpi} implementations: + * Ignite provides the following {@code GridAuthenticationSpi} implementations: * <ul> * <li> * {@link org.apache.ignite.spi.authentication.noop.NoopAuthenticationSpi} - permits any request. http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7dd91ec7/modules/core/src/main/java/org/apache/ignite/spi/deployment/DeploymentSpi.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/spi/deployment/DeploymentSpi.java b/modules/core/src/main/java/org/apache/ignite/spi/deployment/DeploymentSpi.java index 12b03e0..c7b2107 100644 --- a/modules/core/src/main/java/org/apache/ignite/spi/deployment/DeploymentSpi.java +++ b/modules/core/src/main/java/org/apache/ignite/spi/deployment/DeploymentSpi.java @@ -45,7 +45,7 @@ import org.jetbrains.annotations.*; * local deployment. * </strong> * <p> - * Gridgain provides the following {@code GridDeploymentSpi} implementations: + * Ignite provides the following {@code GridDeploymentSpi} implementations: * <ul> * <li>{@link org.apache.ignite.spi.deployment.local.LocalDeploymentSpi}</li> * <li>{@ignitelink org.apache.ignite.spi.deployment.uri.UriDeploymentSpi}</li> http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7dd91ec7/modules/core/src/main/java/org/apache/ignite/spi/discovery/DiscoverySpi.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/spi/discovery/DiscoverySpi.java b/modules/core/src/main/java/org/apache/ignite/spi/discovery/DiscoverySpi.java index cba57bb..0802022 100644 --- a/modules/core/src/main/java/org/apache/ignite/spi/discovery/DiscoverySpi.java +++ b/modules/core/src/main/java/org/apache/ignite/spi/discovery/DiscoverySpi.java @@ -31,7 +31,7 @@ import java.util.*; * with default configuration which allows all nodes in local network * (with enabled multicast) to discover each other. * <p> - * Gridgain provides the following {@code GridDeploymentSpi} implementation: + * Ignite provides the following {@code GridDeploymentSpi} implementation: * <ul> * <li>{@link org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi}</li> * </ul> http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7dd91ec7/modules/core/src/test/config/load/dsi-49-server-production.xml ---------------------------------------------------------------------- diff --git a/modules/core/src/test/config/load/dsi-49-server-production.xml b/modules/core/src/test/config/load/dsi-49-server-production.xml index 28deb23..8bd1368 100644 --- a/modules/core/src/test/config/load/dsi-49-server-production.xml +++ b/modules/core/src/test/config/load/dsi-49-server-production.xml @@ -82,6 +82,6 @@ <util:list id="lifecycleBeans"> - <!-- <bean class="gridgain.MyGridLifecycleBean" /> --> + <!-- <bean class="org.apache.ignite.lifecycle.LifecycleBean" /> --> </util:list> </beans> http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7dd91ec7/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 0183c27..e00a7e6 100644 --- a/modules/core/src/test/config/log4j-test.xml +++ b/modules/core/src/test/config/log4j-test.xml @@ -84,7 +84,7 @@ </category> --> - <!-- Enable Gridgain debugging. + <!-- Enable Ignite debugging. <category name="org.apache.ignite"> <level value="DEBUG"/> </category> http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7dd91ec7/modules/hadoop/src/main/java/org/apache/ignite/fs/hadoop/GridGgfsHadoopParameters.java ---------------------------------------------------------------------- diff --git a/modules/hadoop/src/main/java/org/apache/ignite/fs/hadoop/GridGgfsHadoopParameters.java b/modules/hadoop/src/main/java/org/apache/ignite/fs/hadoop/GridGgfsHadoopParameters.java index d42c611..2e0dd58 100644 --- a/modules/hadoop/src/main/java/org/apache/ignite/fs/hadoop/GridGgfsHadoopParameters.java +++ b/modules/hadoop/src/main/java/org/apache/ignite/fs/hadoop/GridGgfsHadoopParameters.java @@ -58,7 +58,7 @@ package org.apache.ignite.fs.hadoop; * </property> * <property> * <name>fs.ggfs.127.0.0.1:10500.log.dir</name> - * <value>/home/gridgain/log/sampling</value> + * <value>/home/apache/ignite/log/sampling</value> * </property> * <property> * <name>fs.ggfs.127.0.0.1:10500.log.batch_size</name> http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7dd91ec7/modules/hadoop/src/main/java/org/apache/ignite/fs/hadoop/v1/GridGgfsHadoopFileSystem.java ---------------------------------------------------------------------- diff --git a/modules/hadoop/src/main/java/org/apache/ignite/fs/hadoop/v1/GridGgfsHadoopFileSystem.java b/modules/hadoop/src/main/java/org/apache/ignite/fs/hadoop/v1/GridGgfsHadoopFileSystem.java index 25dca31..356be6a 100644 --- a/modules/hadoop/src/main/java/org/apache/ignite/fs/hadoop/v1/GridGgfsHadoopFileSystem.java +++ b/modules/hadoop/src/main/java/org/apache/ignite/fs/hadoop/v1/GridGgfsHadoopFileSystem.java @@ -64,7 +64,7 @@ import static org.apache.ignite.internal.fs.hadoop.GridGgfsHadoopUtils.*; * distribution: * <pre name="code" class="bash"> * export IGNITE_HOME=/path/to/Ignite/distribution - * export HADOOP_CLASSPATH=$IGNITE_HOME/gridgain*.jar + * export HADOOP_CLASSPATH=$IGNITE_HOME/ignite*.jar * * for f in $IGNITE_HOME/libs/*.jar; do * export HADOOP_CLASSPATH=$HADOOP_CLASSPATH:$f; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7dd91ec7/modules/hadoop/src/main/java/org/apache/ignite/fs/hadoop/v2/GridGgfsHadoopFileSystem.java ---------------------------------------------------------------------- diff --git a/modules/hadoop/src/main/java/org/apache/ignite/fs/hadoop/v2/GridGgfsHadoopFileSystem.java b/modules/hadoop/src/main/java/org/apache/ignite/fs/hadoop/v2/GridGgfsHadoopFileSystem.java index 2cdcd8a..a69bb2a 100644 --- a/modules/hadoop/src/main/java/org/apache/ignite/fs/hadoop/v2/GridGgfsHadoopFileSystem.java +++ b/modules/hadoop/src/main/java/org/apache/ignite/fs/hadoop/v2/GridGgfsHadoopFileSystem.java @@ -64,7 +64,7 @@ import static org.apache.ignite.internal.fs.hadoop.GridGgfsHadoopUtils.*; * distribution: * <pre name="code" class="bash"> * export IGNITE_HOME=/path/to/Ignite/distribution - * export HADOOP_CLASSPATH=$IGNITE_HOME/gridgain*.jar + * export HADOOP_CLASSPATH=$IGNITE_HOME/ignite*.jar * * for f in $IGNITE_HOME/libs/*.jar; do * export HADOOP_CLASSPATH=$HADOOP_CLASSPATH:$f; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7dd91ec7/modules/hibernate/src/main/java/org/apache/ignite/cache/hibernate/GridHibernateRegionFactory.java ---------------------------------------------------------------------- diff --git a/modules/hibernate/src/main/java/org/apache/ignite/cache/hibernate/GridHibernateRegionFactory.java b/modules/hibernate/src/main/java/org/apache/ignite/cache/hibernate/GridHibernateRegionFactory.java index 1218d6c..5cfaf75 100644 --- a/modules/hibernate/src/main/java/org/apache/ignite/cache/hibernate/GridHibernateRegionFactory.java +++ b/modules/hibernate/src/main/java/org/apache/ignite/cache/hibernate/GridHibernateRegionFactory.java @@ -40,19 +40,19 @@ import static org.hibernate.cache.spi.access.AccessType.*; * hibernate.cache.region.factory_class=org.apache.ignite.cache.hibernate.GridHibernateRegionFactory * </pre> * Note that before region factory is started you need to start properly configured Ignite node in the same JVM. - * For example to start Ignite node one of loader provided in {@code org.gridgain.grid.startup} package can be used. + * For example to start Ignite node one of loader provided in {@code org.apache.ignite.grid.startup} package can be used. * <p> * Name of grid to be used for region factory must be specified as following Hibernate property: * <pre name="code" class="brush: xml; gutter: false;"> - * org.gridgain.hibernate.grid_name=<grid name> + * org.apache.ignite.hibernate.grid_name=<grid name> * </pre> * Each Hibernate cache region must be associated with some {@link org.apache.ignite.cache.GridCache}, by default it is assumed that * for each cache region there is a {@link org.apache.ignite.cache.GridCache} with the same name. Also it is possible to define - * region to cache mapping using properties with prefix {@code org.gridgain.hibernate.region_cache}. + * region to cache mapping using properties with prefix {@code org.apache.ignite.hibernate.region_cache}. * For example if for region with name "region1" cache with name "cache1" should be used then following * Hibernate property should be specified: * <pre name="code" class="brush: xml; gutter: false;"> - * org.gridgain.hibernate.region_cache.region1=cache1 + * org.apache.ignite.hibernate.region_cache.region1=cache1 * </pre> */ public class GridHibernateRegionFactory implements RegionFactory { http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7dd91ec7/modules/tools/src/main/java/org/apache/ignite/util/antgar/IgniteDeploymentGarAntTask.java ---------------------------------------------------------------------- diff --git a/modules/tools/src/main/java/org/apache/ignite/util/antgar/IgniteDeploymentGarAntTask.java b/modules/tools/src/main/java/org/apache/ignite/util/antgar/IgniteDeploymentGarAntTask.java index 1f750df..23d4c3c 100644 --- a/modules/tools/src/main/java/org/apache/ignite/util/antgar/IgniteDeploymentGarAntTask.java +++ b/modules/tools/src/main/java/org/apache/ignite/util/antgar/IgniteDeploymentGarAntTask.java @@ -38,7 +38,7 @@ import java.io.*; * </ul> */ public class IgniteDeploymentGarAntTask extends Zip { - /** GAR descriptor name. Its value is {@code gridgain.xml}. */ + /** GAR descriptor name. Its value is {@code ignite.xml}. */ public static final String DESC_NAME = "gridgain.xml"; /** Default descriptor path. */ http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7dd91ec7/modules/web/src/main/java/org/apache/ignite/cache/websession/GridWebSessionFilter.java ---------------------------------------------------------------------- diff --git a/modules/web/src/main/java/org/apache/ignite/cache/websession/GridWebSessionFilter.java b/modules/web/src/main/java/org/apache/ignite/cache/websession/GridWebSessionFilter.java index 53f6f91..0dc4647 100644 --- a/modules/web/src/main/java/org/apache/ignite/cache/websession/GridWebSessionFilter.java +++ b/modules/web/src/main/java/org/apache/ignite/cache/websession/GridWebSessionFilter.java @@ -49,7 +49,7 @@ import static org.apache.ignite.transactions.IgniteTxIsolation.*; * </listener> * * <filter> - * <filter-name>GridGainWebSessionsFilter</filter-name> + * <filter-name>GridWebSessionFilter</filter-name> * <filter-class>org.apache.ignite.cache.websession.GridWebSessionFilter</filter-class> * </filter> * @@ -63,7 +63,7 @@ import static org.apache.ignite.transactions.IgniteTxIsolation.*; * be used in this case: * <pre name="code" class="xml"> * <filter> - * <filter-name>GridGainWebSessionsFilter</filter-name> + * <filter-name>GridWebSessionFilter</filter-name> * <filter-class>org.apache.ignite.cache.websession.GridWebSessionFilter</filter-class> * </filter> * @@ -106,7 +106,7 @@ import static org.apache.ignite.transactions.IgniteTxIsolation.*; * servlet context parameters. You can specify filter init parameters as follows: * <pre name="code" class="xml"> * <filter> - * <filter-name>GridGainWebSessionsFilter</filter-name> + * <filter-name>GridWebSessionFilter</filter-name> * <filter-class>org.apache.ignite.cache.websession.GridWebSessionFilter</filter-class> * <init-param> * <param-name>IgniteWebSessionsGridName</param-name>
