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 2007/02/18 07:22:49 UTC
svn commit: r508877 - in /incubator/tuscany/java/sca/kernel:
api/src/main/java/org/apache/tuscany/api/
api/src/test/java/org/apache/tuscany/api/
core/src/main/java/org/apache/tuscany/core/builder/
core/src/main/java/org/apache/tuscany/core/component/sc...
Author: jmarino
Date: Sat Feb 17 22:22:48 2007
New Revision: 508877
URL: http://svn.apache.org/viewvc?view=rev&rev=508877
Log:
remove context names from TuscanyException and tuscanyRuntimeException as Component URIs are now used
Modified:
incubator/tuscany/java/sca/kernel/api/src/main/java/org/apache/tuscany/api/TuscanyException.java
incubator/tuscany/java/sca/kernel/api/src/main/java/org/apache/tuscany/api/TuscanyRuntimeException.java
incubator/tuscany/java/sca/kernel/api/src/test/java/org/apache/tuscany/api/TuscanyExceptionTestCase.java
incubator/tuscany/java/sca/kernel/api/src/test/java/org/apache/tuscany/api/TuscanyRuntimeExceptionTestCase.java
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/builder/BuilderRegistryImpl.java
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/builder/WiringExceptionFormatter.java
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/component/scope/CompositeScopeContainer.java
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/databinding/impl/MediatorImpl.java
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/deployer/DeployerImpl.java
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/loader/ComponentLoader.java
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/loader/IncludeLoader.java
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/loader/LoaderExceptionFormatter.java
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/monitor/DefaultExceptionFormatter.java
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/property/PropertyHelper.java
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/wire/IncompatibleServiceContractExceptionFormatter.java
incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/monitor/DefaultExceptionFormatterTestCase.java
incubator/tuscany/java/sca/kernel/spi/src/test/java/org/apache/tuscany/spi/TuscanyRuntimeExceptionTestCase.java
Modified: incubator/tuscany/java/sca/kernel/api/src/main/java/org/apache/tuscany/api/TuscanyException.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/api/src/main/java/org/apache/tuscany/api/TuscanyException.java?view=diff&rev=508877&r1=508876&r2=508877
==============================================================================
--- incubator/tuscany/java/sca/kernel/api/src/main/java/org/apache/tuscany/api/TuscanyException.java (original)
+++ incubator/tuscany/java/sca/kernel/api/src/main/java/org/apache/tuscany/api/TuscanyException.java Sat Feb 17 22:22:48 2007
@@ -18,9 +18,6 @@
*/
package org.apache.tuscany.api;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Collections;
import java.io.PrintWriter;
/**
@@ -30,7 +27,6 @@
*/
public abstract class TuscanyException extends Exception {
private static final long serialVersionUID = -7847121698339635268L;
- private List<String> contextStack;
private final String identifier;
/**
@@ -103,31 +99,6 @@
}
/**
- * Returns a collection of names representing the context call stack where the error occured. The top of the stack
- * is the first element in the collection.
- *
- * @return a collection of names representing the context call stack
- */
- public List<String> returnContextNames() {
- if (contextStack == null) {
- contextStack = new ArrayList<String>();
- }
- return Collections.unmodifiableList(contextStack);
- }
-
- /**
- * Pushes a context name where an error occured onto the call stack.
- *
- * @param name the name of a context to push on the stack
- */
- public void addContextName(String name) {
- if (contextStack == null) {
- contextStack = new ArrayList<String>();
- }
- contextStack.add(name);
- }
-
- /**
* Returns a string representing additional error information referred to in the error message.
*
* @return additional error information
@@ -137,7 +108,7 @@
}
public PrintWriter appendBaseMessage(PrintWriter writer) {
- if (identifier == null && contextStack == null) {
+ if (identifier == null) {
if (super.getMessage() == null) {
return writer;
}
@@ -146,19 +117,8 @@
if (super.getMessage() != null) {
writer.append(super.getMessage());
}
- if (identifier != null) {
- writer.append(" [").append(identifier).append(']');
- }
+ writer.append(" [").append(identifier).append(']');
return writer;
}
- public PrintWriter appendContextStack(PrintWriter writer) {
- if (contextStack != null) {
- writer.append("\nContext stack trace: ");
- for (int i = contextStack.size() - 1; i >= 0; i--) {
- writer.append('[').append(contextStack.get(i)).append(']');
- }
- }
- return writer;
- }
}
Modified: incubator/tuscany/java/sca/kernel/api/src/main/java/org/apache/tuscany/api/TuscanyRuntimeException.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/api/src/main/java/org/apache/tuscany/api/TuscanyRuntimeException.java?view=diff&rev=508877&r1=508876&r2=508877
==============================================================================
--- incubator/tuscany/java/sca/kernel/api/src/main/java/org/apache/tuscany/api/TuscanyRuntimeException.java (original)
+++ incubator/tuscany/java/sca/kernel/api/src/main/java/org/apache/tuscany/api/TuscanyRuntimeException.java Sat Feb 17 22:22:48 2007
@@ -18,9 +18,6 @@
*/
package org.apache.tuscany.api;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Collections;
import java.io.PrintWriter;
/**
@@ -31,7 +28,6 @@
public abstract class TuscanyRuntimeException extends RuntimeException {
private static final long serialVersionUID = -759677431966121786L;
- private List<String> contextStack;
private final String identifier;
/**
@@ -106,31 +102,6 @@
}
/**
- * Returns a collection of names representing the context call stack where the error occured. The top of the stack
- * is the first element in the collection.
- *
- * @return a collection of names representing the context call stack
- */
- public List<String> returnContextNames() {
- if (contextStack == null) {
- contextStack = new ArrayList<String>();
- }
- return Collections.unmodifiableList(contextStack);
- }
-
- /**
- * Pushes a context name where an error occured onto the call stack.
- *
- * @param name the name of a context to push on the stack
- */
- public void addContextName(String name) {
- if (contextStack == null) {
- contextStack = new ArrayList<String>();
- }
- contextStack.add(name);
- }
-
- /**
* Returns a string representing additional error information referred to in the error message.
*
* @return additional error information
@@ -140,7 +111,7 @@
}
public PrintWriter appendBaseMessage(PrintWriter writer) {
- if (identifier == null && contextStack == null) {
+ if (identifier == null) {
if (super.getMessage() == null) {
return writer;
}
@@ -149,19 +120,7 @@
if (super.getMessage() != null) {
writer.append(super.getMessage());
}
- if (identifier != null) {
- writer.append(" [").append(identifier).append(']');
- }
- return writer;
- }
-
- public PrintWriter appendContextStack(PrintWriter writer) {
- if (contextStack != null) {
- writer.append("Context stack trace: ");
- for (int i = contextStack.size() - 1; i >= 0; i--) {
- writer.append('[').append(contextStack.get(i)).append(']');
- }
- }
+ writer.append(" [").append(identifier).append(']');
return writer;
}
Modified: incubator/tuscany/java/sca/kernel/api/src/test/java/org/apache/tuscany/api/TuscanyExceptionTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/api/src/test/java/org/apache/tuscany/api/TuscanyExceptionTestCase.java?view=diff&rev=508877&r1=508876&r2=508877
==============================================================================
--- incubator/tuscany/java/sca/kernel/api/src/test/java/org/apache/tuscany/api/TuscanyExceptionTestCase.java (original)
+++ incubator/tuscany/java/sca/kernel/api/src/test/java/org/apache/tuscany/api/TuscanyExceptionTestCase.java Sat Feb 17 22:22:48 2007
@@ -20,8 +20,6 @@
import java.io.PrintWriter;
import java.io.StringWriter;
-import java.util.ArrayList;
-import java.util.List;
import junit.framework.TestCase;
@@ -32,15 +30,12 @@
private static final Throwable CAUSE = new Throwable("Cause");
private static final String IDENTIFIER = "IDENTIFIER";
private static final String MESSAGE = "Message";
- private static final String CONTEXT1 = "CONTEXT1";
- private static final String CONTEXT2 = "CONTEXT2";
public void testNoArgConstructor() {
TuscanyException ex = new DummyException();
assertNull(ex.getMessage());
assertNull(ex.getCause());
assertNull(ex.getIdentifier());
- assertTrue(ex.returnContextNames().isEmpty());
}
public void testMessageConstructor() {
@@ -48,7 +43,6 @@
assertEquals(MESSAGE, ex.getMessage());
assertNull(ex.getCause());
assertNull(ex.getIdentifier());
- assertTrue(ex.returnContextNames().isEmpty());
}
public void testAppendBaseMessage() {
@@ -72,7 +66,6 @@
assertEquals(CAUSE.getClass().getName() + ": " + CAUSE.getMessage(), ex.getMessage());
assertEquals(CAUSE, ex.getCause());
assertNull(ex.getIdentifier());
- assertTrue(ex.returnContextNames().isEmpty());
}
public void testMessageThrowableConstructor() {
@@ -80,41 +73,6 @@
assertEquals(MESSAGE, ex.getMessage());
assertEquals(CAUSE, ex.getCause());
assertNull(ex.getIdentifier());
- assertTrue(ex.returnContextNames().isEmpty());
- }
-
- public void testContextStack() {
- TuscanyException ex = new DummyException(MESSAGE);
- List<String> contexts = new ArrayList<String>();
- contexts.add(CONTEXT1);
- ex.addContextName(CONTEXT1);
- assertEquals(contexts, ex.returnContextNames());
- contexts.add(CONTEXT2);
- ex.addContextName(CONTEXT2);
- assertEquals(contexts, ex.returnContextNames());
- }
-
- public void testAppendContextMessage() {
- TuscanyException ex = new DummyException(MESSAGE);
- ex.addContextName(CONTEXT1);
- ex.addContextName(CONTEXT2);
- StringWriter writer = new StringWriter();
- PrintWriter pw = new PrintWriter(writer);
- ex.appendContextStack(pw);
- assertEquals("\nContext stack trace: [CONTEXT2][CONTEXT1]", writer.toString());
- }
-
- public void testAddContext() throws Exception {
- TuscanyException e = new DummyException();
- e.addContextName("foo");
- e.addContextName("bar");
- assertEquals("foo", e.returnContextNames().get(0));
- assertEquals("bar", e.returnContextNames().get(1));
- }
-
- public void testEmptyContext() throws Exception {
- TuscanyException e = new DummyException();
- assertEquals(0, e.returnContextNames().size());
}
public void testGetMessage() throws Exception {
@@ -124,20 +82,8 @@
public void testFullMessage() throws Exception {
TuscanyException e = new DummyException("message", "foo");
- e.addContextName("foo");
e.getMessage();
}
-
- public void testImmutableContextNames() {
- TuscanyException e = new DummyException("message", "foo");
- try {
- e.returnContextNames().add("foo");
- fail();
- } catch (UnsupportedOperationException e1) {
- // expected
- }
- }
-
public static class DummyException extends TuscanyException {
Modified: incubator/tuscany/java/sca/kernel/api/src/test/java/org/apache/tuscany/api/TuscanyRuntimeExceptionTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/api/src/test/java/org/apache/tuscany/api/TuscanyRuntimeExceptionTestCase.java?view=diff&rev=508877&r1=508876&r2=508877
==============================================================================
--- incubator/tuscany/java/sca/kernel/api/src/test/java/org/apache/tuscany/api/TuscanyRuntimeExceptionTestCase.java (original)
+++ incubator/tuscany/java/sca/kernel/api/src/test/java/org/apache/tuscany/api/TuscanyRuntimeExceptionTestCase.java Sat Feb 17 22:22:48 2007
@@ -20,8 +20,6 @@
import java.io.PrintWriter;
import java.io.StringWriter;
-import java.util.ArrayList;
-import java.util.List;
import junit.framework.TestCase;
@@ -40,7 +38,6 @@
assertNull(ex.getMessage());
assertNull(ex.getCause());
assertNull(ex.getIdentifier());
- assertTrue(ex.returnContextNames().isEmpty());
}
public void testMessageConstructor() {
@@ -48,7 +45,6 @@
assertSame(MESSAGE, ex.getMessage());
assertNull(ex.getCause());
assertNull(ex.getIdentifier());
- assertTrue(ex.returnContextNames().isEmpty());
}
public void testThrowableConstructor() {
@@ -56,7 +52,6 @@
assertEquals(CAUSE.getClass().getName() + ": " + CAUSE.getMessage(), ex.getMessage());
assertSame(CAUSE, ex.getCause());
assertNull(ex.getIdentifier());
- assertTrue(ex.returnContextNames().isEmpty());
}
public void testMessageThrowableConstructor() {
@@ -64,7 +59,6 @@
assertSame(MESSAGE, ex.getMessage());
assertSame(CAUSE, ex.getCause());
assertNull(ex.getIdentifier());
- assertTrue(ex.returnContextNames().isEmpty());
}
public void testIdentifier() {
@@ -72,27 +66,6 @@
assertEquals(IDENTIFIER, ex.getIdentifier());
}
- public void testContextStack() {
- TuscanyRuntimeException ex = new DummyException(MESSAGE);
- List<String> contexts = new ArrayList<String>();
- contexts.add(CONTEXT1);
- ex.addContextName(CONTEXT1);
- assertEquals(contexts, ex.returnContextNames());
- contexts.add(CONTEXT2);
- ex.addContextName(CONTEXT2);
- assertEquals(contexts, ex.returnContextNames());
- }
-
- public void testAppendContextMessage() {
- TuscanyRuntimeException ex = new DummyException(MESSAGE);
- ex.addContextName(CONTEXT1);
- ex.addContextName(CONTEXT2);
- StringWriter writer = new StringWriter();
- PrintWriter pw = new PrintWriter(writer);
- ex.appendContextStack(pw);
- assertEquals("Context stack trace: [CONTEXT2][CONTEXT1]", writer.toString());
- }
-
public void testAppendBaseMessage() {
TuscanyRuntimeException ex = new DummyException(MESSAGE, IDENTIFIER);
StringWriter writer = new StringWriter();
@@ -107,16 +80,6 @@
PrintWriter pw = new PrintWriter(writer);
ex.appendBaseMessage(pw);
assertEquals("Message", writer.toString());
- }
-
- public void testImmutableContextNames() {
- TuscanyRuntimeException e = new DummyException("message", "foo");
- try {
- e.returnContextNames().add("foo");
- fail();
- } catch (UnsupportedOperationException e1) {
- // expected
- }
}
public static class DummyException extends TuscanyRuntimeException {
Modified: incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/builder/BuilderRegistryImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/builder/BuilderRegistryImpl.java?view=diff&rev=508877&r1=508876&r2=508877
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/builder/BuilderRegistryImpl.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/builder/BuilderRegistryImpl.java Sat Feb 17 22:22:48 2007
@@ -49,7 +49,6 @@
import org.apache.tuscany.spi.model.ServiceDefinition;
import org.apache.tuscany.core.binding.local.LocalBindingDefinition;
-import org.apache.tuscany.core.component.ComponentManager;
import org.apache.tuscany.core.implementation.composite.ReferenceImpl;
import org.apache.tuscany.core.implementation.composite.ServiceImpl;
@@ -91,57 +90,48 @@
Class<?> implClass = componentDefinition.getImplementation().getClass();
// noinspection SuspiciousMethodCalls
ComponentBuilder<I> componentBuilder = (ComponentBuilder<I>) componentBuilders.get(implClass);
- try {
- if (componentBuilder == null) {
- String name = implClass.getName();
- throw new NoRegisteredBuilderException("No builder registered for implementation", name);
- }
+ if (componentBuilder == null) {
+ String name = implClass.getName();
+ throw new NoRegisteredBuilderException("No builder registered for implementation", name);
+ }
- Component component = componentBuilder.build(parent, componentDefinition, context);
- assert component != null;
- component.setDefaultPropertyValues(componentDefinition.getPropertyValues());
- Scope scope = componentDefinition.getImplementation().getComponentType().getImplementationScope();
- if (scope == Scope.SYSTEM || scope == Scope.COMPOSITE) {
- component.setScopeContainer(context.getCompositeScope());
- } else {
- // Check for conversational contract if conversational scope
- if (scope == Scope.CONVERSATION) {
- boolean hasConversationalContract = false;
- ComponentType<ServiceDefinition, ReferenceDefinition, ?> componentType =
- componentDefinition.getImplementation().getComponentType();
- Map<String, ServiceDefinition> services = componentType.getServices();
- for (ServiceDefinition serviceDef : services.values()) {
- ServiceContract<?> contract = serviceDef.getServiceContract();
- if (contract.isConversational()) {
- hasConversationalContract = true;
- break;
- }
- }
- if (!hasConversationalContract) {
- String name = implClass.getName();
- throw new NoConversationalContractException(
- "No conversational contract for conversational implementation", name);
+ Component component = componentBuilder.build(parent, componentDefinition, context);
+ assert component != null;
+ component.setDefaultPropertyValues(componentDefinition.getPropertyValues());
+ Scope scope = componentDefinition.getImplementation().getComponentType().getImplementationScope();
+ if (scope == Scope.SYSTEM || scope == Scope.COMPOSITE) {
+ component.setScopeContainer(context.getCompositeScope());
+ } else {
+ // Check for conversational contract if conversational scope
+ if (scope == Scope.CONVERSATION) {
+ boolean hasConversationalContract = false;
+ ComponentType<ServiceDefinition, ReferenceDefinition, ?> componentType =
+ componentDefinition.getImplementation().getComponentType();
+ Map<String, ServiceDefinition> services = componentType.getServices();
+ for (ServiceDefinition serviceDef : services.values()) {
+ ServiceContract<?> contract = serviceDef.getServiceContract();
+ if (contract.isConversational()) {
+ hasConversationalContract = true;
+ break;
}
}
- // Now it's ok to set the scope container
- ScopeContainer scopeContainer = scopeRegistry.getScopeContainer(scope);
- if (scopeContainer == null) {
- throw new ScopeNotFoundException(scope.toString());
+ if (!hasConversationalContract) {
+ String name = implClass.getName();
+ throw new NoConversationalContractException(
+ "No conversational contract for conversational implementation", name);
}
- component.setScopeContainer(scopeContainer);
}
- context.getComponents().put(component.getUri(), component);
- ComponentType<?, ?, ?> componentType = componentDefinition.getImplementation().getComponentType();
- assert componentType != null : "Component type must be set";
- // create wires for the component
-// if (wireService != null && component instanceof AtomicComponent) {
-// wireService.createWires((AtomicComponent) component, componentDefinition);
-// }
- return component;
- } catch (BuilderException e) {
- e.addContextName(componentDefinition.getUri().toString());
- throw e;
+ // Now it's ok to set the scope container
+ ScopeContainer scopeContainer = scopeRegistry.getScopeContainer(scope);
+ if (scopeContainer == null) {
+ throw new ScopeNotFoundException(scope.toString());
+ }
+ component.setScopeContainer(scopeContainer);
}
+ context.getComponents().put(component.getUri(), component);
+ ComponentType<?, ?, ?> componentType = componentDefinition.getImplementation().getComponentType();
+ assert componentType != null : "Component type must be set";
+ return component;
}
@SuppressWarnings({"unchecked"})
Modified: incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/builder/WiringExceptionFormatter.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/builder/WiringExceptionFormatter.java?view=diff&rev=508877&r1=508876&r2=508877
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/builder/WiringExceptionFormatter.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/builder/WiringExceptionFormatter.java Sat Feb 17 22:22:48 2007
@@ -62,7 +62,6 @@
if (e.getTargetUri() != null) {
writer.write("\nTarget : " + e.getTargetUri());
}
- e.appendContextStack(writer).append("\n");
return writer;
}
}
Modified: incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/component/scope/CompositeScopeContainer.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/component/scope/CompositeScopeContainer.java?view=diff&rev=508877&r1=508876&r2=508877
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/component/scope/CompositeScopeContainer.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/component/scope/CompositeScopeContainer.java Sat Feb 17 22:22:48 2007
@@ -150,12 +150,7 @@
// the instance could have been created from a depth-first traversal
InstanceWrapper ctx = instanceWrappers.get(component);
if (ctx == EMPTY) {
- try {
- ctx = new InstanceWrapperImpl(component, component.createInstance());
- } catch (ObjectCreationException e) {
- e.addContextName(component.getUri().toString());
- throw e;
- }
+ ctx = new InstanceWrapperImpl(component, component.createInstance());
ctx.start();
instanceWrappers.put(component, ctx);
destroyQueue.add(ctx);
Modified: incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/databinding/impl/MediatorImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/databinding/impl/MediatorImpl.java?view=diff&rev=508877&r1=508876&r2=508877
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/databinding/impl/MediatorImpl.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/databinding/impl/MediatorImpl.java Sat Feb 17 22:22:48 2007
@@ -161,10 +161,7 @@
String targetId = targetDataType.getDataBinding();
List<Transformer> path = transformerRegistry.getTransformerChain(sourceId, targetId);
if (path == null) {
- TransformationException ex = new TransformationException("No path found for the transformation");
- ex.addContextName("Source: " + sourceId);
- ex.addContextName("Target: " + targetId);
- throw ex;
+ throw new TransformationException("No path found for the transformation");
}
return path;
}
Modified: incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/deployer/DeployerImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/deployer/DeployerImpl.java?view=diff&rev=508877&r1=508876&r2=508877
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/deployer/DeployerImpl.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/deployer/DeployerImpl.java Sat Feb 17 22:22:48 2007
@@ -24,15 +24,15 @@
import org.apache.tuscany.spi.annotation.Autowire;
import org.apache.tuscany.spi.builder.Builder;
import org.apache.tuscany.spi.builder.BuilderException;
+import org.apache.tuscany.spi.builder.BuilderInstantiationException;
import org.apache.tuscany.spi.builder.BuilderRegistry;
import org.apache.tuscany.spi.builder.Connector;
-import org.apache.tuscany.spi.builder.BuilderInstantiationException;
import org.apache.tuscany.spi.component.Component;
import org.apache.tuscany.spi.component.CompositeComponent;
+import org.apache.tuscany.spi.component.RegistrationException;
import org.apache.tuscany.spi.component.SCAObject;
import org.apache.tuscany.spi.component.ScopeContainer;
import org.apache.tuscany.spi.component.ScopeContainerMonitor;
-import org.apache.tuscany.spi.component.RegistrationException;
import org.apache.tuscany.spi.deployer.Deployer;
import org.apache.tuscany.spi.deployer.DeploymentContext;
import org.apache.tuscany.spi.event.Event;
@@ -45,9 +45,9 @@
import org.apache.tuscany.spi.resolver.ResolutionException;
import org.apache.tuscany.api.annotation.Monitor;
+import org.apache.tuscany.core.component.ComponentManager;
import org.apache.tuscany.core.component.event.ComponentStop;
import org.apache.tuscany.core.component.scope.CompositeScopeContainer;
-import org.apache.tuscany.core.component.ComponentManager;
import org.apache.tuscany.core.resolver.AutowireResolver;
/**
@@ -113,7 +113,7 @@
}
public <I extends Implementation<?>> Collection<Component> deploy(CompositeComponent parent,
- ComponentDefinition<I> componentDefinition)
+ ComponentDefinition<I> componentDefinition)
throws LoaderException, BuilderException, ResolutionException {
final ScopeContainer scopeContainer = new CompositeScopeContainer(monitor);
scopeContainer.start();
@@ -141,9 +141,7 @@
try {
componentManager.register(toRegister);
} catch (RegistrationException e) {
- BuilderInstantiationException bie = new BuilderInstantiationException("Error registering component", e);
- bie.addContextName(componentDefinition.getUri().toString());
- throw bie;
+ throw new BuilderInstantiationException("Error registering component", e);
}
}
connector.connect(componentDefinition);
Modified: incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/loader/ComponentLoader.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/loader/ComponentLoader.java?view=diff&rev=508877&r1=508876&r2=508877
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/loader/ComponentLoader.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/loader/ComponentLoader.java Sat Feb 17 22:22:48 2007
@@ -20,8 +20,6 @@
import java.lang.reflect.Type;
import java.net.URI;
-import java.net.URISyntaxException;
-import java.util.List;
import java.util.Map;
import javax.xml.namespace.QName;
import javax.xml.parsers.DocumentBuilder;
@@ -42,7 +40,6 @@
import org.apache.tuscany.spi.databinding.extension.DOMHelper;
import org.apache.tuscany.spi.deployer.DeploymentContext;
import org.apache.tuscany.spi.extension.LoaderExtension;
-import org.apache.tuscany.spi.loader.IllegalSCDLNameException;
import org.apache.tuscany.spi.loader.InvalidReferenceException;
import org.apache.tuscany.spi.loader.InvalidValueException;
import org.apache.tuscany.spi.loader.LoaderException;
@@ -73,9 +70,9 @@
import org.apache.tuscany.spi.util.stax.StaxUtil;
import org.apache.tuscany.core.binding.local.LocalBindingDefinition;
+import org.apache.tuscany.core.deployer.ChildDeploymentContext;
import org.apache.tuscany.core.implementation.system.model.SystemImplementation;
import org.apache.tuscany.core.property.SimplePropertyObjectFactory;
-import org.apache.tuscany.core.deployer.ChildDeploymentContext;
/**
* Loads a component definition from an XML-based assembly file
@@ -112,71 +109,66 @@
String name = reader.getAttributeValue(null, "name");
String initLevel = reader.getAttributeValue(null, "initLevel");
- try {
- URI componentId = URI.create(deploymentContext.getComponentId()+"/").resolve(name);
- DeploymentContext childContext = new ChildDeploymentContext(deploymentContext,
- deploymentContext.getClassLoader(),
- deploymentContext.getScdlLocation(),
- componentId);
- Implementation<?> impl = loadImplementation(parent, reader, childContext);
- registry.loadComponentType(parent, impl, childContext);
-
- ComponentDefinition<Implementation<?>> componentDefinition =
- new ComponentDefinition<Implementation<?>>(componentId, impl);
-
- if (initLevel != null) {
- if (initLevel.length() == 0) {
- componentDefinition.setInitLevel(0);
- } else {
- try {
- componentDefinition.setInitLevel(Integer.valueOf(initLevel));
- } catch (NumberFormatException e) {
- throw new InvalidValueException(initLevel, "initValue", e);
- }
+ URI componentId = URI.create(deploymentContext.getComponentId() + "/").resolve(name);
+ DeploymentContext childContext = new ChildDeploymentContext(deploymentContext,
+ deploymentContext.getClassLoader(),
+ deploymentContext.getScdlLocation(),
+ componentId);
+ Implementation<?> impl = loadImplementation(parent, reader, childContext);
+ registry.loadComponentType(parent, impl, childContext);
+
+ ComponentDefinition<Implementation<?>> componentDefinition =
+ new ComponentDefinition<Implementation<?>>(componentId, impl);
+
+ if (initLevel != null) {
+ if (initLevel.length() == 0) {
+ componentDefinition.setInitLevel(0);
+ } else {
+ try {
+ componentDefinition.setInitLevel(Integer.valueOf(initLevel));
+ } catch (NumberFormatException e) {
+ throw new InvalidValueException(initLevel, "initValue", e);
}
}
+ }
- while (true) {
- switch (reader.next()) {
- case START_ELEMENT:
- QName qname = reader.getName();
- if (PROPERTY.equals(qname)) {
- loadProperty(reader, childContext, componentDefinition);
- } else if (REFERENCE.equals(qname)) {
- loadReference(reader, childContext, componentDefinition);
- } else {
- throw new UnrecognizedElementException(qname);
+ while (true) {
+ switch (reader.next()) {
+ case START_ELEMENT:
+ QName qname = reader.getName();
+ if (PROPERTY.equals(qname)) {
+ loadProperty(reader, childContext, componentDefinition);
+ } else if (REFERENCE.equals(qname)) {
+ loadReference(reader, childContext, componentDefinition);
+ } else {
+ throw new UnrecognizedElementException(qname);
+ }
+ reader.next();
+ break;
+ case END_ELEMENT:
+ if (reader.getName().equals(COMPONENT)) {
+ // hack to leave alone SystemImplementation
+ if (!((Implementation) componentDefinition
+ .getImplementation() instanceof SystemImplementation)) {
+ populatePropertyValues(componentDefinition);
}
- reader.next();
- break;
- case END_ELEMENT:
- if (reader.getName().equals(COMPONENT)) {
- // hack to leave alone SystemImplementation
- if (!((Implementation) componentDefinition
- .getImplementation() instanceof SystemImplementation)) {
- populatePropertyValues(componentDefinition);
- }
- ComponentType<ServiceDefinition, ReferenceDefinition, Property<?>> type =
- (ComponentType<ServiceDefinition, ReferenceDefinition, Property<?>>) componentDefinition
- .getImplementation().getComponentType();
- for (ReferenceDefinition ref : type.getReferences().values()) {
- if (ref.isAutowire()) {
- ReferenceTarget referenceTarget = new ReferenceTarget();
- String compName = componentDefinition.getUri().toString();
- URI refName = URI.create(compName + ref.getUri().toString());
- referenceTarget.setReferenceName(refName);
- componentDefinition.add(referenceTarget);
- }
+ ComponentType<ServiceDefinition, ReferenceDefinition, Property<?>> type =
+ (ComponentType<ServiceDefinition, ReferenceDefinition, Property<?>>) componentDefinition
+ .getImplementation().getComponentType();
+ for (ReferenceDefinition ref : type.getReferences().values()) {
+ if (ref.isAutowire()) {
+ ReferenceTarget referenceTarget = new ReferenceTarget();
+ String compName = componentDefinition.getUri().toString();
+ URI refName = URI.create(compName + ref.getUri().toString());
+ referenceTarget.setReferenceName(refName);
+ componentDefinition.add(referenceTarget);
}
- validate(componentDefinition);
- return componentDefinition;
}
- break;
- }
+ validate(componentDefinition);
+ return componentDefinition;
+ }
+ break;
}
- } catch (LoaderException e) {
- e.addContextName(name);
- throw e;
}
}
@@ -244,7 +236,7 @@
QualifiedName qName = new QualifiedName(target.trim());
URI componentId = deploymentContext.getComponentId();
- URI targetURI = componentId.resolve(qName.getFragment());
+ URI targetURI = componentId.resolve(qName.getFragment());
Implementation<?> impl = componentDefinition.getImplementation();
ComponentType<?, ?, ?> componentType = impl.getComponentType();
if (!componentType.getReferences().containsKey(name)) {
Modified: incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/loader/IncludeLoader.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/loader/IncludeLoader.java?view=diff&rev=508877&r1=508876&r2=508877
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/loader/IncludeLoader.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/loader/IncludeLoader.java Sat Feb 17 22:22:48 2007
@@ -19,8 +19,8 @@
package org.apache.tuscany.core.loader;
import java.net.MalformedURLException;
-import java.net.URL;
import java.net.URI;
+import java.net.URL;
import javax.xml.namespace.QName;
import javax.xml.stream.XMLStreamException;
import javax.xml.stream.XMLStreamReader;
@@ -91,12 +91,7 @@
URI componentId = deploymentContext.getComponentId();
DeploymentContext childContext = new ChildDeploymentContext(deploymentContext, cl, url, componentId);
CompositeComponentType composite;
- try {
- composite = loadFromSidefile(parent, url, childContext);
- } catch (LoaderException e) {
- e.addContextName(name);
- throw e;
- }
+ composite = loadFromSidefile(parent, url, childContext);
Include include = new Include();
include.setName(name);
Modified: incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/loader/LoaderExceptionFormatter.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/loader/LoaderExceptionFormatter.java?view=diff&rev=508877&r1=508876&r2=508877
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/loader/LoaderExceptionFormatter.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/loader/LoaderExceptionFormatter.java Sat Feb 17 22:22:48 2007
@@ -44,7 +44,6 @@
} else {
writer.write("\n");
}
- e.appendContextStack(writer).append("\n");
return writer;
}
}
Modified: incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/monitor/DefaultExceptionFormatter.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/monitor/DefaultExceptionFormatter.java?view=diff&rev=508877&r1=508876&r2=508877
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/monitor/DefaultExceptionFormatter.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/monitor/DefaultExceptionFormatter.java Sat Feb 17 22:22:48 2007
@@ -41,10 +41,10 @@
public PrintWriter write(PrintWriter writer, Throwable exception) {
if (exception instanceof TuscanyException) {
TuscanyException e = (TuscanyException) exception;
- e.appendContextStack(e.appendBaseMessage(writer));
+ e.appendBaseMessage(writer);
} else if (exception instanceof TuscanyRuntimeException) {
TuscanyRuntimeException e = (TuscanyRuntimeException) exception;
- e.appendContextStack(e.appendBaseMessage(writer));
+ e.appendBaseMessage(writer);
}
writer.append("\n");
return writer;
Modified: incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/property/PropertyHelper.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/property/PropertyHelper.java?view=diff&rev=508877&r1=508876&r2=508877
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/property/PropertyHelper.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/property/PropertyHelper.java Sat Feb 17 22:22:48 2007
@@ -24,7 +24,6 @@
import java.net.URL;
import java.util.Iterator;
import java.util.Map;
-
import javax.xml.namespace.NamespaceContext;
import javax.xml.parsers.ParserConfigurationException;
import javax.xml.xpath.XPath;
@@ -33,7 +32,9 @@
import javax.xml.xpath.XPathExpressionException;
import javax.xml.xpath.XPathFactory;
-import org.apache.tuscany.core.databinding.xml.InputStream2Node;
+import org.w3c.dom.Document;
+import org.w3c.dom.Node;
+
import org.apache.tuscany.spi.databinding.extension.DOMHelper;
import org.apache.tuscany.spi.deployer.DeploymentContext;
import org.apache.tuscany.spi.loader.InvalidValueException;
@@ -43,8 +44,8 @@
import org.apache.tuscany.spi.model.Implementation;
import org.apache.tuscany.spi.model.Property;
import org.apache.tuscany.spi.model.PropertyValue;
-import org.w3c.dom.Document;
-import org.w3c.dom.Node;
+
+import org.apache.tuscany.core.databinding.xml.InputStream2Node;
/**
* The property factory backed by the DataBindingframework
@@ -65,7 +66,7 @@
path.setNamespaceContext(new DOMNamespeceContext(node));
}
XPathExpression expression = path.compile(xPathExpression);
- Node result = (Node)expression.evaluate(node, XPathConstants.NODE);
+ Node result = (Node) expression.evaluate(node, XPathConstants.NODE);
if (result == null) {
return null;
}
@@ -93,7 +94,7 @@
InputStream is = url.openStream();
try {
InputStream2Node transformer = new InputStream2Node();
- return (Document)transformer.transform(is, null);
+ return (Document) transformer.transform(is, null);
} finally {
is.close();
}
@@ -107,7 +108,7 @@
ComponentDefinition<? extends Implementation<?>> componentDefinition,
DeploymentContext deploymentContext) throws LoaderException {
Map<String, PropertyValue<?>> propertyValues = componentDefinition.getPropertyValues();
-
+
for (PropertyValue propValue : propertyValues.values()) {
Document node = propValue.getValue();
String source = propValue.getSource();
@@ -125,11 +126,7 @@
String name = source.substring(1, index);
Property<?> compositeProp = parent.getProperties().get(name);
if (compositeProp == null) {
- InvalidValueException ex =
- new InvalidValueException(
- "The 'source' cannot be resolved to a composite property");
- ex.addContextName(source);
- throw ex;
+ throw new InvalidValueException("Source cannot be resolved to a composite property");
}
Document document = compositeProp.getDefaultValue();
// Adding /value because the document root is "value"
@@ -146,17 +143,14 @@
node = evaluate(null, document, xpath);
if (node != null) {
propValue.setValue(node);
- }
+ }
/*Property<?> prop =
- (Property<?>)componentDefinition.getImplementation().getComponentType()
- .getProperties().get(propValue.getName());
- propValue
- .setValueFactory(new SimplePropertyObjectFactory(prop, propValue.getValue()));*/
+ (Property<?>)componentDefinition.getImplementation().getComponentType()
+ .getProperties().get(propValue.getName());
+ propValue
+ .setValueFactory(new SimplePropertyObjectFactory(prop, propValue.getValue()));*/
} else {
- InvalidValueException ex =
- new InvalidValueException("The 'source' has an invalid value");
- ex.addContextName(source);
- throw ex;
+ throw new InvalidValueException("Source has an invalid value");
}
} catch (Exception e) {
throw new LoaderException(e);
@@ -165,7 +159,7 @@
node = loadFromFile(propValue.getFile(), deploymentContext);
propValue.setValue(node);
Property<?> prop =
- (Property<?>)componentDefinition.getImplementation().getComponentType().getProperties()
+ (Property<?>) componentDefinition.getImplementation().getComponentType().getProperties()
.get(propValue.getName());
propValue.setValueFactory(new SimplePropertyObjectFactory(prop, propValue.getValue()));
}
Modified: incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/wire/IncompatibleServiceContractExceptionFormatter.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/wire/IncompatibleServiceContractExceptionFormatter.java?view=diff&rev=508877&r1=508876&r2=508877
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/wire/IncompatibleServiceContractExceptionFormatter.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/wire/IncompatibleServiceContractExceptionFormatter.java Sat Feb 17 22:22:48 2007
@@ -89,7 +89,6 @@
writer.write("\nTarget Contract: " + targetContractName + "/" + targetOpName + "\n");
}
- e.appendContextStack(writer);
return writer;
}
}
Modified: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/monitor/DefaultExceptionFormatterTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/monitor/DefaultExceptionFormatterTestCase.java?view=diff&rev=508877&r1=508876&r2=508877
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/monitor/DefaultExceptionFormatterTestCase.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/monitor/DefaultExceptionFormatterTestCase.java Sat Feb 17 22:22:48 2007
@@ -36,10 +36,8 @@
PrintWriter pw = new PrintWriter(writer);
TuscanyException e = new TuscanyException("somemessage") {
};
- e.addContextName("somecontext");
formatter.write(pw, e);
assertTrue(writer.toString().indexOf("somemessage") >= 0);
- assertTrue(writer.toString().indexOf("somecontext") >= 0);
}
public void testTuscanyRuntimeExceptionFormat() throws Exception {
@@ -47,10 +45,8 @@
PrintWriter pw = new PrintWriter(writer);
TuscanyRuntimeException e = new TuscanyRuntimeException("somemessage") {
};
- e.addContextName("somecontext");
formatter.write(pw, e);
assertTrue(writer.toString().indexOf("somemessage") >= 0);
- assertTrue(writer.toString().indexOf("somecontext") >= 0);
}
public void testNormalExceptionFormat() throws Exception {
Modified: incubator/tuscany/java/sca/kernel/spi/src/test/java/org/apache/tuscany/spi/TuscanyRuntimeExceptionTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/spi/src/test/java/org/apache/tuscany/spi/TuscanyRuntimeExceptionTestCase.java?view=diff&rev=508877&r1=508876&r2=508877
==============================================================================
--- incubator/tuscany/java/sca/kernel/spi/src/test/java/org/apache/tuscany/spi/TuscanyRuntimeExceptionTestCase.java (original)
+++ incubator/tuscany/java/sca/kernel/spi/src/test/java/org/apache/tuscany/spi/TuscanyRuntimeExceptionTestCase.java Sat Feb 17 22:22:48 2007
@@ -32,30 +32,10 @@
assertEquals("foo", e.getIdentifier());
}
- public void testAddContext() throws Exception {
- TuscanyRuntimeException e = new TestException();
- e.addContextName("foo");
- e.addContextName("bar");
- assertEquals("foo", e.returnContextNames().get(0));
- assertEquals("bar", e.returnContextNames().get(1));
- }
-
- public void testEmptyContext() throws Exception {
- TuscanyRuntimeException e = new TestException();
- assertEquals(0, e.returnContextNames().size());
- }
-
public void testEmptyGetMessage() throws Exception {
TuscanyRuntimeException e = new TestException();
e.getMessage();
}
-
- public void testFullMessage() throws Exception {
- TuscanyRuntimeException e = new TestException();
- e.addContextName("foo");
- e.getMessage();
- }
-
private class TestException extends TuscanyRuntimeException {
---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org