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

---
 etc/deploy-jndi-config.xml                    | 33 -------------------
 etc/deploy-server.wsdd                        |  2 +-
 etc/deploy-server.wsdd_NOSEC                  |  2 +-
 .../registry/impl/core/RegistryFactory.java   |  3 ++
 4 files changed, 5 insertions(+), 35 deletions(-)

diff --git a/etc/deploy-jndi-config.xml b/etc/deploy-jndi-config.xml
index 62bd4c9..c91abeb 100644
--- a/etc/deploy-jndi-config.xml
+++ b/etc/deploy-jndi-config.xml
@@ -91,40 +91,7 @@
 			value="RegistryFactoryResourceProperties"
 			type="java.lang.String"
 			override="false"/>
-		
 	
-	<resource name="RegistryConfiguration" type="org.gcube.informationsystem.registry.impl.RegistryConfiguration">
-			<resourceParams>
-				
-				<parameter>
-					<name>
-						factory
-					</name>
-					<value>
-						org.globus.wsrf.jndi.BeanFactory
-					</value>
-				</parameter>
-				
-				<parameter>
-					<name>registrationRemovalInterval</name>
-					<value>140</value>
-				</parameter>
-				
-				<parameter>
-					<name>profilesBase</name>
-					<value>@config.dir@/DILResourceSchemas</value>
-				</parameter>
-				
-				<parameter>
-					<name>propertiesFile</name>
-					<value>@config.dir@/registration.properties</value>
-				</parameter>
-				<parameter>
-					<name>registrationType</name>
-					<value>Pull</value>
-				</parameter>
-		</resourceParams>
-	</resource>	
 					
 	
 	<resource name="publicationProfile" type="org.gcube.common.core.state.GCUBEPublicationProfile">	
diff --git a/etc/deploy-server.wsdd b/etc/deploy-server.wsdd
index 99501e9..3dfcbe8 100644
--- a/etc/deploy-server.wsdd
+++ b/etc/deploy-server.wsdd
@@ -10,7 +10,7 @@
         <parameter name="allowedMethods" value="*"/>
         <parameter name="handlerClass" value="org.globus.axis.providers.RPCProvider"/>
         <parameter name="scope" value="Application"/>
-  		<parameter name="providers" value="GCUBEProvider SubscribeProvider GetCurrentMessageProvider "/>
+  		<parameter name="providers" value="GCUBEProvider SubscribeProvider DestroyProvider GetCurrentMessageProvider "/>
    		<parameter name="loadOnStartup" value="false"/> 
 		<parameter name="securityDescriptor" value="@config.dir@/security-descriptor-Service.xml"/>
     </service>
diff --git a/etc/deploy-server.wsdd_NOSEC b/etc/deploy-server.wsdd_NOSEC
index 339655d..acbb8ae 100644
--- a/etc/deploy-server.wsdd_NOSEC
+++ b/etc/deploy-server.wsdd_NOSEC
@@ -10,7 +10,7 @@
         <parameter name="allowedMethods" value="*"/>
         <parameter name="handlerClass" value="org.globus.axis.providers.RPCProvider"/>
         <parameter name="scope" value="Application"/>
-  		<parameter name="providers" value="GCUBEProvider SubscribeProvider GetCurrentMessageProvider "/>
+  		<parameter name="providers" value="GCUBEProvider SubscribeProvider DestroyProvider GetCurrentMessageProvider "/>
    		<parameter name="loadOnStartup" value="false"/> 
 
 	</service>
diff --git a/org/gcube/informationsystem/registry/impl/core/RegistryFactory.java b/org/gcube/informationsystem/registry/impl/core/RegistryFactory.java
index 910bac4..a7fb2c8 100644
--- a/org/gcube/informationsystem/registry/impl/core/RegistryFactory.java
+++ b/org/gcube/informationsystem/registry/impl/core/RegistryFactory.java
@@ -232,6 +232,7 @@ public class RegistryFactory extends GCUBEStartupPortType{
 		if (!isResourceCreated(ID)) {
 			input = new CreateResourceMessage();
 			input.setProfile(xmlProfile);
+			input.setType(mess.getType());
 			this.createResource(input);
 			return new UpdateResourceResponse();
 		}
@@ -312,6 +313,7 @@ public class RegistryFactory extends GCUBEStartupPortType{
 		try{
 
 			ProfileResource resource = getProfileResource(ID );
+			profile = this.getResourceClass(type);
 			profile.load(new StringReader( XMLUtils.DocumentToString(resource.getProfile())));
 			//remove profile
 			resource.removeProfile();
@@ -323,6 +325,7 @@ public class RegistryFactory extends GCUBEStartupPortType{
 
 		}
 		catch (Exception e) {
+			e.printStackTrace();
 			logger.error("Error removing resource for ID "+ e);
 			throw new RemoteException();
 		}