Repository: incubator-ignite Updated Branches: refs/heads/sprint-1 b9288ffec -> 9f2bb6c17
IGNITE-65 Implemented Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/8efb40e2 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/8efb40e2 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/8efb40e2 Branch: refs/heads/sprint-1 Commit: 8efb40e2c18d75064f7cd52f064038b0af96e25b Parents: 1a2e7d4 Author: avinogradov <avinogra...@gridgain.com> Authored: Tue Jan 20 17:36:14 2015 +0300 Committer: avinogradov <avinogra...@gridgain.com> Committed: Tue Jan 20 17:36:14 2015 +0300 ---------------------------------------------------------------------- assembly/libs/readme.txt | 12 +++++------ assembly/release-base.xml | 2 +- docs/gridgain_readme.md | 4 ++-- examples/pom-standalone.xml | 18 ++++++++-------- modules/aop/readme.txt | 4 ++-- modules/aws/readme.txt | 4 ++-- .../org/apache/ignite/cluster/ClusterNode.java | 2 +- .../optimized/IgniteOptimizedClassResolver.java | 2 +- .../org/apache/ignite/mbean/IgniteMBean.java | 2 +- .../spi/discovery/tcp/TcpDiscoverySpi.java | 4 ++-- .../gridgain/grid/kernal/GridProductImpl.java | 12 +++++------ .../gridgain/grid/kernal/GridProperties.java | 2 +- .../grid/kernal/GridUpdateNotifier.java | 4 ++-- .../dataload/IgniteDataLoaderImpl.java | 2 +- .../core/src/main/resources/gridgain.properties | 22 -------------------- .../core/src/main/resources/ignite.properties | 22 ++++++++++++++++++++ .../grid/kernal/GridUpdateNotifierSelfTest.java | 2 +- modules/email/readme.txt | 4 ++-- modules/hadoop/readme.txt | 4 ++-- modules/hibernate/readme.txt | 4 ++-- modules/indexing/readme.txt | 4 ++-- modules/jcl/readme.txt | 4 ++-- modules/jta/readme.txt | 4 ++-- modules/log4j/readme.txt | 4 ++-- modules/rest-http/readme.txt | 4 ++-- modules/scalar/pom.xml | 4 ++-- modules/scalar/readme.txt | 4 ++-- modules/schedule/readme.txt | 4 ++-- modules/slf4j/readme.txt | 4 ++-- modules/spring/readme.txt | 4 ++-- modules/ssh/readme.txt | 4 ++-- modules/urideploy/readme.txt | 4 ++-- .../visor/commands/node/VisorNodeCommand.scala | 4 ++-- modules/web/readme.txt | 4 ++-- pom.xml | 10 ++++----- 35 files changed, 99 insertions(+), 99 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8efb40e2/assembly/libs/readme.txt ---------------------------------------------------------------------- diff --git a/assembly/libs/readme.txt b/assembly/libs/readme.txt index 1fe1d30..ef6aed2 100644 --- a/assembly/libs/readme.txt +++ b/assembly/libs/readme.txt @@ -53,8 +53,8 @@ a set of additional modules needed for this edition to work. Specifically: - gridgain-fabric - (all dependencies included in other editions) -Here is how 'gridgain-datagrid' can be added to your POM file (replace '${gridgain.version}' -with actual GridGain version you are interested in): +Here is how 'gridgain-datagrid' can be added to your POM file (replace '${ignite.version}' +with actual Ignite version you are interested in): <project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; @@ -66,7 +66,7 @@ with actual GridGain version you are interested in): <dependency> <groupId>org.gridgain</groupId> <artifactId>gridgain-datagrid</artifactId> - <version>${gridgain.version}</version> + <version>${ignite.version}</version> </dependency> ... </dependencies> @@ -91,7 +91,7 @@ Here is how it can be imported into your POM file: <dependency> <groupId>org.gridgain</groupId> <artifactId>gridgain-core</artifactId> - <version>${gridgain.version}</version> + <version>${ignite.version}</version> </dependency> ... </dependencies> @@ -134,14 +134,14 @@ you should add 'gridgain-spring' module like this: <dependency> <groupId>org.gridgain</groupId> <artifactId>gridgain-core</artifactId> - <version>${gridgain.version}</version> + <version>${ignite.version}</version> </dependency> <!-- Optional. --> <dependency> <groupId>org.gridgain</groupId> <artifactId>gridgain-spring</artifactId> - <version>${gridgain.version}</version> + <version>${ignite.version}</version> </dependency> ... </dependencies> http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8efb40e2/assembly/release-base.xml ---------------------------------------------------------------------- diff --git a/assembly/release-base.xml b/assembly/release-base.xml index 9822cc4..5881729 100644 --- a/assembly/release-base.xml +++ b/assembly/release-base.xml @@ -23,7 +23,7 @@ http://maven.apache.org/xsd/component-1.1.2.xsd";> <files> <file> - <source>apache-2.0.txt</source> + <source>LICENSE.txt</source> <outputDirectory>/</outputDirectory> </file> http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8efb40e2/docs/gridgain_readme.md ---------------------------------------------------------------------- diff --git a/docs/gridgain_readme.md b/docs/gridgain_readme.md index 34a48ea..2bd7370 100644 --- a/docs/gridgain_readme.md +++ b/docs/gridgain_readme.md @@ -92,7 +92,7 @@ GridGain Maven repository has `4` artifacts (add `'-ent'` for enterprise edition <dependency> <groupId>org.gridgain</groupId> <artifactId>gridgain-fabric</artifactId> - <version>${gridgain.version}</version> + <version>${ignite.version}</version> <type>pom</type> </dependency> @@ -106,7 +106,7 @@ GridGain Maven repository has `4` artifacts (add `'-ent'` for enterprise edition <dependency> <groupId>org.gridgain</groupId> <artifactId>gridgain-fabric-ent</artifactId> - <version>${gridgain.version}</version> + <version>${ignite.version}</version> <type>pom</type> </dependency> http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8efb40e2/examples/pom-standalone.xml ---------------------------------------------------------------------- diff --git a/examples/pom-standalone.xml b/examples/pom-standalone.xml index 0258190..78c0736 100644 --- a/examples/pom-standalone.xml +++ b/examples/pom-standalone.xml @@ -28,55 +28,55 @@ <properties> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> - <gridgain.version>6.5.6</gridgain.version> + <ignite.version>1.0.0</ignite.version> <src.dir>src/main/java</src.dir> </properties> <groupId>org.gridgain</groupId> <artifactId>gridgain-examples</artifactId> - <version>${gridgain.version}</version> + <version>${ignite.version}</version> <dependencies> <dependency> <groupId>org.gridgain</groupId> <artifactId>gridgain-core</artifactId> - <version>${gridgain.version}</version> + <version>${ignite.version}</version> </dependency> <dependency> <groupId>org.gridgain</groupId> <artifactId>gridgain-hibernate</artifactId> - <version>${gridgain.version}</version> + <version>${ignite.version}</version> </dependency> <dependency> <groupId>org.gridgain</groupId> <artifactId>gridgain-scalar</artifactId> - <version>${gridgain.version}</version> + <version>${ignite.version}</version> </dependency> <dependency> <groupId>org.gridgain</groupId> <artifactId>gridgain-spring</artifactId> - <version>${gridgain.version}</version> + <version>${ignite.version}</version> </dependency> <dependency> <groupId>org.gridgain</groupId> <artifactId>gridgain-log4j</artifactId> - <version>${gridgain.version}</version> + <version>${ignite.version}</version> </dependency> <dependency> <groupId>org.gridgain</groupId> <artifactId>gridgain-indexing</artifactId> - <version>${gridgain.version}</version> + <version>${ignite.version}</version> </dependency> <dependency> <groupId>org.gridgain</groupId> <artifactId>gridgain-schedule</artifactId> - <version>${gridgain.version}</version> + <version>${ignite.version}</version> </dependency> <dependency> http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8efb40e2/modules/aop/readme.txt ---------------------------------------------------------------------- diff --git a/modules/aop/readme.txt b/modules/aop/readme.txt index b589c13..b72ad81 100644 --- a/modules/aop/readme.txt +++ b/modules/aop/readme.txt @@ -12,7 +12,7 @@ Importing AOP Module In Maven Project ------------------------------------- If you are using Maven to manage dependencies of your project, you can add AOP module -dependency like this (replace '${gridgain.version}' with actual GridGain version you are +dependency like this (replace '${ignite.version}' with actual Ignite version you are interested in): <project xmlns="http://maven.apache.org/POM/4.0.0"; @@ -25,7 +25,7 @@ interested in): <dependency> <groupId>org.gridgain</groupId> <artifactId>gridgain-aop</artifactId> - <version>${gridgain.version}</version> + <version>${ignite.version}</version> </dependency> ... </dependencies> http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8efb40e2/modules/aws/readme.txt ---------------------------------------------------------------------- diff --git a/modules/aws/readme.txt b/modules/aws/readme.txt index b3911c1..faa80a4 100644 --- a/modules/aws/readme.txt +++ b/modules/aws/readme.txt @@ -11,7 +11,7 @@ Importing AWS Module In Maven Project ------------------------------------- If you are using Maven to manage dependencies of your project, you can add AWS module -dependency like this (replace '${gridgain.version}' with actual GridGain version you are +dependency like this (replace '${ignite.version}' with actual Ignite version you are interested in): <project xmlns="http://maven.apache.org/POM/4.0.0"; @@ -24,7 +24,7 @@ interested in): <dependency> <groupId>org.gridgain</groupId> <artifactId>gridgain-aws</artifactId> - <version>${gridgain.version}</version> + <version>${ignite.version}</version> </dependency> ... </dependencies> http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8efb40e2/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 2b28069..9eef8cd 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 @@ -57,7 +57,7 @@ import java.util.*; * <ul> * <li>{@code {@link System#getProperties()}} - All system properties.</li> * <li>{@code {@link System#getenv(String)}} - All environment properties.</li> - * <li>{@code org.gridgain.build.ver} - GridGain build version.</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> http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8efb40e2/modules/core/src/main/java/org/apache/ignite/marshaller/optimized/IgniteOptimizedClassResolver.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/marshaller/optimized/IgniteOptimizedClassResolver.java b/modules/core/src/main/java/org/apache/ignite/marshaller/optimized/IgniteOptimizedClassResolver.java index ae57b8f..21fbbaf 100644 --- a/modules/core/src/main/java/org/apache/ignite/marshaller/optimized/IgniteOptimizedClassResolver.java +++ b/modules/core/src/main/java/org/apache/ignite/marshaller/optimized/IgniteOptimizedClassResolver.java @@ -269,7 +269,7 @@ class IgniteOptimizedClassResolver { } catch (ArrayIndexOutOfBoundsException e) { throw new ClassNotFoundException("Failed to find optimized class ID " + - "(is same GridGain version running on all nodes?): " + ggId, e); + "(is same Ignite version running on all nodes?): " + ggId, e); } name = ggT.get1(); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8efb40e2/modules/core/src/main/java/org/apache/ignite/mbean/IgniteMBean.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/mbean/IgniteMBean.java b/modules/core/src/main/java/org/apache/ignite/mbean/IgniteMBean.java index a1a1448..9f19b80 100644 --- a/modules/core/src/main/java/org/apache/ignite/mbean/IgniteMBean.java +++ b/modules/core/src/main/java/org/apache/ignite/mbean/IgniteMBean.java @@ -38,7 +38,7 @@ public interface IgniteMBean { * * @return String presentation of the version. */ - @IgniteMBeanDescription("String presentation of the GridGain version.") + @IgniteMBeanDescription("String presentation of the Ignite version.") public String getFullVersion(); /** http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8efb40e2/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpi.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpi.java b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpi.java index e5573e6..8f95223 100644 --- a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpi.java +++ b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpi.java @@ -3296,7 +3296,7 @@ public class TcpDiscoverySpi extends TcpDiscoverySpiAdapter implements TcpDiscov else { String errMsg = "Local node's and remote node's build versions are not compatible " + (rmtBuildVer.contains("-os") && locBuildVer.contains("-os") ? - "(topologies built with different GridGain versions " + + "(topologies built with different Ignite versions " + "are supported in Enterprise version only) " : "(node will not join, all nodes in topology should have " + "compatible build versions) ") + @@ -3314,7 +3314,7 @@ public class TcpDiscoverySpi extends TcpDiscoverySpiAdapter implements TcpDiscov try { String sndMsg = "Local node's and remote node's build versions are not compatible " + (rmtBuildVer.contains("-os") && locBuildVer.contains("-os") ? - "(topologies built with different GridGain versions " + + "(topologies built with different Ignite versions " + "are supported in Enterprise version only) " : "(node will not join, all nodes in topology should have " + "compatible build versions) ") + http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8efb40e2/modules/core/src/main/java/org/gridgain/grid/kernal/GridProductImpl.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/GridProductImpl.java b/modules/core/src/main/java/org/gridgain/grid/kernal/GridProductImpl.java index 70066d8..05cccb1 100644 --- a/modules/core/src/main/java/org/gridgain/grid/kernal/GridProductImpl.java +++ b/modules/core/src/main/java/org/gridgain/grid/kernal/GridProductImpl.java @@ -38,7 +38,7 @@ public class GridProductImpl implements IgniteProduct, Externalizable { /** Enterprise edition flag. */ public static final boolean ENT; - /** GridGain version. */ + /** Ignite version. */ public static final String VER; /** Build timestamp in seconds. */ @@ -53,7 +53,7 @@ public class GridProductImpl implements IgniteProduct, Externalizable { /** Release date. */ public static final String RELEASE_DATE; - /** GridGain version as numeric array (generated from {@link #VER}). */ + /** Ignite version as numeric array (generated from {@link #VER}). */ public static final byte[] VER_BYTES; /** Compound version. */ @@ -86,10 +86,10 @@ public class GridProductImpl implements IgniteProduct, Externalizable { ENT = ent0; - VER = GridProperties.get("gridgain.version"); - BUILD_TSTAMP = Long.valueOf(GridProperties.get("gridgain.build")); - REV_HASH = GridProperties.get("gridgain.revision"); - RELEASE_DATE = GridProperties.get("gridgain.rel.date"); + VER = GridProperties.get("ignite.version"); + BUILD_TSTAMP = Long.valueOf(GridProperties.get("ignite.build")); + REV_HASH = GridProperties.get("ignite.revision"); + RELEASE_DATE = GridProperties.get("ignite.rel.date"); VER_BYTES = U.intToBytes(VER.hashCode()); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8efb40e2/modules/core/src/main/java/org/gridgain/grid/kernal/GridProperties.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/GridProperties.java b/modules/core/src/main/java/org/gridgain/grid/kernal/GridProperties.java index 255a1ec..3131586 100644 --- a/modules/core/src/main/java/org/gridgain/grid/kernal/GridProperties.java +++ b/modules/core/src/main/java/org/gridgain/grid/kernal/GridProperties.java @@ -25,7 +25,7 @@ import java.util.*; */ public class GridProperties { /** Properties file path. */ - private static final String FILE_PATH = "gridgain.properties"; + private static final String FILE_PATH = "ignite.properties"; /** Enterprise properties file path. */ private static final String ENT_FILE_PATH = "gridgain-ent.properties"; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8efb40e2/modules/core/src/main/java/org/gridgain/grid/kernal/GridUpdateNotifier.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/GridUpdateNotifier.java b/modules/core/src/main/java/org/gridgain/grid/kernal/GridUpdateNotifier.java index 1311bbb..8a2fe5f 100644 --- a/modules/core/src/main/java/org/gridgain/grid/kernal/GridUpdateNotifier.java +++ b/modules/core/src/main/java/org/gridgain/grid/kernal/GridUpdateNotifier.java @@ -45,7 +45,7 @@ import static java.net.URLEncoder.*; */ class GridUpdateNotifier { /** Access URL to be used to access latest version data. */ - private static final String UPD_STATUS_PARAMS = GridProperties.get("gridgain.update.status.params"); + private static final String UPD_STATUS_PARAMS = GridProperties.get("ignite.update.status.params"); /** Throttling for logging out. */ private static final long THROTTLE_PERIOD = 24 * 60 * 60 * 1000; // 1 day. @@ -90,7 +90,7 @@ class GridUpdateNotifier { * Creates new notifier with default values. * * @param gridName gridName - * @param ver Compound GridGain version. + * @param ver Compound Ignite version. * @param site Site. * @param reportOnlyNew Whether or not to report only new version. * @param gw Kernal gateway. http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8efb40e2/modules/core/src/main/java/org/gridgain/grid/kernal/processors/dataload/IgniteDataLoaderImpl.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/dataload/IgniteDataLoaderImpl.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/dataload/IgniteDataLoaderImpl.java index 9591e99..56ec4a9 100644 --- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/dataload/IgniteDataLoaderImpl.java +++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/dataload/IgniteDataLoaderImpl.java @@ -56,7 +56,7 @@ import static org.gridgain.grid.kernal.managers.communication.GridIoPolicy.*; */ public class IgniteDataLoaderImpl<K, V> implements IgniteDataLoader<K, V>, Delayed { /** */ - public static final IgniteProductVersion COMPACT_MAP_ENTRIES_SINCE = IgniteProductVersion.fromString("6.5.6"); + public static final IgniteProductVersion COMPACT_MAP_ENTRIES_SINCE = IgniteProductVersion.fromString("1.0"); /** Cache updater. */ private IgniteDataLoadCacheUpdater<K, V> updater = GridDataLoadCacheUpdaters.individual(); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8efb40e2/modules/core/src/main/resources/gridgain.properties ---------------------------------------------------------------------- diff --git a/modules/core/src/main/resources/gridgain.properties b/modules/core/src/main/resources/gridgain.properties deleted file mode 100644 index b5337ce..0000000 --- a/modules/core/src/main/resources/gridgain.properties +++ /dev/null @@ -1,22 +0,0 @@ -# -# Licensed to the Apache Software Foundation (ASF) under one or more -# contributor license agreements. See the NOTICE file distributed with -# this work for additional information regarding copyright ownership. -# The ASF licenses this file to You under the Apache License, Version 2.0 -# (the "License"); you may not use this file except in compliance with -# the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# - -gridgain.version=6.5.7 -gridgain.build=0 -gridgain.revision=DEV -gridgain.rel.date=01011970 -gridgain.update.status.params=test=vfvfvskfkeievskjv http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8efb40e2/modules/core/src/main/resources/ignite.properties ---------------------------------------------------------------------- diff --git a/modules/core/src/main/resources/ignite.properties b/modules/core/src/main/resources/ignite.properties new file mode 100644 index 0000000..549bde3 --- /dev/null +++ b/modules/core/src/main/resources/ignite.properties @@ -0,0 +1,22 @@ +# +# Licensed to the Apache Software Foundation (ASF) under one or more +# contributor license agreements. See the NOTICE file distributed with +# this work for additional information regarding copyright ownership. +# The ASF licenses this file to You under the Apache License, Version 2.0 +# (the "License"); you may not use this file except in compliance with +# the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# + +ignite.version=1.0.0 +ignite.build=0 +ignite.revision=DEV +ignite.rel.date=01011970 +ignite.update.status.params=test=vfvfvskfkeievskjv http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8efb40e2/modules/core/src/test/java/org/gridgain/grid/kernal/GridUpdateNotifierSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/GridUpdateNotifierSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/GridUpdateNotifierSelfTest.java index 6df2278..d714acc 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/GridUpdateNotifierSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/GridUpdateNotifierSelfTest.java @@ -36,7 +36,7 @@ public class GridUpdateNotifierSelfTest extends GridCommonAbstractTest { * @throws Exception If failed. */ public void testNotifier() throws Exception { - GridUpdateNotifier ntf = new GridUpdateNotifier(null, GridProperties.get("gridgain.version"), + GridUpdateNotifier ntf = new GridUpdateNotifier(null, GridProperties.get("ignite.version"), GridKernal.SITE, TEST_GATEWAY, false); ntf.checkForNewVersion(new SelfExecutor(), log); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8efb40e2/modules/email/readme.txt ---------------------------------------------------------------------- diff --git a/modules/email/readme.txt b/modules/email/readme.txt index a456d8d..789ebd6 100644 --- a/modules/email/readme.txt +++ b/modules/email/readme.txt @@ -13,7 +13,7 @@ Importing email Module In Maven Project --------------------------------------- If you are using Maven to manage dependencies of your project, you can add email module -dependency like this (replace '${gridgain.version}' with actual GridGain version you are +dependency like this (replace '${ignite.version}' with actual Ignite version you are interested in): <project xmlns="http://maven.apache.org/POM/4.0.0"; @@ -26,7 +26,7 @@ interested in): <dependency> <groupId>org.gridgain</groupId> <artifactId>gridgain-email</artifactId> - <version>${gridgain.version}</version> + <version>${ignite.version}</version> </dependency> ... </dependencies> http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8efb40e2/modules/hadoop/readme.txt ---------------------------------------------------------------------- diff --git a/modules/hadoop/readme.txt b/modules/hadoop/readme.txt index 3583fd2..5fcc040 100644 --- a/modules/hadoop/readme.txt +++ b/modules/hadoop/readme.txt @@ -12,7 +12,7 @@ Importing Hadoop Module In Maven Project ---------------------------------------- If you are using Maven to manage dependencies of your project, you can add Hadoop module -dependency like this (replace '${gridgain.version}' with actual GridGain version you are +dependency like this (replace '${ignite.version}' with actual Ignite version you are interested in): <project xmlns="http://maven.apache.org/POM/4.0.0"; @@ -25,7 +25,7 @@ interested in): <dependency> <groupId>org.gridgain</groupId> <artifactId>gridgain-hadoop</artifactId> - <version>${gridgain.version}</version> + <version>${ignite.version}</version> </dependency> ... </dependencies> http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8efb40e2/modules/hibernate/readme.txt ---------------------------------------------------------------------- diff --git a/modules/hibernate/readme.txt b/modules/hibernate/readme.txt index 871cd6b..e1a913a 100644 --- a/modules/hibernate/readme.txt +++ b/modules/hibernate/readme.txt @@ -12,7 +12,7 @@ Importing Hibernate Module In Maven Project ------------------------------------------- If you are using Maven to manage dependencies of your project, you can add Hibernate module -dependency like this (replace '${gridgain.version}' with actual GridGain version you are +dependency like this (replace '${ignite.version}' with actual Ignite version you are interested in): <project xmlns="http://maven.apache.org/POM/4.0.0"; @@ -25,7 +25,7 @@ interested in): <dependency> <groupId>org.gridgain</groupId> <artifactId>gridgain-hibernate</artifactId> - <version>${gridgain.version}</version> + <version>${ignite.version}</version> </dependency> ... </dependencies> http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8efb40e2/modules/indexing/readme.txt ---------------------------------------------------------------------- diff --git a/modules/indexing/readme.txt b/modules/indexing/readme.txt index 7eb0e7b..9e87ede 100644 --- a/modules/indexing/readme.txt +++ b/modules/indexing/readme.txt @@ -12,7 +12,7 @@ Importing indexing Module In Maven Project ------------------------------------------ If you are using Maven to manage dependencies of your project, you can add indexing module -dependency like this (replace '${gridgain.version}' with actual GridGain version you are +dependency like this (replace '${ignite.version}' with actual Ignite version you are interested in): <project xmlns="http://maven.apache.org/POM/4.0.0"; @@ -25,7 +25,7 @@ interested in): <dependency> <groupId>org.gridgain</groupId> <artifactId>gridgain-indexing</artifactId> - <version>${gridgain.version}</version> + <version>${ignite.version}</version> </dependency> ... </dependencies> http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8efb40e2/modules/jcl/readme.txt ---------------------------------------------------------------------- diff --git a/modules/jcl/readme.txt b/modules/jcl/readme.txt index 6a60827..878c7d3 100644 --- a/modules/jcl/readme.txt +++ b/modules/jcl/readme.txt @@ -12,7 +12,7 @@ Importing JCL Module In Maven Project ------------------------------------- If you are using Maven to manage dependencies of your project, you can add JCL module -dependency like this (replace '${gridgain.version}' with actual GridGain version you are +dependency like this (replace '${ignite.version}' with actual Ignite version you are interested in): <project xmlns="http://maven.apache.org/POM/4.0.0"; @@ -25,7 +25,7 @@ interested in): <dependency> <groupId>org.gridgain</groupId> <artifactId>gridgain-jcl</artifactId> - <version>${gridgain.version}</version> + <version>${ignite.version}</version> </dependency> ... </dependencies> http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8efb40e2/modules/jta/readme.txt ---------------------------------------------------------------------- diff --git a/modules/jta/readme.txt b/modules/jta/readme.txt index 2894525..67cf2ea 100644 --- a/modules/jta/readme.txt +++ b/modules/jta/readme.txt @@ -11,7 +11,7 @@ Importing JTA Module In Maven Project ------------------------------------- If you are using Maven to manage dependencies of your project, you can add JTA module -dependency like this (replace '${gridgain.version}' with actual GridGain version you are +dependency like this (replace '${ignite.version}' with actual Ignite version you are interested in): <project xmlns="http://maven.apache.org/POM/4.0.0"; @@ -24,7 +24,7 @@ interested in): <dependency> <groupId>org.gridgain</groupId> <artifactId>gridgain-jta</artifactId> - <version>${gridgain.version}</version> + <version>${ignite.version}</version> </dependency> ... </dependencies> http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8efb40e2/modules/log4j/readme.txt ---------------------------------------------------------------------- diff --git a/modules/log4j/readme.txt b/modules/log4j/readme.txt index c12ed0c..b03294e 100644 --- a/modules/log4j/readme.txt +++ b/modules/log4j/readme.txt @@ -11,7 +11,7 @@ Importing Log4J Module In Maven Project --------------------------------------- If you are using Maven to manage dependencies of your project, you can add Log4J module -dependency like this (replace '${gridgain.version}' with actual GridGain version you are +dependency like this (replace '${ignite.version}' with actual Ignite version you are interested in): <project xmlns="http://maven.apache.org/POM/4.0.0"; @@ -24,7 +24,7 @@ interested in): <dependency> <groupId>org.gridgain</groupId> <artifactId>gridgain-log4j</artifactId> - <version>${gridgain.version}</version> + <version>${ignite.version}</version> </dependency> ... </dependencies> http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8efb40e2/modules/rest-http/readme.txt ---------------------------------------------------------------------- diff --git a/modules/rest-http/readme.txt b/modules/rest-http/readme.txt index b0a1a89..07c35ad 100644 --- a/modules/rest-http/readme.txt +++ b/modules/rest-http/readme.txt @@ -12,7 +12,7 @@ Importing REST-HTTP Module In Maven Project ------------------------------------------- If you are using Maven to manage dependencies of your project, you can add REST-HTTP module -dependency like this (replace '${gridgain.version}' with actual GridGain version you are +dependency like this (replace '${ignite.version}' with actual Ignite version you are interested in): <project xmlns="http://maven.apache.org/POM/4.0.0"; @@ -25,7 +25,7 @@ interested in): <dependency> <groupId>org.gridgain</groupId> <artifactId>gridgain-rest-http</artifactId> - <version>${gridgain.version}</version> + <version>${ignite.version}</version> </dependency> ... </dependencies> http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8efb40e2/modules/scalar/pom.xml ---------------------------------------------------------------------- diff --git a/modules/scalar/pom.xml b/modules/scalar/pom.xml index 1ea11fc..ab55ae5 100644 --- a/modules/scalar/pom.xml +++ b/modules/scalar/pom.xml @@ -150,7 +150,7 @@ <table style="padding: 0px 10px 10px 10px; width: 100%" border="0"> <tr> <td> - <nobr>GridGain™ - Scalar DSL, ver. <strong>${gridgain.version}</strong></nobr> + <nobr>GridGain™ - Scalar DSL, ver. <strong>${ignite.version}</strong></nobr> <br> <a target=_blank href="http://www.gridgain.com/";><nobr>2014 Copyright © GridGain Systems</nobr></a> </td> @@ -181,7 +181,7 @@ <fileset dir="target/site/scaladocs"/> </replaceregexp> - <zip destfile="target/gridgain-scalar-${gridgain.version}-javadoc.jar" + <zip destfile="target/gridgain-scalar-${ignite.version}-javadoc.jar" basedir="target/site/scaladocs" encoding="UTF-8"/> </target> http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8efb40e2/modules/scalar/readme.txt ---------------------------------------------------------------------- diff --git a/modules/scalar/readme.txt b/modules/scalar/readme.txt index 0bb738a..40885ab 100644 --- a/modules/scalar/readme.txt +++ b/modules/scalar/readme.txt @@ -11,7 +11,7 @@ Importing Scalar Module In Maven Project ---------------------------------------- If you are using Maven to manage dependencies of your project, you can add Scalar module -dependency like this (replace '${gridgain.version}' with actual GridGain version you are +dependency like this (replace '${ignite.version}' with actual Ignite version you are interested in): <project xmlns="http://maven.apache.org/POM/4.0.0"; @@ -24,7 +24,7 @@ interested in): <dependency> <groupId>org.gridgain</groupId> <artifactId>gridgain-scalar</artifactId> - <version>${gridgain.version}</version> + <version>${ignite.version}</version> </dependency> ... </dependencies> http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8efb40e2/modules/schedule/readme.txt ---------------------------------------------------------------------- diff --git a/modules/schedule/readme.txt b/modules/schedule/readme.txt index 82d9436..43c01e3 100644 --- a/modules/schedule/readme.txt +++ b/modules/schedule/readme.txt @@ -11,7 +11,7 @@ Importing Schedule Module In Maven Project ------------------------------------------ If you are using Maven to manage dependencies of your project, you can add Schedule module -dependency like this (replace '${gridgain.version}' with actual GridGain version you are +dependency like this (replace '${ignite.version}' with actual Ignite version you are interested in): <project xmlns="http://maven.apache.org/POM/4.0.0"; @@ -24,7 +24,7 @@ interested in): <dependency> <groupId>org.gridgain</groupId> <artifactId>gridgain-schedule</artifactId> - <version>${gridgain.version}</version> + <version>${ignite.version}</version> </dependency> ... </dependencies> http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8efb40e2/modules/slf4j/readme.txt ---------------------------------------------------------------------- diff --git a/modules/slf4j/readme.txt b/modules/slf4j/readme.txt index efd2b4c..c4255ae 100644 --- a/modules/slf4j/readme.txt +++ b/modules/slf4j/readme.txt @@ -11,7 +11,7 @@ Importing SLF4J Module In Maven Project --------------------------------------- If you are using Maven to manage dependencies of your project, you can add SLF4J module -dependency like this (replace '${gridgain.version}' with actual GridGain version you are +dependency like this (replace '${ignite.version}' with actual Ignite version you are interested in): <project xmlns="http://maven.apache.org/POM/4.0.0"; @@ -24,7 +24,7 @@ interested in): <dependency> <groupId>org.gridgain</groupId> <artifactId>gridgain-slf4j</artifactId> - <version>${gridgain.version}</version> + <version>${ignite.version}</version> </dependency> ... </dependencies> http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8efb40e2/modules/spring/readme.txt ---------------------------------------------------------------------- diff --git a/modules/spring/readme.txt b/modules/spring/readme.txt index 31d220b..6b9cbd8 100644 --- a/modules/spring/readme.txt +++ b/modules/spring/readme.txt @@ -12,7 +12,7 @@ Importing Spring Module In Maven Project ---------------------------------------- If you are using Maven to manage dependencies of your project, you can add Spring module -dependency like this (replace '${gridgain.version}' with actual GridGain version you are +dependency like this (replace '${ignite.version}' with actual Ignite version you are interested in): <project xmlns="http://maven.apache.org/POM/4.0.0"; @@ -25,7 +25,7 @@ interested in): <dependency> <groupId>org.gridgain</groupId> <artifactId>gridgain-spring</artifactId> - <version>${gridgain.version}</version> + <version>${ignite.version}</version> </dependency> ... </dependencies> http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8efb40e2/modules/ssh/readme.txt ---------------------------------------------------------------------- diff --git a/modules/ssh/readme.txt b/modules/ssh/readme.txt index 1865d1f..073ae51 100644 --- a/modules/ssh/readme.txt +++ b/modules/ssh/readme.txt @@ -11,7 +11,7 @@ Importing SSH Module In Maven Project ------------------------------------- If you are using Maven to manage dependencies of your project, you can add SSH module -dependency like this (replace '${gridgain.version}' with actual GridGain version you are +dependency like this (replace '${ignite.version}' with actual Ignite version you are interested in): <project xmlns="http://maven.apache.org/POM/4.0.0"; @@ -24,7 +24,7 @@ interested in): <dependency> <groupId>org.gridgain</groupId> <artifactId>gridgain-ssh</artifactId> - <version>${gridgain.version}</version> + <version>${ignite.version}</version> </dependency> ... </dependencies> http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8efb40e2/modules/urideploy/readme.txt ---------------------------------------------------------------------- diff --git a/modules/urideploy/readme.txt b/modules/urideploy/readme.txt index 007e691..b334838 100644 --- a/modules/urideploy/readme.txt +++ b/modules/urideploy/readme.txt @@ -12,7 +12,7 @@ Importing URI Deploy Module In Maven Project -------------------------------------------- If you are using Maven to manage dependencies of your project, you can add URI Deploy module -dependency like this (replace '${gridgain.version}' with actual GridGain version you are +dependency like this (replace '${ignite.version}' with actual Ignite version you are interested in): <project xmlns="http://maven.apache.org/POM/4.0.0"; @@ -25,7 +25,7 @@ interested in): <dependency> <groupId>org.gridgain</groupId> <artifactId>gridgain-urideploy</artifactId> - <version>${gridgain.version}</version> + <version>${ignite.version}</version> </dependency> ... </dependencies> http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8efb40e2/modules/visor-console/src/main/scala/org/gridgain/visor/commands/node/VisorNodeCommand.scala ---------------------------------------------------------------------- diff --git a/modules/visor-console/src/main/scala/org/gridgain/visor/commands/node/VisorNodeCommand.scala b/modules/visor-console/src/main/scala/org/gridgain/visor/commands/node/VisorNodeCommand.scala index 620611c..f9a213a 100644 --- a/modules/visor-console/src/main/scala/org/gridgain/visor/commands/node/VisorNodeCommand.scala +++ b/modules/visor-console/src/main/scala/org/gridgain/visor/commands/node/VisorNodeCommand.scala @@ -186,7 +186,7 @@ class VisorNodeCommand { t += ("OS user", node.attribute(ATTR_USER_NAME)) t += ("Deployment mode", node.attribute(ATTR_DEPLOYMENT_MODE)) t += ("Language runtime", node.attribute(ATTR_LANG_RUNTIME)) - t += ("GridGain version", verStr) + t += ("Ignite version", verStr) t += ("JRE information", node.attribute(ATTR_JIT_NAME)) t += ("Non-loopback IPs", node.attribute(ATTR_IPS)) t += ("Enabled MACs", node.attribute(ATTR_MACS)) @@ -243,7 +243,7 @@ class VisorNodeCommand { t += ("OS user", node.attribute(ATTR_USER_NAME)) t += ("Deployment mode", node.attribute(ATTR_DEPLOYMENT_MODE)) t += ("Language runtime", node.attribute(ATTR_LANG_RUNTIME)) - t += ("GridGain version", verStr) + t += ("Ignite version", verStr) t += ("JRE information", node.attribute(ATTR_JIT_NAME)) t += ("Grid name", safe(gridName, "<default>")) t += ("JVM start time", formatDateTime(m.getStartTime)) http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8efb40e2/modules/web/readme.txt ---------------------------------------------------------------------- diff --git a/modules/web/readme.txt b/modules/web/readme.txt index 35d51ea..86c8620 100644 --- a/modules/web/readme.txt +++ b/modules/web/readme.txt @@ -13,7 +13,7 @@ Importing Web Module In Maven Project ------------------------------------- If you are using Maven to manage dependencies of your project, you can add Web module -dependency like this (replace '${gridgain.version}' with actual GridGain version you are +dependency like this (replace '${ignite.version}' with actual Ignite version you are interested in): <project xmlns="http://maven.apache.org/POM/4.0.0"; @@ -26,7 +26,7 @@ interested in): <dependency> <groupId>org.gridgain</groupId> <artifactId>gridgain-web</artifactId> - <version>${gridgain.version}</version> + <version>${ignite.version}</version> </dependency> ... </dependencies> http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8efb40e2/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 8f5676a..52e0152 100644 --- a/pom.xml +++ b/pom.xml @@ -761,7 +761,7 @@ <b>GridGain Fabric</b> </td> <td>: - ver. <strong>${gridgain.version}</strong> + ver. <strong>${ignite.version}</strong> </td> </tr> <tr style="padding: 0; margin: 0"> @@ -1056,7 +1056,7 @@ <table width="100%" border="0"> <tr> <td> - <nobr>GridGain™ - Java Client, ver. <strong>${gridgain.version}</strong></nobr> + <nobr>GridGain™ - Java Client, ver. <strong>${ignite.version}</strong></nobr> <br> <a target=_blank href="http://www.gridgain.com/";><nobr>2014 Copyright © GridGain Systems</nobr></a> </td> @@ -1217,19 +1217,19 @@ </fileset> </replaceregexp> - <replace token="@sh.file.version" value="${gridgain.version}"> + <replace token="@sh.file.version" value="${ignite.version}"> <fileset dir="target/release-package/bin"> <include name="**/*.sh"/> </fileset> </replace> - <replace token="@bat.file.version" value="${gridgain.version}"> + <replace token="@bat.file.version" value="${ignite.version}"> <fileset dir="target/release-package/bin"> <include name="**/*.bat"/> </fileset> </replace> - <replace token="@xml.file.version" value="${gridgain.version}"> + <replace token="@xml.file.version" value="${ignite.version}"> <fileset dir="target/release-package"> <include name="**/*.xml"/> </fileset>
