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/16 21:32:20 UTC
svn commit: r487877 [3/3] - in /incubator/tuscany/java/sca:
kernel/api/src/main/java/org/apache/tuscany/api/
kernel/api/src/test/java/org/apache/tuscany/api/
kernel/core/src/main/java/org/apache/tuscany/core/builder/
kernel/core/src/main/java/org/apach...
Modified: incubator/tuscany/java/sca/services/bindings/binding.axis2/src/main/java/org/apache/tuscany/binding/axis2/Axis2BindingBuilder.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/services/bindings/binding.axis2/src/main/java/org/apache/tuscany/binding/axis2/Axis2BindingBuilder.java?view=diff&rev=487877&r1=487876&r2=487877
==============================================================================
--- incubator/tuscany/java/sca/services/bindings/binding.axis2/src/main/java/org/apache/tuscany/binding/axis2/Axis2BindingBuilder.java (original)
+++ incubator/tuscany/java/sca/services/bindings/binding.axis2/src/main/java/org/apache/tuscany/binding/axis2/Axis2BindingBuilder.java Sat Dec 16 12:32:16 2006
@@ -59,7 +59,7 @@
private WorkContext workContext;
- public Axis2BindingBuilder() {
+ public Axis2BindingBuilder() throws BuilderConfigException {
initAxis();
}
@@ -190,7 +190,7 @@
return WebServiceBinding.class;
}
- protected void initAxis() {
+ protected void initAxis() throws BuilderConfigException {
// TODO: Fix classloader switching. See TUSCANY-647
// TODO: also consider having a system component wrapping the Axis2 ConfigContext
ClassLoader tccl = Thread.currentThread().getContextClassLoader();
Modified: incubator/tuscany/java/sca/services/bindings/binding.axis2/src/main/java/org/apache/tuscany/binding/axis2/Axis2Service.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/services/bindings/binding.axis2/src/main/java/org/apache/tuscany/binding/axis2/Axis2Service.java?view=diff&rev=487877&r1=487876&r2=487877
==============================================================================
--- incubator/tuscany/java/sca/services/bindings/binding.axis2/src/main/java/org/apache/tuscany/binding/axis2/Axis2Service.java (original)
+++ incubator/tuscany/java/sca/services/bindings/binding.axis2/src/main/java/org/apache/tuscany/binding/axis2/Axis2Service.java Sat Dec 16 12:32:16 2006
@@ -268,7 +268,7 @@
/**
* Get the Method from an interface matching the WSDL operation name
*/
- protected Method getMethod(Class<?> serviceInterface, String operationName) {
+ protected Method getMethod(Class<?> serviceInterface, String operationName) throws BuilderConfigException {
// Note: this doesn't support overloaded operations
Method[] methods = serviceInterface.getMethods();
for (Method m : methods) {
Modified: incubator/tuscany/java/sca/services/bindings/binding.celtix/src/main/java/org/apache/tuscany/binding/celtix/CeltixReference.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/services/bindings/binding.celtix/src/main/java/org/apache/tuscany/binding/celtix/CeltixReference.java?view=diff&rev=487877&r1=487876&r2=487877
==============================================================================
--- incubator/tuscany/java/sca/services/bindings/binding.celtix/src/main/java/org/apache/tuscany/binding/celtix/CeltixReference.java (original)
+++ incubator/tuscany/java/sca/services/bindings/binding.celtix/src/main/java/org/apache/tuscany/binding/celtix/CeltixReference.java Sat Dec 16 12:32:16 2006
@@ -28,6 +28,7 @@
import org.apache.tuscany.spi.model.ServiceContract;
import org.apache.tuscany.spi.wire.TargetInvoker;
import org.apache.tuscany.spi.wire.WireService;
+import org.apache.tuscany.spi.builder.BuilderException;
import commonj.sdo.helper.TypeHelper;
import org.objectweb.celtix.Bus;
@@ -61,6 +62,11 @@
}
public TargetInvoker createTargetInvoker(ServiceContract contract, Operation operation) {
- return new CeltixInvoker(operation.getName(), bus, port, wsdlService, wsdlDef, typeHelper);
+ try {
+ return new CeltixInvoker(operation.getName(), bus, port, wsdlService, wsdlDef, typeHelper);
+ } catch (BuilderException e) {
+ // fixme
+ throw new CeltixServiceInitException(e);
+ }
}
}
Modified: incubator/tuscany/java/sca/services/bindings/binding.celtix/src/main/java/org/apache/tuscany/binding/celtix/CeltixService.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/services/bindings/binding.celtix/src/main/java/org/apache/tuscany/binding/celtix/CeltixService.java?view=diff&rev=487877&r1=487876&r2=487877
==============================================================================
--- incubator/tuscany/java/sca/services/bindings/binding.celtix/src/main/java/org/apache/tuscany/binding/celtix/CeltixService.java (original)
+++ incubator/tuscany/java/sca/services/bindings/binding.celtix/src/main/java/org/apache/tuscany/binding/celtix/CeltixService.java Sat Dec 16 12:32:16 2006
@@ -41,7 +41,6 @@
import org.osoa.sca.annotations.Destroy;
import org.apache.tuscany.spi.CoreRuntimeException;
-import org.apache.tuscany.spi.builder.BuilderConfigException;
import org.apache.tuscany.spi.component.CompositeComponent;
import org.apache.tuscany.spi.extension.ServiceExtension;
import org.apache.tuscany.spi.wire.WireService;
@@ -114,7 +113,7 @@
QName qName = wsdlService.getQName();
String portName = port.getName();
- EndpointReferenceType reference = EndpointReferenceUtils.getEndpointReference(url,qName,portName);
+ EndpointReferenceType reference = EndpointReferenceUtils.getEndpointReference(url, qName, portName);
AttributedURIType address = new AttributedURIType();
@@ -235,7 +234,8 @@
return m;
}
}
- throw new BuilderConfigException("no operation named " + operationName
+ // FIXME
+ throw new CeltixServiceInitException("no operation named " + operationName
+ " found on service interface: " + serviceInterface.getName());
}
Modified: incubator/tuscany/java/sca/services/containers/container.script/src/test/java/org/apache/tuscany/container/script/ScriptComponentBuilderTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/services/containers/container.script/src/test/java/org/apache/tuscany/container/script/ScriptComponentBuilderTestCase.java?view=diff&rev=487877&r1=487876&r2=487877
==============================================================================
--- incubator/tuscany/java/sca/services/containers/container.script/src/test/java/org/apache/tuscany/container/script/ScriptComponentBuilderTestCase.java (original)
+++ incubator/tuscany/java/sca/services/containers/container.script/src/test/java/org/apache/tuscany/container/script/ScriptComponentBuilderTestCase.java Sat Dec 16 12:32:16 2006
@@ -43,7 +43,7 @@
}
@SuppressWarnings("unchecked")
- public void testBuild() {
+ public void testBuild() throws Exception {
ScriptComponentBuilder builder = new ScriptComponentBuilder();
DeploymentContext deploymentContext = createMock(DeploymentContext.class);
final ScopeContainer scopeContainer = createMock(ScopeContainer.class);
@@ -84,7 +84,7 @@
}
@SuppressWarnings("unchecked")
- public void testBuildModuleScope() {
+ public void testBuildModuleScope() throws Exception {
ScriptComponentBuilder builder = new ScriptComponentBuilder();
DeploymentContext deploymentContext = createMock(DeploymentContext.class);
final ScopeContainer scopeContainer = createMock(ScopeContainer.class);
Modified: incubator/tuscany/java/sca/services/containers/container.spring/src/main/java/org/apache/tuscany/container/spring/impl/SpringCompositeBuilder.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/services/containers/container.spring/src/main/java/org/apache/tuscany/container/spring/impl/SpringCompositeBuilder.java?view=diff&rev=487877&r1=487876&r2=487877
==============================================================================
--- incubator/tuscany/java/sca/services/containers/container.spring/src/main/java/org/apache/tuscany/container/spring/impl/SpringCompositeBuilder.java (original)
+++ incubator/tuscany/java/sca/services/containers/container.spring/src/main/java/org/apache/tuscany/container/spring/impl/SpringCompositeBuilder.java Sat Dec 16 12:32:16 2006
@@ -19,7 +19,7 @@
package org.apache.tuscany.container.spring.impl;
import org.apache.tuscany.spi.QualifiedName;
-import org.apache.tuscany.spi.builder.BuilderConfigException;
+import org.apache.tuscany.spi.builder.BuilderException;
import org.apache.tuscany.spi.component.Component;
import org.apache.tuscany.spi.component.CompositeComponent;
import org.apache.tuscany.spi.component.Reference;
@@ -48,7 +48,7 @@
@SuppressWarnings("unchecked")
public Component build(CompositeComponent parent,
ComponentDefinition<SpringImplementation> componentDefinition,
- DeploymentContext deploymentContext) throws BuilderConfigException {
+ DeploymentContext deploymentContext) throws BuilderException {
String name = componentDefinition.getName();
SpringImplementation implementation = componentDefinition.getImplementation();
Resource resource = implementation.getApplicationResource();
Modified: incubator/tuscany/java/sca/services/containers/container.spring/src/test/java/org/apache/tuscany/container/spring/SpringTestUtils.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/services/containers/container.spring/src/test/java/org/apache/tuscany/container/spring/SpringTestUtils.java?view=diff&rev=487877&r1=487876&r2=487877
==============================================================================
--- incubator/tuscany/java/sca/services/containers/container.spring/src/test/java/org/apache/tuscany/container/spring/SpringTestUtils.java (original)
+++ incubator/tuscany/java/sca/services/containers/container.spring/src/test/java/org/apache/tuscany/container/spring/SpringTestUtils.java Sat Dec 16 12:32:16 2006
@@ -21,6 +21,7 @@
import org.apache.tuscany.spi.QualifiedName;
import org.apache.tuscany.spi.idl.InvalidServiceContractException;
import org.apache.tuscany.spi.builder.Connector;
+import org.apache.tuscany.spi.builder.WiringException;
import org.apache.tuscany.spi.component.CompositeComponent;
import org.apache.tuscany.spi.component.Service;
import org.apache.tuscany.spi.extension.ServiceExtension;
@@ -45,7 +46,8 @@
public static <T> Service createService(String name,
Class<T> serviceInterface,
CompositeComponent parent,
- WireService wireService) throws InvalidServiceContractException {
+ WireService wireService)
+ throws InvalidServiceContractException, WiringException {
Service service = new ServiceExtension(name, serviceInterface, parent, wireService);
InboundWire inboundWire = ArtifactFactory.createInboundWire(name, serviceInterface);
OutboundWire outboundWire = ArtifactFactory.createOutboundWire(name, serviceInterface);
Modified: incubator/tuscany/java/sca/services/containers/container.spring/src/test/java/org/apache/tuscany/container/spring/impl/ServiceInvocationTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/services/containers/container.spring/src/test/java/org/apache/tuscany/container/spring/impl/ServiceInvocationTestCase.java?view=diff&rev=487877&r1=487876&r2=487877
==============================================================================
--- incubator/tuscany/java/sca/services/containers/container.spring/src/test/java/org/apache/tuscany/container/spring/impl/ServiceInvocationTestCase.java (original)
+++ incubator/tuscany/java/sca/services/containers/container.spring/src/test/java/org/apache/tuscany/container/spring/impl/ServiceInvocationTestCase.java Sat Dec 16 12:32:16 2006
@@ -18,14 +18,13 @@
*/
package org.apache.tuscany.container.spring.impl;
+import org.apache.tuscany.spi.QualifiedName;
import org.apache.tuscany.spi.builder.Connector;
import org.apache.tuscany.spi.component.Service;
import org.apache.tuscany.spi.extension.ServiceExtension;
-import org.apache.tuscany.spi.idl.InvalidServiceContractException;
import org.apache.tuscany.spi.wire.InboundInvocationChain;
import org.apache.tuscany.spi.wire.InboundWire;
import org.apache.tuscany.spi.wire.OutboundWire;
-import org.apache.tuscany.spi.QualifiedName;
import junit.framework.TestCase;
import org.apache.tuscany.container.spring.mock.TestBean;
@@ -43,7 +42,7 @@
*/
public class ServiceInvocationTestCase extends TestCase {
- public void testInvocation() throws InvalidServiceContractException {
+ public void testInvocation() throws Exception {
AbstractApplicationContext springContext = createSpringContext();
SpringCompositeComponent composite = new SpringCompositeComponent("parent", springContext, null, null, null);
InboundWire inboundWire = ArtifactFactory.createInboundWire("fooService", TestBean.class);
Modified: incubator/tuscany/java/sca/services/persistence/datasource/src/test/java/org/apache/tuscany/persistence/datasource/DataSourceBuilderTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/services/persistence/datasource/src/test/java/org/apache/tuscany/persistence/datasource/DataSourceBuilderTestCase.java?view=diff&rev=487877&r1=487876&r2=487877
==============================================================================
--- incubator/tuscany/java/sca/services/persistence/datasource/src/test/java/org/apache/tuscany/persistence/datasource/DataSourceBuilderTestCase.java (original)
+++ incubator/tuscany/java/sca/services/persistence/datasource/src/test/java/org/apache/tuscany/persistence/datasource/DataSourceBuilderTestCase.java Sat Dec 16 12:32:16 2006
@@ -38,7 +38,7 @@
*/
public class DataSourceBuilderTestCase extends TestCase {
- public void testBuild() {
+ public void testBuild() throws Exception {
CompositeComponent parent = EasyMock.createMock(CompositeComponent.class);
EasyMock.replay(parent);
ScopeContainer scope = EasyMock.createMock(ScopeContainer.class);
Modified: incubator/tuscany/java/sca/test/src/main/java/org/apache/tuscany/test/SCATestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/test/src/main/java/org/apache/tuscany/test/SCATestCase.java?view=diff&rev=487877&r1=487876&r2=487877
==============================================================================
--- incubator/tuscany/java/sca/test/src/main/java/org/apache/tuscany/test/SCATestCase.java (original)
+++ incubator/tuscany/java/sca/test/src/main/java/org/apache/tuscany/test/SCATestCase.java Sat Dec 16 12:32:16 2006
@@ -24,7 +24,9 @@
import java.util.HashMap;
import java.util.Map;
+import org.apache.tuscany.spi.builder.BuilderException;
import org.apache.tuscany.spi.component.Component;
+import org.apache.tuscany.spi.component.ComponentException;
import org.apache.tuscany.spi.component.CompositeComponent;
import org.apache.tuscany.spi.deployer.Deployer;
import org.apache.tuscany.spi.deployer.DeploymentMonitor;
@@ -32,6 +34,7 @@
import org.apache.tuscany.spi.model.ComponentDefinition;
import junit.framework.TestCase;
+import org.apache.tuscany.api.TuscanyException;
import org.apache.tuscany.core.implementation.system.model.SystemCompositeImplementation;
import org.apache.tuscany.core.launcher.CompositeContextImpl;
import org.apache.tuscany.core.launcher.LauncherImpl;
@@ -60,25 +63,25 @@
launcher = new LauncherImpl();
launcher.setApplicationLoader(cl);
URL scdl = cl.getResource(LauncherImpl.METAINF_SYSTEM_SCDL_PATH);
- CompositeComponent composite = launcher.bootRuntime(scdl, monitorFactory);
try {
+ CompositeComponent composite = launcher.bootRuntime(scdl, monitorFactory);
for (String extensionName : extensions.keySet()) {
deployExtension(composite, extensionName, extensions.get(extensionName));
}
- } catch (LoaderException e) {
+ if (applicationSCDL == null) {
+ throw new RuntimeException("application SCDL not found: " + applicationSCDL);
+ }
+ component = launcher.bootApplication("application", applicationSCDL);
+ component.start();
+ context = new CompositeContextImpl(component);
+ context.start();
+ } catch (TuscanyException e) {
DeploymentMonitor monitor = monitorFactory.getMonitor(DeploymentMonitor.class);
monitor.deploymentError(e);
throw e;
}
- if (applicationSCDL == null) {
- throw new RuntimeException("application SCDL not found: " + applicationSCDL);
- }
- component = launcher.bootApplication("application", applicationSCDL);
- component.start();
- context = new CompositeContextImpl(component);
- context.start();
}
/**
@@ -119,7 +122,7 @@
}
protected void deployExtension(CompositeComponent composite, String extensionName, URL scdlURL)
- throws LoaderException {
+ throws LoaderException, BuilderException, ComponentException {
SystemCompositeImplementation implementation = new SystemCompositeImplementation();
implementation.setScdlLocation(scdlURL);
implementation.setClassLoader(new URLClassLoader(new URL[]{scdlURL}, getClass().getClassLoader()));
---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org