From e645bf837324a909467cccb2cb2c33dc0097ce4a Mon Sep 17 00:00:00 2001
From: Manuele Simi <manuele.simi@isti.cnr.it>
Date: Sat, 12 Apr 2008 21:51:19 +0000
Subject: [PATCH] git-svn-id:
 http://svn.research-infrastructures.eu/public/d4science/gcube/trunk/information-system/gCubeIS/Registry@253
 82a268e6-3cf1-43bd-a215-b396298e98cf

---
 etc/registration.xml        | 42 +++++++++-------------
 etc/registrationFactory.xml | 71 ++++++++++++++++---------------------
 2 files changed, 46 insertions(+), 67 deletions(-)

diff --git a/etc/registration.xml b/etc/registration.xml
index 59a091b..f18e9d4 100644
--- a/etc/registration.xml
+++ b/etc/registration.xml
@@ -1,29 +1,19 @@
+<?xml version="1.0" encoding="UTF-8" ?>
 <ServiceGroupRegistrationParameters
-   xmlns:sgc="http://mds.globus.org/servicegroup/client"
-   xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-   xmlns:wsa="http://schemas.xmlsoap.org/ws/2004/03/addressing"
+  xmlns="http://mds.globus.org/servicegroup/client"
    xmlns:agg="http://mds.globus.org/aggregator/types"
-   xmlns="http://mds.globus.org/servicegroup/client">
-
-   <!-- Specifies that the registration will be renewed every 30
-        seconds -->
-   <RefreshIntervalSecs>600</RefreshIntervalSecs>
-
-
-   <!-- <Content> specifies registration specific information -->
-   <Content xsi:type="agg:AggregatorContent"
-      xmlns:agg="http://mds.globus.org/aggregator/types">
-
-      <agg:AggregatorConfig>
-      <agg:GetMultipleResourcePropertiesPollType 	xmlns:registry="http://gcube-system.org/namespaces/informationsystem/registry">
-
-  	   <agg:PollIntervalMillis>60000</agg:PollIntervalMillis>
-  	   <agg:ResourcePropertyNames>registry:Profile</agg:ResourcePropertyNames>
-    </agg:GetMultipleResourcePropertiesPollType>
- 	 </agg:AggregatorConfig>
-      <agg:AggregatorData/>
-   </Content>
-
+   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+        
+    <!-- renewal registration time -->
+    <RefreshIntervalSecs>600</RefreshIntervalSecs>
+    <Content>            
+        <agg:AggregatorConfig xsi:type="agg:AggregatorConfig">
+            <agg:GetMultipleResourcePropertiesPollType xmlns:registry="http://gcube-system.org/namespaces/informationsystem/registry">
+                <agg:PollIntervalMillis>60000</agg:PollIntervalMillis>            
+                <agg:ResourcePropertyNames>registry:Profile</agg:ResourcePropertyNames>                    
+            </agg:GetMultipleResourcePropertiesPollType>
+        </agg:AggregatorConfig>        
+        <agg:AggregatorData/>        
+    </Content>
+    
 </ServiceGroupRegistrationParameters>
-
diff --git a/etc/registrationFactory.xml b/etc/registrationFactory.xml
index a423e0b..03495a9 100644
--- a/etc/registrationFactory.xml
+++ b/etc/registrationFactory.xml
@@ -1,47 +1,36 @@
+<?xml version="1.0" encoding="UTF-8" ?>
 <ServiceGroupRegistrationParameters
-   xmlns:sgc="http://mds.globus.org/servicegroup/client"
-   xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-   xmlns:wsa="http://schemas.xmlsoap.org/ws/2004/03/addressing"
+   xmlns="http://mds.globus.org/servicegroup/client"
    xmlns:agg="http://mds.globus.org/aggregator/types"
-   xmlns="http://mds.globus.org/servicegroup/client">
-
-   <!-- Specifies that the registration will be renewed every 30
-        seconds -->
-    
+   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
         
-   <RefreshIntervalSecs>60</RefreshIntervalSecs>
-
-
-   <!-- <Content> specifies registration specific information -->
-   <Content xsi:type="agg:AggregatorContent"
-      xmlns:agg="http://mds.globus.org/aggregator/types">
-
-      <agg:AggregatorConfig>
-      <agg:GetMultipleResourcePropertiesPollType 	xmlns:registry="http://gcube-system.org/namespaces/informationsystem/registry"
-       xmlns:provider="http://gcube-system.org/namespaces/common/core/porttypes/GCUBEProvider">
-																				
-  	   <agg:PollIntervalMillis>60000</agg:PollIntervalMillis>
-  	   
-	   <agg:ResourcePropertyNames>registry:RunningInstance</agg:ResourcePropertyNames>
-	   <agg:ResourcePropertyNames>registry:ExternalRunningInstance</agg:ResourcePropertyNames>
-	   <agg:ResourcePropertyNames>registry:Service</agg:ResourcePropertyNames>
-	   <agg:ResourcePropertyNames>registry:Collection</agg:ResourcePropertyNames>
-	   <agg:ResourcePropertyNames>registry:CS</agg:ResourcePropertyNames>
-	   <agg:ResourcePropertyNames>registry:CSInstance</agg:ResourcePropertyNames>
-	   <agg:ResourcePropertyNames>registry:GHN</agg:ResourcePropertyNames>
-	   <agg:ResourcePropertyNames>registry:gLiteCE</agg:ResourcePropertyNames>
-	   <agg:ResourcePropertyNames>registry:gLiteSE</agg:ResourcePropertyNames>
-	   <agg:ResourcePropertyNames>registry:gLiteSite</agg:ResourcePropertyNames>
-	   <agg:ResourcePropertyNames>registry:gLiteService</agg:ResourcePropertyNames>
-   	   <agg:ResourcePropertyNames>registry:VRE</agg:ResourcePropertyNames>
- 	   <agg:ResourcePropertyNames>registry:MetadataCollection</agg:ResourcePropertyNames>
-   	   <agg:ResourcePropertyNames>registry:TransformationProgram</agg:ResourcePropertyNames>
-   	   
-
-    </agg:GetMultipleResourcePropertiesPollType>
- 	 </agg:AggregatorConfig>
-      <agg:AggregatorData/>
+    <!-- renewal registration time -->
+    <RefreshIntervalSecs>60</RefreshIntervalSecs>
+   <Content
+        xmlns:agg="http://mds.globus.org/aggregator/types"
+        xsi:type="agg:AggregatorContent">
+      <agg:AggregatorConfig xsi:type="agg:AggregatorConfig">
+	      <agg:GetMultipleResourcePropertiesPollType xmlns:registry="http://gcube-system.org/namespaces/informationsystem/registry">																				
+		  	   <agg:PollIntervalMillis>60000</agg:PollIntervalMillis>
+			   <!-- resource property list from here-->  	   
+			   <agg:ResourcePropertyNames>registry:RunningInstance</agg:ResourcePropertyNames>
+			   <agg:ResourcePropertyNames>registry:ExternalRunningInstance</agg:ResourcePropertyNames>
+			   <agg:ResourcePropertyNames>registry:Service</agg:ResourcePropertyNames>
+			   <agg:ResourcePropertyNames>registry:Collection</agg:ResourcePropertyNames>
+			   <agg:ResourcePropertyNames>registry:CS</agg:ResourcePropertyNames>
+			   <agg:ResourcePropertyNames>registry:CSInstance</agg:ResourcePropertyNames>
+			   <agg:ResourcePropertyNames>registry:GHN</agg:ResourcePropertyNames>
+			   <agg:ResourcePropertyNames>registry:gLiteCE</agg:ResourcePropertyNames>
+			   <agg:ResourcePropertyNames>registry:gLiteSE</agg:ResourcePropertyNames>
+			   <agg:ResourcePropertyNames>registry:gLiteSite</agg:ResourcePropertyNames>
+			   <agg:ResourcePropertyNames>registry:gLiteService</agg:ResourcePropertyNames>
+		   	   <agg:ResourcePropertyNames>registry:VRE</agg:ResourcePropertyNames>
+		 	   <agg:ResourcePropertyNames>registry:MetadataCollection</agg:ResourcePropertyNames>
+		   	   <agg:ResourcePropertyNames>registry:TransformationProgram</agg:ResourcePropertyNames>   	   
+	
+		    </agg:GetMultipleResourcePropertiesPollType>
+ 	    </agg:AggregatorConfig>
+        <agg:AggregatorData/>
    </Content>
 
 </ServiceGroupRegistrationParameters>