You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by rf...@apache.org on 2008/10/11 01:33:47 UTC
svn commit: r703606 - in /tuscany/branches/sca-equinox/modules:
core-spi/src/main/java/org/apache/tuscany/sca/event/
core-spi/src/main/java/org/apache/tuscany/sca/store/
core-spi/src/test/java/org/apache/tuscany/sca/event/
core/src/main/java/org/apache...
Author: rfeng
Date: Fri Oct 10 16:33:46 2008
New Revision: 703606
URL: http://svn.apache.org/viewvc?rev=703606&view=rev
Log:
Remove dead code (Event/Store)
Removed:
tuscany/branches/sca-equinox/modules/core-spi/src/main/java/org/apache/tuscany/sca/event/
tuscany/branches/sca-equinox/modules/core-spi/src/main/java/org/apache/tuscany/sca/store/
tuscany/branches/sca-equinox/modules/core-spi/src/test/java/org/apache/tuscany/sca/event/
tuscany/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/event/
tuscany/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/store/
tuscany/branches/sca-equinox/modules/core/src/test/java/org/apache/tuscany/sca/core/event/
tuscany/branches/sca-equinox/modules/core/src/test/java/org/apache/tuscany/sca/core/store/
Modified:
tuscany/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/AbstractScopeContainer.java
tuscany/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/ConversationalScopeContainer.java
tuscany/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/ConversationalScopeContainerFactory.java
tuscany/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/DefaultScopeRegistry.java
tuscany/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/HttpSessionScopeContainer.java
tuscany/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/RequestScopeContainer.java
tuscany/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/ScopeContainer.java
Modified: tuscany/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/AbstractScopeContainer.java
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/AbstractScopeContainer.java?rev=703606&r1=703605&r2=703606&view=diff
==============================================================================
--- tuscany/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/AbstractScopeContainer.java (original)
+++ tuscany/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/AbstractScopeContainer.java Fri Oct 10 16:33:46 2008
@@ -22,7 +22,6 @@
import java.util.concurrent.ConcurrentHashMap;
import org.apache.tuscany.sca.core.context.InstanceWrapper;
-import org.apache.tuscany.sca.event.Event;
import org.apache.tuscany.sca.provider.ImplementationProvider;
import org.apache.tuscany.sca.runtime.RuntimeComponent;
@@ -88,9 +87,6 @@
// do nothing here. the conversational scope container implements this
}
- public void onEvent(Event event) {
- }
-
protected boolean isEagerInit() {
ImplementationProvider implementationProvider = ((RuntimeComponent)component).getImplementationProvider();
if (implementationProvider instanceof ScopedImplementationProvider) {
Modified: tuscany/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/ConversationalScopeContainer.java
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/ConversationalScopeContainer.java?rev=703606&r1=703605&r2=703606&view=diff
==============================================================================
--- tuscany/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/ConversationalScopeContainer.java (original)
+++ tuscany/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/ConversationalScopeContainer.java Fri Oct 10 16:33:46 2008
@@ -32,7 +32,6 @@
import org.apache.tuscany.sca.core.invocation.ThreadMessageContext;
import org.apache.tuscany.sca.invocation.Message;
import org.apache.tuscany.sca.runtime.RuntimeComponent;
-import org.apache.tuscany.sca.store.Store;
/**
* A scope context which manages atomic component instances keyed on ConversationID
@@ -44,7 +43,7 @@
private Map<Object, InstanceLifeCycleWrapper> instanceLifecycleCollection =
new ConcurrentHashMap<Object, InstanceLifeCycleWrapper>();
- public ConversationalScopeContainer(Store aStore, RuntimeComponent component) {
+ public ConversationalScopeContainer(RuntimeComponent component) {
super(Scope.CONVERSATION, component);
// Note: aStore is here to preserve the original factory interface. It is not currently used in this
Modified: tuscany/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/ConversationalScopeContainerFactory.java
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/ConversationalScopeContainerFactory.java?rev=703606&r1=703605&r2=703606&view=diff
==============================================================================
--- tuscany/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/ConversationalScopeContainerFactory.java (original)
+++ tuscany/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/ConversationalScopeContainerFactory.java Fri Oct 10 16:33:46 2008
@@ -20,21 +20,18 @@
package org.apache.tuscany.sca.core.scope;
import org.apache.tuscany.sca.runtime.RuntimeComponent;
-import org.apache.tuscany.sca.store.Store;
/**
* @version $Rev$ $Date$
*/
public class ConversationalScopeContainerFactory implements ScopeContainerFactory {
- private Store store;
- public ConversationalScopeContainerFactory(Store store) {
+ public ConversationalScopeContainerFactory() {
super();
- this.store = store;
}
public ScopeContainer createScopeContainer(RuntimeComponent component) {
- return new ConversationalScopeContainer(store, component);
+ return new ConversationalScopeContainer(component);
}
public Scope getScope() {
Modified: tuscany/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/DefaultScopeRegistry.java
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/DefaultScopeRegistry.java?rev=703606&r1=703605&r2=703606&view=diff
==============================================================================
--- tuscany/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/DefaultScopeRegistry.java (original)
+++ tuscany/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/DefaultScopeRegistry.java Fri Oct 10 16:33:46 2008
@@ -22,7 +22,7 @@
/**
* A default scope registry implementation.
*
- * @version $Rev: $ $Date: $
+ * @version $Rev$ $Date$
*/
public class DefaultScopeRegistry extends ScopeRegistryImpl implements ScopeRegistry {
@@ -30,7 +30,7 @@
ScopeContainerFactory[] factories =
new ScopeContainerFactory[] {new CompositeScopeContainerFactory(), new StatelessScopeContainerFactory(),
new RequestScopeContainerFactory(),
- new ConversationalScopeContainerFactory(null),
+ new ConversationalScopeContainerFactory(),
// new HttpSessionScopeContainer(monitor)
};
for (ScopeContainerFactory f : factories) {
Modified: tuscany/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/HttpSessionScopeContainer.java
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/HttpSessionScopeContainer.java?rev=703606&r1=703605&r2=703606&view=diff
==============================================================================
--- tuscany/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/HttpSessionScopeContainer.java (original)
+++ tuscany/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/HttpSessionScopeContainer.java Fri Oct 10 16:33:46 2008
@@ -19,8 +19,6 @@
package org.apache.tuscany.sca.core.scope;
import org.apache.tuscany.sca.core.context.InstanceWrapper;
-import org.apache.tuscany.sca.core.event.HttpSessionEnd;
-import org.apache.tuscany.sca.event.Event;
import org.apache.tuscany.sca.runtime.RuntimeComponent;
/**
@@ -36,16 +34,6 @@
}
@Override
- public void onEvent(Event event) {
- checkInit();
- if (event instanceof HttpSessionEnd) {
- //FIXME key is not used
- //Object key = ((HttpSessionEnd)event).getSessionID();
- // FIXME: Remove the session id
- }
- }
-
- @Override
public synchronized void start() {
if (lifecycleState != UNINITIALIZED && lifecycleState != STOPPED) {
throw new IllegalStateException("Scope must be in UNINITIALIZED or STOPPED state [" + lifecycleState + "]");
Modified: tuscany/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/RequestScopeContainer.java
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/RequestScopeContainer.java?rev=703606&r1=703605&r2=703606&view=diff
==============================================================================
--- tuscany/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/RequestScopeContainer.java (original)
+++ tuscany/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/RequestScopeContainer.java Fri Oct 10 16:33:46 2008
@@ -22,8 +22,6 @@
import java.util.concurrent.ConcurrentHashMap;
import org.apache.tuscany.sca.core.context.InstanceWrapper;
-import org.apache.tuscany.sca.core.event.RequestEnd;
-import org.apache.tuscany.sca.event.Event;
import org.apache.tuscany.sca.runtime.RuntimeComponent;
/**
@@ -41,14 +39,6 @@
}
@Override
- public void onEvent(Event event) {
- checkInit();
- if (event instanceof RequestEnd) {
- // shutdownInstances(Thread.currentThread());
- }
- }
-
- @Override
public synchronized void start() {
if (lifecycleState != UNINITIALIZED && lifecycleState != STOPPED) {
throw new IllegalStateException("Scope must be in UNINITIALIZED or STOPPED state [" + lifecycleState + "]");
Modified: tuscany/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/ScopeContainer.java
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/ScopeContainer.java?rev=703606&r1=703605&r2=703606&view=diff
==============================================================================
--- tuscany/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/ScopeContainer.java (original)
+++ tuscany/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/ScopeContainer.java Fri Oct 10 16:33:46 2008
@@ -19,7 +19,6 @@
package org.apache.tuscany.sca.core.scope;
import org.apache.tuscany.sca.core.context.InstanceWrapper;
-import org.apache.tuscany.sca.event.RuntimeEventListener;
import org.apache.tuscany.sca.runtime.RuntimeComponent;
@@ -31,7 +30,7 @@
* For example, for COMPOSITE scope this could be the URI of the composite component,
* or for HTTP Session scope it might be the HTTP session ID.
*/
-public interface ScopeContainer<KEY> extends RuntimeEventListener {
+public interface ScopeContainer<KEY> {
/**
* Returns the Scope that this container supports.