ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sboi...@apache.org
Subject [01/32] incubator-ignite git commit: # Renaming
Date Fri, 05 Dec 2014 10:03:02 GMT
Repository: incubator-ignite
Updated Branches:
  refs/heads/master 76094f009 -> 650cb8869


# Renaming


Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/cd99e620
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/cd99e620
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/cd99e620

Branch: refs/heads/master
Commit: cd99e620782922de986e95e03864c15889e9d297
Parents: 76094f0
Author: sboikov <sboikov@gridgain.com>
Authored: Fri Dec 5 12:33:14 2014 +0300
Committer: sboikov <sboikov@gridgain.com>
Committed: Fri Dec 5 12:33:14 2014 +0300

----------------------------------------------------------------------
 .../ignite/cluster/GridTopologyException.java   | 41 ++++++++++++++++++++
 .../ignite/compute/ComputeTaskAdapter.java      |  3 +-
 .../optimized-classnames.previous.properties    |  2 +-
 .../optimized/optimized-classnames.properties   |  2 +-
 .../grid/GridEmptyProjectionException.java      |  1 +
 .../gridgain/grid/GridTopologyException.java    | 40 -------------------
 .../GridTransactionalCacheQueueImpl.java        |  1 +
 .../cache/distributed/dht/GridDhtTxLocal.java   |  1 +
 .../processors/streamer/IgniteStreamerImpl.java |  1 +
 .../kernal/visor/node/VisorNodePingTask.java    |  1 +
 .../grid/util/future/GridCompoundFuture.java    |  1 +
 .../grid/kernal/GridTaskFailoverSelfTest.java   |  1 +
 .../GridCacheAbstractFailoverSelfTest.java      |  1 +
 .../cache/GridCacheAbstractSelfTest.java        |  1 +
 .../GridCacheAbstractNodeRestartSelfTest.java   |  2 +-
 .../near/GridCacheNearOnlyTopologySelfTest.java |  1 -
 ...ionedClientOnlyNoPrimaryFullApiSelfTest.java |  1 +
 17 files changed, 56 insertions(+), 45 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cd99e620/modules/core/src/main/java/org/apache/ignite/cluster/GridTopologyException.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/cluster/GridTopologyException.java
b/modules/core/src/main/java/org/apache/ignite/cluster/GridTopologyException.java
new file mode 100644
index 0000000..63399b7
--- /dev/null
+++ b/modules/core/src/main/java/org/apache/ignite/cluster/GridTopologyException.java
@@ -0,0 +1,41 @@
+/* @java.file.header */
+
+/*  _________        _____ __________________        _____
+ *  __  ____/___________(_)______  /__  ____/______ ____(_)_______
+ *  _  / __  __  ___/__  / _  __  / _  / __  _  __ `/__  / __  __ \
+ *  / /_/ /  _  /    _  /  / /_/ /  / /_/ /  / /_/ / _  /  _  / / /
+ *  \____/   /_/     /_/   \_,__/   \____/   \__,_/  /_/   /_/ /_/
+ */
+
+package org.apache.ignite.cluster;
+
+import org.gridgain.grid.*;
+import org.jetbrains.annotations.*;
+
+/**
+ * This exception is used to indicate error with grid topology (e.g., crashed node, etc.).
+ */
+public class GridTopologyException extends GridException {
+    /** */
+    private static final long serialVersionUID = 0L;
+
+    /**
+     * Creates new topology exception with given error message.
+     *
+     * @param msg Error message.
+     */
+    public GridTopologyException(String msg) {
+        super(msg);
+    }
+
+    /**
+     * Creates new topology exception with given error message and optional
+     * nested exception.
+     *
+     * @param msg Error message.
+     * @param cause Optional nested exception (can be {@code null}).
+     */
+    public GridTopologyException(String msg, @Nullable Throwable cause) {
+        super(msg, cause);
+    }
+}

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cd99e620/modules/core/src/main/java/org/apache/ignite/compute/ComputeTaskAdapter.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/compute/ComputeTaskAdapter.java
b/modules/core/src/main/java/org/apache/ignite/compute/ComputeTaskAdapter.java
index 9db78d3..feb0bae 100644
--- a/modules/core/src/main/java/org/apache/ignite/compute/ComputeTaskAdapter.java
+++ b/modules/core/src/main/java/org/apache/ignite/compute/ComputeTaskAdapter.java
@@ -9,6 +9,7 @@
 
 package org.apache.ignite.compute;
 
+import org.apache.ignite.cluster.*;
 import org.gridgain.grid.*;
 
 import java.util.*;
@@ -67,7 +68,7 @@ public abstract class ComputeTaskAdapter<T, R> implements ComputeTask<T,
R> {
      * <p>
      * If remote job resulted in exception ({@link ComputeJobResult#getException()} is not
{@code null}),
      * then {@link ComputeJobResultPolicy#FAILOVER} policy will be returned if the exception
is instance
-     * of {@link GridTopologyException} or {@link ComputeExecutionRejectedException}, which
means that
+     * of {@link org.apache.ignite.cluster.GridTopologyException} or {@link ComputeExecutionRejectedException},
which means that
      * remote node either failed or job execution was rejected before it got a chance to
start. In all
      * other cases the exception will be rethrown which will ultimately cause task to fail.
      *

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cd99e620/modules/core/src/main/java/org/apache/ignite/marshaller/optimized/optimized-classnames.previous.properties
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/marshaller/optimized/optimized-classnames.previous.properties
b/modules/core/src/main/java/org/apache/ignite/marshaller/optimized/optimized-classnames.previous.properties
index 9038b45..117b1b9 100644
--- a/modules/core/src/main/java/org/apache/ignite/marshaller/optimized/optimized-classnames.previous.properties
+++ b/modules/core/src/main/java/org/apache/ignite/marshaller/optimized/optimized-classnames.previous.properties
@@ -4615,7 +4615,7 @@ org.gridgain.grid.GridSpringBean
 org.gridgain.grid.GridTaskCancelledException
 org.gridgain.grid.GridTaskSessionScope
 org.gridgain.grid.GridTaskTimeoutException
-org.gridgain.grid.GridTopologyException
+org.apache.ignite.cluster.GridTopologyException
 org.gridgain.grid.GridUserUndeclaredException
 org.gridgain.grid.benchmarks.GridLocalNodeBenchmark
 org.gridgain.grid.cache.GridCacheAtomicWriteOrderMode

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cd99e620/modules/core/src/main/java/org/apache/ignite/marshaller/optimized/optimized-classnames.properties
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/marshaller/optimized/optimized-classnames.properties
b/modules/core/src/main/java/org/apache/ignite/marshaller/optimized/optimized-classnames.properties
index 9038b45..117b1b9 100644
--- a/modules/core/src/main/java/org/apache/ignite/marshaller/optimized/optimized-classnames.properties
+++ b/modules/core/src/main/java/org/apache/ignite/marshaller/optimized/optimized-classnames.properties
@@ -4615,7 +4615,7 @@ org.gridgain.grid.GridSpringBean
 org.gridgain.grid.GridTaskCancelledException
 org.gridgain.grid.GridTaskSessionScope
 org.gridgain.grid.GridTaskTimeoutException
-org.gridgain.grid.GridTopologyException
+org.apache.ignite.cluster.GridTopologyException
 org.gridgain.grid.GridUserUndeclaredException
 org.gridgain.grid.benchmarks.GridLocalNodeBenchmark
 org.gridgain.grid.cache.GridCacheAtomicWriteOrderMode

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cd99e620/modules/core/src/main/java/org/gridgain/grid/GridEmptyProjectionException.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/GridEmptyProjectionException.java
b/modules/core/src/main/java/org/gridgain/grid/GridEmptyProjectionException.java
index 642c4f4..9a06c71 100644
--- a/modules/core/src/main/java/org/gridgain/grid/GridEmptyProjectionException.java
+++ b/modules/core/src/main/java/org/gridgain/grid/GridEmptyProjectionException.java
@@ -9,6 +9,7 @@
 
 package org.gridgain.grid;
 
+import org.apache.ignite.cluster.*;
 import org.jetbrains.annotations.*;
 
 /**

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cd99e620/modules/core/src/main/java/org/gridgain/grid/GridTopologyException.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/GridTopologyException.java b/modules/core/src/main/java/org/gridgain/grid/GridTopologyException.java
deleted file mode 100644
index 3c7b09c..0000000
--- a/modules/core/src/main/java/org/gridgain/grid/GridTopologyException.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/* @java.file.header */
-
-/*  _________        _____ __________________        _____
- *  __  ____/___________(_)______  /__  ____/______ ____(_)_______
- *  _  / __  __  ___/__  / _  __  / _  / __  _  __ `/__  / __  __ \
- *  / /_/ /  _  /    _  /  / /_/ /  / /_/ /  / /_/ / _  /  _  / / /
- *  \____/   /_/     /_/   \_,__/   \____/   \__,_/  /_/   /_/ /_/
- */
-
-package org.gridgain.grid;
-
-import org.jetbrains.annotations.*;
-
-/**
- * This exception is used to indicate error with grid topology (e.g., crashed node, etc.).
- */
-public class GridTopologyException extends GridException {
-    /** */
-    private static final long serialVersionUID = 0L;
-
-    /**
-     * Creates new topology exception with given error message.
-     *
-     * @param msg Error message.
-     */
-    public GridTopologyException(String msg) {
-        super(msg);
-    }
-
-    /**
-     * Creates new topology exception with given error message and optional
-     * nested exception.
-     *
-     * @param msg Error message.
-     * @param cause Optional nested exception (can be {@code null}).
-     */
-    public GridTopologyException(String msg, @Nullable Throwable cause) {
-        super(msg, cause);
-    }
-}

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cd99e620/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/datastructures/GridTransactionalCacheQueueImpl.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/datastructures/GridTransactionalCacheQueueImpl.java
b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/datastructures/GridTransactionalCacheQueueImpl.java
index 6a29f52..520884d 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/datastructures/GridTransactionalCacheQueueImpl.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/datastructures/GridTransactionalCacheQueueImpl.java
@@ -9,6 +9,7 @@
 
 package org.gridgain.grid.kernal.processors.cache.datastructures;
 
+import org.apache.ignite.cluster.*;
 import org.gridgain.grid.*;
 import org.gridgain.grid.cache.*;
 import org.gridgain.grid.cache.datastructures.*;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cd99e620/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridDhtTxLocal.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridDhtTxLocal.java
b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridDhtTxLocal.java
index bf8484f..89574b1 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridDhtTxLocal.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridDhtTxLocal.java
@@ -9,6 +9,7 @@
 
 package org.gridgain.grid.kernal.processors.cache.distributed.dht;
 
+import org.apache.ignite.cluster.*;
 import org.apache.ignite.lang.*;
 import org.gridgain.grid.*;
 import org.gridgain.grid.cache.*;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cd99e620/modules/core/src/main/java/org/gridgain/grid/kernal/processors/streamer/IgniteStreamerImpl.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/streamer/IgniteStreamerImpl.java
b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/streamer/IgniteStreamerImpl.java
index bde0c6f..f9546d9 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/streamer/IgniteStreamerImpl.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/streamer/IgniteStreamerImpl.java
@@ -10,6 +10,7 @@
 package org.gridgain.grid.kernal.processors.streamer;
 
 import org.apache.ignite.*;
+import org.apache.ignite.cluster.*;
 import org.apache.ignite.events.*;
 import org.apache.ignite.lang.*;
 import org.apache.ignite.thread.*;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cd99e620/modules/core/src/main/java/org/gridgain/grid/kernal/visor/node/VisorNodePingTask.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/visor/node/VisorNodePingTask.java
b/modules/core/src/main/java/org/gridgain/grid/kernal/visor/node/VisorNodePingTask.java
index 410f8756..e4725cf 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/visor/node/VisorNodePingTask.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/visor/node/VisorNodePingTask.java
@@ -9,6 +9,7 @@
 
 package org.gridgain.grid.kernal.visor.node;
 
+import org.apache.ignite.cluster.*;
 import org.apache.ignite.compute.*;
 import org.gridgain.grid.*;
 import org.gridgain.grid.kernal.processors.task.*;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cd99e620/modules/core/src/main/java/org/gridgain/grid/util/future/GridCompoundFuture.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/util/future/GridCompoundFuture.java
b/modules/core/src/main/java/org/gridgain/grid/util/future/GridCompoundFuture.java
index a017fd1..d06373b 100644
--- a/modules/core/src/main/java/org/gridgain/grid/util/future/GridCompoundFuture.java
+++ b/modules/core/src/main/java/org/gridgain/grid/util/future/GridCompoundFuture.java
@@ -9,6 +9,7 @@
 
 package org.gridgain.grid.util.future;
 
+import org.apache.ignite.cluster.*;
 import org.apache.ignite.lang.*;
 import org.gridgain.grid.*;
 import org.gridgain.grid.cache.*;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cd99e620/modules/core/src/test/java/org/gridgain/grid/kernal/GridTaskFailoverSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/GridTaskFailoverSelfTest.java
b/modules/core/src/test/java/org/gridgain/grid/kernal/GridTaskFailoverSelfTest.java
index 9b463d2..fe1d1cf 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/GridTaskFailoverSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/GridTaskFailoverSelfTest.java
@@ -9,6 +9,7 @@
 package org.gridgain.grid.kernal;
 
 import org.apache.ignite.*;
+import org.apache.ignite.cluster.*;
 import org.apache.ignite.compute.*;
 import org.apache.ignite.resources.*;
 import org.gridgain.grid.*;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cd99e620/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheAbstractFailoverSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheAbstractFailoverSelfTest.java
b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheAbstractFailoverSelfTest.java
index 7fcac63..26b20e3 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheAbstractFailoverSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheAbstractFailoverSelfTest.java
@@ -10,6 +10,7 @@
 package org.gridgain.grid.kernal.processors.cache;
 
 import org.apache.ignite.*;
+import org.apache.ignite.cluster.*;
 import org.apache.ignite.configuration.*;
 import org.apache.ignite.lang.*;
 import org.apache.ignite.resources.*;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cd99e620/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheAbstractSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheAbstractSelfTest.java
b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheAbstractSelfTest.java
index 3d42c55..d3363f9 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheAbstractSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheAbstractSelfTest.java
@@ -9,6 +9,7 @@
 
 package org.gridgain.grid.kernal.processors.cache;
 
+import org.apache.ignite.cluster.*;
 import org.apache.ignite.configuration.*;
 import org.apache.ignite.lang.*;
 import org.apache.ignite.marshaller.optimized.*;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cd99e620/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/GridCacheAbstractNodeRestartSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/GridCacheAbstractNodeRestartSelfTest.java
b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/GridCacheAbstractNodeRestartSelfTest.java
index 523f0a0..a2c4831 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/GridCacheAbstractNodeRestartSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/GridCacheAbstractNodeRestartSelfTest.java
@@ -10,8 +10,8 @@
 package org.gridgain.grid.kernal.processors.cache.distributed;
 
 import org.apache.ignite.*;
+import org.apache.ignite.cluster.*;
 import org.apache.ignite.configuration.*;
-import org.gridgain.grid.*;
 import org.gridgain.grid.cache.*;
 import org.gridgain.grid.spi.discovery.tcp.*;
 import org.gridgain.grid.spi.discovery.tcp.ipfinder.*;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cd99e620/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCacheNearOnlyTopologySelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCacheNearOnlyTopologySelfTest.java
b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCacheNearOnlyTopologySelfTest.java
index e65a065..440dad5 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCacheNearOnlyTopologySelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCacheNearOnlyTopologySelfTest.java
@@ -12,7 +12,6 @@ package org.gridgain.grid.kernal.processors.cache.distributed.near;
 import org.apache.ignite.*;
 import org.apache.ignite.cluster.*;
 import org.apache.ignite.configuration.*;
-import org.gridgain.grid.*;
 import org.gridgain.grid.cache.*;
 import org.gridgain.grid.spi.discovery.tcp.*;
 import org.gridgain.grid.spi.discovery.tcp.ipfinder.*;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cd99e620/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCachePartitionedClientOnlyNoPrimaryFullApiSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCachePartitionedClientOnlyNoPrimaryFullApiSelfTest.java
b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCachePartitionedClientOnlyNoPrimaryFullApiSelfTest.java
index cca4875..9612585 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCachePartitionedClientOnlyNoPrimaryFullApiSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCachePartitionedClientOnlyNoPrimaryFullApiSelfTest.java
@@ -9,6 +9,7 @@
 
 package org.gridgain.grid.kernal.processors.cache.distributed.near;
 
+import org.apache.ignite.cluster.*;
 import org.apache.ignite.lang.*;
 import org.gridgain.grid.*;
 import org.gridgain.grid.cache.*;


Mime
View raw message