From d756cc37f042ed34cc31bee5e52813d2307c3e8f Mon Sep 17 00:00:00 2001 From: Lucio Lelii Date: Tue, 21 Oct 2008 17:09:24 +0000 Subject: [PATCH] git-svn-id: http://svn.research-infrastructures.eu/public/d4science/gcube/trunk/vre-management/VREModeler@5224 82a268e6-3cf1-43bd-a215-b396298e98cf --- .classpath | 8 ++ .project | 17 +++ build.xml | 8 +- schema/ModelerFactory.wsdl | 38 ++--- schema/ModelerService.wsdl | 122 ++++++++-------- .../vremodeler/db/IStoDBUtil.java | 50 ++----- .../vremodeler/impl/ModelFactoryService.java | 11 +- .../vremodeler/impl/ModelerService.java | 131 ++++++++++-------- .../vremodeler/impl/ServiceContext.java | 3 + .../vremodeler/impl/XMLUtil.java | 24 ++-- 10 files changed, 211 insertions(+), 201 deletions(-) create mode 100644 .classpath create mode 100644 .project diff --git a/.classpath b/.classpath new file mode 100644 index 0000000..c5a19a7 --- /dev/null +++ b/.classpath @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/.project b/.project new file mode 100644 index 0000000..b542e96 --- /dev/null +++ b/.project @@ -0,0 +1,17 @@ + + + VREModeler + + + + + + org.eclipse.jdt.core.javabuilder + + + + + + org.eclipse.jdt.core.javanature + + diff --git a/build.xml b/build.xml index 5f3c962..c7504be 100644 --- a/build.xml +++ b/build.xml @@ -153,13 +153,7 @@ etics.build: (optional) Set to 'true', it indicates that build structures a - - - - - - - + diff --git a/schema/ModelerFactory.wsdl b/schema/ModelerFactory.wsdl index f8e4050..d7b9cb7 100644 --- a/schema/ModelerFactory.wsdl +++ b/schema/ModelerFactory.wsdl @@ -32,8 +32,8 @@ - - + + @@ -41,10 +41,10 @@ - + - + @@ -72,11 +72,11 @@ - - + + - - + + @@ -84,11 +84,11 @@ - - + + - - + + @@ -108,9 +108,9 @@ - - - + + + @@ -118,14 +118,14 @@ - + - - - + + + diff --git a/schema/ModelerService.wsdl b/schema/ModelerService.wsdl index aeda9de..a1bb389 100644 --- a/schema/ModelerService.wsdl +++ b/schema/ModelerService.wsdl @@ -32,24 +32,24 @@ - + - + - + - - - - + + + + - + - + @@ -111,27 +111,27 @@ - + - + - + - + - + - + - + - + - + - + @@ -159,18 +159,18 @@ ============================================================--> - - + + - - + + - - + + - - + + @@ -230,32 +230,32 @@ - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + @@ -271,14 +271,14 @@ wsrp:ResourceProperties="tns:ModelerProperties" wsdlpp:extends="provider:GCUBEProvider"> - - - + + + - - - + + + @@ -324,24 +324,24 @@ - - - + + + - - - + + + - - - + + + - - - + + + diff --git a/src/org/gcube/vremanagement/vremodeler/db/IStoDBUtil.java b/src/org/gcube/vremanagement/vremodeler/db/IStoDBUtil.java index 7fa4c2b..b435b79 100644 --- a/src/org/gcube/vremanagement/vremodeler/db/IStoDBUtil.java +++ b/src/org/gcube/vremanagement/vremodeler/db/IStoDBUtil.java @@ -1,27 +1,15 @@ package org.gcube.vremanagement.vremodeler.db; -import java.io.StringReader; import java.rmi.RemoteException; -import java.sql.ResultSet; import java.sql.SQLException; import java.util.ArrayList; -import java.util.LinkedList; import java.util.List; -import java.util.regex.Matcher; -import java.util.regex.Pattern; -import javax.xml.parsers.DocumentBuilder; -import javax.xml.parsers.DocumentBuilderFactory; import org.apache.axis.components.uuid.UUIDGen; import org.apache.axis.components.uuid.UUIDGenFactory; -import org.apache.axis.message.addressing.AttributedURI; import org.apache.axis.message.addressing.EndpointReferenceType; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; import org.gcube.common.core.contexts.GHNContext; import org.gcube.common.core.faults.GCUBEFault; -import org.gcube.common.core.informationsystem.client.AtomicCondition; import org.gcube.common.core.informationsystem.client.ISClient; -import org.gcube.common.core.informationsystem.client.ISQuery; import org.gcube.common.core.informationsystem.client.queries.GCUBECSQuery; import org.gcube.common.core.informationsystem.client.queries.GCUBECollectionQuery; import org.gcube.common.core.informationsystem.client.queries.GCUBEGHNQuery; @@ -32,18 +20,10 @@ import org.gcube.common.core.resources.GCUBECS; import org.gcube.common.core.resources.GCUBECollection; import org.gcube.common.core.resources.GCUBEHostingNode; import org.gcube.common.core.resources.GCUBEMCollection; -import org.gcube.common.core.resources.GCUBEResource; import org.gcube.common.core.resources.GCUBERunningInstance; import org.gcube.common.core.resources.GCUBEService; import org.gcube.common.core.scope.GCUBEScope; import org.gcube.common.core.utils.logging.GCUBELog; -import org.gcube.vremanagement.vremodeler.impl.ModelFactoryService; -import org.globus.axis.gsi.GSIConstants; -import org.gridforum.jgss.ExtendedGSSCredential; -import org.w3c.dom.Document; -import org.w3c.dom.Element; -import org.w3c.dom.NodeList; -import org.xml.sax.InputSource; /** * @@ -193,10 +173,10 @@ public class IStoDBUtil { //preparing collectionList to insert //table declaration: //COLLECTION(ID VARCHAR NOT NULL PRIMARY KEY,NAME VARCHAR,DESCRIPTION VARCHAR,MEMBERS VARCHAR,CREATION VARCHAR,LASTUPDATE VARCHAR) - List> values = new LinkedList>(); + List> values = new ArrayList>(collectionList.size()); List row; for (GCUBECollection col: collectionList ){ - row= new LinkedList(); + row= new ArrayList(6); row.add(col.getID()); row.add(col.getName()); row.add(col.getDescription()); @@ -237,10 +217,10 @@ public class IStoDBUtil { //preparing collectionList to insert //table declaration: //MDCOLLECTION(ID VARCHAR NOT NULL PRIMARY KEY,NAME VARCHAR,DESCRIPTION VARCHAR,RELATEDCOLLECTIONID VARCHAR NOT NULL) - List> values = new LinkedList>(); + List> values = new ArrayList>(collectionList.size()); List row; for (GCUBEMCollection col: collectionList ){ - row= new LinkedList(); + row= new ArrayList(4); row.add(col.getID()); row.add(col.getName()); row.add(col.getDescription()); @@ -438,10 +418,10 @@ public class IStoDBUtil { //preparing collectionList to insert //table declaration: //TABLE CS(ID VARCHAR NOT NULL PRIMARY KEY, NAME VARCHAR NOT NULL, DESCRIPTION VARCHAR NOT NULL) - List> values = new LinkedList>(); + List> values = new ArrayList>(csList.size()); List row; for (GCUBECS cs: csList ){ - row= new LinkedList(); + row= new ArrayList(3); row.add(cs.getID()); row.add(cs.getProcessName()); row.add(cs.getDescription()); @@ -464,7 +444,7 @@ public class IStoDBUtil { private static void insertGHN(GCUBEScope scope) throws GCUBEFault { List ghnList= null; - List riTotalList= new LinkedList();; + List riTotalList= new ArrayList();; try{ if (queryClient==null) queryClient= GHNContext.getImplementation(ISClient.class); GCUBEGHNQuery query= queryClient.getQuery(GCUBEGHNQuery.class); @@ -480,10 +460,10 @@ public class IStoDBUtil { //preparing collectionList to insert //table declaration: //TABLE DHN(ID VARCHAR NOT NULL PRIMARY KEY,HOST VARCHAR,SECURITY VARCHAR,UPTIME VARCHAR,MAINMEMORYVA VARCHAR,MAINMEMORYVS VARCHAR,LOCALAS VARCHAR,LOCATION VARCHAR,COUNTRY VARCHAR,DOMAIN VARCHAR) - List> values = new LinkedList>(); + List> values = new ArrayList>(ghnList.size()); List row; for (GCUBEHostingNode ghn: ghnList ){ - row= new LinkedList(); + row= new ArrayList(10); String id= ghn.getID(); row.add(id); row.add(ghn.getNodeDescription().getName()); @@ -513,20 +493,20 @@ public class IStoDBUtil { //RUNNINGINSTANCE(ID VARCHAR NOT NULL PRIMARY KEY,NAME VARCHAR NOT NULL, CLASS VARCHAR NOT NULL) //GHNRELATEDRI(DHNID VARCHAR NOT NULL,RIID VARCHAR NOT NULL,PRIMARY KEY(DHNID,RIID)) if (riTotalList!=null & riTotalList.size()>0){ - riValues = new LinkedList>(); + riValues = new ArrayList>(); List riRow; - riRelatedGHNvalues = new LinkedList>(); + riRelatedGHNvalues = new ArrayList>(riTotalList.size()); List riRelatedGHNrow; for (GCUBERunningInstance ri :riTotalList){ - riRow= new LinkedList(); + riRow= new ArrayList(3); riRow.add(ri.getID()); riRow.add(ri.getServiceName()); riRow.add(ri.getServiceClass()); riValues.add(riRow); - riRelatedGHNrow= new LinkedList(); + riRelatedGHNrow= new ArrayList(); riRelatedGHNrow.add(ri.getGHNID()); riRelatedGHNrow.add(ri.getID()); riRelatedGHNvalues.add(riRelatedGHNrow); @@ -559,10 +539,10 @@ public class IStoDBUtil { //table declaration: // RELATEDSERVICEID(ID VARCHAR NOT NULL PRIMARY KEY,NAME VARCHAR NOT NULL,CLASS VARCHAR NOT NULL) //this table represent the service available on the IS - List> values = new LinkedList>(); + List> values = new ArrayList>(serviceList.size()); List row; for (GCUBEService service: serviceList ){ - row = new LinkedList(); + row = new ArrayList(3); row.add(service.getID()); row.add(service.getServiceName()); row.add(service.getServiceClass()); diff --git a/src/org/gcube/vremanagement/vremodeler/impl/ModelFactoryService.java b/src/org/gcube/vremanagement/vremodeler/impl/ModelFactoryService.java index 26c0215..4c4c3c2 100644 --- a/src/org/gcube/vremanagement/vremodeler/impl/ModelFactoryService.java +++ b/src/org/gcube/vremanagement/vremodeler/impl/ModelFactoryService.java @@ -10,7 +10,6 @@ import org.gcube.common.core.faults.GCUBEFault; import org.gcube.common.core.porttypes.GCUBEStartupPortType; import org.gcube.common.core.utils.logging.GCUBELog; import org.gcube.vremanagement.vremodeler.db.DBInterface; -import org.gcube.vremanagement.vremodeler.stubs.GetExistingNamesResponseMessage; import org.globus.wsrf.encoding.ObjectDeserializer; import org.globus.wsrf.tests.basic.CreateResource; import org.xml.sax.InputSource; @@ -85,7 +84,7 @@ public class ModelFactoryService extends GCUBEStartupPortType{ * @return String * @throws RemoteException - */ - public String getAllDLs() throws GCUBEFault{ + public String getAllVREs() throws GCUBEFault{ String toReturn = null; ResultSet res=null; try{ @@ -93,7 +92,7 @@ public class ModelFactoryService extends GCUBEStartupPortType{ res= DBInterface.queryDB("select DL.name, DL.description, DL.status, DL.epr from DL;"); }catch(Exception e) {logger.error("VDL Model: error on DB"); throw new GCUBEFault(e);} try { - toReturn=XMLUtil.PrepareAllDLsXML(res); + toReturn=XMLUtil.PrepareAllVREsXML(res); } catch (Exception e) { logger.error("VDLModel parsing error in function getAllDLs "+e.getMessage()); throw new GCUBEFault(e); @@ -113,7 +112,7 @@ public class ModelFactoryService extends GCUBEStartupPortType{ */ public void removeDL(String request) throws GCUBEFault{ try{ - ResultSet res=DBInterface.queryDB("Select DL.epr from DL where DL.id='"+request+"';"); + ResultSet res=DBInterface.queryDB("Select VRE.epr from VRE where VRE.id='"+request+"';"); EndpointReferenceType dlEpr; @@ -121,10 +120,10 @@ public class ModelFactoryService extends GCUBEStartupPortType{ StringReader stringReader = new StringReader(res.getString(1)); InputSource inputSource = new InputSource(stringReader); dlEpr = (EndpointReferenceType) ObjectDeserializer.deserialize(inputSource, EndpointReferenceType.class); - }else throw new Exception("DL not retreived in DB"); + }else throw new Exception("VRE not retreived in DB"); //destroy the resource; - DBInterface.ExecuteUpdate("DELETE FROM DL where DL.id='"+request+"';"); + DBInterface.ExecuteUpdate("DELETE FROM VRE where VRE.id='"+request+"';"); }catch(Exception e){ logger.error("VDLModel: "+e.getMessage()); diff --git a/src/org/gcube/vremanagement/vremodeler/impl/ModelerService.java b/src/org/gcube/vremanagement/vremodeler/impl/ModelerService.java index 1f7103a..9cfe56a 100644 --- a/src/org/gcube/vremanagement/vremodeler/impl/ModelerService.java +++ b/src/org/gcube/vremanagement/vremodeler/impl/ModelerService.java @@ -5,13 +5,16 @@ import java.sql.Date; import java.sql.ResultSet; import java.util.ArrayList; import java.util.Hashtable; +import java.util.List; + import org.gcube.common.core.faults.GCUBEFault; import org.gcube.vremanagement.vremodeler.db.DBInterface; import org.gcube.vremanagement.vremodeler.stubs.CollectionArray; -import org.gcube.vremanagement.vremodeler.stubs.DHNArray; import org.gcube.vremanagement.vremodeler.stubs.FunctionalityIDArray; +import org.gcube.vremanagement.vremodeler.stubs.GHNArray; import org.gcube.vremanagement.vremodeler.stubs.SetMDFormatArgs; -import org.gcube.vremanagement.vremodeler.stubs.VdlRequest; +import org.gcube.vremanagement.vremodeler.stubs.VRERequest; + import org.globus.wsrf.ResourceException; import org.globus.wsrf.encoding.ObjectSerializer; import org.globus.wsrf.encoding.SerializationException; @@ -31,7 +34,7 @@ public class ModelerService { * @throws RemoteException - * */ - public void setDLModel(VdlRequest request) throws GCUBEFault{ + public void setVREModel(VRERequest request) throws GCUBEFault{ Date dateFrom=null, dateTo=null; ResultSet res=null; @@ -41,7 +44,7 @@ public class ModelerService { { dateFrom=new Date(request.getStartTime()); dateTo=new Date(request.getEndTime()); - DBInterface.queryDB("update DL set name='"+request.getDLName()+"', description='"+request.getDLDescription()+"', dldesigner='"+request.getDLDesigner()+"', dlmanager= '"+request.getDLManager()+"', intervalfrom='"+dateFrom+"', intervalto='"+dateTo+"' where DL.id='"+getResource().getID()+"'; "); + DBInterface.queryDB("update VRE set name='"+request.getVREName()+"', description='"+request.getVREDescription()+"', dldesigner='"+request.getVREDesigner()+"', dlmanager= '"+request.getVREManager()+"', intervalfrom='"+dateFrom+"', intervalto='"+dateTo+"' where DL.id='"+getResource().getID()+"'; "); }else{ dateFrom=new Date(request.getStartTime()); dateTo=new Date(request.getEndTime()); @@ -54,7 +57,7 @@ public class ModelerService { throw new RemoteException("VDL Model Service: error serializing EPR",e); } - DBInterface.ExecuteUpdate("insert into DL values('"+getResource().getID()+"','"+request.getDLName()+"','"+request.getDLDescription()+"','"+request.getDLDesigner()+"','"+request.getDLManager()+"','"+dateFrom+"','"+dateTo+"','"+eprToString+"','In Progress'); "); + DBInterface.ExecuteUpdate("insert into VRE values('"+getResource().getID()+"','"+request.getVREName()+"','"+request.getVREDescription()+"','"+request.getVREDesigner()+"','"+request.getVREManager()+"','"+dateFrom+"','"+dateTo+"','"+eprToString+"','In Progress'); "); } @@ -75,7 +78,7 @@ public class ModelerService { * @return VoidType * @throws RemoteException - */ - public String getDLModel() throws GCUBEFault{ + public String getVREModel() throws GCUBEFault{ String toReturn =null; @@ -86,7 +89,7 @@ public class ModelerService { String ID=getResource().getId(); DBInterface.connect(); res=DBInterface.queryDB("select * from DL where DL.id='"+ID+"';"); - toReturn=XMLUtil.PrepareDLModelXML(res); + toReturn=XMLUtil.PrepareVREModelXML(res); } catch (Exception e) { //logger.error("VDLModel parsing error in function getDLModel "+e.getMessage()); throw new GCUBEFault(e); @@ -101,22 +104,22 @@ public class ModelerService { * @return a XML String * @throws RemoteException - */ - public String getDHNs() throws GCUBEFault{ + public String getGHNs() throws GCUBEFault{ ResultSet res; - ArrayList relatedDHN=new ArrayList(); + ArrayList relatedGHN=new ArrayList(); try{ DBInterface.connect(); - res= DBInterface.queryDB("select * from DHN;"); + res= DBInterface.queryDB("select * from GHN;"); - ResultSet resRelated= DBInterface.queryDB("select dhnid from DLRELATEDDHN where DLRELATEDDHN.dlid='"+getResource().getId()+"';"); + ResultSet resRelated= DBInterface.queryDB("select ghnid from VRERELATEDGHN where VRERELATEDGHN.dlid='"+getResource().getId()+"';"); while(resRelated.next()){ - relatedDHN.add(resRelated.getString(1)); + relatedGHN.add(resRelated.getString(1)); } }catch(Exception e) {//logger.error("VDL Model: error on DB"); throw new GCUBEFault(e);} - return XMLUtil.PrepareDHNsXML(res, relatedDHN); + return XMLUtil.PrepareGHNsXML(res, relatedGHN); } @@ -127,24 +130,24 @@ public class ModelerService { * @return VoidType * @throws RemoteException - */ - public void setDHNs(DHNArray request) throws GCUBEFault{ + public void setGHNs(GHNArray request) throws GCUBEFault{ try{ String instanceID=(String) getResource().getId(); - DBInterface.ExecuteUpdate("DELETE FROM DLRELATEDDHN WHERE DLRELATEDDHN.dlid='"+instanceID+"';"); - - String[][] toInsert= new String[request.getDHNElement().length][2]; + DBInterface.ExecuteUpdate("DELETE FROM VRERELATEDDHN WHERE VRERELATEDDHN.vreid='"+instanceID+"';"); String dlKey=instanceID; - //logger.debug("KEY: "+dlKey); - for (int i=0; i> values= new ArrayList>(request.getGHNElement().length); + ArrayList row=null; + for (int i=0; i(2); + row.add(dlKey); + row.add(request.getGHNElement()[i]); + values.add(row); } - DBInterface.InsertInto("DLRELATEDDHN", toInsert, false); + DBInterface.InsertInto("VRERELATEDGHN", values); }catch(Exception e){throw new GCUBEFault(e);} } @@ -165,7 +168,7 @@ public class ModelerService { DBInterface.connect(); res= DBInterface.queryDB("select * from COLLECTION;"); - ResultSet resRelated= DBInterface.queryDB("select collid from DLRELATEDCOLLECTION where DLRELATEDCOLLECTION.dlid='"+getResource().getId()+"';"); + ResultSet resRelated= DBInterface.queryDB("select collid from VRERELATEDCOLLECTION where VRERELATEDCOLLECTION.dlid='"+getResource().getId()+"';"); while(resRelated.next()){ relatedCollection.add(resRelated.getString(1)); } @@ -186,21 +189,21 @@ public class ModelerService { */ public void setCollection(CollectionArray request) throws GCUBEFault{ try{ - DBInterface.ExecuteUpdate("DELETE FROM DLRELATEDCOLLECTION WHERE DLRELATEDCOLLECTION.dlid='"+getResource().getID()+"';"); - - String[][] toInsert= new String[request.getCollectionElement().length][2]; - + DBInterface.connect(); + DBInterface.ExecuteUpdate("DELETE FROM VRERELATEDCOLLECTION WHERE VRERELATEDCOLLECTION.vreid='"+getResource().getID()+"';"); + String dlKey=(String) getResource().getId(); - //logger.debug("KEY: "+dlKey); - + + ArrayList> values= new ArrayList>(request.getCollectionElement().length); + ArrayList row=null; for (int i=0; i(2); + row.add(dlKey); + row.add(request.getCollectionElement()[i]); } - - DBInterface.InsertInto("DLRELATEDCOLLECTION", toInsert, false); + DBInterface.connect(); + DBInterface.InsertInto("VRERELATEDCOLLECTION", values); }catch(Exception e){throw new GCUBEFault(e);} } @@ -261,7 +264,7 @@ public class ModelerService { } - return XMLUtil.PrepareMCFormatXML(resNative, resDerivable, totalMF, selectedMetadataStructure); + return XMLUtil.PrepareMCFormatXML(null, null, null, selectedMetadataStructure); } @@ -277,26 +280,25 @@ public class ModelerService { try{ DBInterface.ExecuteUpdate("DELETE FROM DLRELATEDMETADATAFORMAT WHERE DLRELATEDMETADATAFORMAT.dlid='"+getResource().getId()+"';"); String[] singleElement; - ArrayList elementsList= new ArrayList(); String key=(String) getResource().getId(); //logger.debug(request.getCollectionIDArray().length+" "+request.getMdFormatIDArray().length+" "+request.getCheckedArray().length+" "+request.getCheckedArray(0).getCheckedRowElement().length); - + ArrayList> values= new ArrayList>(request.getCollectionIDArray().length); + ArrayList row=null; for (int i=0; i(3); + row.add(key); + row.add(request.getCollectionIDArray(i)); + row.add(request.getMdFormatIDArray(j)); + values.add(row); + } - //logger.debug("pervenuto: coll "+ request.getCollectionIDArray(i)+" MF "+request.getMdFormatIDArray(j)); } - DBInterface.InsertInto("DLRELATEDMETADATAFORMAT", elementsList.toArray(new String[0][0]), false); + DBInterface.InsertInto("VRERELATEDMETADATAFORMAT", values); }catch(Exception e){throw new GCUBEFault(e);} } @@ -320,10 +322,10 @@ public class ModelerService { try { DBInterface.connect(); resFunct= DBInterface.queryDB("select * from functionality where father is null;"); - selectedFuncRes= DBInterface.queryDB("select funcid from DLRELATEDFUNCT where dlid='"+getResource().getID()+"';"); + selectedFuncRes= DBInterface.queryDB("select funcid from DLRELATEDFUNCT where vreid='"+getResource().getID()+"';"); while (selectedFuncRes.next()) selectedFunctionality.add(selectedFuncRes.getInt(1)); - selectedCSRes= DBInterface.queryDB("select csid from DLRELATEDCS where dlid='"+getResource().getID()+"';"); + selectedCSRes= DBInterface.queryDB("select csid from VRERELATEDCS where vreid='"+getResource().getID()+"';"); while (selectedCSRes.next()) selectedCS.add(selectedCSRes.getString(1)); } catch (Exception e) { @@ -345,34 +347,41 @@ public class ModelerService { */ public void setFunctionality(FunctionalityIDArray request) throws GCUBEFault { try{ - DBInterface.ExecuteUpdate("DELETE FROM DLRELATEDFUNCT WHERE DLRELATEDFUNCT.dlid='"+getResource().getId()+"';"); - DBInterface.ExecuteUpdate("DELETE FROM DLRELATEDCS WHERE DLRELATEDCS.dlid='"+getResource().getId()+"';"); + DBInterface.ExecuteUpdate("DELETE FROM VRERELATEDFUNCT WHERE VRERELATEDFUNCT.vreid='"+getResource().getId()+"';"); + DBInterface.ExecuteUpdate("DELETE FROM VRERELATEDCS WHERE VRERELATEDCS.vreid='"+getResource().getId()+"';"); String dlKey=(String) getResource().getId(); //logger.debug("KEY: "+dlKey); if (request.getFunctionalityIDElement()!=null){ - String[][] toInsertFunc= new String[request.getFunctionalityIDElement().length][2]; + ArrayList> values= new ArrayList>(request.getFunctionalityIDElement().length); + ArrayList row=null; for (int i=0; i(2); + row.add(dlKey); + row.add(request.getFunctionalityIDElement()[i]); + values.add(row); } - DBInterface.InsertInto("DLRELATEDFUNCT", toInsertFunc, false); + DBInterface.InsertInto("VRERELATEDFUNCT", values); } if (request.getCsIDElement()!=null) { - String[][] toInsertCS= new String[request.getCsIDElement().length][2]; + ArrayList> values= new ArrayList>(request.getCsIDElement().length); + ArrayList row=null; + for (int i=0; i(2); + row.add(dlKey); + row.add(request.getCsIDElement()[i]); + values.add(row); } - DBInterface.InsertInto("DLRELATEDCS", toInsertCS, false); + DBInterface.InsertInto("VRERELATEDCS", values); } }catch(Exception e){throw new GCUBEFault(e);} @@ -408,9 +417,9 @@ public class ModelerService { * @return * @throws RemoteException - */ - public void setDLtoPendingState() throws GCUBEFault{ + public void setVREtoPendingState() throws GCUBEFault{ try{ - DBInterface.ExecuteUpdate("UPDATE DL SET STATUS='Pending' WHERE DL.id='"+getResource().getId()+"';"); + DBInterface.ExecuteUpdate("UPDATE VRE SET STATUS='Pending' WHERE VRE.id='"+getResource().getId()+"';"); }catch(Exception e){throw new GCUBEFault(e);} } @@ -420,7 +429,7 @@ public class ModelerService { * @return * @throws RemoteException - */ - public void deployDL() throws RemoteException{ + public void deployVRE() throws RemoteException{ /*DBInterface.ExecuteUpdate("UPDATE DL SET STATUS='Deploying' WHERE DL.id='"+getResource().getId()+"';"); DLManagementFactoryServiceAddressingLocator dlMan=new DLManagementFactoryServiceAddressingLocator(); try { diff --git a/src/org/gcube/vremanagement/vremodeler/impl/ServiceContext.java b/src/org/gcube/vremanagement/vremodeler/impl/ServiceContext.java index 455838f..850beee 100644 --- a/src/org/gcube/vremanagement/vremodeler/impl/ServiceContext.java +++ b/src/org/gcube/vremanagement/vremodeler/impl/ServiceContext.java @@ -1,6 +1,8 @@ package org.gcube.vremanagement.vremodeler.impl; import org.gcube.common.core.contexts.GCUBEServiceContext; +import org.gcube.vremanagement.vremodeler.db.DBInterface; +import org.gcube.vremanagement.vremodeler.db.IStoDBUtil; public class ServiceContext extends GCUBEServiceContext{ @@ -18,6 +20,7 @@ public class ServiceContext extends GCUBEServiceContext{ protected void onReady() throws Exception{ logger.info("ready event invoked on " + this.getName()); + IStoDBUtil.initDB(ServiceContext.getContext().getStartScopes()[0]); } diff --git a/src/org/gcube/vremanagement/vremodeler/impl/XMLUtil.java b/src/org/gcube/vremanagement/vremodeler/impl/XMLUtil.java index 5a11f5c..9810a9c 100644 --- a/src/org/gcube/vremanagement/vremodeler/impl/XMLUtil.java +++ b/src/org/gcube/vremanagement/vremodeler/impl/XMLUtil.java @@ -57,7 +57,7 @@ public class XMLUtil { } - protected static String PrepareDHNsXML(ResultSet res, ArrayList relatedDHNs){ + protected static String PrepareGHNsXML(ResultSet res, ArrayList relatedGHNs){ StringBuilder temp = new StringBuilder(), runningInstancesString ; ResultSet riRes; @@ -65,8 +65,8 @@ public class XMLUtil { temp.append(""); try{ while (res.next()){ - selectedString= relatedDHNs.contains(res.getString("ID")) ? "true" : "false"; - riRes= DBInterface.queryDB("select RI.id, RI.name from RUNNINGINSTANCE as RI, DHNRELATEDRI as REL where REL.DHNID='"+res.getString("ID")+"' and REL.RIID=RI.ID"); + selectedString= relatedGHNs.contains(res.getString("ID")) ? "true" : "false"; + riRes= DBInterface.queryDB("select RI.id, RI.name from RUNNINGINSTANCE as RI, GHNRELATEDRI as REL where REL.DHNID='"+res.getString("ID")+"' and REL.RIID=RI.ID"); runningInstancesString= new StringBuilder(); while (riRes.next()){ runningInstancesString.append(""); } - temp.append(""); + temp.append(""); temp.append(res.getString(1)); temp.append(""); temp.append(res.getString(2)); @@ -100,7 +100,7 @@ public class XMLUtil { temp.append(runningInstancesString); temp.append(""); temp.append(selectedString); - temp.append(""); + temp.append(""); } }catch(SQLException e){//logger.error("database error "+e.getMessage()); } @@ -342,7 +342,7 @@ public class XMLUtil { @SuppressWarnings("deprecation") - protected static String PrepareDLModelXML(ResultSet res) throws Exception{ + protected static String PrepareVREModelXML(ResultSet res) throws Exception{ StringBuilder toReturn=new StringBuilder(); @@ -351,11 +351,11 @@ public class XMLUtil { toReturn.append(res.getString(2)); toReturn.append(""); toReturn.append(res.getString(3)); - toReturn.append(""); + toReturn.append(""); toReturn.append(res.getString(4)); - toReturn.append(""); + toReturn.append(""); toReturn.append(res.getString(5)); - toReturn.append(""); + toReturn.append(""); toReturn.append(res.getDate(6).getTime()); toReturn.append(""); toReturn.append(res.getDate(7).getTime()); @@ -371,11 +371,11 @@ public class XMLUtil { } - protected static String PrepareAllDLsXML(ResultSet res) throws Exception{ + protected static String PrepareAllVREsXML(ResultSet res) throws Exception{ StringBuilder toReturn=new StringBuilder(); toReturn.append(""); while (res.next()){ - toReturn.append("
"); + toReturn.append(""); toReturn.append(res.getString(1)); toReturn.append(""); toReturn.append(res.getString(2)); @@ -383,7 +383,7 @@ public class XMLUtil { toReturn.append(res.getString(3)); toReturn.append(""); toReturn.append(res.getString(4)); - toReturn.append("
"); + toReturn.append(""); } toReturn.append("");