Author: lresende
Date: Thu Dec 21 09:12:07 2006
New Revision: 489410
URL: http://svn.apache.org/viewvc?view=rev&rev=489410
Log:
Updates after changes to move from @Scope("MODULE") to @Scope("COMPOSITE")
Modified:
incubator/tuscany/sandbox/lresende/container.das/src/main/java/org/apache/tuscany/container/dataaccess/DataAccessComponent.java
incubator/tuscany/sandbox/lresende/container.das/src/main/java/org/apache/tuscany/container/dataaccess/DataAccessComponentBuilder.java
incubator/tuscany/sandbox/lresende/container.das/src/main/java/org/apache/tuscany/container/dataaccess/DataAccessComponentType.java
incubator/tuscany/sandbox/lresende/container.das/src/main/java/org/apache/tuscany/container/dataaccess/DataAccessInvoker.java
Modified: incubator/tuscany/sandbox/lresende/container.das/src/main/java/org/apache/tuscany/container/dataaccess/DataAccessComponent.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/lresende/container.das/src/main/java/org/apache/tuscany/container/dataaccess/DataAccessComponent.java?view=diff&rev=489410&r1=489409&r2=489410
==============================================================================
--- incubator/tuscany/sandbox/lresende/container.das/src/main/java/org/apache/tuscany/container/dataaccess/DataAccessComponent.java (original)
+++ incubator/tuscany/sandbox/lresende/container.das/src/main/java/org/apache/tuscany/container/dataaccess/DataAccessComponent.java Thu Dec 21 09:12:07 2006
@@ -28,6 +28,7 @@
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.component.WorkContext;
import org.apache.tuscany.spi.extension.AtomicComponentExtension;
import org.apache.tuscany.spi.model.Operation;
@@ -107,15 +108,15 @@
// return properties;
// }
- 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 TargetException("Service '" + service + "'not found"); // TODO better error message
+ throw new TargetResolutionException("Service '" + service + "'not found"); // TODO better error message
}
return wireService.createProxy(wire);
}
Modified: incubator/tuscany/sandbox/lresende/container.das/src/main/java/org/apache/tuscany/container/dataaccess/DataAccessComponentBuilder.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/lresende/container.das/src/main/java/org/apache/tuscany/container/dataaccess/DataAccessComponentBuilder.java?view=diff&rev=489410&r1=489409&r2=489410
==============================================================================
--- incubator/tuscany/sandbox/lresende/container.das/src/main/java/org/apache/tuscany/container/dataaccess/DataAccessComponentBuilder.java (original)
+++ incubator/tuscany/sandbox/lresende/container.das/src/main/java/org/apache/tuscany/container/dataaccess/DataAccessComponentBuilder.java Thu Dec 21 09:12:07 2006
@@ -63,8 +63,8 @@
//TODO: have ComponentBuilderExtension pass ScopeContainer in on build method?
ScopeContainer scopeContainer;
Scope scope = componentType.getLifecycleScope();
- if (Scope.MODULE == scope) {
- scopeContainer = deploymentContext.getModuleScope();
+ if (Scope.COMPOSITE == scope) {
+ scopeContainer = deploymentContext.getCompositeScope();
} else {
scopeContainer = scopeRegistry.getScopeContainer(scope);
}
Modified: incubator/tuscany/sandbox/lresende/container.das/src/main/java/org/apache/tuscany/container/dataaccess/DataAccessComponentType.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/lresende/container.das/src/main/java/org/apache/tuscany/container/dataaccess/DataAccessComponentType.java?view=diff&rev=489410&r1=489409&r2=489410
==============================================================================
--- incubator/tuscany/sandbox/lresende/container.das/src/main/java/org/apache/tuscany/container/dataaccess/DataAccessComponentType.java (original)
+++ incubator/tuscany/sandbox/lresende/container.das/src/main/java/org/apache/tuscany/container/dataaccess/DataAccessComponentType.java Thu Dec 21 09:12:07 2006
@@ -26,7 +26,7 @@
public class DataAccessComponentType extends ComponentType<ServiceDefinition, ReferenceDefinition, Property<?>> {
- private Scope lifecycleScope = Scope.MODULE;
+ private Scope lifecycleScope = Scope.COMPOSITE;
public DataAccessComponentType() {
}
Modified: incubator/tuscany/sandbox/lresende/container.das/src/main/java/org/apache/tuscany/container/dataaccess/DataAccessInvoker.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/lresende/container.das/src/main/java/org/apache/tuscany/container/dataaccess/DataAccessInvoker.java?view=diff&rev=489410&r1=489409&r2=489410
==============================================================================
--- incubator/tuscany/sandbox/lresende/container.das/src/main/java/org/apache/tuscany/container/dataaccess/DataAccessInvoker.java (original)
+++ incubator/tuscany/sandbox/lresende/container.das/src/main/java/org/apache/tuscany/container/dataaccess/DataAccessInvoker.java Thu Dec 21 09:12:07 2006
@@ -21,6 +21,7 @@
import java.lang.reflect.InvocationTargetException;
import org.apache.tuscany.container.dataaccessscript.DataAccessInstanceImpl;
+import org.apache.tuscany.spi.component.TargetException;
import org.apache.tuscany.spi.extension.TargetInvokerExtension;
/**
@@ -44,7 +45,16 @@
public Object invokeTarget(final Object payload, final short sequence) throws InvocationTargetException {
- DataAccessInstanceImpl target = (DataAccessInstanceImpl) component.getTargetInstance();
+ DataAccessInstanceImpl target;
+
+ //get the component
+ try{
+ target = (DataAccessInstanceImpl) component.getTargetInstance();
+ }catch(TargetException e){
+ throw new InvocationTargetException(e);
+ }
+
+ //invoke it
try {
return target.invokeFunction(functionName,
(Object[]) payload,
---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org