This commit is contained in:
Lucio Lelii 2009-01-14 18:55:26 +00:00
parent ea99ae85e0
commit 6aeec21d60
2 changed files with 7 additions and 9 deletions

View File

@ -13,17 +13,14 @@ import javax.xml.xpath.XPath;
import javax.xml.xpath.XPathConstants; import javax.xml.xpath.XPathConstants;
import javax.xml.xpath.XPathExpressionException; import javax.xml.xpath.XPathExpressionException;
import javax.xml.xpath.XPathFactory; import javax.xml.xpath.XPathFactory;
import org.gcube.common.core.contexts.GHNContext;
import org.gcube.common.core.faults.GCUBEFault; import org.gcube.common.core.faults.GCUBEFault;
import org.gcube.common.core.informationsystem.publisher.ISPublisher; import org.gcube.common.core.informationsystem.publisher.ISPublisher;
import org.gcube.common.core.resources.GCUBECollection; 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.GCUBEMCollection;
import org.gcube.common.core.resources.impl.kxml.KGCUBEResource; import org.gcube.common.core.resources.impl.kxml.KGCUBEResource;
import org.gcube.common.core.scope.GCUBEScope; import org.gcube.common.core.scope.GCUBEScope;
import org.gcube.common.core.utils.handlers.GCUBEServiceClientImpl; import org.gcube.common.core.utils.handlers.GCUBEServiceClientImpl;
import org.gcube.common.core.utils.logging.GCUBELog; 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.AddResourcesParameters;
import org.gcube.vremanagement.vremanager.stubs.vremanager.OptionsParameters; import org.gcube.vremanagement.vremanager.stubs.vremanager.OptionsParameters;
import org.gcube.vremanagement.vremanager.stubs.vremanager.ResourceItem; 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.db.DBInterface;
import org.gcube.vremanagement.vremodeler.impl.ModelerContext; import org.gcube.vremanagement.vremodeler.impl.ModelerContext;
import org.gcube.vremanagement.vremodeler.impl.ModelerResource; 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.Couple;
import org.gcube.vremanagement.vremodeler.impl.util.VREManagerServiceHandler; import org.gcube.vremanagement.vremodeler.impl.util.VREManagerServiceHandler;
import org.globus.wsrf.ResourceException; import org.globus.wsrf.ResourceException;
@ -100,7 +98,7 @@ public class DeployVRE extends Thread{
@Override @Override
protected String makeCall(VREManagerPortType mbportType) protected String makeCall(VREManagerPortType mbportType)
throws Exception { throws Exception {
System.out.println("makeCall called"); //System.out.println("makeCall called");
try{ try{
AddResourcesParameters arp= new AddResourcesParameters(); AddResourcesParameters arp= new AddResourcesParameters();
ServiceList services= new ServiceList(); ServiceList services= new ServiceList();
@ -118,13 +116,13 @@ public class DeployVRE extends Thread{
String report; String report;
int attempt=0; int attempt=0;
do{ do{
Thread.currentThread().sleep(30000); Thread.currentThread().sleep(20000);
report=mbportType.getReport(reportId); report=mbportType.getReport(reportId);
attempt++; attempt++;
getResource().setReportFirstStep(report); getResource().setReportFirstStep(report);
System.out.println("---------"); /*System.out.println("---------");
System.out.println(report); System.out.println(report);
System.out.println("---------"); System.out.println("---------");*/
}while (!isDeploymentStatusFinished(report) && attempt<10); }while (!isDeploymentStatusFinished(report) && attempt<10);
}catch(Exception e){e.printStackTrace(); throw e;} }catch(Exception e){e.printStackTrace(); throw e;}
return ""; return "";

View File

@ -52,7 +52,7 @@ public abstract class VREManagerServiceHandler<T, P> extends GCUBEServiceHandler
List<EndpointReferenceType> eprs = new ArrayList<EndpointReferenceType>(); List<EndpointReferenceType> eprs = new ArrayList<EndpointReferenceType>();
for (GCUBERunningInstance instance : client.execute(query, scope)) for (GCUBERunningInstance instance : client.execute(query, scope))
eprs.add(instance.getAccessPoint().getEndpoint("gcube/vremanagement/VREManager")); eprs.add(instance.getAccessPoint().getEndpoint("gcube/vremanagement/VREManager"));
System.out.println(eprs.size());
return eprs; return eprs;
}catch(Exception e){e.printStackTrace(); throw e;} }catch(Exception e){e.printStackTrace(); throw e;}
} }
@ -62,7 +62,7 @@ public abstract class VREManagerServiceHandler<T, P> extends GCUBEServiceHandler
protected void interact(EndpointReferenceType arg0) throws Exception{ protected void interact(EndpointReferenceType arg0) throws Exception{
VREManagerPortType mbpt= null; VREManagerPortType mbpt= null;
System.out.println("interact called");
try{ try{
VREManagerServiceAddressingLocator mbsal= new VREManagerServiceAddressingLocator(); VREManagerServiceAddressingLocator mbsal= new VREManagerServiceAddressingLocator();
mbpt= mbsal.getVREManagerPortTypePort(arg0); mbpt= mbsal.getVREManagerPortTypePort(arg0);