From a518eb0ac233dbe4a1d3bbd86b866aa3a8abd8a6 Mon Sep 17 00:00:00 2001 From: Manuele Simi Date: Mon, 31 Jan 2011 03:44:53 +0000 Subject: [PATCH] A bit of cleaning git-svn-id: http://svn.research-infrastructures.eu/public/d4science/gcube/trunk/information-system/gCubeIS/Registry@34392 82a268e6-3cf1-43bd-a215-b396298e98cf --- .../impl/porttypes/RegistryFactory.java | 3 +-- .../impl/porttypes/ResourceRegistration.java | 22 +++++++++---------- 2 files changed, 12 insertions(+), 13 deletions(-) diff --git a/src/org/gcube/informationsystem/registry/impl/porttypes/RegistryFactory.java b/src/org/gcube/informationsystem/registry/impl/porttypes/RegistryFactory.java index 3e1d66e..ee6e3bf 100644 --- a/src/org/gcube/informationsystem/registry/impl/porttypes/RegistryFactory.java +++ b/src/org/gcube/informationsystem/registry/impl/porttypes/RegistryFactory.java @@ -41,7 +41,6 @@ import org.gcube.informationsystem.registry.stubs.RemoveResourceMessage; import org.gcube.informationsystem.registry.stubs.RemoveResourceResponse; import org.gcube.informationsystem.registry.stubs.ResourceNotAcceptedFault; import org.gcube.informationsystem.registry.stubs.SchemaValidationFault; -import org.gcube.informationsystem.registry.stubs.UpdateFault; import org.gcube.informationsystem.registry.stubs.UpdateResourceMessage; import org.gcube.informationsystem.registry.stubs.UpdateResourceResponse; @@ -340,7 +339,7 @@ public class RegistryFactory extends GCUBEPortType { logger.debug("Resource " + ID+ " successfully removed"); } catch (Exception e) { logger.error("Unable to remove the resource " + ID, e); - throw new UpdateFault(); + throw new GCUBEFault(); } // if the resource is a GHN, remove also the related RIs try { diff --git a/src/org/gcube/informationsystem/registry/impl/porttypes/ResourceRegistration.java b/src/org/gcube/informationsystem/registry/impl/porttypes/ResourceRegistration.java index 3e368ac..b06456e 100644 --- a/src/org/gcube/informationsystem/registry/impl/porttypes/ResourceRegistration.java +++ b/src/org/gcube/informationsystem/registry/impl/porttypes/ResourceRegistration.java @@ -19,17 +19,17 @@ import org.gcube.informationsystem.registry.impl.filters.FilterManager; import org.gcube.informationsystem.registry.impl.filters.FilterExecutor.InvalidFilterException; import org.gcube.informationsystem.registry.impl.profilemanagement.GHN; import org.gcube.informationsystem.registry.impl.state.Definitions.ResourceType; -import org.gcube.informationsystem.registry.stubs.CreateFault; -import org.gcube.informationsystem.registry.stubs.CreateMessage; -import org.gcube.informationsystem.registry.stubs.CreateResponse; -import org.gcube.informationsystem.registry.stubs.InvalidResourceFault; -import org.gcube.informationsystem.registry.stubs.RemoveFault; -import org.gcube.informationsystem.registry.stubs.RemoveMessage; -import org.gcube.informationsystem.registry.stubs.RemoveResponse; -import org.gcube.informationsystem.registry.stubs.ResourceNotAcceptedFault; -import org.gcube.informationsystem.registry.stubs.UpdateFault; -import org.gcube.informationsystem.registry.stubs.UpdateMessage; -import org.gcube.informationsystem.registry.stubs.UpdateResponse; +import org.gcube.informationsystem.registry.stubs.resourceregistration.CreateFault; +import org.gcube.informationsystem.registry.stubs.resourceregistration.CreateMessage; +import org.gcube.informationsystem.registry.stubs.resourceregistration.CreateResponse; +import org.gcube.informationsystem.registry.stubs.resourceregistration.InvalidResourceFault; +import org.gcube.informationsystem.registry.stubs.resourceregistration.RemoveFault; +import org.gcube.informationsystem.registry.stubs.resourceregistration.RemoveMessage; +import org.gcube.informationsystem.registry.stubs.resourceregistration.RemoveResponse; +import org.gcube.informationsystem.registry.stubs.resourceregistration.ResourceNotAcceptedFault; +import org.gcube.informationsystem.registry.stubs.resourceregistration.UpdateFault; +import org.gcube.informationsystem.registry.stubs.resourceregistration.UpdateMessage; +import org.gcube.informationsystem.registry.stubs.resourceregistration.UpdateResponse; /** *