gCubeSystem
/
resource-management-portlet
15
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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
This commit is contained in:
Massimiliano Assante 2013-10-07 20:50:37 +00:00
parent 0415a23cda
commit 576668cc37
3 changed files with 24 additions and 59 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
pom.xml
View File

@ -80,6 +80,10 @@
<artifactId>gwtquery</artifactId>
<version>1.3.3</version>
</dependency>
<dependency>
<groupId>org.gcube.dvos</groupId>
<artifactId>usermanagement-core</artifactId>
</dependency>
<dependency>
<groupId>org.gcube.portlets.admin</groupId>
<artifactId>rmp-common-library</artifactId>
@ -91,6 +95,18 @@
<artifactId>ic-client</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.gcube.core</groupId>
<artifactId>common-fw-clients</artifactId>
<version>[1.0.0-SNAPSHOT, 2.0.0-SNAPSHOT)</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.gcube.core</groupId>
<artifactId>common-clients</artifactId>
<version>[2.0.2-SNAPSHOT, 3.0.0-SNAPSHOT)</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.gcube.core</groupId>
<artifactId>common-scope-maps</artifactId>
@ -119,18 +135,24 @@
<artifactId>ghnmanager-stubs</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.gcube.resourcemanagement</groupId>
<artifactId>softwaregateway-client</artifactId>
<version>[2.0.0-SNAPSHOT, 3.0.0-SNAPSHOT)</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.gcube.applicationsupportlayer</groupId>
<artifactId>aslcore</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.gcube.portlets.user</groupId>
<groupId>org.gcube.common</groupId>
<artifactId>home-library</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.gcube.portlets.user</groupId>
<groupId>org.gcube.common</groupId>
<artifactId>home-library-jcr</artifactId>
<scope>provided</scope>
</dependency>

55
src/main/java/org/gcube/portlets/admin/resourcemanagement/server/QueryTest.java
View File

@ -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<XMLResult> 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 " +
" <Resource> " +
" {$outer//Document/ID} " +
" {$outer//Document/Source} " +
" {$outer//Document/SourceKey} " +
" <ServiceClass>{$outer//Document/Data/child::*[local-name()='ServiceClass']/text()}</ServiceClass> " +
" <ServiceName>{$outer//Document/Data/child::*[local-name()='ServiceName']/text()}</ServiceName> " +
" <SubType>{$outer//Document/Data/child::*[local-name()='ServiceClass']/text()}</SubType> " +
" {$outer//Document/TerminationTimeHuman} "+
" {$outer//Document/LastUpdateHuman} " +
" <RI>{$outer//Document/Data/child::*[local-name()='RI']/text()}</RI> " +
" <Type>WSResource</Type> "+
" <scopes>{$outer//Document/Data/child::*[local-name()='Scope']/text()}</scopes> "+
" </Resource>";
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
}
}
}
}

2
src/main/java/org/gcube/portlets/admin/resourcemanagement/server/ResourceCommands.java
View File

@ -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;