You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by js...@apache.org on 2007/05/07 11:33:43 UTC

svn commit: r535813 - in /incubator/tuscany/java/sca/modules: core-spi/src/main/java/org/apache/tuscany/event/ core-spi/src/main/java/org/apache/tuscany/scope/ core-spi/src/main/java/org/apache/tuscany/spi/ core-spi/src/main/java/org/apache/tuscany/spi...

Author: jsdelfino
Date: Mon May  7 02:33:39 2007
New Revision: 535813

URL: http://svn.apache.org/viewvc?view=rev&rev=535813
Log:
Renamed spi.event package to event.

Added:
    incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/event/
    incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/event/Event.java   (with props)
    incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/event/EventFilter.java   (with props)
    incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/event/EventPublisher.java   (with props)
    incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/event/RuntimeEventListener.java   (with props)
    incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/event/TrueFilter.java   (with props)
Removed:
    incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/spi/event/
    incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/spi/package-info.java
Modified:
    incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/scope/ScopeContainer.java
    incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/store/Store.java
    incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/store/StoreExpirationEvent.java
    incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/core/event/BaseEventPublisher.java
    incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/core/event/ComponentStart.java
    incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/core/event/ComponentStop.java
    incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/core/event/ConversationEnd.java
    incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/core/event/ConversationStart.java
    incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/core/event/HttpSessionEnd.java
    incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/core/event/HttpSessionStart.java
    incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/core/event/RequestEnd.java
    incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/core/event/RequestStart.java
    incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/core/scope/AbstractScopeContainer.java
    incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/core/scope/ConversationalScopeContainer.java
    incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/core/scope/HttpSessionScopeContainer.java
    incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/core/scope/RequestScopeContainer.java
    incubator/tuscany/java/sca/modules/core/src/test/java/org/apache/tuscany/core/event/BaseEventPublisherTestCase.java
    incubator/tuscany/java/sca/modules/core/src/test/java/org/apache/tuscany/core/store/MemoryStoreTestCase.java

Added: incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/event/Event.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/event/Event.java?view=auto&rev=535813
==============================================================================
--- incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/event/Event.java (added)
+++ incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/event/Event.java Mon May  7 02:33:39 2007
@@ -0,0 +1,33 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.    
+ */
+package org.apache.tuscany.event;
+
+/**
+ * Represents an event that is propagated in the runtime
+ *
+ * @version $$Rev$$ $$Date$$
+ */
+public interface Event {
+
+    /**
+     * Returns the source of the event
+     */
+    Object getSource();
+
+}

Propchange: incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/event/Event.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/event/Event.java
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Added: incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/event/EventFilter.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/event/EventFilter.java?view=auto&rev=535813
==============================================================================
--- incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/event/EventFilter.java (added)
+++ incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/event/EventFilter.java Mon May  7 02:33:39 2007
@@ -0,0 +1,33 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.    
+ */
+package org.apache.tuscany.event;
+
+/**
+ * Evaluates whether a {@link RuntimeEventListener} is applicable to a given runtime event
+ *
+ * @version $$Rev$$ $$Date$$
+ */
+public interface EventFilter {
+
+    /**
+     * Performs the actual evaluation on an event
+     */
+    boolean match(Event event);
+
+}

Propchange: incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/event/EventFilter.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/event/EventFilter.java
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Added: incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/event/EventPublisher.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/event/EventPublisher.java?view=auto&rev=535813
==============================================================================
--- incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/event/EventPublisher.java (added)
+++ incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/event/EventPublisher.java Mon May  7 02:33:39 2007
@@ -0,0 +1,50 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.    
+ */
+package org.apache.tuscany.event;
+
+/**
+ * Publishes events in the runtime
+ *
+ * @version $$Rev$$ $$Date$$
+ */
+public interface EventPublisher {
+
+    /**
+     * Publish an event
+     */
+    void publish(Event object);
+
+    /**
+     * Registers a listener to receive notifications for the context
+     */
+    void addListener(RuntimeEventListener listener);
+
+    /**
+     * Registers a listener to receive notifications for the context
+     */
+    void addListener(EventFilter filter, RuntimeEventListener listener);
+
+
+    /**
+     * Removes a previously registered listener
+     */
+    void removeListener(RuntimeEventListener listener);
+
+
+}

Propchange: incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/event/EventPublisher.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/event/EventPublisher.java
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Added: incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/event/RuntimeEventListener.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/event/RuntimeEventListener.java?view=auto&rev=535813
==============================================================================
--- incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/event/RuntimeEventListener.java (added)
+++ incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/event/RuntimeEventListener.java Mon May  7 02:33:39 2007
@@ -0,0 +1,31 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.    
+ */
+package org.apache.tuscany.event;
+
+import java.util.EventListener;
+
+/**
+ * Listeners observe events fired in the SCA runtime.
+ *
+ * @version $Rev$ $Date$
+ */
+public interface RuntimeEventListener extends EventListener {
+
+    void onEvent(Event event);
+}

Propchange: incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/event/RuntimeEventListener.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/event/RuntimeEventListener.java
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Added: incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/event/TrueFilter.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/event/TrueFilter.java?view=auto&rev=535813
==============================================================================
--- incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/event/TrueFilter.java (added)
+++ incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/event/TrueFilter.java Mon May  7 02:33:39 2007
@@ -0,0 +1,31 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.    
+ */
+package org.apache.tuscany.event;
+
+/**
+ * An event filter that always returns a true condition
+ *
+ * @version $$Rev$$ $$Date$$
+ */
+public class TrueFilter implements EventFilter {
+
+    public boolean match(Event event) {
+        return true;
+    }
+}

Propchange: incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/event/TrueFilter.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/event/TrueFilter.java
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Modified: incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/scope/ScopeContainer.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/scope/ScopeContainer.java?view=diff&rev=535813&r1=535812&r2=535813
==============================================================================
--- incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/scope/ScopeContainer.java (original)
+++ incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/scope/ScopeContainer.java Mon May  7 02:33:39 2007
@@ -21,13 +21,13 @@
 import java.net.URI;
 
 import org.apache.tuscany.core.RuntimeComponent;
+import org.apache.tuscany.event.RuntimeEventListener;
 import org.apache.tuscany.spi.Lifecycle;
 import org.apache.tuscany.spi.component.GroupInitializationException;
 import org.apache.tuscany.spi.component.PersistenceException;
 import org.apache.tuscany.spi.component.TargetDestructionException;
 import org.apache.tuscany.spi.component.TargetNotFoundException;
 import org.apache.tuscany.spi.component.TargetResolutionException;
-import org.apache.tuscany.spi.event.RuntimeEventListener;
 
 
 /**

Modified: incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/store/Store.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/store/Store.java?view=diff&rev=535813&r1=535812&r2=535813
==============================================================================
--- incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/store/Store.java (original)
+++ incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/store/Store.java Mon May  7 02:33:39 2007
@@ -19,7 +19,7 @@
 package org.apache.tuscany.store;
 
 import org.apache.tuscany.core.RuntimeComponent;
-import org.apache.tuscany.spi.event.EventPublisher;
+import org.apache.tuscany.event.EventPublisher;
 
 /**
  * Implementations provide a persistent store for runtime data such as conversational state. A persistent store could be

Modified: incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/store/StoreExpirationEvent.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/store/StoreExpirationEvent.java?view=diff&rev=535813&r1=535812&r2=535813
==============================================================================
--- incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/store/StoreExpirationEvent.java (original)
+++ incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/store/StoreExpirationEvent.java Mon May  7 02:33:39 2007
@@ -19,7 +19,7 @@
 package org.apache.tuscany.store;
 
 import org.apache.tuscany.core.RuntimeComponent;
-import org.apache.tuscany.spi.event.Event;
+import org.apache.tuscany.event.Event;
 
 /**
  * Fired when a store implementation expires a resource

Modified: incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/core/event/BaseEventPublisher.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/core/event/BaseEventPublisher.java?view=diff&rev=535813&r1=535812&r2=535813
==============================================================================
--- incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/core/event/BaseEventPublisher.java (original)
+++ incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/core/event/BaseEventPublisher.java Mon May  7 02:33:39 2007
@@ -23,11 +23,11 @@
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.CopyOnWriteArrayList;
 
-import org.apache.tuscany.spi.event.Event;
-import org.apache.tuscany.spi.event.EventFilter;
-import org.apache.tuscany.spi.event.EventPublisher;
-import org.apache.tuscany.spi.event.RuntimeEventListener;
-import org.apache.tuscany.spi.event.TrueFilter;
+import org.apache.tuscany.event.Event;
+import org.apache.tuscany.event.EventFilter;
+import org.apache.tuscany.event.EventPublisher;
+import org.apache.tuscany.event.RuntimeEventListener;
+import org.apache.tuscany.event.TrueFilter;
 
 /**
  * Base implementation of an <code>EventPublisher</code>

Modified: incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/core/event/ComponentStart.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/core/event/ComponentStart.java?view=diff&rev=535813&r1=535812&r2=535813
==============================================================================
--- incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/core/event/ComponentStart.java (original)
+++ incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/core/event/ComponentStart.java Mon May  7 02:33:39 2007
@@ -20,7 +20,7 @@
 
 import java.net.URI;
 
-import org.apache.tuscany.spi.event.Event;
+import org.apache.tuscany.event.Event;
 
 /**
  * Propagated when a component starts

Modified: incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/core/event/ComponentStop.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/core/event/ComponentStop.java?view=diff&rev=535813&r1=535812&r2=535813
==============================================================================
--- incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/core/event/ComponentStop.java (original)
+++ incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/core/event/ComponentStop.java Mon May  7 02:33:39 2007
@@ -20,7 +20,7 @@
 
 import java.net.URI;
 
-import org.apache.tuscany.spi.event.Event;
+import org.apache.tuscany.event.Event;
 
 /**
  * Propagated when a component stops

Modified: incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/core/event/ConversationEnd.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/core/event/ConversationEnd.java?view=diff&rev=535813&r1=535812&r2=535813
==============================================================================
--- incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/core/event/ConversationEnd.java (original)
+++ incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/core/event/ConversationEnd.java Mon May  7 02:33:39 2007
@@ -18,7 +18,7 @@
  */
 package org.apache.tuscany.core.event;
 
-import org.apache.tuscany.spi.event.Event;
+import org.apache.tuscany.event.Event;
 
 
 

Modified: incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/core/event/ConversationStart.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/core/event/ConversationStart.java?view=diff&rev=535813&r1=535812&r2=535813
==============================================================================
--- incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/core/event/ConversationStart.java (original)
+++ incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/core/event/ConversationStart.java Mon May  7 02:33:39 2007
@@ -18,7 +18,7 @@
  */
 package org.apache.tuscany.core.event;
 
-import org.apache.tuscany.spi.event.Event;
+import org.apache.tuscany.event.Event;
 
 
 /**

Modified: incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/core/event/HttpSessionEnd.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/core/event/HttpSessionEnd.java?view=diff&rev=535813&r1=535812&r2=535813
==============================================================================
--- incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/core/event/HttpSessionEnd.java (original)
+++ incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/core/event/HttpSessionEnd.java Mon May  7 02:33:39 2007
@@ -18,7 +18,7 @@
  */
 package org.apache.tuscany.core.event;
 
-import org.apache.tuscany.spi.event.Event;
+import org.apache.tuscany.event.Event;
 
 
 

Modified: incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/core/event/HttpSessionStart.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/core/event/HttpSessionStart.java?view=diff&rev=535813&r1=535812&r2=535813
==============================================================================
--- incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/core/event/HttpSessionStart.java (original)
+++ incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/core/event/HttpSessionStart.java Mon May  7 02:33:39 2007
@@ -18,7 +18,7 @@
  */
 package org.apache.tuscany.core.event;
 
-import org.apache.tuscany.spi.event.Event;
+import org.apache.tuscany.event.Event;
 
 
 /**

Modified: incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/core/event/RequestEnd.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/core/event/RequestEnd.java?view=diff&rev=535813&r1=535812&r2=535813
==============================================================================
--- incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/core/event/RequestEnd.java (original)
+++ incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/core/event/RequestEnd.java Mon May  7 02:33:39 2007
@@ -18,7 +18,7 @@
  */
 package org.apache.tuscany.core.event;
 
-import org.apache.tuscany.spi.event.Event;
+import org.apache.tuscany.event.Event;
 
 /**
  * Propagated when a request completes or is ended

Modified: incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/core/event/RequestStart.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/core/event/RequestStart.java?view=diff&rev=535813&r1=535812&r2=535813
==============================================================================
--- incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/core/event/RequestStart.java (original)
+++ incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/core/event/RequestStart.java Mon May  7 02:33:39 2007
@@ -18,7 +18,7 @@
  */
 package org.apache.tuscany.core.event;
 
-import org.apache.tuscany.spi.event.Event;
+import org.apache.tuscany.event.Event;
 
 /**
  * Propagated when a request is started in the runtime

Modified: incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/core/scope/AbstractScopeContainer.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/core/scope/AbstractScopeContainer.java?view=diff&rev=535813&r1=535812&r2=535813
==============================================================================
--- incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/core/scope/AbstractScopeContainer.java (original)
+++ incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/core/scope/AbstractScopeContainer.java Mon May  7 02:33:39 2007
@@ -28,6 +28,7 @@
 import org.apache.tuscany.assembly.Implementation;
 import org.apache.tuscany.core.RuntimeComponent;
 import org.apache.tuscany.core.ScopedImplementationProvider;
+import org.apache.tuscany.event.Event;
 import org.apache.tuscany.scope.InstanceWrapper;
 import org.apache.tuscany.scope.Scope;
 import org.apache.tuscany.scope.ScopeContainer;
@@ -37,7 +38,6 @@
 import org.apache.tuscany.spi.component.PersistenceException;
 import org.apache.tuscany.spi.component.TargetDestructionException;
 import org.apache.tuscany.spi.component.TargetResolutionException;
-import org.apache.tuscany.spi.event.Event;
 import org.osoa.sca.annotations.Destroy;
 import org.osoa.sca.annotations.Init;
 import org.osoa.sca.annotations.Reference;

Modified: incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/core/scope/ConversationalScopeContainer.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/core/scope/ConversationalScopeContainer.java?view=diff&rev=535813&r1=535812&r2=535813
==============================================================================
--- incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/core/scope/ConversationalScopeContainer.java (original)
+++ incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/core/scope/ConversationalScopeContainer.java Mon May  7 02:33:39 2007
@@ -21,6 +21,8 @@
 import java.net.URI;
 
 import org.apache.tuscany.core.RuntimeComponent;
+import org.apache.tuscany.event.Event;
+import org.apache.tuscany.event.RuntimeEventListener;
 import org.apache.tuscany.scope.InstanceWrapper;
 import org.apache.tuscany.scope.Scope;
 import org.apache.tuscany.scope.ScopeContainer;
@@ -28,8 +30,6 @@
 import org.apache.tuscany.spi.component.TargetDestructionException;
 import org.apache.tuscany.spi.component.TargetResolutionException;
 import org.apache.tuscany.spi.component.WorkContext;
-import org.apache.tuscany.spi.event.Event;
-import org.apache.tuscany.spi.event.RuntimeEventListener;
 import org.apache.tuscany.store.Store;
 import org.apache.tuscany.store.StoreExpirationEvent;
 import org.apache.tuscany.store.StoreReadException;

Modified: incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/core/scope/HttpSessionScopeContainer.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/core/scope/HttpSessionScopeContainer.java?view=diff&rev=535813&r1=535812&r2=535813
==============================================================================
--- incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/core/scope/HttpSessionScopeContainer.java (original)
+++ incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/core/scope/HttpSessionScopeContainer.java Mon May  7 02:33:39 2007
@@ -26,12 +26,12 @@
 
 import org.apache.tuscany.core.RuntimeComponent;
 import org.apache.tuscany.core.event.HttpSessionEnd;
+import org.apache.tuscany.event.Event;
 import org.apache.tuscany.scope.InstanceWrapper;
 import org.apache.tuscany.scope.Scope;
 import org.apache.tuscany.spi.component.TargetDestructionException;
 import org.apache.tuscany.spi.component.TargetResolutionException;
 import org.apache.tuscany.spi.component.WorkContext;
-import org.apache.tuscany.spi.event.Event;
 
 /**
  * A scope context which manages atomic component instances keyed on HTTP

Modified: incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/core/scope/RequestScopeContainer.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/core/scope/RequestScopeContainer.java?view=diff&rev=535813&r1=535812&r2=535813
==============================================================================
--- incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/core/scope/RequestScopeContainer.java (original)
+++ incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/core/scope/RequestScopeContainer.java Mon May  7 02:33:39 2007
@@ -27,11 +27,11 @@
 
 import org.apache.tuscany.core.RuntimeComponent;
 import org.apache.tuscany.core.event.RequestEnd;
+import org.apache.tuscany.event.Event;
 import org.apache.tuscany.scope.InstanceWrapper;
 import org.apache.tuscany.scope.Scope;
 import org.apache.tuscany.spi.component.TargetDestructionException;
 import org.apache.tuscany.spi.component.TargetResolutionException;
-import org.apache.tuscany.spi.event.Event;
 
 /**
  * A scope context which manages atomic component instances keyed on the current request context

Modified: incubator/tuscany/java/sca/modules/core/src/test/java/org/apache/tuscany/core/event/BaseEventPublisherTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/core/src/test/java/org/apache/tuscany/core/event/BaseEventPublisherTestCase.java?view=diff&rev=535813&r1=535812&r2=535813
==============================================================================
--- incubator/tuscany/java/sca/modules/core/src/test/java/org/apache/tuscany/core/event/BaseEventPublisherTestCase.java (original)
+++ incubator/tuscany/java/sca/modules/core/src/test/java/org/apache/tuscany/core/event/BaseEventPublisherTestCase.java Mon May  7 02:33:39 2007
@@ -21,11 +21,11 @@
 
 import junit.framework.TestCase;
 
-import org.apache.tuscany.spi.event.Event;
-import org.apache.tuscany.spi.event.EventFilter;
-import org.apache.tuscany.spi.event.EventPublisher;
-import org.apache.tuscany.spi.event.RuntimeEventListener;
-import org.apache.tuscany.spi.event.TrueFilter;
+import org.apache.tuscany.event.Event;
+import org.apache.tuscany.event.EventFilter;
+import org.apache.tuscany.event.EventPublisher;
+import org.apache.tuscany.event.RuntimeEventListener;
+import org.apache.tuscany.event.TrueFilter;
 import org.easymock.EasyMock;
 
 /**

Modified: incubator/tuscany/java/sca/modules/core/src/test/java/org/apache/tuscany/core/store/MemoryStoreTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/core/src/test/java/org/apache/tuscany/core/store/MemoryStoreTestCase.java?view=diff&rev=535813&r1=535812&r2=535813
==============================================================================
--- incubator/tuscany/java/sca/modules/core/src/test/java/org/apache/tuscany/core/store/MemoryStoreTestCase.java (original)
+++ incubator/tuscany/java/sca/modules/core/src/test/java/org/apache/tuscany/core/store/MemoryStoreTestCase.java Mon May  7 02:33:39 2007
@@ -26,7 +26,7 @@
 
 import org.apache.tuscany.core.RuntimeComponent;
 import org.apache.tuscany.core.store.MemoryStore;
-import org.apache.tuscany.spi.event.RuntimeEventListener;
+import org.apache.tuscany.event.RuntimeEventListener;
 import org.apache.tuscany.store.DuplicateRecordException;
 import org.apache.tuscany.store.Store;
 import org.apache.tuscany.store.StoreExpirationEvent;



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