svn commit: r488890 [1/2] - in /incubator/tuscany/java/sca: ./ kernel/core/src/main/java/org/apache/tuscany/core/builder/ kernel/core/src/main/java/org/apache/tuscany/core/component/scope/ kernel/core/src/main/java/org/apache/tuscany/core/databinding/i...

[jm...@apache.org]

Author: jmarino
Date: Tue Dec 19 18:36:22 2006
New Revision: 488890

URL: http://svn.apache.org/viewvc?view=rev&rev=488890
Log:
change from @Scope(MODULE) @Scope(COMPOSITE)

Modified:
    incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/builder/BuilderRegistryImpl.java
    incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/builder/ConnectorImpl.java
    incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/component/scope/ModuleScopeContainer.java
    incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/component/scope/ModuleScopeObjectFactory.java
    incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/component/scope/ScopeRegistryImpl.java
    incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/databinding/impl/MediatorImpl.java
    incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/java/JavaComponentBuilder.java
    incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/processor/ScopeProcessor.java
    incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/system/component/SystemAtomicComponentImpl.java
    incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/system/component/SystemSingletonAtomicComponent.java
    incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/property/PropertyObjectFactoryImpl.java
    incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/services/store/memory/MemoryStore.java
    incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/services/work/jsr237/Jsr237WorkScheduler.java
    incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/wire/jdk/JDKWireService.java
    incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/builder/ConnectorImplTestCase.java
    incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/composite/CompositeBuilderTestCase.java
    incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/composite/CompositeComponentImplSystemWireTestCase.java
    incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/java/GetServiceByNameTestCase.java
    incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/java/JavaComponentBuilderMetadataTestCase.java
    incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/java/JavaComponentBuilderReferenceTestCase.java
    incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/java/JavaReferenceWireTestCase.java
    incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/java/integration/CallbackInvocationTestCase.java
    incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/processor/ScopeProcessorTestCase.java
    incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/system/builder/SystemComponentBuilderTestCase.java
    incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/integration/implementation/IntrospectionRegistryIntegrationTestCase.java
    incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/integration/implementation/system/builder/MockComponentFactory.java
    incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/integration/wire/DifferentInterfaceWireTestCase.java
    incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/mock/component/ModuleScopeComponent.java
    incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/mock/component/ModuleScopeComponentImpl.java
    incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/mock/component/OrderedEagerInitPojo.java
    incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/mock/component/OrderedInitPojoImpl.java
    incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/databinding/extension/DataBindingExtension.java
    incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/databinding/extension/TransformerExtension.java
    incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/extension/BindingBuilderExtension.java
    incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/extension/ComponentBuilderExtension.java
    incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/extension/ComponentTypeLoaderExtension.java
    incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/model/Scope.java
    incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/wire/WirePostProcessorExtension.java
    incubator/tuscany/java/sca/kernel/spi/src/test/java/org/apache/tuscany/spi/model/ScopeTestCase.java
    incubator/tuscany/java/sca/pom.xml
    incubator/tuscany/java/sca/runtime/osgi/src/main/java/org/apache/tuscany/osgi/binding/OSGiBindingLoader.java
    incubator/tuscany/java/sca/services/bindings/binding.axis2/src/main/java/org/apache/tuscany/binding/axis2/WebServiceBindingLoader.java
    incubator/tuscany/java/sca/services/bindings/binding.celtix/src/main/java/org/apache/tuscany/binding/celtix/BusServiceImpl.java
    incubator/tuscany/java/sca/services/bindings/binding.celtix/src/main/java/org/apache/tuscany/binding/celtix/WebServiceBindingLoader.java
    incubator/tuscany/java/sca/services/bindings/binding.jms/src/main/java/org/apache/tuscany/binding/jms/JMSBindingLoader.java
    incubator/tuscany/java/sca/services/bindings/binding.jsonrpc/src/main/java/org/apache/tuscany/binding/jsonrpc/JSONRPCBindingLoader.java
    incubator/tuscany/java/sca/services/bindings/binding.rmi/src/main/java/org/apache/tuscany/binding/rmi/RMIBindingLoader.java
    incubator/tuscany/java/sca/services/bindings/binding.rmi/src/main/java/org/apache/tuscany/binding/rmi/host/RMIHostImpl.java
    incubator/tuscany/java/sca/services/containers/container.groovy/src/main/java/org/apache/tuscany/container/groovy/GroovyComponentBuilder.java
    incubator/tuscany/java/sca/services/containers/container.groovy/src/main/java/org/apache/tuscany/container/groovy/GroovyComponentTypeLoader.java
    incubator/tuscany/java/sca/services/containers/container.groovy/src/test/java/org/apache/tuscany/container/groovy/GroovyComponentTypeLoaderTestCase.java
    incubator/tuscany/java/sca/services/containers/container.javascript/src/main/java/org/apache/tuscany/container/javascript/JavaScriptComponentBuilder.java
    incubator/tuscany/java/sca/services/containers/container.javascript/src/main/java/org/apache/tuscany/container/javascript/JavaScriptComponentType.java
    incubator/tuscany/java/sca/services/containers/container.javascript/src/main/java/org/apache/tuscany/container/javascript/rhino/RhinoSCAConfig.java
    incubator/tuscany/java/sca/services/containers/container.javascript/src/main/java/org/apache/tuscany/container/javascript/utils/xmlfromxsd/XmlInstanceRegistryImpl.java
    incubator/tuscany/java/sca/services/containers/container.javascript/src/test/java/org/apache/tuscany/container/javascript/rhino/RhinoSCAConfigTestCase.java
    incubator/tuscany/java/sca/services/containers/container.ruby/src/main/java/org/apache/tuscany/container/ruby/RubyComponentBuilder.java
    incubator/tuscany/java/sca/services/containers/container.ruby/src/main/java/org/apache/tuscany/container/ruby/RubyComponentType.java
    incubator/tuscany/java/sca/services/containers/container.ruby/src/main/java/org/apache/tuscany/container/ruby/rubyscript/RubySCAConfig.java
    incubator/tuscany/java/sca/services/containers/container.script/src/main/java/org/apache/tuscany/container/script/ScriptComponentBuilder.java
    incubator/tuscany/java/sca/services/containers/container.script/src/main/java/org/apache/tuscany/container/script/ScriptComponentType.java
    incubator/tuscany/java/sca/services/containers/container.script/src/test/java/org/apache/tuscany/container/script/ScriptComponentBuilderTestCase.java
    incubator/tuscany/java/sca/services/containers/container.script/src/test/java/org/apache/tuscany/container/script/ScriptComponentTestCase.java
    incubator/tuscany/java/sca/services/containers/container.script/src/test/java/org/apache/tuscany/container/script/ScriptComponentTypeTestCase.java
    incubator/tuscany/java/sca/services/transports/http.jetty/src/main/java/org/apache/tuscany/service/jetty/JettyServiceImpl.java

Modified: incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/builder/BuilderRegistryImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/builder/BuilderRegistryImpl.java?view=diff&rev=488890&r1=488889&r2=488890
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/builder/BuilderRegistryImpl.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/builder/BuilderRegistryImpl.java Tue Dec 19 18:36:22 2006
@@ -58,7 +58,7 @@
  *
  * @version $Rev$ $Date$
  */
-@Scope("MODULE")
+@Scope("COMPOSITE")
 public class BuilderRegistryImpl implements BuilderRegistry {
     protected WireService wireService;
     protected ScopeRegistry scopeRegistry;

Modified: incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/builder/ConnectorImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/builder/ConnectorImpl.java?view=diff&rev=488890&r1=488889&r2=488890
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/builder/ConnectorImpl.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/builder/ConnectorImpl.java Tue Dec 19 18:36:22 2006
@@ -573,19 +573,19 @@
             return true;
         } else if (pReferrer == Scope.REQUEST && pReferee == Scope.SESSION) {
             return true;
-        } else if (pReferrer == Scope.REQUEST && pReferee == Scope.MODULE) {
+        } else if (pReferrer == Scope.REQUEST && pReferee == Scope.COMPOSITE) {
             return true;
         } else if (pReferrer == Scope.REQUEST && pReferee == Scope.SYSTEM) {
             return true;
-        } else if (pReferrer == Scope.SESSION && pReferee == Scope.MODULE) {
+        } else if (pReferrer == Scope.SESSION && pReferee == Scope.COMPOSITE) {
             return true;
         } else if (pReferrer == Scope.SESSION && pReferee == Scope.SYSTEM) {
             return true;
-        } else if (pReferrer == Scope.SYSTEM && pReferee == Scope.MODULE) {
+        } else if (pReferrer == Scope.SYSTEM && pReferee == Scope.COMPOSITE) {
             // case where a service context points to a module scoped component
             return true;
         } else {
-            return pReferrer == Scope.MODULE && pReferee == Scope.SYSTEM;
+            return pReferrer == Scope.COMPOSITE && pReferee == Scope.SYSTEM;
         }
     }
 

Modified: incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/component/scope/ModuleScopeContainer.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/component/scope/ModuleScopeContainer.java?view=diff&rev=488890&r1=488889&r2=488890
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/component/scope/ModuleScopeContainer.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/component/scope/ModuleScopeContainer.java Tue Dec 19 18:36:22 2006
@@ -58,7 +58,7 @@
     }
 
     public Scope getScope() {
-        return Scope.MODULE;
+        return Scope.COMPOSITE;
     }
 
     public void onEvent(Event event) {

Modified: incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/component/scope/ModuleScopeObjectFactory.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/component/scope/ModuleScopeObjectFactory.java?view=diff&rev=488890&r1=488889&r2=488890
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/component/scope/ModuleScopeObjectFactory.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/component/scope/ModuleScopeObjectFactory.java Tue Dec 19 18:36:22 2006
@@ -39,7 +39,7 @@
 
     public ModuleScopeObjectFactory(@Autowire ScopeRegistry registry,
                                     @Monitor ScopeContainerMonitor monitor) {
-        registry.registerFactory(Scope.MODULE, this);
+        registry.registerFactory(Scope.COMPOSITE, this);
         this.monitor = monitor;
     }
 

Modified: incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/component/scope/ScopeRegistryImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/component/scope/ScopeRegistryImpl.java?view=diff&rev=488890&r1=488889&r2=488890
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/component/scope/ScopeRegistryImpl.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/component/scope/ScopeRegistryImpl.java Tue Dec 19 18:36:22 2006
@@ -38,7 +38,7 @@
         new ConcurrentHashMap<Scope, ObjectFactory<? extends ScopeContainer>>();
 
     public ScopeContainer getScopeContainer(Scope scope) {
-        assert Scope.MODULE != scope;
+        assert Scope.COMPOSITE != scope;
         ScopeContainer container = scopeCache.get(scope);
         if (container == null) {
             ObjectFactory<? extends ScopeContainer> factory = factoryCache.get(scope);

Modified: incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/databinding/impl/MediatorImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/databinding/impl/MediatorImpl.java?view=diff&rev=488890&r1=488889&r2=488890
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/databinding/impl/MediatorImpl.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/databinding/impl/MediatorImpl.java Tue Dec 19 18:36:22 2006
@@ -37,7 +37,7 @@
 /**
  * Default Mediator implementation
  */
-@Scope("MODULE")
+@Scope("COMPOSITE")
 public class MediatorImpl implements Mediator {
 
     private DataBindingRegistry dataBindingRegistry;

Modified: incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/java/JavaComponentBuilder.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/java/JavaComponentBuilder.java?view=diff&rev=488890&r1=488889&r2=488890
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/java/JavaComponentBuilder.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/java/JavaComponentBuilder.java Tue Dec 19 18:36:22 2006
@@ -71,7 +71,7 @@
         PojoConfiguration configuration = new PojoConfiguration();
         configuration.setParent(parent);
         Scope scope = componentType.getImplementationScope();
-        if (Scope.MODULE == scope) {
+        if (Scope.COMPOSITE == scope) {
             configuration.setScopeContainer(deployment.getModuleScope());
         } else {
             ScopeContainer container = scopeRegistry.getScopeContainer(scope);

Modified: incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/processor/ScopeProcessor.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/processor/ScopeProcessor.java?view=diff&rev=488890&r1=488889&r2=488890
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/processor/ScopeProcessor.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/processor/ScopeProcessor.java Tue Dec 19 18:36:22 2006
@@ -47,8 +47,8 @@
         //FIXME deal with eager init
         String name = annotation.value();
         Scope scope;
-        if ("MODULE".equals(name)) {
-            scope = Scope.MODULE;
+        if ("COMPOSITE".equals(name)) {
+            scope = Scope.COMPOSITE;
         } else if ("SESSION".equals(name)) {
             scope = Scope.SESSION;
         } else if ("CONVERSATION".equals(name)) {

Modified: incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/system/component/SystemAtomicComponentImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/system/component/SystemAtomicComponentImpl.java?view=diff&rev=488890&r1=488889&r2=488890
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/system/component/SystemAtomicComponentImpl.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/system/component/SystemAtomicComponentImpl.java Tue Dec 19 18:36:22 2006
@@ -40,7 +40,7 @@
 
     public SystemAtomicComponentImpl(PojoConfiguration configuration) {
         super(configuration);
-        scope = Scope.MODULE;
+        scope = Scope.COMPOSITE;
     }
 
     public Object getServiceInstance(String name) throws TargetResolutionException {

Modified: incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/system/component/SystemSingletonAtomicComponent.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/system/component/SystemSingletonAtomicComponent.java?view=diff&rev=488890&r1=488889&r2=488890
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/system/component/SystemSingletonAtomicComponent.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/system/component/SystemSingletonAtomicComponent.java Tue Dec 19 18:36:22 2006
@@ -69,7 +69,7 @@
     }
 
     public Scope getScope() {
-        return Scope.MODULE;
+        return Scope.COMPOSITE;
     }
 
     public boolean isEagerInit() {

Modified: incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/property/PropertyObjectFactoryImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/property/PropertyObjectFactoryImpl.java?view=diff&rev=488890&r1=488889&r2=488890
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/property/PropertyObjectFactoryImpl.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/property/PropertyObjectFactoryImpl.java Tue Dec 19 18:36:22 2006
@@ -40,7 +40,7 @@
 import org.w3c.dom.Node;
 
 @Service(PropertyObjectFactory.class)
-@Scope("MODULE")
+@Scope("COMPOSITE")
 public class PropertyObjectFactoryImpl implements PropertyObjectFactory {
     private DataBindingRegistry registry;
     private Mediator mediator;

Modified: incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/services/store/memory/MemoryStore.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/services/store/memory/MemoryStore.java?view=diff&rev=488890&r1=488889&r2=488890
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/services/store/memory/MemoryStore.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/services/store/memory/MemoryStore.java Tue Dec 19 18:36:22 2006
@@ -43,7 +43,7 @@
  *
  * @version $Rev$ $Date$
  */
-@Scope("MODULE")
+@Scope("COMPOSITE")
 public class MemoryStore implements Store {
     private Map<SCAObject, Map<String, Record>> store;
     // TODO integrate with a core threading scheme

Modified: incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/services/work/jsr237/Jsr237WorkScheduler.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/services/work/jsr237/Jsr237WorkScheduler.java?view=diff&rev=488890&r1=488889&r2=488890
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/services/work/jsr237/Jsr237WorkScheduler.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/services/work/jsr237/Jsr237WorkScheduler.java Tue Dec 19 18:36:22 2006
@@ -41,7 +41,7 @@
  * manager implementaion available. For example, if the managed environment supports work manager the runtime can use
  * the appropriate lookup mechanism to inject the work manager implementation. </p>
  */
-@Scope("MODULE")
+@Scope("COMPOSITE")
 public class Jsr237WorkScheduler implements WorkScheduler {
 
     /**

Modified: incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/wire/jdk/JDKWireService.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/wire/jdk/JDKWireService.java?view=diff&rev=488890&r1=488889&r2=488890
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/wire/jdk/JDKWireService.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/wire/jdk/JDKWireService.java Tue Dec 19 18:36:22 2006
@@ -67,7 +67,7 @@
  *
  * @version $$Rev$$ $$Date$$
  */
-@Scope("MODULE")
+@Scope("COMPOSITE")
 public class JDKWireService extends WireServiceExtension {
 
     public JDKWireService() {

Modified: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/builder/ConnectorImplTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/builder/ConnectorImplTestCase.java?view=diff&rev=488890&r1=488889&r2=488890
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/builder/ConnectorImplTestCase.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/builder/ConnectorImplTestCase.java Tue Dec 19 18:36:22 2006
@@ -118,7 +118,7 @@
 
         // create the target
         AtomicComponent target = EasyMock.createMock(AtomicComponent.class);
-        EasyMock.expect(target.getScope()).andReturn(Scope.MODULE);
+        EasyMock.expect(target.getScope()).andReturn(Scope.COMPOSITE);
         EasyMock.expect(target.isSystem()).andReturn(false).atLeastOnce();
         target.getInboundWire(EasyMock.eq("FooService"));
         EasyMock.expectLastCall().andReturn(targetWire).atLeastOnce();
@@ -207,7 +207,7 @@
 
         // create the target
         AtomicComponent target = EasyMock.createMock(AtomicComponent.class);
-        EasyMock.expect(target.getScope()).andReturn(Scope.MODULE);
+        EasyMock.expect(target.getScope()).andReturn(Scope.COMPOSITE);
         target.getInboundWire(EasyMock.eq("FooService"));
         EasyMock.expectLastCall().andReturn(targetWire);
         target.createTargetInvoker(EasyMock.eq("FooService"), EasyMock.eq(operation), EasyMock.eq(targetWire));
@@ -247,7 +247,7 @@
         // create the source
         AtomicComponent source = EasyMock.createMock(AtomicComponent.class);
         EasyMock.expect(source.isSystem()).andReturn(false).atLeastOnce();
-        EasyMock.expect(source.getScope()).andReturn(Scope.MODULE);
+        EasyMock.expect(source.getScope()).andReturn(Scope.COMPOSITE);
         EasyMock.expect(source.getParent()).andReturn(parent).atLeastOnce();
         EasyMock.expect(source.getOutboundWires()).andReturn(outboundWires);
         EasyMock.expect(source.getName()).andReturn("source");

Modified: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/composite/CompositeBuilderTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/composite/CompositeBuilderTestCase.java?view=diff&rev=488890&r1=488889&r2=488890
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/composite/CompositeBuilderTestCase.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/composite/CompositeBuilderTestCase.java Tue Dec 19 18:36:22 2006
@@ -155,7 +155,7 @@
 
         PojoComponentType<JavaMappedService, JavaMappedReference, JavaMappedProperty<?>> sourceType =
             new PojoComponentType<JavaMappedService, JavaMappedReference, JavaMappedProperty<?>>();
-        sourceType.setImplementationScope(Scope.MODULE);
+        sourceType.setImplementationScope(Scope.COMPOSITE);
         JavaMappedReference reference = new JavaMappedReference();
         reference.setName("targetReference");
         JavaInterfaceProcessorRegistry registry = new JavaInterfaceProcessorRegistryImpl();
@@ -191,7 +191,7 @@
 
         PojoComponentType<JavaMappedService, JavaMappedReference, JavaMappedProperty<?>> targetType =
             new PojoComponentType<JavaMappedService, JavaMappedReference, JavaMappedProperty<?>>();
-        targetType.setImplementationScope(Scope.MODULE);
+        targetType.setImplementationScope(Scope.COMPOSITE);
 
         JavaInterfaceProcessorRegistry registry = new JavaInterfaceProcessorRegistryImpl();
         ServiceContract<?> targetContract = registry.introspect(Target.class);
@@ -216,7 +216,7 @@
         container.start();
         container.register(EasyMock.isA(AtomicComponent.class));
         EasyMock.expectLastCall().anyTimes();
-        EasyMock.expect(container.getScope()).andReturn(Scope.MODULE).anyTimes();
+        EasyMock.expect(container.getScope()).andReturn(Scope.COMPOSITE).anyTimes();
         EasyMock.expect(container.getInstance(EasyMock.isA(AtomicComponent.class))).andAnswer(new IAnswer<Object>() {
             private Map<AtomicComponent, Object> cache = new HashMap<AtomicComponent, Object>();
 

Modified: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/composite/CompositeComponentImplSystemWireTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/composite/CompositeComponentImplSystemWireTestCase.java?view=diff&rev=488890&r1=488889&r2=488890
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/composite/CompositeComponentImplSystemWireTestCase.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/composite/CompositeComponentImplSystemWireTestCase.java Tue Dec 19 18:36:22 2006
@@ -68,7 +68,7 @@
         wireMap.put("ref", wires);
         CompositeComponent parent = new CompositeComponentImpl("foo", "foo", null, new ConnectorImpl(), null);
         SystemAtomicComponent source = EasyMock.createMock(SystemAtomicComponent.class);
-        EasyMock.expect(source.getScope()).andReturn(Scope.MODULE).atLeastOnce();
+        EasyMock.expect(source.getScope()).andReturn(Scope.COMPOSITE).atLeastOnce();
         EasyMock.expect(source.getName()).andReturn("source").atLeastOnce();
         EasyMock.expect(source.getServiceInterfaces()).andReturn(services);
         EasyMock.expect(source.getOutboundWires()).andReturn(wireMap);
@@ -89,7 +89,7 @@
         EasyMock.expect(target.getName()).andReturn("target").atLeastOnce();
         EasyMock.expect(target.getServiceInterfaces()).andReturn(services);
         EasyMock.expect(target.getInboundWire("bar")).andReturn(inbound).atLeastOnce();
-        EasyMock.expect(target.getScope()).andReturn(Scope.MODULE).atLeastOnce();
+        EasyMock.expect(target.getScope()).andReturn(Scope.COMPOSITE).atLeastOnce();
         EasyMock.expect(target.getParent()).andReturn(parent).atLeastOnce();
         target.getInboundWires();
         EasyMock.expectLastCall().andReturn(Collections.emptyMap());

Modified: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/java/GetServiceByNameTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/java/GetServiceByNameTestCase.java?view=diff&rev=488890&r1=488889&r2=488890
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/java/GetServiceByNameTestCase.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/java/GetServiceByNameTestCase.java Tue Dec 19 18:36:22 2006
@@ -45,7 +45,7 @@
     public void testServiceLocate() throws Exception {
         ScopeContainer scope = createMock(ScopeContainer.class);
         scope.register(EasyMock.isA(JavaAtomicComponent.class));
-        expect(scope.getScope()).andReturn(Scope.MODULE);
+        expect(scope.getScope()).andReturn(Scope.COMPOSITE);
         replay(scope);
         PojoConfiguration configuration = new PojoConfiguration();
         configuration.setScopeContainer(scope);

Modified: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/java/JavaComponentBuilderMetadataTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/java/JavaComponentBuilderMetadataTestCase.java?view=diff&rev=488890&r1=488889&r2=488890
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/java/JavaComponentBuilderMetadataTestCase.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/java/JavaComponentBuilderMetadataTestCase.java Tue Dec 19 18:36:22 2006
@@ -68,7 +68,7 @@
     public void testScope() throws Exception {
         JavaComponentBuilder builder = new JavaComponentBuilder();
         JavaAtomicComponent component = (JavaAtomicComponent) builder.build(parent, definition, deploymentContext);
-        assertEquals(Scope.MODULE, component.getScope());
+        assertEquals(Scope.COMPOSITE, component.getScope());
     }
 
     public void testUnknownScope() throws Exception {
@@ -105,7 +105,7 @@
         scope.stop();
         scope.register(EasyMock.isA(AtomicComponent.class));
         EasyMock.expectLastCall().atLeastOnce();
-        EasyMock.expect(scope.getScope()).andReturn(Scope.MODULE).atLeastOnce();
+        EasyMock.expect(scope.getScope()).andReturn(Scope.COMPOSITE).atLeastOnce();
         EasyMock.replay(scope);
         deploymentContext = EasyMock.createMock(DeploymentContext.class);
         EasyMock.expect(deploymentContext.getModuleScope()).andReturn(scope).atLeastOnce();
@@ -114,7 +114,7 @@
 
     private void createComponentDefinitionAndType() throws Exception {
         type = new PojoComponentType<JavaMappedService, JavaMappedReference, JavaMappedProperty<?>>();
-        type.setImplementationScope(Scope.MODULE);
+        type.setImplementationScope(Scope.COMPOSITE);
         JavaMappedReference reference = new JavaMappedReference();
         reference.setName("target");
         reference.setMember(SourceImpl.class.getMethod("setTarget", Target.class));

Modified: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/java/JavaComponentBuilderReferenceTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/java/JavaComponentBuilderReferenceTestCase.java?view=diff&rev=488890&r1=488889&r2=488890
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/java/JavaComponentBuilderReferenceTestCase.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/java/JavaComponentBuilderReferenceTestCase.java Tue Dec 19 18:36:22 2006
@@ -66,7 +66,7 @@
 
         PojoComponentType<JavaMappedService, JavaMappedReference, JavaMappedProperty<?>> sourceType =
             new PojoComponentType<JavaMappedService, JavaMappedReference, JavaMappedProperty<?>>();
-        sourceType.setImplementationScope(Scope.MODULE);
+        sourceType.setImplementationScope(Scope.COMPOSITE);
         JavaMappedReference reference = new JavaMappedReference();
         reference.setName("target");
         reference.setMember(SourceImpl.class.getMethod("setTarget", Target.class));
@@ -110,7 +110,7 @@
         scope.stop();
         scope.register(EasyMock.isA(AtomicComponent.class));
         EasyMock.expectLastCall().atLeastOnce();
-        EasyMock.expect(scope.getScope()).andReturn(Scope.MODULE).atLeastOnce();
+        EasyMock.expect(scope.getScope()).andReturn(Scope.COMPOSITE).atLeastOnce();
         scope.getInstance(EasyMock.isA(AtomicComponent.class));
         EasyMock.expectLastCall().andAnswer(new IAnswer<Object>() {
             private Map<AtomicComponent, Object> cache = new HashMap<AtomicComponent, Object>();

Modified: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/java/JavaReferenceWireTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/java/JavaReferenceWireTestCase.java?view=diff&rev=488890&r1=488889&r2=488890
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/java/JavaReferenceWireTestCase.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/java/JavaReferenceWireTestCase.java Tue Dec 19 18:36:22 2006
@@ -88,7 +88,7 @@
         scope.stop();
         scope.register(EasyMock.isA(AtomicComponent.class));
         EasyMock.expectLastCall().atLeastOnce();
-        EasyMock.expect(scope.getScope()).andReturn(Scope.MODULE).atLeastOnce();
+        EasyMock.expect(scope.getScope()).andReturn(Scope.COMPOSITE).atLeastOnce();
         scope.getInstance(EasyMock.isA(AtomicComponent.class));
         EasyMock.expectLastCall().andAnswer(new IAnswer<Object>() {
             private Map<AtomicComponent, Object> cache = new HashMap<AtomicComponent, Object>();

Modified: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/java/integration/CallbackInvocationTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/java/integration/CallbackInvocationTestCase.java?view=diff&rev=488890&r1=488889&r2=488890
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/java/integration/CallbackInvocationTestCase.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/java/integration/CallbackInvocationTestCase.java Tue Dec 19 18:36:22 2006
@@ -182,7 +182,7 @@
         PojoComponentType<JavaMappedService, JavaMappedReference, JavaMappedProperty<?>> type =
             new PojoComponentType<JavaMappedService, JavaMappedReference, JavaMappedProperty<?>>();
         type.setConstructorDefinition(ctorDef);
-        type.setImplementationScope(Scope.MODULE);
+        type.setImplementationScope(Scope.COMPOSITE);
         Method method = FooImpl.class.getMethod("setCallback", FooCallback.class);
         JavaInterfaceProcessorRegistry registry = new JavaInterfaceProcessorRegistryImpl();
         ServiceContract<?> contract = registry.introspect(Foo.class);
@@ -204,7 +204,7 @@
         PojoComponentType<JavaMappedService, JavaMappedReference, JavaMappedProperty<?>> type =
             new PojoComponentType<JavaMappedService, JavaMappedReference, JavaMappedProperty<?>>();
         type.setConstructorDefinition(ctorDef);
-        type.setImplementationScope(Scope.MODULE);
+        type.setImplementationScope(Scope.COMPOSITE);
         Method method = FooClient.class.getMethod("setFoo", Foo.class);
         JavaInterfaceProcessorRegistry registry = new JavaInterfaceProcessorRegistryImpl();
         ServiceContract<?> contract = registry.introspect(Foo.class);
@@ -230,7 +230,7 @@
         PojoComponentType<JavaMappedService, JavaMappedReference, JavaMappedProperty<?>> type =
             new PojoComponentType<JavaMappedService, JavaMappedReference, JavaMappedProperty<?>>();
         type.setConstructorDefinition(ctorDef);
-        type.setImplementationScope(Scope.MODULE);
+        type.setImplementationScope(Scope.COMPOSITE);
         Method method = FooPlainClient.class.getMethod("setFoo", Foo.class);
         JavaInterfaceProcessorRegistry registry = new JavaInterfaceProcessorRegistryImpl();
         ServiceContract<?> contract = registry.introspect(Foo.class);

Modified: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/processor/ScopeProcessorTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/processor/ScopeProcessorTestCase.java?view=diff&rev=488890&r1=488889&r2=488890
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/processor/ScopeProcessorTestCase.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/processor/ScopeProcessorTestCase.java Tue Dec 19 18:36:22 2006
@@ -42,7 +42,7 @@
             new PojoComponentType<JavaMappedService, JavaMappedReference, JavaMappedProperty<?>>();
 
         processor.visitClass(parent, Module.class, type, null);
-        assertEquals(Scope.MODULE, type.getImplementationScope());
+        assertEquals(Scope.COMPOSITE, type.getImplementationScope());
     }
 
     public void testSessionScope() throws ProcessingException {
@@ -98,7 +98,7 @@
         parent = EasyMock.createNiceMock(CompositeComponent.class);
     }
 
-    @org.osoa.sca.annotations.Scope("MODULE")
+    @org.osoa.sca.annotations.Scope("COMPOSITE")
     private class Module {
     }
 

Modified: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/system/builder/SystemComponentBuilderTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/system/builder/SystemComponentBuilderTestCase.java?view=diff&rev=488890&r1=488889&r2=488890
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/system/builder/SystemComponentBuilderTestCase.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/system/builder/SystemComponentBuilderTestCase.java Tue Dec 19 18:36:22 2006
@@ -70,7 +70,7 @@
         Method destroyMethod = FooImpl.class.getMethod("destroy");
         destroyMethod.setAccessible(true);
         type.setDestroyMethod(destroyMethod);
-        type.setImplementationScope(Scope.MODULE);
+        type.setImplementationScope(Scope.COMPOSITE);
         ConstructorDefinition<FooImpl> ctorDef = new ConstructorDefinition<FooImpl>(FooImpl.class.getConstructor());
         type.setConstructorDefinition(ctorDef);
         SystemImplementation impl = new SystemImplementation();
@@ -99,7 +99,7 @@
         Method destroyMethod = FooImpl.class.getMethod("destroy");
         destroyMethod.setAccessible(true);
         type.setDestroyMethod(destroyMethod);
-        type.setImplementationScope(Scope.MODULE);
+        type.setImplementationScope(Scope.COMPOSITE);
         JavaMappedProperty mappedProp = new JavaMappedProperty();
         mappedProp.setName("prop");
         Method propMethod = FooImpl.class.getMethod("setProp", String.class);
@@ -129,7 +129,7 @@
     public void testRefBuild() throws Exception {
         PojoComponentType<JavaMappedService, JavaMappedReference, JavaMappedProperty<?>> type =
             new PojoComponentType<JavaMappedService, JavaMappedReference, JavaMappedProperty<?>>();
-        type.setImplementationScope(Scope.MODULE);
+        type.setImplementationScope(Scope.COMPOSITE);
         JavaMappedReference mappedReference = new JavaMappedReference();
         mappedReference.setName("ref");
         Method refMethod = FooImpl.class.getMethod("setRef", Foo.class);
@@ -168,7 +168,7 @@
     public void testAutowireBuild() throws Exception {
         PojoComponentType<JavaMappedService, JavaMappedReference, JavaMappedProperty<?>> type =
             new PojoComponentType<JavaMappedService, JavaMappedReference, JavaMappedProperty<?>>();
-        type.setImplementationScope(Scope.MODULE);
+        type.setImplementationScope(Scope.COMPOSITE);
         JavaMappedReference mappedReference = new JavaMappedReference();
         mappedReference.setName("ref");
         mappedReference.setAutowire(true);
@@ -202,7 +202,7 @@
     public void testAutowireConstructorBuild() throws Exception {
         PojoComponentType<JavaMappedService, JavaMappedReference, JavaMappedProperty<?>> type =
             new PojoComponentType<JavaMappedService, JavaMappedReference, JavaMappedProperty<?>>();
-        type.setImplementationScope(Scope.MODULE);
+        type.setImplementationScope(Scope.COMPOSITE);
         ConstructorDefinition<FooImpl2> ctorDef =
             new ConstructorDefinition<FooImpl2>(FooImpl2.class.getConstructor(Foo.class));
         ctorDef.getInjectionNames().add("ref");

Modified: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/integration/implementation/IntrospectionRegistryIntegrationTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/integration/implementation/IntrospectionRegistryIntegrationTestCase.java?view=diff&rev=488890&r1=488889&r2=488890
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/integration/implementation/IntrospectionRegistryIntegrationTestCase.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/integration/implementation/IntrospectionRegistryIntegrationTestCase.java Tue Dec 19 18:36:22 2006
@@ -30,7 +30,7 @@
 import org.apache.tuscany.spi.implementation.java.JavaMappedReference;
 import org.apache.tuscany.spi.implementation.java.JavaMappedService;
 import org.apache.tuscany.spi.implementation.java.PojoComponentType;
-import static org.apache.tuscany.spi.model.Scope.MODULE;
+import static org.apache.tuscany.spi.model.Scope.COMPOSITE;
 
 import junit.framework.TestCase;
 import org.apache.tuscany.core.idl.java.JavaInterfaceProcessorRegistryImpl;
@@ -59,7 +59,7 @@
         registry.introspect(null, Foo.class, type, null);
         assertEquals(Foo.class.getMethod("init"), type.getInitMethod());
         assertEquals(Foo.class.getMethod("destroy"), type.getDestroyMethod());
-        assertEquals(MODULE, type.getImplementationScope());
+        assertEquals(COMPOSITE, type.getImplementationScope());
         assertEquals(Foo.class.getMethod("setBar", String.class), type.getProperties().get("bar").getMember());
         assertEquals(Foo.class.getMethod("setTarget", Foo.class), type.getReferences().get("target").getMember());
         assertEquals(Foo.class.getMethod("setResource", Foo.class), type.getResources().get("resource").getMember());
@@ -79,7 +79,7 @@
         registry.registerProcessor(new ResourceProcessor());
     }
 
-    @Scope("MODULE")
+    @Scope("COMPOSITE")
     private static class Foo {
         protected Foo target;
         protected String bar;

Modified: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/integration/implementation/system/builder/MockComponentFactory.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/integration/implementation/system/builder/MockComponentFactory.java?view=diff&rev=488890&r1=488889&r2=488890
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/integration/implementation/system/builder/MockComponentFactory.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/integration/implementation/system/builder/MockComponentFactory.java Tue Dec 19 18:36:22 2006
@@ -59,7 +59,7 @@
         SystemImplementation impl = new SystemImplementation();
         PojoComponentType<ServiceDefinition, ReferenceDefinition, Property<?>> componentType =
             new PojoComponentType<ServiceDefinition, ReferenceDefinition, Property<?>>();
-        componentType.setImplementationScope(Scope.MODULE);
+        componentType.setImplementationScope(Scope.COMPOSITE);
         componentType
             .setConstructorDefinition(
                 new ConstructorDefinition<SourceImpl>(SourceImpl.class.getConstructor((Class[]) null)));
@@ -99,7 +99,7 @@
         SystemImplementation impl = new SystemImplementation();
         PojoComponentType<ServiceDefinition, ReferenceDefinition, Property<?>> componentType =
             new PojoComponentType<ServiceDefinition, ReferenceDefinition, Property<?>>();
-        componentType.setImplementationScope(Scope.MODULE);
+        componentType.setImplementationScope(Scope.COMPOSITE);
         JavaMappedReference reference;
         try {
             reference = new JavaMappedReference();
@@ -132,7 +132,7 @@
         SystemImplementation impl = new SystemImplementation();
         PojoComponentType<JavaMappedService, JavaMappedReference, JavaMappedProperty<?>> componentType =
             new PojoComponentType<JavaMappedService, JavaMappedReference, JavaMappedProperty<?>>();
-        componentType.setImplementationScope(Scope.MODULE);
+        componentType.setImplementationScope(Scope.COMPOSITE);
         componentType
             .setConstructorDefinition(
                 new ConstructorDefinition<TargetImpl>(TargetImpl.class.getConstructor((Class[]) null)));

Modified: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/integration/wire/DifferentInterfaceWireTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/integration/wire/DifferentInterfaceWireTestCase.java?view=diff&rev=488890&r1=488889&r2=488890
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/integration/wire/DifferentInterfaceWireTestCase.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/integration/wire/DifferentInterfaceWireTestCase.java Tue Dec 19 18:36:22 2006
@@ -116,7 +116,7 @@
         scope.stop();
         scope.register(EasyMock.isA(AtomicComponent.class));
         EasyMock.expectLastCall().atLeastOnce();
-        EasyMock.expect(scope.getScope()).andReturn(Scope.MODULE).atLeastOnce();
+        EasyMock.expect(scope.getScope()).andReturn(Scope.COMPOSITE).atLeastOnce();
         scope.getInstance(EasyMock.isA(AtomicComponent.class));
         EasyMock.expectLastCall().andAnswer(new IAnswer<Object>() {
             private Map<AtomicComponent, Object> cache = new HashMap<AtomicComponent, Object>();

Modified: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/mock/component/ModuleScopeComponent.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/mock/component/ModuleScopeComponent.java?view=diff&rev=488890&r1=488889&r2=488890
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/mock/component/ModuleScopeComponent.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/mock/component/ModuleScopeComponent.java Tue Dec 19 18:36:22 2006
@@ -23,7 +23,7 @@
 /**
  * @version $Rev$ $Date$
  */
-@Scope("MODULE")
+@Scope("COMPOSITE")
 public interface ModuleScopeComponent {
 
     //public boolean isInit();

Modified: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/mock/component/ModuleScopeComponentImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/mock/component/ModuleScopeComponentImpl.java?view=diff&rev=488890&r1=488889&r2=488890
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/mock/component/ModuleScopeComponentImpl.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/mock/component/ModuleScopeComponentImpl.java Tue Dec 19 18:36:22 2006
@@ -24,7 +24,7 @@
 /**
  * @version $Rev$ $Date$
  */
-@Scope("MODULE")
+@Scope("COMPOSITE")
 public class ModuleScopeComponentImpl implements
     ModuleScopeComponent {
 

Modified: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/mock/component/OrderedEagerInitPojo.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/mock/component/OrderedEagerInitPojo.java?view=diff&rev=488890&r1=488889&r2=488890
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/mock/component/OrderedEagerInitPojo.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/mock/component/OrderedEagerInitPojo.java Tue Dec 19 18:36:22 2006
@@ -22,7 +22,7 @@
 import org.osoa.sca.annotations.Init;
 import org.osoa.sca.annotations.Scope;
 
-@Scope("MODULE")
+@Scope("COMPOSITE")
 public class OrderedEagerInitPojo {
 
     private static final Object LOCK = new Object();

Modified: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/mock/component/OrderedInitPojoImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/mock/component/OrderedInitPojoImpl.java?view=diff&rev=488890&r1=488889&r2=488890
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/mock/component/OrderedInitPojoImpl.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/mock/component/OrderedInitPojoImpl.java Tue Dec 19 18:36:22 2006
@@ -22,7 +22,7 @@
 import org.osoa.sca.annotations.Init;
 import org.osoa.sca.annotations.Scope;
 
-@Scope("MODULE")
+@Scope("COMPOSITE")
 public class OrderedInitPojoImpl implements OrderedInitPojo {
 
     private static final Object LOCK = new Object();

Modified: incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/databinding/extension/DataBindingExtension.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/databinding/extension/DataBindingExtension.java?view=diff&rev=488890&r1=488889&r2=488890
==============================================================================
--- incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/databinding/extension/DataBindingExtension.java (original)
+++ incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/databinding/extension/DataBindingExtension.java Tue Dec 19 18:36:22 2006
@@ -43,7 +43,7 @@
  *
  * @version $Rev$ $Date$
  */
-@Scope("MODULE")
+@Scope("COMPOSITE")
 @Service(DataBinding.class)
 public abstract class DataBindingExtension implements DataBinding {
 

Modified: incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/databinding/extension/TransformerExtension.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/databinding/extension/TransformerExtension.java?view=diff&rev=488890&r1=488889&r2=488890
==============================================================================
--- incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/databinding/extension/TransformerExtension.java (original)
+++ incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/databinding/extension/TransformerExtension.java Tue Dec 19 18:36:22 2006
@@ -27,7 +27,7 @@
 /**
  * Base Implementation of Transformer which provides the registration to the transformer registry
  */
-@org.osoa.sca.annotations.Scope("MODULE")
+@org.osoa.sca.annotations.Scope("COMPOSITE")
 @Service(Transformer.class)
 public abstract class TransformerExtension<S, T> implements Transformer {
 

Modified: incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/extension/BindingBuilderExtension.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/extension/BindingBuilderExtension.java?view=diff&rev=488890&r1=488889&r2=488890
==============================================================================
--- incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/extension/BindingBuilderExtension.java (original)
+++ incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/extension/BindingBuilderExtension.java Tue Dec 19 18:36:22 2006
@@ -40,7 +40,7 @@
  *
  * @version $$Rev$$ $$Date$$
  */
-@Scope("MODULE")
+@Scope("COMPOSITE")
 public abstract class BindingBuilderExtension<B extends Binding> implements BindingBuilder<B> {
 
     protected BuilderRegistry builderRegistry;

Modified: incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/extension/ComponentBuilderExtension.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/extension/ComponentBuilderExtension.java?view=diff&rev=488890&r1=488889&r2=488890
==============================================================================
--- incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/extension/ComponentBuilderExtension.java (original)
+++ incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/extension/ComponentBuilderExtension.java Tue Dec 19 18:36:22 2006
@@ -40,7 +40,7 @@
  *
  * @version $$Rev$$ $$Date$$
  */
-@Scope("MODULE")
+@Scope("COMPOSITE")
 public abstract class ComponentBuilderExtension<I extends Implementation<?>> implements ComponentBuilder<I> {
 
     protected BuilderRegistry builderRegistry;

Modified: incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/extension/ComponentTypeLoaderExtension.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/extension/ComponentTypeLoaderExtension.java?view=diff&rev=488890&r1=488889&r2=488890
==============================================================================
--- incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/extension/ComponentTypeLoaderExtension.java (original)
+++ incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/extension/ComponentTypeLoaderExtension.java Tue Dec 19 18:36:22 2006
@@ -30,7 +30,7 @@
 /**
  * @version $Rev$ $Date$
  */
-@Scope("MODULE")
+@Scope("COMPOSITE")
 public abstract class ComponentTypeLoaderExtension<I extends Implementation> implements ComponentTypeLoader<I> {
     protected LoaderRegistry loaderRegistry;
 

Modified: incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/model/Scope.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/model/Scope.java?view=diff&rev=488890&r1=488889&r2=488890
==============================================================================
--- incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/model/Scope.java (original)
+++ incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/model/Scope.java Tue Dec 19 18:36:22 2006
@@ -28,7 +28,7 @@
     public static final Scope REQUEST = new Scope("REQUEST");
     public static final Scope SESSION = new Scope("SESSION");
     public static final Scope CONVERSATION = new Scope("CONVERSATION");
-    public static final Scope MODULE = new Scope("MODULE");
+    public static final Scope COMPOSITE = new Scope("COMPOSITE");
     public static final Scope SYSTEM = new Scope("SYSTEM");
     public static final Scope UNDEFINED = new Scope("UNDEFINED");
 

Modified: incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/wire/WirePostProcessorExtension.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/wire/WirePostProcessorExtension.java?view=diff&rev=488890&r1=488889&r2=488890
==============================================================================
--- incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/wire/WirePostProcessorExtension.java (original)
+++ incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/wire/WirePostProcessorExtension.java Tue Dec 19 18:36:22 2006
@@ -23,7 +23,7 @@
 
 import org.apache.tuscany.spi.annotation.Autowire;
 
-@Scope("MODULE")
+@Scope("COMPOSITE")
 /**
  * @version $Rev$ $Date$
  */

Modified: incubator/tuscany/java/sca/kernel/spi/src/test/java/org/apache/tuscany/spi/model/ScopeTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/spi/src/test/java/org/apache/tuscany/spi/model/ScopeTestCase.java?view=diff&rev=488890&r1=488889&r2=488890
==============================================================================
--- incubator/tuscany/java/sca/kernel/spi/src/test/java/org/apache/tuscany/spi/model/ScopeTestCase.java (original)
+++ incubator/tuscany/java/sca/kernel/spi/src/test/java/org/apache/tuscany/spi/model/ScopeTestCase.java Tue Dec 19 18:36:22 2006
@@ -26,8 +26,8 @@
 public class ScopeTestCase extends TestCase {
 
     public void testEquals() throws Exception {
-        Scope module = new Scope("module");
-        assertTrue(module.equals(Scope.MODULE));
+        Scope module = new Scope("COMPOSITE");
+        assertTrue(module.equals(Scope.COMPOSITE));
     }
 
     public void testEqualsNew() throws Exception {

Modified: incubator/tuscany/java/sca/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/pom.xml?view=diff&rev=488890&r1=488889&r2=488890
==============================================================================
--- incubator/tuscany/java/sca/pom.xml (original)
+++ incubator/tuscany/java/sca/pom.xml Tue Dec 19 18:36:22 2006
@@ -67,7 +67,7 @@
         <module>services</module>
         <module>runtime</module>
         <module>commands</module>
-        <!--<module>tools</module>-->
+        <module>tools</module>
         <module>plugins</module>
     </modules>
 

Modified: incubator/tuscany/java/sca/runtime/osgi/src/main/java/org/apache/tuscany/osgi/binding/OSGiBindingLoader.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/runtime/osgi/src/main/java/org/apache/tuscany/osgi/binding/OSGiBindingLoader.java?view=diff&rev=488890&r1=488889&r2=488890
==============================================================================
--- incubator/tuscany/java/sca/runtime/osgi/src/main/java/org/apache/tuscany/osgi/binding/OSGiBindingLoader.java (original)
+++ incubator/tuscany/java/sca/runtime/osgi/src/main/java/org/apache/tuscany/osgi/binding/OSGiBindingLoader.java Tue Dec 19 18:36:22 2006
@@ -37,7 +37,7 @@
  *
  * @version $Rev$ $Date$
  */
-@Scope("MODULE")
+@Scope("COMPOSITE")
 public class OSGiBindingLoader extends LoaderExtension<OSGiBinding> {
     public static final QName BINDING_OSGI = new QName("http://tuscany.apache.org/xmlns/osgi/1.0", "binding.osgi");
 

Modified: incubator/tuscany/java/sca/services/bindings/binding.axis2/src/main/java/org/apache/tuscany/binding/axis2/WebServiceBindingLoader.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/services/bindings/binding.axis2/src/main/java/org/apache/tuscany/binding/axis2/WebServiceBindingLoader.java?view=diff&rev=488890&r1=488889&r2=488890
==============================================================================
--- incubator/tuscany/java/sca/services/bindings/binding.axis2/src/main/java/org/apache/tuscany/binding/axis2/WebServiceBindingLoader.java (original)
+++ incubator/tuscany/java/sca/services/bindings/binding.axis2/src/main/java/org/apache/tuscany/binding/axis2/WebServiceBindingLoader.java Tue Dec 19 18:36:22 2006
@@ -49,7 +49,7 @@
  * 
  * @version $Rev$ $Date$
  */
-@Scope("MODULE")
+@Scope("COMPOSITE")
 @SuppressWarnings("deprecation")
 public class WebServiceBindingLoader extends LoaderExtension<WebServiceBinding> {
     public static final QName BINDING_WS = new QName(XML_NAMESPACE_1_0, "binding.ws");

Modified: incubator/tuscany/java/sca/services/bindings/binding.celtix/src/main/java/org/apache/tuscany/binding/celtix/BusServiceImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/services/bindings/binding.celtix/src/main/java/org/apache/tuscany/binding/celtix/BusServiceImpl.java?view=diff&rev=488890&r1=488889&r2=488890
==============================================================================
--- incubator/tuscany/java/sca/services/bindings/binding.celtix/src/main/java/org/apache/tuscany/binding/celtix/BusServiceImpl.java (original)
+++ incubator/tuscany/java/sca/services/bindings/binding.celtix/src/main/java/org/apache/tuscany/binding/celtix/BusServiceImpl.java Tue Dec 19 18:36:22 2006
@@ -35,7 +35,7 @@
  *
  * @version $Rev$ $Date$
  */
-@Scope("MODULE")
+@Scope("COMPOSITE")
 public class BusServiceImpl implements BusService {
 
     protected WSDLDefinitionRegistry wsdlRegistry;

Modified: incubator/tuscany/java/sca/services/bindings/binding.celtix/src/main/java/org/apache/tuscany/binding/celtix/WebServiceBindingLoader.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/services/bindings/binding.celtix/src/main/java/org/apache/tuscany/binding/celtix/WebServiceBindingLoader.java?view=diff&rev=488890&r1=488889&r2=488890
==============================================================================
--- incubator/tuscany/java/sca/services/bindings/binding.celtix/src/main/java/org/apache/tuscany/binding/celtix/WebServiceBindingLoader.java (original)
+++ incubator/tuscany/java/sca/services/bindings/binding.celtix/src/main/java/org/apache/tuscany/binding/celtix/WebServiceBindingLoader.java Tue Dec 19 18:36:22 2006
@@ -56,7 +56,7 @@
  *
  * @version $Rev$ $Date$
  */
-@Scope("MODULE")
+@Scope("COMPOSITE")
 public class WebServiceBindingLoader extends LoaderExtension<WebServiceBinding> {
     public static final QName BINDING_WS = new QName(XML_NAMESPACE_1_0, "binding.ws");
 

Modified: incubator/tuscany/java/sca/services/bindings/binding.jms/src/main/java/org/apache/tuscany/binding/jms/JMSBindingLoader.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/services/bindings/binding.jms/src/main/java/org/apache/tuscany/binding/jms/JMSBindingLoader.java?view=diff&rev=488890&r1=488889&r2=488890
==============================================================================
--- incubator/tuscany/java/sca/services/bindings/binding.jms/src/main/java/org/apache/tuscany/binding/jms/JMSBindingLoader.java (original)
+++ incubator/tuscany/java/sca/services/bindings/binding.jms/src/main/java/org/apache/tuscany/binding/jms/JMSBindingLoader.java Tue Dec 19 18:36:22 2006
@@ -40,7 +40,7 @@
  *
  * @version $Rev: 449970 $ $Date: 2006-09-26 06:05:35 -0400 (Tue, 26 Sep 2006) $
  */
-@Scope("MODULE")
+@Scope("COMPOSITE")
 public class JMSBindingLoader extends LoaderExtension<JMSBinding> {
     public static final QName BINDING_JMS = new QName(
         "http://tuscany.apache.org/xmlns/binding/jms/1.0-SNAPSHOT", "binding.jms");

Modified: incubator/tuscany/java/sca/services/bindings/binding.jsonrpc/src/main/java/org/apache/tuscany/binding/jsonrpc/JSONRPCBindingLoader.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/services/bindings/binding.jsonrpc/src/main/java/org/apache/tuscany/binding/jsonrpc/JSONRPCBindingLoader.java?view=diff&rev=488890&r1=488889&r2=488890
==============================================================================
--- incubator/tuscany/java/sca/services/bindings/binding.jsonrpc/src/main/java/org/apache/tuscany/binding/jsonrpc/JSONRPCBindingLoader.java (original)
+++ incubator/tuscany/java/sca/services/bindings/binding.jsonrpc/src/main/java/org/apache/tuscany/binding/jsonrpc/JSONRPCBindingLoader.java Tue Dec 19 18:36:22 2006
@@ -37,7 +37,7 @@
  * 
  * @version $Rev$ $Date$
  */
-@Scope("MODULE")
+@Scope("COMPOSITE")
 public class JSONRPCBindingLoader extends LoaderExtension<JSONRPCBinding> {
     public static final QName BINDING_JSON = new QName(XML_NAMESPACE_1_0, "binding.jsonrpc");
 

Modified: incubator/tuscany/java/sca/services/bindings/binding.rmi/src/main/java/org/apache/tuscany/binding/rmi/RMIBindingLoader.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/services/bindings/binding.rmi/src/main/java/org/apache/tuscany/binding/rmi/RMIBindingLoader.java?view=diff&rev=488890&r1=488889&r2=488890
==============================================================================
--- incubator/tuscany/java/sca/services/bindings/binding.rmi/src/main/java/org/apache/tuscany/binding/rmi/RMIBindingLoader.java (original)
+++ incubator/tuscany/java/sca/services/bindings/binding.rmi/src/main/java/org/apache/tuscany/binding/rmi/RMIBindingLoader.java Tue Dec 19 18:36:22 2006
@@ -36,7 +36,7 @@
  *
  * @version $Rev$ $Date$
  */
-@Scope("MODULE")
+@Scope("COMPOSITE")
 public class RMIBindingLoader extends LoaderExtension<RMIBinding> {
     public static final QName BINDING_RMI = new QName(
         "http://tuscany.apache.org/xmlns/binding/rmi/1.0-SNAPSHOT", "binding.rmi");

Modified: incubator/tuscany/java/sca/services/bindings/binding.rmi/src/main/java/org/apache/tuscany/binding/rmi/host/RMIHostImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/services/bindings/binding.rmi/src/main/java/org/apache/tuscany/binding/rmi/host/RMIHostImpl.java?view=diff&rev=488890&r1=488889&r2=488890
==============================================================================
--- incubator/tuscany/java/sca/services/bindings/binding.rmi/src/main/java/org/apache/tuscany/binding/rmi/host/RMIHostImpl.java (original)
+++ incubator/tuscany/java/sca/services/bindings/binding.rmi/src/main/java/org/apache/tuscany/binding/rmi/host/RMIHostImpl.java Tue Dec 19 18:36:22 2006
@@ -34,7 +34,7 @@
 /**
  * This class provides an implementation for the RMI Host SPIs
  */
-@Scope("MODULE")
+@Scope("COMPOSITE")
 public class RMIHostImpl implements RMIHost {
 
     // map of RMI registries started and running

Modified: incubator/tuscany/java/sca/services/containers/container.groovy/src/main/java/org/apache/tuscany/container/groovy/GroovyComponentBuilder.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/services/containers/container.groovy/src/main/java/org/apache/tuscany/container/groovy/GroovyComponentBuilder.java?view=diff&rev=488890&r1=488889&r2=488890
==============================================================================
--- incubator/tuscany/java/sca/services/containers/container.groovy/src/main/java/org/apache/tuscany/container/groovy/GroovyComponentBuilder.java (original)
+++ incubator/tuscany/java/sca/services/containers/container.groovy/src/main/java/org/apache/tuscany/container/groovy/GroovyComponentBuilder.java Tue Dec 19 18:36:22 2006
@@ -90,7 +90,7 @@
         configuration.setParent(parent);
         // get the scope container for this component's scope
         Scope scope = componentType.getLifecycleScope();
-        if (Scope.MODULE == scope) {
+        if (Scope.COMPOSITE == scope) {
             configuration.setScopeContainer(deploymentContext.getModuleScope());
         } else {
             configuration.setScopeContainer(scopeRegistry.getScopeContainer(scope));

Modified: incubator/tuscany/java/sca/services/containers/container.groovy/src/main/java/org/apache/tuscany/container/groovy/GroovyComponentTypeLoader.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/services/containers/container.groovy/src/main/java/org/apache/tuscany/container/groovy/GroovyComponentTypeLoader.java?view=diff&rev=488890&r1=488889&r2=488890
==============================================================================
--- incubator/tuscany/java/sca/services/containers/container.groovy/src/main/java/org/apache/tuscany/container/groovy/GroovyComponentTypeLoader.java (original)
+++ incubator/tuscany/java/sca/services/containers/container.groovy/src/main/java/org/apache/tuscany/container/groovy/GroovyComponentTypeLoader.java Tue Dec 19 18:36:22 2006
@@ -36,7 +36,7 @@
         throws LoaderException {
         GroovyComponentType componentType = new GroovyComponentType();
         // for now, default to module
-        componentType.setLifecycleScope(Scope.MODULE);
+        componentType.setLifecycleScope(Scope.COMPOSITE);
         implementation.setComponentType(componentType);
     }
 

Modified: incubator/tuscany/java/sca/services/containers/container.groovy/src/test/java/org/apache/tuscany/container/groovy/GroovyComponentTypeLoaderTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/services/containers/container.groovy/src/test/java/org/apache/tuscany/container/groovy/GroovyComponentTypeLoaderTestCase.java?view=diff&rev=488890&r1=488889&r2=488890
==============================================================================
--- incubator/tuscany/java/sca/services/containers/container.groovy/src/test/java/org/apache/tuscany/container/groovy/GroovyComponentTypeLoaderTestCase.java (original)
+++ incubator/tuscany/java/sca/services/containers/container.groovy/src/test/java/org/apache/tuscany/container/groovy/GroovyComponentTypeLoaderTestCase.java Tue Dec 19 18:36:22 2006
@@ -32,6 +32,6 @@
         GroovyImplementation impl = new GroovyImplementation();
         loader.load(null, impl, null);
         GroovyComponentType type = impl.getComponentType();
-        assertEquals(Scope.MODULE, type.getLifecycleScope());
+        assertEquals(Scope.COMPOSITE, type.getLifecycleScope());
     }
 }

Modified: incubator/tuscany/java/sca/services/containers/container.javascript/src/main/java/org/apache/tuscany/container/javascript/JavaScriptComponentBuilder.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/services/containers/container.javascript/src/main/java/org/apache/tuscany/container/javascript/JavaScriptComponentBuilder.java?view=diff&rev=488890&r1=488889&r2=488890
==============================================================================
--- incubator/tuscany/java/sca/services/containers/container.javascript/src/main/java/org/apache/tuscany/container/javascript/JavaScriptComponentBuilder.java (original)
+++ incubator/tuscany/java/sca/services/containers/container.javascript/src/main/java/org/apache/tuscany/container/javascript/JavaScriptComponentBuilder.java Tue Dec 19 18:36:22 2006
@@ -97,7 +97,7 @@
         // TODO: have ComponentBuilderExtension pass ScopeContainer in on build method?
         ScopeContainer scopeContainer;
         Scope scope = componentType.getLifecycleScope();
-        if (Scope.MODULE == scope) {
+        if (Scope.COMPOSITE == scope) {
             scopeContainer = deploymentContext.getModuleScope();
         } else {
             scopeContainer = scopeRegistry.getScopeContainer(scope);

Modified: incubator/tuscany/java/sca/services/containers/container.javascript/src/main/java/org/apache/tuscany/container/javascript/JavaScriptComponentType.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/services/containers/container.javascript/src/main/java/org/apache/tuscany/container/javascript/JavaScriptComponentType.java?view=diff&rev=488890&r1=488889&r2=488890
==============================================================================
--- incubator/tuscany/java/sca/services/containers/container.javascript/src/main/java/org/apache/tuscany/container/javascript/JavaScriptComponentType.java (original)
+++ incubator/tuscany/java/sca/services/containers/container.javascript/src/main/java/org/apache/tuscany/container/javascript/JavaScriptComponentType.java Tue Dec 19 18:36:22 2006
@@ -26,7 +26,7 @@
 
 public class JavaScriptComponentType extends ComponentType<ServiceDefinition, ReferenceDefinition, Property<?>> {
 
-    private Scope lifecycleScope = Scope.MODULE;
+    private Scope lifecycleScope = Scope.COMPOSITE;
 
     public JavaScriptComponentType() {
     }

Modified: incubator/tuscany/java/sca/services/containers/container.javascript/src/main/java/org/apache/tuscany/container/javascript/rhino/RhinoSCAConfig.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/services/containers/container.javascript/src/main/java/org/apache/tuscany/container/javascript/rhino/RhinoSCAConfig.java?view=diff&rev=488890&r1=488889&r2=488890
==============================================================================
--- incubator/tuscany/java/sca/services/containers/container.javascript/src/main/java/org/apache/tuscany/container/javascript/rhino/RhinoSCAConfig.java (original)
+++ incubator/tuscany/java/sca/services/containers/container.javascript/src/main/java/org/apache/tuscany/container/javascript/rhino/RhinoSCAConfig.java Tue Dec 19 18:36:22 2006
@@ -113,7 +113,7 @@
                 } else if ("conversational".equalsIgnoreCase(String.valueOf(o))) {
                     this.scope = Scope.SESSION; // TODO: where's CONVERSATION?
                 } else if ("composite".equalsIgnoreCase(String.valueOf(o))) {
-                    this.scope = Scope.MODULE; // TODO: composite = MODULE for now?
+                    this.scope = Scope.COMPOSITE; // TODO: composite = MODULE for now?
                 } else {
                     throw new IllegalArgumentException("invalid scope value: " + o);
                 }

Modified: incubator/tuscany/java/sca/services/containers/container.javascript/src/main/java/org/apache/tuscany/container/javascript/utils/xmlfromxsd/XmlInstanceRegistryImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/services/containers/container.javascript/src/main/java/org/apache/tuscany/container/javascript/utils/xmlfromxsd/XmlInstanceRegistryImpl.java?view=diff&rev=488890&r1=488889&r2=488890
==============================================================================
--- incubator/tuscany/java/sca/services/containers/container.javascript/src/main/java/org/apache/tuscany/container/javascript/utils/xmlfromxsd/XmlInstanceRegistryImpl.java (original)
+++ incubator/tuscany/java/sca/services/containers/container.javascript/src/main/java/org/apache/tuscany/container/javascript/utils/xmlfromxsd/XmlInstanceRegistryImpl.java Tue Dec 19 18:36:22 2006
@@ -29,7 +29,7 @@
  * An implementation for the XMLInstnaceRegistry
  *
  */
-@Scope("MODULE")
+@Scope("COMPOSITE")
 public class XmlInstanceRegistryImpl implements XmlInstanceRegistry {
 
     private Hashtable<String, Map<String, XmlObject>> wsdlXmlInstances;

Modified: incubator/tuscany/java/sca/services/containers/container.javascript/src/test/java/org/apache/tuscany/container/javascript/rhino/RhinoSCAConfigTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/services/containers/container.javascript/src/test/java/org/apache/tuscany/container/javascript/rhino/RhinoSCAConfigTestCase.java?view=diff&rev=488890&r1=488889&r2=488890
==============================================================================
--- incubator/tuscany/java/sca/services/containers/container.javascript/src/test/java/org/apache/tuscany/container/javascript/rhino/RhinoSCAConfigTestCase.java (original)
+++ incubator/tuscany/java/sca/services/containers/container.javascript/src/test/java/org/apache/tuscany/container/javascript/rhino/RhinoSCAConfigTestCase.java Tue Dec 19 18:36:22 2006
@@ -63,7 +63,7 @@
         RhinoScript rs = new RhinoScript("testScopeComposite", "SCA = { scope : 'composite', javaInterface : 'helloworld.HelloWorldService'}");
         RhinoSCAConfig scaConfig = rs.getSCAConfig();
         assertTrue(scaConfig.hasSCAConfig());
-        assertEquals(Scope.MODULE, scaConfig.getScope()); // TODO 
+        assertEquals(Scope.COMPOSITE, scaConfig.getScope()); // TODO
     }
 
     public void testScopeConversational() {

Modified: incubator/tuscany/java/sca/services/containers/container.ruby/src/main/java/org/apache/tuscany/container/ruby/RubyComponentBuilder.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/services/containers/container.ruby/src/main/java/org/apache/tuscany/container/ruby/RubyComponentBuilder.java?view=diff&rev=488890&r1=488889&r2=488890
==============================================================================
--- incubator/tuscany/java/sca/services/containers/container.ruby/src/main/java/org/apache/tuscany/container/ruby/RubyComponentBuilder.java (original)
+++ incubator/tuscany/java/sca/services/containers/container.ruby/src/main/java/org/apache/tuscany/container/ruby/RubyComponentBuilder.java Tue Dec 19 18:36:22 2006
@@ -74,7 +74,7 @@
         // TODO: have ComponentBuilderExtension pass ScopeContainer in on build method?
         ScopeContainer scopeContainer;
         Scope scope = componentType.getLifecycleScope();
-        if (Scope.MODULE == scope) {
+        if (Scope.COMPOSITE == scope) {
             scopeContainer = deploymentContext.getModuleScope();
         } else {
             scopeContainer = scopeRegistry.getScopeContainer(scope);

Modified: incubator/tuscany/java/sca/services/containers/container.ruby/src/main/java/org/apache/tuscany/container/ruby/RubyComponentType.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/services/containers/container.ruby/src/main/java/org/apache/tuscany/container/ruby/RubyComponentType.java?view=diff&rev=488890&r1=488889&r2=488890
==============================================================================
--- incubator/tuscany/java/sca/services/containers/container.ruby/src/main/java/org/apache/tuscany/container/ruby/RubyComponentType.java (original)
+++ incubator/tuscany/java/sca/services/containers/container.ruby/src/main/java/org/apache/tuscany/container/ruby/RubyComponentType.java Tue Dec 19 18:36:22 2006
@@ -27,7 +27,7 @@
 public class RubyComponentType extends
         ComponentType<ServiceDefinition, ReferenceDefinition, Property<?>> {
 
-    private Scope lifecycleScope = Scope.MODULE;
+    private Scope lifecycleScope = Scope.COMPOSITE;
 
     public RubyComponentType() {
     }

Modified: incubator/tuscany/java/sca/services/containers/container.ruby/src/main/java/org/apache/tuscany/container/ruby/rubyscript/RubySCAConfig.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/services/containers/container.ruby/src/main/java/org/apache/tuscany/container/ruby/rubyscript/RubySCAConfig.java?view=diff&rev=488890&r1=488889&r2=488890
==============================================================================
--- incubator/tuscany/java/sca/services/containers/container.ruby/src/main/java/org/apache/tuscany/container/ruby/rubyscript/RubySCAConfig.java (original)
+++ incubator/tuscany/java/sca/services/containers/container.ruby/src/main/java/org/apache/tuscany/container/ruby/rubyscript/RubySCAConfig.java Tue Dec 19 18:36:22 2006
@@ -115,7 +115,7 @@
                 } else if ("conversational".equalsIgnoreCase(String.valueOf(o))) {
                     this.scope = Scope.SESSION; // TODO: where's CONVERSATIONAL?
                 } else if ("composite".equalsIgnoreCase(String.valueOf(o))) {
-                    this.scope = Scope.MODULE; // TODO: composite = MODULE for now?
+                    this.scope = Scope.COMPOSITE; // TODO: composite = MODULE for now?
                 } else {
                     throw new IllegalArgumentException("invalid scope value: " + o);
                 }

Modified: incubator/tuscany/java/sca/services/containers/container.script/src/main/java/org/apache/tuscany/container/script/ScriptComponentBuilder.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/services/containers/container.script/src/main/java/org/apache/tuscany/container/script/ScriptComponentBuilder.java?view=diff&rev=488890&r1=488889&r2=488890
==============================================================================
--- incubator/tuscany/java/sca/services/containers/container.script/src/main/java/org/apache/tuscany/container/script/ScriptComponentBuilder.java (original)
+++ incubator/tuscany/java/sca/services/containers/container.script/src/main/java/org/apache/tuscany/container/script/ScriptComponentBuilder.java Tue Dec 19 18:36:22 2006
@@ -63,7 +63,7 @@
         // TODO: have ComponentBuilderExtension pass ScopeContainer in on build method?
         ScopeContainer scopeContainer;
         Scope scope = componentType.getLifecycleScope();
-        if (Scope.MODULE == scope) {
+        if (Scope.COMPOSITE == scope) {
             scopeContainer = deploymentContext.getModuleScope();
         } else {
             scopeContainer = scopeRegistry.getScopeContainer(scope);

Modified: incubator/tuscany/java/sca/services/containers/container.script/src/main/java/org/apache/tuscany/container/script/ScriptComponentType.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/services/containers/container.script/src/main/java/org/apache/tuscany/container/script/ScriptComponentType.java?view=diff&rev=488890&r1=488889&r2=488890
==============================================================================
--- incubator/tuscany/java/sca/services/containers/container.script/src/main/java/org/apache/tuscany/container/script/ScriptComponentType.java (original)
+++ incubator/tuscany/java/sca/services/containers/container.script/src/main/java/org/apache/tuscany/container/script/ScriptComponentType.java Tue Dec 19 18:36:22 2006
@@ -30,7 +30,7 @@
  */
 public class ScriptComponentType extends ComponentType<ServiceDefinition, ReferenceDefinition, Property<?>> {
 
-    private Scope lifecycleScope = Scope.MODULE;
+    private Scope lifecycleScope = Scope.COMPOSITE;
 
     public ScriptComponentType() {
     }

Modified: incubator/tuscany/java/sca/services/containers/container.script/src/test/java/org/apache/tuscany/container/script/ScriptComponentBuilderTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/services/containers/container.script/src/test/java/org/apache/tuscany/container/script/ScriptComponentBuilderTestCase.java?view=diff&rev=488890&r1=488889&r2=488890
==============================================================================
--- incubator/tuscany/java/sca/services/containers/container.script/src/test/java/org/apache/tuscany/container/script/ScriptComponentBuilderTestCase.java (original)
+++ incubator/tuscany/java/sca/services/containers/container.script/src/test/java/org/apache/tuscany/container/script/ScriptComponentBuilderTestCase.java Tue Dec 19 18:36:22 2006
@@ -49,7 +49,7 @@
         final ScopeContainer scopeContainer = createMock(ScopeContainer.class);
         expect(scopeContainer.getScope()).andStubAnswer(new IAnswer() {
             public Object answer() throws Throwable {
-                return Scope.MODULE;
+                return Scope.COMPOSITE;
             }
         });
         expect(deploymentContext.getModuleScope()).andStubAnswer(new IAnswer() {
@@ -61,7 +61,7 @@
         ComponentDefinition<ScriptImplementation> impl =
             new ComponentDefinition<ScriptImplementation>(new ScriptImplementation());
         ScriptComponentType componentType = new ScriptComponentType();
-        componentType.setLifecycleScope(Scope.MODULE);
+        componentType.setLifecycleScope(Scope.COMPOSITE);
         ServiceDefinition service = new ServiceDefinition();
         ServiceContract serviceContract = new JavaServiceContract();
         service.setServiceContract(serviceContract);
@@ -90,7 +90,7 @@
         final ScopeContainer scopeContainer = createMock(ScopeContainer.class);
         expect(scopeContainer.getScope()).andStubAnswer(new IAnswer() {
             public Object answer() throws Throwable {
-                return Scope.MODULE;
+                return Scope.COMPOSITE;
             }
         });
         expect(deploymentContext.getModuleScope()).andStubAnswer(new IAnswer() {

Modified: incubator/tuscany/java/sca/services/containers/container.script/src/test/java/org/apache/tuscany/container/script/ScriptComponentTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/services/containers/container.script/src/test/java/org/apache/tuscany/container/script/ScriptComponentTestCase.java?view=diff&rev=488890&r1=488889&r2=488890
==============================================================================
--- incubator/tuscany/java/sca/services/containers/container.script/src/test/java/org/apache/tuscany/container/script/ScriptComponentTestCase.java (original)
+++ incubator/tuscany/java/sca/services/containers/container.script/src/test/java/org/apache/tuscany/container/script/ScriptComponentTestCase.java Tue Dec 19 18:36:22 2006
@@ -102,7 +102,7 @@
     protected void setUp() throws Exception {
         super.setUp();
         container = EasyMock.createMock(ScopeContainer.class);
-        EasyMock.expect(container.getScope()).andReturn(Scope.MODULE);
+        EasyMock.expect(container.getScope()).andReturn(Scope.COMPOSITE);
         EasyMock.replay(container);
     }
 

Modified: incubator/tuscany/java/sca/services/containers/container.script/src/test/java/org/apache/tuscany/container/script/ScriptComponentTypeTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/services/containers/container.script/src/test/java/org/apache/tuscany/container/script/ScriptComponentTypeTestCase.java?view=diff&rev=488890&r1=488889&r2=488890
==============================================================================
--- incubator/tuscany/java/sca/services/containers/container.script/src/test/java/org/apache/tuscany/container/script/ScriptComponentTypeTestCase.java (original)
+++ incubator/tuscany/java/sca/services/containers/container.script/src/test/java/org/apache/tuscany/container/script/ScriptComponentTypeTestCase.java Tue Dec 19 18:36:22 2006
@@ -26,7 +26,7 @@
 
     public void testLifecycleScope() {
         ScriptComponentType ct = new ScriptComponentType();
-        assertEquals(Scope.MODULE, ct.getLifecycleScope());
+        assertEquals(Scope.COMPOSITE, ct.getLifecycleScope());
         ct.setLifecycleScope(Scope.SYSTEM);
         assertEquals(Scope.SYSTEM, ct.getLifecycleScope());
     }



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