svn commit: r558267 - in /incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/sca: core/scope/AbstractScopeContainer.java core/scope/ConversationalScopeContainer.java scope/ScopeContainer.java

[sl...@apache.org]

Author: slaws
Date: Sat Jul 21 01:15:44 2007
New Revision: 558267

URL: http://svn.apache.org/viewvc?view=rev&rev=558267
Log:
TUSCANY-1377
Remove the conversational component instance at the end of it's lifecycle.
TUSCANY-1472 
Involves implementing a new remove(contextId) up through the scope contianer chain

Modified:
    incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/AbstractScopeContainer.java
    incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/ConversationalScopeContainer.java
    incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/scope/ScopeContainer.java

Modified: incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/AbstractScopeContainer.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/AbstractScopeContainer.java?view=diff&rev=558267&r1=558266&r2=558267
==============================================================================
--- incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/AbstractScopeContainer.java (original)
+++ incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/AbstractScopeContainer.java Sat Jul 21 01:15:44 2007
@@ -100,6 +100,16 @@
 
     public void returnWrapper(InstanceWrapper wrapper, KEY contextId) throws TargetDestructionException {
     }
+    
+    /**
+     * Default implmentation of remove which does nothing 
+     * 
+     * @param contextId the identifier of the context to remove. 
+     * @throws PersistenceException if there was a problem removing the instance 
+     */
+    public void remove(KEY contextId) 
+        throws TargetDestructionException {
+    }    
 
     public synchronized void start() {
         int lifecycleState = getLifecycleState();

Modified: incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/ConversationalScopeContainer.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/ConversationalScopeContainer.java?view=diff&rev=558267&r1=558266&r2=558267
==============================================================================
--- incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/ConversationalScopeContainer.java (original)
+++ incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/ConversationalScopeContainer.java Sat Jul 21 01:15:44 2007
@@ -173,12 +173,6 @@
         return getInstanceWrapper(true,contextId);
     } 
     
-    @Override
-    // Override the remove to make sure if this path ever gets enabled this 
-    // implementation gets updated.
-    //
-    public void remove() throws PersistenceException {
-    }
     
     // The remove is invoked when a conversation is explicitly ended.  This can occur by using the @EndsConversation or API.  
     // In this case the instance is immediately removed.  A new conversation will be started on the next operation

Modified: incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/scope/ScopeContainer.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/scope/ScopeContainer.java?view=diff&rev=558267&r1=558266&r2=558267
==============================================================================
--- incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/scope/ScopeContainer.java (original)
+++ incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/scope/ScopeContainer.java Sat Jul 21 01:15:44 2007
@@ -90,4 +90,14 @@
      * @throws PersistenceException if there was a problem removing the instance
      */
      void remove() throws PersistenceException;
+     
+     /**
+      * Removes an identified component implementation instance associated with the current 
+      * context from persistent storage
+      *
+      * @param contextId the identifier of the context to remove. 
+      * @throws PersistenceException if there was a problem removing the instance
+      */
+      void remove(KEY contextId) 
+          throws TargetDestructionException;     
 }



---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org