You are viewing a plain text version of this content. The canonical link for it is here.
Posted to wsrf-dev@ws.apache.org by sc...@apache.org on 2005/06/03 21:51:20 UTC
svn commit: r179871 - in
/incubator/apollo/trunk/src/java/org/apache/ws/resource:
ResourceCreationEvent.java ResourceDestructionEvent.java ResourceEvent.java
impl/AbstractResourceHome.java
Author: scamp
Date: Fri Jun 3 12:51:19 2005
New Revision: 179871
URL: http://svn.apache.org/viewcvs?rev=179871&view=rev
Log: (empty)
Modified:
incubator/apollo/trunk/src/java/org/apache/ws/resource/ResourceCreationEvent.java
incubator/apollo/trunk/src/java/org/apache/ws/resource/ResourceDestructionEvent.java
incubator/apollo/trunk/src/java/org/apache/ws/resource/ResourceEvent.java
incubator/apollo/trunk/src/java/org/apache/ws/resource/impl/AbstractResourceHome.java
Modified: incubator/apollo/trunk/src/java/org/apache/ws/resource/ResourceCreationEvent.java
URL: http://svn.apache.org/viewcvs/incubator/apollo/trunk/src/java/org/apache/ws/resource/ResourceCreationEvent.java?rev=179871&r1=179870&r2=179871&view=diff
==============================================================================
--- incubator/apollo/trunk/src/java/org/apache/ws/resource/ResourceCreationEvent.java (original)
+++ incubator/apollo/trunk/src/java/org/apache/ws/resource/ResourceCreationEvent.java Fri Jun 3 12:51:19 2005
@@ -10,36 +10,20 @@
*/
public class ResourceCreationEvent implements ResourceEvent
{
- EndpointReference m_epr;
- private Object m_resourceId;
+ private Resource m_resource;
- public ResourceCreationEvent(EndpointReference epr)
+ public ResourceCreationEvent(Resource resource)
{
- m_epr = epr;
- }
-
- public void setResourceId(Object resourceId)
- {
- m_resourceId = resourceId;
+ m_resource = resource;
}
/**
- * Returns the EndpointRefrence for the Resource the event isassociated with.
+ * Returns the Resource for which the event has occurred.
*
* @return EndpointReference
*/
- public EndpointReference getEndpointReference()
- {
- return m_epr;
- }
-
- /**
- * Returns the ResourceID of the resource the event is about.
- *
- * @return The resource id of the resource.
- */
- public Object getResourceID()
+ public Resource getResource()
{
- return m_resourceId;
+ return m_resource;
}
}
Modified: incubator/apollo/trunk/src/java/org/apache/ws/resource/ResourceDestructionEvent.java
URL: http://svn.apache.org/viewcvs/incubator/apollo/trunk/src/java/org/apache/ws/resource/ResourceDestructionEvent.java?rev=179871&r1=179870&r2=179871&view=diff
==============================================================================
--- incubator/apollo/trunk/src/java/org/apache/ws/resource/ResourceDestructionEvent.java (original)
+++ incubator/apollo/trunk/src/java/org/apache/ws/resource/ResourceDestructionEvent.java Fri Jun 3 12:51:19 2005
@@ -12,34 +12,21 @@
{
EndpointReference m_epr;
Object m_resourceId;
+ private Resource m_resource;
- public ResourceDestructionEvent(EndpointReference epr)
- {
- m_epr = epr;
- }
-
- public void setResourceId(Object resourceId)
- {
- m_resourceId = resourceId;
- }
- /**
- * Returns the EndpointRefrence for the Resource the event isassociated with.
- *
- * @return EndpointReference
- */
- public EndpointReference getEndpointReference()
+ public ResourceDestructionEvent(Resource resource)
{
- return m_epr;
+ m_resource = resource;
}
/**
- * Returns the ResourceID of the resource the event is about.
+ * Returns the Resource of the resource the event is about.
*
- * @return The resource id of the resource.
+ * @return The resource.
*/
- public Object getResourceID()
+ public Resource getResource()
{
- return m_resourceId;
+ return m_resource;
}
}
Modified: incubator/apollo/trunk/src/java/org/apache/ws/resource/ResourceEvent.java
URL: http://svn.apache.org/viewcvs/incubator/apollo/trunk/src/java/org/apache/ws/resource/ResourceEvent.java?rev=179871&r1=179870&r2=179871&view=diff
==============================================================================
--- incubator/apollo/trunk/src/java/org/apache/ws/resource/ResourceEvent.java (original)
+++ incubator/apollo/trunk/src/java/org/apache/ws/resource/ResourceEvent.java Fri Jun 3 12:51:19 2005
@@ -10,16 +10,10 @@
public interface ResourceEvent
{
/**
- * Returns the EndpointRefrence for the Resource the event isassociated with.
+ * Returns the Resource for which the event has occurred.
*
* @return EndpointReference
*/
- EndpointReference getEndpointReference();
+ Resource getResource();
- /**
- * Returns the ResourceID of the resource the event is about.
- *
- * @return The resource id of the resource.
- */
- Object getResourceID();
}
Modified: incubator/apollo/trunk/src/java/org/apache/ws/resource/impl/AbstractResourceHome.java
URL: http://svn.apache.org/viewcvs/incubator/apollo/trunk/src/java/org/apache/ws/resource/impl/AbstractResourceHome.java?rev=179871&r1=179870&r2=179871&view=diff
==============================================================================
--- incubator/apollo/trunk/src/java/org/apache/ws/resource/impl/AbstractResourceHome.java (original)
+++ incubator/apollo/trunk/src/java/org/apache/ws/resource/impl/AbstractResourceHome.java Fri Jun 3 12:51:19 2005
@@ -34,6 +34,7 @@
import org.apache.ws.resource.ResourceHome;
import org.apache.ws.resource.ResourceKey;
import org.apache.ws.resource.ResourceUnknownException;
+import org.apache.ws.resource.PropertiesResource;
import org.apache.ws.resource.i18n.Keys;
import org.apache.ws.resource.i18n.MessagesImpl;
import org.apache.ws.resource.lifetime.ScheduledResourceTerminationResource;
@@ -416,9 +417,11 @@
throw new ResourceException( MSG.getMessage( Keys.FAILED_TO_DESTROY_RESOURCE, resource, re ) );
}
- m_resources.remove( getLookupKey( key ) );
- notifyResourceDeletedListeners( resource.getEndpointReference(), key );
-
+ Resource removedResource = (Resource) m_resources.remove( getLookupKey( key ) );
+ if(removedResource instanceof PropertiesResource)
+ {
+ notifyResourceDeletedListeners( removedResource);
+ }
LOG.debug( MSG.getMessage( Keys.REMOVED_RESOURCE_WITH_KEY, resource.getClass().getName(),
String.valueOf( key ) ) );
if ( m_cache != null )
@@ -546,7 +549,7 @@
{
m_sweeper.schedule();
}
- notifyResourceCreatedListeners( resource.getEndpointReference() );
+ notifyResourceCreatedListeners( resource );
}
private Resource get( ResourceKey key )
@@ -739,34 +742,29 @@
/**
* This method is used to notify listeners a resource has been created.
*
- * @param epr The EndpointReference for the Resource which was created
+ * @param resource The Resource which was created
*/
- private void notifyResourceCreatedListeners( EndpointReference epr )
+ private void notifyResourceCreatedListeners( Resource resource )
{
for ( int i = 0; i < m_creationListeners.size(); i++ )
{
ResourceCreationListener resourceCreationListener = (ResourceCreationListener) m_creationListeners.get( i );
- resourceCreationListener.creationOccurred( new ResourceCreationEvent( epr ) );
+ resourceCreationListener.creationOccurred( new ResourceCreationEvent( resource ) );
}
}
/**
* This method is used to notify listeners a resource has been deleted.
*
- * @param epr The EndpointReference for the Resource which was created
- * @param key
+ * @param resource The EndpointReference for the Resource which was created
*/
- private void notifyResourceDeletedListeners(EndpointReference epr, ResourceKey key)
+ private void notifyResourceDeletedListeners(Resource resource)
{
for ( int i = 0; i < m_destructionListeners.size(); i++ )
{
ResourceDestructionListener resourceDestructionListener = (ResourceDestructionListener) m_destructionListeners.get(
i );
- ResourceDestructionEvent event = new ResourceDestructionEvent( epr );
- if(key != null)
- {
- event.setResourceId(key.getValue());
- }
+ ResourceDestructionEvent event = new ResourceDestructionEvent( resource );
resourceDestructionListener.destructionOccurred( event );
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: apollo-dev-unsubscribe@ws.apache.org
For additional commands, e-mail: apollo-dev-help@ws.apache.org