ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sboi...@apache.org
Subject [17/50] [abbrv] incubator-ignite git commit: # sprint-1 Fixed class names
Date Tue, 27 Jan 2015 10:55:59 GMT
# sprint-1 Fixed class names


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

Branch: refs/heads/ignite-99-2
Commit: e0ba6a3c280f60d929910f27c9112c4b104d4738
Parents: 24c504b
Author: sboikov <sboikov@gridgain.com>
Authored: Mon Jan 26 09:58:52 2015 +0300
Committer: sboikov <sboikov@gridgain.com>
Committed: Mon Jan 26 09:58:52 2015 +0300

----------------------------------------------------------------------
 .../optimized/GridOptimizedMarshallerTest.java  |  4 +-
 modules/extdata/p2p/META-INF/gridgain.xml       |  2 +-
 .../tests/p2p/GridSingleSplitTestTask.java      | 76 --------------------
 .../ignite/tests/p2p/SingleSplitTestTask.java   | 76 ++++++++++++++++++++
 4 files changed, 79 insertions(+), 79 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/e0ba6a3c/modules/core/src/test/java/org/apache/ignite/marshaller/optimized/GridOptimizedMarshallerTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/marshaller/optimized/GridOptimizedMarshallerTest.java
b/modules/core/src/test/java/org/apache/ignite/marshaller/optimized/GridOptimizedMarshallerTest.java
index 1d133b2..935b531 100644
--- a/modules/core/src/test/java/org/apache/ignite/marshaller/optimized/GridOptimizedMarshallerTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/marshaller/optimized/GridOptimizedMarshallerTest.java
@@ -320,8 +320,8 @@ public class GridOptimizedMarshallerTest extends GridCommonAbstractTest
{
         try {
             Ignite ignite = startGridsMultiThreaded(2);
 
-            String taskClsName = "org.gridgain.grid.tests.p2p.GridSingleSplitTestTask";
-            String jobClsName = "org.gridgain.grid.tests.p2p.GridSingleSplitTestTask$GridSingleSplitTestJob";
+            String taskClsName = "org.apache.ignite.tests.p2p.SingleSplitTestTask";
+            String jobClsName = "org.apache.ignite.tests.p2p.SingleSplitTestTask$SingleSplitTestJob";
 
             ClassLoader ldr = getExternalClassLoader();
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/e0ba6a3c/modules/extdata/p2p/META-INF/gridgain.xml
----------------------------------------------------------------------
diff --git a/modules/extdata/p2p/META-INF/gridgain.xml b/modules/extdata/p2p/META-INF/gridgain.xml
index 7fc7851..6ff181c 100644
--- a/modules/extdata/p2p/META-INF/gridgain.xml
+++ b/modules/extdata/p2p/META-INF/gridgain.xml
@@ -35,6 +35,6 @@
     <util:list id="tasks">
         <value>org.apache.ignite.tests.p2p.P2PTestTaskExternalPath1</value>
         <value>org.apache.ignite.tests.p2p.GridP2PTestTaskExternalPath2</value>
-        <value>org.apache.ignite.tests.p2p.GridSingleSplitTestTask</value>
+        <value>org.apache.ignite.tests.p2p.SingleSplitTestTask</value>
     </util:list>
 </beans>

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/e0ba6a3c/modules/extdata/p2p/src/main/java/org/apache/ignite/tests/p2p/GridSingleSplitTestTask.java
----------------------------------------------------------------------
diff --git a/modules/extdata/p2p/src/main/java/org/apache/ignite/tests/p2p/GridSingleSplitTestTask.java
b/modules/extdata/p2p/src/main/java/org/apache/ignite/tests/p2p/GridSingleSplitTestTask.java
deleted file mode 100644
index 298cf24..0000000
--- a/modules/extdata/p2p/src/main/java/org/apache/ignite/tests/p2p/GridSingleSplitTestTask.java
+++ /dev/null
@@ -1,76 +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.
- */
-
-package org.apache.ignite.tests.p2p;
-
-import org.apache.ignite.*;
-import org.apache.ignite.compute.*;
-
-import java.io.*;
-import java.util.*;
-
-/**
- * Test task for P2P deployment tests.
- */
-public class GridSingleSplitTestTask extends ComputeTaskSplitAdapter<Integer, Integer>
{
-    /**
-     * {@inheritDoc}
-     */
-    @Override protected Collection<? extends ComputeJob> split(int gridSize, Integer
arg) throws IgniteCheckedException {
-        assert gridSize > 0 : "Subgrid cannot be empty.";
-
-        Collection<ComputeJobAdapter> jobs = new ArrayList<>(gridSize);
-
-        for (int i = 0; i < arg; i++)
-            jobs.add(new GridSingleSplitTestJob(1));
-
-        return jobs;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override public Integer reduce(List<ComputeJobResult> results) throws IgniteCheckedException
{
-        int retVal = 0;
-
-        for (ComputeJobResult res : results) {
-            assert res.getException() == null : "Load test jobs can never fail: " + res;
-
-            retVal += (Integer)res.getData();
-        }
-
-        return retVal;
-    }
-
-    /**
-     * Test job for P2P deployment tests.
-     */
-    @SuppressWarnings("PublicInnerClass")
-    public static final class GridSingleSplitTestJob extends ComputeJobAdapter {
-        /**
-         * @param args Job arguments.
-         */
-        public GridSingleSplitTestJob(Integer args) {
-            super(args);
-        }
-
-        /** {@inheritDoc} */
-        @Override public Serializable execute() {
-            return new GridSingleSplitTestJobTarget().executeLoadTestJob((Integer)argument(0));
-        }
-    }
-}

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/e0ba6a3c/modules/extdata/p2p/src/main/java/org/apache/ignite/tests/p2p/SingleSplitTestTask.java
----------------------------------------------------------------------
diff --git a/modules/extdata/p2p/src/main/java/org/apache/ignite/tests/p2p/SingleSplitTestTask.java
b/modules/extdata/p2p/src/main/java/org/apache/ignite/tests/p2p/SingleSplitTestTask.java
new file mode 100644
index 0000000..29e5e17
--- /dev/null
+++ b/modules/extdata/p2p/src/main/java/org/apache/ignite/tests/p2p/SingleSplitTestTask.java
@@ -0,0 +1,76 @@
+/*
+ * 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.
+ */
+
+package org.apache.ignite.tests.p2p;
+
+import org.apache.ignite.*;
+import org.apache.ignite.compute.*;
+
+import java.io.*;
+import java.util.*;
+
+/**
+ * Test task for P2P deployment tests.
+ */
+public class SingleSplitTestTask extends ComputeTaskSplitAdapter<Integer, Integer>
{
+    /**
+     * {@inheritDoc}
+     */
+    @Override protected Collection<? extends ComputeJob> split(int gridSize, Integer
arg) throws IgniteCheckedException {
+        assert gridSize > 0 : "Subgrid cannot be empty.";
+
+        Collection<ComputeJobAdapter> jobs = new ArrayList<>(gridSize);
+
+        for (int i = 0; i < arg; i++)
+            jobs.add(new SingleSplitTestJob(1));
+
+        return jobs;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override public Integer reduce(List<ComputeJobResult> results) throws IgniteCheckedException
{
+        int retVal = 0;
+
+        for (ComputeJobResult res : results) {
+            assert res.getException() == null : "Load test jobs can never fail: " + res;
+
+            retVal += (Integer)res.getData();
+        }
+
+        return retVal;
+    }
+
+    /**
+     * Test job for P2P deployment tests.
+     */
+    @SuppressWarnings("PublicInnerClass")
+    public static final class SingleSplitTestJob extends ComputeJobAdapter {
+        /**
+         * @param args Job arguments.
+         */
+        public SingleSplitTestJob(Integer args) {
+            super(args);
+        }
+
+        /** {@inheritDoc} */
+        @Override public Serializable execute() {
+            return new GridSingleSplitTestJobTarget().executeLoadTestJob((Integer)argument(0));
+        }
+    }
+}


Mime
View raw message