Author: jmarino
Date: Thu Apr 6 22:28:04 2006
New Revision: 392189
URL: http://svn.apache.org/viewcvs?rev=392189&view=rev
Log:
more extensibility API refactoring
Removed:
incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/context/Context.java
Modified:
incubator/tuscany/java/sca/bindings/binding.axis2/src/main/java/org/apache/tuscany/binding/axis2/builder/WebServiceEntryPointBuilder.java
incubator/tuscany/java/sca/bindings/binding.axis2/src/main/java/org/apache/tuscany/binding/axis2/handler/ExternalWebServiceTargetInvoker.java
incubator/tuscany/java/sca/bindings/binding.jsonrpc/src/main/java/org/apache/tuscany/binding/jsonrpc/builder/JSONRPCEntryPointConfigurationBuilder.java
incubator/tuscany/java/sca/containers/container.java/src/main/java/org/apache/tuscany/container/java/builder/JavaContextFactoryBuilder.java
incubator/tuscany/java/sca/containers/container.java/src/test/java/org/apache/tuscany/container/java/builder/JavaContextFactoryBuilderTestCase.java
incubator/tuscany/java/sca/containers/container.java/src/test/java/org/apache/tuscany/container/java/mock/binding/foo/FooESTargetInvoker.java
incubator/tuscany/java/sca/containers/container.js/src/main/java/org/apache/tuscany/container/js/builder/JavaScriptContextFactoryBuilder.java
incubator/tuscany/java/sca/containers/container.js/src/test/java/org/apache/tuscany/container/js/builder/JSContextFactoryBuilderTestCase.java
incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/builder/ContextFactory.java
incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/builder/ContextFactoryBuilder.java
incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/context/AbstractContext.java
incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/context/ContextRuntimeException.java
incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/context/InstanceContext.java
incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/context/scope/AbstractScopeContext.java
incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/context/scope/RequestScopeContext.java
incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/system/builder/SystemContextFactoryBuilder.java
incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/system/builder/SystemEntryPointBuilder.java
incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/system/builder/SystemExternalServiceBuilder.java
incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/system/config/SystemObjectContextFactory.java
incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/system/context/SystemComponentContext.java
incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/runtime/RuntimeBootTestCase.java
incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/runtime/RuntimeContextImplTestCase.java
incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/system/builder/SystemContextFactoryBuilderTestCase.java
incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/system/context/TestBuilder.java
Modified:
incubator/tuscany/java/sca/bindings/binding.axis2/src/main/java/org/apache/tuscany/binding/axis2/builder/WebServiceEntryPointBuilder.java
URL:
http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/bindings/binding.axis2/src/main/java/org/apache/tuscany/binding/axis2/builder/WebServiceEntryPointBuilder.java?rev=392189&r1=392188&r2=392189&view=diff
==============================================================================
---
incubator/tuscany/java/sca/bindings/binding.axis2/src/main/java/org/apache/tuscany/binding/axis2/builder/WebServiceEntryPointBuilder.java
(original)
+++
incubator/tuscany/java/sca/bindings/binding.axis2/src/main/java/org/apache/tuscany/binding/axis2/builder/WebServiceEntryPointBuilder.java
Thu Apr 6 22:28:04 2006
@@ -52,7 +52,7 @@
* @version $Rev$ $Date$
*/
@Scope("MODULE")
-public class WebServiceEntryPointBuilder implements
ContextFactoryBuilder<AggregateContext> {
+public class WebServiceEntryPointBuilder implements ContextFactoryBuilder {
private RuntimeContext runtimeContext;
Modified:
incubator/tuscany/java/sca/bindings/binding.axis2/src/main/java/org/apache/tuscany/binding/axis2/handler/ExternalWebServiceTargetInvoker.java
URL:
http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/bindings/binding.axis2/src/main/java/org/apache/tuscany/binding/axis2/handler/ExternalWebServiceTargetInvoker.java?rev=392189&r1=392188&r2=392189&view=diff
==============================================================================
---
incubator/tuscany/java/sca/bindings/binding.axis2/src/main/java/org/apache/tuscany/binding/axis2/handler/ExternalWebServiceTargetInvoker.java
(original)
+++
incubator/tuscany/java/sca/bindings/binding.axis2/src/main/java/org/apache/tuscany/binding/axis2/handler/ExternalWebServiceTargetInvoker.java
Thu Apr 6 22:28:04 2006
@@ -13,17 +13,13 @@
*/
package org.apache.tuscany.binding.axis2.handler;
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
-
-import org.apache.tuscany.core.context.ExternalServiceContext;
-import org.apache.tuscany.core.context.InstanceContext;
-import org.apache.tuscany.core.context.QualifiedName;
-import org.apache.tuscany.core.context.ScopeContext;
-import org.apache.tuscany.core.context.TargetException;
+import org.apache.tuscany.core.context.*;
import org.apache.tuscany.core.invocation.Interceptor;
import org.apache.tuscany.core.invocation.TargetInvoker;
import org.apache.tuscany.core.message.Message;
+
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
/**
* Responsible for invoking an external web service
Modified:
incubator/tuscany/java/sca/bindings/binding.jsonrpc/src/main/java/org/apache/tuscany/binding/jsonrpc/builder/JSONRPCEntryPointConfigurationBuilder.java
URL:
http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/bindings/binding.jsonrpc/src/main/java/org/apache/tuscany/binding/jsonrpc/builder/JSONRPCEntryPointConfigurationBuilder.java?rev=392189&r1=392188&r2=392189&view=diff
==============================================================================
---
incubator/tuscany/java/sca/bindings/binding.jsonrpc/src/main/java/org/apache/tuscany/binding/jsonrpc/builder/JSONRPCEntryPointConfigurationBuilder.java
(original)
+++
incubator/tuscany/java/sca/bindings/binding.jsonrpc/src/main/java/org/apache/tuscany/binding/jsonrpc/builder/JSONRPCEntryPointConfigurationBuilder.java
Thu Apr 6 22:28:04 2006
@@ -13,19 +13,12 @@
*/
package org.apache.tuscany.binding.jsonrpc.builder;
-import java.lang.reflect.Method;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.Set;
-
import org.apache.tuscany.binding.jsonrpc.assembly.JSONRPCBinding;
import
org.apache.tuscany.binding.jsonrpc.config.JSONRPCEntryPointRuntimeConfiguration;
import org.apache.tuscany.core.builder.BuilderException;
import org.apache.tuscany.core.builder.ContextFactoryBuilder;
import org.apache.tuscany.core.builder.impl.EntryPointContextFactory;
import org.apache.tuscany.core.config.JavaIntrospectionHelper;
-import org.apache.tuscany.core.context.AggregateContext;
import org.apache.tuscany.core.context.QualifiedName;
import org.apache.tuscany.core.invocation.InvocationConfiguration;
import org.apache.tuscany.core.invocation.ProxyConfiguration;
@@ -35,21 +28,23 @@
import org.apache.tuscany.core.message.MessageFactory;
import org.apache.tuscany.core.runtime.RuntimeContext;
import org.apache.tuscany.core.system.annotation.Autowire;
-import org.apache.tuscany.model.assembly.AssemblyModelObject;
-import org.apache.tuscany.model.assembly.ConfiguredService;
-import org.apache.tuscany.model.assembly.EntryPoint;
-import org.apache.tuscany.model.assembly.Service;
-import org.apache.tuscany.model.assembly.ServiceContract;
+import org.apache.tuscany.model.assembly.*;
import org.osoa.sca.annotations.Init;
import org.osoa.sca.annotations.Scope;
+import java.lang.reflect.Method;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Set;
+
/**
* Creates a <code>RuntimeConfigurationBuilder</code> for an entry point
configured with the [EMAIL PROTECTED] JSONRPCBinding}
*
* @version $Rev$ $Date$
*/
@Scope("MODULE")
-public class JSONRPCEntryPointConfigurationBuilder implements
ContextFactoryBuilder<AggregateContext> {
+public class JSONRPCEntryPointConfigurationBuilder implements
ContextFactoryBuilder {
private RuntimeContext runtimeContext;
Modified:
incubator/tuscany/java/sca/containers/container.java/src/main/java/org/apache/tuscany/container/java/builder/JavaContextFactoryBuilder.java
URL:
http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/containers/container.java/src/main/java/org/apache/tuscany/container/java/builder/JavaContextFactoryBuilder.java?rev=392189&r1=392188&r2=392189&view=diff
==============================================================================
---
incubator/tuscany/java/sca/containers/container.java/src/main/java/org/apache/tuscany/container/java/builder/JavaContextFactoryBuilder.java
(original)
+++
incubator/tuscany/java/sca/containers/container.java/src/main/java/org/apache/tuscany/container/java/builder/JavaContextFactoryBuilder.java
Thu Apr 6 22:28:04 2006
@@ -1,35 +1,16 @@
package org.apache.tuscany.container.java.builder;
-import java.lang.reflect.Field;
-import java.lang.reflect.Method;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
+import commonj.sdo.DataObject;
import org.apache.tuscany.container.java.assembly.JavaImplementation;
import org.apache.tuscany.container.java.config.JavaContextFactory;
-import org.apache.tuscany.core.builder.BuilderConfigException;
-import org.apache.tuscany.core.builder.BuilderException;
-import org.apache.tuscany.core.builder.ContextFactoryBuilder;
-import org.apache.tuscany.core.builder.NoAccessorException;
-import org.apache.tuscany.core.builder.ObjectFactory;
+import org.apache.tuscany.core.builder.*;
import org.apache.tuscany.core.builder.impl.ArrayMultiplicityObjectFactory;
import org.apache.tuscany.core.builder.impl.HierarchicalBuilder;
import org.apache.tuscany.core.builder.impl.ListMultiplicityObjectFactory;
import org.apache.tuscany.core.builder.impl.ProxyObjectFactory;
import org.apache.tuscany.core.config.JavaIntrospectionHelper;
-import org.apache.tuscany.core.context.AggregateContext;
import org.apache.tuscany.core.context.QualifiedName;
-import org.apache.tuscany.core.injection.ContextObjectFactory;
-import org.apache.tuscany.core.injection.EventInvoker;
-import org.apache.tuscany.core.injection.FieldInjector;
-import org.apache.tuscany.core.injection.Injector;
-import org.apache.tuscany.core.injection.MethodEventInvoker;
-import org.apache.tuscany.core.injection.MethodInjector;
-import org.apache.tuscany.core.injection.SDOObjectFactory;
-import org.apache.tuscany.core.injection.SingletonObjectFactory;
+import org.apache.tuscany.core.injection.*;
import org.apache.tuscany.core.invocation.InvocationConfiguration;
import org.apache.tuscany.core.invocation.MethodHashMap;
import org.apache.tuscany.core.invocation.ProxyConfiguration;
@@ -39,21 +20,15 @@
import org.apache.tuscany.core.message.MessageFactory;
import org.apache.tuscany.core.runtime.RuntimeContext;
import org.apache.tuscany.core.system.annotation.Autowire;
-import org.apache.tuscany.model.assembly.AssemblyModelObject;
-import org.apache.tuscany.model.assembly.ConfiguredProperty;
-import org.apache.tuscany.model.assembly.ConfiguredReference;
-import org.apache.tuscany.model.assembly.ConfiguredService;
-import org.apache.tuscany.model.assembly.Multiplicity;
-import org.apache.tuscany.model.assembly.Scope;
-import org.apache.tuscany.model.assembly.Service;
-import org.apache.tuscany.model.assembly.ServiceContract;
-import org.apache.tuscany.model.assembly.SimpleComponent;
+import org.apache.tuscany.model.assembly.*;
import org.osoa.sca.annotations.ComponentName;
import org.osoa.sca.annotations.Context;
import org.osoa.sca.annotations.Destroy;
import org.osoa.sca.annotations.Init;
-import commonj.sdo.DataObject;
+import java.lang.reflect.Field;
+import java.lang.reflect.Method;
+import java.util.*;
/**
* Builds context factories for component implementations that map to
@@ -65,7 +40,7 @@
* @version $Rev: 368822 $ $Date: 2006-01-13 10:54:38 -0800 (Fri, 13 Jan 2006)
$
*/
@org.osoa.sca.annotations.Scope("MODULE")
-public class JavaContextFactoryBuilder implements
ContextFactoryBuilder<AggregateContext> {
+public class JavaContextFactoryBuilder implements ContextFactoryBuilder {
private RuntimeContext runtimeContext;
Modified:
incubator/tuscany/java/sca/containers/container.java/src/test/java/org/apache/tuscany/container/java/builder/JavaContextFactoryBuilderTestCase.java
URL:
http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/containers/container.java/src/test/java/org/apache/tuscany/container/java/builder/JavaContextFactoryBuilderTestCase.java?rev=392189&r1=392188&r2=392189&view=diff
==============================================================================
---
incubator/tuscany/java/sca/containers/container.java/src/test/java/org/apache/tuscany/container/java/builder/JavaContextFactoryBuilderTestCase.java
(original)
+++
incubator/tuscany/java/sca/containers/container.java/src/test/java/org/apache/tuscany/container/java/builder/JavaContextFactoryBuilderTestCase.java
Thu Apr 6 22:28:04 2006
@@ -13,10 +13,7 @@
import org.apache.tuscany.container.java.mock.components.ModuleScopeComponent;
import org.apache.tuscany.core.builder.ContextFactory;
import org.apache.tuscany.core.builder.impl.DefaultWireBuilder;
-import org.apache.tuscany.core.context.EventContext;
-import org.apache.tuscany.core.context.InstanceContext;
-import org.apache.tuscany.core.context.ScopeContext;
-import org.apache.tuscany.core.context.ScopeStrategy;
+import org.apache.tuscany.core.context.*;
import org.apache.tuscany.core.context.impl.EventContextImpl;
import org.apache.tuscany.core.context.scope.DefaultScopeStrategy;
import org.apache.tuscany.core.context.scope.ModuleScopeContext;
@@ -79,7 +76,7 @@
}
for (Component component : components) {
ContextFactory config = (ContextFactory)
component.getComponentImplementation().getContextFactory();
- InstanceContext context = (InstanceContext) config.createContext();
+ InstanceContext context = config.createContext();
if ("source".equals(component.getName())) {
ModuleScopeComponent source = (ModuleScopeComponent)
context.getInstance(null);
Assert.assertNotNull(source);
Modified:
incubator/tuscany/java/sca/containers/container.java/src/test/java/org/apache/tuscany/container/java/mock/binding/foo/FooESTargetInvoker.java
URL:
http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/containers/container.java/src/test/java/org/apache/tuscany/container/java/mock/binding/foo/FooESTargetInvoker.java?rev=392189&r1=392188&r2=392189&view=diff
==============================================================================
---
incubator/tuscany/java/sca/containers/container.java/src/test/java/org/apache/tuscany/container/java/mock/binding/foo/FooESTargetInvoker.java
(original)
+++
incubator/tuscany/java/sca/containers/container.java/src/test/java/org/apache/tuscany/container/java/mock/binding/foo/FooESTargetInvoker.java
Thu Apr 6 22:28:04 2006
@@ -15,10 +15,7 @@
import java.lang.reflect.InvocationTargetException;
-import org.apache.tuscany.core.context.ExternalServiceContext;
-import org.apache.tuscany.core.context.InstanceContext;
-import org.apache.tuscany.core.context.ScopeContext;
-import org.apache.tuscany.core.context.TargetException;
+import org.apache.tuscany.core.context.*;
import org.apache.tuscany.core.invocation.Interceptor;
import org.apache.tuscany.core.invocation.TargetInvoker;
import org.apache.tuscany.core.message.Message;
Modified:
incubator/tuscany/java/sca/containers/container.js/src/main/java/org/apache/tuscany/container/js/builder/JavaScriptContextFactoryBuilder.java
URL:
http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/containers/container.js/src/main/java/org/apache/tuscany/container/js/builder/JavaScriptContextFactoryBuilder.java?rev=392189&r1=392188&r2=392189&view=diff
==============================================================================
---
incubator/tuscany/java/sca/containers/container.js/src/main/java/org/apache/tuscany/container/js/builder/JavaScriptContextFactoryBuilder.java
(original)
+++
incubator/tuscany/java/sca/containers/container.js/src/main/java/org/apache/tuscany/container/js/builder/JavaScriptContextFactoryBuilder.java
Thu Apr 6 22:28:04 2006
@@ -16,22 +16,13 @@
*/
package org.apache.tuscany.container.js.builder;
-import java.lang.reflect.Method;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
import commonj.sdo.helper.TypeHelper;
-import org.osoa.sca.annotations.Init;
-
import org.apache.tuscany.container.js.assembly.JavaScriptImplementation;
import org.apache.tuscany.container.js.config.JavaScriptContextFactory;
import org.apache.tuscany.container.js.rhino.RhinoE4XScript;
import org.apache.tuscany.container.js.rhino.RhinoScript;
import org.apache.tuscany.core.builder.BuilderException;
import org.apache.tuscany.core.builder.ContextFactoryBuilder;
-import org.apache.tuscany.core.context.AggregateContext;
import org.apache.tuscany.core.context.QualifiedName;
import org.apache.tuscany.core.invocation.InvocationConfiguration;
import org.apache.tuscany.core.invocation.MethodHashMap;
@@ -42,15 +33,13 @@
import org.apache.tuscany.core.message.MessageFactory;
import org.apache.tuscany.core.runtime.RuntimeContext;
import org.apache.tuscany.core.system.annotation.Autowire;
-import org.apache.tuscany.model.assembly.AssemblyModelObject;
-import org.apache.tuscany.model.assembly.ComponentImplementation;
-import org.apache.tuscany.model.assembly.ConfiguredProperty;
-import org.apache.tuscany.model.assembly.ConfiguredReference;
-import org.apache.tuscany.model.assembly.ConfiguredService;
-import org.apache.tuscany.model.assembly.Scope;
-import org.apache.tuscany.model.assembly.Service;
-import org.apache.tuscany.model.assembly.ServiceContract;
-import org.apache.tuscany.model.assembly.SimpleComponent;
+import org.apache.tuscany.model.assembly.*;
+import org.osoa.sca.annotations.Init;
+
+import java.lang.reflect.Method;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
/**
* Builds [EMAIL PROTECTED]
org.apache.tuscany.container.js.config.JavaScriptContextFactory}s from a
JavaScript
@@ -59,7 +48,7 @@
* @version $Rev$ $Date$
*/
@org.osoa.sca.annotations.Scope("MODULE")
-public class JavaScriptContextFactoryBuilder implements
ContextFactoryBuilder<AggregateContext> {
+public class JavaScriptContextFactoryBuilder implements ContextFactoryBuilder {
private ProxyFactoryFactory factory;
Modified:
incubator/tuscany/java/sca/containers/container.js/src/test/java/org/apache/tuscany/container/js/builder/JSContextFactoryBuilderTestCase.java
URL:
http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/containers/container.js/src/test/java/org/apache/tuscany/container/js/builder/JSContextFactoryBuilderTestCase.java?rev=392189&r1=392188&r2=392189&view=diff
==============================================================================
---
incubator/tuscany/java/sca/containers/container.js/src/test/java/org/apache/tuscany/container/js/builder/JSContextFactoryBuilderTestCase.java
(original)
+++
incubator/tuscany/java/sca/containers/container.js/src/test/java/org/apache/tuscany/container/js/builder/JSContextFactoryBuilderTestCase.java
Thu Apr 6 22:28:04 2006
@@ -1,10 +1,7 @@
package org.apache.tuscany.container.js.builder;
-import java.util.Collection;
-
import junit.framework.Assert;
import junit.framework.TestCase;
-
import org.apache.tuscany.common.resource.impl.ResourceLoaderImpl;
import org.apache.tuscany.container.js.assembly.mock.HelloWorldService;
import org.apache.tuscany.container.js.config.JavaScriptContextFactory;
@@ -39,7 +36,7 @@
context.registerFactory(contextFactory);
context.start();
context.onEvent(EventContext.MODULE_START, null);
- for (ProxyFactory proxyFactory : (Collection<ProxyFactory>)
contextFactory.getTargetProxyFactories().values()) {
+ for (ProxyFactory proxyFactory :
contextFactory.getTargetProxyFactories().values()) {
jsWireBuilder.completeTargetChain(proxyFactory,
JavaScriptContextFactory.class, context);
proxyFactory.initialize();
}
Modified:
incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/builder/ContextFactory.java
URL:
http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/builder/ContextFactory.java?rev=392189&r1=392188&r2=392189&view=diff
==============================================================================
---
incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/builder/ContextFactory.java
(original)
+++
incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/builder/ContextFactory.java
Thu Apr 6 22:28:04 2006
@@ -1,7 +1,7 @@
package org.apache.tuscany.core.builder;
import org.apache.tuscany.core.context.AggregateContext;
-import org.apache.tuscany.core.context.Context;
+import org.apache.tuscany.core.context.InstanceContext;
import org.apache.tuscany.core.invocation.spi.ProxyFactory;
import org.apache.tuscany.model.assembly.Scope;
@@ -9,7 +9,7 @@
import java.util.Map;
/**
- * Implementations serve the dual purpose of creating instances of [EMAIL
PROTECTED] org.apache.tuscany.core.context.Context} based
+ * Implementations serve the dual purpose of creating instances of [EMAIL
PROTECTED] org.apache.tuscany.core.context.InstanceContext} based
* on a compiled configuration such as a logical assembly model and holding a
* [EMAIL PROTECTED] org.apache.tuscany.core.invocation.spi.ProxyFactory} for
the instance type associated with the context.
* <p>
@@ -25,7 +25,7 @@
*
* @version $Rev: 385747 $ $Date: 2006-03-13 22:12:53 -0800 (Mon, 13 Mar 2006)
$
*/
-public interface ContextFactory<T extends Context> {
+public interface ContextFactory<T extends InstanceContext> {
/**
* Creates a <code>Context</code> based on configuration supplied by a
logical model assembly
Modified:
incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/builder/ContextFactoryBuilder.java
URL:
http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/builder/ContextFactoryBuilder.java?rev=392189&r1=392188&r2=392189&view=diff
==============================================================================
---
incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/builder/ContextFactoryBuilder.java
(original)
+++
incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/builder/ContextFactoryBuilder.java
Thu Apr 6 22:28:04 2006
@@ -1,6 +1,5 @@
package org.apache.tuscany.core.builder;
-import org.apache.tuscany.core.context.Context;
import org.apache.tuscany.model.assembly.AssemblyModelObject;
/**
@@ -31,7 +30,7 @@
* @see ContextFactory
* @see org.apache.tuscany.core.builder.WireBuilder
*/
-public interface ContextFactoryBuilder<Y extends Context> {
+public interface ContextFactoryBuilder{
/**
* Creates or updates a context factory based on configuration contained
in the given model object. The model object
Modified:
incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/context/AbstractContext.java
URL:
http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/context/AbstractContext.java?rev=392189&r1=392188&r2=392189&view=diff
==============================================================================
---
incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/context/AbstractContext.java
(original)
+++
incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/context/AbstractContext.java
Thu Apr 6 22:28:04 2006
@@ -24,7 +24,7 @@
*
* @version $Rev$ $Date$
*/
-public abstract class AbstractContext implements Context {
+public abstract class AbstractContext implements InstanceContext {
public AbstractContext() {
}
Modified:
incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/context/ContextRuntimeException.java
URL:
http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/context/ContextRuntimeException.java?rev=392189&r1=392188&r2=392189&view=diff
==============================================================================
---
incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/context/ContextRuntimeException.java
(original)
+++
incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/context/ContextRuntimeException.java
Thu Apr 6 22:28:04 2006
@@ -14,7 +14,7 @@
package org.apache.tuscany.core.context;
/**
- * An unchecked exception encountered by an [EMAIL PROTECTED]
org.apache.tuscany.core.context.Context}
+ * An unchecked exception encountered by an [EMAIL PROTECTED]
org.apache.tuscany.core.context.InstanceContext}
*
* @version $Rev$ $Date$
*/
Modified:
incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/context/InstanceContext.java
URL:
http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/context/InstanceContext.java?rev=392189&r1=392188&r2=392189&view=diff
==============================================================================
---
incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/context/InstanceContext.java
(original)
+++
incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/context/InstanceContext.java
Thu Apr 6 22:28:04 2006
@@ -24,30 +24,105 @@
* @see org.apache.tuscany.core.context.AggregateContext
* @see org.apache.tuscany.core.context.EntryPointContext
* @see org.apache.tuscany.core.context.ExternalServiceContext
- *
+ * An entity that provides an execution context for a runtime artifact
+ * Manages instances of a runtime artifact. An <code>InstanceContext</code>
may contain child contexts which
+ * themselves manage implementation instances or it may be a leaf context.
+ *
+ *
* @version $Rev$ $Date$
*/
-public interface InstanceContext extends Context {
+public interface InstanceContext{
- /**
- * Returns the instance associated with the requested name, which may be
in a simple or compound form. Simple (i.e.
- * leaf) contexts will return an instance associated with the service name
part of the compound name, which may be
- * null.
- * <p>
- * Aggregate contexts will return an instance (likely a proxy) of a
contained entry point context. In this case, the
- * port name on the qualified name will correspond to the aggregate
context name and the part name will be used to
- * retrieve the contained entry point context. The latter may be null. If
the contained context is not an entry
- * point context, an exception will be thrown.
- *
- * @param qName a qualified name of the requested instance
- * @return the implementation instance or a proxy to it
- * @throws TargetException if an error occurs retrieving the instance or
the requested component is not an entry
- * point.
- *
- * @see AggregateContext
- * @see org.apache.tuscany.model.assembly.EntryPoint
- */
- public Object getInstance(QualifiedName qName) throws TargetException;
+ /* A configuration error state */
+ public static final int CONFIG_ERROR = -1;
+
+ /* Has not been initialized */
+ public static final int UNINITIALIZED = 0;
+
+ /* In the process of being configured and initialized */
+ public static final int INITIALIZING = 1;
+
+ /* Instantiated and configured */
+ public static final int INITIALIZED = 2;
+
+ /* Configured and initialized */
+ public static final int RUNNING = 4;
+
+ /* In the process of being shutdown */
+ public static final int STOPPING = 5;
+
+ /* Has been shutdown and removed from the module */
+ public static final int STOPPED = 6;
+
+ /* In an error state */
+ public static final int ERROR = 7;
+
+ /**
+ * Returns the name of the context
+ */
+ public String getName();
+
+ /**
+ * Sets the name of the context
+ */
+ public void setName(String name);
+
+ /**
+ * Returns the lifecycle state
+ *
+ * @see #UNINITIALIZED
+ * @see #INITIALIZING
+ * @see #INITIALIZED
+ * @see #RUNNING
+ * @see #STOPPING
+ * @see #STOPPED
+ */
+ public int getLifecycleState();
+
+ /**
+ * Starts the container
+ *
+ * @throws CoreRuntimeException
+ */
+ public void start() throws CoreRuntimeException;
+
+ /**
+ * Stops the container
+ *
+ * @throws CoreRuntimeException
+ */
+ public void stop() throws CoreRuntimeException;
+
+ /**
+ * Registers a listener to receive notifications for the context
+ */
+ public void addListener(RuntimeEventListener listener);
+
+ /**
+ * Removes a previously registered listener
+ */
+ public void removeListener(RuntimeEventListener listener);
+
+
+ /**
+ * Returns the instance associated with the requested name, which may
be in a simple or compound form. Simple (i.e.
+ * leaf) contexts will return an instance associated with the service
name part of the compound name, which may be
+ * null.
+ * <p>
+ * Aggregate contexts will return an instance (likely a proxy) of a
contained entry point context. In this case, the
+ * port name on the qualified name will correspond to the aggregate
context name and the part name will be used to
+ * retrieve the contained entry point context. The latter may be null.
If the contained context is not an entry
+ * point context, an exception will be thrown.
+ *
+ * @param qName a qualified name of the requested instance
+ * @return the implementation instance or a proxy to it
+ * @throws org.apache.tuscany.core.context.TargetException if an error
occurs retrieving the instance or the requested component is not an entry
+ * point.
+ *
+ * @see org.apache.tuscany.core.context.AggregateContext
+ * @see org.apache.tuscany.model.assembly.EntryPoint
+ */
+ Object getInstance(QualifiedName qName) throws TargetException;
}
Modified:
incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/context/scope/AbstractScopeContext.java
URL:
http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/context/scope/AbstractScopeContext.java?rev=392189&r1=392188&r2=392189&view=diff
==============================================================================
---
incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/context/scope/AbstractScopeContext.java
(original)
+++
incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/context/scope/AbstractScopeContext.java
Thu Apr 6 22:28:04 2006
@@ -31,7 +31,7 @@
*
* @version $Rev$ $Date$
*/
-public abstract class AbstractScopeContext extends AbstractContext implements
ScopeContext{
+public abstract class AbstractScopeContext extends AbstractContext implements
ScopeContext {
// The collection of runtime configurations for the scope
protected Map<String, ContextFactory<InstanceContext>> contextFactorys =
new ConcurrentHashMap<String, ContextFactory<InstanceContext>>();
@@ -85,9 +85,8 @@
for (int i = contexts.length - 1; i >= 0; i--) {
InstanceContext context = contexts[i];
- if (context.getLifecycleState() == Context.RUNNING) {
+ if (context.getLifecycleState() == RUNNING) {
synchronized (context) {
- // context.setLifecycleState(Context.STOPPING);
removeContextByKey(context.getName(), key);
try {
context.stop();
Modified:
incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/context/scope/RequestScopeContext.java
URL:
http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/context/scope/RequestScopeContext.java?rev=392189&r1=392188&r2=392189&view=diff
==============================================================================
---
incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/context/scope/RequestScopeContext.java
(original)
+++
incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/context/scope/RequestScopeContext.java
Thu Apr 6 22:28:04 2006
@@ -54,8 +54,8 @@
break;
case EventContext.CONTEXT_CREATED:
checkInit();
- assert(key instanceof Context): "Context must be passed on
created event";
- Context context = (Context)key;
+ assert(key instanceof InstanceContext): "Context must be
passed on created event";
+ InstanceContext context = (InstanceContext)key;
if (context instanceof SimpleComponentContext) {
SimpleComponentContext simpleCtx =
(SimpleComponentContext)context;
// Queue the context to have its implementation instance
released if destroyable
Modified:
incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/system/builder/SystemContextFactoryBuilder.java
URL:
http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/system/builder/SystemContextFactoryBuilder.java?rev=392189&r1=392188&r2=392189&view=diff
==============================================================================
---
incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/system/builder/SystemContextFactoryBuilder.java
(original)
+++
incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/system/builder/SystemContextFactoryBuilder.java
Thu Apr 6 22:28:04 2006
@@ -56,18 +56,10 @@
*
* @version $Rev$ $Date$
*/
-public class SystemContextFactoryBuilder implements
ContextFactoryBuilder<AggregateContext> {
-
- // ----------------------------------
- // Constructors
- // ----------------------------------
+public class SystemContextFactoryBuilder implements ContextFactoryBuilder {
public SystemContextFactoryBuilder() {
}
-
- // ----------------------------------
- // Methods
- // ----------------------------------
public void build(AssemblyModelObject modelObject) throws BuilderException
{
if (!(modelObject instanceof Component)) {
Modified:
incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/system/builder/SystemEntryPointBuilder.java
URL:
http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/system/builder/SystemEntryPointBuilder.java?rev=392189&r1=392188&r2=392189&view=diff
==============================================================================
---
incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/system/builder/SystemEntryPointBuilder.java
(original)
+++
incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/system/builder/SystemEntryPointBuilder.java
Thu Apr 6 22:28:04 2006
@@ -16,7 +16,6 @@
import org.apache.tuscany.core.builder.BuilderException;
import org.apache.tuscany.core.builder.BuilderInitException;
import org.apache.tuscany.core.builder.ContextFactoryBuilder;
-import org.apache.tuscany.core.context.AggregateContext;
import org.apache.tuscany.core.injection.FactoryInitException;
import org.apache.tuscany.core.system.assembly.SystemBinding;
import org.apache.tuscany.core.system.config.SystemEntryPointContextFactory;
@@ -29,7 +28,7 @@
*
* @version $Rev: 385747 $ $Date: 2006-03-13 22:12:53 -0800 (Mon, 13 Mar 2006)
$
*/
-public class SystemEntryPointBuilder implements
ContextFactoryBuilder<AggregateContext> {
+public class SystemEntryPointBuilder implements ContextFactoryBuilder {
// ----------------------------------
// Constructors
Modified:
incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/system/builder/SystemExternalServiceBuilder.java
URL:
http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/system/builder/SystemExternalServiceBuilder.java?rev=392189&r1=392188&r2=392189&view=diff
==============================================================================
---
incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/system/builder/SystemExternalServiceBuilder.java
(original)
+++
incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/system/builder/SystemExternalServiceBuilder.java
Thu Apr 6 22:28:04 2006
@@ -16,7 +16,6 @@
import org.apache.tuscany.core.builder.BuilderConfigException;
import org.apache.tuscany.core.builder.BuilderException;
import org.apache.tuscany.core.builder.ContextFactoryBuilder;
-import org.apache.tuscany.core.context.AggregateContext;
import org.apache.tuscany.core.injection.InterAggregateReferenceFactory;
import org.apache.tuscany.core.system.assembly.SystemBinding;
import
org.apache.tuscany.core.system.config.SystemExternalServiceContextFactory;
@@ -29,17 +28,10 @@
*
* @version $Rev$ $Date$
*/
-public class SystemExternalServiceBuilder implements
ContextFactoryBuilder<AggregateContext> {
- // ----------------------------------
- // Constructors
- // ----------------------------------
+public class SystemExternalServiceBuilder implements ContextFactoryBuilder {
public SystemExternalServiceBuilder() {
}
-
- // ----------------------------------
- // Methods
- // ----------------------------------
public void build(AssemblyModelObject modelObject) throws BuilderException
{
if (!(modelObject instanceof ExternalService)) {
Modified:
incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/system/config/SystemObjectContextFactory.java
URL:
http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/system/config/SystemObjectContextFactory.java?rev=392189&r1=392188&r2=392189&view=diff
==============================================================================
---
incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/system/config/SystemObjectContextFactory.java
(original)
+++
incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/system/config/SystemObjectContextFactory.java
Thu Apr 6 22:28:04 2006
@@ -21,7 +21,7 @@
import org.apache.tuscany.core.builder.ContextFactory;
import org.apache.tuscany.core.builder.ObjectFactory;
import org.apache.tuscany.core.context.AggregateContext;
-import org.apache.tuscany.core.context.Context;
+import org.apache.tuscany.core.context.InstanceContext;
import org.apache.tuscany.core.injection.SingletonObjectFactory;
import org.apache.tuscany.core.invocation.spi.ProxyFactory;
import org.apache.tuscany.core.system.context.SystemComponentContext;
@@ -52,7 +52,7 @@
objectFactory = new SingletonObjectFactory<Object>(instance);
}
- public Context createContext() throws ContextCreationException {
+ public InstanceContext createContext() throws ContextCreationException {
return new SystemComponentContext(name, objectFactory, false, null,
null, false);
}
Modified:
incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/system/context/SystemComponentContext.java
URL:
http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/system/context/SystemComponentContext.java?rev=392189&r1=392188&r2=392189&view=diff
==============================================================================
---
incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/system/context/SystemComponentContext.java
(original)
+++
incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/system/context/SystemComponentContext.java
Thu Apr 6 22:28:04 2006
@@ -114,7 +114,7 @@
return cachedTargetInstance;
}
} catch (ObjectCreationException e) {
- lifecycleState = Context.ERROR;
+ lifecycleState = ERROR;
TargetException te = new TargetException("Error creating
instance for component", e);
te.setIdentifier(getName());
throw te;
Modified:
incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/runtime/RuntimeBootTestCase.java
URL:
http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/runtime/RuntimeBootTestCase.java?rev=392189&r1=392188&r2=392189&view=diff
==============================================================================
---
incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/runtime/RuntimeBootTestCase.java
(original)
+++
incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/runtime/RuntimeBootTestCase.java
Thu Apr 6 22:28:04 2006
@@ -18,8 +18,8 @@
import org.apache.tuscany.common.monitor.impl.NullMonitorFactory;
import org.apache.tuscany.core.builder.ContextFactoryBuilder;
import org.apache.tuscany.core.context.AggregateContext;
-import org.apache.tuscany.core.context.Context;
import org.apache.tuscany.core.context.EventContext;
+import org.apache.tuscany.core.context.InstanceContext;
import org.apache.tuscany.core.mock.MockFactory;
import java.util.List;
@@ -47,13 +47,13 @@
}
public void testRuntimeLifecycle() {
- assertEquals(Context.RUNNING, runtime.getLifecycleState());
+ assertEquals(InstanceContext.RUNNING, runtime.getLifecycleState());
runtime.stop();
- assertEquals(Context.STOPPED, runtime.getLifecycleState());
+ assertEquals(InstanceContext.STOPPED, runtime.getLifecycleState());
runtime.start();
- assertEquals(Context.RUNNING, runtime.getLifecycleState());
+ assertEquals(InstanceContext.RUNNING, runtime.getLifecycleState());
}
public void testIncrementalBoot() throws Exception{
@@ -77,7 +77,7 @@
system.fireEvent(EventContext.MODULE_STOP, null);
runtimeContext.stop();
- Assert.assertEquals(Context.STOPPED,system.getLifecycleState());
+
Assert.assertEquals(InstanceContext.STOPPED,system.getLifecycleState());
}
protected void setUp() throws Exception {
Modified:
incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/runtime/RuntimeContextImplTestCase.java
URL:
http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/runtime/RuntimeContextImplTestCase.java?rev=392189&r1=392188&r2=392189&view=diff
==============================================================================
---
incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/runtime/RuntimeContextImplTestCase.java
(original)
+++
incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/runtime/RuntimeContextImplTestCase.java
Thu Apr 6 22:28:04 2006
@@ -19,8 +19,8 @@
import org.apache.tuscany.core.builder.ContextFactoryBuilder;
import org.apache.tuscany.core.config.ConfigurationException;
import org.apache.tuscany.core.context.AggregateContext;
-import org.apache.tuscany.core.context.Context;
import org.apache.tuscany.core.context.EventContext;
+import org.apache.tuscany.core.context.InstanceContext;
import org.apache.tuscany.core.context.impl.AggregateContextImpl;
import org.apache.tuscany.core.mock.MockFactory;
import org.apache.tuscany.core.mock.component.ModuleScopeSystemComponent;
@@ -56,7 +56,7 @@
AggregateContext root = runtime.getRootContext();
Assert.assertNotNull(root);
- Assert.assertTrue(root.getLifecycleState() == Context.RUNNING);
+ Assert.assertTrue(root.getLifecycleState() == InstanceContext.RUNNING);
AggregateContext system = runtime.getSystemContext();
Assert.assertNotNull(system);
@@ -72,7 +72,7 @@
ep.getBindings().add(systemFactory.createSystemBinding());
Service service = systemFactory.createService();
service.setName("system.child/TestService2EP");
- ((ConfiguredService)
ep.getConfiguredReference().getTargetConfiguredServices().get(0)).setService(service);
+
ep.getConfiguredReference().getTargetConfiguredServices().get(0).setService(service);
JavaServiceContract inter = systemFactory.createJavaServiceContract();
inter.setInterface(ModuleScopeSystemComponentImpl.class);
service.setServiceContract(inter);
@@ -105,7 +105,7 @@
AggregateContext root = runtime.getRootContext();
Assert.assertNotNull(root);
- Assert.assertTrue(root.getLifecycleState() == Context.RUNNING);
+ Assert.assertTrue(root.getLifecycleState() == InstanceContext.RUNNING);
AggregateContext system = runtime.getSystemContext();
Assert.assertNotNull(system);
Modified:
incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/system/builder/SystemContextFactoryBuilderTestCase.java
URL:
http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/system/builder/SystemContextFactoryBuilderTestCase.java?rev=392189&r1=392188&r2=392189&view=diff
==============================================================================
---
incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/system/builder/SystemContextFactoryBuilderTestCase.java
(original)
+++
incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/system/builder/SystemContextFactoryBuilderTestCase.java
Thu Apr 6 22:28:04 2006
@@ -103,7 +103,7 @@
ContextFactory contextFactory = (ContextFactory)
component.getComponentImplementation().getContextFactory();
Assert.assertNotNull(contextFactory);
contextFactory.prepare(createContext());
- InstanceContext ctx = (InstanceContext) contextFactory.createContext();
+ InstanceContext ctx = contextFactory.createContext();
ctx.start();
SystemComponentImpl instance = (SystemComponentImpl)
ctx.getInstance(null);
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=392189&r1=392188&r2=392189&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
Thu Apr 6 22:28:04 2006
@@ -2,7 +2,6 @@
import org.apache.tuscany.core.builder.BuilderException;
import org.apache.tuscany.core.builder.ContextFactoryBuilder;
-import org.apache.tuscany.core.context.AggregateContext;
import org.apache.tuscany.core.runtime.RuntimeContext;
import org.apache.tuscany.core.system.annotation.Autowire;
import org.apache.tuscany.model.assembly.AssemblyModelObject;
@@ -10,7 +9,7 @@
import org.osoa.sca.annotations.Scope;
@Scope("MODULE")
-public class TestBuilder implements ContextFactoryBuilder<AggregateContext> {
+public class TestBuilder implements ContextFactoryBuilder {
@Autowire
private RuntimeContext runtime;
