sprint-1 - Renaming ManagedServices to IgniteServices.

apache · Feb 6, 2015 · 9200ef5 · 9200ef5
1 parent ce0c304
commit 9200ef5
Show file tree

Hide file tree

Showing 72 changed files with 366 additions and 376 deletions.
diff --git a/...ples/compute/ComputeBroadcastExample.java → .../computegrid/ComputeBroadcastExample.java b/...ples/compute/ComputeBroadcastExample.java → .../computegrid/ComputeBroadcastExample.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.ignite.examples.compute;
+package org.apache.ignite.examples.computegrid;
 
 import org.apache.ignite.*;
 import org.apache.ignite.examples.*;

diff --git a/...mples/compute/ComputeCallableExample.java → ...s/computegrid/ComputeCallableExample.java b/...mples/compute/ComputeCallableExample.java → ...s/computegrid/ComputeCallableExample.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.ignite.examples.compute;
+package org.apache.ignite.examples.computegrid;
 
 import org.apache.ignite.*;
 import org.apache.ignite.examples.*;

diff --git a/...amples/compute/ComputeClosureExample.java → ...es/computegrid/ComputeClosureExample.java b/...amples/compute/ComputeClosureExample.java → ...es/computegrid/ComputeClosureExample.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.ignite.examples.compute;
+package org.apache.ignite.examples.computegrid;
 
 import org.apache.ignite.*;
 import org.apache.ignite.examples.*;

diff --git a/...mpute/ComputeContinuousMapperExample.java → ...egrid/ComputeContinuousMapperExample.java b/...mpute/ComputeContinuousMapperExample.java → ...egrid/ComputeContinuousMapperExample.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.ignite.examples.compute;
+package org.apache.ignite.examples.computegrid;
 
 import org.apache.ignite.*;
 import org.apache.ignite.cluster.*;

diff --git a/...ompute/ComputeExecutorServiceExample.java → ...tegrid/ComputeExecutorServiceExample.java b/...ompute/ComputeExecutorServiceExample.java → ...tegrid/ComputeExecutorServiceExample.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.ignite.examples.compute;
+package org.apache.ignite.examples.computegrid;
 
 import org.apache.ignite.*;
 import org.apache.ignite.examples.*;

diff --git a/.../ComputeFibonacciContinuationExample.java → .../ComputeFibonacciContinuationExample.java b/.../ComputeFibonacciContinuationExample.java → .../ComputeFibonacciContinuationExample.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.ignite.examples.compute;
+package org.apache.ignite.examples.computegrid;
 
 import org.apache.ignite.*;
 import org.apache.ignite.cluster.*;

diff --git a/...les/compute/ComputeProjectionExample.java → ...computegrid/ComputeProjectionExample.java b/...les/compute/ComputeProjectionExample.java → ...computegrid/ComputeProjectionExample.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.ignite.examples.compute;
+package org.apache.ignite.examples.computegrid;
 
 import org.apache.ignite.*;
 import org.apache.ignite.cluster.*;

diff --git a/...amples/compute/ComputeReducerExample.java → ...es/computegrid/ComputeReducerExample.java b/...amples/compute/ComputeReducerExample.java → ...es/computegrid/ComputeReducerExample.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.ignite.examples.compute;
+package org.apache.ignite.examples.computegrid;
 
 import org.apache.ignite.*;
 import org.apache.ignite.examples.*;

diff --git a/...mples/compute/ComputeRunnableExample.java → ...s/computegrid/ComputeRunnableExample.java b/...mples/compute/ComputeRunnableExample.java → ...s/computegrid/ComputeRunnableExample.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.ignite.examples.compute;
+package org.apache.ignite.examples.computegrid;
 
 import org.apache.ignite.*;
 import org.apache.ignite.examples.*;

diff --git a/...mples/compute/ComputeScheduleExample.java → ...s/computegrid/ComputeScheduleExample.java b/...mples/compute/ComputeScheduleExample.java → ...s/computegrid/ComputeScheduleExample.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.ignite.examples.compute;
+package org.apache.ignite.examples.computegrid;
 
 import org.apache.ignite.*;
 import org.apache.ignite.examples.*;

diff --git a/...amples/compute/ComputeTaskMapExample.java → ...es/computegrid/ComputeTaskMapExample.java b/...amples/compute/ComputeTaskMapExample.java → ...es/computegrid/ComputeTaskMapExample.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.ignite.examples.compute;
+package org.apache.ignite.examples.computegrid;
 
 import org.apache.ignite.*;
 import org.apache.ignite.cluster.*;

diff --git a/...ples/compute/ComputeTaskSplitExample.java → .../computegrid/ComputeTaskSplitExample.java b/...ples/compute/ComputeTaskSplitExample.java → .../computegrid/ComputeTaskSplitExample.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.ignite.examples.compute;
+package org.apache.ignite.examples.computegrid;
 
 import org.apache.ignite.*;
 import org.apache.ignite.compute.*;

diff --git a/...pute/failover/ComputeFailoverExample.java → ...grid/failover/ComputeFailoverExample.java b/...pute/failover/ComputeFailoverExample.java → ...grid/failover/ComputeFailoverExample.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.ignite.examples.compute.failover;
+package org.apache.ignite.examples.computegrid.failover;
 
 import org.apache.ignite.*;
 import org.apache.ignite.compute.*;

diff --git a/.../failover/ComputeFailoverNodeStartup.java → .../failover/ComputeFailoverNodeStartup.java b/.../failover/ComputeFailoverNodeStartup.java → .../failover/ComputeFailoverNodeStartup.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.ignite.examples.compute.failover;
+package org.apache.ignite.examples.computegrid.failover;
 
 import org.apache.ignite.*;
 import org.apache.ignite.configuration.*;

diff --git a/...te/examples/compute/failover/package.html → ...xamples/computegrid/failover/package.html b/...te/examples/compute/failover/package.html → ...xamples/computegrid/failover/package.html
diff --git a/...e/examples/compute/montecarlo/Credit.java → ...amples/computegrid/montecarlo/Credit.java b/...e/examples/compute/montecarlo/Credit.java → ...amples/computegrid/montecarlo/Credit.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.ignite.examples.compute.montecarlo;
+package org.apache.ignite.examples.computegrid.montecarlo;
 
 import java.io.*;
 

diff --git a/...compute/montecarlo/CreditRiskExample.java → ...utegrid/montecarlo/CreditRiskExample.java b/...compute/montecarlo/CreditRiskExample.java → ...utegrid/montecarlo/CreditRiskExample.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.ignite.examples.compute.montecarlo;
+package org.apache.ignite.examples.computegrid.montecarlo;
 
 import org.apache.ignite.*;
 import org.apache.ignite.examples.*;

diff --git a/...compute/montecarlo/CreditRiskManager.java → ...utegrid/montecarlo/CreditRiskManager.java b/...compute/montecarlo/CreditRiskManager.java → ...utegrid/montecarlo/CreditRiskManager.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.ignite.examples.compute.montecarlo;
+package org.apache.ignite.examples.computegrid.montecarlo;
 
 import java.util.*;
 

diff --git a/.../examples/compute/montecarlo/package.html → ...mples/computegrid/montecarlo/package.html b/.../examples/compute/montecarlo/package.html → ...mples/computegrid/montecarlo/package.html
diff --git a/...ache/ignite/examples/compute/package.html → .../ignite/examples/computegrid/package.html b/...ache/ignite/examples/compute/package.html → .../ignite/examples/computegrid/package.html
diff --git a/...tastructures/IgniteAtomicLongExample.java → ...tastructures/IgniteAtomicLongExample.java b/...tastructures/IgniteAtomicLongExample.java → ...tastructures/IgniteAtomicLongExample.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.ignite.examples.datagrid.datastructures;
+package org.apache.ignite.examples.datastructures;
 
 import org.apache.ignite.*;
 import org.apache.ignite.examples.datagrid.*;

diff --git a/...uctures/IgniteAtomicReferenceExample.java → ...uctures/IgniteAtomicReferenceExample.java b/...uctures/IgniteAtomicReferenceExample.java → ...uctures/IgniteAtomicReferenceExample.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.ignite.examples.datagrid.datastructures;
+package org.apache.ignite.examples.datastructures;
 
 import org.apache.ignite.*;
 import org.apache.ignite.examples.datagrid.*;

diff --git a/...ructures/IgniteAtomicSequenceExample.java → ...ructures/IgniteAtomicSequenceExample.java b/...ructures/IgniteAtomicSequenceExample.java → ...ructures/IgniteAtomicSequenceExample.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.ignite.examples.datagrid.datastructures;
+package org.apache.ignite.examples.datastructures;
 
 import org.apache.ignite.*;
 import org.apache.ignite.examples.datagrid.*;

diff --git a/...tructures/IgniteAtomicStampedExample.java → ...tructures/IgniteAtomicStampedExample.java b/...tructures/IgniteAtomicStampedExample.java → ...tructures/IgniteAtomicStampedExample.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.ignite.examples.datagrid.datastructures;
+package org.apache.ignite.examples.datastructures;
 
 import org.apache.ignite.*;
 import org.apache.ignite.examples.datagrid.*;

diff --git a/...ructures/IgniteCountDownLatchExample.java → ...ructures/IgniteCountDownLatchExample.java b/...ructures/IgniteCountDownLatchExample.java → ...ructures/IgniteCountDownLatchExample.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.ignite.examples.datagrid.datastructures;
+package org.apache.ignite.examples.datastructures;
 
 import org.apache.ignite.*;
 import org.apache.ignite.examples.datagrid.*;

diff --git a/...id/datastructures/IgniteQueueExample.java → ...es/datastructures/IgniteQueueExample.java b/...id/datastructures/IgniteQueueExample.java → ...es/datastructures/IgniteQueueExample.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.ignite.examples.datagrid.datastructures;
+package org.apache.ignite.examples.datastructures;
 
 import org.apache.ignite.*;
 import org.apache.ignite.configuration.*;

diff --git a/...grid/datastructures/IgniteSetExample.java → ...ples/datastructures/IgniteSetExample.java b/...grid/datastructures/IgniteSetExample.java → ...ples/datastructures/IgniteSetExample.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.ignite.examples.datagrid.datastructures;
+package org.apache.ignite.examples.datastructures;
 
 import org.apache.ignite.*;
 import org.apache.ignite.configuration.*;

diff --git a/...ples/datagrid/datastructures/package.html → ...nite/examples/datastructures/package.html b/...ples/datagrid/datastructures/package.html → ...nite/examples/datastructures/package.html
diff --git a/...te/examples/services/ServicesExample.java → ...examples/servicegrid/ServicesExample.java b/...te/examples/services/ServicesExample.java → ...examples/servicegrid/ServicesExample.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.ignite.examples.services;
+package org.apache.ignite.examples.servicegrid;
 
 import org.apache.ignite.*;
 import org.apache.ignite.cluster.*;
@@ -57,7 +57,7 @@ public static void main(String[] args) throws Exception {
                 return;
             }
 
-            IgniteManaged svcs = ignite.managed(rmts);
+            IgniteServices svcs = ignite.services(rmts);
 
             try {
                 // Deploy cluster singleton.
@@ -79,7 +79,7 @@ public static void main(String[] args) throws Exception {
             }
             finally {
                 // Undeploy all services.
-                ignite.managed().cancelAll();
+                ignite.services().cancelAll();
             }
         }
     }
@@ -96,7 +96,7 @@ private static void serviceProxyExample(Ignite ignite) throws Exception {
         System.out.println(">>>");
 
         // Get a sticky proxy for node-singleton map service.
-        SimpleMapService<Integer, String> mapSvc = ignite.managed().serviceProxy("myNodeSingletonService", SimpleMapService.class, true);
+        SimpleMapService<Integer, String> mapSvc = ignite.services().serviceProxy("myNodeSingletonService", SimpleMapService.class, true);
 
         int cnt = 10;
 
@@ -126,7 +126,7 @@ private static void serviceInjectionExample(Ignite ignite) throws Exception {
         System.out.println(">>>");
 
         // Get a sticky proxy for cluster-singleton map service.
-        SimpleMapService<Integer, String> mapSvc = ignite.managed().serviceProxy("myClusterSingletonService", SimpleMapService.class, true);
+        SimpleMapService<Integer, String> mapSvc = ignite.services().serviceProxy("myClusterSingletonService", SimpleMapService.class, true);
 
         int cnt = 10;
 

diff --git a/...e/examples/services/SimpleMapService.java → ...xamples/servicegrid/SimpleMapService.java b/...e/examples/services/SimpleMapService.java → ...xamples/servicegrid/SimpleMapService.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.ignite.examples.services;
+package org.apache.ignite.examples.servicegrid;
 
 /**
  * Simple map service.

diff --git a/...amples/services/SimpleMapServiceImpl.java → ...les/servicegrid/SimpleMapServiceImpl.java b/...amples/services/SimpleMapServiceImpl.java → ...les/servicegrid/SimpleMapServiceImpl.java
@@ -15,17 +15,17 @@
  * limitations under the License.
  */
 
-package org.apache.ignite.examples.services;
+package org.apache.ignite.examples.servicegrid;
 
-import org.apache.ignite.managed.*;
+import org.apache.ignite.services.*;
 
 import java.util.*;
 import java.util.concurrent.*;
 
 /**
  * Simple service which loops infinitely and prints out a counter.
  */
-public class SimpleMapServiceImpl<K, V> implements ManagedService, SimpleMapService<K, V> {
+public class SimpleMapServiceImpl<K, V> implements Service, SimpleMapService<K, V> {
     /** Serial version UID. */
     private static final long serialVersionUID = 0L;
 
@@ -53,19 +53,19 @@ public class SimpleMapServiceImpl<K, V> implements ManagedService, SimpleMapServ
     }
 
     /** {@inheritDoc} */
-    @Override public void cancel(ManagedServiceContext ctx) {
+    @Override public void cancel(ServiceContext ctx) {
         System.out.println("Service was cancelled: " + ctx.name());
     }
 
     /** {@inheritDoc} */
-    @Override public void init(ManagedServiceContext ctx) throws Exception {
+    @Override public void init(ServiceContext ctx) throws Exception {
         System.out.println("Service was initialized: " + ctx.name());
 
         map = new ConcurrentHashMap<>();
     }
 
     /** {@inheritDoc} */
-    @Override public void execute(ManagedServiceContext ctx) throws Exception {
+    @Override public void execute(ServiceContext ctx) throws Exception {
         System.out.println("Executing distributed service: " + ctx.name());
     }
 }
diff --git a/examples/src/test/java/org/apache/ignite/examples/BasicExamplesSelfTest.java b/examples/src/test/java/org/apache/ignite/examples/BasicExamplesSelfTest.java
@@ -17,7 +17,7 @@
 
 package org.apache.ignite.examples;
 
-import org.apache.ignite.examples.compute.*;
+import org.apache.ignite.examples.computegrid.*;
 import org.apache.ignite.testframework.junits.common.*;
 
 /**

diff --git a/examples/src/test/java/org/apache/ignite/examples/CacheExamplesSelfTest.java b/examples/src/test/java/org/apache/ignite/examples/CacheExamplesSelfTest.java
@@ -18,7 +18,7 @@
 package org.apache.ignite.examples;
 
 import org.apache.ignite.examples.datagrid.*;
-import org.apache.ignite.examples.datagrid.datastructures.*;
+import org.apache.ignite.examples.datastructures.*;
 import org.apache.ignite.examples.datagrid.starschema.*;
 import org.apache.ignite.examples.datagrid.store.*;
 import org.apache.ignite.testframework.junits.common.*;

diff --git a/examples/src/test/java/org/apache/ignite/examples/CheckpointExamplesSelfTest.java b/examples/src/test/java/org/apache/ignite/examples/CheckpointExamplesSelfTest.java
@@ -17,7 +17,7 @@
 
 package org.apache.ignite.examples;
 
-import org.apache.ignite.examples.compute.failover.*;
+import org.apache.ignite.examples.computegrid.failover.*;
 import org.apache.ignite.testframework.junits.common.*;
 
 /**

diff --git a/examples/src/test/java/org/apache/ignite/examples/ContinuationExamplesSelfTest.java b/examples/src/test/java/org/apache/ignite/examples/ContinuationExamplesSelfTest.java
@@ -17,7 +17,7 @@
 
 package org.apache.ignite.examples;
 
-import org.apache.ignite.examples.compute.*;
+import org.apache.ignite.examples.computegrid.*;
 import org.apache.ignite.testframework.junits.common.*;
 
 /**

diff --git a/examples/src/test/java/org/apache/ignite/examples/ContinuousMapperExamplesSelfTest.java b/examples/src/test/java/org/apache/ignite/examples/ContinuousMapperExamplesSelfTest.java
@@ -17,7 +17,7 @@
 
 package org.apache.ignite.examples;
 
-import org.apache.ignite.examples.compute.*;
+import org.apache.ignite.examples.computegrid.*;
 import org.apache.ignite.testframework.junits.common.*;
 
 /**

diff --git a/examples/src/test/java/org/apache/ignite/examples/MonteCarloExamplesSelfTest.java b/examples/src/test/java/org/apache/ignite/examples/MonteCarloExamplesSelfTest.java
@@ -17,7 +17,7 @@
 
 package org.apache.ignite.examples;
 
-import org.apache.ignite.examples.compute.montecarlo.*;
+import org.apache.ignite.examples.computegrid.montecarlo.*;
 import org.apache.ignite.testframework.junits.common.*;
 
 /**

diff --git a/examples/src/test/java/org/apache/ignite/examples/ProjectionExampleSelfTest.java b/examples/src/test/java/org/apache/ignite/examples/ProjectionExampleSelfTest.java
@@ -17,7 +17,7 @@
 
 package org.apache.ignite.examples;
 
-import org.apache.ignite.examples.compute.*;
+import org.apache.ignite.examples.computegrid.*;
 import org.apache.ignite.testframework.junits.common.*;
 
 /**

diff --git a/examples/src/test/java/org/apache/ignite/examples/TaskExamplesSelfTest.java b/examples/src/test/java/org/apache/ignite/examples/TaskExamplesSelfTest.java
@@ -17,7 +17,7 @@
 
 package org.apache.ignite.examples;
 
-import org.apache.ignite.examples.compute.*;
+import org.apache.ignite.examples.computegrid.*;
 import org.apache.ignite.testframework.junits.common.*;
 
 /**