You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by ak...@apache.org on 2015/03/04 10:05:07 UTC
[1/3] incubator-ignite git commit: # sprint-2 Fixed replace in build
script.
Repository: incubator-ignite
Updated Branches:
refs/heads/ignite-187 4dd275b19 -> 6554e9a5d
# sprint-2 Fixed replace in build script.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/be3c24cd
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/be3c24cd
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/be3c24cd
Branch: refs/heads/ignite-187
Commit: be3c24cd3fd4a9aaf9a6922eac7bc56b5f85473c
Parents: c4030f9
Author: anovikov <an...@gridgain.com>
Authored: Wed Mar 4 14:34:50 2015 +0700
Committer: anovikov <an...@gridgain.com>
Committed: Wed Mar 4 14:34:50 2015 +0700
----------------------------------------------------------------------
pom.xml | 49 ++++---------------------------------------------
1 file changed, 4 insertions(+), 45 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/be3c24cd/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index b176b10..b561aab 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1121,38 +1121,6 @@
<configuration>
<target>
<replaceregexp byline="true">
- <regexp pattern='pushd "%~dp0"/\.\./\.\.(\s*&::.+)?'/>
- <substitution expression='pushd "%~dp0"/..'/>
- <fileset dir="${basedir}/target/release-package/bin">
- <include name="**/*.bat"/>
- </fileset>
- </replaceregexp>
-
- <replaceregexp byline="true">
- <regexp pattern='IGNITE_HOME_TMP="\$\(dirname "\$\{IGNITE_HOME_TMP\}"\)"(\s*#.*)?'/>
- <substitution expression=""/>
- <fileset dir="${basedir}/target/release-package/bin">
- <include name="**/*.sh"/>
- </fileset>
- </replaceregexp>
-
- <replaceregexp byline="true">
- <regexp pattern='set SCRIPTS_HOME=%IGNITE_HOME%\\os\\bin(\s*&::.*)?'/>
- <substitution expression='set SCRIPTS_HOME=%IGNITE_HOME%\\\\bin'/>
- <fileset dir="${basedir}/target/release-package/bin">
- <include name="**/*.bat"/>
- </fileset>
- </replaceregexp>
-
- <replaceregexp byline="true">
- <regexp pattern='SCRIPTS_HOME="\$\{IGNITE_HOME_TMP\}/os/bin"(\s*#.*)?'/>
- <substitution expression='SCRIPTS_HOME="$${IGNITE_HOME_TMP}/bin"'/>
- <fileset dir="${basedir}/target/release-package/bin">
- <include name="**/*.sh"/>
- </fileset>
- </replaceregexp>
-
- <replaceregexp byline="true">
<regexp pattern='\. "\$\{SCRIPTS_HOME\}"/include/target-classpath.sh(\s*#.*)?'/>
<substitution expression=""/>
<fileset dir="${basedir}/target/release-package/bin">
@@ -1184,23 +1152,14 @@
</fileset>
</replaceregexp>
- <replace token="@sh.file.version" value="${ignite.version}">
+ <replaceregexp byline="true">
+ <regexp pattern='-DIGNITE_UPDATE_NOTIFIER=false'/>
+ <substitution expression=""/>
<fileset dir="${basedir}/target/release-package/bin">
<include name="**/*.sh"/>
- </fileset>
- </replace>
-
- <replace token="@bat.file.version" value="${ignite.version}">
- <fileset dir="${basedir}/target/release-package/bin">
<include name="**/*.bat"/>
</fileset>
- </replace>
-
- <replace token="@xml.file.version" value="${ignite.version}">
- <fileset dir="${basedir}/target/release-package">
- <include name="**/*.xml"/>
- </fileset>
- </replace>
+ </replaceregexp>
<zip destfile="${basedir}/target/ignite-${ignite.edition}-${ignite.version}.zip"
encoding="UTF-8">
[2/3] incubator-ignite git commit: Merge branches 'ignite-187' and
'sprint-2' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into
ignite-187
Posted by ak...@apache.org.
Merge branches 'ignite-187' and 'sprint-2' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-187
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/44b5c4ec
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/44b5c4ec
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/44b5c4ec
Branch: refs/heads/ignite-187
Commit: 44b5c4ec9d20a16cd9f3a12ef23f11df69edce0e
Parents: 4dd275b be3c24c
Author: AKuznetsov <ak...@gridgain.com>
Authored: Wed Mar 4 15:08:01 2015 +0700
Committer: AKuznetsov <ak...@gridgain.com>
Committed: Wed Mar 4 15:08:01 2015 +0700
----------------------------------------------------------------------
pom.xml | 49 ++++---------------------------------------------
1 file changed, 4 insertions(+), 45 deletions(-)
----------------------------------------------------------------------
[3/3] incubator-ignite git commit: # IGNITE-187 Fixes for spi start.
Posted by ak...@apache.org.
# IGNITE-187 Fixes for spi start.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/6554e9a5
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/6554e9a5
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/6554e9a5
Branch: refs/heads/ignite-187
Commit: 6554e9a5dd53c10c3bfecacefdab66ad83778990
Parents: 44b5c4e
Author: AKuznetsov <ak...@gridgain.com>
Authored: Wed Mar 4 16:04:47 2015 +0700
Committer: AKuznetsov <ak...@gridgain.com>
Committed: Wed Mar 4 16:04:47 2015 +0700
----------------------------------------------------------------------
.../internal/managers/GridManagerAdapter.java | 21 +++++++++++++++-----
.../checkpoint/GridCheckpointManager.java | 5 ++++-
.../collision/GridCollisionManager.java | 5 ++++-
.../discovery/GridDiscoveryManager.java | 1 -
.../managers/indexing/GridIndexingManager.java | 5 ++++-
.../swapspace/GridSwapSpaceManager.java | 5 ++++-
6 files changed, 32 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/6554e9a5/modules/core/src/main/java/org/apache/ignite/internal/managers/GridManagerAdapter.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/managers/GridManagerAdapter.java b/modules/core/src/main/java/org/apache/ignite/internal/managers/GridManagerAdapter.java
index 7c692e3..2a0aaec 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/managers/GridManagerAdapter.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/managers/GridManagerAdapter.java
@@ -161,20 +161,31 @@ public abstract class GridManagerAdapter<T extends IgniteSpi> implements GridMan
}
/**
- * Starts wrapped SPI.
+ * Inject resources into wrapped SPI.
*
- * @throws IgniteCheckedException If wrapped SPI could not be started.
+ * @throws IgniteCheckedException If injection failed.
*/
- protected final void startSpi() throws IgniteCheckedException {
- Collection<String> names = U.newHashSet(spis.length);
-
+ protected final void injectSpi() throws IgniteCheckedException {
for (T spi : spis) {
// Inject all spi resources.
ctx.resource().inject(spi);
// Inject SPI internal objects.
inject(spi);
+ }
+ }
+
+ /**
+ * Starts wrapped SPI.
+ *
+ * @throws IgniteCheckedException If wrapped SPI could not be started.
+ */
+ protected final void startSpi() throws IgniteCheckedException {
+ Collection<String> names = U.newHashSet(spis.length);
+ injectSpi();
+
+ for (T spi : spis) {
try {
Map<String, Object> retval = spi.getNodeAttributes();
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/6554e9a5/modules/core/src/main/java/org/apache/ignite/internal/managers/checkpoint/GridCheckpointManager.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/managers/checkpoint/GridCheckpointManager.java b/modules/core/src/main/java/org/apache/ignite/internal/managers/checkpoint/GridCheckpointManager.java
index 291930b..bcaa70a 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/managers/checkpoint/GridCheckpointManager.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/managers/checkpoint/GridCheckpointManager.java
@@ -75,8 +75,11 @@ public class GridCheckpointManager extends GridManagerAdapter<CheckpointSpi> {
/** {@inheritDoc} */
@Override public void start() throws IgniteCheckedException {
- if (ctx.config().isDaemon())
+ if (ctx.config().isDaemon()) {
+ injectSpi();
+
return;
+ }
for (CheckpointSpi spi : getSpis()) {
spi.setCheckpointListener(new CheckpointListener() {
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/6554e9a5/modules/core/src/main/java/org/apache/ignite/internal/managers/collision/GridCollisionManager.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/managers/collision/GridCollisionManager.java b/modules/core/src/main/java/org/apache/ignite/internal/managers/collision/GridCollisionManager.java
index 2f00fb7..e38617a 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/managers/collision/GridCollisionManager.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/managers/collision/GridCollisionManager.java
@@ -44,8 +44,11 @@ public class GridCollisionManager extends GridManagerAdapter<CollisionSpi> {
/** {@inheritDoc} */
@Override public void start() throws IgniteCheckedException {
- if (ctx.config().isDaemon())
+ if (ctx.config().isDaemon()) {
+ injectSpi();
+
return;
+ }
startSpi();
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/6554e9a5/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManager.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManager.java b/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManager.java
index bfa4fae..e7020c1 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManager.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManager.java
@@ -53,7 +53,6 @@ import java.util.zip.*;
import static java.util.concurrent.TimeUnit.*;
import static org.apache.ignite.events.EventType.*;
import static org.apache.ignite.internal.IgniteNodeAttributes.*;
-import static org.apache.ignite.internal.IgniteVersionUtils.*;
import static org.apache.ignite.plugin.segmentation.GridSegmentationPolicy.*;
/**
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/6554e9a5/modules/core/src/main/java/org/apache/ignite/internal/managers/indexing/GridIndexingManager.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/managers/indexing/GridIndexingManager.java b/modules/core/src/main/java/org/apache/ignite/internal/managers/indexing/GridIndexingManager.java
index 3fe7839..5e734a2 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/managers/indexing/GridIndexingManager.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/managers/indexing/GridIndexingManager.java
@@ -45,8 +45,11 @@ public class GridIndexingManager extends GridManagerAdapter<IndexingSpi> {
* @throws IgniteCheckedException Thrown in case of any errors.
*/
@Override public void start() throws IgniteCheckedException {
- if (ctx.config().isDaemon())
+ if (ctx.config().isDaemon()) {
+ injectSpi();
+
return;
+ }
if (!enabled())
U.warn(log, "Indexing is disabled (to enable please configure GridIndexingSpi).");
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/6554e9a5/modules/core/src/main/java/org/apache/ignite/internal/managers/swapspace/GridSwapSpaceManager.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/managers/swapspace/GridSwapSpaceManager.java b/modules/core/src/main/java/org/apache/ignite/internal/managers/swapspace/GridSwapSpaceManager.java
index ef999d7..2b7fbeb 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/managers/swapspace/GridSwapSpaceManager.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/managers/swapspace/GridSwapSpaceManager.java
@@ -50,8 +50,11 @@ public class GridSwapSpaceManager extends GridManagerAdapter<SwapSpaceSpi> {
/** {@inheritDoc} */
@Override public void start() throws IgniteCheckedException {
- if (ctx.config().isDaemon())
+ if (ctx.config().isDaemon()) {
+ injectSpi();
+
return;
+ }
getSpi().setListener(new SwapSpaceSpiListener() {
@Override public void onSwapEvent(int evtType, @Nullable String spaceName, @Nullable byte[] keyBytes) {