git-svn-id: http://svn.research-infrastructures.eu/public/d4science/gcube/trunk/vre-management/VREModeler@5812 82a268e6-3cf1-43bd-a215-b396298e98cf

etc/hsqldb/vdldb.script

@@ -5,7 +5,7 @@ CREATE MEMORY TABLE MDCOLLECTION(ID VARCHAR NOT NULL PRIMARY KEY,NAME VARCHAR,DE
 CREATE MEMORY TABLE VRE(ID VARCHAR NOT NULL PRIMARY KEY,NAME VARCHAR NOT NULL,DESCRIPTION VARCHAR NOT NULL,VREDESIGNER VARCHAR NOT NULL,VREMANAGER VARCHAR NOT NULL,INTERVALFROM DATE,INTERVALTO DATE,EPR VARCHAR,STATUS VARCHAR)
 CREATE MEMORY TABLE CS(ID VARCHAR NOT NULL PRIMARY KEY,NAME VARCHAR NOT NULL,DESCRIPTION VARCHAR NOT NULL)
 CREATE MEMORY TABLE RUNNINGINSTANCE(ID VARCHAR NOT NULL PRIMARY KEY,NAME VARCHAR NOT NULL, CLASS VARCHAR NOT NULL)
-CREATE MEMORY TABLE GHNRELATEDRI(DHNID VARCHAR NOT NULL,RIID VARCHAR NOT NULL,PRIMARY KEY(DHNID,RIID))
+CREATE MEMORY TABLE GHNRELATEDRI(GHNID VARCHAR NOT NULL,RIID VARCHAR NOT NULL,PRIMARY KEY(GHNID,RIID))
 CREATE MEMORY TABLE RIRELATEDPKG(RIID VARCHAR NOT NULL,PKGID INTEGER NOT NULL,PRIMARY KEY(RIID,PKGID))
 CREATE MEMORY TABLE FUNCTIONALITY(ID INTEGER GENERATED BY DEFAULT AS IDENTITY(START WITH 0) NOT NULL PRIMARY KEY,NAME VARCHAR NOT NULL,DESCRIPTION VARCHAR NOT NULL,FATHER INTEGER,FLAG INTEGER NOT NULL)
 CREATE MEMORY TABLE PACKAGE(ID VARCHAR NOT NULL,SCLASS VARCHAR NOT NULL,SNAME VARCHAR NOT NULL,PNAME VARCHAR NOT NULL,PRIMARY KEY(SCLASS,SNAME,PNAME))
@@ -13,7 +13,7 @@ CREATE MEMORY TABLE MDFORMAT(ID VARCHAR NOT NULL PRIMARY KEY,NAME VARCHAR NOT NU
 CREATE MEMORY TABLE DERIVABLEMDF(MDCOLLID VARCHAR NOT NULL,MDFID VARCHAR NOT NULL,TPID VARCHAR NOT NULL,PRIMARY KEY(MDCOLLID,MDFID),CONSTRAINT SYS_FK_170 FOREIGN KEY(MDCOLLID) REFERENCES MDCOLLECTION(ID),CONSTRAINT SYS_FK_171 FOREIGN KEY(MDFID) REFERENCES MDFORMAT(ID))
 CREATE MEMORY TABLE NATIVEMDF(MDCOLLID VARCHAR NOT NULL,MDFID VARCHAR NOT NULL,PRIMARY KEY(MDCOLLID,MDFID),CONSTRAINT SYS_FK_178 FOREIGN KEY(MDCOLLID) REFERENCES MDCOLLECTION(ID),CONSTRAINT SYS_FK_179 FOREIGN KEY(MDFID) REFERENCES MDFORMAT(ID))
 CREATE MEMORY TABLE VRERELATEDCOLLECTION(VREID VARCHAR NOT NULL,COLLID VARCHAR NOT NULL,PRIMARY KEY(VREID,COLLID))
-CREATE MEMORY TABLE VRERELATEDGHN(VREID VARCHAR NOT NULL,DHNID VARCHAR NOT NULL,PRIMARY KEY(VREID,DHNID))
+CREATE MEMORY TABLE VRERELATEDGHN(VREID VARCHAR NOT NULL,GHNID VARCHAR NOT NULL,PRIMARY KEY(VREID,GHNID))
 CREATE MEMORY TABLE VRERELATEDCS(VREID VARCHAR NOT NULL,CSID VARCHAR NOT NULL,PRIMARY KEY(VREID,CSID))
 CREATE MEMORY TABLE VRERELATEDMETADATAFORMAT(VREID VARCHAR,COLLID VARCHAR,MFID VARCHAR)
 CREATE MEMORY TABLE VRERELATEDFUNC(VREID VARCHAR NOT NULL,FUNCID VARCHAR NOT NULL,PRIMARY KEY(VREID,FUNCID))

src/org/gcube/vremanagement/vremodeler/impl/ModelerResource.java

@@ -9,7 +9,9 @@ public class ModelerResource extends GCUBEWSResource {
 	protected static String[] RPNames = { RP_ID};
 	
 	@Override
-	protected void initialise(Object... arg0) throws ResourceException {
+	protected void initialise(Object... args) throws ResourceException {
+		if (args.length!=1) throw new ResourceException();
+		this.setId((String) args[0]);
 		
 	}
 
@@ -31,7 +33,7 @@ public class ModelerResource extends GCUBEWSResource {
 	return (String) this.getResourcePropertySet().get(RP_ID).get(0);
     }
     
-    protected synchronized void setId(String id) throws Exception {
+    protected synchronized void setId(String id) throws ResourceException {
     	this.getResourcePropertySet().get(RP_ID).clear();
 		this.getResourcePropertySet().get(RP_ID).add(id);
     }

src/org/gcube/vremanagement/vremodeler/impl/ModelerService.java

@@ -11,6 +11,7 @@ import javax.xml.rpc.ServiceException;
 
 import org.gcube.common.core.faults.GCUBEFault;
 import org.gcube.common.core.types.VOID;
+import org.gcube.common.core.utils.logging.GCUBELog;
 import org.gcube.vremanagement.vremanager.stubs.vremanager.VREManagerPortType;
 import org.gcube.vremanagement.vremanager.stubs.vremanager.service.VREManagerServiceAddressingLocator;
 import org.gcube.vremanagement.vremodeler.db.DBInterface;
@@ -27,6 +28,7 @@ import org.globus.wsrf.encoding.SerializationException;
 
 public class ModelerService {
 
+	private static final GCUBELog logger = new GCUBELog(ModelerService.class.getName());
 	
 	protected ModelerResource getResource() throws ResourceException{
 		return (ModelerResource) ModelerContext.getPortTypeContext().getWSHome().find();
@@ -110,6 +112,7 @@ public class ModelerService {
 	 * @throws RemoteException -
 	 */
 	public String getGHNs(VOID var) throws GCUBEFault{
+		logger.info("getGHNs method");
 		ResultSet res;
 		ArrayList<String> relatedGHN=new ArrayList<String>();
 		try{
@@ -117,13 +120,13 @@ public class ModelerService {
 			res= DBInterface.queryDB("select * from GHN;");
 			
 			ResultSet resRelated= DBInterface.queryDB("select ghnid from VRERELATEDGHN where VRERELATEDGHN.vreid='"+getResource().getId()+"';");
-			while(resRelated.next()){
+			while(resRelated.next())
 				relatedGHN.add(resRelated.getString(1));
-			}
 			
-		}catch(Exception e) {//logger.error("VDL Model: error on DB"); 
+			
+		}catch(Exception e) {
+			logger.error("VDL Model: error retreiving GHNs"+e);
 			throw new GCUBEFault(e);}
-		
 		return XMLUtil.PrepareGHNsXML(res, relatedGHN); 
 	}
 	

src/org/gcube/vremanagement/vremodeler/impl/XMLUtil.java

@@ -8,6 +8,7 @@ import java.util.Enumeration;
 import java.util.Hashtable;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
+import org.gcube.common.core.utils.logging.GCUBELog;
 import org.gcube.vremanagement.vremodeler.db.DBInterface;
 
 
@@ -19,7 +20,9 @@ import org.gcube.vremanagement.vremodeler.db.DBInterface;
  */
 public class XMLUtil {
 
-		
+	
+	private static final GCUBELog logger = new GCUBELog(ModelerService.class.getName());
+	
 	/**
 	 * it creates the XML output for VDLGenerator
 	 * 
@@ -66,7 +69,7 @@ public class XMLUtil {
 		try{
 			while (res.next()){
 					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");
+					riRes= DBInterface.queryDB("select RI.id, RI.name from RUNNINGINSTANCE as RI, GHNRELATEDRI as REL where REL.GHNID='"+res.getString("ID")+"' and REL.RIID=RI.ID");
 					runningInstancesString= new StringBuilder();
 					while (riRes.next()){
 						runningInstancesString.append("<RunningInstance id=\"");
@@ -102,8 +105,9 @@ public class XMLUtil {
 					temp.append(selectedString);
 					temp.append("</Selected></GHN>");
 			}
-		}catch(SQLException e){//logger.error("database error "+e.getMessage());
-			}
+		}catch(SQLException e){
+			logger.error("database error "+e.getMessage());
+		}
 		
 		temp.append("</ResultSet>");
 		//logger.debug("VDLMODEL: request collection XML: "+temp);