diff --git a/.classpath b/.classpath index a31545e..121449e 100644 --- a/.classpath +++ b/.classpath @@ -5,7 +5,7 @@ - + diff --git a/CHANGELOG b/CHANGELOG index e114cb7..f62d8ee 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,10 +1,15 @@ +v. 1.3.2 (20-10-2009) + * porting on gCore 060 + v. 1.3.1 (10-2009) * startRegistration/updateState/AddRemoveScopes operations removed from Factory Service * cleanup of old notification code in ProfileResource * cleanup of resource package + v. 1.3.0 (04-09-2009) * Porting on the new IS-IC portType * Some internal refactoring + v. 1.2.0 (27-05-2009) * porting on gCore0.5.0 * new Service Map management diff --git a/etc/deploy-jndi-config.xml b/etc/deploy-jndi-config.xml index 306f779..9ecd5eb 100644 --- a/etc/deploy-jndi-config.xml +++ b/etc/deploy-jndi-config.xml @@ -7,13 +7,7 @@ name="configDir" value="@config.dir@" type="java.lang.String" - override="false" /> - - + override="false" /> IS-Registry: validate, register and unregister GCUBE resources to/from the IS. It also publishes Topics for notifications about GCUBE resource events IS-Registry-service - 1.3.1 + 1.3.2 diff --git a/src/org/gcube/informationsystem/registry/impl/contexts/ServiceContext.java b/src/org/gcube/informationsystem/registry/impl/contexts/ServiceContext.java index 27efc49..f8d1e0e 100644 --- a/src/org/gcube/informationsystem/registry/impl/contexts/ServiceContext.java +++ b/src/org/gcube/informationsystem/registry/impl/contexts/ServiceContext.java @@ -55,6 +55,7 @@ public class ServiceContext extends GCUBEServiceContext { protected GCUBEProducer topicProducer; + @SuppressWarnings("unchecked") protected class NotificationResourceScheduler extends GCUBEScheduledHandler { @@ -125,7 +126,7 @@ public class ServiceContext extends GCUBEServiceContext { } NotificationResourceScheduler scheduler = new NotificationResourceScheduler(20, GCUBEScheduledHandler.Mode.LAZY); - scheduler.setHandled(new GCUBEHandler(){ + scheduler.setScheduled(new GCUBEHandler(){ @Override public void run() throws Exception { diff --git a/src/org/gcube/informationsystem/registry/impl/state/ProfileResource.java b/src/org/gcube/informationsystem/registry/impl/state/ProfileResource.java index 3fc8faa..345eedf 100644 --- a/src/org/gcube/informationsystem/registry/impl/state/ProfileResource.java +++ b/src/org/gcube/informationsystem/registry/impl/state/ProfileResource.java @@ -1,5 +1,7 @@ package org.gcube.informationsystem.registry.impl.state; +import org.gcube.common.core.contexts.GHNContext; +import org.gcube.common.core.informationsystem.publisher.ISPublisher; import org.gcube.common.core.resources.GCUBEResource; import org.gcube.common.core.state.GCUBEWSResource; import org.gcube.common.core.utils.logging.GCUBELog; @@ -114,4 +116,12 @@ public class ProfileResource extends GCUBEWSResource { this.store(); } + /* (non-Javadoc) + * @see org.gcube.common.core.state.GCUBEWSResource#getPublisher() + */ + @Override + protected ISPublisher getPublisher() throws Exception { + return GHNContext.getImplementation(ISPublisher.class); + } + }