From 5d5418a9405fd385a3d4cb0167ed04c15a4a89e4 Mon Sep 17 00:00:00 2001
From: Andrea Manzi <andrea.manzi@cern.ch>
Date: Thu, 20 Mar 2008 18:20:05 +0000
Subject: [PATCH] git-svn-id:
 http://svn.research-infrastructures.eu/public/d4science/gcube/trunk/information-system/gCubeIS/Registry@39
 82a268e6-3cf1-43bd-a215-b396298e98cf

---
 .classpath                  |  3 +--
 etc/deploy-jndi-config.xml  | 19 +++++++++++++++----
 etc/deploy-server.wsdd      |  2 +-
 schema/RegistryFactory.wsdl |  5 +++++
 4 files changed, 22 insertions(+), 7 deletions(-)

diff --git a/.classpath b/.classpath
index 94fb10c..47c34b9 100644
--- a/.classpath
+++ b/.classpath
@@ -2,9 +2,8 @@
 <classpath>
 	<classpathentry excluding="src/" kind="src" path=""/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry kind="lib" path="org.gcube.informationservice.registry.stubs.jar"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/CONTAINERLIB"/>
 	<classpathentry combineaccessrules="false" kind="src" path="/GCUBE_CORE"/>
-	<classpathentry kind="lib" path="org.gcube.informationsystem.registry.stubs.jar"/>
+	<classpathentry kind="lib" path="/home/andrea/gcube/information-system/gCubeIS/SERVICELIBS/GCUBE_ISREGISTRY/org.gcube.informationsystem.registry.stubs.jar"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/etc/deploy-jndi-config.xml b/etc/deploy-jndi-config.xml
index 57d6979..1df4a87 100644
--- a/etc/deploy-jndi-config.xml
+++ b/etc/deploy-jndi-config.xml
@@ -13,6 +13,12 @@
 	
 <service name="gcube/informationsystem/registry/Registry">
 	
+	<environment 
+		name="name" 
+	 	value="Registry" 
+	 	type="java.lang.String"
+	 	override="false" />
+	 	
 	<environment 
 		name="RPDName"
 		value="ProfileResourceProperties"
@@ -20,12 +26,12 @@
 		override="false"/>
 		
 	<environment
-  		name="lifetime"
+  		name="lifeTime"
   		value="120"
   		type="java.lang.Integer"
   		override="false" /> 	
 	
-	<resource name="publicationProfile" type="org.gcube.common.core.service.GCUBEPublicationProfile">	
+	<resource name="publicationProfile" type="org.gcube.common.core.state.GCUBEPublicationProfile">	
 		<resourceParams>
 			<parameter>
 				<name>factory</name>
@@ -37,7 +43,7 @@
 			</parameter>
 			<parameter>
 				<name>fileName</name>
-				<value>@config.dir@/Registration.xml</value>
+				<value>@config.dir@/registration.xml</value>
 			</parameter>
 		</resourceParams>
 	</resource>
@@ -74,7 +80,12 @@
 
 <service name="gcube/informationsystem/registry/RegistryFactory">
 	
-	
+	<environment 
+		name="name" 
+	 	value="RegistryFactory" 
+	 	type="java.lang.String"
+	 	override="false" />
+	 	
 	<environment 
 			name="RPDName"
 			value="RegistryFactoryResourceProperties"
diff --git a/etc/deploy-server.wsdd b/etc/deploy-server.wsdd
index b05e74f..c5dc09e 100644
--- a/etc/deploy-server.wsdd
+++ b/etc/deploy-server.wsdd
@@ -5,7 +5,7 @@
     xmlns:xsd="http://www.w3.org/2001/XMLSchema">
 
     <service name="gcube/informationsystem/registry/Registry" provider="Handler" use="literal" style="document">
-        <parameter name="className" value="org.gcube.informationservice.registry.impl.core.Registry"/>
+        <parameter name="className" value="org.gcube.informationsystem.registry.impl.core.Registry"/>
 		<wsdlFile>share/schema/Registry/Registry_service.wsdl</wsdlFile>
         <parameter name="allowedMethods" value="*"/>
         <parameter name="handlerClass" value="org.globus.axis.providers.RPCProvider"/>
diff --git a/schema/RegistryFactory.wsdl b/schema/RegistryFactory.wsdl
index cf2f389..9a5eca1 100644
--- a/schema/RegistryFactory.wsdl
+++ b/schema/RegistryFactory.wsdl
@@ -49,6 +49,7 @@
 	<xsd:complexType  name="UpdateProfileMessage">
 		<xsd:sequence>
 			<xsd:element name="uniqueID" type="xsd:string"/>
+			<xsd:element name="type" type="xsd:string"/>
 			<xsd:element name="xmlProfile" type="xsd:string"/>
 		</xsd:sequence>
 	</xsd:complexType>
@@ -56,6 +57,7 @@
 	<xsd:complexType  name="UpdateScopeInProfileMessage">
 		<xsd:sequence>
 			<xsd:element name="uniqueID" type="xsd:string"/>
+			<xsd:element name="type" type="xsd:string"/>
 			<xsd:element name="scope" type="xsd:string"/>
 		</xsd:sequence>
 	</xsd:complexType>
@@ -63,6 +65,7 @@
 	<xsd:complexType  name="UpdateStateMessage">
 		<xsd:sequence>
 			<xsd:element name="uniqueID" type="xsd:string"/>
+			
 			<xsd:element name="state" type="xsd:string"/>
 		</xsd:sequence>
 	</xsd:complexType>
@@ -70,6 +73,7 @@
 	<xsd:complexType name="CreateResourceMessage">
 			<xsd:sequence>
 				<xsd:element name="profile" type="xsd:string" minOccurs="1" maxOccurs="1"/>
+				<xsd:element name="type" type="xsd:string"/>
 				<xsd:element name="scopes" type="xsd:string" minOccurs="0" maxOccurs="unbounded"/>
 			</xsd:sequence>
 	</xsd:complexType>
@@ -83,6 +87,7 @@
 	<xsd:complexType name="RemoveScopeInProfileMessage">
 			<xsd:sequence>
 				<xsd:element name="uniqueID" type="xsd:string" minOccurs="1" maxOccurs="1"/>
+				<xsd:element name="type" type="xsd:string"/>
 				<xsd:element name="scope" type="xsd:string"/>
 			</xsd:sequence>
 	</xsd:complexType>