diff --git a/pom.xml b/pom.xml index f649ea3..4d4ff4d 100644 --- a/pom.xml +++ b/pom.xml @@ -11,7 +11,7 @@ org.gcube.portlets.admin rmp-common-library - 2.0.0-SNAPSHOT + 2.1.0-SNAPSHOT Resource Management Library gCube Resource Management Library is a common library containing shared code for Information System Operations diff --git a/src/main/java/org/gcube/resourcemanagement/support/server/gcube/queries/xquery/resources/RETURN_RuntimeResource.xq b/src/main/java/org/gcube/resourcemanagement/support/server/gcube/queries/xquery/resources/RETURN_RuntimeResource.xq index 4eb9e97..a9296d1 100644 --- a/src/main/java/org/gcube/resourcemanagement/support/server/gcube/queries/xquery/resources/RETURN_RuntimeResource.xq +++ b/src/main/java/org/gcube/resourcemanagement/support/server/gcube/queries/xquery/resources/RETURN_RuntimeResource.xq @@ -4,4 +4,5 @@ {$subtype} {$scopes} {$profiles//Resource/Profile/Name/text()} + {$profiles//Resource/Profile/RunTime/HostedOn/text()} \ No newline at end of file diff --git a/src/main/java/org/gcube/resourcemanagement/support/server/managers/resources/AbstractResourceManager.java b/src/main/java/org/gcube/resourcemanagement/support/server/managers/resources/AbstractResourceManager.java index 43ec3be..6f8fc51 100644 --- a/src/main/java/org/gcube/resourcemanagement/support/server/managers/resources/AbstractResourceManager.java +++ b/src/main/java/org/gcube/resourcemanagement/support/server/managers/resources/AbstractResourceManager.java @@ -56,6 +56,7 @@ import org.gcube.vremanagement.resourcemanager.client.proxies.Proxies; * * official wiki. * @author Daniele Strollo (ISTI-CNR) + * @author Massimiliano Assante (ISTI-CNR) */ public abstract class AbstractResourceManager { private String id = null; @@ -231,6 +232,11 @@ public abstract class AbstractResourceManager { LOG_PREFIX, "[BIND-SCOPE-ENTER] Adding " + this.getType() + " " + this.getID() + " to scope [" + targetScope.toString() + "]"); + + System.out.println("***\n\n[BIND-SCOPE-ENTER] Adding " + this.getType() + " " + this.getID() + " to scope [" + + targetScope.toString() + "]"); + + String curr = ScopeProvider.instance.get(); ScopeProvider.instance.set(targetScope.toString()); @@ -254,6 +260,8 @@ public abstract class AbstractResourceManager { ScopeProvider.instance.set(scope.enclosingScope().toString()); } else ScopeProvider.instance.set(targetScope); + System.out.println("***\n\nCalling manager.addResources(addParam) addParam.toString()=" + addParam.toString()); + String reportID = manager.addResources(addParam); ServerConsole.trace( @@ -261,6 +269,9 @@ public abstract class AbstractResourceManager { "[BIND-SCOPE-EXIT] Applyed Adding " + this.getType() + " " + this.getID() + " to scope [" + targetScope.toString() + "]... reportID: " + reportID); + System.out.println("***\n\n[BIND-SCOPE-EXIT] Applyed Adding " + this.getType() + " " + this.getID() + " to scope [" + + targetScope.toString() + "]... reportID: " + reportID); + RMReportingLibrary pt = this.getReportResourceManager(scope.toString()); String toReturn = pt.getReport(reportID); @@ -271,6 +282,7 @@ public abstract class AbstractResourceManager { ServerConsole.trace( LOG_PREFIX, "[BIND-SCOPE-EXIT] [FAILURE]"); + System.out.println("***[BIND-SCOPE-EXIT] [FAILURE]" +e.getMessage()); throw new ResourceOperationException("During resource::addToScope: "+ targetScope + " Message: \n" + e.getMessage()); } } diff --git a/src/main/java/org/gcube/resourcemanagement/support/server/managers/resources/GenericResourceManager.java b/src/main/java/org/gcube/resourcemanagement/support/server/managers/resources/GenericResourceManager.java index 62aea8f..aac6d53 100644 --- a/src/main/java/org/gcube/resourcemanagement/support/server/managers/resources/GenericResourceManager.java +++ b/src/main/java/org/gcube/resourcemanagement/support/server/managers/resources/GenericResourceManager.java @@ -52,8 +52,8 @@ import org.xml.sax.SAXException; /** + * @author Massimiliano Assante (ISTI-CNR) * @author Daniele Strollo (ISTI-CNR) - * */ public class GenericResourceManager extends AbstractResourceManager { // Used internally to require static functionalities (e.g. deploy). diff --git a/src/main/java/org/gcube/resourcemanagement/support/server/managers/resources/RunningInstanceManager.java b/src/main/java/org/gcube/resourcemanagement/support/server/managers/resources/RunningInstanceManager.java index f62e6e1..fc981b4 100644 --- a/src/main/java/org/gcube/resourcemanagement/support/server/managers/resources/RunningInstanceManager.java +++ b/src/main/java/org/gcube/resourcemanagement/support/server/managers/resources/RunningInstanceManager.java @@ -53,7 +53,7 @@ import org.gcube.vremanagement.resourcemanager.client.fws.Types.SoftwareList; /** * @author Daniele Strollo (ISTI-CNR) - * + * @author Massimiliano Assante (ISTI-CNR) */ public class RunningInstanceManager extends AbstractResourceManager { // Used internally to require static functionalities (e.g. deploy). diff --git a/src/main/java/org/gcube/resourcemanagement/support/shared/types/datamodel/ResourceDetailModel.java b/src/main/java/org/gcube/resourcemanagement/support/shared/types/datamodel/ResourceDetailModel.java index 6aad909..6e36373 100644 --- a/src/main/java/org/gcube/resourcemanagement/support/shared/types/datamodel/ResourceDetailModel.java +++ b/src/main/java/org/gcube/resourcemanagement/support/shared/types/datamodel/ResourceDetailModel.java @@ -474,16 +474,18 @@ public class ResourceDetailModel { ********************************************/ // The column model for grid representation modelColumns = new ArrayList(); - modelColumns.add(new ColumnConfig("Name", "Name", 300)); + modelColumns.add(new ColumnConfig("Name", "Name", 200)); + modelColumns.add(new ColumnConfig("Host", "Host", 250)); modelColumns.add(new ColumnConfig("Scopes", "Scopes", 300)); + //Optional - modelColumns.add(new ColumnConfig("ID", "ID", 220)); + modelColumns.add(new ColumnConfig("ID", "ID", 100)); modelColumns.add(new ColumnConfig("SubType", "Category", 370)); // create the column model cm = new ColumnModel(modelColumns); - for (int i = 3; i < modelColumns.size(); i++) { + for (int i = 4; i < modelColumns.size(); i++) { cm.setHidden(i, true); } RECORD_DEFINITION.put(ResourceTypeDecorator.RuntimeResource.name(), cm); @@ -495,6 +497,7 @@ public class ResourceDetailModel { type.addField("ID"); type.addField("Name"); type.addField("Scopes"); + type.addField("Host"); type.addField("SubType"); type.addField("Type"); @@ -773,6 +776,7 @@ public class ResourceDetailModel { "Name", "SubType", "ID", + "Host", "Scopes" }); REQUIRED_FIELDS.put(