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/17 20:17:15 UTC
svn commit: r488028 [2/4] - in /incubator/tuscany/java/sca:
commands/launcher/src/main/java/org/apache/tuscany/launcher/
kernel/core/src/main/java/org/apache/tuscany/core/bootstrap/
kernel/core/src/main/java/org/apache/tuscany/core/builder/ kernel/core...
Modified: incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/system/builder/SystemCompositeBuilder.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/system/builder/SystemCompositeBuilder.java?view=diff&rev=488028&r1=488027&r2=488028
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/system/builder/SystemCompositeBuilder.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/system/builder/SystemCompositeBuilder.java Sun Dec 17 11:17:11 2006
@@ -24,7 +24,9 @@
import org.apache.tuscany.spi.builder.BuilderException;
import org.apache.tuscany.spi.builder.BuilderRegistry;
import org.apache.tuscany.spi.builder.Connector;
+import org.apache.tuscany.spi.builder.BuilderInstantiationException;
import org.apache.tuscany.spi.component.Component;
+import org.apache.tuscany.spi.component.ComponentRegistrationException;
import org.apache.tuscany.spi.component.CompositeComponent;
import org.apache.tuscany.spi.component.SCAObject;
import org.apache.tuscany.spi.deployer.DeploymentContext;
@@ -87,7 +89,11 @@
e.addContextName(parent.getName());
throw e;
}
- component.register(child);
+ try {
+ component.register(child);
+ } catch (ComponentRegistrationException e) {
+ throw new BuilderInstantiationException("Error registering component", e);
+ }
}
for (BoundServiceDefinition<? extends Binding> serviceDefinition : allBoundServices) {
@@ -100,7 +106,11 @@
e.addContextName(parent.getName());
throw e;
}
- component.register(object);
+ try {
+ component.register(object);
+ } catch (ComponentRegistrationException e) {
+ throw new BuilderInstantiationException("Error registering service", e);
+ }
}
return component;
}
Modified: incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/system/component/SystemReferenceImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/system/component/SystemReferenceImpl.java?view=diff&rev=488028&r1=488027&r2=488028
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/system/component/SystemReferenceImpl.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/system/component/SystemReferenceImpl.java Sun Dec 17 11:17:11 2006
@@ -85,7 +85,7 @@
return referenceInterface.cast(inboundWire.getTargetService());
}
- public WireInvocationHandler getHandler() throws TargetException {
+ public WireInvocationHandler getHandler() {
throw new UnsupportedOperationException();
}
Modified: incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/system/wire/SystemOutboundWireImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/system/wire/SystemOutboundWireImpl.java?view=diff&rev=488028&r1=488027&r2=488028
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/system/wire/SystemOutboundWireImpl.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/system/wire/SystemOutboundWireImpl.java Sun Dec 17 11:17:11 2006
@@ -76,9 +76,7 @@
}
public Object getTargetService() throws TargetException {
- if (targetWire == null) {
- throw new TargetException("No target wire connected to source wire");
- }
+ assert targetWire != null;
return interfaze.cast(targetWire.getTargetService());
}
@@ -138,7 +136,7 @@
public SCAObject getContainer() {
return container;
}
-
+
public void setContainer(SCAObject container) {
this.container = container;
}
Modified: incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/injection/ResourceObjectFactory.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/injection/ResourceObjectFactory.java?view=diff&rev=488028&r1=488027&r2=488028
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/injection/ResourceObjectFactory.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/injection/ResourceObjectFactory.java Sun Dec 17 11:17:11 2006
@@ -22,6 +22,7 @@
import org.apache.tuscany.spi.ObjectFactory;
import org.apache.tuscany.spi.component.CompositeComponent;
import org.apache.tuscany.spi.component.SCAObject;
+import org.apache.tuscany.spi.component.TargetException;
import org.apache.tuscany.spi.host.ResourceHost;
import org.apache.tuscany.spi.host.ResourceResolutionException;
@@ -91,7 +92,11 @@
} else {
T instance = null;
if (mappedName == null) {
- instance = parent.resolveSystemInstance(type);
+ try {
+ instance = parent.resolveSystemInstance(type);
+ } catch (TargetException e) {
+ throw new ObjectCreationException(e);
+ }
if (instance == null) {
// if not found in parent scope, search the host namespace
resolveFromHost = true;
@@ -104,7 +109,11 @@
} else {
SCAObject child = parent.getSystemChild(mappedName);
if (child != null) {
- instance = type.cast(child.getServiceInstance());
+ try {
+ instance = type.cast(child.getServiceInstance());
+ } catch (TargetException e) {
+ throw new ObjectCreationException(e);
+ }
}
if (instance == null && !optional) {
throw new ResourceNotFoundException("No resource found for URI", mappedName);
Modified: incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/launcher/CompositeContextImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/launcher/CompositeContextImpl.java?view=diff&rev=488028&r1=488027&r2=488028
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/launcher/CompositeContextImpl.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/launcher/CompositeContextImpl.java Sun Dec 17 11:17:11 2006
@@ -22,8 +22,10 @@
import org.osoa.sca.RequestContext;
import org.osoa.sca.SCA;
import org.osoa.sca.ServiceReference;
+import org.osoa.sca.ServiceRuntimeException;
import org.apache.tuscany.spi.component.CompositeComponent;
+import org.apache.tuscany.spi.component.TargetException;
public class CompositeContextImpl extends SCA implements CompositeContext {
@@ -61,8 +63,12 @@
return null;
}
- public <T> T locateService(Class<T> serviceInterface, String serviceName) {
- return composite.locateService(serviceInterface, serviceName);
+ public <T> T locateService(Class<T> serviceInterface, String serviceName) throws ServiceRuntimeException {
+ try {
+ return composite.locateService(serviceInterface, serviceName);
+ } catch (TargetException e) {
+ throw new ServiceRuntimeException(e);
+ }
}
public ServiceReference newSession(String arg0) {
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=488028&r1=488027&r2=488028
==============================================================================
--- 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 Sun Dec 17 11:17:11 2006
@@ -203,12 +203,7 @@
try {
Thread.currentThread().setContextClassLoader(getClass().getClassLoader());
- try {
- return (CompositeComponent) deployer.deploy(parent, moduleDefinition);
- } catch (TuscanyException e) {
- e.addContextName(moduleDefinition.getName());
- throw e;
- }
+ return (CompositeComponent) deployer.deploy(parent, moduleDefinition);
} finally {
Thread.currentThread().setContextClassLoader(ccl);
}
Modified: incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/loader/ReferenceLoader.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/loader/ReferenceLoader.java?view=diff&rev=488028&r1=488027&r2=488028
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/loader/ReferenceLoader.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/loader/ReferenceLoader.java Sun Dec 17 11:17:11 2006
@@ -62,7 +62,6 @@
DeploymentContext deploymentContext)
throws XMLStreamException, LoaderException {
assert REFERENCE.equals(reader.getName());
-
String name = reader.getAttributeValue(null, "name");
Multiplicity multiplicity =
StAXUtil.multiplicity(reader.getAttributeValue(null, "multiplicity"), Multiplicity.ONE_ONE);
Modified: incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/monitor/JavaLoggingMonitorFactory.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/monitor/JavaLoggingMonitorFactory.java?view=diff&rev=488028&r1=488027&r2=488028
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/monitor/JavaLoggingMonitorFactory.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/monitor/JavaLoggingMonitorFactory.java Sun Dec 17 11:17:11 2006
@@ -201,7 +201,7 @@
private final Logger logger;
private final Map<String, Level> methodLevels;
private final ResourceBundle bundle;
- private List<ExceptionFormatter> formatters = new ArrayList<ExceptionFormatter>();
+ private List<ExceptionFormatter> formatters;
private ExceptionFormatter defaultFormatter;
public LoggingHandler(Logger logger,
Modified: incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/wire/InboundWireImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/wire/InboundWireImpl.java?view=diff&rev=488028&r1=488027&r2=488028
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/wire/InboundWireImpl.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/wire/InboundWireImpl.java Sun Dec 17 11:17:11 2006
@@ -48,11 +48,9 @@
private SCAObject container;
public Object getTargetService() throws TargetException {
- if (targetWire != null) {
- // optimized, no interceptors or handlers on either end
- return targetWire.getTargetService();
- }
- throw new TargetException("Target wire not optimized");
+ assert targetWire != null;
+ // optimized, no interceptors or handlers on either end
+ return targetWire.getTargetService();
}
public ServiceContract getServiceContract() {
Modified: incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/wire/OutboundWireImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/wire/OutboundWireImpl.java?view=diff&rev=488028&r1=488027&r2=488028
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/wire/OutboundWireImpl.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/wire/OutboundWireImpl.java Sun Dec 17 11:17:11 2006
@@ -50,11 +50,9 @@
private SCAObject container;
public Object getTargetService() throws TargetException {
- if (targetWire != null) {
- // optimized, no interceptors or handlers on either end
- return targetWire.getTargetService();
- }
- throw new TargetException("Target wire not optimized");
+ assert targetWire != null;
+ // optimized, no interceptors or handlers on either end
+ return targetWire.getTargetService();
}
public ServiceContract getServiceContract() {
Modified: incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/wire/jdk/JDKInboundInvocationHandler.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/wire/jdk/JDKInboundInvocationHandler.java?view=diff&rev=488028&r1=488027&r2=488028
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/wire/jdk/JDKInboundInvocationHandler.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/wire/jdk/JDKInboundInvocationHandler.java Sun Dec 17 11:17:11 2006
@@ -27,10 +27,10 @@
import java.util.HashMap;
import java.util.Map;
+import org.apache.tuscany.spi.component.AtomicComponent;
import org.apache.tuscany.spi.component.ReactivationException;
import org.apache.tuscany.spi.component.SCAExternalizable;
-import org.apache.tuscany.spi.component.AtomicComponent;
-import org.apache.tuscany.spi.component.TargetException;
+import org.apache.tuscany.spi.component.TargetInvocationException;
import org.apache.tuscany.spi.component.WorkContext;
import org.apache.tuscany.spi.wire.AbstractInboundInvocationHandler;
import org.apache.tuscany.spi.wire.InboundInvocationChain;
@@ -93,7 +93,7 @@
return hashCode();
// TODO beter hash algorithm
}
- throw new TargetException("Operation not configured", method.getName());
+ throw new TargetInvocationException("Operation not configured", method.getName());
}
InboundInvocationChain chain = holder.chain;
TargetInvoker invoker;
@@ -101,7 +101,7 @@
assert chain != null;
if (chain.getTargetInvoker() == null) {
String name = chain.getOperation().getName();
- throw new TargetException("No target invoker configured for operation", name);
+ throw new TargetInvocationException("No target invoker configured for operation", name);
}
if (chain.getTargetInvoker().isCacheable()) {
// clone and store the invoker locally
Modified: incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/wire/jdk/JDKOutboundInvocationHandler.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/wire/jdk/JDKOutboundInvocationHandler.java?view=diff&rev=488028&r1=488027&r2=488028
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/wire/jdk/JDKOutboundInvocationHandler.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/wire/jdk/JDKOutboundInvocationHandler.java Sun Dec 17 11:17:11 2006
@@ -35,7 +35,7 @@
import org.apache.tuscany.spi.component.ReactivationException;
import org.apache.tuscany.spi.component.SCAExternalizable;
import org.apache.tuscany.spi.component.SCAObject;
-import org.apache.tuscany.spi.component.TargetException;
+import org.apache.tuscany.spi.component.TargetInvocationException;
import org.apache.tuscany.spi.component.WorkContext;
import static org.apache.tuscany.spi.idl.java.JavaIDLUtils.findMethod;
import static org.apache.tuscany.spi.model.InteractionScope.CONVERSATIONAL;
@@ -112,7 +112,7 @@
return hashCode();
// TODO beter hash algorithm
}
- throw new TargetException("Operation not configured", method.getName());
+ throw new TargetInvocationException("Operation not configured", method.getName());
}
OutboundInvocationChain chain = holder.chain;
TargetInvoker invoker;
@@ -121,7 +121,7 @@
assert chain != null;
if (chain.getTargetInvoker() == null) {
String name = chain.getOperation().getName();
- throw new TargetException("No target invoker configured for operation", name);
+ throw new TargetInvocationException("No target invoker configured for operation", name);
}
if (chain.getTargetInvoker().isCacheable()) {
// clone and store the invoker locally
Modified: incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/wire/jdk/JDKWireService.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/wire/jdk/JDKWireService.java?view=diff&rev=488028&r1=488027&r2=488028
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/wire/jdk/JDKWireService.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/wire/jdk/JDKWireService.java Sun Dec 17 11:17:11 2006
@@ -30,7 +30,6 @@
import org.apache.tuscany.spi.component.Component;
import org.apache.tuscany.spi.component.CompositeComponent;
import org.apache.tuscany.spi.component.Reference;
-import org.apache.tuscany.spi.component.ReferenceNotFoundException;
import org.apache.tuscany.spi.component.Service;
import org.apache.tuscany.spi.component.WorkContext;
import org.apache.tuscany.spi.model.Binding;
@@ -221,13 +220,7 @@
for (ReferenceTarget referenceTarget : definition.getReferenceTargets().values()) {
Map<String, ? extends ReferenceDefinition> references = componentType.getReferences();
ReferenceDefinition mappedReference = references.get(referenceTarget.getReferenceName());
- if (mappedReference == null) {
- String refName = referenceTarget.getReferenceName();
- ReferenceNotFoundException e = new ReferenceNotFoundException(refName);
- e.addContextName(refName);
- e.addContextName(definition.getName());
- throw e;
- }
+ assert mappedReference != null;
OutboundWire wire = createWire(referenceTarget, mappedReference);
wire.setContainer(component);
component.addOutboundWire(wire);
Modified: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/component/scope/ConversationalScopeContainerMaxAgeTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/component/scope/ConversationalScopeContainerMaxAgeTestCase.java?view=diff&rev=488028&r1=488027&r2=488028
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/component/scope/ConversationalScopeContainerMaxAgeTestCase.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/component/scope/ConversationalScopeContainerMaxAgeTestCase.java Sun Dec 17 11:17:11 2006
@@ -18,16 +18,16 @@
*/
package org.apache.tuscany.core.component.scope;
-import org.apache.tuscany.spi.component.ScopeContainer;
-import org.apache.tuscany.spi.component.WorkContext;
import org.apache.tuscany.spi.component.AtomicComponent;
import org.apache.tuscany.spi.component.SCAObject;
-import org.apache.tuscany.spi.services.store.Store;
+import org.apache.tuscany.spi.component.ScopeContainer;
+import org.apache.tuscany.spi.component.WorkContext;
import org.apache.tuscany.spi.model.Scope;
+import org.apache.tuscany.spi.services.store.Store;
import junit.framework.TestCase;
-import org.easymock.EasyMock;
import org.apache.tuscany.core.component.WorkContextImpl;
+import org.easymock.EasyMock;
/**
* @version $Rev$ $Date$
@@ -39,7 +39,7 @@
private Store store;
private AtomicComponent component;
- public void testMaxAgeUpdate() {
+ public void testMaxAgeUpdate() throws Exception {
context.setIdentifier(Scope.CONVERSATION, "12345");
container.getInstance(component);
EasyMock.verify(store);
Modified: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/component/scope/ConversationalScopeContainerMaxIdleTimeTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/component/scope/ConversationalScopeContainerMaxIdleTimeTestCase.java?view=diff&rev=488028&r1=488027&r2=488028
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/component/scope/ConversationalScopeContainerMaxIdleTimeTestCase.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/component/scope/ConversationalScopeContainerMaxIdleTimeTestCase.java Sun Dec 17 11:17:11 2006
@@ -39,7 +39,7 @@
private Store store;
private AtomicComponent component;
- public void testMaxIdleTimeUpdate() {
+ public void testMaxIdleTimeUpdate() throws Exception {
context.setIdentifier(Scope.CONVERSATION, "12345");
container.getInstance(component);
EasyMock.verify(store);
Modified: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/component/scope/ConversationalScopeContainerPersistenceTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/component/scope/ConversationalScopeContainerPersistenceTestCase.java?view=diff&rev=488028&r1=488027&r2=488028
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/component/scope/ConversationalScopeContainerPersistenceTestCase.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/component/scope/ConversationalScopeContainerPersistenceTestCase.java Sun Dec 17 11:17:11 2006
@@ -43,7 +43,7 @@
/**
* Verifies the scope container properly creates an instance
*/
- public void testNotYetPersistedInMemory() {
+ public void testNotYetPersistedInMemory() throws Exception {
String id = UUID.randomUUID().toString();
context.setIdentifier(Scope.CONVERSATION, id);
AtomicComponent component = EasyMock.createMock(AtomicComponent.class);
Modified: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/component/scope/ConversationalScopeInstanceLifecycleTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/component/scope/ConversationalScopeInstanceLifecycleTestCase.java?view=diff&rev=488028&r1=488027&r2=488028
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/component/scope/ConversationalScopeInstanceLifecycleTestCase.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/component/scope/ConversationalScopeInstanceLifecycleTestCase.java Sun Dec 17 11:17:11 2006
@@ -20,6 +20,7 @@
import org.apache.tuscany.spi.component.SystemAtomicComponent;
import org.apache.tuscany.spi.component.WorkContext;
+import org.apache.tuscany.spi.component.TargetException;
import org.apache.tuscany.spi.event.RuntimeEventListener;
import org.apache.tuscany.spi.model.Scope;
import org.apache.tuscany.spi.services.store.StoreMonitor;
@@ -144,7 +145,7 @@
}
@SuppressWarnings("unchecked")
- private SystemAtomicComponent createComponent(boolean init) {
+ private SystemAtomicComponent createComponent(boolean init) throws TargetException {
SystemAtomicComponent component = EasyMock.createMock(SystemAtomicComponent.class);
EasyMock.expect(component.createInstance()).andStubAnswer(new IAnswer() {
public Object answer() throws Throwable {
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=488028&r1=488027&r2=488028
==============================================================================
--- 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 Sun Dec 17 11:17:11 2006
@@ -20,6 +20,7 @@
import org.apache.tuscany.spi.component.SystemAtomicComponent;
import org.apache.tuscany.spi.component.WorkContext;
+import org.apache.tuscany.spi.component.TargetException;
import org.apache.tuscany.spi.event.RuntimeEventListener;
import org.apache.tuscany.spi.model.Scope;
@@ -124,7 +125,7 @@
}
@SuppressWarnings("unchecked")
- private SystemAtomicComponent createComponent(boolean init) {
+ private SystemAtomicComponent createComponent(boolean init) throws TargetException {
SystemAtomicComponent component = EasyMock.createMock(SystemAtomicComponent.class);
EasyMock.expect(component.createInstance()).andStubAnswer(new IAnswer() {
public Object answer() throws Throwable {
Modified: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/component/scope/InstanceWrapperTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/component/scope/InstanceWrapperTestCase.java?view=diff&rev=488028&r1=488027&r2=488028
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/component/scope/InstanceWrapperTestCase.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/component/scope/InstanceWrapperTestCase.java Sun Dec 17 11:17:11 2006
@@ -18,7 +18,6 @@
*/
package org.apache.tuscany.core.component.scope;
-import org.apache.tuscany.spi.Lifecycle;
import org.apache.tuscany.spi.component.AtomicComponent;
import junit.framework.TestCase;
@@ -29,7 +28,6 @@
*/
public class InstanceWrapperTestCase extends TestCase {
-
public void testExceptionInit() throws Exception {
AtomicComponent component = getComponent();
InstanceWrapper wrapper = new InstanceWrapperImpl(component, new Object());
@@ -39,7 +37,7 @@
} catch (SomeException e) {
// expected
}
- assertEquals(Lifecycle.ERROR, wrapper.getLifecycleState());
+ assertFalse(wrapper.isStarted());
EasyMock.verify(component);
}
Modified: 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/ModuleScopeInstanceLifecycleTestCase.java?view=diff&rev=488028&r1=488027&r2=488028
==============================================================================
--- 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/ModuleScopeInstanceLifecycleTestCase.java Sun Dec 17 11:17:11 2006
@@ -21,6 +21,7 @@
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;
@@ -157,7 +158,7 @@
}
@SuppressWarnings("unchecked")
- private SystemAtomicComponent createComponent(int init) {
+ private SystemAtomicComponent createComponent(int init) throws TargetException {
SystemAtomicComponent component = EasyMock.createMock(SystemAtomicComponent.class);
EasyMock.expect(component.createInstance()).andStubAnswer(new IAnswer() {
public Object answer() throws Throwable {
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=488028&r1=488027&r2=488028
==============================================================================
--- 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 Sun Dec 17 11:17:11 2006
@@ -20,6 +20,7 @@
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;
@@ -115,7 +116,7 @@
}
@SuppressWarnings("unchecked")
- private SystemAtomicComponent createComponent(boolean init) {
+ private SystemAtomicComponent createComponent(boolean init) throws TargetException {
SystemAtomicComponent component = EasyMock.createMock(SystemAtomicComponent.class);
EasyMock.expect(component.createInstance()).andStubAnswer(new IAnswer() {
public Object answer() throws Throwable {
Modified: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/composite/AutowireResolutionTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/composite/AutowireResolutionTestCase.java?view=diff&rev=488028&r1=488027&r2=488028
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/composite/AutowireResolutionTestCase.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/composite/AutowireResolutionTestCase.java Sun Dec 17 11:17:11 2006
@@ -43,7 +43,7 @@
verify(parent);
}
- public void testResolveToSelf() {
+ public void testResolveToSelf() throws Exception {
CompositeComponent parent = createMock(CompositeComponent.class);
replay(parent);
CompositeComponent component = new CompositeComponentImpl("test", parent, null, null);
@@ -51,7 +51,7 @@
verify(parent);
}
- public void testSystemResolveToSelf() {
+ public void testSystemResolveToSelf() throws Exception {
CompositeComponent parent = createMock(CompositeComponent.class);
replay(parent);
CompositeComponent component = new CompositeComponentImpl("test", parent, null, null);
@@ -59,7 +59,7 @@
verify(parent);
}
- public void testResolvedByAutowire() {
+ public void testResolvedByAutowire() throws Exception {
Foo foo = new Foo() {
};
CompositeComponent parent = createMock(CompositeComponent.class);
@@ -70,7 +70,7 @@
verify(parent);
}
- public void testSystemResolvedByAutowire() {
+ public void testSystemResolvedByAutowire() throws Exception {
Foo foo = new Foo() {
};
CompositeComponent parent = createMock(CompositeComponent.class);
@@ -84,7 +84,7 @@
/**
* Verify parent resolution strategy for application services
*/
- public void testNamespaceIsolationAutowire() {
+ public void testNamespaceIsolationAutowire() throws Exception {
Foo foo = new Foo() {
};
CompositeComponent parent = new CompositeComponentImpl("parent", null, null, null);
Modified: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/composite/CompositeBuilderTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/composite/CompositeBuilderTestCase.java?view=diff&rev=488028&r1=488027&r2=488028
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/composite/CompositeBuilderTestCase.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/composite/CompositeBuilderTestCase.java Sun Dec 17 11:17:11 2006
@@ -25,6 +25,7 @@
import org.apache.tuscany.spi.component.AtomicComponent;
import org.apache.tuscany.spi.component.CompositeComponent;
import org.apache.tuscany.spi.component.ScopeContainer;
+import org.apache.tuscany.spi.component.TargetException;
import org.apache.tuscany.spi.deployer.DeploymentContext;
import org.apache.tuscany.spi.idl.java.JavaInterfaceProcessorRegistry;
import org.apache.tuscany.spi.idl.java.JavaServiceContract;
@@ -210,7 +211,7 @@
return new ComponentDefinition<JavaImplementation>("TargetComponent", targetImpl);
}
- private ScopeContainer createMock() {
+ private ScopeContainer createMock() throws TargetException {
ScopeContainer container = EasyMock.createMock(ScopeContainer.class);
container.start();
container.register(EasyMock.isA(AtomicComponent.class));
Modified: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/composite/CompositeComponentImplBasicTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/composite/CompositeComponentImplBasicTestCase.java?view=diff&rev=488028&r1=488027&r2=488028
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/composite/CompositeComponentImplBasicTestCase.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/composite/CompositeComponentImplBasicTestCase.java Sun Dec 17 11:17:11 2006
@@ -50,51 +50,41 @@
Assert.assertEquals(Scope.COMPOSITE, composite.getScope());
}
- public void testGetChildren() {
+ public void testGetChildren() throws Exception {
CompositeComponent composite = new CompositeComponentImpl("parent", null, null, null);
composite.register(new ServiceExtension("foo", null, null, null));
Assert.assertEquals(1, composite.getChildren().size());
}
- public void testGetServices() {
+ public void testGetServices() throws Exception {
CompositeComponent composite = new CompositeComponentImpl("parent", null, null, null);
composite.register(new ServiceExtension("foo", null, null, null));
composite.register(getReference("bar"));
Assert.assertEquals(1, composite.getServices().size());
}
- public void testGetService() {
+ public void testGetService() throws Exception {
CompositeComponent composite = new CompositeComponentImpl("parent", null, null, null);
composite.register(new ServiceExtension("foo", null, null, null));
composite.start();
assertNotNull(composite.getService("foo"));
}
- public void testServiceNotFound() {
+ public void testServiceNotFound() throws Exception {
CompositeComponent composite = new CompositeComponentImpl("parent", null, null, null);
composite.register(new ServiceExtension("foo", null, null, null));
composite.start();
- try {
- composite.getService("bar");
- fail();
- } catch (TargetNotFoundException e) {
- // expected
- }
+ assertNull(composite.getService("bar"));
}
- public void testNotService() {
+ public void testNotService() throws Exception {
CompositeComponent composite = new CompositeComponentImpl("parent", null, null, null);
composite.register(getReference("foo"));
composite.start();
- try {
- composite.getService("foo");
- fail();
- } catch (TargetNotFoundException e) {
- // expected
- }
+ assertNull(composite.getService("foo"));
}
- public void testTargetNotFound() {
+ public void testTargetNotFound() throws Exception {
CompositeComponent composite = new CompositeComponentImpl("parent", null, null, null);
composite.register(getReference("foo"));
composite.start();
@@ -106,14 +96,14 @@
}
}
- public void testReferencesServices() {
+ public void testReferencesServices() throws Exception {
CompositeComponent composite = new CompositeComponentImpl("parent", null, null, null);
composite.register(new ServiceExtension("foo", null, null, null));
composite.register(getReference("bar"));
Assert.assertEquals(1, composite.getReferences().size());
}
- public void testServiceInterfaces() {
+ public void testServiceInterfaces() throws Exception {
CompositeComponent composite = new CompositeComponentImpl("parent", null, null, null);
Service service1 = getService("foo", Foo.class);
composite.register(service1);
@@ -129,7 +119,7 @@
}
}
- public void testGetServiceInstanceByName() {
+ public void testGetServiceInstanceByName() throws Exception {
CompositeComponent composite = new CompositeComponentImpl("parent", null, null, null);
Service service = createMock(Service.class);
EasyMock.expect(service.isSystem()).andReturn(false).atLeastOnce();
@@ -145,7 +135,7 @@
assertNotNull(composite.getServiceInstance("foo"));
}
- public void testGetServiceInstanceNotFound() {
+ public void testGetServiceInstanceNotFound() throws Exception {
CompositeComponent composite = new CompositeComponentImpl("parent", null, null, null);
Service service = getService("foo", Foo.class);
composite.register(service);
@@ -157,7 +147,7 @@
}
}
- public void testGetServiceInstanceNotService() {
+ public void testGetServiceInstanceNotService() throws Exception {
CompositeComponent composite = new CompositeComponentImpl("parent", null, null, null);
Reference reference = getReference("foo");
composite.register(reference);
Modified: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/composite/CompositeComponentResolutionTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/composite/CompositeComponentResolutionTestCase.java?view=diff&rev=488028&r1=488027&r2=488028
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/composite/CompositeComponentResolutionTestCase.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/composite/CompositeComponentResolutionTestCase.java Sun Dec 17 11:17:11 2006
@@ -25,7 +25,6 @@
import org.apache.tuscany.spi.component.CompositeComponent;
import org.apache.tuscany.spi.component.Service;
import org.apache.tuscany.spi.component.SystemAtomicComponent;
-import org.apache.tuscany.spi.component.TargetNotFoundException;
import junit.framework.TestCase;
import org.apache.tuscany.core.mock.component.Source;
@@ -39,7 +38,7 @@
*/
public class CompositeComponentResolutionTestCase extends TestCase {
- public void testSystemComponentResolution() throws NoSuchMethodException {
+ public void testSystemComponentResolution() throws Exception {
CompositeComponent parent = new CompositeComponentImpl("foo", null, null, true);
parent.start();
List<Class<?>> interfaces = new ArrayList<Class<?>>();
@@ -59,7 +58,7 @@
EasyMock.verify(component);
}
- public void testLocateSystemService() throws NoSuchMethodException {
+ public void testLocateSystemService() throws Exception {
CompositeComponent parent = new CompositeComponentImpl("foo", null, null, true);
parent.start();
List<Class<?>> interfaces = new ArrayList<Class<?>>();
@@ -77,7 +76,7 @@
EasyMock.verify(component);
}
- public void testLocateService() throws NoSuchMethodException {
+ public void testLocateService() throws Exception {
CompositeComponent parent = new CompositeComponentImpl("foo", null, null, null);
parent.start();
List<Class<?>> interfaces = new ArrayList<Class<?>>();
@@ -95,7 +94,7 @@
EasyMock.verify(component);
}
- public void testComponentResolution() throws NoSuchMethodException {
+ public void testComponentResolution() throws Exception {
CompositeComponent parent = new CompositeComponentImpl("foo", null, null, null);
parent.start();
List<Class<?>> interfaces = new ArrayList<Class<?>>();
@@ -116,7 +115,7 @@
}
- public void testGetService() throws NoSuchMethodException {
+ public void testGetService() throws Exception {
CompositeComponent parent = new CompositeComponentImpl("foo", null, null, null);
parent.start();
Service service = EasyMock.createMock(Service.class);
@@ -127,16 +126,11 @@
EasyMock.replay(service);
parent.register(service);
assertNotNull(parent.getService("source"));
- try {
- parent.getSystemService("source");
- fail();
- } catch (TargetNotFoundException e) {
- // expected
- }
+ assertNull(parent.getSystemService("source"));
EasyMock.verify(service);
}
- public void testSystemGetService() throws NoSuchMethodException {
+ public void testSystemGetService() throws Exception {
CompositeComponent parent = new CompositeComponentImpl("foo", null, null, true);
parent.start();
Service service = EasyMock.createMock(Service.class);
@@ -147,12 +141,7 @@
EasyMock.replay(service);
parent.register(service);
assertNotNull(parent.getSystemService("source"));
- try {
- parent.getService("source");
- fail();
- } catch (TargetNotFoundException e) {
- // expected
- }
+ assertNull(parent.getService("source"));
EasyMock.verify(service);
}
Modified: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/composite/CompositeLifecycleTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/composite/CompositeLifecycleTestCase.java?view=diff&rev=488028&r1=488027&r2=488028
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/composite/CompositeLifecycleTestCase.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/composite/CompositeLifecycleTestCase.java Sun Dec 17 11:17:11 2006
@@ -45,7 +45,7 @@
composite.stop();
}
- public void testSystemRestart() throws NoSuchMethodException {
+ public void testSystemRestart() throws Exception {
List<Class<?>> interfaces = new ArrayList<Class<?>>();
interfaces.add(Source.class);
Source originalSource = new SourceImpl();
@@ -75,7 +75,7 @@
EasyMock.verify(component);
}
- public void testRestart() throws NoSuchMethodException {
+ public void testRestart() throws Exception {
List<Class<?>> interfaces = new ArrayList<Class<?>>();
interfaces.add(Source.class);
Source originalSource = new SourceImpl();
@@ -105,7 +105,7 @@
EasyMock.verify(component);
}
- public void testChildStoppedBeforeParent() {
+ public void testChildStoppedBeforeParent() throws Exception {
CompositeComponent parent = new CompositeComponentImpl("parent", null, null, null);
CompositeComponent child = new CompositeComponentImpl("child", null, null, null);
parent.register(child);
Modified: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/composite/CompositePropagationTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/composite/CompositePropagationTestCase.java?view=diff&rev=488028&r1=488027&r2=488028
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/composite/CompositePropagationTestCase.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/composite/CompositePropagationTestCase.java Sun Dec 17 11:17:11 2006
@@ -33,7 +33,6 @@
import static org.easymock.EasyMock.verify;
/**
- *
* @version $Rev$ $Date$
*/
public class CompositePropagationTestCase extends TestCase {
@@ -41,7 +40,7 @@
private CompositeComponent parent;
private CompositeComponent child2;
- public void testSystemLifecyclePropagation() throws NoSuchMethodException {
+ public void testSystemLifecyclePropagation() throws Exception {
parent.start();
List<Class<?>> interfaces = new ArrayList<Class<?>>();
interfaces.add(Source.class);
@@ -56,7 +55,7 @@
verify(component);
}
- public void testLifecyclePropagation() throws NoSuchMethodException {
+ public void testLifecyclePropagation() throws Exception {
parent.start();
List<Class<?>> interfaces = new ArrayList<Class<?>>();
interfaces.add(Source.class);
Modified: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/composite/JavaObjectRegistrationTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/composite/JavaObjectRegistrationTestCase.java?view=diff&rev=488028&r1=488027&r2=488028
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/composite/JavaObjectRegistrationTestCase.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/composite/JavaObjectRegistrationTestCase.java Sun Dec 17 11:17:11 2006
@@ -18,8 +18,6 @@
*/
package org.apache.tuscany.core.implementation.composite;
-import javax.naming.ConfigurationException;
-
import org.apache.tuscany.spi.component.CompositeComponent;
import org.apache.tuscany.spi.component.DuplicateNameException;
@@ -40,7 +38,7 @@
assertSame(instance, resolvedInstance);
}
- public void testDuplicateRegistration() throws ConfigurationException {
+ public void testDuplicateRegistration() throws Exception {
MockComponent instance = new MockComponent();
composite.registerJavaObject("foo", MockComponent.class, instance);
try {
@@ -51,14 +49,14 @@
}
}
- public void testSystemAutowireToObject() {
+ public void testSystemAutowireToObject() throws Exception {
MockComponent instance = new MockComponent();
composite.registerJavaObject("foo", MockComponent.class, instance);
assertSame(instance, composite.resolveSystemInstance(MockComponent.class));
assertNull(composite.resolveSystemExternalInstance(MockComponent.class));
}
- public void testApplicationAutowireToObject() {
+ public void testApplicationAutowireToObject() throws Exception {
MockComponent instance = new MockComponent();
composite.registerJavaObject("foo", MockComponent.class, instance);
assertNull(composite.resolveInstance(MockComponent.class));
Modified: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/java/JavaComponentBuilderReferenceTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/java/JavaComponentBuilderReferenceTestCase.java?view=diff&rev=488028&r1=488027&r2=488028
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/java/JavaComponentBuilderReferenceTestCase.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/java/JavaComponentBuilderReferenceTestCase.java Sun Dec 17 11:17:11 2006
@@ -19,14 +19,14 @@
package org.apache.tuscany.core.implementation.java;
import java.lang.reflect.Constructor;
+import java.util.Collections;
import java.util.HashMap;
import java.util.Map;
-import java.util.Collections;
import org.apache.tuscany.spi.component.AtomicComponent;
import org.apache.tuscany.spi.component.CompositeComponent;
-import org.apache.tuscany.spi.component.ScopeContainer;
import org.apache.tuscany.spi.component.SCAObject;
+import org.apache.tuscany.spi.component.ScopeContainer;
import org.apache.tuscany.spi.deployer.DeploymentContext;
import org.apache.tuscany.spi.idl.java.JavaServiceContract;
import org.apache.tuscany.spi.implementation.java.ConstructorDefinition;
@@ -35,13 +35,13 @@
import org.apache.tuscany.spi.implementation.java.JavaMappedService;
import org.apache.tuscany.spi.implementation.java.PojoComponentType;
import org.apache.tuscany.spi.model.ComponentDefinition;
+import org.apache.tuscany.spi.model.InteractionScope;
+import org.apache.tuscany.spi.model.Operation;
import org.apache.tuscany.spi.model.Scope;
import org.apache.tuscany.spi.model.ServiceContract;
-import org.apache.tuscany.spi.model.Operation;
-import org.apache.tuscany.spi.model.InteractionScope;
-import org.apache.tuscany.spi.wire.WireService;
-import org.apache.tuscany.spi.wire.OutboundWire;
import org.apache.tuscany.spi.wire.OutboundInvocationChain;
+import org.apache.tuscany.spi.wire.OutboundWire;
+import org.apache.tuscany.spi.wire.WireService;
import junit.framework.TestCase;
import org.apache.tuscany.core.implementation.composite.CompositeComponentImpl;
@@ -52,7 +52,7 @@
import org.easymock.EasyMock;
import org.easymock.IAnswer;
-/**
+/**
* @version $$Rev$$ $$Date$$
*/
public class JavaComponentBuilderReferenceTestCase extends TestCase {
@@ -84,7 +84,7 @@
JavaComponentBuilder builder = new JavaComponentBuilder();
builder.setWireService(wireService);
- JavaAtomicComponent component = (JavaAtomicComponent) builder.build(parent, definition, deploymentContext);
+ JavaAtomicComponent component = (JavaAtomicComponent) builder.build(parent, definition, deploymentContext);
component.addOutboundWire(wire);
deploymentContext.getModuleScope().start();
component.start();
@@ -104,7 +104,7 @@
}
- private void createDeploymentContext() {
+ private void createDeploymentContext() throws Exception {
ScopeContainer scope = EasyMock.createMock(ScopeContainer.class);
scope.start();
scope.stop();
Modified: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/java/JavaReferenceWireTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/java/JavaReferenceWireTestCase.java?view=diff&rev=488028&r1=488027&r2=488028
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/java/JavaReferenceWireTestCase.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/java/JavaReferenceWireTestCase.java Sun Dec 17 11:17:11 2006
@@ -24,6 +24,7 @@
import org.apache.tuscany.spi.component.AtomicComponent;
import org.apache.tuscany.spi.component.ScopeContainer;
+import org.apache.tuscany.spi.component.TargetException;
import org.apache.tuscany.spi.model.Operation;
import org.apache.tuscany.spi.model.Scope;
import org.apache.tuscany.spi.wire.OutboundInvocationChain;
@@ -81,7 +82,7 @@
EasyMock.verify(service);
}
- private ScopeContainer createMock() {
+ private ScopeContainer createMock() throws TargetException {
ScopeContainer scope = EasyMock.createMock(ScopeContainer.class);
scope.start();
scope.stop();
Modified: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/system/component/SystemAtomicComponentWireInvocationTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/system/component/SystemAtomicComponentWireInvocationTestCase.java?view=diff&rev=488028&r1=488027&r2=488028
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/system/component/SystemAtomicComponentWireInvocationTestCase.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/system/component/SystemAtomicComponentWireInvocationTestCase.java Sun Dec 17 11:17:11 2006
@@ -41,7 +41,7 @@
*/
public class SystemAtomicComponentWireInvocationTestCase extends TestCase {
- public void testWireResolution() throws NoSuchMethodException {
+ public void testWireResolution() throws Exception {
ModuleScopeContainer scope = new ModuleScopeContainer(null);
scope.start();
Target target = new TargetImpl();
Modified: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/system/component/SystemServiceComponentWireTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/system/component/SystemServiceComponentWireTestCase.java?view=diff&rev=488028&r1=488027&r2=488028
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/system/component/SystemServiceComponentWireTestCase.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/system/component/SystemServiceComponentWireTestCase.java Sun Dec 17 11:17:11 2006
@@ -34,7 +34,7 @@
*/
public class SystemServiceComponentWireTestCase extends TestCase {
- public void testServiceContext() throws NoSuchMethodException {
+ public void testServiceContext() throws Exception {
Target target = new TargetImpl();
SystemOutboundWire outboundWire = EasyMock.createMock(SystemOutboundWire.class);
EasyMock.expect(outboundWire.getTargetService()).andReturn(target);
Modified: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/system/component/SystemSingletonAtomicComponentTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/system/component/SystemSingletonAtomicComponentTestCase.java?view=diff&rev=488028&r1=488027&r2=488028
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/system/component/SystemSingletonAtomicComponentTestCase.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/system/component/SystemSingletonAtomicComponentTestCase.java Sun Dec 17 11:17:11 2006
@@ -18,6 +18,8 @@
*/
package org.apache.tuscany.core.implementation.system.component;
+import org.apache.tuscany.spi.component.TargetException;
+
import junit.framework.TestCase;
/**
@@ -25,7 +27,7 @@
*/
public class SystemSingletonAtomicComponentTestCase extends TestCase {
- public void testGetInstance() {
+ public void testGetInstance() throws TargetException {
FooImpl foo = new FooImpl();
SystemSingletonAtomicComponent<Foo, FooImpl> component =
new SystemSingletonAtomicComponent<Foo, FooImpl>("foo", null, Foo.class, foo);
Modified: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/system/component/SystemWireObjectFactoryTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/system/component/SystemWireObjectFactoryTestCase.java?view=diff&rev=488028&r1=488027&r2=488028
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/system/component/SystemWireObjectFactoryTestCase.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/system/component/SystemWireObjectFactoryTestCase.java Sun Dec 17 11:17:11 2006
@@ -27,7 +27,7 @@
*/
public class SystemWireObjectFactoryTestCase extends TestCase {
- public void testGetInstance() {
+ public void testGetInstance() throws Exception {
Foo foo = new Foo();
SystemOutboundWire wire = EasyMock.createMock(SystemOutboundWire.class);
EasyMock.expect(wire.getTargetService()).andReturn(foo);
Modified: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/system/wire/SystemInboundtoOutboundTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/system/wire/SystemInboundtoOutboundTestCase.java?view=diff&rev=488028&r1=488027&r2=488028
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/system/wire/SystemInboundtoOutboundTestCase.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/system/wire/SystemInboundtoOutboundTestCase.java Sun Dec 17 11:17:11 2006
@@ -30,7 +30,7 @@
*/
public class SystemInboundtoOutboundTestCase extends TestCase {
- public void testWire() throws NoSuchMethodException {
+ public void testWire() throws Exception {
Target target = new TargetImpl();
SystemOutboundWire outboundWire = EasyMock.createMock(SystemOutboundWire.class);
EasyMock.expect(outboundWire.getTargetService()).andReturn(target);
Modified: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/system/wire/SystemOutboundAutowireTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/system/wire/SystemOutboundAutowireTestCase.java?view=diff&rev=488028&r1=488027&r2=488028
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/system/wire/SystemOutboundAutowireTestCase.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/system/wire/SystemOutboundAutowireTestCase.java Sun Dec 17 11:17:11 2006
@@ -32,7 +32,7 @@
*/
public class SystemOutboundAutowireTestCase extends TestCase {
- public void testAutowire() {
+ public void testAutowire() throws Exception {
CompositeComponent component = createMock(CompositeComponent.class);
expect(component.resolveSystemInstance(Object.class)).andReturn(new Object());
replay(component);
@@ -42,7 +42,7 @@
}
- public void testNonExistentAutowire() {
+ public void testNonExistentAutowire() throws Exception {
CompositeComponent component = createMock(CompositeComponent.class);
expect(component.resolveSystemInstance(Object.class)).andReturn(null);
replay(component);
@@ -57,7 +57,7 @@
}
- public void testNonExistentAutowireNotRequired() {
+ public void testNonExistentAutowireNotRequired() throws Exception {
CompositeComponent component = createMock(CompositeComponent.class);
expect(component.resolveSystemInstance(Object.class)).andReturn(null);
replay(component);
Modified: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/system/wire/SystemOutboundToInboundTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/system/wire/SystemOutboundToInboundTestCase.java?view=diff&rev=488028&r1=488027&r2=488028
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/system/wire/SystemOutboundToInboundTestCase.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/system/wire/SystemOutboundToInboundTestCase.java Sun Dec 17 11:17:11 2006
@@ -32,7 +32,7 @@
*/
public class SystemOutboundToInboundTestCase extends TestCase {
- public void testWire() throws NoSuchMethodException {
+ public void testWire() throws Exception {
Target target = new TargetImpl();
SystemInboundWire inboundWire = EasyMock.createMock(SystemInboundWire.class);
EasyMock.expect(inboundWire.getTargetService()).andReturn(target);
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=488028&r1=488027&r2=488028
==============================================================================
--- 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 Sun Dec 17 11:17:11 2006
@@ -29,6 +29,7 @@
import org.apache.tuscany.spi.component.AtomicComponent;
import org.apache.tuscany.spi.component.ScopeContainer;
+import org.apache.tuscany.spi.component.TargetException;
import org.apache.tuscany.spi.component.WorkContext;
import org.apache.tuscany.spi.model.Scope;
@@ -45,11 +46,11 @@
import org.apache.tuscany.core.component.scope.RequestScopeContainer;
import org.apache.tuscany.core.component.scope.StatelessScopeContainer;
import org.apache.tuscany.core.integration.mock.MockFactory;
-import org.apache.tuscany.core.util.JavaIntrospectionHelper;
-import org.apache.tuscany.core.mock.component.TargetImpl;
-import org.apache.tuscany.core.mock.component.Target;
-import org.apache.tuscany.core.mock.component.SourceImpl;
import org.apache.tuscany.core.mock.component.Source;
+import org.apache.tuscany.core.mock.component.SourceImpl;
+import org.apache.tuscany.core.mock.component.Target;
+import org.apache.tuscany.core.mock.component.TargetImpl;
+import org.apache.tuscany.core.util.JavaIntrospectionHelper;
/**
* Tests scoping is properly handled for service references
@@ -161,7 +162,12 @@
FutureTask<Void> future = new FutureTask<Void>(new Runnable() {
public void run() {
requestScope.onEvent(new RequestStart(this));
- Target target2 = (Target) targetComponent.getServiceInstance();
+ Target target2 = null;
+ try {
+ target2 = (Target) targetComponent.getServiceInstance();
+ } catch (TargetException e) {
+ fail(e.getMessage());
+ }
assertFalse("foo".equals(target2.getString()));
assertFalse("foo".equals(source.getTarget().getString()));
source.getTarget().setString("bar");
@@ -336,7 +342,12 @@
FutureTask<Void> future = new FutureTask<Void>(new Runnable() {
public void run() {
requestScope.onEvent(new RequestStart(this));
- Target target2 = (Target) targetComponent.getServiceInstance();
+ Target target2 = null;
+ try {
+ target2 = (Target) targetComponent.getServiceInstance();
+ } catch (TargetException e) {
+ fail(e.getMessage());
+ }
assertFalse("foo".equals(target2.getString()));
assertFalse("foo".equals(source.getTarget().getString()));
source.getTarget().setString("bar");
@@ -420,8 +431,14 @@
FutureTask<Void> future = new FutureTask<Void>(new Runnable() {
public void run() {
requestScope.onEvent(new RequestStart(this));
- Source source2 = (Source) sourceComponent.getServiceInstance();
- Target target2 = (Target) targetComponent.getServiceInstance();
+ Source source2 = null;
+ Target target2 = null;
+ try {
+ source2 = (Source) sourceComponent.getServiceInstance();
+ target2 = (Target) targetComponent.getServiceInstance();
+ } catch (TargetException e) {
+ fail(e.getMessage());
+ }
assertFalse("foo".equals(target2.getString()));
assertFalse("foo".equals(source2.getTarget().getString()));
source2.getTarget().setString("bar");
@@ -466,8 +483,14 @@
FutureTask<Void> future = new FutureTask<Void>(new Runnable() {
public void run() {
requestScope.onEvent(new RequestStart(this));
- Source source2 = (Source) sourceComponent.getServiceInstance();
- Target target2 = (Target) targetComponent.getServiceInstance();
+ Source source2 = null;
+ Target target2 = null;
+ try {
+ source2 = (Source) sourceComponent.getServiceInstance();
+ target2 = (Target) targetComponent.getServiceInstance();
+ } catch (TargetException e) {
+ fail(e.getMessage());
+ }
assertEquals("foo", target2.getString());
assertEquals("foo", source2.getTarget().getString());
source2.getTarget().setString("bar");
@@ -518,8 +541,14 @@
FutureTask<Void> future = new FutureTask<Void>(new Runnable() {
public void run() {
requestScope.onEvent(new RequestStart(this));
- Source source2 = (Source) sourceComponent.getServiceInstance();
- Target target2 = (Target) targetComponent.getServiceInstance();
+ Source source2 = null;
+ Target target2 = null;
+ try {
+ source2 = (Source) sourceComponent.getServiceInstance();
+ target2 = (Target) targetComponent.getServiceInstance();
+ } catch (TargetException e) {
+ fail(e.getMessage());
+ }
assertEquals("foo", target2.getString());
assertEquals("foo", source2.getTarget().getString());
source2.getTarget().setString("bar");
@@ -628,7 +657,12 @@
FutureTask<Void> future = new FutureTask<Void>(new Runnable() {
public void run() {
requestScope.onEvent(new RequestStart(this));
- Target target2 = (Target) targetComponent.getServiceInstance();
+ Target target2 = null;
+ try {
+ target2 = (Target) targetComponent.getServiceInstance();
+ } catch (TargetException e) {
+ fail(e.getMessage());
+ }
assertFalse("foo".equals(target2.getString()));
assertFalse("foo".equals(source.getTarget().getString()));
source.getTarget().setString("bar");
Modified: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/integration/wire/DifferentInterfaceWireTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/integration/wire/DifferentInterfaceWireTestCase.java?view=diff&rev=488028&r1=488027&r2=488028
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/integration/wire/DifferentInterfaceWireTestCase.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/integration/wire/DifferentInterfaceWireTestCase.java Sun Dec 17 11:17:11 2006
@@ -27,6 +27,7 @@
import org.apache.tuscany.spi.component.AtomicComponent;
import org.apache.tuscany.spi.component.ScopeContainer;
+import org.apache.tuscany.spi.component.TargetException;
import org.apache.tuscany.spi.model.Scope;
import junit.framework.TestCase;
@@ -109,7 +110,7 @@
super.tearDown();
}
- private ScopeContainer createMock() {
+ private ScopeContainer createMock() throws TargetException {
ScopeContainer scope = EasyMock.createMock(ScopeContainer.class);
scope.start();
scope.stop();
Added: incubator/tuscany/java/sca/kernel/host-api/src/main/java/org/apache/tuscany/host/runtime/InitializationException.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/host-api/src/main/java/org/apache/tuscany/host/runtime/InitializationException.java?view=auto&rev=488028
==============================================================================
--- incubator/tuscany/java/sca/kernel/host-api/src/main/java/org/apache/tuscany/host/runtime/InitializationException.java (added)
+++ incubator/tuscany/java/sca/kernel/host-api/src/main/java/org/apache/tuscany/host/runtime/InitializationException.java Sun Dec 17 11:17:11 2006
@@ -0,0 +1,33 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.tuscany.host.runtime;
+
+import org.apache.tuscany.api.TuscanyException;
+
+/**
+ * Denotes an error starting the runtime
+ *
+ * @version $Rev$ $Date$
+ */
+public class InitializationException extends TuscanyException {
+
+ public InitializationException(Throwable cause) {
+ super(cause);
+ }
+}
Propchange: incubator/tuscany/java/sca/kernel/host-api/src/main/java/org/apache/tuscany/host/runtime/InitializationException.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/tuscany/java/sca/kernel/host-api/src/main/java/org/apache/tuscany/host/runtime/InitializationException.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Added: incubator/tuscany/java/sca/kernel/host-api/src/main/java/org/apache/tuscany/host/runtime/ShutdownException.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/host-api/src/main/java/org/apache/tuscany/host/runtime/ShutdownException.java?view=auto&rev=488028
==============================================================================
--- incubator/tuscany/java/sca/kernel/host-api/src/main/java/org/apache/tuscany/host/runtime/ShutdownException.java (added)
+++ incubator/tuscany/java/sca/kernel/host-api/src/main/java/org/apache/tuscany/host/runtime/ShutdownException.java Sun Dec 17 11:17:11 2006
@@ -0,0 +1,33 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.tuscany.host.runtime;
+
+import org.apache.tuscany.api.TuscanyException;
+
+/**
+ * Denotes an error during runtime shutdown
+ *
+ * @version $Rev$ $Date$
+ */
+public class ShutdownException extends TuscanyException {
+
+ public ShutdownException(Throwable cause) {
+ super(cause);
+ }
+}
Propchange: incubator/tuscany/java/sca/kernel/host-api/src/main/java/org/apache/tuscany/host/runtime/ShutdownException.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/tuscany/java/sca/kernel/host-api/src/main/java/org/apache/tuscany/host/runtime/ShutdownException.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Modified: incubator/tuscany/java/sca/kernel/host-api/src/main/java/org/apache/tuscany/host/runtime/TuscanyRuntime.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/host-api/src/main/java/org/apache/tuscany/host/runtime/TuscanyRuntime.java?view=diff&rev=488028&r1=488027&r2=488028
==============================================================================
--- incubator/tuscany/java/sca/kernel/host-api/src/main/java/org/apache/tuscany/host/runtime/TuscanyRuntime.java (original)
+++ incubator/tuscany/java/sca/kernel/host-api/src/main/java/org/apache/tuscany/host/runtime/TuscanyRuntime.java Sun Dec 17 11:17:11 2006
@@ -22,8 +22,8 @@
import org.osoa.sca.SCA;
-import org.apache.tuscany.host.RuntimeInfo;
import org.apache.tuscany.host.MonitorFactory;
+import org.apache.tuscany.host.RuntimeInfo;
/**
* @version $Rev$ $Date$
@@ -45,12 +45,14 @@
/**
* Returns the name of the component associated with the application SCDL.
+ *
* @return the name of the component associated with the application SCDL
*/
String getApplicationName();
/**
* Sets the name of the component associated with the application SCDL.
+ *
* @param applicationName the name of the component associated with the application SCDL
*/
void setApplicationName(String applicationName);
@@ -91,15 +93,15 @@
RuntimeInfo getRuntimeInfo();
/**
- * Sets the info this runtime should make available to service components.
- * The instance supplied here should be registered in the system composite with the name
- * {@link RuntimeInfo#COMPONENT_NAME "RuntimeInfo"}.
+ * Sets the info this runtime should make available to service components. The instance supplied here should be
+ * registered in the system composite with the name {@link RuntimeInfo#COMPONENT_NAME "RuntimeInfo"}.
*
* @param runtimeInfo the information this runtime should make available to service components
*/
void setRuntimeInfo(RuntimeInfo runtimeInfo);
- /** Returns the MonitorFactory that this runtime is using.
+ /**
+ * Returns the MonitorFactory that this runtime is using.
*
* @return the MonitorFactory that this runtime is using
*/
@@ -107,6 +109,7 @@
/**
* Sets the MonitorFactory that this runtime should use.
+ *
* @param monitorFactory the MonitorFactory that this runtime should use
*/
void setMonitorFactory(MonitorFactory monitorFactory);
@@ -121,13 +124,16 @@
/**
* Initialize a runtime.
*
+ * @throws InitializationException if there is an error initializing the runtime
*/
- void initialize();
+ void initialize() throws InitializationException;
/**
* Destroy the runtime. Any further invocations should result in an error.
+ *
+ * @throws ShutdownException if there is an error destroying the runtime
*/
- void destroy();
+ void destroy() throws ShutdownException;
/**
* Returns the current SCA context
Modified: incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/bootstrap/RuntimeComponent.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/bootstrap/RuntimeComponent.java?view=diff&rev=488028&r1=488027&r2=488028
==============================================================================
--- incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/bootstrap/RuntimeComponent.java (original)
+++ incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/bootstrap/RuntimeComponent.java Sun Dec 17 11:17:11 2006
@@ -19,6 +19,7 @@
package org.apache.tuscany.spi.bootstrap;
import org.apache.tuscany.spi.component.CompositeComponent;
+import org.apache.tuscany.spi.component.TargetException;
import org.apache.tuscany.spi.deployer.Deployer;
/**
@@ -48,6 +49,7 @@
* Returns the deployer for this runtime. This interface can be used to deploy new SCA bundles to the runtime.
*
* @return the deployer for this runtime
+ * @throws TargetException if there is an error returning the deployer
*/
- Deployer getDeployer();
+ Deployer getDeployer() throws TargetException;
}
Added: incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/builder/BuilderInstantiationException.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/builder/BuilderInstantiationException.java?view=auto&rev=488028
==============================================================================
--- incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/builder/BuilderInstantiationException.java (added)
+++ incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/builder/BuilderInstantiationException.java Sun Dec 17 11:17:11 2006
@@ -0,0 +1,39 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.tuscany.spi.builder;
+
+/**
+ * Denotes an error instantiating an <code>SCAObject</code>
+ *
+ * @version $Rev$ $Date$
+ */
+public class BuilderInstantiationException extends BuilderException {
+
+ public BuilderInstantiationException(String message, String identifier) {
+ super(message, identifier);
+ }
+
+ public BuilderInstantiationException(String message, Throwable cause) {
+ super(message, cause);
+ }
+
+ public BuilderInstantiationException(String message, String identifier, Throwable cause) {
+ super(message, identifier, cause);
+ }
+}
Propchange: incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/builder/BuilderInstantiationException.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/builder/BuilderInstantiationException.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Modified: incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/builder/WiringException.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/builder/WiringException.java?view=diff&rev=488028&r1=488027&r2=488028
==============================================================================
--- incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/builder/WiringException.java (original)
+++ incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/builder/WiringException.java Sun Dec 17 11:17:11 2006
@@ -41,6 +41,10 @@
super(message, cause);
}
+ protected WiringException(String message, String identifier, Throwable cause) {
+ super(message, identifier, cause);
+ }
+
protected WiringException(Throwable cause) {
super(cause);
}
Modified: incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/component/Component.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/component/Component.java?view=diff&rev=488028&r1=488027&r2=488028
==============================================================================
--- incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/component/Component.java (original)
+++ incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/component/Component.java Sun Dec 17 11:17:11 2006
@@ -34,13 +34,6 @@
public interface Component extends SCAObject {
/**
- * Returns a service associated with the given name
- *
- * @throws TargetException if an error occurs retrieving the service instance
- */
- Object getServiceInstance(String name) throws TargetException;
-
- /**
* Returns the service interfaces implemented by the component
*/
List<Class<?>> getServiceInterfaces();
@@ -52,7 +45,7 @@
void addInboundWire(InboundWire wire);
/**
- * Returns the target-side wire associated with the given service name
+ * Returns the target-side wire associated with the given service name or null if not found
*/
InboundWire getInboundWire(String serviceName);
@@ -82,10 +75,20 @@
* Callback to create a {@link org.apache.tuscany.spi.wire.TargetInvoker} which dispatches to a service offered by
* the component
*
- * @param targetName
- * @param operation the operation to invoke
- * @param callbackWire
+ * @param targetName the service name
+ * @param operation the operation to invoke
+ * @param callbackWire the callback wire or null if the associated wire is unidirectional
+ * @throws TargetInvokerCreationException
*/
- TargetInvoker createTargetInvoker(String targetName, Operation operation, InboundWire callbackWire);
+ TargetInvoker createTargetInvoker(String targetName, Operation operation, InboundWire callbackWire)
+ throws TargetInvokerCreationException;
+
+ /**
+ * Returns a service associated with the given name
+ *
+ * @throws TargetException if an error occurs retrieving the service instance
+ */
+ Object getServiceInstance(String name) throws TargetException;
+
}
Modified: incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/component/ComponentException.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/component/ComponentException.java?view=diff&rev=488028&r1=488027&r2=488028
==============================================================================
--- incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/component/ComponentException.java (original)
+++ incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/component/ComponentException.java Sun Dec 17 11:17:11 2006
@@ -21,6 +21,8 @@
import org.apache.tuscany.api.TuscanyException;
/**
+ * An checked exception encountered by an {@link org.apache.tuscany.spi.component.Component}
+ *
* @version $Rev$ $Date$
*/
public abstract class ComponentException extends TuscanyException {
---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org