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 [2/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...
Modified: incubator/tuscany/java/sca/services/containers/container.ruby/src/main/java/org/apache/tuscany/container/ruby/RubyComponent.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/services/containers/container.ruby/src/main/java/org/apache/tuscany/container/ruby/RubyComponent.java?view=diff&rev=488144&r1=488143&r2=488144
==============================================================================
--- incubator/tuscany/java/sca/services/containers/container.ruby/src/main/java/org/apache/tuscany/container/ruby/RubyComponent.java (original)
+++ incubator/tuscany/java/sca/services/containers/container.ruby/src/main/java/org/apache/tuscany/container/ruby/RubyComponent.java Sun Dec 17 23:43:50 2006
@@ -26,8 +26,9 @@
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.component.WorkContext;
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;
import org.apache.tuscany.spi.model.Operation;
@@ -124,12 +125,12 @@
return (RubyScriptInstance) scopeContainer.getInstance(this);
}
- public Object getServiceInstance() throws TargetException {
+ public Object getServiceInstance() throws TargetResolutionException {
return getServiceInstance(null);
}
@SuppressWarnings("unchecked")
- 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); // TODO better error message
Modified: incubator/tuscany/java/sca/services/containers/container.script/src/main/java/org/apache/tuscany/container/script/ScriptComponent.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/services/containers/container.script/src/main/java/org/apache/tuscany/container/script/ScriptComponent.java?view=diff&rev=488144&r1=488143&r2=488144
==============================================================================
--- incubator/tuscany/java/sca/services/containers/container.script/src/main/java/org/apache/tuscany/container/script/ScriptComponent.java (original)
+++ incubator/tuscany/java/sca/services/containers/container.script/src/main/java/org/apache/tuscany/container/script/ScriptComponent.java Sun Dec 17 23:43:50 2006
@@ -24,6 +24,7 @@
import org.apache.tuscany.spi.ObjectCreationException;
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 static org.apache.tuscany.spi.idl.java.JavaIDLUtils.findMethod;
import org.apache.tuscany.spi.model.Operation;
@@ -34,6 +35,8 @@
/**
* A component implementation for script languages.
+ *
+ * @version $Rev$ $Date$
*/
public class ScriptComponent extends AtomicComponentExtension {
private final List<Class<?>> services;
@@ -68,7 +71,7 @@
return services;
}
- public Object getServiceInstance() throws TargetException {
+ public Object getServiceInstance() throws TargetResolutionException {
return getServiceInstance(null);
}
@@ -77,7 +80,7 @@
}
@SuppressWarnings("unchecked")
- 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/persistence/datasource/src/main/java/org/apache/tuscany/persistence/datasource/DataSourceComponent.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/services/persistence/datasource/src/main/java/org/apache/tuscany/persistence/datasource/DataSourceComponent.java?view=diff&rev=488144&r1=488143&r2=488144
==============================================================================
--- incubator/tuscany/java/sca/services/persistence/datasource/src/main/java/org/apache/tuscany/persistence/datasource/DataSourceComponent.java (original)
+++ incubator/tuscany/java/sca/services/persistence/datasource/src/main/java/org/apache/tuscany/persistence/datasource/DataSourceComponent.java Sun Dec 17 23:43:50 2006
@@ -25,8 +25,8 @@
import org.apache.tuscany.spi.ObjectCreationException;
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.component.TargetDestructionException;
+import org.apache.tuscany.spi.component.TargetResolutionException;
import org.apache.tuscany.spi.extension.SystemAtomicComponentExtension;
import org.apache.tuscany.spi.wire.OutboundWire;
@@ -64,7 +64,7 @@
return instanceFactory.getInstance();
}
- public Object getTargetInstance() throws TargetException {
+ public Object getTargetInstance() throws TargetResolutionException {
return scopeContainer.getInstance(this);
}
Modified: incubator/tuscany/java/sca/services/persistence/openjpa/src/main/java/org/apache/tuscany/service/openjpa/JPAAtomicComponent.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/services/persistence/openjpa/src/main/java/org/apache/tuscany/service/openjpa/JPAAtomicComponent.java?view=diff&rev=488144&r1=488143&r2=488144
==============================================================================
--- incubator/tuscany/java/sca/services/persistence/openjpa/src/main/java/org/apache/tuscany/service/openjpa/JPAAtomicComponent.java (original)
+++ incubator/tuscany/java/sca/services/persistence/openjpa/src/main/java/org/apache/tuscany/service/openjpa/JPAAtomicComponent.java Sun Dec 17 23:43:50 2006
@@ -26,7 +26,7 @@
import org.apache.tuscany.spi.ObjectCreationException;
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.component.TargetResolutionException;
import org.apache.tuscany.spi.extension.SystemAtomicComponentExtension;
/**
@@ -65,7 +65,7 @@
return factory;
}
- public Object getTargetInstance() throws TargetException {
+ public Object getTargetInstance() throws TargetResolutionException {
return factory;
}
Modified: incubator/tuscany/java/sca/services/persistence/store.journal/src/test/java/org/apache/tuscany/persistence/store/journal/performance/MockSCAObject.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/services/persistence/store.journal/src/test/java/org/apache/tuscany/persistence/store/journal/performance/MockSCAObject.java?view=diff&rev=488144&r1=488143&r2=488144
==============================================================================
--- incubator/tuscany/java/sca/services/persistence/store.journal/src/test/java/org/apache/tuscany/persistence/store/journal/performance/MockSCAObject.java (original)
+++ incubator/tuscany/java/sca/services/persistence/store.journal/src/test/java/org/apache/tuscany/persistence/store/journal/performance/MockSCAObject.java Sun Dec 17 23:43:50 2006
@@ -23,7 +23,7 @@
import org.apache.tuscany.spi.CoreRuntimeException;
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.event.Event;
import org.apache.tuscany.spi.event.EventFilter;
import org.apache.tuscany.spi.event.RuntimeEventListener;
@@ -49,7 +49,7 @@
return null;
}
- public Object getServiceInstance() throws TargetException {
+ public Object getServiceInstance() throws TargetResolutionException {
return null;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org