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/18 08:43:53 UTC
svn commit: r488144 [1/2] - in /incubator/tuscany/java/sca:
kernel/core/src/main/java/org/apache/tuscany/core/bootstrap/
kernel/core/src/main/java/org/apache/tuscany/core/component/scope/
kernel/core/src/main/java/org/apache/tuscany/core/implementation...
Author: jmarino
Date: Sun Dec 17 23:43:50 2006
New Revision: 488144
URL: http://svn.apache.org/viewvc?view=rev&rev=488144
Log:
refactor TargetException hierarchy, throwing more specific subclasses
Added:
incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/component/TargetResolutionException.java (contents, props changed)
- copied, changed from r488059, incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/component/scope/TargetRetrievalException.java
Removed:
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/component/scope/TargetPersistException.java
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/component/scope/TargetRetrievalException.java
Modified:
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/bootstrap/DefaultRuntime.java
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/ConversationalScopeContainer.java
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/component/scope/HttpSessionScopeContainer.java
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/component/scope/InstanceWrapper.java
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/component/scope/InstanceWrapperImpl.java
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/component/scope/ModuleScopeContainer.java
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/component/scope/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/implementation/PojoAtomicComponent.java
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/composite/CompositeService.java
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/java/JavaAtomicComponent.java
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/system/component/SystemAtomicComponentImpl.java
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/system/component/SystemReferenceImpl.java
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/system/component/SystemServiceImpl.java
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/system/component/SystemSingletonAtomicComponent.java
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/system/component/SystemWireObjectFactory.java
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/system/wire/SystemInboundWireImpl.java
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/system/wire/SystemOutboundAutowire.java
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/system/wire/SystemOutboundWireImpl.java
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/injection/ResourceObjectFactory.java
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/launcher/CompositeContextImpl.java
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/wire/InboundWireImpl.java
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/wire/OutboundWireImpl.java
incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/databinding/impl/PassByValueWirePostProcessorTestCase.java
incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/component/Component.java
incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/component/CompositeComponent.java
incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/component/IllegalTargetException.java
incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/component/SCAObject.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/component/SystemAtomicComponent.java
incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/component/TargetDestructionException.java
incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/component/TargetInitializationException.java
incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/component/TargetNotFoundException.java
incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/extension/CompositeComponentExtension.java
incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/extension/ReferenceExtension.java
incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/extension/ServiceExtension.java
incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/extension/SystemAtomicComponentExtension.java
incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/wire/RuntimeWire.java
incubator/tuscany/java/sca/kernel/spi/src/test/java/org/apache/tuscany/spi/component/AbstractSCAObjectTestCase.java
incubator/tuscany/java/sca/kernel/spi/src/test/java/org/apache/tuscany/spi/extension/AtomicComponentExtensionTestCase.java
incubator/tuscany/java/sca/services/containers/container.groovy/src/main/java/org/apache/tuscany/container/groovy/GroovyAtomicComponent.java
incubator/tuscany/java/sca/services/containers/container.javascript/src/main/java/org/apache/tuscany/container/javascript/JavaScriptComponent.java
incubator/tuscany/java/sca/services/containers/container.ruby/src/main/java/org/apache/tuscany/container/ruby/RubyComponent.java
incubator/tuscany/java/sca/services/containers/container.script/src/main/java/org/apache/tuscany/container/script/ScriptComponent.java
incubator/tuscany/java/sca/services/persistence/datasource/src/main/java/org/apache/tuscany/persistence/datasource/DataSourceComponent.java
incubator/tuscany/java/sca/services/persistence/openjpa/src/main/java/org/apache/tuscany/service/openjpa/JPAAtomicComponent.java
incubator/tuscany/java/sca/services/persistence/store.journal/src/test/java/org/apache/tuscany/persistence/store/journal/performance/MockSCAObject.java
Modified: incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/bootstrap/DefaultRuntime.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/bootstrap/DefaultRuntime.java?view=diff&rev=488144&r1=488143&r2=488144
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/bootstrap/DefaultRuntime.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/bootstrap/DefaultRuntime.java Sun Dec 17 23:43:50 2006
@@ -26,7 +26,7 @@
import org.apache.tuscany.spi.bootstrap.ComponentNames;
import org.apache.tuscany.spi.bootstrap.RuntimeComponent;
import org.apache.tuscany.spi.component.CompositeComponent;
-import org.apache.tuscany.spi.component.TargetException;
+import org.apache.tuscany.spi.component.TargetResolutionException;
import org.apache.tuscany.spi.deployer.Deployer;
import org.apache.tuscany.core.implementation.composite.CompositeComponentImpl;
@@ -72,7 +72,7 @@
return systemComponent;
}
- public Deployer getDeployer() throws TargetException {
+ public Deployer getDeployer() throws TargetResolutionException {
return systemComponent.resolveExternalInstance(Deployer.class);
}
}
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=488144&r1=488143&r2=488144
==============================================================================
--- 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 Dec 17 23:43:50 2006
@@ -28,8 +28,8 @@
import org.apache.tuscany.spi.component.AtomicComponent;
import org.apache.tuscany.spi.component.PersistenceException;
import org.apache.tuscany.spi.component.ScopeContainer;
-import org.apache.tuscany.spi.component.TargetException;
import org.apache.tuscany.spi.component.TargetNotFoundException;
+import org.apache.tuscany.spi.component.TargetResolutionException;
import org.apache.tuscany.spi.component.WorkContext;
import org.apache.tuscany.spi.event.Event;
import org.apache.tuscany.spi.event.EventFilter;
@@ -103,7 +103,7 @@
}
}
- public Object getInstance(AtomicComponent component) throws TargetException {
+ public Object getInstance(AtomicComponent component) throws TargetResolutionException {
InstanceWrapper ctx = getInstanceWrapper(component, true);
if (ctx != null) {
if (!ctx.isStarted()) {
@@ -114,7 +114,7 @@
return null;
}
- public Object getAssociatedInstance(AtomicComponent component) throws TargetException {
+ public Object getAssociatedInstance(AtomicComponent component) throws TargetResolutionException {
InstanceWrapper ctx = getInstanceWrapper(component, false);
if (ctx != null) {
if (!ctx.isStarted()) {
@@ -162,5 +162,5 @@
}
protected abstract InstanceWrapper getInstanceWrapper(AtomicComponent component, boolean create)
- throws TargetException;
+ throws TargetResolutionException;
}
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=488144&r1=488143&r2=488144
==============================================================================
--- 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 Dec 17 23:43:50 2006
@@ -25,8 +25,8 @@
import org.apache.tuscany.spi.component.AtomicComponent;
import org.apache.tuscany.spi.component.PersistenceException;
import org.apache.tuscany.spi.component.ScopeContainer;
-import org.apache.tuscany.spi.component.TargetException;
import org.apache.tuscany.spi.component.TargetNotFoundException;
+import org.apache.tuscany.spi.component.TargetResolutionException;
import org.apache.tuscany.spi.component.WorkContext;
import org.apache.tuscany.spi.event.Event;
import org.apache.tuscany.spi.model.Scope;
@@ -74,7 +74,7 @@
}
@Override
- public Object getInstance(AtomicComponent component) throws TargetException {
+ public Object getInstance(AtomicComponent component) throws TargetResolutionException {
String conversationId = getConversationId();
try {
workContext.setCurrentAtomicComponent(component);
@@ -93,15 +93,15 @@
return o;
}
} catch (StoreReadException e) {
- throw new TargetRetrievalException("Error retrieving target instance", e);
+ throw new TargetResolutionException("Error retrieving target instance", e);
} catch (StoreWriteException e) {
- throw new TargetPersistException("Error persisting target instance", e);
+ throw new TargetResolutionException("Error persisting target instance", e);
} finally {
workContext.setCurrentAtomicComponent(null);
}
}
- public Object getAssociatedInstance(AtomicComponent component) throws TargetException {
+ public Object getAssociatedInstance(AtomicComponent component) throws TargetResolutionException {
String conversationId = getConversationId();
try {
workContext.setCurrentAtomicComponent(component);
@@ -117,9 +117,9 @@
throw new TargetNotFoundException(component.getName());
}
} catch (StoreReadException e) {
- throw new TargetRetrievalException("Error retrieving target instance", e);
+ throw new TargetResolutionException("Error retrieving target instance", e);
} catch (StoreWriteException e) {
- throw new TargetPersistException("Error persisting target instance", e);
+ throw new TargetResolutionException("Error persisting target instance", e);
} finally {
workContext.setCurrentAtomicComponent(null);
}
Modified: incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/component/scope/HttpSessionScopeContainer.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/component/scope/HttpSessionScopeContainer.java?view=diff&rev=488144&r1=488143&r2=488144
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/component/scope/HttpSessionScopeContainer.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/component/scope/HttpSessionScopeContainer.java Sun Dec 17 23:43:50 2006
@@ -26,8 +26,9 @@
import org.apache.tuscany.spi.ObjectCreationException;
import org.apache.tuscany.spi.component.AtomicComponent;
+import org.apache.tuscany.spi.component.TargetDestructionException;
+import org.apache.tuscany.spi.component.TargetResolutionException;
import org.apache.tuscany.spi.component.WorkContext;
-import org.apache.tuscany.spi.component.TargetException;
import org.apache.tuscany.spi.event.Event;
import org.apache.tuscany.spi.model.Scope;
@@ -69,7 +70,7 @@
} catch (ObjectCreationException e) {
// FIXME JFM
e.printStackTrace();
- } catch (TargetException e) {
+ } catch (TargetResolutionException e) {
// FIXME JFM
e.printStackTrace();
@@ -104,13 +105,15 @@
}
- protected InstanceWrapper getInstanceWrapper(AtomicComponent component, boolean create) throws TargetException {
+ protected InstanceWrapper getInstanceWrapper(AtomicComponent component, boolean create) throws
+ TargetResolutionException {
Object key = workContext.getIdentifier(Scope.SESSION);
assert key != null : "HTTP session key not bound in work context";
return getInstance(component, key, create);
}
- private InstanceWrapper getInstance(AtomicComponent component, Object key, boolean create) throws TargetException {
+ private InstanceWrapper getInstance(AtomicComponent component, Object key, boolean create)
+ throws TargetResolutionException {
Map<Object, InstanceWrapper> wrappers = contexts.get(component);
InstanceWrapper ctx = wrappers.get(key);
if (ctx == null && !create) {
@@ -144,7 +147,7 @@
while (iter.hasPrevious()) {
try {
iter.previous().stop();
- } catch (TargetException e) {
+ } catch (TargetDestructionException e) {
// JFM FIXME
e.printStackTrace();
}
Modified: incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/component/scope/InstanceWrapper.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/component/scope/InstanceWrapper.java?view=diff&rev=488144&r1=488143&r2=488144
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/component/scope/InstanceWrapper.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/component/scope/InstanceWrapper.java Sun Dec 17 23:43:50 2006
@@ -18,7 +18,8 @@
*/
package org.apache.tuscany.core.component.scope;
-import org.apache.tuscany.spi.component.TargetException;
+import org.apache.tuscany.spi.component.TargetDestructionException;
+import org.apache.tuscany.spi.component.TargetInitializationException;
/**
* Provides lifecycle management for an implementation instance associated with an {@link
@@ -33,8 +34,8 @@
boolean isStarted();
- void start() throws TargetException;
+ void start() throws TargetInitializationException;
- void stop() throws TargetException;
+ void stop() throws TargetDestructionException;
}
Modified: incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/component/scope/InstanceWrapperImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/component/scope/InstanceWrapperImpl.java?view=diff&rev=488144&r1=488143&r2=488144
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/component/scope/InstanceWrapperImpl.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/component/scope/InstanceWrapperImpl.java Sun Dec 17 23:43:50 2006
@@ -19,7 +19,8 @@
package org.apache.tuscany.core.component.scope;
import org.apache.tuscany.spi.component.AtomicComponent;
-import org.apache.tuscany.spi.component.TargetException;
+import org.apache.tuscany.spi.component.TargetDestructionException;
+import org.apache.tuscany.spi.component.TargetInitializationException;
/**
* Default implementation of an <code>InstanceWrapper</code>
@@ -49,12 +50,12 @@
return instance;
}
- public void start() throws TargetException {
+ public void start() throws TargetInitializationException {
component.init(instance);
started = true;
}
- public void stop() throws TargetException {
+ public void stop() throws TargetDestructionException {
component.destroy(instance);
started = false;
}
Modified: incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/component/scope/ModuleScopeContainer.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/component/scope/ModuleScopeContainer.java?view=diff&rev=488144&r1=488143&r2=488144
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/component/scope/ModuleScopeContainer.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/component/scope/ModuleScopeContainer.java Sun Dec 17 23:43:50 2006
@@ -28,7 +28,9 @@
import org.apache.tuscany.spi.ObjectCreationException;
import org.apache.tuscany.spi.component.AtomicComponent;
-import org.apache.tuscany.spi.component.TargetException;
+import org.apache.tuscany.spi.component.TargetDestructionException;
+import org.apache.tuscany.spi.component.TargetInitializationException;
+import org.apache.tuscany.spi.component.TargetResolutionException;
import org.apache.tuscany.spi.component.WorkContext;
import org.apache.tuscany.spi.event.Event;
import org.apache.tuscany.spi.model.Scope;
@@ -70,7 +72,7 @@
if (event instanceof CompositeStart) {
try {
eagerInitComponents();
- } catch (TargetException e) {
+ } catch (TargetResolutionException e) {
// JFM FIXME
e.printStackTrace();
}
@@ -109,7 +111,7 @@
while (iter.hasPrevious()) {
try {
iter.previous().stop();
- } catch (TargetException e) {
+ } catch (TargetDestructionException e) {
// JFM FIXME
e.printStackTrace();
}
@@ -123,7 +125,8 @@
instanceWrappers.put(component, EMPTY);
}
- protected InstanceWrapper getInstanceWrapper(AtomicComponent component, boolean create) throws TargetException {
+ protected InstanceWrapper getInstanceWrapper(AtomicComponent component, boolean create)
+ throws TargetResolutionException {
checkInit();
InstanceWrapper ctx = instanceWrappers.get(component);
assert ctx != null : "Component not registered with scope: " + component;
@@ -141,7 +144,7 @@
return ctx;
}
- private void eagerInitComponents() throws ObjectCreationException, TargetException {
+ private void eagerInitComponents() throws ObjectCreationException, TargetResolutionException {
List<AtomicComponent> componentList = new ArrayList<AtomicComponent>(instanceWrappers.keySet());
Collections.sort(componentList, COMPARATOR);
// start each group
@@ -181,11 +184,11 @@
return true;
}
- public void start() throws TargetException {
+ public void start() throws TargetInitializationException {
}
- public void stop() throws TargetException {
+ public void stop() throws TargetDestructionException {
}
}
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=488144&r1=488143&r2=488144
==============================================================================
--- 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 Dec 17 23:43:50 2006
@@ -25,7 +25,8 @@
import java.util.concurrent.ConcurrentHashMap;
import org.apache.tuscany.spi.component.AtomicComponent;
-import org.apache.tuscany.spi.component.TargetException;
+import org.apache.tuscany.spi.component.TargetDestructionException;
+import org.apache.tuscany.spi.component.TargetResolutionException;
import org.apache.tuscany.spi.component.WorkContext;
import org.apache.tuscany.spi.event.Event;
import org.apache.tuscany.spi.model.Scope;
@@ -64,7 +65,7 @@
if (entry.getKey().isEagerInit()) {
try {
getInstance(entry.getKey());
- } catch (TargetException e) {
+ } catch (TargetResolutionException e) {
// FIXME JFM monitor
e.printStackTrace();
}
@@ -94,7 +95,8 @@
contexts.put(component, new ConcurrentHashMap<Thread, InstanceWrapper>());
}
- protected InstanceWrapper getInstanceWrapper(AtomicComponent component, boolean create) throws TargetException {
+ protected InstanceWrapper getInstanceWrapper(AtomicComponent component, boolean create)
+ throws TargetResolutionException {
Map<Thread, InstanceWrapper> instanceContextMap = contexts.get(component);
assert instanceContextMap != null : "Atomic component not registered";
InstanceWrapper ctx = instanceContextMap.get(Thread.currentThread());
@@ -129,7 +131,7 @@
while (iter.hasPrevious()) {
try {
iter.previous().stop();
- } catch (TargetException e) {
+ } catch (TargetDestructionException e) {
// JFM FIXME
e.printStackTrace();
}
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=488144&r1=488143&r2=488144
==============================================================================
--- 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 Dec 17 23:43:50 2006
@@ -19,7 +19,7 @@
package org.apache.tuscany.core.component.scope;
import org.apache.tuscany.spi.component.AtomicComponent;
-import org.apache.tuscany.spi.component.TargetException;
+import org.apache.tuscany.spi.component.TargetResolutionException;
import org.apache.tuscany.spi.component.WorkContext;
import org.apache.tuscany.spi.event.Event;
import org.apache.tuscany.spi.model.Scope;
@@ -64,7 +64,8 @@
checkInit();
}
- protected InstanceWrapper getInstanceWrapper(AtomicComponent component, boolean create) throws TargetException {
+ protected InstanceWrapper getInstanceWrapper(AtomicComponent component, boolean create)
+ throws TargetResolutionException {
// there never is a previously associated instance, return null
if (!create) {
return null;
Modified: incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/PojoAtomicComponent.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/PojoAtomicComponent.java?view=diff&rev=488144&r1=488143&r2=488144
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/PojoAtomicComponent.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/PojoAtomicComponent.java Sun Dec 17 23:43:50 2006
@@ -29,8 +29,8 @@
import org.apache.tuscany.spi.ObjectCreationException;
import org.apache.tuscany.spi.ObjectFactory;
import org.apache.tuscany.spi.component.TargetDestructionException;
-import org.apache.tuscany.spi.component.TargetException;
import org.apache.tuscany.spi.component.TargetInitializationException;
+import org.apache.tuscany.spi.component.TargetResolutionException;
import org.apache.tuscany.spi.extension.AtomicComponentExtension;
import org.apache.tuscany.spi.wire.OutboundWire;
import org.apache.tuscany.spi.wire.RuntimeWire;
@@ -118,11 +118,11 @@
}
}
- public Object getTargetInstance() throws TargetException {
+ public Object getTargetInstance() throws TargetResolutionException {
return scopeContainer.getInstance(this);
}
- public Object getAssociatedTargetInstance() throws TargetException {
+ public Object getAssociatedTargetInstance() throws TargetResolutionException {
return scopeContainer.getAssociatedInstance(this);
}
@@ -204,6 +204,17 @@
//TODO multiplicity for constructor injection
}
+ public boolean implementsCallback(Class callbackClass) {
+ Class<?>[] implementedInterfaces = implementationClass.getInterfaces();
+ for (Class<?> implementedInterface : implementedInterfaces) {
+ if (implementedInterface.isAssignableFrom(callbackClass)) {
+ return true;
+ }
+ }
+
+ return false;
+ }
+
protected Injector<Object> createInjector(Member member, RuntimeWire wire) {
ObjectFactory<?> factory = createWireFactory(wire);
if (member instanceof Field) {
@@ -243,14 +254,4 @@
protected abstract ObjectFactory<?> createWireFactory(RuntimeWire wire);
- public boolean implementsCallback(Class callbackClass) {
- Class<?>[] implementedInterfaces = implementationClass.getInterfaces();
- for (Class<?> implementedInterface : implementedInterfaces) {
- if (implementedInterface.isAssignableFrom(callbackClass)) {
- return true;
- }
- }
-
- return false;
- }
}
Modified: incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/composite/CompositeService.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/composite/CompositeService.java?view=diff&rev=488144&r1=488143&r2=488144
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/composite/CompositeService.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/composite/CompositeService.java Sun Dec 17 23:43:50 2006
@@ -20,7 +20,7 @@
import org.apache.tuscany.spi.CoreRuntimeException;
import org.apache.tuscany.spi.component.CompositeComponent;
-import org.apache.tuscany.spi.component.TargetException;
+import org.apache.tuscany.spi.component.TargetResolutionException;
import org.apache.tuscany.spi.extension.ServiceExtension;
import org.apache.tuscany.spi.model.Operation;
import org.apache.tuscany.spi.model.ServiceContract;
@@ -52,7 +52,7 @@
return new CompositeReferenceCallbackTargetInvoker(operation, inboundWire);
}
- public Object getServiceInstance() throws TargetException {
+ public Object getServiceInstance() throws TargetResolutionException {
return interfaze.cast(wireService.createProxy(outboundWire));
}
}
Modified: incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/java/JavaAtomicComponent.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/java/JavaAtomicComponent.java?view=diff&rev=488144&r1=488143&r2=488144
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/java/JavaAtomicComponent.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/java/JavaAtomicComponent.java Sun Dec 17 23:43:50 2006
@@ -23,8 +23,8 @@
import java.lang.reflect.Method;
import org.apache.tuscany.spi.ObjectFactory;
-import org.apache.tuscany.spi.component.TargetException;
import org.apache.tuscany.spi.component.TargetNotFoundException;
+import org.apache.tuscany.spi.component.TargetResolutionException;
import static org.apache.tuscany.spi.idl.java.JavaIDLUtils.findMethod;
import org.apache.tuscany.spi.model.Operation;
import org.apache.tuscany.spi.model.ServiceContract;
@@ -53,7 +53,7 @@
this.scope = configuration.getScopeContainer().getScope();
}
- public Object getServiceInstance(String name) throws TargetException {
+ public Object getServiceInstance(String name) throws TargetResolutionException {
InboundWire wire = serviceWires.get(name);
if (wire == null) {
TargetNotFoundException e = new TargetNotFoundException(name);
@@ -63,7 +63,7 @@
return wireService.createProxy(wire);
}
- public Object getServiceInstance() throws TargetException {
+ public Object getServiceInstance() throws TargetResolutionException {
if (serviceInterfaces.size() == 0) {
return getTargetInstance();
} else if (serviceInterfaces.size() == 1) {
Modified: incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/system/component/SystemAtomicComponentImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/system/component/SystemAtomicComponentImpl.java?view=diff&rev=488144&r1=488143&r2=488144
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/system/component/SystemAtomicComponentImpl.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/system/component/SystemAtomicComponentImpl.java Sun Dec 17 23:43:50 2006
@@ -19,13 +19,13 @@
package org.apache.tuscany.core.implementation.system.component;
import org.apache.tuscany.spi.ObjectFactory;
-import org.apache.tuscany.spi.component.TargetException;
import org.apache.tuscany.spi.component.SystemAtomicComponent;
+import org.apache.tuscany.spi.component.TargetResolutionException;
import org.apache.tuscany.spi.model.Operation;
import org.apache.tuscany.spi.model.Scope;
+import org.apache.tuscany.spi.wire.InboundWire;
import org.apache.tuscany.spi.wire.RuntimeWire;
import org.apache.tuscany.spi.wire.TargetInvoker;
-import org.apache.tuscany.spi.wire.InboundWire;
import org.apache.tuscany.core.implementation.PojoAtomicComponent;
import org.apache.tuscany.core.implementation.PojoConfiguration;
@@ -43,11 +43,11 @@
scope = Scope.MODULE;
}
- public Object getServiceInstance(String name) throws TargetException {
+ public Object getServiceInstance(String name) throws TargetResolutionException {
return getTargetInstance();
}
- public Object getServiceInstance() throws TargetException {
+ public Object getServiceInstance() throws TargetResolutionException {
return getTargetInstance();
}
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=488144&r1=488143&r2=488144
==============================================================================
--- 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 23:43:50 2006
@@ -20,7 +20,7 @@
import org.apache.tuscany.spi.component.AbstractSCAObject;
import org.apache.tuscany.spi.component.CompositeComponent;
-import org.apache.tuscany.spi.component.TargetException;
+import org.apache.tuscany.spi.component.TargetResolutionException;
import org.apache.tuscany.spi.model.Operation;
import org.apache.tuscany.spi.model.Scope;
import org.apache.tuscany.spi.model.ServiceContract;
@@ -81,7 +81,7 @@
this.referenceInterface = referenceInterface;
}
- public Object getServiceInstance() throws TargetException {
+ public Object getServiceInstance() throws TargetResolutionException {
return referenceInterface.cast(inboundWire.getTargetService());
}
Modified: incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/system/component/SystemServiceImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/system/component/SystemServiceImpl.java?view=diff&rev=488144&r1=488143&r2=488144
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/system/component/SystemServiceImpl.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/system/component/SystemServiceImpl.java Sun Dec 17 23:43:50 2006
@@ -21,7 +21,7 @@
import org.apache.tuscany.spi.CoreRuntimeException;
import org.apache.tuscany.spi.component.AbstractSCAObject;
import org.apache.tuscany.spi.component.CompositeComponent;
-import org.apache.tuscany.spi.component.TargetException;
+import org.apache.tuscany.spi.component.TargetResolutionException;
import org.apache.tuscany.spi.model.Operation;
import org.apache.tuscany.spi.model.Scope;
import org.apache.tuscany.spi.model.ServiceContract;
@@ -82,7 +82,7 @@
throw new UnsupportedOperationException();
}
- public Object getServiceInstance() throws TargetException {
+ public Object getServiceInstance() throws TargetResolutionException {
return inboundWire.getTargetService();
}
Modified: incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/system/component/SystemSingletonAtomicComponent.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/system/component/SystemSingletonAtomicComponent.java?view=diff&rev=488144&r1=488143&r2=488144
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/system/component/SystemSingletonAtomicComponent.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/system/component/SystemSingletonAtomicComponent.java Sun Dec 17 23:43:50 2006
@@ -28,8 +28,8 @@
import org.apache.tuscany.spi.component.CompositeComponent;
import org.apache.tuscany.spi.component.SystemAtomicComponent;
import org.apache.tuscany.spi.component.TargetDestructionException;
-import org.apache.tuscany.spi.component.TargetException;
import org.apache.tuscany.spi.component.TargetInitializationException;
+import org.apache.tuscany.spi.component.TargetResolutionException;
import org.apache.tuscany.spi.model.Operation;
import org.apache.tuscany.spi.model.Scope;
import org.apache.tuscany.spi.wire.InboundWire;
@@ -88,15 +88,15 @@
return -1;
}
- public T getTargetInstance() throws TargetException {
+ public T getTargetInstance() throws TargetResolutionException {
return instance;
}
- public Object getServiceInstance(String name) throws TargetException {
+ public Object getServiceInstance(String name) throws TargetResolutionException {
return getTargetInstance();
}
- public Object getServiceInstance() throws TargetException {
+ public Object getServiceInstance() throws TargetResolutionException {
return getTargetInstance();
}
Modified: incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/system/component/SystemWireObjectFactory.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/system/component/SystemWireObjectFactory.java?view=diff&rev=488144&r1=488143&r2=488144
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/system/component/SystemWireObjectFactory.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/system/component/SystemWireObjectFactory.java Sun Dec 17 23:43:50 2006
@@ -20,7 +20,7 @@
import org.apache.tuscany.spi.ObjectCreationException;
import org.apache.tuscany.spi.ObjectFactory;
-import org.apache.tuscany.spi.component.TargetException;
+import org.apache.tuscany.spi.component.TargetResolutionException;
import org.apache.tuscany.core.implementation.system.wire.SystemOutboundWire;
@@ -40,7 +40,7 @@
public Object getInstance() throws ObjectCreationException {
try {
return wire.getTargetService();
- } catch (TargetException e) {
+ } catch (TargetResolutionException e) {
throw new ObjectCreationException(e);
}
}
Modified: incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/system/wire/SystemInboundWireImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/system/wire/SystemInboundWireImpl.java?view=diff&rev=488144&r1=488143&r2=488144
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/system/wire/SystemInboundWireImpl.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/system/wire/SystemInboundWireImpl.java Sun Dec 17 23:43:50 2006
@@ -23,7 +23,7 @@
import org.apache.tuscany.spi.component.Component;
import org.apache.tuscany.spi.component.SCAObject;
-import org.apache.tuscany.spi.component.TargetException;
+import org.apache.tuscany.spi.component.TargetResolutionException;
import org.apache.tuscany.spi.idl.java.JavaServiceContract;
import org.apache.tuscany.spi.model.Operation;
import org.apache.tuscany.spi.model.ServiceContract;
@@ -78,7 +78,7 @@
throw new UnsupportedOperationException();
}
- public Object getTargetService() throws TargetException {
+ public Object getTargetService() throws TargetResolutionException {
if (wire != null) {
return interfaze.cast(wire.getTargetService());
}
@@ -107,7 +107,7 @@
public void addSourceCallbackInvocationChains(Object targetAddr,
Map<Operation<?>,
- OutboundInvocationChain> chains) {
+ OutboundInvocationChain> chains) {
throw new UnsupportedOperationException();
}
Modified: incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/system/wire/SystemOutboundAutowire.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/system/wire/SystemOutboundAutowire.java?view=diff&rev=488144&r1=488143&r2=488144
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/system/wire/SystemOutboundAutowire.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/system/wire/SystemOutboundAutowire.java Sun Dec 17 23:43:50 2006
@@ -24,8 +24,8 @@
import org.apache.tuscany.spi.QualifiedName;
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.component.TargetNotFoundException;
+import org.apache.tuscany.spi.component.TargetResolutionException;
import org.apache.tuscany.spi.idl.java.JavaServiceContract;
import org.apache.tuscany.spi.model.Operation;
import org.apache.tuscany.spi.model.ServiceContract;
@@ -79,7 +79,7 @@
public void setTargetName(QualifiedName targetName) {
}
- public Object getTargetService() throws TargetException {
+ public Object getTargetService() throws TargetResolutionException {
Class<?> interfaze = serviceContract.getInterfaceClass();
Object service = component.resolveSystemInstance(interfaze);
if (service == null && required) {
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=488144&r1=488143&r2=488144
==============================================================================
--- 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 23:43:50 2006
@@ -23,7 +23,7 @@
import org.apache.tuscany.spi.QualifiedName;
import org.apache.tuscany.spi.component.SCAObject;
-import org.apache.tuscany.spi.component.TargetException;
+import org.apache.tuscany.spi.component.TargetResolutionException;
import org.apache.tuscany.spi.idl.java.JavaServiceContract;
import org.apache.tuscany.spi.model.Operation;
import org.apache.tuscany.spi.model.ServiceContract;
@@ -75,7 +75,7 @@
this.targetName = targetName;
}
- public Object getTargetService() throws TargetException {
+ public Object getTargetService() throws TargetResolutionException {
assert targetWire != null;
return interfaze.cast(targetWire.getTargetService());
}
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=488144&r1=488143&r2=488144
==============================================================================
--- 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 23:43:50 2006
@@ -22,7 +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.component.TargetResolutionException;
import org.apache.tuscany.spi.host.ResourceHost;
import org.apache.tuscany.spi.host.ResourceResolutionException;
@@ -94,7 +94,7 @@
if (mappedName == null) {
try {
instance = parent.resolveSystemInstance(type);
- } catch (TargetException e) {
+ } catch (TargetResolutionException e) {
throw new ObjectCreationException(e);
}
if (instance == null) {
@@ -111,7 +111,7 @@
if (child != null) {
try {
instance = type.cast(child.getServiceInstance());
- } catch (TargetException e) {
+ } catch (TargetResolutionException e) {
throw new ObjectCreationException(e);
}
}
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=488144&r1=488143&r2=488144
==============================================================================
--- 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 23:43:50 2006
@@ -25,15 +25,11 @@
import org.osoa.sca.ServiceRuntimeException;
import org.apache.tuscany.spi.component.CompositeComponent;
-import org.apache.tuscany.spi.component.TargetException;
+import org.apache.tuscany.spi.component.TargetResolutionException;
+
-/**
- * Implementation of SCA Specification CompositeContext that delegates to the Tuscany runtime fabric.
- *
- * @version $Rev$ $Date$
- */
public class CompositeContextImpl extends SCA implements CompositeContext {
- private final CompositeComponent composite;
+ protected final CompositeComponent composite;
public CompositeContextImpl(final CompositeComponent composite) {
this.composite = composite;
@@ -47,11 +43,11 @@
setCompositeContext(null);
}
- public ServiceReference createServiceReferenceForSession(Object self) {
+ public ServiceReference createServiceReferenceForSession(Object arg0) {
return null;
}
- public ServiceReference createServiceReferenceForSession(Object self, String serviceName) {
+ public ServiceReference createServiceReferenceForSession(Object arg0, String arg1) {
return null;
}
@@ -70,16 +66,17 @@
public <T> T locateService(Class<T> serviceInterface, String serviceName) throws ServiceRuntimeException {
try {
return composite.locateService(serviceInterface, serviceName);
- } catch (TargetException e) {
+ } catch (TargetResolutionException e) {
throw new ServiceRuntimeException(e);
}
}
- public ServiceReference newSession(String serviceName) {
+ public ServiceReference newSession(String arg0) {
return null;
}
- public ServiceReference newSession(String serviceName, Object sessionId) {
+ public ServiceReference newSession(String arg0, Object arg1) {
return null;
}
+
}
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=488144&r1=488143&r2=488144
==============================================================================
--- 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 23:43:50 2006
@@ -22,7 +22,7 @@
import java.util.Map;
import org.apache.tuscany.spi.component.SCAObject;
-import org.apache.tuscany.spi.component.TargetException;
+import org.apache.tuscany.spi.component.TargetResolutionException;
import org.apache.tuscany.spi.model.Operation;
import org.apache.tuscany.spi.model.ServiceContract;
import org.apache.tuscany.spi.wire.InboundInvocationChain;
@@ -47,7 +47,7 @@
new HashMap<Object, Map<Operation<?>, OutboundInvocationChain>>();
private SCAObject container;
- public Object getTargetService() throws TargetException {
+ public Object getTargetService() throws TargetResolutionException {
assert targetWire != null;
// optimized, no interceptors or handlers on either end
return targetWire.getTargetService();
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=488144&r1=488143&r2=488144
==============================================================================
--- 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 23:43:50 2006
@@ -23,7 +23,7 @@
import org.apache.tuscany.spi.QualifiedName;
import org.apache.tuscany.spi.component.SCAObject;
-import org.apache.tuscany.spi.component.TargetException;
+import org.apache.tuscany.spi.component.TargetResolutionException;
import org.apache.tuscany.spi.model.Operation;
import org.apache.tuscany.spi.model.ServiceContract;
import org.apache.tuscany.spi.wire.InboundInvocationChain;
@@ -49,7 +49,7 @@
private InboundWire targetWire;
private SCAObject container;
- public Object getTargetService() throws TargetException {
+ public Object getTargetService() throws TargetResolutionException {
assert targetWire != null;
// optimized, no interceptors or handlers on either end
return targetWire.getTargetService();
Modified: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/databinding/impl/PassByValueWirePostProcessorTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/databinding/impl/PassByValueWirePostProcessorTestCase.java?view=diff&rev=488144&r1=488143&r2=488144
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/databinding/impl/PassByValueWirePostProcessorTestCase.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/databinding/impl/PassByValueWirePostProcessorTestCase.java Sun Dec 17 23:43:50 2006
@@ -25,7 +25,7 @@
import java.util.Map;
import org.apache.tuscany.spi.ObjectCreationException;
-import org.apache.tuscany.spi.component.TargetException;
+import org.apache.tuscany.spi.component.TargetResolutionException;
import org.apache.tuscany.spi.extension.AtomicComponentExtension;
import org.apache.tuscany.spi.idl.java.JavaServiceContract;
import org.apache.tuscany.spi.model.Operation;
@@ -48,6 +48,8 @@
/**
* Testcase for testing if the PassByValueWireProcessor adds the PassByValueInterceptor to the invocation chains and
* also ensure that the outbound and inbound chain of interceptors are linked after this insertion
+ *
+ * @version $Rev$ $Date$
*/
public class PassByValueWirePostProcessorTestCase extends TestCase {
private PassByValueWirePostProcessor processor;
@@ -156,27 +158,22 @@
}
public Object createInstance() throws ObjectCreationException {
- // TODO Auto-generated method stub
return null;
}
public TargetInvoker createTargetInvoker(String targetName, Operation operation, InboundWire callbackWire) {
- // TODO Auto-generated method stub
return null;
}
- public Object getServiceInstance(String name) throws TargetException {
- // TODO Auto-generated method stub
+ public Object getServiceInstance(String name) throws TargetResolutionException {
return null;
}
public List<Class<?>> getServiceInterfaces() {
- // TODO Auto-generated method stub
return null;
}
- public Object getServiceInstance() throws TargetException {
- // TODO Auto-generated method stub
+ public Object getServiceInstance() throws TargetResolutionException {
return null;
}
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=488144&r1=488143&r2=488144
==============================================================================
--- 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 23:43:50 2006
@@ -86,9 +86,9 @@
/**
* Returns a service associated with the given name
*
- * @throws TargetException if an error occurs retrieving the service instance
+ * @throws TargetResolutionException if an error occurs retrieving the service instance
*/
- Object getServiceInstance(String name) throws TargetException;
+ Object getServiceInstance(String name) throws TargetResolutionException;
}
Modified: incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/component/CompositeComponent.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/component/CompositeComponent.java?view=diff&rev=488144&r1=488143&r2=488144
==============================================================================
--- incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/component/CompositeComponent.java (original)
+++ incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/component/CompositeComponent.java Sun Dec 17 23:43:50 2006
@@ -123,23 +123,23 @@
/**
* Returns a system service associated with the given name
*
- * @throws TargetException if an error occurs retrieving the service instance
+ * @throws TargetResolutionException if an error occurs retrieving the service instance
*/
- Object getSystemServiceInstance(String name) throws TargetException;
+ Object getSystemServiceInstance(String name) throws TargetResolutionException;
/**
* Returns the service instance for associated with the child registered for the given name
*
- * @throws TargetException
+ * @throws TargetResolutionException
*/
- <T> T locateService(Class<T> serviceInterface, String serviceName) throws TargetException;
+ <T> T locateService(Class<T> serviceInterface, String serviceName) throws TargetResolutionException;
/**
* Returns the system service instance for associated with the child registered for the given name
*
- * @throws TargetException
+ * @throws TargetResolutionException
*/
- <T> T locateSystemService(Class<T> serviceInterface, String serviceName) throws TargetException;
+ <T> T locateSystemService(Class<T> serviceInterface, String serviceName) throws TargetResolutionException;
/**
* Returns the references contained by the composite
@@ -157,9 +157,9 @@
*
* @param instanceInterface the type of service being requested
* @return a reference to the requested service or null if none can be found
- * @throws TargetException
+ * @throws TargetResolutionException
*/
- <T> T resolveInstance(Class<T> instanceInterface) throws TargetException;
+ <T> T resolveInstance(Class<T> instanceInterface) throws TargetResolutionException;
/**
* Invoked by system child components to return an an autowire target. Resolved targets may be system services or
@@ -167,9 +167,9 @@
*
* @param instanceInterface the type of service being requested
* @return a reference to the requested service or null if none can be found
- * @throws TargetException
+ * @throws TargetResolutionException
*/
- <T> T resolveSystemInstance(Class<T> instanceInterface) throws TargetException;
+ <T> T resolveSystemInstance(Class<T> instanceInterface) throws TargetResolutionException;
/**
* Invoked by a parent component to return an autowire target in a child. Resolved targets must be services. For
@@ -179,9 +179,9 @@
*
* @param instanceInterface the type of service being requested
* @return a reference to the requested service or null if none can be found
- * @throws TargetException
+ * @throws TargetResolutionException
*/
- <T> T resolveExternalInstance(Class<T> instanceInterface) throws TargetException;
+ <T> T resolveExternalInstance(Class<T> instanceInterface) throws TargetResolutionException;
/**
* Invoked by a parent component to return a system autowire target in a child. Resolved targets must be system
@@ -191,8 +191,8 @@
*
* @param instanceInterface the type of service being requested
* @return a reference to the requested service or null if none can be found
- * @throws TargetException
+ * @throws TargetResolutionException
*/
- <T> T resolveSystemExternalInstance(Class<T> instanceInterface) throws TargetException;
+ <T> T resolveSystemExternalInstance(Class<T> instanceInterface) throws TargetResolutionException;
}
Modified: incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/component/IllegalTargetException.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/component/IllegalTargetException.java?view=diff&rev=488144&r1=488143&r2=488144
==============================================================================
--- incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/component/IllegalTargetException.java (original)
+++ incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/component/IllegalTargetException.java Sun Dec 17 23:43:50 2006
@@ -23,7 +23,7 @@
*
* @version $$Rev$$ $$Date$$
*/
-public class IllegalTargetException extends TargetException {
+public class IllegalTargetException extends TargetResolutionException {
public IllegalTargetException(String message, String identifier) {
super(message, identifier);
Modified: incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/component/SCAObject.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/component/SCAObject.java?view=diff&rev=488144&r1=488143&r2=488144
==============================================================================
--- incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/component/SCAObject.java (original)
+++ incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/component/SCAObject.java Sun Dec 17 23:43:50 2006
@@ -68,9 +68,9 @@
/**
* Returns an instance associated with the default service
*
- * @throws TargetException if an error occurs retrieving the instance
+ * @throws TargetResolutionException if an error occurs resolving the instance
*/
- Object getServiceInstance() throws TargetException;
+ Object getServiceInstance() throws TargetResolutionException;
/**
* Called to signal that the composite should perform any required steps prior to registration with its parent such
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=488144&r1=488143&r2=488144
==============================================================================
--- 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 Dec 17 23:43:50 2006
@@ -49,17 +49,17 @@
/**
* Returns an implementation instance associated with the current request context, creating one if necessary
*
- * @throws TargetException
+ * @throws TargetResolutionException
*/
- Object getInstance(AtomicComponent component) throws TargetException;
+ Object getInstance(AtomicComponent component) throws TargetResolutionException;
/**
* Returns an implementation instance associated with the current context. If no instance is found, a {@link
* TargetNotFoundException} is thrown
*
- * @throws TargetException
+ * @throws TargetResolutionException
*/
- Object getAssociatedInstance(AtomicComponent component) throws TargetException;
+ Object getAssociatedInstance(AtomicComponent component) throws TargetResolutionException;
/**
* Persists a new component implementation instance, equivalent to an insert or append operation
Modified: incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/component/SystemAtomicComponent.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/component/SystemAtomicComponent.java?view=diff&rev=488144&r1=488143&r2=488144
==============================================================================
--- incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/component/SystemAtomicComponent.java (original)
+++ incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/component/SystemAtomicComponent.java Sun Dec 17 23:43:50 2006
@@ -29,9 +29,9 @@
* Returns the target instance associated with the component. A target instance is the actual object a request is
* dispatched to sans wire chain.
*
- * @throws org.apache.tuscany.spi.component.TargetException
+ * @throws TargetResolutionException
*
*/
- Object getTargetInstance() throws TargetException;
+ Object getTargetInstance() throws TargetResolutionException;
}
Modified: incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/component/TargetDestructionException.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/component/TargetDestructionException.java?view=diff&rev=488144&r1=488143&r2=488144
==============================================================================
--- incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/component/TargetDestructionException.java (original)
+++ incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/component/TargetDestructionException.java Sun Dec 17 23:43:50 2006
@@ -23,8 +23,7 @@
*
* @version $Rev$ $Date$
*/
-public class TargetDestructionException extends TargetException {
-
+public class TargetDestructionException extends TargetResolutionException {
public TargetDestructionException(String message, String identifier) {
super(message, identifier);
Modified: incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/component/TargetInitializationException.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/component/TargetInitializationException.java?view=diff&rev=488144&r1=488143&r2=488144
==============================================================================
--- incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/component/TargetInitializationException.java (original)
+++ incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/component/TargetInitializationException.java Sun Dec 17 23:43:50 2006
@@ -23,7 +23,7 @@
*
* @version $Rev$ $Date$
*/
-public class TargetInitializationException extends TargetException {
+public class TargetInitializationException extends TargetResolutionException {
public TargetInitializationException(String message, String identifier) {
super(message, identifier);
Modified: incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/component/TargetNotFoundException.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/component/TargetNotFoundException.java?view=diff&rev=488144&r1=488143&r2=488144
==============================================================================
--- incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/component/TargetNotFoundException.java (original)
+++ incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/component/TargetNotFoundException.java Sun Dec 17 23:43:50 2006
@@ -23,7 +23,7 @@
*
* @version $$Rev$$ $$Date$$
*/
-public class TargetNotFoundException extends TargetException {
+public class TargetNotFoundException extends TargetResolutionException {
public TargetNotFoundException(String message) {
super(message);
Copied: incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/component/TargetResolutionException.java (from r488059, incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/component/scope/TargetRetrievalException.java)
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/component/TargetResolutionException.java?view=diff&rev=488144&p1=incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/component/scope/TargetRetrievalException.java&r1=488059&p2=incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/component/TargetResolutionException.java&r2=488144
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/component/scope/TargetRetrievalException.java (original)
+++ incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/component/TargetResolutionException.java Sun Dec 17 23:43:50 2006
@@ -16,22 +16,28 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.tuscany.core.component.scope;
-
-import org.apache.tuscany.spi.component.TargetException;
+package org.apache.tuscany.spi.component;
/**
* Denotes an error retrieving a target instance
*
* @version $Rev$ $Date$
*/
-public class TargetRetrievalException extends TargetException {
+public class TargetResolutionException extends TargetException {
- public TargetRetrievalException(String message) {
+ public TargetResolutionException(String message) {
super(message);
}
- public TargetRetrievalException(String message, Throwable cause) {
+ public TargetResolutionException(String message, String identifier) {
+ super(message, identifier);
+ }
+
+ public TargetResolutionException(String message, Throwable cause) {
super(message, cause);
+ }
+
+ public TargetResolutionException(String message, String identifier, Throwable cause) {
+ super(message, identifier, cause);
}
}
Propchange: incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/component/TargetResolutionException.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/component/TargetResolutionException.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Modified: incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/extension/CompositeComponentExtension.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/extension/CompositeComponentExtension.java?view=diff&rev=488144&r1=488143&r2=488144
==============================================================================
--- incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/extension/CompositeComponentExtension.java (original)
+++ incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/extension/CompositeComponentExtension.java Sun Dec 17 23:43:50 2006
@@ -41,8 +41,8 @@
import org.apache.tuscany.spi.component.Reference;
import org.apache.tuscany.spi.component.SCAObject;
import org.apache.tuscany.spi.component.Service;
-import org.apache.tuscany.spi.component.TargetException;
import org.apache.tuscany.spi.component.TargetNotFoundException;
+import org.apache.tuscany.spi.component.TargetResolutionException;
import org.apache.tuscany.spi.event.Event;
import org.apache.tuscany.spi.model.Scope;
import org.apache.tuscany.spi.wire.InboundWire;
@@ -224,7 +224,7 @@
return null;
}
- public Object getServiceInstance() throws TargetException {
+ public Object getServiceInstance() throws TargetResolutionException {
Service service = services.get(0);
if (service == null) {
throw new TargetNotFoundException("Component has no services");
@@ -240,7 +240,7 @@
return null;
}
- public <T> T locateService(Class<T> serviceInterface, String name) throws TargetException {
+ public <T> T locateService(Class<T> serviceInterface, String name) throws TargetResolutionException {
SCAObject target = children.get(name);
if (target == null) {
TargetNotFoundException e = new TargetNotFoundException(name);
@@ -250,7 +250,7 @@
return serviceInterface.cast(target.getServiceInstance());
}
- public <T> T locateSystemService(Class<T> serviceInterface, String name) throws TargetException {
+ public <T> T locateSystemService(Class<T> serviceInterface, String name) throws TargetResolutionException {
SCAObject object = systemChildren.get(name);
if (object == null) {
TargetNotFoundException e = new TargetNotFoundException(name);
@@ -260,7 +260,7 @@
return serviceInterface.cast(object.getServiceInstance());
}
- public Object getServiceInstance(String name) throws TargetException {
+ public Object getServiceInstance(String name) throws TargetResolutionException {
SCAObject context = children.get(name);
if (context == null) {
TargetNotFoundException e = new TargetNotFoundException(name);
@@ -273,7 +273,7 @@
}
}
- public Object getSystemServiceInstance(String name) throws TargetException {
+ public Object getSystemServiceInstance(String name) throws TargetResolutionException {
SCAObject target = systemChildren.get(name);
if (target == null) {
TargetNotFoundException e = new TargetNotFoundException(name);
@@ -296,7 +296,7 @@
return serviceInterfaces;
}
- public <T> T resolveInstance(Class<T> instanceInterface) throws TargetException {
+ public <T> T resolveInstance(Class<T> instanceInterface) throws TargetResolutionException {
if (CompositeComponent.class.equals(instanceInterface)) {
return instanceInterface.cast(this);
}
@@ -325,7 +325,7 @@
}
}
- public <T> T resolveSystemInstance(Class<T> instanceInterface) throws TargetException {
+ public <T> T resolveSystemInstance(Class<T> instanceInterface) throws TargetResolutionException {
if (CompositeComponent.class.equals(instanceInterface)) {
return instanceInterface.cast(this);
}
@@ -352,7 +352,7 @@
}
}
- public <T> T resolveExternalInstance(Class<T> instanceInterface) throws TargetException {
+ public <T> T resolveExternalInstance(Class<T> instanceInterface) throws TargetResolutionException {
Service service = autowireExternal.get(instanceInterface);
if (service != null) {
try {
@@ -366,7 +366,7 @@
}
}
- public <T> T resolveSystemExternalInstance(Class<T> instanceInterface) throws TargetException {
+ public <T> T resolveSystemExternalInstance(Class<T> instanceInterface) throws TargetResolutionException {
Service service = systemAutowireExternal.get(instanceInterface);
if (service != null) {
try {
Modified: incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/extension/ReferenceExtension.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/extension/ReferenceExtension.java?view=diff&rev=488144&r1=488143&r2=488144
==============================================================================
--- incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/extension/ReferenceExtension.java (original)
+++ incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/extension/ReferenceExtension.java Sun Dec 17 23:43:50 2006
@@ -21,8 +21,8 @@
import org.apache.tuscany.spi.component.AbstractSCAObject;
import org.apache.tuscany.spi.component.CompositeComponent;
import org.apache.tuscany.spi.component.Reference;
-import org.apache.tuscany.spi.component.TargetException;
import org.apache.tuscany.spi.component.TargetInvokerCreationException;
+import org.apache.tuscany.spi.component.TargetResolutionException;
import org.apache.tuscany.spi.model.Operation;
import org.apache.tuscany.spi.model.Scope;
import org.apache.tuscany.spi.model.ServiceContract;
@@ -78,7 +78,7 @@
return referenceInterface;
}
- public Object getServiceInstance() throws TargetException {
+ public Object getServiceInstance() throws TargetResolutionException {
return wireService.createProxy(inboundWire);
}
Modified: incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/extension/ServiceExtension.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/extension/ServiceExtension.java?view=diff&rev=488144&r1=488143&r2=488144
==============================================================================
--- incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/extension/ServiceExtension.java (original)
+++ incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/extension/ServiceExtension.java Sun Dec 17 23:43:50 2006
@@ -22,8 +22,8 @@
import org.apache.tuscany.spi.component.AbstractSCAObject;
import org.apache.tuscany.spi.component.CompositeComponent;
import org.apache.tuscany.spi.component.Service;
-import org.apache.tuscany.spi.component.TargetException;
import org.apache.tuscany.spi.component.TargetInvokerCreationException;
+import org.apache.tuscany.spi.component.TargetResolutionException;
import org.apache.tuscany.spi.model.Operation;
import org.apache.tuscany.spi.model.Scope;
import org.apache.tuscany.spi.model.ServiceContract;
@@ -93,7 +93,7 @@
throw new UnsupportedOperationException();
}
- public Object getServiceInstance() throws TargetException {
+ public Object getServiceInstance() throws TargetResolutionException {
return wireService.createProxy(inboundWire);
}
Modified: incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/extension/SystemAtomicComponentExtension.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/extension/SystemAtomicComponentExtension.java?view=diff&rev=488144&r1=488143&r2=488144
==============================================================================
--- incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/extension/SystemAtomicComponentExtension.java (original)
+++ incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/extension/SystemAtomicComponentExtension.java Sun Dec 17 23:43:50 2006
@@ -23,10 +23,10 @@
import org.apache.tuscany.spi.component.CompositeComponent;
import org.apache.tuscany.spi.component.ScopeContainer;
import org.apache.tuscany.spi.component.SystemAtomicComponent;
-import org.apache.tuscany.spi.component.TargetException;
+import org.apache.tuscany.spi.component.TargetResolutionException;
import org.apache.tuscany.spi.model.Operation;
-import org.apache.tuscany.spi.wire.TargetInvoker;
import org.apache.tuscany.spi.wire.InboundWire;
+import org.apache.tuscany.spi.wire.TargetInvoker;
/**
* @version $Rev$ $Date$
@@ -50,11 +50,11 @@
this.interfazes = serviceInterfaces;
}
- public Object getServiceInstance() throws TargetException {
+ public Object getServiceInstance() throws TargetResolutionException {
return getTargetInstance();
}
- public Object getServiceInstance(String name) throws TargetException {
+ public Object getServiceInstance(String name) throws TargetResolutionException {
throw new UnsupportedOperationException();
}
Modified: incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/wire/RuntimeWire.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/wire/RuntimeWire.java?view=diff&rev=488144&r1=488143&r2=488144
==============================================================================
--- incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/wire/RuntimeWire.java (original)
+++ incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/wire/RuntimeWire.java Sun Dec 17 23:43:50 2006
@@ -18,9 +18,9 @@
*/
package org.apache.tuscany.spi.wire;
-import org.apache.tuscany.spi.component.TargetException;
-import org.apache.tuscany.spi.model.ServiceContract;
import org.apache.tuscany.spi.component.SCAObject;
+import org.apache.tuscany.spi.component.TargetResolutionException;
+import org.apache.tuscany.spi.model.ServiceContract;
/**
* The base wire type used to connect references and services
@@ -32,7 +32,7 @@
/**
* Returns the non-proxied target instance for this wire
*/
- Object getTargetService() throws TargetException;
+ Object getTargetService() throws TargetResolutionException;
/**
* Returns the service contract associated with the wire
Modified: incubator/tuscany/java/sca/kernel/spi/src/test/java/org/apache/tuscany/spi/component/AbstractSCAObjectTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/spi/src/test/java/org/apache/tuscany/spi/component/AbstractSCAObjectTestCase.java?view=diff&rev=488144&r1=488143&r2=488144
==============================================================================
--- incubator/tuscany/java/sca/kernel/spi/src/test/java/org/apache/tuscany/spi/component/AbstractSCAObjectTestCase.java (original)
+++ incubator/tuscany/java/sca/kernel/spi/src/test/java/org/apache/tuscany/spi/component/AbstractSCAObjectTestCase.java Sun Dec 17 23:43:50 2006
@@ -106,7 +106,7 @@
return null;
}
- public Object getServiceInstance() throws TargetException {
+ public Object getServiceInstance() throws TargetResolutionException {
return null;
}
}
Modified: incubator/tuscany/java/sca/kernel/spi/src/test/java/org/apache/tuscany/spi/extension/AtomicComponentExtensionTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/spi/src/test/java/org/apache/tuscany/spi/extension/AtomicComponentExtensionTestCase.java?view=diff&rev=488144&r1=488143&r2=488144
==============================================================================
--- incubator/tuscany/java/sca/kernel/spi/src/test/java/org/apache/tuscany/spi/extension/AtomicComponentExtensionTestCase.java (original)
+++ incubator/tuscany/java/sca/kernel/spi/src/test/java/org/apache/tuscany/spi/extension/AtomicComponentExtensionTestCase.java Sun Dec 17 23:43:50 2006
@@ -22,7 +22,7 @@
import org.apache.tuscany.spi.ObjectCreationException;
import org.apache.tuscany.spi.component.ScopeContainer;
-import org.apache.tuscany.spi.component.TargetException;
+import org.apache.tuscany.spi.component.TargetResolutionException;
import org.apache.tuscany.spi.model.Operation;
import org.apache.tuscany.spi.wire.InboundWire;
import org.apache.tuscany.spi.wire.TargetInvoker;
@@ -78,7 +78,7 @@
super(null, null, scopeContainer, null, null, null, null, 0);
}
- public Object getServiceInstance() throws TargetException {
+ public Object getServiceInstance() throws TargetResolutionException {
return null;
}
@@ -86,7 +86,7 @@
return null;
}
- public Object getServiceInstance(String name) throws TargetException {
+ public Object getServiceInstance(String name) throws TargetResolutionException {
return null;
}
Modified: incubator/tuscany/java/sca/services/containers/container.groovy/src/main/java/org/apache/tuscany/container/groovy/GroovyAtomicComponent.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/services/containers/container.groovy/src/main/java/org/apache/tuscany/container/groovy/GroovyAtomicComponent.java?view=diff&rev=488144&r1=488143&r2=488144
==============================================================================
--- incubator/tuscany/java/sca/services/containers/container.groovy/src/main/java/org/apache/tuscany/container/groovy/GroovyAtomicComponent.java (original)
+++ incubator/tuscany/java/sca/services/containers/container.groovy/src/main/java/org/apache/tuscany/container/groovy/GroovyAtomicComponent.java Sun Dec 17 23:43:50 2006
@@ -27,6 +27,7 @@
import org.apache.tuscany.spi.ObjectFactory;
import org.apache.tuscany.spi.component.TargetException;
import org.apache.tuscany.spi.component.TargetNotFoundException;
+import org.apache.tuscany.spi.component.TargetResolutionException;
import org.apache.tuscany.spi.extension.AtomicComponentExtension;
import org.apache.tuscany.spi.model.Operation;
import org.apache.tuscany.spi.wire.InboundWire;
@@ -98,12 +99,12 @@
return (GroovyObject) scopeContainer.getInstance(this);
}
- public Object getServiceInstance() throws TargetException {
+ public Object getServiceInstance() throws TargetResolutionException {
//TODO this should return a default service from a wire
return scopeContainer.getInstance(this);
}
- public Object getServiceInstance(String service) throws TargetException {
+ public Object getServiceInstance(String service) throws TargetResolutionException {
InboundWire wire = getInboundWire(service);
if (wire == null) {
throw new TargetNotFoundException("Service not found", service);
Modified: incubator/tuscany/java/sca/services/containers/container.javascript/src/main/java/org/apache/tuscany/container/javascript/JavaScriptComponent.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/services/containers/container.javascript/src/main/java/org/apache/tuscany/container/javascript/JavaScriptComponent.java?view=diff&rev=488144&r1=488143&r2=488144
==============================================================================
--- incubator/tuscany/java/sca/services/containers/container.javascript/src/main/java/org/apache/tuscany/container/javascript/JavaScriptComponent.java (original)
+++ incubator/tuscany/java/sca/services/containers/container.javascript/src/main/java/org/apache/tuscany/container/javascript/JavaScriptComponent.java Sun Dec 17 23:43:50 2006
@@ -27,6 +27,7 @@
import org.apache.tuscany.spi.component.ScopeContainer;
import org.apache.tuscany.spi.component.TargetException;
import org.apache.tuscany.spi.component.TargetNotFoundException;
+import org.apache.tuscany.spi.component.TargetResolutionException;
import org.apache.tuscany.spi.component.WorkContext;
import org.apache.tuscany.spi.extension.AtomicComponentExtension;
import org.apache.tuscany.spi.extension.ExecutionMonitor;
@@ -107,11 +108,11 @@
return (RhinoScriptInstance) scopeContainer.getInstance(this);
}
- public Object getServiceInstance() throws TargetException {
+ public Object getServiceInstance() throws TargetResolutionException {
return getServiceInstance(null);
}
- public Object getServiceInstance(String service) throws TargetException {
+ public Object getServiceInstance(String service) throws TargetResolutionException {
InboundWire wire = getInboundWire(service);
if (wire == null) {
throw new TargetNotFoundException("ServiceDefinition not found", service);
---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org