You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by me...@apache.org on 2007/03/18 22:10:31 UTC
svn commit: r519695 - in /incubator/tuscany/java/sca:
kernel/core/src/main/java/org/apache/tuscany/core/component/scope/
kernel/core/src/main/java/org/apache/tuscany/core/deployer/
kernel/core/src/main/java/org/apache/tuscany/core/implementation/ kerne...
Author: meerajk
Date: Sun Mar 18 14:10:30 2007
New Revision: 519695
URL: http://svn.apache.org/viewvc?view=rev&rev=519695
Log:
Removed type argument GROUP from PhysicalComponentDefinition
Added:
incubator/tuscany/java/sca/runtime/standalone/plugin.standalone/
Modified:
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/component/scope/AbstractScopeContainer.java
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/component/scope/CompositeScopeContainer.java
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/component/scope/ConversationalScopeContainer.java
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/component/scope/RequestScopeContainer.java
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/component/scope/StatelessScopeContainer.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/implementation/PojoComponent.java
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/java/JavaComponent.java
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/java/JavaPhysicalComponentBuilder.java
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/java/JavaTargetInvoker.java
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/system/builder/SystemPhysicalComponentBuilder.java
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/system/component/SystemComponent.java
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/system/model/SystemPhysicalComponentDefinition.java
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/model/physical/java/JavaPhysicalComponentDefinition.java
incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/component/scope/AbstractScopeContainerTestCase.java
incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/component/scope/BasicCompositeScopeTestCase.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/implementation/PojoComponentTestCase.java
incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/java/JavaComponentBuilderMetadataTestCase.java
incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/component/ScopeContainer.java
incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/model/physical/PhysicalComponentDefinition.java
incubator/tuscany/java/sca/runtime/standalone/standalone-host/src/main/java/org/apache/tuscany/runtime/standalone/host/StandaloneRuntimeImpl.java
incubator/tuscany/java/sca/runtime/webapp/webapp-host/src/main/java/org/apache/tuscany/runtime/webapp/WebappRuntimeImpl.java
Modified: incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/component/scope/AbstractScopeContainer.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/component/scope/AbstractScopeContainer.java?view=diff&rev=519695&r1=519694&r2=519695
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/component/scope/AbstractScopeContainer.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/component/scope/AbstractScopeContainer.java Sun Mar 18 14:10:30 2007
@@ -19,6 +19,7 @@
package org.apache.tuscany.core.component.scope;
+import java.net.URI;
import java.util.ArrayList;
import java.util.Collections;
import java.util.Comparator;
@@ -50,8 +51,8 @@
*
* @version $Rev$ $Date$
*/
-public abstract class AbstractScopeContainer<GROUP, KEY> extends AbstractLifecycle
- implements ScopeContainer<GROUP, KEY> {
+public abstract class AbstractScopeContainer<KEY> extends AbstractLifecycle
+ implements ScopeContainer<KEY> {
private static final Comparator<AtomicComponent<?>> COMPARATOR = new Comparator<AtomicComponent<?>>() {
public int compare(AtomicComponent<?> o1, AtomicComponent<?> o2) {
@@ -62,16 +63,16 @@
private final Scope scope;
protected final ScopeContainerMonitor monitor;
- protected final Map<GROUP, Set<AtomicComponent<?>>> groups =
- new ConcurrentHashMap<GROUP, Set<AtomicComponent<?>>>();
- protected final Map<AtomicComponent<?>, GROUP> componentGroups =
- new ConcurrentHashMap<AtomicComponent<?>, GROUP>();
+ protected final Map<URI, Set<AtomicComponent<?>>> groups =
+ new ConcurrentHashMap<URI, Set<AtomicComponent<?>>>();
+ protected final Map<AtomicComponent<?>, URI> componentGroups =
+ new ConcurrentHashMap<AtomicComponent<?>, URI>();
- protected final Map<KEY, GROUP> contextGroups = new ConcurrentHashMap<KEY, GROUP>();
+ protected final Map<KEY, URI> contextGroups = new ConcurrentHashMap<KEY, URI>();
// the queue of components to eagerly initialize in each group
- protected final Map<GROUP, List<AtomicComponent<?>>> initQueues =
- new ConcurrentHashMap<GROUP, List<AtomicComponent<?>>>();
+ protected final Map<URI, List<AtomicComponent<?>>> initQueues =
+ new ConcurrentHashMap<URI, List<AtomicComponent<?>>>();
// the queue of instanceWrappers to destroy, in the order that their instances were created
protected final Map<KEY, List<InstanceWrapper<?>>> destroyQueues =
@@ -123,7 +124,7 @@
public void onEvent(Event event) {
}
- public <T> void register(AtomicComponent<T> component, GROUP groupId) {
+ public <T> void register(AtomicComponent<T> component, URI groupId) {
checkInit();
assert groups.containsKey(groupId);
Set<AtomicComponent<?>> components = groups.get(groupId);
@@ -138,36 +139,36 @@
}
public <T> void unregister(AtomicComponent<T> component) {
- GROUP groupId = componentGroups.remove(component);
+ URI groupId = componentGroups.remove(component);
assert groupId != null;
Set<AtomicComponent<?>> components = groups.get(groupId);
components.remove(component);
}
- public void createGroup(GROUP groupId) {
+ public void createGroup(URI groupId) {
assert !groups.containsKey(groupId);
groups.put(groupId, new HashSet<AtomicComponent<?>>());
initQueues.put(groupId, new ArrayList<AtomicComponent<?>>());
}
- protected Set<AtomicComponent<?>> getGroupMembers(GROUP groupId) {
+ protected Set<AtomicComponent<?>> getGroupMembers(URI groupId) {
return groups.get(groupId);
}
- public void removeGroup(GROUP groupId) {
+ public void removeGroup(URI groupId) {
assert groups.containsKey(groupId);
groups.remove(groupId);
initQueues.remove(groupId);
}
- public void startContext(KEY contextId, GROUP groupId) throws GroupInitializationException {
+ public void startContext(KEY contextId, URI groupId) throws GroupInitializationException {
assert !contextGroups.containsKey(contextId);
contextGroups.put(contextId, groupId);
destroyQueues.put(contextId, new ArrayList<InstanceWrapper<?>>());
initializeComponents(contextId, initQueues.get(groupId));
}
- protected GROUP getContextGroup(KEY contextId) {
+ protected URI getContextGroup(KEY contextId) {
return contextGroups.get(contextId);
}
Modified: incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/component/scope/CompositeScopeContainer.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/component/scope/CompositeScopeContainer.java?view=diff&rev=519695&r1=519694&r2=519695
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/component/scope/CompositeScopeContainer.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/component/scope/CompositeScopeContainer.java Sun Mar 18 14:10:30 2007
@@ -18,6 +18,7 @@
*/
package org.apache.tuscany.core.component.scope;
+import java.net.URI;
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
@@ -42,7 +43,7 @@
*/
@EagerInit
@Service(ScopeContainer.class)
-public class CompositeScopeContainer<GROUP, KEY> extends AbstractScopeContainer<GROUP, KEY> {
+public class CompositeScopeContainer<KEY> extends AbstractScopeContainer<KEY> {
private static final InstanceWrapper<Object> EMPTY = new InstanceWrapper<Object>() {
public Object getInstance() {
return null;
@@ -69,7 +70,7 @@
super(Scope.COMPOSITE, monitor);
}
- public <T> void register(AtomicComponent<T> component, GROUP groupId) {
+ public <T> void register(AtomicComponent<T> component, URI groupId) {
super.register(component, groupId);
instanceWrappers.put(component, EMPTY);
}
Modified: incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/component/scope/ConversationalScopeContainer.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/component/scope/ConversationalScopeContainer.java?view=diff&rev=519695&r1=519694&r2=519695
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/component/scope/ConversationalScopeContainer.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/component/scope/ConversationalScopeContainer.java Sun Mar 18 14:10:30 2007
@@ -18,6 +18,8 @@
*/
package org.apache.tuscany.core.component.scope;
+import java.net.URI;
+
import org.apache.tuscany.spi.component.AtomicComponent;
import org.apache.tuscany.spi.component.InstanceWrapper;
import org.apache.tuscany.spi.component.PersistenceException;
@@ -67,7 +69,7 @@
lifecycleState = STOPPED;
}
- public void register(AtomicComponent component, Object groupId) {
+ public void register(AtomicComponent component, URI groupId) {
super.register(component, groupId);
component.addListener(this);
}
Modified: incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/component/scope/RequestScopeContainer.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/component/scope/RequestScopeContainer.java?view=diff&rev=519695&r1=519694&r2=519695
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/component/scope/RequestScopeContainer.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/component/scope/RequestScopeContainer.java Sun Mar 18 14:10:30 2007
@@ -18,6 +18,7 @@
*/
package org.apache.tuscany.core.component.scope;
+import java.net.URI;
import java.util.ArrayList;
import java.util.List;
import java.util.ListIterator;
@@ -71,7 +72,7 @@
lifecycleState = STOPPED;
}
- public void register(AtomicComponent component, Object groupId) {
+ public void register(AtomicComponent component, URI groupId) {
super.register(component, groupId);
contexts.put(component, new ConcurrentHashMap<Thread, InstanceWrapper>());
}
Modified: incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/component/scope/StatelessScopeContainer.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/component/scope/StatelessScopeContainer.java?view=diff&rev=519695&r1=519694&r2=519695
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/component/scope/StatelessScopeContainer.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/component/scope/StatelessScopeContainer.java Sun Mar 18 14:10:30 2007
@@ -37,7 +37,7 @@
*/
@EagerInit
@Service(ScopeContainer.class)
-public class StatelessScopeContainer<GROUP, KEY> extends AbstractScopeContainer<GROUP, KEY> {
+public class StatelessScopeContainer<KEY> extends AbstractScopeContainer<KEY> {
public StatelessScopeContainer(@Monitor ScopeContainerMonitor monitor) {
super(Scope.STATELESS, monitor);
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=519695&r1=519694&r2=519695
==============================================================================
--- 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 Sun Mar 18 14:10:30 2007
@@ -120,7 +120,7 @@
ComponentDefinition<I> componentDefinition)
throws LoaderException, BuilderException, ResolutionException {
@SuppressWarnings("unchecked")
- ScopeContainer<URI, URI> scopeContainer = scopeRegistry.getScopeContainer(Scope.COMPOSITE);
+ ScopeContainer<URI> scopeContainer = scopeRegistry.getScopeContainer(Scope.COMPOSITE);
URI groupId = componentDefinition.getUri();
scopeContainer.createGroup(groupId);
DeploymentContext deploymentContext =
Modified: incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/PojoComponent.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/PojoComponent.java?view=diff&rev=519695&r1=519694&r2=519695
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/PojoComponent.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/PojoComponent.java Sun Mar 18 14:10:30 2007
@@ -54,10 +54,10 @@
* @param <T> the implementation class
* @param <GROUP> the component group id type
*/
-public abstract class PojoComponent<T, GROUP> extends AbstractSCAObject implements AtomicComponent<T> {
+public abstract class PojoComponent<T> extends AbstractSCAObject implements AtomicComponent<T> {
private final InstanceFactoryProvider<T> provider;
- private final ScopeContainer<GROUP, ?> scopeContainer;
- private final GROUP groupId;
+ private final ScopeContainer<?> scopeContainer;
+ private final URI groupId;
private final int initLevel;
private final long maxIdleTime;
private final long maxAge;
@@ -65,8 +65,8 @@
public PojoComponent(URI componentId,
InstanceFactoryProvider<T> provider,
- ScopeContainer<GROUP, ?> scopeContainer,
- GROUP groupId,
+ ScopeContainer<?> scopeContainer,
+ URI groupId,
int initLevel,
long maxIdleTime,
long maxAge) {
Modified: incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/java/JavaComponent.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/java/JavaComponent.java?view=diff&rev=519695&r1=519694&r2=519695
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/java/JavaComponent.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/java/JavaComponent.java Sun Mar 18 14:10:30 2007
@@ -29,11 +29,11 @@
* @param <T> the implementation class for the defined component
* @param <GROUP> the component group id type
*/
-public class JavaComponent<T,GROUP> extends PojoComponent<T,GROUP> {
+public class JavaComponent<T> extends PojoComponent<T> {
public JavaComponent(URI componentId,
InstanceFactoryProvider<T> instanceFactoryProvider,
- ScopeContainer<GROUP, ?> scopeContainer,
- GROUP groupId,
+ ScopeContainer<?> scopeContainer,
+ URI groupId,
int initLevel,
long maxIdleTime,
long maxAge) {
Modified: incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/java/JavaPhysicalComponentBuilder.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/java/JavaPhysicalComponentBuilder.java?view=diff&rev=519695&r1=519694&r2=519695
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/java/JavaPhysicalComponentBuilder.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/java/JavaPhysicalComponentBuilder.java Sun Mar 18 14:10:30 2007
@@ -60,8 +60,8 @@
* @param <T> the implementation class for the defined component
* @param <GROUP> the component group id type
*/
-public class JavaPhysicalComponentBuilder<T, GROUP>
- extends POJOPhysicalComponentBuilder<JavaPhysicalComponentDefinition<T, GROUP>, JavaComponent<T, GROUP>>
+public class JavaPhysicalComponentBuilder<T>
+ extends POJOPhysicalComponentBuilder<JavaPhysicalComponentDefinition<T>, JavaComponent<T>>
implements WireAttacher<JavaComponent, JavaPhysicalWireSourceDefinition, JavaPhysicalWireTargetDefinition> {
// Classloader registry
@@ -104,11 +104,11 @@
* @return A component instance that is ready to go live.
* @throws BuilderException If unable to build the component.
*/
- public JavaComponent<T, GROUP> build(JavaPhysicalComponentDefinition<T, GROUP> componentDefinition) throws BuilderException {
+ public JavaComponent<T> build(JavaPhysicalComponentDefinition<T> componentDefinition) throws BuilderException {
URI componentId = componentDefinition.getComponentId();
InstanceFactoryProvider<T> provider = componentDefinition.getProvider();
- JavaComponent<T, GROUP> component = new JavaComponent<T, GROUP>(componentId, provider, null, null, 0, -1, -1);
+ JavaComponent<T> component = new JavaComponent<T>(componentId, provider, null, null, 0, -1, -1);
setInstanceFactoryClass(componentDefinition, component);
Modified: incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/java/JavaTargetInvoker.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/java/JavaTargetInvoker.java?view=diff&rev=519695&r1=519694&r2=519695
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/java/JavaTargetInvoker.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/java/JavaTargetInvoker.java Sun Mar 18 14:10:30 2007
@@ -39,7 +39,7 @@
public class JavaTargetInvoker<T> extends TargetInvokerExtension {
protected Method operation;
private final AtomicComponent<T> component;
- private final ScopeContainer<?,Object> scopeContainer;
+ private final ScopeContainer scopeContainer;
protected InstanceWrapper<T> target;
protected boolean stateless;
Modified: incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/system/builder/SystemPhysicalComponentBuilder.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/system/builder/SystemPhysicalComponentBuilder.java?view=diff&rev=519695&r1=519694&r2=519695
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/system/builder/SystemPhysicalComponentBuilder.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/system/builder/SystemPhysicalComponentBuilder.java Sun Mar 18 14:10:30 2007
@@ -36,7 +36,7 @@
*/
@EagerInit
public class SystemPhysicalComponentBuilder<T, GROUP>
- extends POJOPhysicalComponentBuilder<SystemPhysicalComponentDefinition<T, GROUP>, SystemComponent<T, GROUP>> {
+ extends POJOPhysicalComponentBuilder<SystemPhysicalComponentDefinition<T>, SystemComponent<T>> {
public SystemPhysicalComponentBuilder(
@Reference(name = "builderRegistry")PhysicalComponentBuilderRegistry builderRegistry,
@@ -44,12 +44,12 @@
super(builderRegistry, scopeRegistry);
}
- public SystemComponent<T, GROUP> build(SystemPhysicalComponentDefinition<T, GROUP> definition) {
+ public SystemComponent<T> build(SystemPhysicalComponentDefinition<T> definition) {
URI componentId = definition.getComponentId();
int initLevel = definition.getInitLevel();
- GROUP groupId = definition.getGroupId();
- ScopeContainer<GROUP, ?> scopeContainer = null;
+ URI groupId = definition.getGroupId();
+ ScopeContainer<?> scopeContainer = null;
InstanceFactoryProvider<T> provider = definition.getProvider();
- return new SystemComponent<T, GROUP>(componentId, provider, scopeContainer, groupId, initLevel, -1, -1);
+ return new SystemComponent<T>(componentId, provider, scopeContainer, groupId, initLevel, -1, -1);
}
}
Modified: incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/system/component/SystemComponent.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/system/component/SystemComponent.java?view=diff&rev=519695&r1=519694&r2=519695
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/system/component/SystemComponent.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/system/component/SystemComponent.java Sun Mar 18 14:10:30 2007
@@ -29,11 +29,11 @@
* @param <T> the implementation class for the defined component
* @param <GROUP> the component group id type
*/
-public class SystemComponent<T, GROUP> extends PojoComponent<T, GROUP> {
+public class SystemComponent<T> extends PojoComponent<T> {
public SystemComponent(URI componentId,
InstanceFactoryProvider<T> provider,
- ScopeContainer<GROUP, ?> scopeContainer,
- GROUP groupId,
+ ScopeContainer<?> scopeContainer,
+ URI groupId,
int initLevel,
int maxIdleTime,
int maxAge) {
Modified: incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/system/model/SystemPhysicalComponentDefinition.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/system/model/SystemPhysicalComponentDefinition.java?view=diff&rev=519695&r1=519694&r2=519695
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/system/model/SystemPhysicalComponentDefinition.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/system/model/SystemPhysicalComponentDefinition.java Sun Mar 18 14:10:30 2007
@@ -26,7 +26,7 @@
* @param <T> the implementation class for the defined component
* @param <GROUP> the component group id type
*/
-public class SystemPhysicalComponentDefinition<T, GROUP> extends PhysicalComponentDefinition<GROUP> {
+public class SystemPhysicalComponentDefinition<T> extends PhysicalComponentDefinition {
private int initLevel;
private InstanceFactoryProvider<T> provider;
Modified: incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/model/physical/java/JavaPhysicalComponentDefinition.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/model/physical/java/JavaPhysicalComponentDefinition.java?view=diff&rev=519695&r1=519694&r2=519695
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/model/physical/java/JavaPhysicalComponentDefinition.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/model/physical/java/JavaPhysicalComponentDefinition.java Sun Mar 18 14:10:30 2007
@@ -30,7 +30,7 @@
* @param <T> the implementation class (if known)
* @param <GROUP> the component group id type
*/
-public class JavaPhysicalComponentDefinition<T, GROUP> extends PhysicalComponentDefinition<GROUP> {
+public class JavaPhysicalComponentDefinition<T> extends PhysicalComponentDefinition {
private InstanceFactoryProvider<T> provider;
Modified: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/component/scope/AbstractScopeContainerTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/component/scope/AbstractScopeContainerTestCase.java?view=diff&rev=519695&r1=519694&r2=519695
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/component/scope/AbstractScopeContainerTestCase.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/component/scope/AbstractScopeContainerTestCase.java Sun Mar 18 14:10:30 2007
@@ -18,6 +18,8 @@
*/
package org.apache.tuscany.core.component.scope;
+import java.net.URI;
+
import junit.framework.TestCase;
import org.apache.tuscany.spi.component.ScopeContainer;
@@ -30,10 +32,10 @@
/**
* @version $Rev$ $Date$
*/
-public abstract class AbstractScopeContainerTestCase<T, GROUP, KEY> extends TestCase {
+public abstract class AbstractScopeContainerTestCase<T, KEY> extends TestCase {
protected IMocksControl control;
- protected ScopeContainer<GROUP, KEY> scopeContainer;
- protected GROUP groupId;
+ protected ScopeContainer<KEY> scopeContainer;
+ protected URI groupId;
protected KEY contextId;
protected AtomicComponent<T> component;
protected InstanceWrapper<T> wrapper;
Modified: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/component/scope/BasicCompositeScopeTestCase.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=519695&r1=519694&r2=519695
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/component/scope/BasicCompositeScopeTestCase.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/component/scope/BasicCompositeScopeTestCase.java Sun Mar 18 14:10:30 2007
@@ -35,7 +35,7 @@
*/
public class BasicCompositeScopeTestCase<T> extends TestCase {
protected IMocksControl control;
- protected ScopeContainer<URI, URI> scopeContainer;
+ protected ScopeContainer<URI> scopeContainer;
protected URI groupId;
protected URI contextId;
protected AtomicComponent<T> component;
@@ -136,7 +136,7 @@
EasyMock.expect(component.isEagerInit()).andStubReturn(false);
wrapper = control.createMock(InstanceWrapper.class);
- scopeContainer = new CompositeScopeContainer<URI, URI>(null);
+ scopeContainer = new CompositeScopeContainer<URI>(null);
scopeContainer.start();
scopeContainer.createGroup(groupId);
scopeContainer.startContext(contextId, groupId);
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=519695&r1=519694&r2=519695
==============================================================================
--- 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 Sun Mar 18 14:10:30 2007
@@ -32,7 +32,7 @@
* @version $Rev$ $Date$
*/
public class BasicStatelessScopeTestCase<T> extends TestCase {
- private StatelessScopeContainer<String, String> scopeContainer;
+ private StatelessScopeContainer<String> scopeContainer;
private String contextId;
private IMocksControl control;
private AtomicComponent<T> component;
@@ -79,7 +79,7 @@
@SuppressWarnings("unchecked")
protected void setUp() throws Exception {
super.setUp();
- scopeContainer = new StatelessScopeContainer<String, String>(null);
+ scopeContainer = new StatelessScopeContainer<String>(null);
contextId = "context";
control = EasyMock.createStrictControl();
Modified: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/PojoComponentTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/PojoComponentTestCase.java?view=diff&rev=519695&r1=519694&r2=519695
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/PojoComponentTestCase.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/PojoComponentTestCase.java Sun Mar 18 14:10:30 2007
@@ -124,7 +124,7 @@
component = new TestComponent<T>(componentId, provider, scopeContainer, 0, -1, -1);
}
- public static class TestComponent<T> extends PojoComponent<T, Object> {
+ public static class TestComponent<T> extends PojoComponent<T> {
public TestComponent(URI componentId,
InstanceFactoryProvider<T> instanceFactoryProvider,
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=519695&r1=519694&r2=519695
==============================================================================
--- 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 Sun Mar 18 14:10:30 2007
@@ -103,7 +103,7 @@
scopeContainer = EasyMock.createMock(ScopeContainer.class);
scopeContainer.start();
scopeContainer.stop();
- scopeContainer.register(EasyMock.isA(AtomicComponent.class), EasyMock.isNull());
+ scopeContainer.register(EasyMock.isA(AtomicComponent.class), EasyMock.isA(URI.class));
EasyMock.expectLastCall().atLeastOnce();
EasyMock.expect(scopeContainer.getScope()).andReturn(Scope.COMPOSITE).atLeastOnce();
EasyMock.replay(scopeContainer);
Modified: incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/component/ScopeContainer.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/component/ScopeContainer.java?view=diff&rev=519695&r1=519694&r2=519695
==============================================================================
--- incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/component/ScopeContainer.java (original)
+++ incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/component/ScopeContainer.java Sun Mar 18 14:10:30 2007
@@ -18,6 +18,8 @@
*/
package org.apache.tuscany.spi.component;
+import java.net.URI;
+
import org.apache.tuscany.spi.Lifecycle;
import org.apache.tuscany.spi.event.RuntimeEventListener;
import org.apache.tuscany.spi.model.Scope;
@@ -32,7 +34,7 @@
* or for HTTP Session scope it might be the HTTP session ID.
* @param <GROUP> the type of IDs that identify groups of components
*/
-public interface ScopeContainer<GROUP, KEY> extends Lifecycle, RuntimeEventListener {
+public interface ScopeContainer<KEY> extends Lifecycle, RuntimeEventListener {
/**
* Returns the Scope that this container supports.
@@ -46,14 +48,14 @@
*
* @param groupId an identifier for the group
*/
- void createGroup(GROUP groupId);
+ void createGroup(URI groupId);
/**
* Remove a group that associates components together.
*
* @param groupId an identifier for the group
*/
- void removeGroup(GROUP groupId);
+ void removeGroup(URI groupId);
/**
* Registers a component with the scope.
@@ -61,7 +63,7 @@
* @param component the component to register
* @param groupId the id of the group to associate this component with
*/
- <T> void register(AtomicComponent<T> component, GROUP groupId);
+ <T> void register(AtomicComponent<T> component, URI groupId);
/**
* Unregisters a component with the scope.
@@ -77,7 +79,7 @@
* @param groupId the group of components to associate with this context
* @throws GroupInitializationException if an exception was thrown by any eagerInit component
*/
- void startContext(KEY contextId, GROUP groupId) throws GroupInitializationException;
+ void startContext(KEY contextId, URI groupId) throws GroupInitializationException;
/**
* Stop the context with the supplied ID.
Modified: incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/model/physical/PhysicalComponentDefinition.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/model/physical/PhysicalComponentDefinition.java?view=diff&rev=519695&r1=519694&r2=519695
==============================================================================
--- incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/model/physical/PhysicalComponentDefinition.java (original)
+++ incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/model/physical/PhysicalComponentDefinition.java Sun Mar 18 14:10:30 2007
@@ -29,12 +29,12 @@
* @version $Rev$ $Date$
* @param <GROUP> the component group id type
*/
-public abstract class PhysicalComponentDefinition<GROUP> extends ModelObject {
+public abstract class PhysicalComponentDefinition extends ModelObject {
// Component Id.
private URI componentId;
private Scope scope;
- private GROUP groupId;
+ private URI groupId;
// Instance factory provider
private InstanceFactoryProviderDefinition instanceFactoryProviderDefinition;// Scope
@@ -61,7 +61,7 @@
* Returns the id of the component group this component belongs to.
* @return the id of the component group this component belongs to
*/
- public GROUP getGroupId() {
+ public URI getGroupId() {
return groupId;
}
@@ -69,7 +69,7 @@
* Sets the id of the component group this component belongs to.
* @param groupId the id of the component group this component belongs to
*/
- public void setGroupId(GROUP groupId) {
+ public void setGroupId(URI groupId) {
this.groupId = groupId;
}
Modified: incubator/tuscany/java/sca/runtime/standalone/standalone-host/src/main/java/org/apache/tuscany/runtime/standalone/host/StandaloneRuntimeImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/runtime/standalone/standalone-host/src/main/java/org/apache/tuscany/runtime/standalone/host/StandaloneRuntimeImpl.java?view=diff&rev=519695&r1=519694&r2=519695
==============================================================================
--- incubator/tuscany/java/sca/runtime/standalone/standalone-host/src/main/java/org/apache/tuscany/runtime/standalone/host/StandaloneRuntimeImpl.java (original)
+++ incubator/tuscany/java/sca/runtime/standalone/standalone-host/src/main/java/org/apache/tuscany/runtime/standalone/host/StandaloneRuntimeImpl.java Sun Mar 18 14:10:30 2007
@@ -85,7 +85,7 @@
component.start();
}
ScopeRegistry scopeRegistry = getScopeRegistry();
- ScopeContainer<URI, URI> container = scopeRegistry.getScopeContainer(Scope.COMPOSITE);
+ ScopeContainer<URI> container = scopeRegistry.getScopeContainer(Scope.COMPOSITE);
container.startContext(compositeUri, compositeUri);
getWorkContext().setIdentifier(Scope.COMPOSITE, compositeUri);
WorkContext workContext = new SimpleWorkContext();
Modified: incubator/tuscany/java/sca/runtime/webapp/webapp-host/src/main/java/org/apache/tuscany/runtime/webapp/WebappRuntimeImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/runtime/webapp/webapp-host/src/main/java/org/apache/tuscany/runtime/webapp/WebappRuntimeImpl.java?view=diff&rev=519695&r1=519694&r2=519695
==============================================================================
--- incubator/tuscany/java/sca/runtime/webapp/webapp-host/src/main/java/org/apache/tuscany/runtime/webapp/WebappRuntimeImpl.java (original)
+++ incubator/tuscany/java/sca/runtime/webapp/webapp-host/src/main/java/org/apache/tuscany/runtime/webapp/WebappRuntimeImpl.java Sun Mar 18 14:10:30 2007
@@ -138,7 +138,7 @@
try {
ScopeRegistry scopeRegistry = getScopeRegistry();
- ScopeContainer<URI, URI> container = scopeRegistry.getScopeContainer(Scope.COMPOSITE);
+ ScopeContainer<URI> container = scopeRegistry.getScopeContainer(Scope.COMPOSITE);
container.startContext(compositeId, compositeId);
getWorkContext().setIdentifier(Scope.COMPOSITE, compositeId);
} catch (GroupInitializationException e) {
---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org