You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by sb...@apache.org on 2015/02/02 16:39:02 UTC
[1/4] incubator-ignite git commit: Ignite-151-154 gridgain.edition
renamed to ignite.edition
Repository: incubator-ignite
Updated Branches:
refs/heads/ignite-151-154 [created] babd67e9d
Ignite-151-154 gridgain.edition renamed to ignite.edition
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/a4967567
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/a4967567
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/a4967567
Branch: refs/heads/ignite-151-154
Commit: a49675674f5b21bf38ce28d690f01620785c9e1e
Parents: 06d9b7d
Author: avinogradov <av...@gridgain.com>
Authored: Mon Feb 2 12:56:07 2015 +0300
Committer: avinogradov <av...@gridgain.com>
Committed: Mon Feb 2 12:56:07 2015 +0300
----------------------------------------------------------------------
assembly/release-base.xml | 2 +-
pom.xml | 14 +++++++-------
2 files changed, 8 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a4967567/assembly/release-base.xml
----------------------------------------------------------------------
diff --git a/assembly/release-base.xml b/assembly/release-base.xml
index 5cdeb2a..5bc0a27 100644
--- a/assembly/release-base.xml
+++ b/assembly/release-base.xml
@@ -76,7 +76,7 @@
</fileSet>
<fileSet>
- <directory>config/${gridgain.edition}</directory>
+ <directory>config/${ignite.edition}</directory>
<outputDirectory>/config</outputDirectory>
</fileSet>
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a4967567/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 07c5955..a7b38f1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -34,7 +34,7 @@
<properties>
<ignite.version>1.0.0-SNAPSHOT</ignite.version>
- <gridgain.edition>fabric</gridgain.edition>
+ <ignite.edition>fabric</ignite.edition>
<hadoop.version>2.4.1</hadoop.version>
<spring.version>4.1.0.RELEASE</spring.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -326,7 +326,7 @@
</goals>
<configuration>
<descriptors>
- <descriptor>assembly/dependencies-${gridgain.edition}.xml</descriptor>
+ <descriptor>assembly/dependencies-${ignite.edition}.xml</descriptor>
</descriptors>
<outputDirectory>${basedir}</outputDirectory>
<finalName>libs</finalName>
@@ -343,7 +343,7 @@
</goals>
<configuration>
<descriptors>
- <descriptor>assembly/dependencies-optional-${gridgain.edition}.xml</descriptor>
+ <descriptor>assembly/dependencies-optional-${ignite.edition}.xml</descriptor>
</descriptors>
<outputDirectory>${basedir}/libs</outputDirectory>
<finalName>optional</finalName>
@@ -377,7 +377,7 @@
</goals>
<configuration>
<descriptors>
- <descriptor>assembly/release-${gridgain.edition}.xml</descriptor>
+ <descriptor>assembly/release-${ignite.edition}.xml</descriptor>
</descriptors>
<finalName>release-package</finalName>
<appendAssemblyId>false</appendAssemblyId>
@@ -1250,10 +1250,10 @@
</fileset>
</replace>
- <zip destfile="target/ignite-${gridgain.edition}-${ignite.version}.zip"
+ <zip destfile="target/ignite-${ignite.edition}-${ignite.version}.zip"
encoding="UTF-8">
<zipfileset dir="target/release-package"
- prefix="ignite-${gridgain.edition}-${ignite.version}"
+ prefix="ignite-${ignite.edition}-${ignite.version}"
filemode="755">
<include name="**/*.sh"/>
<include name="**/configure"/>
@@ -1262,7 +1262,7 @@
<include name="**/missing"/>
</zipfileset>
<zipfileset dir="target/release-package"
- prefix="ignite-${gridgain.edition}-${ignite.version}">
+ prefix="ignite-${ignite.edition}-${ignite.version}">
<exclude name="**/*.sh"/>
<exclude name="**/configure"/>
<exclude name="**/install-sh"/>
[2/4] incubator-ignite git commit: Ignite-151-154 minor changes
Posted by sb...@apache.org.
Ignite-151-154 minor changes
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/882c4b6c
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/882c4b6c
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/882c4b6c
Branch: refs/heads/ignite-151-154
Commit: 882c4b6cc59d0ac153c261985ab48ac36bd59b11
Parents: a496756
Author: avinogradov <av...@gridgain.com>
Authored: Mon Feb 2 14:21:42 2015 +0300
Committer: avinogradov <av...@gridgain.com>
Committed: Mon Feb 2 14:21:42 2015 +0300
----------------------------------------------------------------------
pom.xml | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/882c4b6c/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index a7b38f1..f261df1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -600,8 +600,8 @@
</tagletArtifact>
</taglet>
</taglets>
- <doctitle>GridGain ${ignite.version}</doctitle>
- <windowtitle>GridGain ${ignite.version}</windowtitle>
+ <doctitle>Ignite ${ignite.version}</doctitle>
+ <windowtitle>Ignite ${ignite.version}</windowtitle>
<breakiterator>true</breakiterator>
<verbose>true</verbose>
<show>protected</show>
@@ -809,8 +809,8 @@
</taglets>
<reportOutputDirectory>target/javadoc</reportOutputDirectory>
<destDir>core</destDir>
- <doctitle>GridGain ${ignite.version}</doctitle>
- <windowtitle>GridGain ${ignite.version}</windowtitle>
+ <doctitle>Ignite ${ignite.version}</doctitle>
+ <windowtitle>Ignite ${ignite.version}</windowtitle>
<breakiterator>true</breakiterator>
<verbose>true</verbose>
<show>protected</show>
[3/4] incubator-ignite git commit: Ignite-151-154 package & javadoc
fix
Posted by sb...@apache.org.
Ignite-151-154 package & javadoc fix
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/11b6b6fd
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/11b6b6fd
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/11b6b6fd
Branch: refs/heads/ignite-151-154
Commit: 11b6b6fdd62955d5dc72173224b86f5b90353bfc
Parents: 882c4b6
Author: avinogradov <av...@gridgain.com>
Authored: Mon Feb 2 15:22:21 2015 +0300
Committer: avinogradov <av...@gridgain.com>
Committed: Mon Feb 2 15:22:21 2015 +0300
----------------------------------------------------------------------
bin/ignite.bat | 2 +-
bin/igniterouter.bat | 2 +-
bin/igniterouter.sh | 2 +-
bin/include/functions.sh | 2 +-
pom.xml | 4 ++++
5 files changed, 8 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/11b6b6fd/bin/ignite.bat
----------------------------------------------------------------------
diff --git a/bin/ignite.bat b/bin/ignite.bat
index d11dc1b..1a3a299 100644
--- a/bin/ignite.bat
+++ b/bin/ignite.bat
@@ -127,7 +127,7 @@ set RESTART_SUCCESS_OPT=-DIGNITE_SUCCESS_FILE=%RESTART_SUCCESS_FILE%
::
:: You can specify IGNITE_JMX_PORT environment variable for overriding automatically found JMX port
::
-for /F "tokens=*" %%A in ('""%JAVA_HOME%\bin\java" -cp %CP% org.gridgain.grid.util.portscanner.GridJmxPortFinder"') do (
+for /F "tokens=*" %%A in ('""%JAVA_HOME%\bin\java" -cp %CP% org.apache.ignite.internal.util.portscanner.GridJmxPortFinder"') do (
set JMX_PORT=%%A
)
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/11b6b6fd/bin/igniterouter.bat
----------------------------------------------------------------------
diff --git a/bin/igniterouter.bat b/bin/igniterouter.bat
index 36f1fae..adcf488 100644
--- a/bin/igniterouter.bat
+++ b/bin/igniterouter.bat
@@ -25,7 +25,7 @@ if "%OS%" == "Windows_NT" setlocal
:: Set router service environment.
::
set "DEFAULT_CONFIG=config\router\default-router.xml"
-set MAIN_CLASS=org.gridgain.client.router.impl.GridRouterCommandLineStartup
+set MAIN_CLASS=org.apache.ignite.client.router.impl.GridRouterCommandLineStartup
::
:: Start router service.
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/11b6b6fd/bin/igniterouter.sh
----------------------------------------------------------------------
diff --git a/bin/igniterouter.sh b/bin/igniterouter.sh
index b75aec3..58fa971 100644
--- a/bin/igniterouter.sh
+++ b/bin/igniterouter.sh
@@ -42,7 +42,7 @@ setGridGainHome
# Set router service environment.
#
export DEFAULT_CONFIG=config/router/default-router.xml
-export MAIN_CLASS=org.gridgain.client.router.impl.GridRouterCommandLineStartup
+export MAIN_CLASS=org.apache.ignite.client.router.impl.GridRouterCommandLineStartup
#
# Start router service.
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/11b6b6fd/bin/include/functions.sh
----------------------------------------------------------------------
diff --git a/bin/include/functions.sh b/bin/include/functions.sh
index cc2aca8..7a7187c 100755
--- a/bin/include/functions.sh
+++ b/bin/include/functions.sh
@@ -111,7 +111,7 @@ setGridGainHome() {
# The function exports JMX_MON variable with Java JMX options.
#
findAvailableJmxPort() {
- JMX_PORT=`"$JAVA" -cp "${IGNITE_LIBS}" org.gridgain.grid.util.portscanner.GridJmxPortFinder`
+ JMX_PORT=`"$JAVA" -cp "${IGNITE_LIBS}" org.apache.ignite.internal.util.portscanner.GridJmxPortFinder`
#
# This variable defines necessary parameters for JMX
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/11b6b6fd/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index f261df1..0014001 100644
--- a/pom.xml
+++ b/pom.xml
@@ -941,6 +941,10 @@
<title>Interop</title>
<packages>org.apache.ignite.interop</packages>
</group>
+ <group>
+ <title>Yardstick</title>
+ <packages>org.apache.ignite.yardstick</packages>
+ </group>
</groups>
<header>
<![CDATA[
[4/4] incubator-ignite git commit: Ignite-151-154 package & javadoc
fix
Posted by sb...@apache.org.
Ignite-151-154 package & javadoc fix
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/babd67e9
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/babd67e9
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/babd67e9
Branch: refs/heads/ignite-151-154
Commit: babd67e9d1e11b4154610bc11a157e69982ce6ea
Parents: 11b6b6f
Author: avinogradov <av...@gridgain.com>
Authored: Mon Feb 2 17:42:21 2015 +0300
Committer: avinogradov <av...@gridgain.com>
Committed: Mon Feb 2 17:42:21 2015 +0300
----------------------------------------------------------------------
bin/ignitevisorcmd.bat | 2 +-
pom.xml | 10 +++-------
2 files changed, 4 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/babd67e9/bin/ignitevisorcmd.bat
----------------------------------------------------------------------
diff --git a/bin/ignitevisorcmd.bat b/bin/ignitevisorcmd.bat
index c4c64f9..981fa45 100644
--- a/bin/ignitevisorcmd.bat
+++ b/bin/ignitevisorcmd.bat
@@ -135,7 +135,7 @@ if %ENABLE_ASSERTIONS% == 1 set JVM_OPTS_VISOR=%JVM_OPTS_VISOR% -ea
::
"%JAVA_HOME%\bin\java.exe" %JVM_OPTS_VISOR% -DIGNITE_PROG_NAME="%PROG_NAME%" ^
-DIGNITE_DEPLOYMENT_MODE_OVERRIDE=ISOLATED %QUIET% %JVM_XOPTS% -cp "%CP%" ^
- org.gridgain.visor.commands.VisorConsole
+ org.apache.ignite.visor.commands.VisorConsole
:error_finish
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/babd67e9/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 0014001..04d286f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -823,7 +823,7 @@
<link>http://hadoop.apache.org/docs/current/api/</link>
</links>
<stylesheetfile>assembly/docfiles/javadoc.css</stylesheetfile>
- <excludePackageNames>com.*:org.jetbrains.*:org.pcollections:*.jdk8:*.tests:*.tools:*.typedef:*.examples:*.client:*.kernal:*.internal:*.util:*.dr:*.compute.gridify.aop:*.spi.authentication:*.spi.securesession:*.spi.discovery.tcp.messages:*.spi.discovery.tcp.internal:*.spi.deployment.uri.scanners:*.spi.deployment.uri.tasks:*.spi.indexing.h2.opt:org.apache.ignite.portables</excludePackageNames>
+ <excludePackageNames>com.*:org.jetbrains.*:org.pcollections:*.jdk8:*.tests:*.tools:*.typedef:*.examples:*.client:*.kernal:*.internal:*.util:*.dr:*.compute.gridify.aop:*.spi.authentication:*.spi.securesession:*.spi.discovery.tcp.messages:*.spi.discovery.tcp.internal:*.spi.deployment.uri.scanners:*.spi.deployment.uri.tasks:*.spi.indexing.h2.opt:org.apache.ignite.portables:org.apache.ignite.yardstick</excludePackageNames>
<groups>
<group>
<title>Common Grid APIs</title>
@@ -941,10 +941,6 @@
<title>Interop</title>
<packages>org.apache.ignite.interop</packages>
</group>
- <group>
- <title>Yardstick</title>
- <packages>org.apache.ignite.yardstick</packages>
- </group>
</groups>
<header>
<![CDATA[
@@ -1035,8 +1031,8 @@
</taglets>
<reportOutputDirectory>target/javadoc</reportOutputDirectory>
<destDir>client</destDir>
- <doctitle>GridGain ${ignite.version} - Java Client</doctitle>
- <windowtitle>GridGain ${ignite.version} - Java Client</windowtitle>
+ <doctitle>Ignite ${ignite.version} - Java Client</doctitle>
+ <windowtitle>Ignite ${ignite.version} - Java Client</windowtitle>
<breakiterator>true</breakiterator>
<verbose>true</verbose>
<show>protected</show>