diff --git a/src/org/gcube/vremanagement/vremodeler/impl/thread/DeployVRE.java b/src/org/gcube/vremanagement/vremodeler/impl/thread/DeployVRE.java index b1bee84..80119b9 100644 --- a/src/org/gcube/vremanagement/vremodeler/impl/thread/DeployVRE.java +++ b/src/org/gcube/vremanagement/vremodeler/impl/thread/DeployVRE.java @@ -13,17 +13,14 @@ import javax.xml.xpath.XPath; import javax.xml.xpath.XPathConstants; import javax.xml.xpath.XPathExpressionException; import javax.xml.xpath.XPathFactory; -import org.gcube.common.core.contexts.GHNContext; import org.gcube.common.core.faults.GCUBEFault; import org.gcube.common.core.informationsystem.publisher.ISPublisher; import org.gcube.common.core.resources.GCUBECollection; -import org.gcube.common.core.resources.GCUBEGenericResource; import org.gcube.common.core.resources.GCUBEMCollection; import org.gcube.common.core.resources.impl.kxml.KGCUBEResource; import org.gcube.common.core.scope.GCUBEScope; import org.gcube.common.core.utils.handlers.GCUBEServiceClientImpl; import org.gcube.common.core.utils.logging.GCUBELog; -import org.gcube.common.vremanagement.ghnmanager.impl.contexts.ServiceContext; import org.gcube.vremanagement.vremanager.stubs.vremanager.AddResourcesParameters; import org.gcube.vremanagement.vremanager.stubs.vremanager.OptionsParameters; import org.gcube.vremanagement.vremanager.stubs.vremanager.ResourceItem; @@ -35,6 +32,7 @@ import org.gcube.vremanagement.vremanager.stubs.vremanager.VREManagerPortType; import org.gcube.vremanagement.vremodeler.db.DBInterface; import org.gcube.vremanagement.vremodeler.impl.ModelerContext; import org.gcube.vremanagement.vremodeler.impl.ModelerResource; +import org.gcube.vremanagement.vremodeler.impl.ServiceContext; import org.gcube.vremanagement.vremodeler.impl.util.Couple; import org.gcube.vremanagement.vremodeler.impl.util.VREManagerServiceHandler; import org.globus.wsrf.ResourceException; @@ -100,7 +98,7 @@ public class DeployVRE extends Thread{ @Override protected String makeCall(VREManagerPortType mbportType) throws Exception { - System.out.println("makeCall called"); + //System.out.println("makeCall called"); try{ AddResourcesParameters arp= new AddResourcesParameters(); ServiceList services= new ServiceList(); @@ -118,13 +116,13 @@ public class DeployVRE extends Thread{ String report; int attempt=0; do{ - Thread.currentThread().sleep(30000); + Thread.currentThread().sleep(20000); report=mbportType.getReport(reportId); attempt++; getResource().setReportFirstStep(report); - System.out.println("---------"); + /*System.out.println("---------"); System.out.println(report); - System.out.println("---------"); + System.out.println("---------");*/ }while (!isDeploymentStatusFinished(report) && attempt<10); }catch(Exception e){e.printStackTrace(); throw e;} return ""; diff --git a/src/org/gcube/vremanagement/vremodeler/impl/util/VREManagerServiceHandler.java b/src/org/gcube/vremanagement/vremodeler/impl/util/VREManagerServiceHandler.java index 2f48158..7e36a9e 100644 --- a/src/org/gcube/vremanagement/vremodeler/impl/util/VREManagerServiceHandler.java +++ b/src/org/gcube/vremanagement/vremodeler/impl/util/VREManagerServiceHandler.java @@ -52,7 +52,7 @@ public abstract class VREManagerServiceHandler extends GCUBEServiceHandler List eprs = new ArrayList(); for (GCUBERunningInstance instance : client.execute(query, scope)) eprs.add(instance.getAccessPoint().getEndpoint("gcube/vremanagement/VREManager")); - System.out.println(eprs.size()); + return eprs; }catch(Exception e){e.printStackTrace(); throw e;} } @@ -62,7 +62,7 @@ public abstract class VREManagerServiceHandler extends GCUBEServiceHandler protected void interact(EndpointReferenceType arg0) throws Exception{ VREManagerPortType mbpt= null; - System.out.println("interact called"); + try{ VREManagerServiceAddressingLocator mbsal= new VREManagerServiceAddressingLocator(); mbpt= mbsal.getVREManagerPortTypePort(arg0);