svn commit: r377064 - in /incubator/tuscany/java/sca: container.java/src/test/java/org/apache/tuscany/container/java/integration/ core/src/main/java/org/apache/tuscany/core/builder/ core/src/main/java/org/apache/tuscany/core/runtime/ core/src/main/java...

[jb...@apache.org]

Author: jboynes
Date: Sat Feb 11 13:35:15 2006
New Revision: 377064

URL: http://svn.apache.org/viewcvs?rev=377064&view=rev
Log:
refactor runtime classes into separate package

Added:
    incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/runtime/
    incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/runtime/RuntimeContext.java   (contents, props changed)
      - copied, changed from r377007, incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/system/context/RuntimeContext.java
    incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/runtime/RuntimeContextImpl.java   (contents, props changed)
      - copied, changed from r377022, incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/system/context/RuntimeContextImpl.java
    incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/runtime/RuntimeMonitor.java   (contents, props changed)
      - copied, changed from r377007, incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/system/context/RuntimeMonitor.java
    incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/runtime/RuntimeScopeStrategy.java   (contents, props changed)
      - copied, changed from r377007, incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/system/context/RuntimeScopeStrategy.java
    incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/runtime/RuntimeBootTestCase.java   (contents, props changed)
      - copied, changed from r377050, incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/system/context/RuntimeBootTestCase.java
    incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/runtime/RuntimeContextImplTestCase.java   (contents, props changed)
      - copied, changed from r377022, incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/system/context/RuntimeContextImplTestCase.java
Removed:
    incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/system/context/RuntimeContext.java
    incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/system/context/RuntimeContextImpl.java
    incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/system/context/RuntimeMonitor.java
    incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/system/context/RuntimeScopeStrategy.java
    incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/system/context/RuntimeBootTestCase.java
    incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/system/context/RuntimeContextImplTestCase.java
Modified:
    incubator/tuscany/java/sca/container.java/src/test/java/org/apache/tuscany/container/java/integration/JavaIntegrationTestCase.java
    incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/builder/ReferenceBuilder.java
    incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/system/builder/ProxyFactoryBuilder.java
    incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/system/builder/SystemComponentContextBuilder.java
    incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/system/context/SystemAggregateContextImpl.java
    incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/system/context/SystemBootstrapTestCase.java
    incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/system/context/TestBuilder.java
    incubator/tuscany/java/sca/tomcat/src/main/java/org/apache/tuscany/tomcat/lifecycle/listener/RuntimeBootstrap.java
    incubator/tuscany/java/sca/tomcat/src/main/java/org/apache/tuscany/tomcat/lifecycle/listener/WebAppLifecycleListener.java

Modified: incubator/tuscany/java/sca/container.java/src/test/java/org/apache/tuscany/container/java/integration/JavaIntegrationTestCase.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/container.java/src/test/java/org/apache/tuscany/container/java/integration/JavaIntegrationTestCase.java?rev=377064&r1=377063&r2=377064&view=diff
==============================================================================
--- incubator/tuscany/java/sca/container.java/src/test/java/org/apache/tuscany/container/java/integration/JavaIntegrationTestCase.java (original)
+++ incubator/tuscany/java/sca/container.java/src/test/java/org/apache/tuscany/container/java/integration/JavaIntegrationTestCase.java Sat Feb 11 13:35:15 2006
@@ -21,8 +21,8 @@
 
 import org.apache.tuscany.container.java.assembly.JavaAssemblyFactory;
 import org.apache.tuscany.container.java.assembly.impl.JavaAssemblyFactoryImpl;
-import org.apache.tuscany.core.system.context.RuntimeContext;
-import org.apache.tuscany.core.system.context.RuntimeContextImpl;
+import org.apache.tuscany.core.runtime.RuntimeContext;
+import org.apache.tuscany.core.runtime.RuntimeContextImpl;
 import org.apache.tuscany.model.assembly.Module;
 import org.apache.tuscany.model.assembly.ModuleComponent;
 

Modified: incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/builder/ReferenceBuilder.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/builder/ReferenceBuilder.java?rev=377064&r1=377063&r2=377064&view=diff
==============================================================================
--- incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/builder/ReferenceBuilder.java (original)
+++ incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/builder/ReferenceBuilder.java Sat Feb 11 13:35:15 2006
@@ -18,7 +18,7 @@
 import org.apache.tuscany.core.invocation.spi.ProxyFactoryFactory;
 import org.apache.tuscany.core.message.MessageFactory;
 import org.apache.tuscany.core.system.annotation.Autowire;
-import org.apache.tuscany.core.system.context.RuntimeContext;
+import org.apache.tuscany.core.runtime.RuntimeContext;
 import org.apache.tuscany.model.assembly.AssemblyModelObject;
 import org.apache.tuscany.model.assembly.ConfiguredReference;
 import org.apache.tuscany.model.assembly.ConfiguredService;

Copied: incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/runtime/RuntimeContext.java (from r377007, incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/system/context/RuntimeContext.java)
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/runtime/RuntimeContext.java?p2=incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/runtime/RuntimeContext.java&p1=incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/system/context/RuntimeContext.java&r1=377007&r2=377064&rev=377064&view=diff
==============================================================================
--- incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/system/context/RuntimeContext.java (original)
+++ incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/runtime/RuntimeContext.java Sat Feb 11 13:35:15 2006
@@ -11,7 +11,7 @@
  * 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.core.system.context;
+package org.apache.tuscany.core.runtime;
 
 import org.apache.tuscany.common.monitor.MonitorFactory;
 import org.apache.tuscany.core.builder.RuntimeConfigurationBuilder;

Propchange: incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/runtime/RuntimeContext.java
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Copied: incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/runtime/RuntimeContextImpl.java (from r377022, incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/system/context/RuntimeContextImpl.java)
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/runtime/RuntimeContextImpl.java?p2=incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/runtime/RuntimeContextImpl.java&p1=incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/system/context/RuntimeContextImpl.java&r1=377022&r2=377064&rev=377064&view=diff
==============================================================================
--- incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/system/context/RuntimeContextImpl.java (original)
+++ incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/runtime/RuntimeContextImpl.java Sat Feb 11 13:35:15 2006
@@ -11,7 +11,7 @@
  * 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.core.system.context;
+package org.apache.tuscany.core.runtime;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -34,6 +34,9 @@
 import org.apache.tuscany.core.context.TargetException;
 import org.apache.tuscany.core.context.impl.AggregateContextImpl;
 import org.apache.tuscany.core.context.impl.EventContextImpl;
+import org.apache.tuscany.core.runtime.RuntimeContext;
+import org.apache.tuscany.core.system.context.SystemAggregateContextImpl;
+import org.apache.tuscany.core.system.context.SystemScopeStrategy;
 import org.apache.tuscany.model.assembly.ExtensibleModelObject;
 
 /**

Propchange: incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/runtime/RuntimeContextImpl.java
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Copied: incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/runtime/RuntimeMonitor.java (from r377007, incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/system/context/RuntimeMonitor.java)
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/runtime/RuntimeMonitor.java?p2=incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/runtime/RuntimeMonitor.java&p1=incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/system/context/RuntimeMonitor.java&r1=377007&r2=377064&rev=377064&view=diff
==============================================================================
--- incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/system/context/RuntimeMonitor.java (original)
+++ incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/runtime/RuntimeMonitor.java Sat Feb 11 13:35:15 2006
@@ -11,7 +11,7 @@
  * 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.core.system.context;
+package org.apache.tuscany.core.runtime;
 
 import org.apache.tuscany.core.TuscanyException;
 import org.apache.tuscany.core.TuscanyRuntimeException;

Propchange: incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/runtime/RuntimeMonitor.java
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Copied: incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/runtime/RuntimeScopeStrategy.java (from r377007, incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/system/context/RuntimeScopeStrategy.java)
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/runtime/RuntimeScopeStrategy.java?p2=incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/runtime/RuntimeScopeStrategy.java&p1=incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/system/context/RuntimeScopeStrategy.java&r1=377007&r2=377064&rev=377064&view=diff
==============================================================================
--- incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/system/context/RuntimeScopeStrategy.java (original)
+++ incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/runtime/RuntimeScopeStrategy.java Sat Feb 11 13:35:15 2006
@@ -14,7 +14,7 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package org.apache.tuscany.core.system.context;
+package org.apache.tuscany.core.runtime;
 
 import static org.apache.tuscany.core.context.ContextConstants.AGGREGATE_SCOPE;
 

Propchange: incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/runtime/RuntimeScopeStrategy.java
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Modified: incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/system/builder/ProxyFactoryBuilder.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/system/builder/ProxyFactoryBuilder.java?rev=377064&r1=377063&r2=377064&view=diff
==============================================================================
--- incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/system/builder/ProxyFactoryBuilder.java (original)
+++ incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/system/builder/ProxyFactoryBuilder.java Sat Feb 11 13:35:15 2006
@@ -44,7 +44,7 @@
 import org.apache.tuscany.core.message.handler.MessageHandler;
 import org.apache.tuscany.core.system.annotation.Autowire;
 import org.apache.tuscany.core.system.assembly.SystemImplementation;
-import org.apache.tuscany.core.system.context.RuntimeContext;
+import org.apache.tuscany.core.runtime.RuntimeContext;
 import org.apache.tuscany.model.assembly.AssemblyModelObject;
 import org.apache.tuscany.model.assembly.Component;
 import org.apache.tuscany.model.assembly.ConfiguredReference;

Modified: incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/system/builder/SystemComponentContextBuilder.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/system/builder/SystemComponentContextBuilder.java?rev=377064&r1=377063&r2=377064&view=diff
==============================================================================
--- incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/system/builder/SystemComponentContextBuilder.java (original)
+++ incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/system/builder/SystemComponentContextBuilder.java Sat Feb 11 13:35:15 2006
@@ -44,7 +44,7 @@
 import org.apache.tuscany.core.system.annotation.ParentContext;
 import org.apache.tuscany.core.system.assembly.SystemImplementation;
 import org.apache.tuscany.core.system.config.SystemComponentRuntimeConfiguration;
-import org.apache.tuscany.core.system.context.RuntimeContext;
+import org.apache.tuscany.core.runtime.RuntimeContext;
 import org.apache.tuscany.model.assembly.AssemblyModelObject;
 import org.apache.tuscany.model.assembly.Component;
 import org.apache.tuscany.model.assembly.ConfiguredProperty;

Modified: incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/system/context/SystemAggregateContextImpl.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/system/context/SystemAggregateContextImpl.java?rev=377064&r1=377063&r2=377064&view=diff
==============================================================================
--- incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/system/context/SystemAggregateContextImpl.java (original)
+++ incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/system/context/SystemAggregateContextImpl.java Sat Feb 11 13:35:15 2006
@@ -59,6 +59,7 @@
 import org.apache.tuscany.core.system.annotation.Autowire;
 import org.apache.tuscany.core.system.annotation.ParentContext;
 import org.apache.tuscany.core.system.assembly.SystemBinding;
+import org.apache.tuscany.core.runtime.RuntimeContext;
 import org.apache.tuscany.model.assembly.Component;
 import org.apache.tuscany.model.assembly.EntryPoint;
 import org.apache.tuscany.model.assembly.ExtensibleModelObject;

Copied: incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/runtime/RuntimeBootTestCase.java (from r377050, incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/system/context/RuntimeBootTestCase.java)
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/runtime/RuntimeBootTestCase.java?p2=incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/runtime/RuntimeBootTestCase.java&p1=incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/system/context/RuntimeBootTestCase.java&r1=377050&r2=377064&rev=377064&view=diff
==============================================================================
--- incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/system/context/RuntimeBootTestCase.java (original)
+++ incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/runtime/RuntimeBootTestCase.java Sat Feb 11 13:35:15 2006
@@ -11,7 +11,7 @@
  * 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.core.system.context;
+package org.apache.tuscany.core.runtime;
 
 import java.util.List;
 
@@ -24,6 +24,8 @@
 import org.apache.tuscany.core.context.Context;
 import org.apache.tuscany.core.context.EventContext;
 import org.apache.tuscany.core.mock.MockSystemAssemblyFactory;
+import org.apache.tuscany.core.runtime.RuntimeContext;
+import org.apache.tuscany.core.runtime.RuntimeContextImpl;
 
 /**
  * Tests runtime boot scenarios

Propchange: incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/runtime/RuntimeBootTestCase.java
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Copied: incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/runtime/RuntimeContextImplTestCase.java (from r377022, incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/system/context/RuntimeContextImplTestCase.java)
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/runtime/RuntimeContextImplTestCase.java?p2=incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/runtime/RuntimeContextImplTestCase.java&p1=incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/system/context/RuntimeContextImplTestCase.java&r1=377022&r2=377064&rev=377064&view=diff
==============================================================================
--- incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/system/context/RuntimeContextImplTestCase.java (original)
+++ incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/runtime/RuntimeContextImplTestCase.java Sat Feb 11 13:35:15 2006
@@ -11,7 +11,7 @@
  * 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.core.system.context;
+package org.apache.tuscany.core.runtime;
 
 import java.util.List;
 
@@ -29,6 +29,10 @@
 import org.apache.tuscany.core.mock.component.ModuleScopeSystemComponent;
 import org.apache.tuscany.core.mock.component.ModuleScopeSystemComponentImpl;
 import org.apache.tuscany.core.system.assembly.pojo.PojoSystemBinding;
+import org.apache.tuscany.core.system.context.SystemAggregateContextImpl;
+import org.apache.tuscany.core.system.context.TestBuilder;
+import org.apache.tuscany.core.runtime.RuntimeContext;
+import org.apache.tuscany.core.runtime.RuntimeContextImpl;
 import org.apache.tuscany.model.assembly.Component;
 import org.apache.tuscany.model.assembly.EntryPoint;
 import org.apache.tuscany.model.assembly.ExternalService;

Propchange: incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/runtime/RuntimeContextImplTestCase.java
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Modified: incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/system/context/SystemBootstrapTestCase.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/system/context/SystemBootstrapTestCase.java?rev=377064&r1=377063&r2=377064&view=diff
==============================================================================
--- incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/system/context/SystemBootstrapTestCase.java (original)
+++ incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/system/context/SystemBootstrapTestCase.java Sat Feb 11 13:35:15 2006
@@ -29,6 +29,8 @@
 import org.apache.tuscany.core.mock.component.ModuleScopeSystemComponent;
 import org.apache.tuscany.core.mock.component.ModuleScopeSystemComponentImpl;
 import org.apache.tuscany.core.system.assembly.pojo.PojoSystemBinding;
+import org.apache.tuscany.core.runtime.RuntimeContext;
+import org.apache.tuscany.core.runtime.RuntimeContextImpl;
 import org.apache.tuscany.model.assembly.Component;
 import org.apache.tuscany.model.assembly.ExternalService;
 import org.apache.tuscany.model.assembly.Module;

Modified: incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/system/context/TestBuilder.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/system/context/TestBuilder.java?rev=377064&r1=377063&r2=377064&view=diff
==============================================================================
--- incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/system/context/TestBuilder.java (original)
+++ incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/system/context/TestBuilder.java Sat Feb 11 13:35:15 2006
@@ -4,6 +4,7 @@
 import org.apache.tuscany.core.builder.RuntimeConfigurationBuilder;
 import org.apache.tuscany.core.context.AggregateContext;
 import org.apache.tuscany.core.system.annotation.Autowire;
+import org.apache.tuscany.core.runtime.RuntimeContext;
 import org.apache.tuscany.model.assembly.AssemblyModelObject;
 import org.osoa.sca.annotations.Init;
 import org.osoa.sca.annotations.Scope;

Modified: incubator/tuscany/java/sca/tomcat/src/main/java/org/apache/tuscany/tomcat/lifecycle/listener/RuntimeBootstrap.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/tomcat/src/main/java/org/apache/tuscany/tomcat/lifecycle/listener/RuntimeBootstrap.java?rev=377064&r1=377063&r2=377064&view=diff
==============================================================================
--- incubator/tuscany/java/sca/tomcat/src/main/java/org/apache/tuscany/tomcat/lifecycle/listener/RuntimeBootstrap.java (original)
+++ incubator/tuscany/java/sca/tomcat/src/main/java/org/apache/tuscany/tomcat/lifecycle/listener/RuntimeBootstrap.java Sat Feb 11 13:35:15 2006
@@ -30,8 +30,8 @@
 import org.apache.tuscany.core.system.builder.SystemComponentContextBuilder;
 import org.apache.tuscany.core.system.builder.SystemEntryPointBuilder;
 import org.apache.tuscany.core.system.builder.SystemExternalServiceBuilder;
-import org.apache.tuscany.core.system.context.RuntimeContext;
-import org.apache.tuscany.core.system.context.RuntimeContextImpl;
+import org.apache.tuscany.core.runtime.RuntimeContext;
+import org.apache.tuscany.core.runtime.RuntimeContextImpl;
 
 /**
  * Bootstraps an SCA runtime hosted by a Tomcat instance. The runtime will be bound to JNDI and accessed by
@@ -42,7 +42,7 @@
  * <code>GlobalNamingResources</code> element:
  * 
  * <pre>
- *   &lt;Resource name=&quot;TuscanyRuntime&quot; auth=&quot;Container&quot; type=&quot;org.apache.tuscany.core.system.context.RuntimeContext&quot;
+ *   &lt;Resource name=&quot;TuscanyRuntime&quot; auth=&quot;Container&quot; type=&quot;org.apache.tuscany.core.runtime.RuntimeContext&quot;
  *          description=&quot;Tuscany Runtime&quot;
  *          factory=&quot; org.apache.tuscany.tomcat.lifecycle.listener.RuntimeBootstrap&quot;
  *          monitor=&quot;[monitor factory]&quot; loader=&quot;[configuration loader]&quot;/&gt;

Modified: incubator/tuscany/java/sca/tomcat/src/main/java/org/apache/tuscany/tomcat/lifecycle/listener/WebAppLifecycleListener.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/tomcat/src/main/java/org/apache/tuscany/tomcat/lifecycle/listener/WebAppLifecycleListener.java?rev=377064&r1=377063&r2=377064&view=diff
==============================================================================
--- incubator/tuscany/java/sca/tomcat/src/main/java/org/apache/tuscany/tomcat/lifecycle/listener/WebAppLifecycleListener.java (original)
+++ incubator/tuscany/java/sca/tomcat/src/main/java/org/apache/tuscany/tomcat/lifecycle/listener/WebAppLifecycleListener.java Sat Feb 11 13:35:15 2006
@@ -26,14 +26,14 @@
 import org.apache.catalina.deploy.FilterDef;
 import org.apache.catalina.deploy.FilterMap;
 import org.apache.tuscany.core.TuscanyRuntimeException;
+import org.apache.tuscany.core.runtime.RuntimeContext;
 import org.apache.tuscany.core.config.ConfigurationException;
 import org.apache.tuscany.core.context.EventContext;
 import org.apache.tuscany.core.context.TuscanyModuleComponentContext;
 import org.apache.tuscany.core.context.webapp.HTTPSessionExpirationListener;
 import org.apache.tuscany.core.context.webapp.TuscanyRequestFilter;
 import org.apache.tuscany.core.context.webapp.TuscanyWebAppRuntime;
-import org.apache.tuscany.core.system.context.RuntimeContext;
-import org.apache.tuscany.core.system.context.RuntimeMonitor;
+import org.apache.tuscany.core.runtime.RuntimeMonitor;
 import org.apache.tuscany.model.assembly.ModuleComponent;
 
 /**