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/14 08:20:46 UTC
svn commit: r487057 [1/2] - 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...
Author: jmarino
Date: Wed Dec 13 23:20:44 2006
New Revision: 487057
URL: http://svn.apache.org/viewvc?view=rev&rev=487057
Log:
make identifier on TuscanyRuntimeException final
Modified:
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/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/ConnectorImpl.java
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/builder/ReferenceTargetNotFoundException.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/ScopeRegistryImpl.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/java/JavaAtomicComponent.java
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/system/builder/SystemBindingBuilder.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/injection/InjectionRuntimeException.java
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/injection/InvalidAccessorException.java
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/injection/MethodInjector.java
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/injection/ObjectCallbackException.java
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/injection/PojoObjectFactory.java
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/injection/ResourceNotFoundException.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/wire/jdk/JDKInboundInvocationHandler.java
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/wire/jdk/JDKOutboundInvocationHandler.java
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/wire/jdk/JDKWireService.java
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/wire/jdk/WireUtils.java
incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/CoreRuntimeException.java
incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/ObjectCreationException.java
incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/builder/BuilderConfigException.java
incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/builder/BuilderException.java
incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/builder/MissingTargetException.java
incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/component/AutowireResolutionException.java
incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/component/ComponentRuntimeException.java
incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/component/DuplicateNameException.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/InvalidConversationSequenceException.java
incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/component/ReactivationException.java
incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/component/ScopeNotFoundException.java
incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/component/ScopeRuntimeException.java
incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/component/TargetException.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/wire/ProxyCreationException.java
incubator/tuscany/java/sca/kernel/spi/src/test/java/org/apache/tuscany/spi/TuscanyRuntimeExceptionTestCase.java
incubator/tuscany/java/sca/runtime/webapp-host/src/main/java/org/apache/tuscany/runtime/webapp/ServletLauncherInitException.java
incubator/tuscany/java/sca/runtime/webapp-host/src/main/java/org/apache/tuscany/runtime/webapp/WebappRuntimeImpl.java
incubator/tuscany/java/sca/runtime/webapp/src/main/java/org/apache/tuscany/runtime/webapp/InvalidResourcePath.java
incubator/tuscany/java/sca/runtime/webapp/src/main/java/org/apache/tuscany/runtime/webapp/TuscanyInitException.java
incubator/tuscany/java/sca/runtime/webapp/src/main/java/org/apache/tuscany/runtime/webapp/WebappUtilImpl.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.groovy/src/main/java/org/apache/tuscany/container/groovy/GroovyComponentBuilder.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/maven/src/main/java/org/apache/tuscany/services/maven/MavenArtifactRepository.java
incubator/tuscany/java/sca/services/maven/src/main/java/org/apache/tuscany/services/maven/TuscanyDependencyException.java
incubator/tuscany/java/sca/services/persistence/datasource/src/main/java/org/apache/tuscany/persistence/datasource/DataSourceBuilder.java
incubator/tuscany/java/sca/services/persistence/openjpa/src/main/java/org/apache/tuscany/service/openjpa/JPAComponentBuilder.java
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=487057&r1=487056&r2=487057
==============================================================================
--- 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 Wed Dec 13 23:20:44 2006
@@ -30,7 +30,7 @@
public abstract class TuscanyRuntimeException extends RuntimeException {
private static final long serialVersionUID = -759677431966121786L;
private List<String> contextStack;
- private String identifier;
+ private final String identifier;
/**
* Override constructor from RuntimeException.
@@ -39,6 +39,7 @@
*/
public TuscanyRuntimeException() {
super();
+ this.identifier = null;
}
/**
@@ -49,6 +50,20 @@
*/
public TuscanyRuntimeException(String message) {
super(message);
+ this.identifier = null;
+ }
+
+
+ /**
+ * Override constructor from Exception.
+ *
+ * @param message passed to Exception
+ * @param identifier additional error information referred to in the error message
+ * @see Exception
+ */
+ protected TuscanyRuntimeException(String message, String identifier) {
+ super(message);
+ this.identifier = identifier;
}
/**
@@ -60,6 +75,21 @@
*/
public TuscanyRuntimeException(String message, Throwable cause) {
super(message, cause);
+ this.identifier = null;
+ }
+
+
+ /**
+ * Override constructor from Exception.
+ *
+ * @param message passed to Exception
+ * @param identifier additional error information referred to in the error message
+ * @param cause passed to RuntimeException
+ * @see Exception
+ */
+ protected TuscanyRuntimeException(String message, String identifier, Throwable cause) {
+ super(message, cause);
+ this.identifier = identifier;
}
/**
@@ -70,6 +100,7 @@
*/
public TuscanyRuntimeException(Throwable cause) {
super(cause);
+ this.identifier = null;
}
/**
@@ -104,15 +135,6 @@
*/
public String getIdentifier() {
return identifier;
- }
-
- /**
- * Sets an additional error information referred to in the error message.
- *
- * @param identifier additional error information
- */
- public void setIdentifier(String identifier) {
- this.identifier = identifier;
}
public String getMessage() {
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=487057&r1=487056&r2=487057
==============================================================================
--- 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 Wed Dec 13 23:20:44 2006
@@ -66,8 +66,7 @@
}
public void testIdentifier() {
- TuscanyRuntimeException ex = new DummyException(MESSAGE);
- ex.setIdentifier(IDENTIFIER);
+ TuscanyRuntimeException ex = new DummyException(MESSAGE, IDENTIFIER);
assertSame(IDENTIFIER, ex.getIdentifier());
assertEquals(MESSAGE + " [" + IDENTIFIER + ']', ex.getMessage());
}
@@ -92,8 +91,7 @@
public void testContextMessageWithIdentifier() {
- TuscanyRuntimeException ex = new DummyException(MESSAGE);
- ex.setIdentifier(IDENTIFIER);
+ TuscanyRuntimeException ex = new DummyException(MESSAGE, IDENTIFIER);
ex.addContextName(CONTEXT1);
ex.addContextName(CONTEXT2);
assertEquals("Message [IDENTIFIER]\nContext stack trace: [CONTEXT2][CONTEXT1]", ex.getMessage());
@@ -105,6 +103,10 @@
public DummyException(String message) {
super(message);
+ }
+
+ public DummyException(String message, String identifier) {
+ super(message, identifier);
}
public DummyException(String message, Throwable cause) {
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=487057&r1=487056&r2=487057
==============================================================================
--- 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 Wed Dec 13 23:20:44 2006
@@ -135,10 +135,8 @@
Class<?> implClass = componentDefinition.getImplementation().getClass();
ComponentBuilder<I> componentBuilder = (ComponentBuilder<I>) componentBuilders.get(implClass);
if (componentBuilder == null) {
- BuilderConfigException e = new BuilderConfigException("No builder registered for implementation");
- e.setIdentifier(implClass.getName());
- e.addContextName(componentDefinition.getName());
- throw e;
+ String name = implClass.getName();
+ throw new BuilderConfigException("No builder registered for implementation", name);
}
Component component = componentBuilder.build(parent, componentDefinition, deploymentContext);
Modified: incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/builder/ConnectorImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/builder/ConnectorImpl.java?view=diff&rev=487057&r1=487056&r2=487057
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/builder/ConnectorImpl.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/builder/ConnectorImpl.java Wed Dec 13 23:20:44 2006
@@ -184,9 +184,9 @@
// match wire chains
OutboundInvocationChain outboundChain = targetChains.get(inboundChain.getOperation());
if (outboundChain == null) {
- BuilderConfigException e = new BuilderConfigException("Incompatible source and target interfaces");
- e.setIdentifier(sourceWire.getServiceName());
- throw e;
+ // FIXME JFM
+ String serviceName = sourceWire.getServiceName();
+ throw new BuilderConfigException("Incompatible source and target interfaces", serviceName);
}
connect(inboundChain, outboundChain);
}
@@ -224,10 +224,9 @@
Operation<?> operation = outboundChain.getOperation();
InboundInvocationChain inboundChain = targetChains.get(operation);
if (inboundChain == null) {
- BuilderConfigException e =
- new BuilderConfigException("Incompatible source and target interfaces for reference");
- e.setIdentifier(sourceWire.getReferenceName());
- throw e;
+ String name = sourceWire.getReferenceName();
+ // FIXME JFM
+ throw new BuilderConfigException("Incompatible source and target interfaces for reference", name);
}
Operation<?> inboundOperation = inboundChain.getOperation();
boolean isOneWayOperation = operation.isNonBlocking();
@@ -276,10 +275,10 @@
Operation<?> operation = inboundChain.getOperation();
if (sourceCallbackChains != null && sourceCallbackChains.get(operation) != null) {
String name = operation.getName();
- BuilderConfigException e =
- new BuilderConfigException("Source callback chain should not exist for operation [" + name + "]");
- e.setIdentifier(sourceWire.getReferenceName());
- throw e;
+ // FIXME JFM
+ String refName = sourceWire.getReferenceName();
+ throw new BuilderConfigException("Source callback chain should not exist for operation [" + name + "]",
+ refName);
}
Operation targetOp =
@@ -322,9 +321,8 @@
boolean nonBlocking) {
Interceptor head = targetChain.getHeadInterceptor();
if (head == null) {
- BuilderConfigException e = new BuilderConfigException("No interceptor for operation");
- e.setIdentifier(targetChain.getOperation().getName());
- throw e;
+ String name = targetChain.getOperation().getName();
+ throw new BuilderConfigException("No interceptor for operation", name);
}
if (nonBlocking) {
sourceChain.setTargetInterceptor(new NonBlockingBridgingInterceptor(scheduler, workContext, head));
@@ -363,9 +361,9 @@
InboundWire targetWire = targetComponent.getInboundWire(targetName.getPortName());
if (targetWire == null) {
String refName = sourceWire.getReferenceName();
- BuilderConfigException e = new BuilderConfigException("No target service for reference " + refName);
- e.setIdentifier(targetName.getPortName());
- throw e;
+ // FIXME JFM
+ throw new BuilderConfigException("No target service for reference " + refName,
+ targetName.getPortName());
}
checkIfWireable(sourceWire, targetWire);
boolean optimizable = isOptimizable(source.getScope(), target.getScope());
@@ -419,14 +417,12 @@
connect(sourceWire, targetWire, optimizable);
} else if (target == null) {
String name = sourceWire.getReferenceName();
- ReferenceTargetNotFoundException e = new ReferenceTargetNotFoundException(name);
- e.setIdentifier(targetName.getQualifiedName());
- throw e;
+ throw new ReferenceTargetNotFoundException(name, targetName.getQualifiedName());
} else {
String name = sourceWire.getReferenceName();
- BuilderConfigException e = new BuilderConfigException("Invalid target type for reference " + name);
- e.setIdentifier(targetName.getQualifiedName());
- throw e;
+ // FIXME JFM
+ throw new BuilderConfigException("Invalid target type for reference " + name,
+ targetName.getQualifiedName());
}
}
Modified: incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/builder/ReferenceTargetNotFoundException.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/builder/ReferenceTargetNotFoundException.java?view=diff&rev=487057&r1=487056&r2=487057
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/builder/ReferenceTargetNotFoundException.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/builder/ReferenceTargetNotFoundException.java Wed Dec 13 23:20:44 2006
@@ -26,18 +26,14 @@
* @version $Rev$ $Date$
*/
public class ReferenceTargetNotFoundException extends BuilderConfigException {
- public ReferenceTargetNotFoundException() {
- }
public ReferenceTargetNotFoundException(String message) {
super(message);
}
- public ReferenceTargetNotFoundException(String message, Throwable cause) {
- super(message, cause);
+ public ReferenceTargetNotFoundException(String message, String identifier) {
+ super(message, identifier);
}
- public ReferenceTargetNotFoundException(Throwable cause) {
- super(cause);
- }
+
}
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=487057&r1=487056&r2=487057
==============================================================================
--- 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 Wed Dec 13 23:20:44 2006
@@ -93,13 +93,9 @@
return o;
}
} catch (StoreReadException e) {
- TargetException e2 = new TargetException(e);
- e2.setIdentifier(component.getName());
- throw e2;
+ throw new TargetException(e);
} catch (StoreWriteException e) {
- TargetException e2 = new TargetException(e);
- e2.setIdentifier(component.getName());
- throw e2;
+ throw new TargetException(e);
} finally {
workContext.setCurrentAtomicComponent(null);
}
@@ -166,9 +162,7 @@
private String getConversationId(AtomicComponent component) {
String conversationId = (String) workContext.getIdentifier(Scope.CONVERSATION);
if (conversationId == null) {
- TargetException e = new TargetException("Conversation id not set in context");
- e.setIdentifier(component.getName());
- throw e;
+ throw new TargetException("Conversation id not set in context", component.getName());
}
return conversationId;
}
Modified: incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/component/scope/ScopeRegistryImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/component/scope/ScopeRegistryImpl.java?view=diff&rev=487057&r1=487056&r2=487057
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/component/scope/ScopeRegistryImpl.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/component/scope/ScopeRegistryImpl.java Wed Dec 13 23:20:44 2006
@@ -62,10 +62,7 @@
if (container == null) {
ObjectFactory<? extends ScopeContainer> factory = factoryCache.get(scope);
if (factory == null) {
- ScopeNotFoundException e = new ScopeNotFoundException("Scope object factory not registered for scope");
- e.setIdentifier(scope.getScope());
-
- throw e;
+ throw new ScopeNotFoundException("Scope object factory not registered for scope", scope.getScope());
}
container = factory.getInstance();
container.setWorkContext(workContext);
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=487057&r1=487056&r2=487057
==============================================================================
--- 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 Wed Dec 13 23:20:44 2006
@@ -102,9 +102,7 @@
try {
initInvoker.invokeEvent(instance);
} catch (ObjectCallbackException e) {
- TargetException t = new TargetException("Error initializing component instance", e);
- t.setIdentifier(getName());
- throw t;
+ throw new TargetException("Error initializing component instance", getName(), e);
}
}
}
@@ -114,9 +112,7 @@
try {
destroyInvoker.invokeEvent(instance);
} catch (ObjectCallbackException e) {
- TargetException t = new TargetException("Error destroying component instance", e);
- t.setIdentifier(getName());
- throw t;
+ throw new InvalidAccessorException("Error destroying component instance", getName());
}
}
}
@@ -214,9 +210,7 @@
} else if (member instanceof Method) {
return new MethodInjector<Object>((Method) member, factory);
} else {
- InvalidAccessorException e = new InvalidAccessorException("Member must be a field or method");
- e.setIdentifier(member.getName());
- throw e;
+ throw new InvalidAccessorException("Member must be a field or method", member.getName());
}
}
@@ -242,9 +236,7 @@
return new MethodInjector<Object>(method, new ListMultiplicityObjectFactory(factories));
}
} else {
- InvalidAccessorException e = new InvalidAccessorException("Member must be a field or method");
- e.setIdentifier(member.getName());
- throw e;
+ throw new InvalidAccessorException("Member must be a field or method", member.getName());
}
}
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=487057&r1=487056&r2=487057
==============================================================================
--- 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 Wed Dec 13 23:20:44 2006
@@ -110,9 +110,7 @@
ObjectFactory<?> factory = new CallbackWireObjectFactory(contract, wireService, inboundWire);
return new MethodInjector<Object>(method, factory);
} else {
- InvalidAccessorException e = new InvalidAccessorException("Member must be a field or method");
- e.setIdentifier(member.getName());
- throw e;
+ throw new InvalidAccessorException("Member must be a field or method", member.getName());
}
}
Modified: incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/system/builder/SystemBindingBuilder.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/system/builder/SystemBindingBuilder.java?view=diff&rev=487057&r1=487056&r2=487057
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/system/builder/SystemBindingBuilder.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/system/builder/SystemBindingBuilder.java Wed Dec 13 23:20:44 2006
@@ -60,20 +60,14 @@
URI uri = definition.getTarget();
if (uri == null) {
- MissingTargetException e = new MissingTargetException("Target URI not specified");
- e.setIdentifier(definition.getName());
- throw e;
+ throw new MissingTargetException("Target URI not specified", definition.getName());
}
QualifiedName targetName = new QualifiedName(uri.getPath());
SCAObject target = parent.getSystemChild(targetName.getPartName());
if (target == null) {
- MissingTargetException e = new MissingTargetException(targetName.toString());
- e.setIdentifier(definition.getName());
- throw e;
+ throw new MissingTargetException(targetName.toString());
} else if (!(target instanceof SystemAtomicComponent)) {
- InvalidTargetTypeException e = new InvalidTargetTypeException(targetName.toString());
- e.setIdentifier(definition.getName());
- throw e;
+ throw new InvalidTargetTypeException(targetName.toString());
}
SystemAtomicComponent atomicComponent = (SystemAtomicComponent) target;
Class<?> interfaze = definition.getServiceContract().getInterfaceClass();
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=487057&r1=487056&r2=487057
==============================================================================
--- 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 Wed Dec 13 23:20:44 2006
@@ -83,9 +83,7 @@
Class<?> interfaze = serviceContract.getInterfaceClass();
Object service = component.resolveSystemInstance(interfaze);
if (service == null && required) {
- TargetNotFoundException e = new TargetNotFoundException("Autowire target not found");
- e.setIdentifier(interfaze.getName());
- throw e;
+ throw new TargetNotFoundException("Autowire target not found", interfaze.getName());
}
return service;
}
Modified: incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/injection/InjectionRuntimeException.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/injection/InjectionRuntimeException.java?view=diff&rev=487057&r1=487056&r2=487057
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/injection/InjectionRuntimeException.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/injection/InjectionRuntimeException.java Wed Dec 13 23:20:44 2006
@@ -35,8 +35,17 @@
super(message);
}
+
+ protected InjectionRuntimeException(String message, String identifier) {
+ super(message, identifier);
+ }
+
public InjectionRuntimeException(String message, Throwable cause) {
super(message, cause);
+ }
+
+ protected InjectionRuntimeException(String message, String identifier, Throwable cause) {
+ super(message, identifier, cause);
}
public InjectionRuntimeException(Throwable cause) {
Modified: incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/injection/InvalidAccessorException.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/injection/InvalidAccessorException.java?view=diff&rev=487057&r1=487056&r2=487057
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/injection/InvalidAccessorException.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/injection/InvalidAccessorException.java Wed Dec 13 23:20:44 2006
@@ -22,18 +22,13 @@
* @version $$Rev$$ $$Date$$
*/
public class InvalidAccessorException extends InjectionRuntimeException {
- public InvalidAccessorException() {
- }
public InvalidAccessorException(String message) {
super(message);
}
- public InvalidAccessorException(String message, Throwable cause) {
- super(message, cause);
+ public InvalidAccessorException(String message, String identifier) {
+ super(message, identifier);
}
- public InvalidAccessorException(Throwable cause) {
- super(cause);
- }
}
Modified: incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/injection/MethodInjector.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/injection/MethodInjector.java?view=diff&rev=487057&r1=487056&r2=487057
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/injection/MethodInjector.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/injection/MethodInjector.java Wed Dec 13 23:20:44 2006
@@ -47,13 +47,9 @@
} catch (IllegalAccessException e) {
throw new AssertionError("Method is not accessible [" + method + "]");
} catch (IllegalArgumentException e) {
- ObjectCreationException oce = new ObjectCreationException("Exception thrown by setter", e);
- oce.setIdentifier(method.getName());
- throw oce;
+ throw new ObjectCreationException("Exception thrown by setter", method.getName(), e);
} catch (InvocationTargetException e) {
- ObjectCreationException oce = new ObjectCreationException("Exception thrown by setter", e);
- oce.setIdentifier(method.getName());
- throw oce;
+ throw new ObjectCreationException("Exception thrown by setter", method.getName(), e);
}
}
}
Modified: incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/injection/ObjectCallbackException.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/injection/ObjectCallbackException.java?view=diff&rev=487057&r1=487056&r2=487057
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/injection/ObjectCallbackException.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/injection/ObjectCallbackException.java Wed Dec 13 23:20:44 2006
@@ -33,6 +33,10 @@
super(message);
}
+ public ObjectCallbackException(String message, String identifier) {
+ super(message, identifier);
+ }
+
public ObjectCallbackException(String message, Throwable cause) {
super(message, cause);
}
Modified: incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/injection/PojoObjectFactory.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/injection/PojoObjectFactory.java?view=diff&rev=487057&r1=487056&r2=487057
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/injection/PojoObjectFactory.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/injection/PojoObjectFactory.java Wed Dec 13 23:20:44 2006
@@ -94,10 +94,9 @@
for (int i = 0; i < size; i++) {
ObjectFactory<?> objectFactory = initializerFactories[i];
if (objectFactory == null) {
- ObjectCallbackException e =
- new ObjectCallbackException("Null object factory for constructor parameter [" + i + "]");
- e.setIdentifier(ctr.getName());
- throw e;
+ // FIXME JFM
+ String name = ctr.getName();
+ throw new ObjectCallbackException("Null object factory for constructor parameter [" + i + "]", name);
}
initargs[i] = objectFactory.getInstance();
}
Modified: incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/injection/ResourceNotFoundException.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/injection/ResourceNotFoundException.java?view=diff&rev=487057&r1=487056&r2=487057
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/injection/ResourceNotFoundException.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/injection/ResourceNotFoundException.java Wed Dec 13 23:20:44 2006
@@ -26,18 +26,9 @@
* @version $Rev$ $Date$
*/
public class ResourceNotFoundException extends ObjectCreationException {
- public ResourceNotFoundException() {
- }
-
- public ResourceNotFoundException(String message) {
- super(message);
- }
- public ResourceNotFoundException(String message, Throwable cause) {
- super(message, cause);
+ public ResourceNotFoundException(String message, String identifier) {
+ super(message, identifier);
}
- public ResourceNotFoundException(Throwable cause) {
- super(cause);
- }
}
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=487057&r1=487056&r2=487057
==============================================================================
--- 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 Wed Dec 13 23:20:44 2006
@@ -98,9 +98,7 @@
instance = resolveInstance();
}
if (instance == null && !optional) {
- ResourceNotFoundException e = new ResourceNotFoundException("No resource found matching type");
- e.setIdentifier(type.getName());
- throw e;
+ throw new ResourceNotFoundException("No resource found matching type", type.getName());
}
return instance;
} else {
@@ -109,9 +107,7 @@
instance = type.cast(child.getServiceInstance());
}
if (instance == null && !optional) {
- ResourceNotFoundException e = new ResourceNotFoundException("No resource found for URI");
- e.setIdentifier(mappedName);
- throw e;
+ throw new ResourceNotFoundException("No resource found for URI", mappedName);
}
return instance;
}
Modified: incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/wire/jdk/JDKInboundInvocationHandler.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/wire/jdk/JDKInboundInvocationHandler.java?view=diff&rev=487057&r1=487056&r2=487057
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/wire/jdk/JDKInboundInvocationHandler.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/wire/jdk/JDKInboundInvocationHandler.java Wed Dec 13 23:20:44 2006
@@ -93,18 +93,15 @@
return hashCode();
// TODO beter hash algorithm
}
- TargetException e = new TargetException("Operation not configured");
- e.setIdentifier(method.getName());
- throw e;
+ throw new TargetException("Operation not configured", method.getName());
}
InboundInvocationChain chain = holder.chain;
TargetInvoker invoker;
if (holder.cachedInvoker == null) {
assert chain != null;
if (chain.getTargetInvoker() == null) {
- TargetException e = new TargetException("No target invoker configured for operation");
- e.setIdentifier(chain.getOperation().getName());
- throw e;
+ String name = chain.getOperation().getName();
+ throw new TargetException("No target invoker configured for operation", name);
}
if (chain.getTargetInvoker().isCacheable()) {
// clone and store the invoker locally
Modified: incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/wire/jdk/JDKOutboundInvocationHandler.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/wire/jdk/JDKOutboundInvocationHandler.java?view=diff&rev=487057&r1=487056&r2=487057
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/wire/jdk/JDKOutboundInvocationHandler.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/wire/jdk/JDKOutboundInvocationHandler.java Wed Dec 13 23:20:44 2006
@@ -112,9 +112,7 @@
return hashCode();
// TODO beter hash algorithm
}
- TargetException e = new TargetException("Operation not configured");
- e.setIdentifier(method.getName());
- throw e;
+ throw new TargetException("Operation not configured", method.getName());
}
OutboundInvocationChain chain = holder.chain;
TargetInvoker invoker;
@@ -122,9 +120,8 @@
if (holder.cachedInvoker == null) {
assert chain != null;
if (chain.getTargetInvoker() == null) {
- TargetException e = new TargetException("No target invoker configured for operation");
- e.setIdentifier(chain.getOperation().getName());
- throw e;
+ String name = chain.getOperation().getName();
+ throw new TargetException("No target invoker configured for operation", name);
}
if (chain.getTargetInvoker().isCacheable()) {
// clone and store the invoker locally
@@ -196,10 +193,7 @@
}
List<OutboundWire> wires = owner.getOutboundWires().get(referenceName);
if (wires == null) {
- ReactivationException e = new ReactivationException("Reference wire not found");
- e.setIdentifier(referenceName);
- e.addContextName(owner.getName());
- throw e;
+ throw new ReactivationException("Reference wire not found", referenceName, owner.getName());
}
// TODO handle multiplicity
OutboundWire wire = wires.get(0);
Modified: incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/wire/jdk/JDKWireService.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/wire/jdk/JDKWireService.java?view=diff&rev=487057&r1=487056&r2=487057
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/wire/jdk/JDKWireService.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/wire/jdk/JDKWireService.java Wed Dec 13 23:20:44 2006
@@ -21,9 +21,9 @@
import java.lang.reflect.Proxy;
import java.util.Map;
+import org.osoa.sca.annotations.Constructor;
import org.osoa.sca.annotations.Init;
import org.osoa.sca.annotations.Scope;
-import org.osoa.sca.annotations.Constructor;
import org.apache.tuscany.spi.QualifiedName;
import org.apache.tuscany.spi.annotation.Autowire;
@@ -106,9 +106,7 @@
ClassLoader cl = interfaze.getClassLoader();
return Proxy.newProxyInstance(cl, new Class[]{interfaze}, handler);
} else {
- ProxyCreationException e = new ProxyCreationException("Invalid wire type");
- e.setIdentifier(wire.getClass().getName());
- throw e;
+ throw new ProxyCreationException("Invalid wire type", wire.getClass().getName());
}
}
@@ -128,9 +126,7 @@
OutboundWire outbound = (OutboundWire) wire;
return new JDKOutboundInvocationHandler(outbound, context);
} else {
- ProxyCreationException e = new ProxyCreationException("Invalid wire type");
- e.setIdentifier(wire.getClass().getName());
- throw e;
+ throw new ProxyCreationException("Invalid wire type", wire.getClass().getName());
}
}
Modified: incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/wire/jdk/WireUtils.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/wire/jdk/WireUtils.java?view=diff&rev=487057&r1=487056&r2=487057
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/wire/jdk/WireUtils.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/wire/jdk/WireUtils.java Wed Dec 13 23:20:44 2006
@@ -53,8 +53,7 @@
InboundInvocationChain chain = entry.getValue();
Method method = findMethod(operation, methods);
if (method == null) {
- NoMethodForOperationException e = new NoMethodForOperationException();
- e.setIdentifier(operation.getName());
+ throw new NoMethodForOperationException(operation.getName());
}
chains.put(method, chain);
}
Modified: incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/CoreRuntimeException.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/CoreRuntimeException.java?view=diff&rev=487057&r1=487056&r2=487057
==============================================================================
--- incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/CoreRuntimeException.java (original)
+++ incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/CoreRuntimeException.java Wed Dec 13 23:20:44 2006
@@ -35,8 +35,18 @@
super(message);
}
+
+ protected CoreRuntimeException(String message, String identifier) {
+ super(message, identifier);
+ }
+
public CoreRuntimeException(String message, Throwable cause) {
super(message, cause);
+ }
+
+
+ protected CoreRuntimeException(String message, String identifier, Throwable cause) {
+ super(message, identifier, cause);
}
public CoreRuntimeException(Throwable cause) {
Modified: incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/ObjectCreationException.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/ObjectCreationException.java?view=diff&rev=487057&r1=487056&r2=487057
==============================================================================
--- incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/ObjectCreationException.java (original)
+++ incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/ObjectCreationException.java Wed Dec 13 23:20:44 2006
@@ -36,8 +36,16 @@
super(message);
}
+ public ObjectCreationException(String message, String identifier) {
+ super(message, identifier);
+ }
+
public ObjectCreationException(String message, Throwable cause) {
super(message, cause);
+ }
+
+ public ObjectCreationException(String message, String identifier, Throwable cause) {
+ super(message, identifier, cause);
}
public ObjectCreationException(Throwable cause) {
Modified: incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/builder/BuilderConfigException.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/builder/BuilderConfigException.java?view=diff&rev=487057&r1=487056&r2=487057
==============================================================================
--- incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/builder/BuilderConfigException.java (original)
+++ incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/builder/BuilderConfigException.java Wed Dec 13 23:20:44 2006
@@ -33,6 +33,10 @@
super(message);
}
+ public BuilderConfigException(String message, String identifier) {
+ super(message, identifier);
+ }
+
public BuilderConfigException(String message, Throwable cause) {
super(message, cause);
}
Modified: incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/builder/BuilderException.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/builder/BuilderException.java?view=diff&rev=487057&r1=487056&r2=487057
==============================================================================
--- incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/builder/BuilderException.java (original)
+++ incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/builder/BuilderException.java Wed Dec 13 23:20:44 2006
@@ -35,8 +35,17 @@
super(message);
}
+
+ protected BuilderException(String message, String identifier) {
+ super(message, identifier);
+ }
+
public BuilderException(String message, Throwable cause) {
super(message, cause);
+ }
+
+ protected BuilderException(String message, String identifier, Throwable cause) {
+ super(message, identifier, cause);
}
public BuilderException(Throwable cause) {
Modified: incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/builder/MissingTargetException.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/builder/MissingTargetException.java?view=diff&rev=487057&r1=487056&r2=487057
==============================================================================
--- incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/builder/MissingTargetException.java (original)
+++ incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/builder/MissingTargetException.java Wed Dec 13 23:20:44 2006
@@ -25,18 +25,12 @@
*/
public class MissingTargetException extends BuilderConfigException {
- public MissingTargetException() {
- }
-
public MissingTargetException(String message) {
super(message);
}
- public MissingTargetException(String message, Throwable cause) {
- super(message, cause);
+ public MissingTargetException(String message, String identifier) {
+ super(message, identifier);
}
- public MissingTargetException(Throwable cause) {
- super(cause);
- }
}
Modified: incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/component/AutowireResolutionException.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/component/AutowireResolutionException.java?view=diff&rev=487057&r1=487056&r2=487057
==============================================================================
--- incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/component/AutowireResolutionException.java (original)
+++ incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/component/AutowireResolutionException.java Wed Dec 13 23:20:44 2006
@@ -25,10 +25,6 @@
*/
public class AutowireResolutionException extends TargetException {
- public AutowireResolutionException() {
- super();
- }
-
public AutowireResolutionException(String message) {
super(message);
}
Modified: incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/component/ComponentRuntimeException.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/component/ComponentRuntimeException.java?view=diff&rev=487057&r1=487056&r2=487057
==============================================================================
--- incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/component/ComponentRuntimeException.java (original)
+++ incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/component/ComponentRuntimeException.java Wed Dec 13 23:20:44 2006
@@ -35,8 +35,16 @@
super(message);
}
+ public ComponentRuntimeException(String message, String identifier) {
+ super(message, identifier);
+ }
+
public ComponentRuntimeException(String message, Throwable cause) {
super(message, cause);
+ }
+
+ public ComponentRuntimeException(String message, String identifier, Throwable cause) {
+ super(message, identifier, cause);
}
public ComponentRuntimeException(Throwable cause) {
Modified: incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/component/DuplicateNameException.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/component/DuplicateNameException.java?view=diff&rev=487057&r1=487056&r2=487057
==============================================================================
--- incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/component/DuplicateNameException.java (original)
+++ incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/component/DuplicateNameException.java Wed Dec 13 23:20:44 2006
@@ -25,20 +25,12 @@
*/
public class DuplicateNameException extends ComponentRuntimeException {
- public DuplicateNameException() {
- super();
- }
-
public DuplicateNameException(String message) {
super(message);
}
- public DuplicateNameException(String message, Throwable cause) {
- super(message, cause);
- }
-
- public DuplicateNameException(Throwable cause) {
- super(cause);
+ public DuplicateNameException(String message, String identifier) {
+ super(message, identifier);
}
}
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=487057&r1=487056&r2=487057
==============================================================================
--- 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 Wed Dec 13 23:20:44 2006
@@ -24,18 +24,10 @@
* @version $$Rev$$ $$Date$$
*/
public class IllegalTargetException extends TargetException {
- public IllegalTargetException() {
- }
- public IllegalTargetException(String message) {
- super(message);
+ public IllegalTargetException(String message, String identifier) {
+ super(message, identifier);
}
- public IllegalTargetException(String message, Throwable cause) {
- super(message, cause);
- }
- public IllegalTargetException(Throwable cause) {
- super(cause);
- }
}
Modified: incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/component/InvalidConversationSequenceException.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/component/InvalidConversationSequenceException.java?view=diff&rev=487057&r1=487056&r2=487057
==============================================================================
--- incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/component/InvalidConversationSequenceException.java (original)
+++ incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/component/InvalidConversationSequenceException.java Wed Dec 13 23:20:44 2006
@@ -25,9 +25,6 @@
*/
public class InvalidConversationSequenceException extends TargetException {
- public InvalidConversationSequenceException() {
- }
-
public InvalidConversationSequenceException(String message) {
super(message);
}
Modified: incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/component/ReactivationException.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/component/ReactivationException.java?view=diff&rev=487057&r1=487056&r2=487057
==============================================================================
--- incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/component/ReactivationException.java (original)
+++ incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/component/ReactivationException.java Wed Dec 13 23:20:44 2006
@@ -26,18 +26,22 @@
* @version $Rev$ $Date$
*/
public class ReactivationException extends TuscanyRuntimeException {
- public ReactivationException() {
- }
+ private String owner;
public ReactivationException(String message) {
super(message);
}
- public ReactivationException(String message, Throwable cause) {
- super(message, cause);
+ public ReactivationException(String message, String identifier, String ower) {
+ super(message, identifier);
+ this.owner = ower;
}
public ReactivationException(Throwable cause) {
super(cause);
+ }
+
+ public String getOwner() {
+ return owner;
}
}
Modified: incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/component/ScopeNotFoundException.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/component/ScopeNotFoundException.java?view=diff&rev=487057&r1=487056&r2=487057
==============================================================================
--- incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/component/ScopeNotFoundException.java (original)
+++ incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/component/ScopeNotFoundException.java Wed Dec 13 23:20:44 2006
@@ -24,18 +24,9 @@
* @version $$Rev$$ $$Date$$
*/
public class ScopeNotFoundException extends ScopeRuntimeException {
- public ScopeNotFoundException() {
- }
-
- public ScopeNotFoundException(String message) {
- super(message);
- }
- public ScopeNotFoundException(String message, Throwable cause) {
- super(message, cause);
+ public ScopeNotFoundException(String message, String identifier) {
+ super(message, identifier);
}
- public ScopeNotFoundException(Throwable cause) {
- super(cause);
- }
}
Modified: incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/component/ScopeRuntimeException.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/component/ScopeRuntimeException.java?view=diff&rev=487057&r1=487056&r2=487057
==============================================================================
--- incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/component/ScopeRuntimeException.java (original)
+++ incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/component/ScopeRuntimeException.java Wed Dec 13 23:20:44 2006
@@ -35,8 +35,16 @@
super(message);
}
+ public ScopeRuntimeException(String message, String identifier) {
+ super(message, identifier);
+ }
+
public ScopeRuntimeException(String message, Throwable cause) {
super(message, cause);
+ }
+
+ public ScopeRuntimeException(String message, String identifier, Throwable cause) {
+ super(message, identifier, cause);
}
public ScopeRuntimeException(Throwable cause) {
Modified: incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/component/TargetException.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/component/TargetException.java?view=diff&rev=487057&r1=487056&r2=487057
==============================================================================
--- incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/component/TargetException.java (original)
+++ incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/component/TargetException.java Wed Dec 13 23:20:44 2006
@@ -27,16 +27,22 @@
*/
public class TargetException extends CoreRuntimeException {
- public TargetException() {
- super();
- }
-
public TargetException(String message) {
super(message);
}
+
+ public TargetException(String message, String identifier) {
+ super(message, identifier);
+ }
+
public TargetException(String message, Throwable cause) {
super(message, cause);
+ }
+
+
+ public TargetException(String message, String identifier, Throwable cause) {
+ super(message, identifier, cause);
}
public TargetException(Throwable cause) {
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=487057&r1=487056&r2=487057
==============================================================================
--- 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 Wed Dec 13 23:20:44 2006
@@ -24,18 +24,13 @@
* @version $$Rev$$ $$Date$$
*/
public class TargetNotFoundException extends TargetException {
- public TargetNotFoundException() {
- }
public TargetNotFoundException(String message) {
super(message);
}
- public TargetNotFoundException(String message, Throwable cause) {
- super(message, cause);
+ public TargetNotFoundException(String message, String identifier) {
+ super(message, identifier);
}
- public TargetNotFoundException(Throwable cause) {
- super(cause);
- }
}
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=487057&r1=487056&r2=487057
==============================================================================
--- 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 Wed Dec 13 23:20:44 2006
@@ -134,19 +134,12 @@
public void register(SCAObject child) {
if (child.isSystem()) {
if (systemChildren.get(child.getName()) != null) {
- DuplicateNameException e =
- new DuplicateNameException("A system child is already registered with the name");
- e.setIdentifier(child.getName());
- e.addContextName(getName());
- throw e;
+ throw new DuplicateNameException("A system child is already registered with the name", child.getName());
}
systemChildren.put(child.getName(), child);
} else {
if (children.get(child.getName()) != null) {
- DuplicateNameException e = new DuplicateNameException("A child is already registered with the name");
- e.setIdentifier(child.getName());
- e.addContextName(getName());
- throw e;
+ throw new DuplicateNameException("A child is already registered with the name", child.getName());
}
children.put(child.getName(), child);
}
@@ -221,15 +214,9 @@
public Service getService(String name) {
SCAObject ctx = children.get(name);
if (ctx == null) {
- TargetNotFoundException e = new TargetNotFoundException("Service not found");
- e.setIdentifier(name);
- e.addContextName(getName());
- throw e;
+ throw new TargetNotFoundException("Service not found", name);
} else if (!(ctx instanceof Service)) {
- TargetNotFoundException e = new TargetNotFoundException("SCAObject not a service");
- e.setIdentifier(name);
- e.addContextName(getName());
- throw e;
+ throw new TargetNotFoundException("Target not a service", name);
}
return (Service) ctx;
}
@@ -245,15 +232,9 @@
public Service getSystemService(String name) {
SCAObject ctx = systemChildren.get(name);
if (ctx == null) {
- TargetNotFoundException e = new TargetNotFoundException("Service not found");
- e.setIdentifier(name);
- e.addContextName(getName());
- throw e;
+ throw new TargetNotFoundException("Service not found", name);
} else if (!(ctx instanceof Service)) {
- TargetNotFoundException e = new TargetNotFoundException("SCAObject not a service");
- e.setIdentifier(name);
- e.addContextName(getName());
- throw e;
+ throw new TargetNotFoundException("Target not a service");
}
return (Service) ctx;
}
@@ -287,10 +268,7 @@
} else if (context instanceof Service) {
return context.getServiceInstance();
} else {
- IllegalTargetException e = new IllegalTargetException("Target must be a service");
- e.setIdentifier(name);
- e.addContextName(getName());
- throw e;
+ throw new IllegalTargetException("Target must be a service", name);
}
}
@@ -303,10 +281,7 @@
} else if (target instanceof Service) {
return target.getServiceInstance();
} else {
- IllegalTargetException e = new IllegalTargetException("Target must be a service");
- e.setIdentifier(name);
- e.addContextName(getName());
- throw e;
+ throw new IllegalTargetException("Target must be a service", name);
}
}
@@ -331,8 +306,7 @@
return instanceInterface.cast(context.getServiceInstance());
} else {
IllegalTargetException e = new IllegalTargetException("Autowire target must be a system "
- + "service, atomic component, or reference");
- e.setIdentifier(instanceInterface.getName());
+ + "service, atomic component, or reference", instanceInterface.getName());
e.addContextName(getName());
throw e;
}
@@ -368,8 +342,7 @@
return instanceInterface.cast(context.getServiceInstance());
} else {
IllegalTargetException e = new IllegalTargetException("Autowire target must be a system "
- + "service, atomic component, or reference");
- e.setIdentifier(instanceInterface.getName());
+ + "service, atomic component, or reference", instanceInterface.getName());
e.addContextName(getName());
throw e;
}
Modified: incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/wire/ProxyCreationException.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/wire/ProxyCreationException.java?view=diff&rev=487057&r1=487056&r2=487057
==============================================================================
--- incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/wire/ProxyCreationException.java (original)
+++ incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/wire/ProxyCreationException.java Wed Dec 13 23:20:44 2006
@@ -33,8 +33,16 @@
super(message);
}
+ public ProxyCreationException(String message, String identifier) {
+ super(message, identifier);
+ }
+
public ProxyCreationException(String message, Throwable cause) {
super(message, cause);
+ }
+
+ public ProxyCreationException(String message, String identifier, Throwable cause) {
+ super(message, identifier, cause);
}
public ProxyCreationException(Throwable cause) {
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=487057&r1=487056&r2=487057
==============================================================================
--- 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 Wed Dec 13 23:20:44 2006
@@ -28,8 +28,7 @@
public class TuscanyRuntimeExceptionTestCase extends TestCase {
public void testIdentifier() throws Exception {
- TuscanyRuntimeException e = new TestException();
- e.setIdentifier("foo");
+ TuscanyRuntimeException e = new TestException("bar", "foo");
assertEquals("foo", e.getIdentifier());
}
@@ -53,7 +52,6 @@
public void testFullMessage() throws Exception {
TuscanyRuntimeException e = new TestException();
- e.setIdentifier("foo");
e.addContextName("foo");
e.getMessage();
}
@@ -61,5 +59,11 @@
private class TestException extends TuscanyRuntimeException {
+ public TestException() {
+ }
+
+ public TestException(String message, String identifier) {
+ super(message, identifier);
+ }
}
}
Modified: incubator/tuscany/java/sca/runtime/webapp-host/src/main/java/org/apache/tuscany/runtime/webapp/ServletLauncherInitException.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/runtime/webapp-host/src/main/java/org/apache/tuscany/runtime/webapp/ServletLauncherInitException.java?view=diff&rev=487057&r1=487056&r2=487057
==============================================================================
--- incubator/tuscany/java/sca/runtime/webapp-host/src/main/java/org/apache/tuscany/runtime/webapp/ServletLauncherInitException.java (original)
+++ incubator/tuscany/java/sca/runtime/webapp-host/src/main/java/org/apache/tuscany/runtime/webapp/ServletLauncherInitException.java Wed Dec 13 23:20:44 2006
@@ -34,6 +34,10 @@
super(message);
}
+ public ServletLauncherInitException(String message, String identifier) {
+ super(message, identifier);
+ }
+
public ServletLauncherInitException(String message, Throwable cause) {
super(message, cause);
}
Modified: incubator/tuscany/java/sca/runtime/webapp-host/src/main/java/org/apache/tuscany/runtime/webapp/WebappRuntimeImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/runtime/webapp-host/src/main/java/org/apache/tuscany/runtime/webapp/WebappRuntimeImpl.java?view=diff&rev=487057&r1=487056&r2=487057
==============================================================================
--- incubator/tuscany/java/sca/runtime/webapp-host/src/main/java/org/apache/tuscany/runtime/webapp/WebappRuntimeImpl.java (original)
+++ incubator/tuscany/java/sca/runtime/webapp-host/src/main/java/org/apache/tuscany/runtime/webapp/WebappRuntimeImpl.java Wed Dec 13 23:20:44 2006
@@ -52,7 +52,7 @@
* <p/>
* The bootstrapper launches the runtime, booting system extensions and applications, according to the servlet
* parameters defined in {@link Constants}. When the runtime is instantiated, it is placed in the servlet context with
- * the attribute {@link Constants.RUNTIME_ATTRIBUTE}. The runtime implements {@link WebappRuntime} so that filters and
+ * the attribute {@link Constants.RUNTIME_PARAM}. The runtime implements {@link WebappRuntime} so that filters and
* servlets loaded in the parent web app classloader may pass events and requests to it.
* <p/>
* By default, the top-most application composite component will be returned when "non-managed" web application code
@@ -147,9 +147,7 @@
while (tokenizer.hasMoreTokens()) {
SCAObject o = current.getChild(tokenizer.nextToken());
if (!(o instanceof CompositeComponent)) {
- ServletLauncherInitException e = new ServletLauncherInitException("Invalid context path");
- e.setIdentifier(path);
- throw e;
+ throw new ServletLauncherInitException("Invalid context path", path);
}
current = (CompositeComponent) o;
}
Modified: incubator/tuscany/java/sca/runtime/webapp/src/main/java/org/apache/tuscany/runtime/webapp/InvalidResourcePath.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/runtime/webapp/src/main/java/org/apache/tuscany/runtime/webapp/InvalidResourcePath.java?view=diff&rev=487057&r1=487056&r2=487057
==============================================================================
--- incubator/tuscany/java/sca/runtime/webapp/src/main/java/org/apache/tuscany/runtime/webapp/InvalidResourcePath.java (original)
+++ incubator/tuscany/java/sca/runtime/webapp/src/main/java/org/apache/tuscany/runtime/webapp/InvalidResourcePath.java Wed Dec 13 23:20:44 2006
@@ -24,16 +24,8 @@
* @version $Rev$ $Date$
*/
public class InvalidResourcePath extends TuscanyInitException {
- public InvalidResourcePath(String string) {
- super(string);
- }
-
- public InvalidResourcePath(String string, Throwable throwable) {
- super(string, throwable);
- }
-
- public InvalidResourcePath(Throwable throwable) {
- super(throwable);
+ public InvalidResourcePath(String message, String identifier, Throwable cause) {
+ super(message, identifier, cause);
}
}
Modified: incubator/tuscany/java/sca/runtime/webapp/src/main/java/org/apache/tuscany/runtime/webapp/TuscanyInitException.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/runtime/webapp/src/main/java/org/apache/tuscany/runtime/webapp/TuscanyInitException.java?view=diff&rev=487057&r1=487056&r2=487057
==============================================================================
--- incubator/tuscany/java/sca/runtime/webapp/src/main/java/org/apache/tuscany/runtime/webapp/TuscanyInitException.java (original)
+++ incubator/tuscany/java/sca/runtime/webapp/src/main/java/org/apache/tuscany/runtime/webapp/TuscanyInitException.java Wed Dec 13 23:20:44 2006
@@ -30,8 +30,16 @@
super(string);
}
+ public TuscanyInitException(String message, String identifier) {
+ super(message, identifier);
+ }
+
public TuscanyInitException(String string, Throwable throwable) {
super(string, throwable);
+ }
+
+ public TuscanyInitException(String message, String identifier, Throwable cause) {
+ super(message, identifier, cause);
}
public TuscanyInitException(Throwable throwable) {
Modified: incubator/tuscany/java/sca/runtime/webapp/src/main/java/org/apache/tuscany/runtime/webapp/WebappUtilImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/runtime/webapp/src/main/java/org/apache/tuscany/runtime/webapp/WebappUtilImpl.java?view=diff&rev=487057&r1=487056&r2=487057
==============================================================================
--- incubator/tuscany/java/sca/runtime/webapp/src/main/java/org/apache/tuscany/runtime/webapp/WebappUtilImpl.java (original)
+++ incubator/tuscany/java/sca/runtime/webapp/src/main/java/org/apache/tuscany/runtime/webapp/WebappUtilImpl.java Wed Dec 13 23:20:44 2006
@@ -69,9 +69,7 @@
try {
urls[i++] = servletContext.getResource((String) path);
} catch (MalformedURLException e) {
- InvalidResourcePath ie = new InvalidResourcePath(APPLICATION_SCDL_PATH_PARAM, e);
- ie.setIdentifier(path.toString());
- throw ie;
+ throw new InvalidResourcePath(APPLICATION_SCDL_PATH_PARAM, path.toString(), e);
}
}
return new URLClassLoader(urls, webappClassLoader);
@@ -82,9 +80,7 @@
try {
return getScdlURL(path, bootClassLoader);
} catch (MalformedURLException e) {
- InvalidResourcePath ie = new InvalidResourcePath(SYSTEM_SCDL_PATH_PARAM, e);
- ie.setIdentifier(path);
- throw ie;
+ throw new InvalidResourcePath(SYSTEM_SCDL_PATH_PARAM, path, e);
}
}
@@ -101,9 +97,7 @@
try {
return getScdlURL(path, bootClassLoader);
} catch (MalformedURLException e) {
- InvalidResourcePath ie = new InvalidResourcePath(APPLICATION_SCDL_PATH_PARAM, e);
- ie.setIdentifier(path);
- throw ie;
+ throw new InvalidResourcePath(APPLICATION_SCDL_PATH_PARAM, path, e);
}
}
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=487057&r1=487056&r2=487057
==============================================================================
--- 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 Wed Dec 13 23:20:44 2006
@@ -104,9 +104,7 @@
public Object getServiceInstance(String service) throws TargetException {
InboundWire wire = getInboundWire(service);
if (wire == null) {
- TargetException e = new TargetException("ServiceDefinition not found"); // TODO better error message
- e.setIdentifier(service);
- throw e;
+ throw new TargetException("ServiceDefinition not found", service);
}
return wireService.createProxy(wire);
}
Modified: incubator/tuscany/java/sca/services/containers/container.groovy/src/main/java/org/apache/tuscany/container/groovy/GroovyComponentBuilder.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/services/containers/container.groovy/src/main/java/org/apache/tuscany/container/groovy/GroovyComponentBuilder.java?view=diff&rev=487057&r1=487056&r2=487057
==============================================================================
--- incubator/tuscany/java/sca/services/containers/container.groovy/src/main/java/org/apache/tuscany/container/groovy/GroovyComponentBuilder.java (original)
+++ incubator/tuscany/java/sca/services/containers/container.groovy/src/main/java/org/apache/tuscany/container/groovy/GroovyComponentBuilder.java Wed Dec 13 23:20:44 2006
@@ -80,9 +80,7 @@
// REVIEW JFM can we cache the class?
groovyClass = groovyClassLoader.parseClass(script);
} catch (CompilationFailedException e) {
- BuilderConfigException bce = new BuilderConfigException(e);
- bce.setIdentifier(name);
- throw bce;
+ throw new BuilderConfigException(name, e);
}
// TODO deal with init and destroy
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=487057&r1=487056&r2=487057
==============================================================================
--- 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 Wed Dec 13 23:20:44 2006
@@ -112,9 +112,7 @@
public Object getServiceInstance(String service) throws TargetException {
InboundWire wire = getInboundWire(service);
if (wire == null) {
- TargetException e = new TargetException("ServiceDefinition not found"); // TODO better error message
- e.setIdentifier(service);
- throw e;
+ throw new TargetException("ServiceDefinition not found", service);
}
return wireService.createProxy(wire);
}
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=487057&r1=487056&r2=487057
==============================================================================
--- 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 Wed Dec 13 23:20:44 2006
@@ -131,9 +131,7 @@
public Object getServiceInstance(String service) throws TargetException {
InboundWire wire = getInboundWire(service);
if (wire == null) {
- TargetException e = new TargetException("ServiceDefinition not found"); // TODO better error message
- e.setIdentifier(service);
- throw e;
+ throw new TargetException("ServiceDefinition not found", service); // TODO better error message
}
return wireService.createProxy(wire);
}
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=487057&r1=487056&r2=487057
==============================================================================
--- 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 Wed Dec 13 23:20:44 2006
@@ -79,9 +79,7 @@
public Object getServiceInstance(String service) throws TargetException {
InboundWire wire = getInboundWire(service);
if (wire == null) {
- TargetException e = new TargetException("Service not found"); // TODO better error message
- e.setIdentifier(service);
- throw e;
+ throw new TargetException("Service not found", service); // TODO better error message
}
return wireService.createProxy(wire);
}
Modified: incubator/tuscany/java/sca/services/maven/src/main/java/org/apache/tuscany/services/maven/MavenArtifactRepository.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/services/maven/src/main/java/org/apache/tuscany/services/maven/MavenArtifactRepository.java?view=diff&rev=487057&r1=487056&r2=487057
==============================================================================
--- incubator/tuscany/java/sca/services/maven/src/main/java/org/apache/tuscany/services/maven/MavenArtifactRepository.java (original)
+++ incubator/tuscany/java/sca/services/maven/src/main/java/org/apache/tuscany/services/maven/MavenArtifactRepository.java Wed Dec 13 23:20:44 2006
@@ -20,28 +20,35 @@
import java.util.Collection;
+import org.osoa.sca.annotations.Destroy;
+import org.osoa.sca.annotations.Property;
+
import org.apache.tuscany.spi.annotation.Autowire;
import org.apache.tuscany.spi.services.artifact.Artifact;
import org.apache.tuscany.spi.services.artifact.ArtifactRepository;
+
import org.apache.tuscany.host.RuntimeInfo;
-import org.osoa.sca.annotations.Destroy;
-import org.osoa.sca.annotations.Property;
/**
* Artifact repository used for resolving artifacts.
- *
- * This is used by the composite loader for resolving artifacts transitively. The repository uses the Maven API for resolving dependencies and hence
- * expects the artifacts to be stored in a structure similar to the Maven repository layout. The repository first looks within the deployed unit (WAR
- * for example), before resorting to a local and set of remote Maven repositories.
+ * <p/>
+ * This is used by the composite loader for resolving artifacts transitively. The repository uses the Maven API for
+ * resolving dependencies and hence expects the artifacts to be stored in a structure similar to the Maven repository
+ * layout. The repository first looks within the deployed unit (WAR for example), before resorting to a local and set of
+ * remote Maven repositories.
*
* @version $Rev$ $Date$
*/
public class MavenArtifactRepository implements ArtifactRepository {
- /** Maven helper */
+ /**
+ * Maven helper
+ */
private MavenHelper mavenHelper;
-
- /** WAR repository helper */
+
+ /**
+ * WAR repository helper
+ */
private WarRepositoryHelper warRepositoryHelper;
/**
@@ -56,29 +63,25 @@
}
/**
- * Resolve an artifact. This ensures that the information associated with an artifact is fully populated; Specifically, after this operation the
- * URL should contain a location where the artifact can be obtained.
+ * Resolve an artifact. This ensures that the information associated with an artifact is fully populated;
+ * Specifically, after this operation the URL should contain a location where the artifact can be obtained.
*
- * @param artifact
- * the artifact to be resolved
+ * @param rootArtifact the artifact to be resolved
*/
public void resolve(Artifact rootArtifact) {
- if(warRepositoryHelper.resolveTransitively(rootArtifact)) {
+ if (warRepositoryHelper.resolveTransitively(rootArtifact)) {
return;
- }
- if(mavenHelper.resolveTransitively(rootArtifact)) {
+ }
+ if (mavenHelper.resolveTransitively(rootArtifact)) {
return;
}
- TuscanyDependencyException tde = new TuscanyDependencyException("Unable to resolve artifact: " + rootArtifact);
- tde.setIdentifier(rootArtifact.toString());
- throw tde;
+ throw new TuscanyDependencyException("Unable to resolve artifact", rootArtifact.toString());
}
/**
* Resolve a collection of Artifacts.
*
- * @param artifacts
- * a collection of artifacts to be resolved
+ * @param artifacts a collection of artifacts to be resolved
* @see #resolve(Artifact)
*/
public void resolve(Collection<? extends Artifact> artifacts) {
@@ -89,7 +92,6 @@
/**
* Destroy method.
- *
*/
@Destroy
public void destroy() {
---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org