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

---
 .classpath                                    | 18 +++++++++--------
 etc/deploy-jndi-config.xml                    | 20 +++++++------------
 .../registry/impl/core/Registry.java          |  2 +-
 .../registry/impl/core/RegistryFactory.java   | 11 +++++-----
 4 files changed, 24 insertions(+), 27 deletions(-)

diff --git a/.classpath b/.classpath
index 23af336..94fb10c 100644
--- a/.classpath
+++ b/.classpath
@@ -1,8 +1,10 @@
-<?xml version="1.0" encoding="UTF-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 kind="output" path="bin"/>
-</classpath>
+<?xml version="1.0" encoding="UTF-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="output" path="bin"/>
+</classpath>
diff --git a/etc/deploy-jndi-config.xml b/etc/deploy-jndi-config.xml
index 41b464e..b066505 100644
--- a/etc/deploy-jndi-config.xml
+++ b/etc/deploy-jndi-config.xml
@@ -12,12 +12,6 @@
 </service>
 	
 <service name="gcube/informationsystem/registry/Registry">
-
-	<environment 
-		name="name" 
-	 	value="IS-Registry" 
-	 	type="java.lang.String"
-	 	override="false" />
 	
 	<environment 
 		name="RPDName"
@@ -48,7 +42,7 @@
 		</resourceParams>
 	</resource>
 	
-	<resource name="wshome" type="org.gcube.informationsystem.registry.impl.core.ProfileResourceHome"> 
+	<resource name="home" type="org.gcube.informationsystem.registry.impl.core.ProfileResourceHome"> 
 	
 		<resourceParams>
 
@@ -78,17 +72,17 @@
 
 </service>
 
-	<service name="gcube/informationsystem/registry/RegistryFactory">
+<service name="gcube/informationsystem/registry/RegistryFactory">
 	
 	
-		<environment 
+	<environment 
 			name="RPDName"
 			value="RegistryFactoryResourceProperties"
 			type="java.lang.String"
 			override="false"/>
 		
 	
-		<resource name="RegistryConfiguration"
+	<resource name="RegistryConfiguration"
 			type="org.gcube.informationsystem.registry.impl.RegistryConfiguration">
 			<resourceParams>
 				
@@ -123,7 +117,7 @@
 	</resource>	
 					
 	
-		<resource name="publicationProfile" type="org.gcube.common.core.PublicationProfile">	
+	<resource name="publicationProfile" type="org.gcube.common.core.PublicationProfile">	
 			<resourceParams>
 				<parameter>
 					<name>factory</name>
@@ -138,9 +132,9 @@
 					<value>@config.dir@/FactoryRegistration.xml</value>
 				</parameter>
 			</resourceParams>
-		</resource>
+	</resource>
 				
-		<resource name="wshome" type="org.gcube.informationsystem.registry.impl.core.RegistryFactoryResourceHome">
+	<resource name="home" type="org.gcube.informationsystem.registry.impl.core.RegistryFactoryResourceHome">
 				
 				<resourceParams>
 					
diff --git a/org/gcube/informationsystem/registry/impl/core/Registry.java b/org/gcube/informationsystem/registry/impl/core/Registry.java
index a05a751..fdd3c35 100644
--- a/org/gcube/informationsystem/registry/impl/core/Registry.java
+++ b/org/gcube/informationsystem/registry/impl/core/Registry.java
@@ -6,7 +6,7 @@ import org.gcube.informationsystem.registry.impl.core.ProfileResource;
 import org.globus.wsrf.ResourceException;
 
 
-public class Registry {
+public class Registry  {
 	
 	public String getProfileString(GetProfileString voidType)  throws GCUBEFault{
 		try {
diff --git a/org/gcube/informationsystem/registry/impl/core/RegistryFactory.java b/org/gcube/informationsystem/registry/impl/core/RegistryFactory.java
index 2511c61..1c341ed 100644
--- a/org/gcube/informationsystem/registry/impl/core/RegistryFactory.java
+++ b/org/gcube/informationsystem/registry/impl/core/RegistryFactory.java
@@ -11,12 +11,14 @@ import javax.naming.Context;
 import javax.naming.InitialContext;
 import javax.naming.NamingException;
 import javax.xml.rpc.ServiceException;
+
+import org.diligentproject.stubs.informationservice.disregistry.DISRegistryFactoryService.SchemaValidationException;
 import org.gcube.common.core.contexts.GCUBEServiceContext;
+import org.gcube.common.core.contexts.GHNContext;
 import org.gcube.common.core.faults.GCUBEFault;
 import org.gcube.common.core.is.ISException;
 import org.gcube.common.core.is.client.ISClient.ISInvalidQueryException;
 import org.gcube.common.core.is.client.ISClient.ISMalformedQueryException;
-import org.gcube.common.core.contexts.GHNContext;
 import org.gcube.common.core.porttypes.GCUBEStartupPortType;
 import org.gcube.common.core.resources.GCUBEHostingNode;
 import org.gcube.common.core.resources.GCUBEResource;
@@ -38,7 +40,6 @@ import org.gcube.informationsystem.registry.stubs.StartRegistrationResponse;
 import org.gcube.informationsystem.registry.stubs.UpdateProfileMessage;
 import org.gcube.informationsystem.registry.stubs.UpdateResourceResponse;
 import org.gcube.informationsystem.registry.stubs.service.RegistryServiceAddressingLocator;
-import org.globus.wsrf.Constants;
 import org.globus.wsrf.ResourceContext;
 import org.globus.wsrf.ResourceException;
 import org.globus.wsrf.ResourceKey;
@@ -98,7 +99,7 @@ public class RegistryFactory extends GCUBEStartupPortType{
 	@Override
 	public void init (Object arg0) throws ServiceException {
 
-		super.init(null);
+		super.init(arg0);
 		//initialization of the Registry Configuration
 		try {
 			ctx =new InitialContext();
@@ -199,7 +200,7 @@ public class RegistryFactory extends GCUBEStartupPortType{
 		try {
 			updateCounterInfo (resource,operationType.create.name(),Calendar.getInstance());
 		} catch (Exception e) {
-			logger.error("Error updating Counting info for resourece with ID " + resource.getID());
+			logger.error("Error updating Counting info for resource with ID " + resource.getID());
 			e.printStackTrace();
 		}
 
@@ -223,7 +224,7 @@ public class RegistryFactory extends GCUBEStartupPortType{
 	 * @throws RemoteException Exception
 	 * @throws SchemaValidationException Exception
 	 */
-	public  UpdateResourceResponse updateResource(UpdateProfileMessage mess) throws RemoteException,SchemaValidationFault {
+	public  UpdateResourceResponse updateResource(UpdateProfileMessage mess) throws RemoteException,SchemaValidationFault,GCUBEFault {
 
 		logSecurityInfo("updateResource");