From 576668cc37d2ddbe0cd82c993afde8b0967ac505 Mon Sep 17 00:00:00 2001 From: Massimiliano Assante Date: Mon, 7 Oct 2013 20:50:37 +0000 Subject: [PATCH] updated pom for new HL, added explicit deps for sw gateway n fw clients git-svn-id: http://svn.research-infrastructures.eu/public/d4science/gcube/trunk/portlets/admin/resource-management@82615 82a268e6-3cf1-43bd-a215-b396298e98cf --- pom.xml | 26 ++++++++- .../resourcemanagement/server/QueryTest.java | 55 ------------------- .../server/ResourceCommands.java | 2 - 3 files changed, 24 insertions(+), 59 deletions(-) delete mode 100644 src/main/java/org/gcube/portlets/admin/resourcemanagement/server/QueryTest.java diff --git a/pom.xml b/pom.xml index 7081a85..c23ec2d 100644 --- a/pom.xml +++ b/pom.xml @@ -80,6 +80,10 @@ gwtquery 1.3.3 + + org.gcube.dvos + usermanagement-core + org.gcube.portlets.admin rmp-common-library @@ -91,6 +95,18 @@ ic-client provided + + org.gcube.core + common-fw-clients + [1.0.0-SNAPSHOT, 2.0.0-SNAPSHOT) + provided + + + org.gcube.core + common-clients + [2.0.2-SNAPSHOT, 3.0.0-SNAPSHOT) + provided + org.gcube.core common-scope-maps @@ -119,18 +135,24 @@ ghnmanager-stubs provided + + org.gcube.resourcemanagement + softwaregateway-client + [2.0.0-SNAPSHOT, 3.0.0-SNAPSHOT) + provided + org.gcube.applicationsupportlayer aslcore provided - org.gcube.portlets.user + org.gcube.common home-library provided - org.gcube.portlets.user + org.gcube.common home-library-jcr provided diff --git a/src/main/java/org/gcube/portlets/admin/resourcemanagement/server/QueryTest.java b/src/main/java/org/gcube/portlets/admin/resourcemanagement/server/QueryTest.java deleted file mode 100644 index 33a0a12..0000000 --- a/src/main/java/org/gcube/portlets/admin/resourcemanagement/server/QueryTest.java +++ /dev/null @@ -1,55 +0,0 @@ -package org.gcube.portlets.admin.resourcemanagement.server; - -import java.util.List; - -import org.gcube.common.core.contexts.GHNContext; -import org.gcube.common.core.informationsystem.client.ISClient; -import org.gcube.common.core.informationsystem.client.XMLResult; -import org.gcube.common.core.informationsystem.client.queries.GCUBEGenericQuery; -import org.gcube.common.core.scope.GCUBEScope; - -public class QueryTest { - - public static void main(String[] args) throws Exception { - List results = null; - ISClient client = GHNContext.getImplementation(ISClient.class); - GCUBEGenericQuery isQuery = null; - isQuery = client.getQuery(GCUBEGenericQuery.class); - - String query = "declare namespace gc = 'http://gcube-system.org/namespaces/common/core/porttypes/GCUBEProvider'; " + - " declare namespace wmns= 'http://gcube-system.org/namespaces/contentmanagement/viewmanager'; " + - " for $outer in collection(\"/db/Properties\")//Document, $res in $outer/Data " + - " where $res/gc:ServiceClass/string() eq 'ContentManagement' and count($res//wmns:View)>0 " + - " and $res/gc:ServiceName/string() eq 'ViewManager'" + - "return " + - " " + - " {$outer//Document/ID} " + - " {$outer//Document/Source} " + - " {$outer//Document/SourceKey} " + - " {$outer//Document/Data/child::*[local-name()='ServiceClass']/text()} " + - " {$outer//Document/Data/child::*[local-name()='ServiceName']/text()} " + - " {$outer//Document/Data/child::*[local-name()='ServiceClass']/text()} " + - " {$outer//Document/TerminationTimeHuman} "+ - " {$outer//Document/LastUpdateHuman} " + - " {$outer//Document/Data/child::*[local-name()='RI']/text()} " + - " WSResource "+ - " {$outer//Document/Data/child::*[local-name()='Scope']/text()} "+ - " "; - - - System.out.println(query); - - isQuery.setExpression(query); - results = client.execute(isQuery, GCUBEScope.getScope("/gcube/devNext")); - for (XMLResult elem : results) { - try { - - System.out.println(elem.toString()); - - } catch (IndexOutOfBoundsException e) { - // ignore exception - } - - } - } -} diff --git a/src/main/java/org/gcube/portlets/admin/resourcemanagement/server/ResourceCommands.java b/src/main/java/org/gcube/portlets/admin/resourcemanagement/server/ResourceCommands.java index 9e1f32c..60bf766 100644 --- a/src/main/java/org/gcube/portlets/admin/resourcemanagement/server/ResourceCommands.java +++ b/src/main/java/org/gcube/portlets/admin/resourcemanagement/server/ResourceCommands.java @@ -18,7 +18,6 @@ package org.gcube.portlets.admin.resourcemanagement.server; import java.util.List; -import org.gcube.common.core.scope.GCUBEScope; import org.gcube.common.scope.impl.ScopeBean; import org.gcube.resourcemanagement.support.client.utils.CurrentStatus; import org.gcube.resourcemanagement.support.shared.util.Assertion; @@ -26,7 +25,6 @@ import org.gcube.resourcemanagement.support.server.managers.resources.Collection import org.gcube.resourcemanagement.support.server.managers.resources.GHNManager; import org.gcube.resourcemanagement.support.server.managers.resources.GenericResourceManager; import org.gcube.resourcemanagement.support.server.managers.resources.RuntimeResourceManager; -import org.gcube.resourcemanagement.support.server.managers.scope.ScopeManager; import org.gcube.resourcemanagement.support.server.types.AllowedResourceTypes; import org.gcube.resourcemanagement.support.server.utils.ServerConsole; import org.gcube.resourcemanagement.support.shared.exceptions.InvalidParameterException;