You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by jm...@apache.org on 2006/12/20 04:39:39 UTC
svn commit: r488903 - in /incubator/tuscany/java/sca:
kernel/core/src/main/java/org/apache/tuscany/core/bootstrap/
kernel/core/src/main/java/org/apache/tuscany/core/builder/
kernel/core/src/main/java/org/apache/tuscany/core/component/event/
kernel/core...
Author: jmarino
Date: Tue Dec 19 19:39:37 2006
New Revision: 488903
URL: http://svn.apache.org/viewvc?view=rev&rev=488903
Log:
rename module references to composite
Added:
incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/component/scope/BasicCompositeScopeTestCase.java (contents, props changed)
- copied, changed from r488899, incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/component/scope/BasicModuleScopeTestCase.java
incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/component/scope/CompositeScopeInitDestroyErrorTestCase.java (contents, props changed)
- copied, changed from r488899, incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/component/scope/ModuleScopeInitDestroyErrorTestCase.java
incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/component/scope/CompositeScopeInstanceLifecycleTestCase.java (contents, props changed)
- copied, changed from r488899, incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/component/scope/ModuleScopeInstanceLifecycleTestCase.java
incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/component/scope/CompositeScopeObjectFactoryTestCase.java (contents, props changed)
- copied, changed from r488899, incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/component/scope/ModuleScopeObjectFactoryTestCase.java
incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/component/scope/CompositeScopeRestartTestCase.java (contents, props changed)
- copied, changed from r488899, incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/component/scope/ModuleScopeRestartTestCase.java
incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/mock/component/CompositeScopeComponent.java (contents, props changed)
- copied, changed from r488890, 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/CompositeScopeComponentImpl.java (contents, props changed)
- copied, changed from r488890, 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/CompositeScopeDestroyOnlyComponent.java (contents, props changed)
- copied, changed from r488784, incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/mock/component/ModuleScopeDestroyOnlyComponent.java
incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/mock/component/CompositeScopeEagerInitComponent.java (contents, props changed)
- copied, changed from r488784, incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/mock/component/ModuleScopeEagerInitComponent.java
incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/mock/component/CompositeScopeEagerInitDestroyComponent.java (contents, props changed)
- copied, changed from r488784, incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/mock/component/ModuleScopeEagerInitDestroyComponent.java
incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/mock/component/CompositeScopeInitDestroyComponent.java (contents, props changed)
- copied, changed from r488784, incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/mock/component/ModuleScopeInitDestroyComponent.java
incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/mock/component/CompositeScopeInitOnlyComponent.java (contents, props changed)
- copied, changed from r488784, incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/mock/component/ModuleScopeInitOnlyComponent.java
Removed:
incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/component/scope/BasicModuleScopeTestCase.java
incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/component/scope/ModuleScopeInitDestroyErrorTestCase.java
incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/component/scope/ModuleScopeInstanceLifecycleTestCase.java
incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/component/scope/ModuleScopeObjectFactoryTestCase.java
incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/component/scope/ModuleScopeRestartTestCase.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/ModuleScopeDestroyOnlyComponent.java
incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/mock/component/ModuleScopeEagerInitComponent.java
incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/mock/component/ModuleScopeEagerInitDestroyComponent.java
incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/mock/component/ModuleScopeInitDestroyComponent.java
incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/mock/component/ModuleScopeInitOnlyComponent.java
Modified:
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/bootstrap/DefaultBootstrapper.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/event/CompositeStart.java
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/component/event/CompositeStop.java
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/component/scope/CompositeScopeObjectFactory.java
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/deployer/DeployerImpl.java
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/deployer/RootDeploymentContext.java
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/composite/AbstractCompositeComponent.java
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/launcher/LauncherImpl.java
incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/component/scope/BasicConversationalScopeTestCase.java
incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/component/scope/BasicStatelessScopeTestCase.java
incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/component/scope/DependencyLifecycleTestCase.java
incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/component/scope/HttpSessionScopeInstanceLifecycleTestCase.java
incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/component/scope/RequestScopeInstanceLifecycleTestCase.java
incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/java/JavaAtomicComponentMetadataInjectionTestCase.java
incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/java/JavaAtomicComponentNegativeMetadataTestCase.java
incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/java/integration/OutboundWireToJavaTestCase.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/integration/scope/ScopeReferenceTestCase.java
incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/mock/component/BadContextPojo.java
incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/Lifecycle.java
incubator/tuscany/java/sca/kernel/spi/src/test/java/org/apache/tuscany/spi/model/ScopeTestCase.java
incubator/tuscany/java/sca/services/containers/container.groovy/src/main/java/org/apache/tuscany/container/groovy/GroovyComponentTypeLoader.java
incubator/tuscany/java/sca/services/persistence/openjpa/src/main/java/org/apache/tuscany/service/openjpa/JPAComponentBuilder.java
Modified: incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/bootstrap/DefaultBootstrapper.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/bootstrap/DefaultBootstrapper.java?view=diff&rev=488903&r1=488902&r2=488903
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/bootstrap/DefaultBootstrapper.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/bootstrap/DefaultBootstrapper.java Tue Dec 19 19:39:37 2006
@@ -142,7 +142,7 @@
/**
* Create a basic ScopeRegistry containing the ScopeContainers that are available to components in the system
- * definition. The implementation returned only support MODULE scope.
+ * definition. The implementation returned only support COMPOSITE scope.
*
* @param workContext the WorkContext the scopes should use
* @return a new 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=488903&r1=488902&r2=488903
==============================================================================
--- 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 19:39:37 2006
@@ -582,7 +582,7 @@
} else if (pReferrer == Scope.SESSION && pReferee == Scope.SYSTEM) {
return true;
} else if (pReferrer == Scope.SYSTEM && pReferee == Scope.COMPOSITE) {
- // case where a service context points to a module scoped component
+ // case where a service context points to a composite scoped component
return true;
} else {
return pReferrer == Scope.COMPOSITE && pReferee == Scope.SYSTEM;
Modified: incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/component/event/CompositeStart.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/component/event/CompositeStart.java?view=diff&rev=488903&r1=488902&r2=488903
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/component/event/CompositeStart.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/component/event/CompositeStart.java Tue Dec 19 19:39:37 2006
@@ -30,10 +30,10 @@
private CompositeComponent component;
/**
- * Creates a module stop event
+ * Creates a composite stop event
*
* @param source the source of the event
- * @param component the composite component associated the module being stopped
+ * @param component the composite component associated the composite being stopped
*/
public CompositeStart(Object source, CompositeComponent component) {
super(source);
Modified: incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/component/event/CompositeStop.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/component/event/CompositeStop.java?view=diff&rev=488903&r1=488902&r2=488903
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/component/event/CompositeStop.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/component/event/CompositeStop.java Tue Dec 19 19:39:37 2006
@@ -30,10 +30,10 @@
private CompositeComponent component;
/**
- * Creates a module stop event
+ * Creates a composite stop event
*
* @param source the source of the event
- * @param component the composite component associated the module being stopped
+ * @param component the composite component associated the composite being stopped
*/
public CompositeStop(Object source, CompositeComponent component) {
super(source);
Modified: incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/component/scope/CompositeScopeObjectFactory.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/component/scope/CompositeScopeObjectFactory.java?view=diff&rev=488903&r1=488902&r2=488903
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/component/scope/CompositeScopeObjectFactory.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/component/scope/CompositeScopeObjectFactory.java Tue Dec 19 19:39:37 2006
@@ -30,7 +30,7 @@
import org.apache.tuscany.api.annotation.Monitor;
/**
- * Creates a new module scope context
+ * Creates a new composite scope context
*
* @version $$Rev$$ $$Date$$
*/
Modified: incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/deployer/DeployerImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/deployer/DeployerImpl.java?view=diff&rev=488903&r1=488902&r2=488903
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/deployer/DeployerImpl.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/deployer/DeployerImpl.java Tue Dec 19 19:39:37 2006
@@ -82,8 +82,8 @@
public <I extends Implementation<?>> Component deploy(CompositeComponent parent,
ComponentDefinition<I> componentDefinition)
throws LoaderException, BuilderException, PrepareException {
- ScopeContainer moduleScope = new CompositeScopeContainer(monitor);
- DeploymentContext deploymentContext = new RootDeploymentContext(null, xmlFactory, moduleScope, null);
+ ScopeContainer scopeContainer = new CompositeScopeContainer(monitor);
+ DeploymentContext deploymentContext = new RootDeploymentContext(null, xmlFactory, scopeContainer, null);
try {
load(parent, componentDefinition, deploymentContext);
} catch (LoaderException e) {
@@ -93,7 +93,7 @@
Component component = (Component) build(parent, componentDefinition, deploymentContext);
if (component instanceof CompositeComponent) {
CompositeComponent composite = (CompositeComponent) component;
- composite.setScopeContainer(moduleScope);
+ composite.setScopeContainer(scopeContainer);
}
component.prepare();
try {
Modified: incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/deployer/RootDeploymentContext.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/deployer/RootDeploymentContext.java?view=diff&rev=488903&r1=488902&r2=488903
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/deployer/RootDeploymentContext.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/deployer/RootDeploymentContext.java Tue Dec 19 19:39:37 2006
@@ -32,23 +32,23 @@
*/
public class RootDeploymentContext extends AbstractDeploymentContext {
private final XMLInputFactory xmlFactory;
- private final ScopeContainer moduleScope;
+ private final ScopeContainer scopeContainer;
/**
* Constructor specifying the loader for application resources.
*
- * @param classLoader the loader for application resources
- * @param xmlFactory a factory that can be used to obtain an StAX XMLStreamReader
- * @param moduleScope the scope context representing this deployment's MODULE scope
- * @param scdlLocation the location of the SCDL being deployed
+ * @param classLoader the loader for application resources
+ * @param xmlFactory a factory that can be used to obtain an StAX XMLStreamReader
+ * @param scopeContainer the scope context representing this deployment's COMPOSITE scope
+ * @param scdlLocation the location of the SCDL being deployed
*/
public RootDeploymentContext(ClassLoader classLoader,
XMLInputFactory xmlFactory,
- ScopeContainer moduleScope,
+ ScopeContainer scopeContainer,
URL scdlLocation) {
super(classLoader, scdlLocation);
this.xmlFactory = xmlFactory;
- this.moduleScope = moduleScope;
+ this.scopeContainer = scopeContainer;
}
public DeploymentContext getParent() {
@@ -60,6 +60,6 @@
}
public ScopeContainer getCompositeScope() {
- return moduleScope;
+ return scopeContainer;
}
}
Modified: incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/composite/AbstractCompositeComponent.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/composite/AbstractCompositeComponent.java?view=diff&rev=488903&r1=488902&r2=488903
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/composite/AbstractCompositeComponent.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/composite/AbstractCompositeComponent.java Tue Dec 19 19:39:37 2006
@@ -50,12 +50,12 @@
public static final int DEFAULT_WAIT = 1000 * 60;
- // Blocking latch to ensure the module is initialized exactly once prior to servicing requests
+ // Blocking latch to ensure the composite is initialized exactly once prior to servicing requests
protected CountDownLatch initializeLatch = new CountDownLatch(1);
protected final Object lock = new Object();
- // Indicates whether the module context has been initialized
+ // Indicates whether the composite context has been initialized
protected boolean initialized;
protected ScopeContainer scopeContainer;
@@ -151,12 +151,12 @@
}
/**
- * Blocks until the module context has been initialized
+ * Blocks until the composite context has been initialized
*/
protected void checkInit() throws ComponentTimeoutException {
if (!initialized) {
try {
- /* block until the module has initialized */
+ /* block until the composite has initialized */
boolean success = initializeLatch.await(AbstractCompositeComponent.DEFAULT_WAIT,
TimeUnit.MILLISECONDS);
if (!success) {
Modified: incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/launcher/LauncherImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/launcher/LauncherImpl.java?view=diff&rev=488903&r1=488902&r2=488903
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/launcher/LauncherImpl.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/launcher/LauncherImpl.java Tue Dec 19 19:39:37 2006
@@ -99,12 +99,12 @@
}
parent.start();
// create a ComponentDefinition to represent the component we are going to deploy
- SystemCompositeImplementation moduleImplementation = new SystemCompositeImplementation();
- moduleImplementation.setScdlLocation(systemScdl);
- moduleImplementation.setClassLoader(systemClassLoader);
+ SystemCompositeImplementation compositeImplementation = new SystemCompositeImplementation();
+ compositeImplementation.setScdlLocation(systemScdl);
+ compositeImplementation.setClassLoader(systemClassLoader);
ComponentDefinition<SystemCompositeImplementation> definition =
new ComponentDefinition<SystemCompositeImplementation>(
- ComponentNames.TUSCANY_SYSTEM, moduleImplementation);
+ ComponentNames.TUSCANY_SYSTEM, compositeImplementation);
try {
// deploy the component into the runtime under the system parent
composite = (CompositeComponent) bootDeployer.deploy(parent, definition);
@@ -192,7 +192,7 @@
CompositeImplementation impl = new CompositeImplementation();
impl.setScdlLocation(appScdl);
impl.setClassLoader(applicationLoader);
- ComponentDefinition<CompositeImplementation> moduleDefinition =
+ ComponentDefinition<CompositeImplementation> definition =
new ComponentDefinition<CompositeImplementation>(name, impl);
// deploy the component into the runtime under the system parent
@@ -203,7 +203,7 @@
try {
Thread.currentThread().setContextClassLoader(getClass().getClassLoader());
- return (CompositeComponent) deployer.deploy(parent, moduleDefinition);
+ return (CompositeComponent) deployer.deploy(parent, definition);
} finally {
Thread.currentThread().setContextClassLoader(ccl);
}
Copied: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/component/scope/BasicCompositeScopeTestCase.java (from r488899, incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/component/scope/BasicModuleScopeTestCase.java)
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/component/scope/BasicCompositeScopeTestCase.java?view=diff&rev=488903&p1=incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/component/scope/BasicModuleScopeTestCase.java&r1=488899&p2=incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/component/scope/BasicCompositeScopeTestCase.java&r2=488903
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/component/scope/BasicModuleScopeTestCase.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/component/scope/BasicCompositeScopeTestCase.java Tue Dec 19 19:39:37 2006
@@ -21,39 +21,36 @@
import org.apache.tuscany.spi.component.ScopeContainer;
import org.apache.tuscany.spi.component.SystemAtomicComponent;
import org.apache.tuscany.spi.component.TargetNotFoundException;
-import org.apache.tuscany.spi.component.WorkContext;
import junit.framework.TestCase;
-import org.apache.tuscany.core.component.WorkContextImpl;
import org.apache.tuscany.core.component.event.CompositeStop;
import org.apache.tuscany.core.implementation.PojoConfiguration;
import org.apache.tuscany.core.implementation.system.component.SystemAtomicComponentImpl;
import org.apache.tuscany.core.injection.EventInvoker;
import org.apache.tuscany.core.injection.MethodEventInvoker;
import org.apache.tuscany.core.injection.PojoObjectFactory;
-import org.apache.tuscany.core.mock.component.ModuleScopeInitDestroyComponent;
+import org.apache.tuscany.core.mock.component.CompositeScopeInitDestroyComponent;
/**
* @version $$Rev$$ $$Date$$
*/
-public class BasicModuleScopeTestCase extends TestCase {
+public class BasicCompositeScopeTestCase extends TestCase {
private EventInvoker<Object> initInvoker;
private EventInvoker<Object> destroyInvoker;
private PojoObjectFactory<?> factory;
public void testLifecycleManagement() throws Exception {
- WorkContext workContext = new WorkContextImpl();
CompositeScopeContainer scopeContext = new CompositeScopeContainer(null);
scopeContext.start();
SystemAtomicComponent component = createComponent(scopeContext);
// start the request
- ModuleScopeInitDestroyComponent o1 =
- (ModuleScopeInitDestroyComponent) scopeContext.getInstance(component);
+ CompositeScopeInitDestroyComponent o1 =
+ (CompositeScopeInitDestroyComponent) scopeContext.getInstance(component);
assertTrue(o1.isInitialized());
assertFalse(o1.isDestroyed());
- ModuleScopeInitDestroyComponent o2 =
- (ModuleScopeInitDestroyComponent) scopeContext.getInstance(component);
+ CompositeScopeInitDestroyComponent o2 =
+ (CompositeScopeInitDestroyComponent) scopeContext.getInstance(component);
assertEquals(o1, o2);
scopeContext.onEvent(new CompositeStop(this, null));
assertTrue(o1.isDestroyed());
@@ -62,7 +59,6 @@
public void testGetAssociatedInstance() throws Exception {
- WorkContext workContext = new WorkContextImpl();
CompositeScopeContainer scopeContext = new CompositeScopeContainer(null);
scopeContext.start();
SystemAtomicComponent component = createComponent(scopeContext);
@@ -72,7 +68,6 @@
}
public void testGetAssociatedInstanceNonExistent() throws Exception {
- WorkContext workContext = new WorkContextImpl();
CompositeScopeContainer scopeContext = new CompositeScopeContainer(null);
scopeContext.start();
SystemAtomicComponent component = createComponent(scopeContext);
@@ -85,20 +80,19 @@
}
}
- public void testModuleIsolation() throws Exception {
- WorkContext workContext = new WorkContextImpl();
+ public void testCompositeIsolation() throws Exception {
CompositeScopeContainer scopeContext = new CompositeScopeContainer(null);
scopeContext.start();
SystemAtomicComponent component = createComponent(scopeContext);
- ModuleScopeInitDestroyComponent o1 =
- (ModuleScopeInitDestroyComponent) scopeContext.getInstance(component);
+ CompositeScopeInitDestroyComponent o1 =
+ (CompositeScopeInitDestroyComponent) scopeContext.getInstance(component);
assertTrue(o1.isInitialized());
assertFalse(o1.isDestroyed());
- ModuleScopeInitDestroyComponent o2 =
- (ModuleScopeInitDestroyComponent) scopeContext.getInstance(component);
+ CompositeScopeInitDestroyComponent o2 =
+ (CompositeScopeInitDestroyComponent) scopeContext.getInstance(component);
assertSame(o1, o2);
scopeContext.onEvent(new CompositeStop(this, null));
assertTrue(o1.isDestroyed());
@@ -107,11 +101,11 @@
protected void setUp() throws Exception {
super.setUp();
- factory = new PojoObjectFactory<ModuleScopeInitDestroyComponent>(
- ModuleScopeInitDestroyComponent.class.getConstructor((Class[]) null));
- initInvoker = new MethodEventInvoker<Object>(ModuleScopeInitDestroyComponent.class.getMethod(
+ factory = new PojoObjectFactory<CompositeScopeInitDestroyComponent>(
+ CompositeScopeInitDestroyComponent.class.getConstructor((Class[]) null));
+ initInvoker = new MethodEventInvoker<Object>(CompositeScopeInitDestroyComponent.class.getMethod(
"init", (Class[]) null));
- destroyInvoker = new MethodEventInvoker<Object>(ModuleScopeInitDestroyComponent.class.getMethod(
+ destroyInvoker = new MethodEventInvoker<Object>(CompositeScopeInitDestroyComponent.class.getMethod(
"destroy", (Class[]) null));
}
@@ -122,7 +116,7 @@
private SystemAtomicComponent createComponent(ScopeContainer scopeContainer) {
PojoConfiguration configuration = new PojoConfiguration();
configuration.setScopeContainer(scopeContainer);
- configuration.addServiceInterface(ModuleScopeInitDestroyComponent.class);
+ configuration.addServiceInterface(CompositeScopeInitDestroyComponent.class);
configuration.setInstanceFactory(factory);
configuration.setInitInvoker(initInvoker);
configuration.setDestroyInvoker(destroyInvoker);
Propchange: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/component/scope/BasicCompositeScopeTestCase.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/component/scope/BasicCompositeScopeTestCase.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Modified: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/component/scope/BasicConversationalScopeTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/component/scope/BasicConversationalScopeTestCase.java?view=diff&rev=488903&r1=488902&r2=488903
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/component/scope/BasicConversationalScopeTestCase.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/component/scope/BasicConversationalScopeTestCase.java Tue Dec 19 19:39:37 2006
@@ -69,7 +69,7 @@
scopeContext.stop();
}
- public void testModuleIsolation() throws Exception {
+ public void testCompositeIsolation() throws Exception {
StoreMonitor monitor = EasyMock.createMock(StoreMonitor.class);
monitor.start(EasyMock.isA(String.class));
monitor.stop(EasyMock.isA(String.class));
Modified: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/component/scope/BasicStatelessScopeTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/component/scope/BasicStatelessScopeTestCase.java?view=diff&rev=488903&r1=488902&r2=488903
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/component/scope/BasicStatelessScopeTestCase.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/component/scope/BasicStatelessScopeTestCase.java Tue Dec 19 19:39:37 2006
@@ -34,7 +34,7 @@
import org.apache.tuscany.core.mock.component.StatelessComponentImpl;
/**
- * Unit tests for the module scope container
+ * Unit tests for the composite scope container
*
* @version $Rev$ $Date$
*/
Copied: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/component/scope/CompositeScopeInitDestroyErrorTestCase.java (from r488899, incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/component/scope/ModuleScopeInitDestroyErrorTestCase.java)
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/component/scope/CompositeScopeInitDestroyErrorTestCase.java?view=diff&rev=488903&p1=incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/component/scope/ModuleScopeInitDestroyErrorTestCase.java&r1=488899&p2=incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/component/scope/CompositeScopeInitDestroyErrorTestCase.java&r2=488903
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/component/scope/ModuleScopeInitDestroyErrorTestCase.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/component/scope/CompositeScopeInitDestroyErrorTestCase.java Tue Dec 19 19:39:37 2006
@@ -34,7 +34,7 @@
/**
* @version $Rev$ $Date$
*/
-public class ModuleScopeInitDestroyErrorTestCase extends TestCase {
+public class CompositeScopeInitDestroyErrorTestCase extends TestCase {
public void testInitializeErrorMonitor() throws Exception {
ScopeContainerMonitor monitor;
Propchange: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/component/scope/CompositeScopeInitDestroyErrorTestCase.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/component/scope/CompositeScopeInitDestroyErrorTestCase.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Copied: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/component/scope/CompositeScopeInstanceLifecycleTestCase.java (from r488899, incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/component/scope/ModuleScopeInstanceLifecycleTestCase.java)
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/component/scope/CompositeScopeInstanceLifecycleTestCase.java?view=diff&rev=488903&p1=incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/component/scope/ModuleScopeInstanceLifecycleTestCase.java&r1=488899&p2=incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/component/scope/CompositeScopeInstanceLifecycleTestCase.java&r2=488903
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/component/scope/ModuleScopeInstanceLifecycleTestCase.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/component/scope/CompositeScopeInstanceLifecycleTestCase.java Tue Dec 19 19:39:37 2006
@@ -20,11 +20,9 @@
import org.apache.tuscany.spi.component.SystemAtomicComponent;
-import org.apache.tuscany.spi.component.WorkContext;
import org.apache.tuscany.spi.component.TargetException;
import junit.framework.TestCase;
-import org.apache.tuscany.core.component.WorkContextImpl;
import org.apache.tuscany.core.component.event.CompositeStart;
import org.apache.tuscany.core.component.event.CompositeStop;
import org.apache.tuscany.core.mock.component.OrderedInitPojo;
@@ -33,11 +31,11 @@
import org.easymock.IAnswer;
/**
- * Lifecycle unit tests for the module scope container
+ * Lifecycle unit tests for the composite scope container
*
* @version $Rev$ $Date$
*/
-public class ModuleScopeInstanceLifecycleTestCase extends TestCase {
+public class CompositeScopeInstanceLifecycleTestCase extends TestCase {
/**
* Verify init and stop by scope container on an atomic component
@@ -45,7 +43,6 @@
* @throws Exception
*/
public void testInitDestroy() throws Exception {
- WorkContext ctx = new WorkContextImpl();
CompositeScopeContainer scope = new CompositeScopeContainer(null);
scope.start();
Foo comp = new Foo();
@@ -58,7 +55,7 @@
scope.register(component);
scope.onEvent(new CompositeStart(this, null));
assertNotNull(scope.getInstance(component));
- // expire module
+ // expire composite
scope.onEvent(new CompositeStop(this, null));
scope.stop();
EasyMock.verify(component);
@@ -70,7 +67,6 @@
* @throws Exception
*/
public void testEagerInitDestroy() throws Exception {
- WorkContext ctx = new WorkContextImpl();
CompositeScopeContainer scope = new CompositeScopeContainer(null);
scope.start();
Foo comp = new Foo();
@@ -82,7 +78,7 @@
EasyMock.replay(initDestroyComponent);
scope.register(initDestroyComponent);
scope.onEvent(new CompositeStart(this, null));
- // expire module
+ // expire composite
scope.onEvent(new CompositeStop(this, null));
scope.stop();
EasyMock.verify(initDestroyComponent);
@@ -90,7 +86,6 @@
public void testDestroyOrder() throws Exception {
- WorkContext ctx = new WorkContextImpl();
CompositeScopeContainer scope = new CompositeScopeContainer(null);
scope.start();
@@ -117,7 +112,7 @@
assertEquals(3, three.getNumberInstantiated());
assertEquals(3, three.getInitOrder());
- // expire module
+ // expire composite
scope.onEvent(new CompositeStop(this, null));
assertEquals(0, one.getNumberInstantiated());
scope.stop();
@@ -127,7 +122,6 @@
}
public void testEagerInitDestroyOrder() throws Exception {
- WorkContext ctx = new WorkContextImpl();
CompositeScopeContainer scope = new CompositeScopeContainer(null);
scope.start();
@@ -148,7 +142,7 @@
OrderedInitPojo three = (OrderedInitPojo) scope.getInstance(threeComponent);
assertNotNull(three);
- // expire module
+ // expire composite
scope.onEvent(new CompositeStop(this, null));
assertEquals(0, one.getNumberInstantiated());
scope.stop();
Propchange: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/component/scope/CompositeScopeInstanceLifecycleTestCase.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/component/scope/CompositeScopeInstanceLifecycleTestCase.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Copied: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/component/scope/CompositeScopeObjectFactoryTestCase.java (from r488899, incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/component/scope/ModuleScopeObjectFactoryTestCase.java)
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/component/scope/CompositeScopeObjectFactoryTestCase.java?view=diff&rev=488903&p1=incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/component/scope/ModuleScopeObjectFactoryTestCase.java&r1=488899&p2=incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/component/scope/CompositeScopeObjectFactoryTestCase.java&r2=488903
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/component/scope/ModuleScopeObjectFactoryTestCase.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/component/scope/CompositeScopeObjectFactoryTestCase.java Tue Dec 19 19:39:37 2006
@@ -27,7 +27,7 @@
/**
* @version $Rev$ $Date$
*/
-public class ModuleScopeObjectFactoryTestCase extends TestCase {
+public class CompositeScopeObjectFactoryTestCase extends TestCase {
public void testCreation() {
ScopeRegistry registry = EasyMock.createMock(ScopeRegistry.class);
Propchange: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/component/scope/CompositeScopeObjectFactoryTestCase.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/component/scope/CompositeScopeObjectFactoryTestCase.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Copied: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/component/scope/CompositeScopeRestartTestCase.java (from r488899, incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/component/scope/ModuleScopeRestartTestCase.java)
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/component/scope/CompositeScopeRestartTestCase.java?view=diff&rev=488903&p1=incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/component/scope/ModuleScopeRestartTestCase.java&r1=488899&p2=incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/component/scope/CompositeScopeRestartTestCase.java&r2=488903
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/component/scope/ModuleScopeRestartTestCase.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/component/scope/CompositeScopeRestartTestCase.java Tue Dec 19 19:39:37 2006
@@ -20,14 +20,12 @@
import java.lang.reflect.Constructor;
-import org.apache.tuscany.spi.component.WorkContext;
+import org.apache.tuscany.spi.component.SystemAtomicComponent;
import junit.framework.TestCase;
-import org.apache.tuscany.core.component.WorkContextImpl;
import org.apache.tuscany.core.component.event.CompositeStart;
import org.apache.tuscany.core.component.event.CompositeStop;
import org.apache.tuscany.core.implementation.PojoConfiguration;
-import org.apache.tuscany.spi.component.SystemAtomicComponent;
import org.apache.tuscany.core.implementation.system.component.SystemAtomicComponentImpl;
import org.apache.tuscany.core.injection.MethodEventInvoker;
import org.apache.tuscany.core.injection.PojoObjectFactory;
@@ -37,10 +35,9 @@
*
* @version $$Rev$$ $$Date$$
*/
-public class ModuleScopeRestartTestCase extends TestCase {
+public class CompositeScopeRestartTestCase extends TestCase {
public void testRestart() throws Exception {
- WorkContext ctx = new WorkContextImpl();
CompositeScopeContainer scope = new CompositeScopeContainer(null);
scope.start();
MethodEventInvoker<Object> initInvoker =
Propchange: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/component/scope/CompositeScopeRestartTestCase.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/component/scope/CompositeScopeRestartTestCase.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Modified: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/component/scope/DependencyLifecycleTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/component/scope/DependencyLifecycleTestCase.java?view=diff&rev=488903&r1=488902&r2=488903
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/component/scope/DependencyLifecycleTestCase.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/component/scope/DependencyLifecycleTestCase.java Tue Dec 19 19:39:37 2006
@@ -43,8 +43,7 @@
*/
public class DependencyLifecycleTestCase extends TestCase {
- public void testInitDestroyOrderModuleScope() throws Exception {
- WorkContext ctx = new WorkContextImpl();
+ public void testInitDestroyOrderCompositeScope() throws Exception {
CompositeScopeContainer scopeCtx = new CompositeScopeContainer(null);
scopeCtx.start();
Map<String, AtomicComponent> contexts = MockFactory.createWiredComponents("source",
@@ -71,8 +70,7 @@
scopeCtx.stop();
}
- public void testInitDestroyOrderAfterStartModuleScope() throws Exception {
- WorkContext ctx = new WorkContextImpl();
+ public void testInitDestroyOrderAfterStartCompositeScope() throws Exception {
CompositeScopeContainer scopeCtx = new CompositeScopeContainer(null);
scopeCtx.start();
Map<String, AtomicComponent> contexts = MockFactory.createWiredComponents("source",
Modified: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/component/scope/HttpSessionScopeInstanceLifecycleTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/component/scope/HttpSessionScopeInstanceLifecycleTestCase.java?view=diff&rev=488903&r1=488902&r2=488903
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/component/scope/HttpSessionScopeInstanceLifecycleTestCase.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/component/scope/HttpSessionScopeInstanceLifecycleTestCase.java Tue Dec 19 19:39:37 2006
@@ -34,7 +34,7 @@
import org.easymock.IAnswer;
/**
- * Lifecycle unit tests for the module scope container
+ * Lifecycle unit tests for the composite scope container
*
* @version $Rev$ $Date$
*/
Modified: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/component/scope/RequestScopeInstanceLifecycleTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/component/scope/RequestScopeInstanceLifecycleTestCase.java?view=diff&rev=488903&r1=488902&r2=488903
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/component/scope/RequestScopeInstanceLifecycleTestCase.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/component/scope/RequestScopeInstanceLifecycleTestCase.java Tue Dec 19 19:39:37 2006
@@ -32,7 +32,7 @@
import org.easymock.IAnswer;
/**
- * Lifecycle unit tests for the module scope container
+ * Lifecycle unit tests for the request scope container
*
* @version $Rev$ $Date$
*/
Modified: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/java/JavaAtomicComponentMetadataInjectionTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/java/JavaAtomicComponentMetadataInjectionTestCase.java?view=diff&rev=488903&r1=488902&r2=488903
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/java/JavaAtomicComponentMetadataInjectionTestCase.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/java/JavaAtomicComponentMetadataInjectionTestCase.java Tue Dec 19 19:39:37 2006
@@ -31,7 +31,7 @@
// TODO implement
}
- public void testModuleContextSet() throws Exception {
+ public void testCompositeContextSet() throws Exception {
// TODO implement
}
}
Modified: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/java/JavaAtomicComponentNegativeMetadataTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/java/JavaAtomicComponentNegativeMetadataTestCase.java?view=diff&rev=488903&r1=488902&r2=488903
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/java/JavaAtomicComponentNegativeMetadataTestCase.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/java/JavaAtomicComponentNegativeMetadataTestCase.java Tue Dec 19 19:39:37 2006
@@ -38,7 +38,7 @@
}
/**
- * Tests that a pojo with <code>@Context</code> specified on a non-ModuleContext type generates an error.
+ * Tests that a pojo with <code>@Context</code> specified on a non-CompositeContext type generates an error.
* <p/>
* <strong>NB:</strong> the test assumes an error with a message containing "@Context" is generated
*/
Modified: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/java/integration/OutboundWireToJavaTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/java/integration/OutboundWireToJavaTestCase.java?view=diff&rev=488903&r1=488902&r2=488903
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/java/integration/OutboundWireToJavaTestCase.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/java/integration/OutboundWireToJavaTestCase.java Tue Dec 19 19:39:37 2006
@@ -160,7 +160,7 @@
scope.stop();
}
- public void testToModuleScope() throws Exception {
+ public void testToCompositeScope() throws Exception {
CompositeScopeContainer scope = new CompositeScopeContainer(null);
scope.start();
scope.onEvent(new CompositeStart(this, null));
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=488903&r1=488902&r2=488903
==============================================================================
--- 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 19:39:37 2006
@@ -36,12 +36,12 @@
CompositeComponent parent;
- public void testModuleScope() throws ProcessingException {
+ public void testCompositeScope() throws ProcessingException {
ScopeProcessor processor = new ScopeProcessor();
PojoComponentType<JavaMappedService, JavaMappedReference, JavaMappedProperty<?>> type =
new PojoComponentType<JavaMappedService, JavaMappedReference, JavaMappedProperty<?>>();
- processor.visitClass(parent, Module.class, type, null);
+ processor.visitClass(parent, Composite.class, type, null);
assertEquals(Scope.COMPOSITE, type.getImplementationScope());
}
@@ -99,7 +99,7 @@
}
@org.osoa.sca.annotations.Scope("COMPOSITE")
- private class Module {
+ private class Composite {
}
@org.osoa.sca.annotations.Scope("SESSION")
Modified: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/integration/scope/ScopeReferenceTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/integration/scope/ScopeReferenceTestCase.java?view=diff&rev=488903&r1=488902&r2=488903
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/integration/scope/ScopeReferenceTestCase.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/integration/scope/ScopeReferenceTestCase.java Tue Dec 19 19:39:37 2006
@@ -41,8 +41,8 @@
import org.apache.tuscany.core.component.event.HttpSessionStart;
import org.apache.tuscany.core.component.event.RequestEnd;
import org.apache.tuscany.core.component.event.RequestStart;
-import org.apache.tuscany.core.component.scope.HttpSessionScopeContainer;
import org.apache.tuscany.core.component.scope.CompositeScopeContainer;
+import org.apache.tuscany.core.component.scope.HttpSessionScopeContainer;
import org.apache.tuscany.core.component.scope.RequestScopeContainer;
import org.apache.tuscany.core.component.scope.StatelessScopeContainer;
import org.apache.tuscany.core.integration.mock.MockFactory;
@@ -62,9 +62,9 @@
private Map<String, Member> members;
/**
- * Tests a module-to-module scoped wire
+ * Tests a composite-to-composite scoped wire
*/
- public void testModuleToModule() throws Exception {
+ public void testCompositeToComposite() throws Exception {
ScopeContainer scope = new CompositeScopeContainer(null);
scope.start();
@@ -85,18 +85,18 @@
}
/**
- * Tests a module-to-session scoped wire is setup properly by the runtime
+ * Tests a composite-to-session scoped wire is setup properly by the runtime
*/
- public void testModuleToSession() throws Exception {
+ public void testCompositeToSession() throws Exception {
WorkContext ctx = new WorkContextImpl();
- ScopeContainer moduleScope = new CompositeScopeContainer(null);
- moduleScope.start();
+ ScopeContainer compositeScope = new CompositeScopeContainer(null);
+ compositeScope.start();
ScopeContainer sessionScope = new HttpSessionScopeContainer(ctx, null);
sessionScope.start();
Map<String, AtomicComponent> contexts = MockFactory.createWiredComponents("source", SourceImpl.class,
- moduleScope, members, "target", Target.class, TargetImpl.class, sessionScope);
- moduleScope.onEvent(new CompositeStart(this, null));
+ compositeScope, members, "target", Target.class, TargetImpl.class, sessionScope);
+ compositeScope.onEvent(new CompositeStart(this, null));
Object session1 = new Object();
ctx.setIdentifier(Scope.SESSION, session1);
sessionScope.onEvent(new HttpSessionStart(this, session1));
@@ -127,24 +127,24 @@
sessionScope.onEvent(new HttpSessionEnd(this, session2));
ctx.clearIdentifier(Scope.SESSION);
- moduleScope.onEvent(new CompositeStop(this, null));
+ compositeScope.onEvent(new CompositeStop(this, null));
sessionScope.stop();
- moduleScope.stop();
+ compositeScope.stop();
}
/**
- * Tests a module-to-request scoped wire
+ * Tests a composite-to-request scoped wire
*/
- public void testModuleToRequest() throws Exception {
+ public void testCompositeToRequest() throws Exception {
WorkContext ctx = new WorkContextImpl();
- ScopeContainer moduleScope = new CompositeScopeContainer(null);
- moduleScope.start();
+ ScopeContainer compositeScope = new CompositeScopeContainer(null);
+ compositeScope.start();
final ScopeContainer requestScope = new RequestScopeContainer(ctx, null);
requestScope.start();
Map<String, AtomicComponent> contexts = MockFactory.createWiredComponents("source", SourceImpl.class,
- moduleScope, members, "target", Target.class, TargetImpl.class, requestScope);
- moduleScope.onEvent(new CompositeStart(this, null));
+ compositeScope, members, "target", Target.class, TargetImpl.class, requestScope);
+ compositeScope.onEvent(new CompositeStart(this, null));
requestScope.onEvent(new RequestStart(this));
AtomicComponent sourceComponent = contexts.get("source");
@@ -180,24 +180,24 @@
future.get();
assertEquals("foo", source.getTarget().getString());
requestScope.onEvent(new RequestEnd(this));
- moduleScope.onEvent(new CompositeStop(this, null));
+ compositeScope.onEvent(new CompositeStop(this, null));
requestScope.stop();
- moduleScope.stop();
+ compositeScope.stop();
}
/**
- * Tests a module-to-stateless scoped wire is setup properly by the runtime
+ * Tests a composite-to-stateless scoped wire is setup properly by the runtime
*/
- public void testModuleToStateless() throws Exception {
+ public void testCompositeToStateless() throws Exception {
WorkContext ctx = new WorkContextImpl();
- ScopeContainer moduleScope = new CompositeScopeContainer(null);
- moduleScope.start();
+ ScopeContainer compositeScope = new CompositeScopeContainer(null);
+ compositeScope.start();
ScopeContainer statelessScope = new StatelessScopeContainer(ctx, null);
statelessScope.start();
Map<String, AtomicComponent> contexts = MockFactory.createWiredComponents("source", SourceImpl.class,
- moduleScope, members, "target", Target.class, TargetImpl.class, statelessScope);
- moduleScope.onEvent(new CompositeStart(this, null));
+ compositeScope, members, "target", Target.class, TargetImpl.class, statelessScope);
+ compositeScope.onEvent(new CompositeStart(this, null));
AtomicComponent sourceComponent = contexts.get("source");
AtomicComponent targetComponent = contexts.get("target");
@@ -212,8 +212,8 @@
assertFalse("foo".equals(target2.getString()));
source.getTarget().setString("bar");
assertFalse("bar".equals(source.getTarget().getString()));
- moduleScope.onEvent(new CompositeStop(this, null));
- moduleScope.stop();
+ compositeScope.onEvent(new CompositeStop(this, null));
+ compositeScope.stop();
statelessScope.stop();
}
@@ -265,18 +265,18 @@
/**
- * Tests a session-to-module scoped wire
+ * Tests a session-to-composite scoped wire
*/
- public void testSessionToModule() throws Exception {
+ public void testSessionToComposite() throws Exception {
WorkContext ctx = new WorkContextImpl();
- ScopeContainer moduleScope = new CompositeScopeContainer(null);
- moduleScope.start();
+ ScopeContainer compositeScope = new CompositeScopeContainer(null);
+ compositeScope.start();
ScopeContainer sessionScope = new HttpSessionScopeContainer(ctx, null);
sessionScope.start();
Map<String, AtomicComponent> contexts = MockFactory.createWiredComponents("source", SourceImpl.class,
- sessionScope, members, "target", Target.class, TargetImpl.class, moduleScope);
- moduleScope.onEvent(new CompositeStart(this, null));
+ sessionScope, members, "target", Target.class, TargetImpl.class, compositeScope);
+ compositeScope.onEvent(new CompositeStart(this, null));
Object session1 = new Object();
ctx.setIdentifier(Scope.SESSION, session1);
sessionScope.onEvent(new HttpSessionStart(this, session1));
@@ -307,7 +307,7 @@
assertEquals("baz", target.getString());
ctx.clearIdentifier(Scope.SESSION);
sessionScope.onEvent(new HttpSessionEnd(this, session2));
- moduleScope.stop();
+ compositeScope.stop();
sessionScope.stop();
}
@@ -454,18 +454,18 @@
}
/**
- * Tests a request-to-module scoped wire
+ * Tests a request-to-composite scoped wire
*/
- public void testRequestToModule() throws Exception {
+ public void testRequestToComposite() throws Exception {
WorkContext ctx = new WorkContextImpl();
final ScopeContainer requestScope = new RequestScopeContainer(ctx, null);
- final ScopeContainer moduleScope = new CompositeScopeContainer(null);
+ final ScopeContainer compositeScope = new CompositeScopeContainer(null);
requestScope.start();
- moduleScope.start();
- moduleScope.onEvent(new CompositeStart(this, null));
+ compositeScope.start();
+ compositeScope.onEvent(new CompositeStart(this, null));
Map<String, AtomicComponent> contexts = MockFactory.createWiredComponents("source", SourceImpl.class,
- requestScope, members, "target", Target.class, TargetImpl.class, moduleScope);
+ requestScope, members, "target", Target.class, TargetImpl.class, compositeScope);
requestScope.onEvent(new RequestStart(this));
final AtomicComponent sourceComponent = contexts.get("source");
@@ -505,8 +505,8 @@
requestScope.onEvent(new RequestEnd(this));
requestScope.stop();
- moduleScope.onEvent(new CompositeStop(this, null));
- moduleScope.stop();
+ compositeScope.onEvent(new CompositeStop(this, null));
+ compositeScope.stop();
}
/**
@@ -725,18 +725,18 @@
/**
- * Tests a stateless-to-module scoped wire is setup properly by the runtime
+ * Tests a stateless-to-composite scoped wire is setup properly by the runtime
*/
- public void testStatelessToModule() throws Exception {
+ public void testStatelessToComposite() throws Exception {
WorkContext ctx = new WorkContextImpl();
ScopeContainer statelessScope = new StatelessScopeContainer(ctx, null);
statelessScope.start();
- ScopeContainer moduleScope = new CompositeScopeContainer(null);
- moduleScope.start();
+ ScopeContainer compositeScope = new CompositeScopeContainer(null);
+ compositeScope.start();
Map<String, AtomicComponent> contexts = MockFactory.createWiredComponents("source", SourceImpl.class,
- statelessScope, members, "target", Target.class, TargetImpl.class, moduleScope);
- moduleScope.onEvent(new CompositeStart(this, null));
+ statelessScope, members, "target", Target.class, TargetImpl.class, compositeScope);
+ compositeScope.onEvent(new CompositeStart(this, null));
AtomicComponent sourceComponent = contexts.get("source");
AtomicComponent targetComponent = contexts.get("target");
Source source = (Source) sourceComponent.getServiceInstance();
@@ -750,7 +750,7 @@
//second session
Object session2 = new Object();
ctx.setIdentifier(Scope.SESSION, session2);
- moduleScope.onEvent(new HttpSessionStart(this, session2));
+ compositeScope.onEvent(new HttpSessionStart(this, session2));
Target target2 = (Target) targetComponent.getServiceInstance();
assertEquals("foo", target2.getString());
@@ -760,8 +760,8 @@
assertEquals("bar", target2.getString());
assertEquals("bar", source.getTarget().getString());
- moduleScope.onEvent(new CompositeStop(this, null));
- moduleScope.stop();
+ compositeScope.onEvent(new CompositeStop(this, null));
+ compositeScope.stop();
statelessScope.stop();
}
Modified: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/mock/component/BadContextPojo.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/mock/component/BadContextPojo.java?view=diff&rev=488903&r1=488902&r2=488903
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/mock/component/BadContextPojo.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/mock/component/BadContextPojo.java Tue Dec 19 19:39:37 2006
@@ -23,6 +23,6 @@
public class BadContextPojo {
@Context
- String moduleContext;
+ String context;
}
Copied: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/mock/component/CompositeScopeComponent.java (from r488890, 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/CompositeScopeComponent.java?view=diff&rev=488903&p1=incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/mock/component/ModuleScopeComponent.java&r1=488890&p2=incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/mock/component/CompositeScopeComponent.java&r2=488903
==============================================================================
--- 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/CompositeScopeComponent.java Tue Dec 19 19:39:37 2006
@@ -24,7 +24,7 @@
* @version $Rev$ $Date$
*/
@Scope("COMPOSITE")
-public interface ModuleScopeComponent {
+public interface CompositeScopeComponent {
//public boolean isInit();
}
Propchange: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/mock/component/CompositeScopeComponent.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/mock/component/CompositeScopeComponent.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Copied: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/mock/component/CompositeScopeComponentImpl.java (from r488890, 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/CompositeScopeComponentImpl.java?view=diff&rev=488903&p1=incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/mock/component/ModuleScopeComponentImpl.java&r1=488890&p2=incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/mock/component/CompositeScopeComponentImpl.java&r2=488903
==============================================================================
--- 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/CompositeScopeComponentImpl.java Tue Dec 19 19:39:37 2006
@@ -25,8 +25,8 @@
* @version $Rev$ $Date$
*/
@Scope("COMPOSITE")
-public class ModuleScopeComponentImpl implements
- ModuleScopeComponent {
+public class CompositeScopeComponentImpl implements
+ CompositeScopeComponent {
private String foo;
Propchange: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/mock/component/CompositeScopeComponentImpl.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/mock/component/CompositeScopeComponentImpl.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Copied: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/mock/component/CompositeScopeDestroyOnlyComponent.java (from r488784, incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/mock/component/ModuleScopeDestroyOnlyComponent.java)
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/mock/component/CompositeScopeDestroyOnlyComponent.java?view=diff&rev=488903&p1=incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/mock/component/ModuleScopeDestroyOnlyComponent.java&r1=488784&p2=incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/mock/component/CompositeScopeDestroyOnlyComponent.java&r2=488903
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/mock/component/ModuleScopeDestroyOnlyComponent.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/mock/component/CompositeScopeDestroyOnlyComponent.java Tue Dec 19 19:39:37 2006
@@ -20,7 +20,7 @@
import org.osoa.sca.annotations.Destroy;
-public class ModuleScopeDestroyOnlyComponent extends ModuleScopeComponentImpl {
+public class CompositeScopeDestroyOnlyComponent extends CompositeScopeComponentImpl {
boolean destroyed;
Propchange: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/mock/component/CompositeScopeDestroyOnlyComponent.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/mock/component/CompositeScopeDestroyOnlyComponent.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Copied: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/mock/component/CompositeScopeEagerInitComponent.java (from r488784, incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/mock/component/ModuleScopeEagerInitComponent.java)
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/mock/component/CompositeScopeEagerInitComponent.java?view=diff&rev=488903&p1=incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/mock/component/ModuleScopeEagerInitComponent.java&r1=488784&p2=incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/mock/component/CompositeScopeEagerInitComponent.java&r2=488903
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/mock/component/ModuleScopeEagerInitComponent.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/mock/component/CompositeScopeEagerInitComponent.java Tue Dec 19 19:39:37 2006
@@ -20,7 +20,7 @@
import org.osoa.sca.annotations.Init;
-public class ModuleScopeEagerInitComponent extends ModuleScopeComponentImpl {
+public class CompositeScopeEagerInitComponent extends CompositeScopeComponentImpl {
boolean initialized;
// this value tests to ensure introspection can find the init() method even
Propchange: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/mock/component/CompositeScopeEagerInitComponent.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/mock/component/CompositeScopeEagerInitComponent.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Copied: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/mock/component/CompositeScopeEagerInitDestroyComponent.java (from r488784, incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/mock/component/ModuleScopeEagerInitDestroyComponent.java)
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/mock/component/CompositeScopeEagerInitDestroyComponent.java?view=diff&rev=488903&p1=incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/mock/component/ModuleScopeEagerInitDestroyComponent.java&r1=488784&p2=incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/mock/component/CompositeScopeEagerInitDestroyComponent.java&r2=488903
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/mock/component/ModuleScopeEagerInitDestroyComponent.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/mock/component/CompositeScopeEagerInitDestroyComponent.java Tue Dec 19 19:39:37 2006
@@ -20,7 +20,7 @@
import org.osoa.sca.annotations.Destroy;
-public class ModuleScopeEagerInitDestroyComponent extends ModuleScopeEagerInitComponent {
+public class CompositeScopeEagerInitDestroyComponent extends CompositeScopeEagerInitComponent {
boolean destroyed;
Propchange: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/mock/component/CompositeScopeEagerInitDestroyComponent.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/mock/component/CompositeScopeEagerInitDestroyComponent.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Copied: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/mock/component/CompositeScopeInitDestroyComponent.java (from r488784, incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/mock/component/ModuleScopeInitDestroyComponent.java)
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/mock/component/CompositeScopeInitDestroyComponent.java?view=diff&rev=488903&p1=incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/mock/component/ModuleScopeInitDestroyComponent.java&r1=488784&p2=incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/mock/component/CompositeScopeInitDestroyComponent.java&r2=488903
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/mock/component/ModuleScopeInitDestroyComponent.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/mock/component/CompositeScopeInitDestroyComponent.java Tue Dec 19 19:39:37 2006
@@ -20,7 +20,7 @@
import org.osoa.sca.annotations.Destroy;
-public class ModuleScopeInitDestroyComponent extends ModuleScopeInitOnlyComponent {
+public class CompositeScopeInitDestroyComponent extends CompositeScopeInitOnlyComponent {
boolean destroyed;
Propchange: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/mock/component/CompositeScopeInitDestroyComponent.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/mock/component/CompositeScopeInitDestroyComponent.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Copied: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/mock/component/CompositeScopeInitOnlyComponent.java (from r488784, incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/mock/component/ModuleScopeInitOnlyComponent.java)
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/mock/component/CompositeScopeInitOnlyComponent.java?view=diff&rev=488903&p1=incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/mock/component/ModuleScopeInitOnlyComponent.java&r1=488784&p2=incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/mock/component/CompositeScopeInitOnlyComponent.java&r2=488903
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/mock/component/ModuleScopeInitOnlyComponent.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/mock/component/CompositeScopeInitOnlyComponent.java Tue Dec 19 19:39:37 2006
@@ -20,7 +20,7 @@
import org.osoa.sca.annotations.Init;
-public class ModuleScopeInitOnlyComponent extends ModuleScopeComponentImpl {
+public class CompositeScopeInitOnlyComponent extends CompositeScopeComponentImpl {
private boolean initialized;
// this value tests to ensure introspection can find the init() method even
Propchange: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/mock/component/CompositeScopeInitOnlyComponent.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/mock/component/CompositeScopeInitOnlyComponent.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Modified: incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/Lifecycle.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/Lifecycle.java?view=diff&rev=488903&r1=488902&r2=488903
==============================================================================
--- incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/Lifecycle.java (original)
+++ incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/Lifecycle.java Tue Dec 19 19:39:37 2006
@@ -36,7 +36,7 @@
int RUNNING = 4;
/* In the process of being shutdown */
int STOPPING = 5;
- /* Has been shutdown and removed from the module */
+ /* Has been shutdown and removed from the composite */
int STOPPED = 6;
/* In an error state */
int ERROR = 7;
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=488903&r1=488902&r2=488903
==============================================================================
--- 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 19:39:37 2006
@@ -26,8 +26,8 @@
public class ScopeTestCase extends TestCase {
public void testEquals() throws Exception {
- Scope module = new Scope("COMPOSITE");
- assertTrue(module.equals(Scope.COMPOSITE));
+ Scope scope = new Scope("COMPOSITE");
+ assertTrue(scope.equals(Scope.COMPOSITE));
}
public void testEqualsNew() throws Exception {
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=488903&r1=488902&r2=488903
==============================================================================
--- 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 19:39:37 2006
@@ -35,7 +35,7 @@
public void load(CompositeComponent parent, GroovyImplementation implementation, DeploymentContext context)
throws LoaderException {
GroovyComponentType componentType = new GroovyComponentType();
- // for now, default to module
+ // for now, default to composite
componentType.setLifecycleScope(Scope.COMPOSITE);
implementation.setComponentType(componentType);
}
Modified: incubator/tuscany/java/sca/services/persistence/openjpa/src/main/java/org/apache/tuscany/service/openjpa/JPAComponentBuilder.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/services/persistence/openjpa/src/main/java/org/apache/tuscany/service/openjpa/JPAComponentBuilder.java?view=diff&rev=488903&r1=488902&r2=488903
==============================================================================
--- incubator/tuscany/java/sca/services/persistence/openjpa/src/main/java/org/apache/tuscany/service/openjpa/JPAComponentBuilder.java (original)
+++ incubator/tuscany/java/sca/services/persistence/openjpa/src/main/java/org/apache/tuscany/service/openjpa/JPAComponentBuilder.java Tue Dec 19 19:39:37 2006
@@ -40,7 +40,7 @@
public Component build(CompositeComponent parent, ComponentDefinition definition, DeploymentContext ctx)
throws BuilderConfigException {
// String name = definition.getName();
-// ScopeContainer moduleScope = ctx.getModuleScope();
+// ScopeContainer moduleScope = ctx.getCompositeScope();
// Integer initLevel = definition.getInitLevel();
ComponentType<?, ?, ?> type = definition.getImplementation().getComponentType();
Property<?> persistenceUnit = type.getProperties().get(PERSISTENCE_UNIT);
---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org