gCubeSystem
/
resource-manager-gcore
16
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

New portTypes' definitions, Junit tests on multimaps, test-suite fixed 

git-svn-id: http://svn.research-infrastructures.eu/public/d4science/gcube/trunk/vre-management/ResourceManager@55815 82a268e6-3cf1-43bd-a215-b396298e98cf
This commit is contained in:
Manuele Simi 2012-06-15 15:39:57 +00:00
parent 9d96711f75
commit f2293120e5
39 changed files with 588 additions and 246 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
.project
View File

@ -10,8 +10,14 @@
<arguments>
</arguments>
</buildCommand>
<buildCommand>
<name>org.eclipse.m2e.core.maven2Builder</name>
<arguments>
</arguments>
</buildCommand>
</buildSpec>
<natures>
<nature>org.eclipse.m2e.core.maven2Nature</nature>
<nature>org.eclipse.jdt.core.javanature</nature>
</natures>
</projectDescription>

3
.settings/org.eclipse.core.resources.prefs Normal file
View File

@ -0,0 +1,3 @@
#Thu May 31 16:30:46 EDT 2012
eclipse.preferences.version=1
encoding/<project>=UTF-8

5
.settings/org.eclipse.m2e.core.prefs Normal file
View File

@ -0,0 +1,5 @@
#Thu May 31 16:30:32 EDT 2012
activeProfiles=
eclipse.preferences.version=1
resolveWorkspaceProjects=true
version=1

28
config/deploy-server.wsdd
View File

@ -3,9 +3,31 @@
xmlns:java="http://xml.apache.org/axis/wsdd/providers/java"
xmlns:xsd="http://www.w3.org/2001/XMLSchema">
<service name="gcube/vremanagement/ResourceManager" provider="Handler" use="literal" style="document">
<parameter name="className" value="org.gcube.vremanagement.resourcemanager.impl.ResourceManager"/>
<wsdlFile>share/schema/org.gcube.vremanagement.resourcemanager/ResourceManager_service.wsdl</wsdlFile>
<service name="gcube/vremanagement/resourcemanager/binder" provider="Handler" use="literal" style="document">
<parameter name="className" value="org.gcube.vremanagement.resourcemanager.portTypes.ResourceManager"/>
<wsdlFile>share/schema/org.gcube.vremanagement.resourcemanager/ResourceBinder_service.wsdl</wsdlFile>
<parameter name="allowedMethods" value="*"/>
<parameter name="handlerClass" value="org.globus.axis.providers.RPCProvider"/>
<parameter name="scope" value="Application"/>
<parameter name="providers" value="GCUBEProvider GetCurrentMessageProvider"/>
<parameter name="loadOnStartup" value="true"/>
<parameter name="securityDescriptor" value="@config.dir@/security_descriptor.xml"/>
</service>
<service name="gcube/vremanagement/resourcemanager/reporting" provider="Handler" use="literal" style="document">
<parameter name="className" value="org.gcube.vremanagement.resourcemanager.portTypes.ResourceManager"/>
<wsdlFile>share/schema/org.gcube.vremanagement.resourcemanager/Reporting_service.wsdl</wsdlFile>
<parameter name="allowedMethods" value="*"/>
<parameter name="handlerClass" value="org.globus.axis.providers.RPCProvider"/>
<parameter name="scope" value="Application"/>
<parameter name="providers" value="GCUBEProvider GetCurrentMessageProvider"/>
<parameter name="loadOnStartup" value="true"/>
<parameter name="securityDescriptor" value="@config.dir@/security_descriptor.xml"/>
</service>
<service name="gcube/vremanagement/resourcemanager/scopecontroller" provider="Handler" use="literal" style="document">
<parameter name="className" value="org.gcube.vremanagement.resourcemanager.portTypes.ResourceManager"/>
<wsdlFile>share/schema/org.gcube.vremanagement.resourcemanager/ScopeController_service.wsdl</wsdlFile>
<parameter name="allowedMethods" value="*"/>
<parameter name="handlerClass" value="org.globus.axis.providers.RPCProvider"/>
<parameter name="scope" value="Application"/>

12
config/profile.xml
View File

@ -17,7 +17,17 @@
<GHNRequirements/>
<GARArchive>org.gcube.vremanagement.resourcemanager.gar</GARArchive>
<PortType>
<Name>gcube/vremanagement/ResourceManager</Name>
<Name>gcube/vremanagement/resourcemanager/binder</Name>
<Security/>
<WSDL/>
</PortType>
<PortType>
<Name>gcube/vremanagement/resourcemanager/scopecontroller</Name>
<Security/>
<WSDL/>
</PortType>
<PortType>
<Name>gcube/vremanagement/resourcemanager/reporting</Name>
<Security/>
<WSDL/>
</PortType>

2
pom.xml
View File

@ -63,7 +63,7 @@
<artifactId>maven-service-plugin</artifactId>
<version>1.0.0</version>
<configuration>
<serviceId>deployer</serviceId>
<serviceId>resourcemanager</serviceId>
<basePackage>${basepackage}</basePackage>
<wsdlDirectory>${wsdlDirectory}</wsdlDirectory>
<wsdlOutputDirectory>${wsdlOutputDirectory}</wsdlOutputDirectory>

10
resource-manager-service/.classpath Normal file
View File

@ -0,0 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="src" output="target/classes" path="src/main/java"/>
<classpathentry excluding="**" kind="src" output="target/classes" path="src/main/resources"/>
<classpathentry kind="src" output="target/test-classes" path="src/test/java"/>
<classpathentry excluding="**" kind="src" output="target/test-classes" path="src/test/resources"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER"/>
<classpathentry kind="output" path="target/classes"/>
</classpath>

23
resource-manager-service/.project Normal file
View File

@ -0,0 +1,23 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
<name>resource-manager-service</name>
<comment></comment>
<projects>
</projects>
<buildSpec>
<buildCommand>
<name>org.eclipse.jdt.core.javabuilder</name>
<arguments>
</arguments>
</buildCommand>
<buildCommand>
<name>org.eclipse.m2e.core.maven2Builder</name>
<arguments>
</arguments>
</buildCommand>
</buildSpec>
<natures>
<nature>org.eclipse.jdt.core.javanature</nature>
<nature>org.eclipse.m2e.core.maven2Nature</nature>
</natures>
</projectDescription>

7
resource-manager-service/.settings/org.eclipse.core.resources.prefs Normal file
View File

@ -0,0 +1,7 @@
#Thu May 31 16:30:48 EDT 2012
eclipse.preferences.version=1
encoding//src/main/java=UTF-8
encoding//src/main/resources=UTF-8
encoding//src/test/java=UTF-8
encoding//src/test/resources=UTF-8
encoding/<project>=UTF-8

6
resource-manager-service/.settings/org.eclipse.jdt.core.prefs Normal file
View File

@ -0,0 +1,6 @@
#Thu May 31 16:30:48 EDT 2012
eclipse.preferences.version=1
org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
org.eclipse.jdt.core.compiler.compliance=1.6
org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
org.eclipse.jdt.core.compiler.source=1.6

5
resource-manager-service/.settings/org.eclipse.m2e.core.prefs Normal file
View File

@ -0,0 +1,5 @@
#Thu May 31 16:30:32 EDT 2012
activeProfiles=
eclipse.preferences.version=1
resolveWorkspaceProjects=true
version=1

2
resource-manager-service/src/main/java/org/gcube/vremanagement/resourcemanager/impl/contexts/ServiceContext.java
View File

@ -6,7 +6,7 @@ import org.gcube.common.core.contexts.GCUBEServiceContext;
import org.gcube.common.core.scope.GCUBEScope;
import org.gcube.common.core.utils.handlers.GCUBEHandler;
import org.gcube.common.core.utils.handlers.GCUBEScheduledHandler;
import org.gcube.vremanagement.resourcemanager.impl.ResourceManager;
import org.gcube.vremanagement.resourcemanager.porttypes.ResourceManager;
/**

2
resource-manager-service/src/main/java/org/gcube/vremanagement/resourcemanager/impl/deployment/resources/Service.java
View File

@ -1,6 +1,6 @@
package org.gcube.vremanagement.resourcemanager.impl.deployment.resources;
import org.gcube.vremanagement.resourcemanager.stubs.resourcemanager.ServiceItem;
import org.gcube.vremanagement.resourcemanager.stubs.binder.ServiceItem;
/**
* A GCUBE service

6
resource-manager-service/src/main/java/org/gcube/vremanagement/resourcemanager/impl/operators/AddResourcesOperator.java
View File

@ -2,9 +2,9 @@ package org.gcube.vremanagement.resourcemanager.impl.operators;
import org.gcube.common.core.utils.logging.GCUBELog;
import org.gcube.vremanagement.resourcemanager.impl.contexts.ServiceContext;
import org.gcube.vremanagement.resourcemanager.stubs.resourcemanager.AddResourcesParameters;
import org.gcube.vremanagement.resourcemanager.stubs.resourcemanager.ResourceList;
import org.gcube.vremanagement.resourcemanager.stubs.resourcemanager.ServiceList;
import org.gcube.vremanagement.resourcemanager.stubs.binder.AddResourcesParameters;
import org.gcube.vremanagement.resourcemanager.stubs.binder.ResourceList;
import org.gcube.vremanagement.resourcemanager.stubs.binder.ServiceList;
/**
* A Resources Operator that coordinates the adding of resources to the scope

4
resource-manager-service/src/main/java/org/gcube/vremanagement/resourcemanager/impl/operators/DeployServiceOperator.java
View File

@ -13,8 +13,8 @@ import org.gcube.common.core.resources.GCUBEService;
import org.gcube.common.core.scope.GCUBEScope;
import org.gcube.common.core.scope.GCUBEScope.Type;
import org.gcube.common.core.utils.logging.GCUBELog;
import org.gcube.vremanagement.resourcemanager.stubs.resourcemanager.ServiceItem;
import org.gcube.vremanagement.resourcemanager.stubs.resourcemanager.ServiceList;
import org.gcube.vremanagement.resourcemanager.stubs.binder.ServiceItem;
import org.gcube.vremanagement.resourcemanager.stubs.binder.ServiceList;
import org.gcube.vremanagement.resourcemanager.impl.brokerage.BrokerConnector;
import org.gcube.vremanagement.resourcemanager.impl.deployment.resources.Service;
import org.gcube.vremanagement.resourcemanager.impl.resources.ScopedDeployedService;

6
resource-manager-service/src/main/java/org/gcube/vremanagement/resourcemanager/impl/operators/RemoveResourcesOperator.java
View File

@ -2,9 +2,9 @@ package org.gcube.vremanagement.resourcemanager.impl.operators;
import org.gcube.common.core.utils.logging.GCUBELog;
import org.gcube.vremanagement.resourcemanager.impl.contexts.ServiceContext;
import org.gcube.vremanagement.resourcemanager.stubs.resourcemanager.RemoveResourcesParameters;
import org.gcube.vremanagement.resourcemanager.stubs.resourcemanager.ResourceList;
import org.gcube.vremanagement.resourcemanager.stubs.resourcemanager.ServiceList;
import org.gcube.vremanagement.resourcemanager.stubs.binder.RemoveResourcesParameters;
import org.gcube.vremanagement.resourcemanager.stubs.binder.ResourceList;
import org.gcube.vremanagement.resourcemanager.stubs.binder.ServiceList;
/**
* A Resources Operator that coordinates the removal of resources from the scope

4
resource-manager-service/src/main/java/org/gcube/vremanagement/resourcemanager/impl/operators/ScopedResourceManagerOperator.java
View File

@ -3,8 +3,8 @@ package org.gcube.vremanagement.resourcemanager.impl.operators;
import java.util.HashSet;
import java.util.Set;
import org.gcube.vremanagement.resourcemanager.stubs.resourcemanager.ResourceItem;
import org.gcube.vremanagement.resourcemanager.stubs.resourcemanager.ResourceList;
import org.gcube.vremanagement.resourcemanager.stubs.binder.ResourceItem;
import org.gcube.vremanagement.resourcemanager.stubs.binder.ResourceList;
import org.gcube.vremanagement.resourcemanager.impl.resources.ScopedResource;
import org.gcube.vremanagement.resourcemanager.impl.resources.ScopedResourceFactory;

2
resource-manager-service/src/main/java/org/gcube/vremanagement/resourcemanager/impl/resources/ScopedAnyResource.java
View File

@ -43,8 +43,8 @@ public final class ScopedAnyResource extends ScopedResource {
@XStreamOmitField
GCUBEResource profile = null;
@SuppressWarnings("rawtypes")
@XStreamOmitField
@SuppressWarnings("unchecked")
Class profileClass = null;
protected ScopedAnyResource(String id, String type, GCUBEScope scope) {

1
resource-manager-service/src/main/java/org/gcube/vremanagement/resourcemanager/impl/resources/ScopedGHN.java
View File

@ -8,7 +8,6 @@ import org.gcube.common.core.contexts.GCUBERemotePortTypeContext;
import org.gcube.common.core.contexts.GHNContext;
import org.gcube.common.core.informationsystem.client.AtomicCondition;
import org.gcube.common.core.informationsystem.client.ISClient;
import org.gcube.common.core.informationsystem.client.ISClient.ISUnsupportedQueryException;
import org.gcube.common.core.informationsystem.client.queries.GCUBEGHNQuery;
import org.gcube.common.core.informationsystem.client.queries.GCUBERIQuery;
import org.gcube.common.core.resources.GCUBEHostingNode;

26
resource-manager-service/src/main/java/org/gcube/vremanagement/resourcemanager/impl/ResourceManager.java → resource-manager-service/src/main/java/org/gcube/vremanagement/resourcemanager/porttypes/ResourceManager.java
View File

@ -1,4 +1,4 @@
package org.gcube.vremanagement.resourcemanager.impl;
package org.gcube.vremanagement.resourcemanager.porttypes;
import java.util.HashSet;
import java.util.Set;
@ -17,18 +17,6 @@ import org.gcube.vremanagement.resourcemanager.impl.contexts.StatefulPortTypeCon
import org.gcube.vremanagement.resourcemanager.impl.deployment.DeployerReport;
import org.gcube.vremanagement.resourcemanager.impl.deployment.VirtualNodeManager;
import org.gcube.vremanagement.resourcemanager.impl.deployment.DeployerReport.DeployedRunningInstance;
import org.gcube.vremanagement.resourcemanager.stubs.resourcemanager.AddResourcesParameters;
import org.gcube.vremanagement.resourcemanager.stubs.resourcemanager.CreateScopeParameters;
import org.gcube.vremanagement.resourcemanager.stubs.resourcemanager.DisposeScopeParameters;
import org.gcube.vremanagement.resourcemanager.stubs.resourcemanager.InvalidOptionsFaultType;
import org.gcube.vremanagement.resourcemanager.stubs.resourcemanager.InvalidScopeFaultType;
import org.gcube.vremanagement.resourcemanager.stubs.resourcemanager.NoSuchReportFaultType;
import org.gcube.vremanagement.resourcemanager.stubs.resourcemanager.OptionsParameters;
import org.gcube.vremanagement.resourcemanager.stubs.resourcemanager.RemoveResourcesParameters;
import org.gcube.vremanagement.resourcemanager.stubs.resourcemanager.ResourcesCreationFaultType;
import org.gcube.vremanagement.resourcemanager.stubs.resourcemanager.ResourcesRemovalFaultType;
import org.gcube.vremanagement.resourcemanager.stubs.resourcemanager.ScopeOption;
import org.gcube.vremanagement.resourcemanager.stubs.resourcemanager.SendReportParameters;
import org.gcube.vremanagement.resourcemanager.impl.operators.AddResourcesOperator;
import org.gcube.vremanagement.resourcemanager.impl.operators.DisposeScopeOperator;
import org.gcube.vremanagement.resourcemanager.impl.operators.OperatorConfig;
@ -42,6 +30,12 @@ import org.gcube.vremanagement.resourcemanager.impl.state.Session.OPERATION;
import org.globus.wsrf.NoSuchResourceException;
import org.globus.wsrf.ResourceException;
import org.gcube.vremanagement.resourcemanager.stubs.binder.*;
import org.gcube.vremanagement.resourcemanager.stubs.common.InvalidScopeFaultType;
import org.gcube.vremanagement.resourcemanager.stubs.scontroller.*;
import org.gcube.vremanagement.resourcemanager.stubs.reporting.*;
/**
* <em>ResourceManager</em> port-type implementation
@ -148,7 +142,7 @@ public class ResourceManager extends GCUBEPortType {
}
public synchronized String createScope(CreateScopeParameters params)
public synchronized void createScope(CreateScopeParameters params)
throws InvalidScopeFaultType, InvalidOptionsFaultType, ResourcesCreationFaultType, GCUBEFault {
String name = params.getName();
logger.info("Creating the new Scope " + name);
@ -161,9 +155,7 @@ public class ResourceManager extends GCUBEPortType {
params.getServiceMap();
}
//String map = params.getServiceMap();
this.changeScopeOptions(params.getOptionsParameters());
return this.addResources(params.getAddResourcesParameters());
this.changeScopeOptions(params.getOptionsParameters());
}
/**

45
resource-manager-service/src/test/java/org/gcube/vremanagement/resourcemanager/impl/resources/types/MultiKeysMapTest.java
View File

@ -1,34 +1,30 @@
package org.gcube.vremanagement.resourcemanager.impl.resources.types;
import junit.framework.Assert;
import org.gcube.common.core.resources.GCUBEHostingNode;
import org.gcube.common.core.resources.GCUBERunningInstance;
import org.gcube.common.core.scope.GCUBEScope;
import org.gcube.vremanagement.resourcemanager.impl.resources.ScopedResource;
import org.gcube.vremanagement.resourcemanager.impl.resources.ScopedResourceFactory;
import org.junit.BeforeClass;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
import static org.junit.Assert.*;
import org.junit.AfterClass;
import org.junit.BeforeClass;
import org.junit.Test;
/**
*
* JUnit test for {@link MultiKeysMap}
*
* @author Manuele Simi (ISTI-CNR)
* @author Manuele Simi (CNR)
*
*/
public class MultiKeysMapTest {
private MultiKeysMap<String, String, ScopedResource> map;
public MultiKeysMapTest(String name) {
super(name);
@Before
public void create() {
this.map = new MultiKeysMap<String, String, ScopedResource>();
}
@ -61,8 +57,10 @@ public class MultiKeysMapTest {
@Test
public void testRemoveValue() throws Exception {
testPut();
ScopedResource ghn = ScopedResourceFactory.newResource("ID1", GCUBEHostingNode.TYPE, GCUBEScope.getScope("/gcube"));
map.removeValue(ghn);
printMap();
}
@ -72,26 +70,6 @@ public class MultiKeysMapTest {
map.removeValuesBySecondaryKey(ri.getType());
}
@Test
public void testGetValuesByPrimaryKey() {
fail("Not yet implemented");
}
@Test
public void testGetValuesBySecondaryKey() {
fail("Not yet implemented");
}
@Test
public void testPrimaryKeySet() {
fail("Not yet implemented");
}
@Test
public void testSecondaryKeySet() {
fail("Not yet implemented");
}
@Test
public void testValues() {
@ -100,15 +78,14 @@ public class MultiKeysMapTest {
}
}
@Test
@After
public void testClean() {
map.clean();
}
@Test
public void printMap() {
private void printMap() {
System.out.println("Values by KEY1:");
for (String key1 : map.primaryKeySet()) {
for (ScopedResource resource : map.getValuesByPrimaryKey(key1))

17
resource-manager-service/src/test/java/org/gcube/vremanagement/resourcemanager/impl/resources/types/MultiKeysTester.java
View File

@ -11,16 +11,20 @@ import org.gcube.vremanagement.resourcemanager.impl.resources.ScopedResource;
import org.gcube.vremanagement.resourcemanager.impl.resources.ScopedResourceFactory;
import org.gcube.vremanagement.resourcemanager.impl.resources.types.MultiKeysMap;
import static org.junit.Assert.*;
import org.junit.AfterClass;
import org.junit.BeforeClass;
import org.junit.Before;
import org.junit.Test;
/**
* JUnit test for {@link MultiKeysMap}
* @author manuele simi (CNR)
*
*/
public class MultiKeysTester {
MultiKeysMap<String, String, ScopedResource> map;
@Test
@Before
public void createMap() {
this.map = new MultiKeysMap<String, String, ScopedResource>();
}
@ -46,8 +50,7 @@ public class MultiKeysTester {
printMap(map);
}
@Test
public void printMap(MultiKeysMap<String, String, ScopedResource> map) {
private void printMap(MultiKeysMap<String, String, ScopedResource> map) {
System.out.println("Values by KEY1:");
for (String key1 : map.primaryKeySet()) {
for (ScopedResource resource : map.getValuesByPrimaryKey(key1))
@ -64,7 +67,7 @@ public class MultiKeysTester {
}
}
public class CollectionWatcher implements Observer {
class CollectionWatcher implements Observer {
public void update(Observable o, Object arg) {
System.out.println("Notified");

23
resource-manager-service/src/test/java/org/gcube/vremanagement/resourcemanager/impl/resources/state/ResourceListTest.java → resource-manager-service/src/test/java/org/gcube/vremanagement/resourcemanager/impl/state/ResourceListTest.java
View File

@ -3,17 +3,20 @@ package org.gcube.vremanagement.resourcemanager.impl.state;
import java.util.HashSet;
import java.util.Set;
import junit.framework.Assert;
import org.gcube.common.core.resources.GCUBEHostingNode;
import org.gcube.common.core.resources.GCUBERunningInstance;
import org.gcube.common.core.scope.GCUBEScope;
import org.gcube.vremanagement.resourcemanager.impl.resources.ScopedResource;
import org.gcube.vremanagement.resourcemanager.impl.resources.ScopedResourceFactory;
import org.gcube.vremanagement.resourcemanager.impl.state.ScopeState;
import com.thoughtworks.xstream.XStream;
import static org.junit.Assert.*;
import org.junit.AfterClass;
import org.junit.BeforeClass;
import org.junit.Before;
import org.junit.Test;
@ -35,17 +38,12 @@ public class ResourceListTest {
private ScopeState list;
@Test
public void initializeList(String name) {
@Before
public void initializeList() {
list = new ScopeState();
list.initialize(GCUBEScope.getScope(SCOPE), NAME, false, DESCRIPTION);
}
protected void setUp() throws Exception {
}
@Test
@ -63,7 +61,9 @@ public class ResourceListTest {
ri.setHostedON("node1.p:8080");
resourceToAdd.add(ri);
list.addResources(resourceToAdd);
Assert.assertEquals(3, list.getResourcesByType(ri.getType()).size());
Assert.assertEquals(1, list.getResourcesByType(ri.getType()).size());
Assert.assertEquals(2, list.getResourcesByType(ghn.getType()).size());
}
public void testGetResourcesByType() {
@ -101,9 +101,8 @@ public class ResourceListTest {
fail("Not yet implemented");
}
@Test
protected void tearDown() throws Exception {
public void print() throws Exception {
XStream stream = new XStream();
stream.processAnnotations(ScopeState.class);
System.out.println(stream.toXML(list));

15
resource-manager-stubs/.classpath Normal file
View File

@ -0,0 +1,15 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="src" output="target/classes" path="src/main/java"/>
<classpathentry excluding="**" kind="src" output="target/classes" path="src/main/resources"/>
<classpathentry kind="src" output="target/test-classes" path="src/test/java"/>
<classpathentry excluding="**" kind="src" output="target/test-classes" path="src/test/resources"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER"/>
<classpathentry kind="src" output="target/classes" path="target/generated-sources/stubs">
<attributes>
<attribute name="optional" value="true"/>
</attributes>
</classpathentry>
<classpathentry kind="output" path="target/classes"/>
</classpath>

23
resource-manager-stubs/.project Normal file
View File

@ -0,0 +1,23 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
<name>resource-manager-stubs</name>
<comment></comment>
<projects>
</projects>
<buildSpec>
<buildCommand>
<name>org.eclipse.jdt.core.javabuilder</name>
<arguments>
</arguments>
</buildCommand>
<buildCommand>
<name>org.eclipse.m2e.core.maven2Builder</name>
<arguments>
</arguments>
</buildCommand>
</buildSpec>
<natures>
<nature>org.eclipse.jdt.core.javanature</nature>
<nature>org.eclipse.m2e.core.maven2Nature</nature>
</natures>
</projectDescription>

7
resource-manager-stubs/.settings/org.eclipse.core.resources.prefs Normal file
View File

@ -0,0 +1,7 @@
#Thu May 31 16:30:47 EDT 2012
eclipse.preferences.version=1
encoding//src/main/java=UTF-8
encoding//src/main/resources=UTF-8
encoding//src/test/java=UTF-8
encoding//src/test/resources=UTF-8
encoding/<project>=UTF-8

6
resource-manager-stubs/.settings/org.eclipse.jdt.core.prefs Normal file
View File

@ -0,0 +1,6 @@
#Thu May 31 16:30:47 EDT 2012
eclipse.preferences.version=1
org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
org.eclipse.jdt.core.compiler.compliance=1.6
org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
org.eclipse.jdt.core.compiler.source=1.6

5
resource-manager-stubs/.settings/org.eclipse.m2e.core.prefs Normal file
View File

@ -0,0 +1,5 @@
#Thu May 31 16:30:32 EDT 2012
activeProfiles=
eclipse.preferences.version=1
resolveWorkspaceProjects=true
version=1

20
resource-manager-stubs/pom.xml
View File

@ -20,13 +20,11 @@
<dependency>
<groupId>org.gcube.core</groupId>
<artifactId>gcf</artifactId>
<version>[1.4.0-SNAPSHOT,1.5.0)</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.8.2</version>
<scope>test</scope>
</dependency>
@ -64,9 +62,21 @@
<configuration>
<wsdls>
<wsdl>
<name>ResourceManager</name>
<relativePackage>stubs.resourcemanager</relativePackage>
<namespace>${namespace}</namespace>
<name>ResourceBinder</name>
<relativePackage>stubs.binder</relativePackage>
<namespace>${namespace}/binder</namespace>
<additionalMappings>-Nhttp://gcube-system.org/common/vremanagement/types=${basepackage}.stubs.common</additionalMappings>
</wsdl>
<wsdl>
<name>ScopeController</name>
<relativePackage>stubs.scontroller</relativePackage>
<namespace>${namespace}/controller</namespace>
<additionalMappings>-Nhttp://gcube-system.org/common/vremanagement/types=${basepackage}.stubs.common</additionalMappings>
</wsdl>
<wsdl>
<name>Reporting</name>
<relativePackage>stubs.reporting</relativePackage>
<namespace>${namespace}/reporting</namespace>
<additionalMappings>-Nhttp://gcube-system.org/common/vremanagement/types=${basepackage}.stubs.common</additionalMappings>
</wsdl>
</wsdls>

10
resource-manager-test-suite/.classpath Normal file
View File

@ -0,0 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="src" output="target/classes" path="src/main/java"/>
<classpathentry excluding="**" kind="src" output="target/classes" path="src/main/resources"/>
<classpathentry kind="src" output="target/test-classes" path="src/test/java"/>
<classpathentry excluding="**" kind="src" output="target/test-classes" path="src/test/resources"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER"/>
<classpathentry kind="output" path="target/classes"/>
</classpath>

23
resource-manager-test-suite/.project Normal file
View File

@ -0,0 +1,23 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
<name>resource-manager-test-suite</name>
<comment></comment>
<projects>
</projects>
<buildSpec>
<buildCommand>
<name>org.eclipse.jdt.core.javabuilder</name>
<arguments>
</arguments>
</buildCommand>
<buildCommand>
<name>org.eclipse.m2e.core.maven2Builder</name>
<arguments>
</arguments>
</buildCommand>
</buildSpec>
<natures>
<nature>org.eclipse.jdt.core.javanature</nature>
<nature>org.eclipse.m2e.core.maven2Nature</nature>
</natures>
</projectDescription>

7
resource-manager-test-suite/.settings/org.eclipse.core.resources.prefs Normal file
View File

@ -0,0 +1,7 @@
#Thu May 31 16:30:48 EDT 2012
eclipse.preferences.version=1
encoding//src/main/java=UTF-8
encoding//src/main/resources=UTF-8
encoding//src/test/java=UTF-8
encoding//src/test/resources=UTF-8
encoding/<project>=UTF-8

6
resource-manager-test-suite/.settings/org.eclipse.jdt.core.prefs Normal file
View File

@ -0,0 +1,6 @@
#Thu May 31 16:30:48 EDT 2012
eclipse.preferences.version=1
org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
org.eclipse.jdt.core.compiler.compliance=1.6
org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
org.eclipse.jdt.core.compiler.source=1.6

5
resource-manager-test-suite/.settings/org.eclipse.m2e.core.prefs Normal file
View File

@ -0,0 +1,5 @@
#Thu May 31 16:30:32 EDT 2012
activeProfiles=
eclipse.preferences.version=1
resolveWorkspaceProjects=true
version=1

2
resource-manager-test-suite/pom.xml
View File

@ -26,7 +26,6 @@
<dependency>
<groupId>org.gcube.core</groupId>
<artifactId>gcf</artifactId>
<version>[1.4.0-SNAPSHOT,1.5.0)</version>
<scope>provided</scope>
</dependency>
@ -45,7 +44,6 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.8.2</version>
<scope>test</scope>
</dependency>

128
wsdl/Reporting.wsdl Normal file
View File

@ -0,0 +1,128 @@
<?xml version="1.0" encoding="UTF-8"?>
<definitions name="Reporting"
targetNamespace="http://gcube-system.org/namespaces/vremanagement/resourcemanager/reporting"
xmlns="http://schemas.xmlsoap.org/wsdl/"
xmlns:tns="http://gcube-system.org/namespaces/vremanagement/resourcemanager/reporting"
xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
xmlns:provider="http://gcube-system.org/namespaces/common/core/porttypes/GCUBEProvider"
xmlns:coretypes="http://gcube-system.org/namespaces/common/core/types"
xmlns:corefaults="http://gcube-system.org/namespaces/common/core/faults"
xmlns:vretypes="http://gcube-system.org/common/vremanagement/types"
xmlns:wsrlw="http://docs.oasis-open.org/wsrf/2004/06/wsrf-WS-ResourceLifetime-1.2-draft-01.wsdl"
xmlns:wsrp="http://docs.oasis-open.org/wsrf/2004/06/wsrf-WS-ResourceProperties-1.2-draft-01.xsd"
xmlns:wsntw="http://docs.oasis-open.org/wsn/2004/06/wsn-WS-BaseNotification-1.2-draft-01.wsdl"
xmlns:wsdlpp="http://www.globus.org/namespaces/2004/10/WSDLPreprocessor"
xmlns:xsd="http://www.w3.org/2001/XMLSchema">
<import namespace="http://gcube-system.org/namespaces/common/core/porttypes/GCUBEProvider" location="../gcube/common/core/providers/GCUBEProvider.wsdl"/>
<import namespace="http://gcube-system.org/namespaces/common/core/faults" location="../gcube/common/core/faults/GCUBEFaults.wsdl"/>
<import namespace="http://gcube-system.org/common/vremanagement/types" location="VREManagementTypes.wsdl"/>
<!--============================================================
T Y P E S
============================================================-->
<types>
<xsd:schema targetNamespace="http://gcube-system.org/namespaces/vremanagement/resourcemanager/reporting"
xmlns:tns="http://gcube-system.org/namespaces/vremanagement/resourcemanager/reporting"
xmlns:xsd="http://www.w3.org/2001/XMLSchema">
<xsd:import namespace="http://gcube-system.org/namespaces/common/core/types" schemaLocation="../gcube/common/core/types/GCUBETypes.xsd"/>
<xsd:import namespace="http://gcube-system.org/common/vremanagement/types" schemaLocation="VREManagementTypes.xsd"/>
<xsd:element name="VOID">
<xsd:complexType/>
</xsd:element>
<xsd:element name="sendReportParameters">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="callbackID" type="xsd:string"/>
<xsd:element name="report" type="xsd:string"/>
</xsd:sequence>
</xsd:complexType>
</xsd:element>
<xsd:element name="reportID" type="xsd:string"/>
<xsd:element name="report" type="xsd:string"/>
<xsd:element name="NoSuchReportFaultType">
<xsd:complexType>
<xsd:complexContent>
<xsd:extension base="corefaults:GCUBEUnrecoverableFault">
<xsd:sequence/>
</xsd:extension>
</xsd:complexContent>
</xsd:complexType>
</xsd:element>
<xsd:element name="InvalidScopeFaultType">
<xsd:complexType>
<xsd:complexContent>
<xsd:extension base="corefaults:GCUBEUnrecoverableFault">
<xsd:sequence/>
</xsd:extension>
</xsd:complexContent>
</xsd:complexType>
</xsd:element>
</xsd:schema>
</types>
<!--============================================================
M E S S A G E S
============================================================-->
<message name="ReportID">
<part name="request" element="tns:reportID"/>
</message>
<message name="SendReportInputMessage">
<part name="request" element="tns:sendReportParameters"/>
</message>
<message name="GetReportInputMessage">
<part name="request" element="tns:reportID"/>
</message>
<message name="GetReportResponseMessage">
<part name="request" element="tns:report"/>
</message>
<message name="VoidMessage">
<part name="response" element="tns:VOID"/>
</message>
<message name="InvalidScopeFaultMessage">
<part name="fault" element="vretypes:InvalidScopeFaultType"/>
</message>
<message name="NoSuchReportFaultMessage">
<part name="fault" element="tns:NoSuchReportFaultType"/>
</message>
<!--============================================================
P O R T T Y P E
============================================================-->
<portType name="ReportingPortType"
wsdlpp:extends="provider:GCUBEProvider">
<operation name="SendReport">
<input message="tns:SendReportInputMessage"/>
<output message="tns:VoidMessage"/>
<fault name="fault" message="tns:InvalidScopeFaultMessage" />
</operation>
<operation name="GetReport">
<input message="tns:GetReportInputMessage"/>
<output message="tns:GetReportResponseMessage"/>
<fault name="fault1" message="tns:InvalidScopeFaultMessage"/>
<fault name="fault2" message="tns:NoSuchReportFaultMessage"/>
</operation>
</portType>
</definitions>

162
wsdl/ResourceManager.wsdl → wsdl/ResourceBinder.wsdl
View File

@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<definitions name="ResourceManager"
targetNamespace="http://gcube-system.org/namespaces/vremanagement/resourcemanager"
<definitions name="ResourceBinder"
targetNamespace="http://gcube-system.org/namespaces/vremanagement/resourcemanager/binder"
xmlns="http://schemas.xmlsoap.org/wsdl/"
xmlns:tns="http://gcube-system.org/namespaces/vremanagement/resourcemanager"
xmlns:tns="http://gcube-system.org/namespaces/vremanagement/resourcemanager/binder"
xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
xmlns:provider="http://gcube-system.org/namespaces/common/core/porttypes/GCUBEProvider"
xmlns:coretypes="http://gcube-system.org/namespaces/common/core/types"
@ -27,8 +27,8 @@
============================================================-->
<types>
<xsd:schema targetNamespace="http://gcube-system.org/namespaces/vremanagement/resourcemanager"
xmlns:tns="http://gcube-system.org/namespaces/vremanagement/resourcemanager"
<xsd:schema targetNamespace="http://gcube-system.org/namespaces/vremanagement/resourcemanager/binder"
xmlns:tns="http://gcube-system.org/namespaces/vremanagement/resourcemanager/binder"
xmlns:xsd="http://www.w3.org/2001/XMLSchema">
<xsd:import namespace="http://gcube-system.org/namespaces/common/core/types" schemaLocation="../gcube/common/core/types/GCUBETypes.xsd"/>
@ -36,11 +36,7 @@
<xsd:simpleType name="resourceID">
<xsd:restriction base="xsd:string" />
</xsd:simpleType>
<xsd:element name="VOID">
<xsd:complexType/>
</xsd:element>
</xsd:simpleType>
<xsd:complexType name="ServiceItem">
<xsd:sequence>
@ -91,73 +87,10 @@
</xsd:complexType>
</xsd:element>
<xsd:element name="sendReportParameters">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="callbackID" type="xsd:string"/>
<xsd:element name="report" type="xsd:string"/>
</xsd:sequence>
</xsd:complexType>
</xsd:element>
<xsd:complexType name="ScopeOption">
<xsd:sequence>
<xsd:element name="name" type="xsd:string"/>
<xsd:element name="value" type="xsd:string"/>
</xsd:sequence>
</xsd:complexType>
<xsd:element name="optionsParameters">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="ScopeOptionList" type="tns:ScopeOption" minOccurs="1" maxOccurs="unbounded"/>
</xsd:sequence>
</xsd:complexType>
</xsd:element>
<xsd:element name="disposeScopeParameters">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="Name" type="coretypes:scope"/>
</xsd:sequence>
</xsd:complexType>
</xsd:element>
<xsd:element name="createScopeParameters">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="Name" type="coretypes:scope"/>
<xsd:element name="ServiceMap" type="xsd:string" minOccurs="0" maxOccurs="1"/>
<xsd:element ref="tns:optionsParameters"/>
<xsd:element ref="tns:addResourcesParameters"/>
</xsd:sequence>
</xsd:complexType>
</xsd:element>
<xsd:element name="GHN" type="tns:resourceID"/>
<xsd:element name="reportID" type="xsd:string"/>
<xsd:element name="report" type="xsd:string"/>
<xsd:element name="InvalidScopeFaultType">
<xsd:complexType>
<xsd:complexContent>
<xsd:extension base="corefaults:GCUBEUnrecoverableFault">
<xsd:sequence/>
</xsd:extension>
</xsd:complexContent>
</xsd:complexType>
</xsd:element>
<xsd:element name="InvalidOptionsFaultType">
<xsd:complexType>
<xsd:complexContent>
<xsd:extension base="corefaults:GCUBEUnrecoverableFault">
<xsd:sequence/>
</xsd:extension>
</xsd:complexContent>
</xsd:complexType>
</xsd:element>
<xsd:element name="ResourcesCreationFaultType">
<xsd:complexType>
<xsd:complexContent>
@ -167,6 +100,7 @@
</xsd:complexContent>
</xsd:complexType>
</xsd:element>
<xsd:element name="ResourcesRemovalFaultType">
<xsd:complexType>
<xsd:complexContent>
@ -175,17 +109,7 @@
</xsd:extension>
</xsd:complexContent>
</xsd:complexType>
</xsd:element>
<xsd:element name="NoSuchReportFaultType">
<xsd:complexType>
<xsd:complexContent>
<xsd:extension base="corefaults:GCUBEUnrecoverableFault">
<xsd:sequence/>
</xsd:extension>
</xsd:complexContent>
</xsd:complexType>
</xsd:element>
</xsd:element>
</xsd:schema>
</types>
@ -203,33 +127,9 @@
</message>
<message name="RemoveResourcesInputMessage">
<part name="request" element="tns:removeResourcesParameters"/>
</message>
<message name="SendReportInputMessage">
<part name="request" element="tns:sendReportParameters"/>
</message>
<message name="ChangeScopeOptionsInputMessage">
<part name="request" element="tns:optionsParameters"/>
</message>
<message name="DisposeScopeInputMessage">
<part name="request" element="tns:disposeScopeParameters"/>
</message>
<message name="CreateScopeInputMessage">
<part name="request" element="tns:createScopeParameters"/>
</message>
<message name="GetReportInputMessage">
<part name="request" element="tns:reportID"/>
</message>
<message name="GetReportResponseMessage">
<part name="request" element="tns:report"/>
</message>
<message name="VoidMessage">
<part name="response" element="tns:VOID"/>
</message>
</message>
<wsdl:message name="InvalidScopeFaultMessage">
<part name="fault" element="tns:InvalidScopeFaultType"/>
</wsdl:message>
<wsdl:message name="InvalidOptionsFaultMessage">
<part name="fault" element="tns:InvalidOptionsFaultType"/>
<part name="fault" element="vretypes:InvalidScopeFaultType"/>
</wsdl:message>
<wsdl:message name="ResourcesCreationFaultMessage">
<part name="fault" element="tns:ResourcesCreationFaultType"/>
@ -237,15 +137,13 @@
<wsdl:message name="ResourcesRemovalFaultMessage">
<part name="fault" element="tns:ResourcesRemovalFaultType"/>
</wsdl:message>
<wsdl:message name="NoSuchReportFaultMessage">
<part name="fault" element="tns:NoSuchReportFaultType"/>
</wsdl:message>
<!--============================================================
P O R T T Y P E
============================================================-->
<portType name="ResourceManagerPortType"
<portType name="ResourceBinderPortType"
wsdlpp:extends="provider:GCUBEProvider">
<operation name="AddResources">
@ -262,40 +160,6 @@
<fault name="fault1" message="tns:InvalidScopeFaultMessage"/>
</operation>
<operation name="ChangeScopeOptions">
<input message="tns:ChangeScopeOptionsInputMessage"/>
<output message="tns:VoidMessage"/>
<fault name="fault" message="tns:InvalidOptionsFaultMessage"/>
<fault name="fault1" message="tns:InvalidScopeFaultMessage"/>
</operation>
<operation name="DisposeScope">
<input message="tns:DisposeScopeInputMessage"/>
<output message="tns:ReportID"/>
<fault name="fault" message="tns:InvalidScopeFaultMessage"/>
</operation>
<operation name="CreateScope">
<input message="tns:CreateScopeInputMessage"/>
<output message="tns:ReportID"/>
<fault name="fault1" message="tns:InvalidScopeFaultMessage"/>
<fault name="fault2" message="tns:InvalidOptionsFaultMessage"/>
<fault name="fault3" message="tns:ResourcesCreationFaultMessage"/>
</operation>
<operation name="SendReport">
<input message="tns:SendReportInputMessage"/>
<output message="tns:VoidMessage"/>
<fault name="fault" message="corefaults:GCUBEFaultMessage"/>
</operation>
<operation name="GetReport">
<input message="tns:GetReportInputMessage"/>
<output message="tns:GetReportResponseMessage"/>
<fault name="fault1" message="tns:InvalidScopeFaultMessage"/>
<fault name="fault2" message="tns:NoSuchReportFaultMessage"/>
</operation>
</portType>
</definitions>

152
wsdl/ScopeController.wsdl Normal file
View File

@ -0,0 +1,152 @@
<?xml version="1.0" encoding="UTF-8"?>
<definitions name="ScopeController"
targetNamespace="http://gcube-system.org/namespaces/vremanagement/resourcemanager/controller"
xmlns="http://schemas.xmlsoap.org/wsdl/"
xmlns:tns="http://gcube-system.org/namespaces/vremanagement/resourcemanager/controller"
xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
xmlns:provider="http://gcube-system.org/namespaces/common/core/porttypes/GCUBEProvider"
xmlns:coretypes="http://gcube-system.org/namespaces/common/core/types"
xmlns:corefaults="http://gcube-system.org/namespaces/common/core/faults"
xmlns:vretypes="http://gcube-system.org/common/vremanagement/types"
xmlns:wsrlw="http://docs.oasis-open.org/wsrf/2004/06/wsrf-WS-ResourceLifetime-1.2-draft-01.wsdl"
xmlns:wsrp="http://docs.oasis-open.org/wsrf/2004/06/wsrf-WS-ResourceProperties-1.2-draft-01.xsd"
xmlns:wsntw="http://docs.oasis-open.org/wsn/2004/06/wsn-WS-BaseNotification-1.2-draft-01.wsdl"
xmlns:wsdlpp="http://www.globus.org/namespaces/2004/10/WSDLPreprocessor"
xmlns:xsd="http://www.w3.org/2001/XMLSchema">
<import namespace="http://gcube-system.org/namespaces/common/core/porttypes/GCUBEProvider" location="../gcube/common/core/providers/GCUBEProvider.wsdl"/>
<import namespace="http://gcube-system.org/namespaces/common/core/faults" location="../gcube/common/core/faults/GCUBEFaults.wsdl"/>
<import namespace="http://gcube-system.org/common/vremanagement/types" location="VREManagementTypes.wsdl"/>
<!--============================================================
T Y P E S
============================================================-->
<types>
<xsd:schema targetNamespace="http://gcube-system.org/namespaces/vremanagement/resourcemanager/controller"
xmlns:tns="http://gcube-system.org/namespaces/vremanagement/resourcemanager/controller"
xmlns:xsd="http://www.w3.org/2001/XMLSchema">
<xsd:import namespace="http://gcube-system.org/namespaces/common/core/types" schemaLocation="../gcube/common/core/types/GCUBETypes.xsd"/>
<xsd:import namespace="http://gcube-system.org/common/vremanagement/types" schemaLocation="VREManagementTypes.xsd"/>
<xsd:element name="reportID" type="xsd:string"/>
<xsd:element name="VOID">
<xsd:complexType/>
</xsd:element>
<xsd:complexType name="ScopeOption">
<xsd:sequence>
<xsd:element name="name" type="xsd:string"/>
<xsd:element name="value" type="xsd:string"/>
</xsd:sequence>
</xsd:complexType>
<xsd:element name="optionsParameters">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="ScopeOptionList" type="tns:ScopeOption" minOccurs="1" maxOccurs="unbounded"/>
</xsd:sequence>
</xsd:complexType>
</xsd:element>
<xsd:element name="disposeScopeParameters">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="Name" type="coretypes:scope"/>
</xsd:sequence>
</xsd:complexType>
</xsd:element>
<xsd:element name="createScopeParameters">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="Name" type="coretypes:scope"/>
<xsd:element name="ServiceMap" type="xsd:string" minOccurs="0" maxOccurs="1"/>
<xsd:element ref="tns:optionsParameters"/>
</xsd:sequence>
</xsd:complexType>
</xsd:element>
<xsd:element name="InvalidOptionsFaultType">
<xsd:complexType>
<xsd:complexContent>
<xsd:extension base="corefaults:GCUBEUnrecoverableFault">
<xsd:sequence/>
</xsd:extension>
</xsd:complexContent>
</xsd:complexType>
</xsd:element>
</xsd:schema>
</types>
<!--============================================================
M E S S A G E S
============================================================-->
<message name="ChangeScopeOptionsInputMessage">
<part name="request" element="tns:optionsParameters"/>
</message>
<message name="DisposeScopeInputMessage">
<part name="request" element="tns:disposeScopeParameters"/>
</message>
<message name="CreateScopeInputMessage">
<part name="request" element="tns:createScopeParameters"/>
</message>
<message name="ReportID">
<part name="request" element="tns:reportID"/>
</message>
<message name="VoidMessage">
<part name="response" element="tns:VOID"/>
</message>
<wsdl:message name="InvalidScopeFaultMessage">
<part name="fault" element="vretypes:InvalidScopeFaultType"/>
</wsdl:message>
<wsdl:message name="InvalidOptionsFaultMessage">
<part name="fault" element="tns:InvalidOptionsFaultType"/>
</wsdl:message>
<!--============================================================
P O R T T Y P E
============================================================-->
<portType name="ScopeControllerPortType"
wsdlpp:extends="provider:GCUBEProvider">
<operation name="ChangeScopeOptions">
<input message="tns:ChangeScopeOptionsInputMessage"/>
<output message="tns:VoidMessage"/>
<fault name="fault" message="tns:InvalidOptionsFaultMessage"/>
<fault name="fault1" message="tns:InvalidScopeFaultMessage"/>
</operation>
<operation name="DisposeScope">
<input message="tns:DisposeScopeInputMessage"/>
<output message="tns:ReportID"/>
<fault name="fault" message="tns:InvalidScopeFaultMessage"/>
</operation>
<operation name="CreateScope">
<input message="tns:CreateScopeInputMessage"/>
<output message="tns:VoidMessage"/>
<fault name="fault1" message="tns:InvalidScopeFaultMessage"/>
<fault name="fault2" message="tns:InvalidOptionsFaultMessage"/>
</operation>
</portType>
</definitions>

18
wsdl/VREManagementTypes.wsdl
View File

@ -2,11 +2,16 @@
<definitions name="VREManagementTypes"
targetNamespace="http://gcube-system.org/common/vremanagement/types"
xmlns:tns="http://gcube-system.org/common/vremanagement/types"
xmlns:coretypes="http://gcube-system.org/namespaces/common/core/types"
xmlns:corefaults="http://gcube-system.org/namespaces/common/core/faults"
xmlns="http://schemas.xmlsoap.org/wsdl/"
xmlns:xs="http://www.w3.org/2001/XMLSchema"
xmlns:wsa="http://schemas.xmlsoap.org/ws/2004/03/addressing"
elementFormDefault="qualified" attributeFormDefault="unqualified">
<import namespace="http://gcube-system.org/namespaces/common/core/faults" location="../gcube/common/core/faults/GCUBEFaults.wsdl"/>
<!--============================================================
T Y P E S
@ -17,9 +22,20 @@
targetNamespace="http://gcube-system.org/common/vremanagement/types"
xmlns:tns="http://gcube-system.org/common/vremanagement/types">
<!-- <xs:import namespace="http://schemas.xmlsoap.org/ws/2004/03/addressing" schemaLocation="../../../../ws/addressing/WS-Addressing.xsd" /> -->
<xs:import namespace="http://schemas.xmlsoap.org/ws/2004/03/addressing" schemaLocation="../ws/addressing/WS-Addressing.xsd" />
<xs:include schemaLocation="VREManagementTypes.xsd" />
<xs:element name="InvalidScopeFaultType">
<xs:complexType>
<xs:complexContent>
<xs:extension base="corefaults:GCUBEUnrecoverableFault">
<xs:sequence/>
</xs:extension>
</xs:complexContent>
</xs:complexType>
</xs:element>
</xs:schema>
</types>