gCubeSystem
/
is-registry
14
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

git-svn-id: http://svn.research-infrastructures.eu/public/d4science/gcube/trunk/information-system/gCubeIS/Registry@26 82a268e6-3cf1-43bd-a215-b396298e98cf

This commit is contained in:
Andrea Manzi 2008-03-20 11:07:18 +00:00
parent 1a9ad97932
commit 72202978d2
6 changed files with 24 additions and 64 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
etc/deploy-jndi-config.xml
View File

@ -82,8 +82,7 @@
override="false"/>
<resource name="RegistryConfiguration"
type="org.gcube.informationsystem.registry.impl.RegistryConfiguration">
<resource name="RegistryConfiguration" type="org.gcube.informationsystem.registry.impl.RegistryConfiguration">
<resourceParams>
<parameter>
@ -117,7 +116,7 @@
</resource>
<resource name="publicationProfile" type="org.gcube.common.core.PublicationProfile">
<resource name="publicationProfile" type="org.gcube.common.core.state.GCUBEPublicationProfile">
<resourceParams>
<parameter>
<name>factory</name>
@ -129,7 +128,7 @@
</parameter>
<parameter>
<name>fileName</name>
<value>@config.dir@/FactoryRegistration.xml</value>
<value>@config.dir@/registrationFactory.xml</value>
</parameter>
</resourceParams>
</resource>
@ -144,7 +143,7 @@
</parameter>
<parameter>
<name>resourceClass</name>
<value>org.gcube.informationsystem.registry.impl.core.FactoryResource</value>
<value>org.gcube.informationsystem.registry.impl.core.RegistryFactoryResource</value>
</parameter>
<parameter>
<name>persistenceDelegateClass</name>

2
org/gcube/informationsystem/registry/impl/core/FactoryContext.java
View File

@ -5,7 +5,7 @@ import org.gcube.common.core.contexts.GCUBEStatefulPortTypeContext;
public class FactoryContext extends GCUBEStatefulPortTypeContext{
static private final String PORTTYPE_NAME = "gcube/informationsystem/regitry/RegistryFactory";
static private final String PORTTYPE_NAME = "gcube/informationsystem/registry/RegistryFactory";
static FactoryContext cache = new FactoryContext();

31
org/gcube/informationsystem/registry/impl/core/RegistryFactory.java
View File

@ -7,9 +7,6 @@ import java.rmi.RemoteException;
import java.util.ArrayList;
import java.util.Calendar;
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;
@ -23,6 +20,7 @@ import org.gcube.common.core.porttypes.GCUBEStartupPortType;
import org.gcube.common.core.resources.GCUBEHostingNode;
import org.gcube.common.core.resources.GCUBEResource;
import org.gcube.common.core.scope.GCUBEScope;
import org.gcube.common.core.state.GCUBEWSResourceKey;
import org.gcube.common.core.utils.logging.GCUBELog;
import org.gcube.common.is.publisher.impl.GCUBEPublisher;
import org.gcube.common.is.publisher.impl.GCUBEPublisherException;
@ -34,11 +32,14 @@ import org.gcube.informationsystem.registry.stubs.RegistryPortType;
import org.gcube.informationsystem.registry.stubs.RegistryProperty;
import org.gcube.informationsystem.registry.stubs.RemoveResourceMessage;
import org.gcube.informationsystem.registry.stubs.RemoveResourceResponse;
import org.gcube.informationsystem.registry.stubs.RemoveScopeInProfileMessage;
import org.gcube.informationsystem.registry.stubs.SchemaValidationFault;
import org.gcube.informationsystem.registry.stubs.StartRegistration;
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.UpdateScopeInProfileMessage;
import org.gcube.informationsystem.registry.stubs.UpdateStateMessage;
import org.gcube.informationsystem.registry.stubs.service.RegistryServiceAddressingLocator;
import org.globus.wsrf.ResourceContext;
import org.globus.wsrf.ResourceException;
@ -76,9 +77,6 @@ public class RegistryFactory extends GCUBEStartupPortType{
public static ArrayList notificationMap = new ArrayList<String>();
/**
*/
protected Context ctx = null;
/**
*
*/
@ -102,12 +100,8 @@ public class RegistryFactory extends GCUBEStartupPortType{
super.init(arg0);
//initialization of the Registry Configuration
try {
ctx =new InitialContext();
//config = (RegistryConfiguration) ctx.lookup(Constants.JNDI_BASE_NAME + "RegistryConfiguration");
FactoryContext.getContext().getWSHome().create("FactoryResource");
} catch (NamingException e) {
e.printStackTrace();
throw new ServiceException(e);
FactoryContext.getContext().getWSHome().create(FactoryContext.getContext().makeKey("FactoryResource"));
} catch (ResourceException e) {
e.printStackTrace();
throw new ServiceException(e);
@ -168,7 +162,7 @@ public class RegistryFactory extends GCUBEStartupPortType{
}
//check ID
if (resource.getID()== null) resource.setID("puppa");
if (resource.getID()== nul");
}
catch (Exception ex)
@ -480,7 +474,16 @@ public class RegistryFactory extends GCUBEStartupPortType{
}
private static void unregisterRIRelatedToDHN(String ID){}
private static void unregisterRIRelatedToDHN(String id ){
}
public String updateScopeInProfile(UpdateScopeInProfileMessage message)throws GCUBEFault{return null;}
public String removeScopeInProfile(RemoveScopeInProfileMessage message)throws GCUBEFault{return null;}
public String updateState(UpdateStateMessage message)throws GCUBEFault{return null;}
}

23
org/gcube/informationsystem/registry/impl/core/RegistryFactoryResource.java
View File

@ -51,12 +51,6 @@ public class RegistryFactoryResource extends GCUBEWSResource {
protected static final String RunningInstanceRP="RunningInstance";
@Override
protected String[] getPropertyNames() {
return null;
}
@Override
protected String[] getTopicNames() {
@ -113,8 +107,6 @@ public class RegistryFactoryResource extends GCUBEWSResource {
try {
this.getPersistenceDelegate().load(this,true);
// Topic List creation for registrationto is-Notifier
listQname = new ArrayList<QName>();
for (String rpName : RPNames)
@ -122,21 +114,6 @@ public class RegistryFactoryResource extends GCUBEWSResource {
// try registration
boolean check = false;
ISPublisher publisher = GHNContext.getImplementation(ISPublisher.class);
while (!check) {
try {
// registration to IS-IC
publisher.registerWSResource(this);
check = true;
}
catch (Exception e) {
logger.error(" Error registering IS-Registry WS-properties to IS-IC",e);
check = false;
}
}
try {
RegistrationThread thread = new RegistrationThread(listQname);
Thread t = new Thread(thread);

6
org/gcube/informationsystem/registry/impl/core/ServiceContext.java
View File

@ -18,10 +18,6 @@ public class ServiceContext extends GCUBEServiceContext{
return JNDI_NAME;
}
public void setScope(String scope) {
// TODO Auto-generated method stub
}
}
}

17
schema/RegistryFactory.wsdl
View File

@ -134,11 +134,7 @@
<xsd:element name="startRegistrationResponse">
<xsd:complexType/>
</xsd:element>
<xsd:element name="validateProfile" type="xsd:string"/>
<xsd:element name="validateProfileResponse" type="xsd:boolean"/>
<xsd:element name="RunningInstance" type="tns:RegistryProperty"/>
<xsd:element name="ExternalRunningInstance" type="tns:RegistryProperty"/>
@ -275,13 +271,6 @@
<part name="response" element="tns:updateStateResponse"/>
</message>
<message name="ValidateProfileRequest">
<part name="request" element="tns:validateProfile"/>
</message>
<message name="ValidateProfileResponse">
<part name="response" element="tns:validateProfileResponse"/>
</message>
<message name="schemaValidationFaultMessage">
<part name="fault" element="tns:schemaValidationFault"/>
</message>
@ -334,11 +323,7 @@
<output message="tns:StartRegistrationResponse"/>
<fault name="fault" message="corefaults:GCUBEFaultMessage"></fault>
</operation>
<operation name="validateProfile">
<input message="tns:ValidateProfileRequest"/>
<output message="tns:ValidateProfileResponse"/>
<fault name="fault" message="tns:schemaValidationFaultMessage"></fault>
</operation>
</portType>