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

etc/deploy-jndi-config.xml

@@ -55,6 +55,10 @@
 		          <parameter>
 		                <name>resourceClass</name>
 		                <value>org.gcube.vremanagement.vremodeler.impl.ModelerResource</value>
+		          </parameter>
+		          <parameter>
+                   	 	<name>persistenceDelegateClass</name>
+                    	<value>org.gcube.vremanagement.vremodeler.impl.ModelerPersistenceDelegate</value>
                 </parameter>
 		          </resourceParams>
 	 </resource>

etc/hsqldb/vdldb.script

@@ -32,31 +32,33 @@ INSERT INTO PORTLET VALUES('Search', null, null)
 INSERT INTO PORTLET VALUES('search', null, 'Search')
 INSERT INTO PORTLET VALUES('CollectionsNavigatorPortlet','collectionsnavigator#CollectionsNavigatorPortlet', 'search')
 INSERT INTO PORTLET VALUES('GSPortlet','searchGUI#Search', 'search')
-INSERT INTO FUNCTIONALITY VALUES(0,'Simple Search','By selecting this function VRE users will be provided with facilities supporting the discovery of Information Objects by issuing simple keyword based queries. This is the simplest modality for discovering the Information Objects constituting the VRE Information Space. In addition to the specification of the keywords characterising the Information Objects the user is interested in, this function permit to restrict the Information Space in which to search by specifying the set of Collections against which the query will be evaluated.',9,0)
+
-INSERT INTO FUNCTIONALITY VALUES(1,'Fielded Search (Advanced)','By selecting this function VRE users will be provided with facilities supporting the discovery of Information Objects by issuing complex queries specifying per field conditions, e.g. queries like "Title contains Diligent and Creator contains Diligent Team". Such per-field conditions can be combined to request objects matching all the specified conditions (conjunctive queries) or any of the specified conditions (disjunctive queries). In addition to the specification of the conditions characterising the Information Objects the user is interested in, this function permit to restrict the Information Space in which to search by specifying the set of Collections against which the query will be evaluated.',9,0)
+INSERT INTO FUNCTIONALITY VALUES(0,'Search (Browse, Simple, and Combined)','By selecting this function VRE users will be provided with facilities supporting the discovery of Information Objects by issuing simple keyword based queries. This is the simplest modality for discovering the Information Objects constituting the VRE Information Space. In addition to the specification of the keywords characterising the Information Objects the user is interested in, this function permit to restrict the Information Space in which to search by specifying the set of Collections against which the query will be evaluated.',7,0)
-INSERT INTO FUNCTIONALITY VALUES(2,'Geospatial Search (Advanced)','By selecting this function VRE users will be provided with facilities supporting the discovery of Information Objects by issuing complex queries specifying temporal and geographical conditions. Temporal conditions will be specified by selecting the time frame of interest; this function provide VRE users with appropriate facilities for supporting this specification. Geographical conditions will be specified by selecting the geographical area of interest; this function provide VRE users with various facilities for specifying such an area ranging from the drawing of the area borders to the specification of the two opposite vertex of a square or the selection of a predefined area via its name. In addition to the specification of the temporal and geographical conditions characterising the Information Objects the user is interested in, this function permit to restrict the Information Space in which to search by specifying the set of Collections against which the query will be evaluated.',9,0)
+INSERT INTO FUNCTIONALITY VALUES(1,'Annotation','By selecting this function VRE users will be provided with facilities for annotating Information Objects. Annotations are additional Information Objects including notes, structured comments or links that an Actor may associate to an existing Information Object to add an interpretative value. This function is particularly useful to support co-operation between the users of a VRE since it allows not only to enrich an Information Object with personal observation and thus share this comment within the VRE community but, in general, also as a mean for transmitting and sharing ideas and thus doing research.',8,0)
-INSERT INTO FUNCTIONALITY VALUES(3,'Google Search','By selecting this function VRE users will be provided with facilities supporting the discovery of Information Objects through Google and thus conceptually residing in the Web. Google is nowadays one of the most used search engines for the World Wide Web, the activation of this function integrates the power of such a search engine into the Virtual Research Environment providing thus providing the VRE users with operations for searching the Web and using the discovered objects to accomplish their activities.',9,0)
+INSERT INTO FUNCTIONALITY VALUES(2,'Report definition','By selecting this function VRE users will be provided with facilities for report management, e.g. report creation. Reports are a special type of Information Object that is characterised by an intensional definition, i.e. the creator defines the report template that characterised the report in a definitional way by specifying the shape and content of this compound Information Object. Such an Information Objects is a "living object", i.e. each time the report is accessed its specification is interpreted and the constituent parts are materialised by using the information currently available in the VRE. Each of such "living objects" can be materialised as to produce a version of it to be recorded into the VRE either as an HTML or a PDF Information Object',8,0)
-INSERT INTO FUNCTIONALITY VALUES(4,'Browse','By selecting this function VRE users will be provided with facilities supporting the discovery of Information Objects by browsing the specified Information Space. The function provide VRE users with facilities for specifying the field to organise the objects (e.g. Title), the criterion to sort the discovered objects (ascending versus descending), the number of objects per page, and the set of collections in which to search. Finally, the VRE user is provided with two visualisations options, i.e. to browse the possible values of the selected field only or to browse the whole objects according to the specified criteria.',9,0)
+INSERT INTO FUNCTIONALITY VALUES(3,'Course management','By selecting this function VRE users will be provided with facilities for courses management, e.g. course creation and course attendance. Each course is a learning environment providing consumers with an organised set of Information Objects and tools (e.g. chats, forums) tailored to support distant learning activities on a specific topic. This function rely on the MooVREe system, i.e. an open-source e-Learning environment system, and is fully integrated with the rest of the VRE content and functions, e.g. a course will be populated by using Information Objects residing into the VRE Information Space and discovered by using the search function. In addition to curate the content of each course, teachers (designated users) can customise each course by selecting among the activity modules supported by the system, e.g. chat, Glossary, Survey.',8,0)
-INSERT INTO FUNCTIONALITY VALUES(5,'Annotation','By selecting this function VRE users will be provided with facilities for annotating Information Objects. Annotations are additional Information Objects including notes, structured comments or links that an Actor may associate to an existing Information Object to add an interpretative value. This function is particularly useful to support co-operation between the users of a VRE since it allows not only to enrich an Information Object with personal observation and thus share this comment within the VRE community but, in general, also as a mean for transmitting and sharing ideas and thus doing research.',8,0)
+INSERT INTO FUNCTIONALITY VALUES(4,'Automatic Source Description, Selection, and Fusion','',7,0)
-INSERT INTO FUNCTIONALITY VALUES(6,'Report definition','By selecting this function VRE users will be provided with facilities for report management, e.g. report creation. Reports are a special type of Information Object that is characterised by an intensional definition, i.e. the creator defines the report template that characterised the report in a definitional way by specifying the shape and content of this compound Information Object. Such an Information Objects is a "living object", i.e. each time the report is accessed its specification is interpreted and the constituent parts are materialised by using the information currently available in the VRE. Each of such "living objects" can be materialised as to produce a version of it to be recorded into the VRE either as an HTML or a PDF Information Object.',8,0)
+INSERT INTO FUNCTIONALITY VALUES(5,'Advanced Search','',7,0)
-INSERT INTO FUNCTIONALITY VALUES(7,'Course management','By selecting this function VRE users will be provided with facilities for courses management, e.g. course creation and course attendance. Each course is a learning environment providing consumers with an organised set of Information Objects and tools (e.g. chats, forums) tailored to support distant learning activities on a specific topic. This function rely on the MooVREe system, i.e. an open-source e-Learning environment system, and is fully integrated with the rest of the VRE content and functions, e.g. a course will be populated by using Information Objects residing into the VRE Information Space and discovered by using the search function. In addition to curate the content of each course, teachers (designated users) can customise each course by selecting among the activity modules supported by the system, e.g. chat, Glossary, Survey.',8,0)
+INSERT INTO FUNCTIONALITY VALUES(6,'Report Template Definition','',8,0)
+INSERT INTO FUNCTIONALITY VALUES(7,'Access Functions','This class of functions characterises the facilities that can be activated in the Virtual Research Environment to support users in requesting, locating, and delivering the Virtual Research Environment Content.',NULL,0)
 INSERT INTO FUNCTIONALITY VALUES(8,'Content Functions','This class of functions characterises the additional Content Management facilities that can be activated in the Virtual Research Environment. The meaning of additional is related to the fact that a fundamental set of Content Management facilities are supported by any VRE and not subject to design choices, e.g. Information Object storage and visualisation. This class contains only the functions providing potential extra-features that can be activated in this specific VRE, e.g. the possibility to annotate Information Object and the possibility to edit Information Objects.',NULL,0)
-INSERT INTO FUNCTIONALITY VALUES(9,'Access Functions','This class of functions characterises the facilities that can be activated in the Virtual Research Environment to support users in requesting, locating, and delivering the Virtual Research Environment Content.',NULL,0)
+INSERT INTO FUNCTIONALITY VALUES(9,'Search by Query Expression','',7,0)
-INSERT INTO FUNCTIONALITY VALUES(10,'Workflow definition and execution','By selecting this function VRE users will be provided with facilities for defining, executing and monitoring workflows, i.e. processes delivering new functions by combining various service invocations into an organised (and even complex) sequence of steps.',NULL,0)
+INSERT INTO FUNCTIONALITY VALUES(10,'Google Search','By selecting this function VRE users will be provided with facilities supporting the discovery of Information Objects through Google and thus conceptually residing in the Web. Google is nowadays one of the most used search engines for the World Wide Web, the activation of this function integrates the power of such a search engine into the Virtual Research Environment providing thus providing the VRE users with operations for searching the Web and using the discovered objects to accomplish their activities.',7,0)
-INSERT INTO FUNCTIONALITY VALUES(11,'Transparent Replication','By selecting this function the Virtual Research Environment will be equipped with a feature acting in the background with the goal to guarantee that the Content managed by the Virtual Research Environment is stored with an adequate level of replication as to improve the content reliability and availability quality parameters. This feature is not directly perceived by the end-users of the VRE but its operation will contribute to improve the quality of the service of the resulting VRE. This function will transparently replicate the Information Objects and their constituents by relying on the distributed storage capacity the with which VRE will be provided.',8,0)
+INSERT INTO FUNCTIONALITY VALUES(11,'Metadata Editing','',8,0)
-INSERT INTO FUNCTIONALITY VALUES(12,'Transparent Distribution','By selecting this function the Virtual Research Environment will be equipped with a feature acting in the background with the goal to guarantee that the Content managed by the Virtual Research Environment is stored with an adequate level of distribution among the available storage devices as to improve the load balancing quality parameter. This feature is not directly perceived by the end-users of the VRE but its operation will contribute to improve the quality of the service of the resulting VRE. This function will transparently distribute the Information Objects and their constituents by relying on the distributed storage capacity with which the VRE will be provided.',8,0)
+
-INSERT INTO FUNCTIONALITY VALUES(13,'Content Watermarking','By selecting this function the Virtual Research Environment will be equipped with a feature acting in the background with the goal to guarantee that the Content managed by the Virtual Research Environment is automatically watermarked before its storage as to prevent unauthorised exploitation of it. This feature is not directly perceived by the end-users of the VRE but its operation will contribute to improve the quality of the service of the resulting VRE. This function will transparently apply watermarking algorithms to the Information Objects and their constituents before to store them on third party storage services as well as take care of their decoding before their consumption. The activation of this function will lead to an improvement of the content security parameter but also to an augment of the access time, i.e. the time needed to consume the object.',8,0)
-INSERT INTO FUNCTIONALITY VALUES(14,'Content Encryption','By selecting this function the Virtual Research Environment will be equipped with a feature acting in the background with the goal to guarantee that the Content managed by the Virtual Research Environment is automatically encrypted before its storage as to avoid unauthorised use of it. This feature is not directly perceived by the end-users of the VRE but its operation will contribute to improve the quality of the service of the resulting VRE. This function will transparently apply encryption algorithms to the Information Objects and their constituents before to store them on third party storage services as well as take care of their decoding before their consumption. The activation of this function will lead to an improvement of the content security parameter but also to an augment of the access time, i.e. the time needed to consume the object.',8,0)
-INSERT INTO FUNCTIONALITY VALUES(15,'Information Object Editing','By selecting this function VRE users will be provided with facilities for editing existing Information Objects. In particular, this function provides users with operation to modify existing Information Objects, more specifically their associated metadata.',8,0)
 INSERT INTO PORTLETRELTOFUNCT VALUES(0,'CollectionsNavigatorPortlet')
 INSERT INTO PORTLETRELTOFUNCT VALUES(0,'GSPortlet')
-INSERT INTO SERVICES VALUES(5,'ABE','Annotation')
+
+INSERT INTO SERVICES VALUES(1,'ABE','Annotation', '1.00.00')
 INSERT INTO SERVICES VALUES(0,'FilterXPathOperator','Search','1.00.00')
 INSERT INTO SERVICES VALUES(0,'JoinInnerOperatorService','Search','1.00.00')
 INSERT INTO SERVICES VALUES(0,'KeepTopOperatorService','Search','1.00.00')
 INSERT INTO SERVICES VALUES(0,'MergeOperator','Search','1.00.00')
-INSERT INTO SERVICES VALUES(3,'GoogleService','Search','1.00.00')
+INSERT INTO SERVICES VALUES(10,'GoogleService','Search','1.00.00')
 INSERT INTO SERVICES VALUES(0,'ResultSetService','Search','1.00.00')
 INSERT INTO SERVICES VALUES(0,'SearchMaster','Search','1.00.00')
 INSERT INTO SERVICES VALUES(0,'SortOperatorService','Search','1.00.00')
 INSERT INTO SERVICES VALUES(0,'TransformXsltOperatorService','Search','1.00.00')
+INSERT INTO SERVICES VALUES(4,'Master','DIR','1.00.00')
+
+

etc/profile.xml

@@ -61,11 +61,279 @@
 				<GARArchive>org.gcube.vremanagement.vremodeler.gar</GARArchive>
 				<PortType>
 					<Name>gcube/vremanagement/vremodeler/ModelerFactoryService</Name>
-					<WSDL/>
+					<WSDL>
+<definitions name="ModelerFactoryService"
+    targetNamespace="http://gcube-system.org/namespaces/vremanagement/vremodeler"
+    xmlns:tns="http://gcube-system.org/namespaces/vremanagement/vremodeler"
+  	xmlns="http://schemas.xmlsoap.org/wsdl/"
+    xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+    xmlns:coretypes="http://gcube-system.org/namespaces/common/core/types"
+    xmlns:corefaults="http://gcube-system.org/namespaces/common/core/faults"
+    xmlns:wsa="http://schemas.xmlsoap.org/ws/2004/03/addressing" >
+     
+    <import namespace="http://gcube-system.org/namespaces/common/core/faults" location="../gcube/common/core/faults/GCUBEFaults.wsdl"/>
+    
+    
+	<!--============================================================
+
+                      			T Y P E S
+
+	============================================================-->
+
+	<types>
+		<xsd:schema targetNamespace="http://gcube-system.org/namespaces/vremanagement/vremodeler"
+    		xmlns:tns="http://gcube-system.org/namespaces/vremanagement/vremodeler"
+    		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://schemas.xmlsoap.org/ws/2004/03/addressing" schemaLocation="../ws/addressing/WS-Addressing.xsd" />
+		 
+			<!-- REQUESTS AND RESPONSES -->
+			
+						
+			<xsd:element name="createResource" type="coretypes:VOID"/>
+			
+			<xsd:element name="createResourceResponse" type="wsa:EndpointReferenceType"/>
+			
+			
+			<xsd:element name="getAllVREsMessageResponse" type="xsd:string"/>
+    		<xsd:element name="getAllVREsMessageRequest" type="coretypes:VOID"/>
+				
+			
+    		
+    		<xsd:element name="initDBRequestMessage" type="coretypes:VOID"/>
+				
+			<xsd:element name="initDBResponseMessage" type="coretypes:VOID"/>
+			
+			<xsd:element name="removeVRERequestMessage" type="xsd:string"/>
+				
+				
+			<xsd:element name="removeVREResponseMessage" type="coretypes:VOID"/>
+			
+			<xsd:element name="getExistingNamesResponseMessage">
+			 <xsd:complexType>
+               	<xsd:sequence>
+                      <xsd:element name="names" type="xsd:string" minOccurs="0" maxOccurs="unbounded"/>
+              	</xsd:sequence>
+        	</xsd:complexType>
+			</xsd:element>
+			
+			<xsd:element name="getExistingNamesRequestMessage" type="coretypes:VOID"/>
+			
+    	</xsd:schema>
+	</types>
+
+
+
+	<!--============================================================
+
+                       M E S S A G E S
+                      
+  	============================================================-->
+  	<message name="CreateResourceRequest">
+		<part name="request" element="tns:createResource"/>
+	</message>
+	<message name="CreateResourceResponse">
+		<part name="response" element="tns:createResourceResponse"/>
+	</message>
+    <message name="GetAllVREsRequest">
+		<part name="request" element="tns:getAllVREsMessageRequest"/>
+	</message>
+	<message name="GetAllVREsResponse">
+		<part name="response" element="tns:getAllVREsMessageResponse"/>
+	</message>
+	<message name="InitDBInputMessage">
+		<part name="request" element="tns:initDBRequestMessage"/>
+	</message>
+	<message name="InitDBOutputMessage">
+		<part name="response" element="tns:initDBResponseMessage"/>
+	</message>
+	<message name="RemoveVREInputMessage">
+		<part name="request" element="tns:removeVRERequestMessage"/>
+	</message>
+	<message name="RemoveVREOutputMessage">
+		<part name="response" element="tns:removeVREResponseMessage"/>
+	</message>
+	<message name="GetExistingNamesInputMessage">
+		<part name="request" element="tns:getExistingNamesRequestMessage"/>
+	</message>
+	<message name="GetExistingNamesOutputMessage">
+		<part name="response" element="tns:getExistingNamesResponseMessage"/>
+	</message>
+
+	<!--============================================================
+
+                       P O R T T Y P E
+                      
+	============================================================-->
+
+	<portType name="ModelerFactoryPortType">
+		<operation name="createResource">
+			<input message="tns:CreateResourceRequest"/>
+			<output message="tns:CreateResourceResponse"/>
+		</operation>
+		<operation name="getAllVREs">
+			<input message="tns:GetAllVREsRequest"/>
+			<output message="tns:GetAllVREsResponse"/>
+		</operation>
+	
+		<operation name="initDB">
+			<input message="tns:InitDBInputMessage"/>
+			<output message="tns:InitDBOutputMessage"/>
+		</operation>
+		
+		<operation name="getExistingNamesVREs">
+			<input message="tns:GetExistingNamesInputMessage"/>
+			<output message="tns:GetExistingNamesOutputMessage"/>
+		</operation>
+		
+		<operation name="removeVRE">
+			<input message="tns:RemoveVREInputMessage"/>
+			<output message="tns:RemoveVREOutputMessage"/>
+		</operation>
+	</portType>
+
+
+
+</definitions></WSDL>
 				</PortType>
 				<PortType>
 					<Name>gcube/vremanagement/vremodeler/ModelerService</Name>
-					<WSDL/>
+					<WSDL>
+<definitions name="ModelerFactoryService"
+    targetNamespace="http://gcube-system.org/namespaces/vremanagement/vremodeler"
+    xmlns:tns="http://gcube-system.org/namespaces/vremanagement/vremodeler"
+  	xmlns="http://schemas.xmlsoap.org/wsdl/"
+    xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+    xmlns:coretypes="http://gcube-system.org/namespaces/common/core/types"
+    xmlns:corefaults="http://gcube-system.org/namespaces/common/core/faults"
+    xmlns:wsa="http://schemas.xmlsoap.org/ws/2004/03/addressing" >
+     
+    <import namespace="http://gcube-system.org/namespaces/common/core/faults" location="../gcube/common/core/faults/GCUBEFaults.wsdl"/>
+    
+    
+	<!--============================================================
+
+                      			T Y P E S
+
+	============================================================-->
+
+	<types>
+		<xsd:schema targetNamespace="http://gcube-system.org/namespaces/vremanagement/vremodeler"
+    		xmlns:tns="http://gcube-system.org/namespaces/vremanagement/vremodeler"
+    		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://schemas.xmlsoap.org/ws/2004/03/addressing" schemaLocation="../ws/addressing/WS-Addressing.xsd" />
+		 
+			<!-- REQUESTS AND RESPONSES -->
+			
+						
+			<xsd:element name="createResource" type="coretypes:VOID"/>
+			
+			<xsd:element name="createResourceResponse" type="wsa:EndpointReferenceType"/>
+			
+			
+			<xsd:element name="getAllVREsMessageResponse" type="xsd:string"/>
+    		<xsd:element name="getAllVREsMessageRequest" type="coretypes:VOID"/>
+				
+			
+    		
+    		<xsd:element name="initDBRequestMessage" type="coretypes:VOID"/>
+				
+			<xsd:element name="initDBResponseMessage" type="coretypes:VOID"/>
+			
+			<xsd:element name="removeVRERequestMessage" type="xsd:string"/>
+				
+				
+			<xsd:element name="removeVREResponseMessage" type="coretypes:VOID"/>
+			
+			<xsd:element name="getExistingNamesResponseMessage">
+			 <xsd:complexType>
+               	<xsd:sequence>
+                      <xsd:element name="names" type="xsd:string" minOccurs="0" maxOccurs="unbounded"/>
+              	</xsd:sequence>
+        	</xsd:complexType>
+			</xsd:element>
+			
+			<xsd:element name="getExistingNamesRequestMessage" type="coretypes:VOID"/>
+			
+    	</xsd:schema>
+	</types>
+
+
+
+	<!--============================================================
+
+                       M E S S A G E S
+                      
+  	============================================================-->
+  	<message name="CreateResourceRequest">
+		<part name="request" element="tns:createResource"/>
+	</message>
+	<message name="CreateResourceResponse">
+		<part name="response" element="tns:createResourceResponse"/>
+	</message>
+    <message name="GetAllVREsRequest">
+		<part name="request" element="tns:getAllVREsMessageRequest"/>
+	</message>
+	<message name="GetAllVREsResponse">
+		<part name="response" element="tns:getAllVREsMessageResponse"/>
+	</message>
+	<message name="InitDBInputMessage">
+		<part name="request" element="tns:initDBRequestMessage"/>
+	</message>
+	<message name="InitDBOutputMessage">
+		<part name="response" element="tns:initDBResponseMessage"/>
+	</message>
+	<message name="RemoveVREInputMessage">
+		<part name="request" element="tns:removeVRERequestMessage"/>
+	</message>
+	<message name="RemoveVREOutputMessage">
+		<part name="response" element="tns:removeVREResponseMessage"/>
+	</message>
+	<message name="GetExistingNamesInputMessage">
+		<part name="request" element="tns:getExistingNamesRequestMessage"/>
+	</message>
+	<message name="GetExistingNamesOutputMessage">
+		<part name="response" element="tns:getExistingNamesResponseMessage"/>
+	</message>
+
+	<!--============================================================
+
+                       P O R T T Y P E
+                      
+	============================================================-->
+
+	<portType name="ModelerFactoryPortType">
+		<operation name="createResource">
+			<input message="tns:CreateResourceRequest"/>
+			<output message="tns:CreateResourceResponse"/>
+		</operation>
+		<operation name="getAllVREs">
+			<input message="tns:GetAllVREsRequest"/>
+			<output message="tns:GetAllVREsResponse"/>
+		</operation>
+	
+		<operation name="initDB">
+			<input message="tns:InitDBInputMessage"/>
+			<output message="tns:InitDBOutputMessage"/>
+		</operation>
+		
+		<operation name="getExistingNamesVREs">
+			<input message="tns:GetExistingNamesInputMessage"/>
+			<output message="tns:GetExistingNamesOutputMessage"/>
+		</operation>
+		
+		<operation name="removeVRE">
+			<input message="tns:RemoveVREInputMessage"/>
+			<output message="tns:RemoveVREOutputMessage"/>
+		</operation>
+	</portType>
+
+
+
+</definitions></WSDL>
 				</PortType>
 			</Main>
 			<Software>

etc/registration.xml

@@ -18,8 +18,8 @@
                <!-- the polling time: how often the IS synchronizes its content with the RPD values --> 
                 <agg:PollIntervalMillis>60000</agg:PollIntervalMillis>                
                 <agg:ResourcePropertyNames>modeler:Id</agg:ResourcePropertyNames>
-                <agg:ResourcePropertyNames>modeler:reportFirstStep</agg:ResourcePropertyNames>
+                <agg:ResourcePropertyNames>modeler:firstReport</agg:ResourcePropertyNames>
-                <agg:ResourcePropertyNames>modeler:reportSecondStep</agg:ResourcePropertyNames>
+                <agg:ResourcePropertyNames>modeler:secondReport</agg:ResourcePropertyNames>
             </agg:GetMultipleResourcePropertiesPollType>
           </agg:AggregatorConfig>