Payara 1487

appserver/extras/payara-micro/payara-micro-boot/src/main/java/fish/payara/micro/PayaraMicroRuntime.java

@@ -1,7 +1,7 @@
 /*
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
  *
- * Copyright (c) 2016 Payara Foundation and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016-2017 Payara Foundation and/or its affiliates. All rights reserved.
  *
  * The contents of this file are subject to the terms of either the GNU
  * General Public License Version 2 only ("GPL") or the Common Development
@@ -39,11 +39,6 @@
  */
 package fish.payara.micro;
 
-//import fish.payara.appserver.micro.services.CDIEventListener;
-//import fish.payara.appserver.micro.services.PayaraClusterListener;
-//import fish.payara.appserver.micro.services.PayaraClusteredCDIEvent;
-//import fish.payara.appserver.micro.services.command.ClusterCommandResult;
-//import fish.payara.appserver.micro.services.data.InstanceDescriptor;
 import fish.payara.micro.event.PayaraClusteredCDIEvent;
 import fish.payara.micro.event.PayaraClusterListener;
 import fish.payara.micro.event.CDIEventListener;

appserver/payara-appserver-modules/payara-micro-cdi/src/main/java/fish/payara/micro/cdi/extension/PayaraMicroProducer.java

@@ -40,6 +40,8 @@
 package fish.payara.micro.cdi.extension;
 
 import fish.payara.micro.PayaraInstance;
+import fish.payara.micro.PayaraMicro;
+import fish.payara.micro.PayaraMicroRuntime;
 import javax.enterprise.inject.Produces;
 import org.glassfish.internal.api.Globals;
 
@@ -49,14 +51,19 @@
  */
 public class PayaraMicroProducer {
 
-    private final PayaraInstance runtime;
+    private final PayaraInstance instance;
 
     PayaraMicroProducer() {
-        runtime = Globals.getDefaultHabitat().getService(PayaraInstance.class);
+        instance = Globals.getDefaultHabitat().getService(PayaraInstance.class);
     }
 
     @Produces
-    PayaraInstance getRuntime() {
-        return runtime;
+    public PayaraInstance getInstance() {
+        return instance;
+    }
+
+    @Produces
+    public PayaraMicroRuntime getRuntime() {
+        return PayaraMicro.getInstance().getRuntime();
     }
 }

appserver/payara-appserver-modules/payara-micro-service/src/main/java/fish/payara/appserver/micro/services/PayaraInstanceImpl.java

@@ -44,6 +44,7 @@ and Distribution License("CDDL") (collectively, the "License").  You
 import java.util.Set;
 import java.util.concurrent.Callable;
 import java.util.concurrent.Future;
+import java.util.concurrent.TimeUnit;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 import javax.annotation.PostConstruct;
@@ -122,6 +123,8 @@ public void setInstanceName(String instanceName) {
         this.instanceName = instanceName;
         me.setInstanceName(instanceName);
     }
+
+
 
     @Override
     public <T extends Serializable> Map<String, Future<T>> runCallable(Collection<String> memberUUIDS, Callable<T> callable) {
@@ -130,7 +133,7 @@ public <T extends Serializable> Map<String, Future<T>> runCallable(Collection<St
 
     @Override
     public <T extends Serializable> Map<String, Future<T>> runCallable(Callable<T> callable) {
-        return cluster.getExecService().runCallable(callable);
+        return cluster.getExecService().runCallableAllMembers(callable);
     }
 
     @Override
@@ -141,7 +144,7 @@ public ClusterCommandResult executeLocalAsAdmin(String command, String... parame
     @Override
     public Map<String, Future<ClusterCommandResult>> executeClusteredASAdmin(String command, String... parameters) {
         AsAdminCallable callable = new AsAdminCallable(command, parameters);
-        Map<String, Future<ClusterCommandResult>> result = cluster.getExecService().runCallable(callable);
+        Map<String, Future<ClusterCommandResult>> result = cluster.getExecService().runCallableAllMembers(callable);
         return result;
     }
 
@@ -187,7 +190,7 @@ void postConstruct() {
         events.register(this);
         myListeners = new HashSet<>(1);
         myCDIListeners = new HashSet<>(1);       
-        initialiseInstanceDescriptor();   
+        initialiseInstanceDescriptor();
     }
 
     /**