You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by js...@apache.org on 2007/05/07 12:29:24 UTC

svn commit: r535837 - in /incubator/tuscany/java/sca/modules: core-spi/src/main/java/org/apache/tuscany/invocation/ core-spi/src/main/java/org/apache/tuscany/spi/ core-spi/src/main/java/org/apache/tuscany/spi/component/ core-spi/src/main/java/org/apach...

Author: jsdelfino
Date: Mon May  7 03:29:15 2007
New Revision: 535837

URL: http://svn.apache.org/viewvc?view=rev&rev=535837
Log:
Cleaned up core exceptions.

Removed:
    incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/spi/TuscanyException.java
    incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/spi/TuscanyRuntimeException.java
    incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/spi/component/DuplicateNameException.java
    incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/spi/component/IllegalTargetException.java
    incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/spi/component/MalformedNameException.java
    incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/spi/component/ReactivationException.java
    incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/spi/component/SCAExternalizable.java
    incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/spi/component/SCAObjectInputStream.java
    incubator/tuscany/java/sca/modules/core-spi/src/test/java/org/apache/tuscany/spi/TuscanyRuntimeExceptionTestCase.java
    incubator/tuscany/java/sca/modules/core-spi/src/test/java/org/apache/tuscany/spi/component/
Modified:
    incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/invocation/ProxyCreationException.java
    incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/spi/CoreRuntimeException.java
    incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/spi/ObjectCreationException.java
    incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/spi/component/ComponentException.java
    incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/spi/component/ComponentRuntimeException.java
    incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/spi/component/InvalidConversationSequenceException.java
    incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/spi/component/RegistrationException.java
    incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/spi/component/TargetDestructionException.java
    incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/spi/component/TargetException.java
    incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/spi/component/TargetInitializationException.java
    incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/spi/component/TargetInvocationException.java
    incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/spi/component/TargetInvokerCreationException.java
    incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/spi/component/TargetNotFoundException.java
    incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/spi/component/TargetResolutionException.java
    incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/store/DuplicateRecordException.java
    incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/store/StoreException.java
    incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/store/StoreReadException.java
    incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/store/StoreWriteException.java
    incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/work/WorkSchedulerException.java
    incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/core/store/MemoryStore.java
    incubator/tuscany/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/implementation/java/context/ReflectiveInstanceFactory.java
    incubator/tuscany/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/implementation/java/injection/InjectionRuntimeException.java
    incubator/tuscany/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/implementation/java/injection/InvalidAccessorException.java
    incubator/tuscany/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/implementation/java/injection/InvalidResourceTypeException.java
    incubator/tuscany/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/implementation/java/injection/MethodInjector.java
    incubator/tuscany/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/implementation/java/injection/NoMultiplicityTypeException.java
    incubator/tuscany/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/implementation/java/injection/ObjectCallbackException.java
    incubator/tuscany/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/implementation/java/injection/PojoObjectFactory.java
    incubator/tuscany/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/implementation/java/injection/ResourceNotFoundException.java
    incubator/tuscany/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/implementation/java/injection/ResourceObjectFactory.java
    incubator/tuscany/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/implementation/java/injection/ResourceResolutionException.java
    incubator/tuscany/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/implementation/java/invocation/JavaComponentInfo.java
    incubator/tuscany/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/implementation/java/invocation/JavaTargetInvoker.java
    incubator/tuscany/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/implementation/java/invocation/PojoConfiguration.java
    incubator/tuscany/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/implementation/java/monitor/DefaultExceptionFormatter.java
    incubator/tuscany/java/sca/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/implementation/java/monitor/DefaultExceptionFormatterTestCase.java

Modified: incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/invocation/ProxyCreationException.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/invocation/ProxyCreationException.java?view=diff&rev=535837&r1=535836&r2=535837
==============================================================================
--- incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/invocation/ProxyCreationException.java (original)
+++ incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/invocation/ProxyCreationException.java Mon May  7 03:29:15 2007
@@ -29,25 +29,19 @@
     private static final long serialVersionUID = 8002454344828513781L;
 
     public ProxyCreationException() {
-    }
-
-    public ProxyCreationException(String message) {
-        super(message);
-    }
-
-    public ProxyCreationException(String message, String identifier) {
-        super(message, identifier);
+        super();
     }
 
     public ProxyCreationException(String message, Throwable cause) {
         super(message, cause);
     }
 
-    public ProxyCreationException(String message, String identifier, Throwable cause) {
-        super(message, identifier, cause);
+    public ProxyCreationException(String message) {
+        super(message);
     }
 
     public ProxyCreationException(Throwable cause) {
         super(cause);
     }
+
 }

Modified: incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/spi/CoreRuntimeException.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/spi/CoreRuntimeException.java?view=diff&rev=535837&r1=535836&r2=535837
==============================================================================
--- incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/spi/CoreRuntimeException.java (original)
+++ incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/spi/CoreRuntimeException.java Mon May  7 03:29:15 2007
@@ -24,31 +24,22 @@
  *
  * @version $Rev$ $Date$
  */
-public abstract class CoreRuntimeException extends TuscanyRuntimeException {
+public abstract class CoreRuntimeException extends RuntimeException {
 
     public CoreRuntimeException() {
         super();
     }
 
-    public CoreRuntimeException(String message) {
-        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(String message) {
+        super(message);
     }
 
     public CoreRuntimeException(Throwable cause) {
         super(cause);
     }
+
 }

Modified: incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/spi/ObjectCreationException.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/spi/ObjectCreationException.java?view=diff&rev=535837&r1=535836&r2=535837
==============================================================================
--- incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/spi/ObjectCreationException.java (original)
+++ incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/spi/ObjectCreationException.java Mon May  7 03:29:15 2007
@@ -24,27 +24,19 @@
  *
  * @version $Rev$ $Date$
  */
-public class ObjectCreationException extends TuscanyRuntimeException {
+public class ObjectCreationException extends RuntimeException {
     private static final long serialVersionUID = -6423113430265944499L;
 
     public ObjectCreationException() {
         super();
     }
 
-    public ObjectCreationException(String message) {
-        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(String message) {
+        super(message);
     }
 
     public ObjectCreationException(Throwable cause) {

Modified: incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/spi/component/ComponentException.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/spi/component/ComponentException.java?view=diff&rev=535837&r1=535836&r2=535837
==============================================================================
--- incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/spi/component/ComponentException.java (original)
+++ incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/spi/component/ComponentException.java Mon May  7 03:29:15 2007
@@ -18,35 +18,28 @@
  */
 package org.apache.tuscany.spi.component;
 
-import org.apache.tuscany.spi.TuscanyException;
 
 /**
  * An checked exception encountered by an {@link org.apache.tuscany.spi.component.Component}
  *
  * @version $Rev$ $Date$
  */
-public abstract class ComponentException extends TuscanyException {
+public abstract class ComponentException extends Exception {
 
-    protected ComponentException() {
+    public ComponentException() {
+        super();
     }
 
-    protected ComponentException(String message) {
-        super(message);
-    }
-
-    protected ComponentException(String message, String identifier) {
-        super(message, identifier);
-    }
-
-    protected ComponentException(String message, Throwable cause) {
+    public ComponentException(String message, Throwable cause) {
         super(message, cause);
     }
 
-    protected ComponentException(String message, String identifier, Throwable cause) {
-        super(message, identifier, cause);
+    public ComponentException(String message) {
+        super(message);
     }
 
-    protected ComponentException(Throwable cause) {
+    public ComponentException(Throwable cause) {
         super(cause);
     }
+
 }

Modified: incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/spi/component/ComponentRuntimeException.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/spi/component/ComponentRuntimeException.java?view=diff&rev=535837&r1=535836&r2=535837
==============================================================================
--- incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/spi/component/ComponentRuntimeException.java (original)
+++ incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/spi/component/ComponentRuntimeException.java Mon May  7 03:29:15 2007
@@ -31,20 +31,12 @@
         super();
     }
 
-    public ComponentRuntimeException(String message) {
-        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(String message) {
+        super(message);
     }
 
     public ComponentRuntimeException(Throwable cause) {

Modified: incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/spi/component/InvalidConversationSequenceException.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/spi/component/InvalidConversationSequenceException.java?view=diff&rev=535837&r1=535836&r2=535837
==============================================================================
--- incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/spi/component/InvalidConversationSequenceException.java (original)
+++ incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/spi/component/InvalidConversationSequenceException.java Mon May  7 03:29:15 2007
@@ -25,7 +25,19 @@
  */
 public class InvalidConversationSequenceException extends TargetInvocationException {
 
-    public InvalidConversationSequenceException(String message, String identifier) {
-        super(message, identifier);
+    public InvalidConversationSequenceException() {
+        super();
+    }
+
+    public InvalidConversationSequenceException(String message, Throwable cause) {
+        super(message, cause);
+    }
+
+    public InvalidConversationSequenceException(String message) {
+        super(message);
+    }
+
+    public InvalidConversationSequenceException(Throwable cause) {
+        super(cause);
     }
 }

Modified: incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/spi/component/RegistrationException.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/spi/component/RegistrationException.java?view=diff&rev=535837&r1=535836&r2=535837
==============================================================================
--- incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/spi/component/RegistrationException.java (original)
+++ incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/spi/component/RegistrationException.java Mon May  7 03:29:15 2007
@@ -24,19 +24,17 @@
  * @version $$Rev$$ $$Date$$
  */
 public abstract class RegistrationException extends ComponentException {
-    public RegistrationException() {
-    }
-
-    public RegistrationException(String message) {
-        super(message);
-    }
 
-    public RegistrationException(String message, String identifier) {
-        super(message, identifier);
+    public RegistrationException() {
+        super();
     }
 
     public RegistrationException(String message, Throwable cause) {
         super(message, cause);
+    }
+
+    public RegistrationException(String message) {
+        super(message);
     }
 
     public RegistrationException(Throwable cause) {

Modified: incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/spi/component/TargetDestructionException.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/spi/component/TargetDestructionException.java?view=diff&rev=535837&r1=535836&r2=535837
==============================================================================
--- incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/spi/component/TargetDestructionException.java (original)
+++ incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/spi/component/TargetDestructionException.java Mon May  7 03:29:15 2007
@@ -25,16 +25,19 @@
  */
 public class TargetDestructionException extends TargetResolutionException {
 
-    public TargetDestructionException(String message, String identifier) {
-        super(message, identifier);
+    public TargetDestructionException() {
+        super();
     }
 
-    public TargetDestructionException(String message, String identifier, Throwable cause) {
-        super(message, identifier, cause);
+    public TargetDestructionException(String message, Throwable cause) {
+        super(message, cause);
     }
 
+    public TargetDestructionException(String message) {
+        super(message);
+    }
 
-    public TargetDestructionException(String message, Throwable cause) {
-        super(message, cause);
+    public TargetDestructionException(Throwable cause) {
+        super(cause);
     }
 }

Modified: incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/spi/component/TargetException.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/spi/component/TargetException.java?view=diff&rev=535837&r1=535836&r2=535837
==============================================================================
--- incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/spi/component/TargetException.java (original)
+++ incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/spi/component/TargetException.java Mon May  7 03:29:15 2007
@@ -25,26 +25,19 @@
  */
 public abstract class TargetException extends ComponentException {
 
-    public TargetException(String message) {
-        super(message);
-    }
-
-
-    public TargetException(String message, String identifier) {
-        super(message, identifier);
+    public TargetException() {
+        super();
     }
 
     public TargetException(String message, Throwable cause) {
         super(message, cause);
     }
 
-
-    public TargetException(String message, String identifier, Throwable cause) {
-        super(message, identifier, cause);
+    public TargetException(String message) {
+        super(message);
     }
 
     public TargetException(Throwable cause) {
         super(cause);
     }
-
 }

Modified: incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/spi/component/TargetInitializationException.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/spi/component/TargetInitializationException.java?view=diff&rev=535837&r1=535836&r2=535837
==============================================================================
--- incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/spi/component/TargetInitializationException.java (original)
+++ incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/spi/component/TargetInitializationException.java Mon May  7 03:29:15 2007
@@ -25,15 +25,19 @@
  */
 public class TargetInitializationException extends TargetResolutionException {
 
-    public TargetInitializationException(String message, String identifier) {
-        super(message, identifier);
-    }
-
-    public TargetInitializationException(String message, String identifier, Throwable cause) {
-        super(message, identifier, cause);
+    public TargetInitializationException() {
+        super();
     }
 
     public TargetInitializationException(String message, Throwable cause) {
         super(message, cause);
+    }
+
+    public TargetInitializationException(String message) {
+        super(message);
+    }
+
+    public TargetInitializationException(Throwable cause) {
+        super(cause);
     }
 }

Modified: incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/spi/component/TargetInvocationException.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/spi/component/TargetInvocationException.java?view=diff&rev=535837&r1=535836&r2=535837
==============================================================================
--- incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/spi/component/TargetInvocationException.java (original)
+++ incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/spi/component/TargetInvocationException.java Mon May  7 03:29:15 2007
@@ -25,19 +25,19 @@
  */
 public class TargetInvocationException extends TargetException {
 
-    public TargetInvocationException(String message) {
-        super(message);
-    }
-
-    public TargetInvocationException(String message, String identifier) {
-        super(message, identifier);
+    public TargetInvocationException() {
+        super();
     }
 
     public TargetInvocationException(String message, Throwable cause) {
         super(message, cause);
     }
 
-    public TargetInvocationException(String message, String identifier, Throwable cause) {
-        super(message, identifier, cause);
+    public TargetInvocationException(String message) {
+        super(message);
+    }
+
+    public TargetInvocationException(Throwable cause) {
+        super(cause);
     }
 }

Modified: incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/spi/component/TargetInvokerCreationException.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/spi/component/TargetInvokerCreationException.java?view=diff&rev=535837&r1=535836&r2=535837
==============================================================================
--- incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/spi/component/TargetInvokerCreationException.java (original)
+++ incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/spi/component/TargetInvokerCreationException.java Mon May  7 03:29:15 2007
@@ -27,22 +27,15 @@
 public abstract class TargetInvokerCreationException extends ComponentException {
 
     public TargetInvokerCreationException() {
-    }
-
-    public TargetInvokerCreationException(String message) {
-        super(message);
-    }
-
-    public TargetInvokerCreationException(String message, String identifier) {
-        super(message, identifier);
+        super();
     }
 
     public TargetInvokerCreationException(String message, Throwable cause) {
         super(message, cause);
     }
 
-    public TargetInvokerCreationException(String message, String identifier, Throwable cause) {
-        super(message, identifier, cause);
+    public TargetInvokerCreationException(String message) {
+        super(message);
     }
 
     public TargetInvokerCreationException(Throwable cause) {

Modified: incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/spi/component/TargetNotFoundException.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/spi/component/TargetNotFoundException.java?view=diff&rev=535837&r1=535836&r2=535837
==============================================================================
--- incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/spi/component/TargetNotFoundException.java (original)
+++ incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/spi/component/TargetNotFoundException.java Mon May  7 03:29:15 2007
@@ -25,12 +25,19 @@
  */
 public class TargetNotFoundException extends TargetResolutionException {
 
+    public TargetNotFoundException() {
+        super();
+    }
+
+    public TargetNotFoundException(String message, Throwable cause) {
+        super(message, cause);
+    }
+
     public TargetNotFoundException(String message) {
         super(message);
     }
 
-    public TargetNotFoundException(String message, String identifier) {
-        super(message, identifier);
+    public TargetNotFoundException(Throwable cause) {
+        super(cause);
     }
-
 }

Modified: incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/spi/component/TargetResolutionException.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/spi/component/TargetResolutionException.java?view=diff&rev=535837&r1=535836&r2=535837
==============================================================================
--- incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/spi/component/TargetResolutionException.java (original)
+++ incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/spi/component/TargetResolutionException.java Mon May  7 03:29:15 2007
@@ -25,19 +25,19 @@
  */
 public class TargetResolutionException extends TargetException {
 
-    public TargetResolutionException(String message) {
-        super(message);
-    }
-
-    public TargetResolutionException(String message, String identifier) {
-        super(message, identifier);
+    public TargetResolutionException() {
+        super();
     }
 
     public TargetResolutionException(String message, Throwable cause) {
         super(message, cause);
     }
 
-    public TargetResolutionException(String message, String identifier, Throwable cause) {
-        super(message, identifier, cause);
+    public TargetResolutionException(String message) {
+        super(message);
+    }
+
+    public TargetResolutionException(Throwable cause) {
+        super(cause);
     }
 }

Modified: incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/store/DuplicateRecordException.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/store/DuplicateRecordException.java?view=diff&rev=535837&r1=535836&r2=535837
==============================================================================
--- incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/store/DuplicateRecordException.java (original)
+++ incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/store/DuplicateRecordException.java Mon May  7 03:29:15 2007
@@ -26,7 +26,20 @@
 public class DuplicateRecordException extends StoreWriteException {
     private static final long serialVersionUID = 3116253222569378447L;
 
-    public DuplicateRecordException(String owner, String identifier) {
-        super(null, owner, identifier);
+    public DuplicateRecordException() {
+        super();
     }
+
+    public DuplicateRecordException(String message, Throwable cause) {
+        super(message, cause);
+    }
+
+    public DuplicateRecordException(String message) {
+        super(message);
+    }
+
+    public DuplicateRecordException(Throwable cause) {
+        super(cause);
+    }
+
 }

Modified: incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/store/StoreException.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/store/StoreException.java?view=diff&rev=535837&r1=535836&r2=535837
==============================================================================
--- incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/store/StoreException.java (original)
+++ incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/store/StoreException.java Mon May  7 03:29:15 2007
@@ -18,38 +18,29 @@
  */
 package org.apache.tuscany.store;
 
-import org.apache.tuscany.spi.TuscanyException;
 
 /**
  * Represents a generic exception thrown by a <code>Store</code>
  *
  * @version $Rev$ $Date$
  */
-public class StoreException extends TuscanyException {
+public class StoreException extends Exception {
     private static final long serialVersionUID = -319152147419962709L;
-    private final String owner;
 
-    public StoreException(String message, String owner, String identifier) {
-        super(message, identifier);
-        this.owner = owner;
+    public StoreException() {
+        super();
     }
 
-    public StoreException(String message, String owner, String identifier, Throwable cause) {
-        super(message, identifier, cause);
-        this.owner = owner;
+    public StoreException(String message, Throwable cause) {
+        super(message, cause);
     }
 
-    public StoreException(String message, String owner, Throwable cause) {
-        super(message, cause);
-        this.owner = owner;
+    public StoreException(String message) {
+        super(message);
     }
 
     public StoreException(Throwable cause) {
         super(cause);
-        owner = null;
-    }
-
-    public String getOwner() {
-        return owner;
     }
+    
 }

Modified: incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/store/StoreReadException.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/store/StoreReadException.java?view=diff&rev=535837&r1=535836&r2=535837
==============================================================================
--- incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/store/StoreReadException.java (original)
+++ incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/store/StoreReadException.java Mon May  7 03:29:15 2007
@@ -26,17 +26,20 @@
 public class StoreReadException extends StoreException {
     private static final long serialVersionUID = -8624542082121467271L;
 
-    public StoreReadException(Throwable cause) {
-        super(cause);
+    public StoreReadException() {
+        super();
     }
 
-    public StoreReadException(String message, String owner, String identifier) {
-        super(message, owner, identifier);
+    public StoreReadException(String message, Throwable cause) {
+        super(message, cause);
     }
 
-    public StoreReadException(String owner, String identifier, Throwable throwable) {
-        super(owner, identifier, throwable);
+    public StoreReadException(String message) {
+        super(message);
     }
 
-
+    public StoreReadException(Throwable cause) {
+        super(cause);
+    }
+    
 }

Modified: incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/store/StoreWriteException.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/store/StoreWriteException.java?view=diff&rev=535837&r1=535836&r2=535837
==============================================================================
--- incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/store/StoreWriteException.java (original)
+++ incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/store/StoreWriteException.java Mon May  7 03:29:15 2007
@@ -26,19 +26,20 @@
 public class StoreWriteException extends StoreException {
     private static final long serialVersionUID = 5539070473942048555L;
 
-    public StoreWriteException(String message, String owner, String identifier) {
-        super(message, owner, identifier);
+    public StoreWriteException() {
+        super();
     }
 
-    public StoreWriteException(String message, String owner, String identifier, Throwable cause) {
-        super(message, owner, identifier, cause);
+    public StoreWriteException(String message, Throwable cause) {
+        super(message, cause);
     }
 
-    public StoreWriteException(String message, String owner, Throwable cause) {
-        super(message, owner, cause);
+    public StoreWriteException(String message) {
+        super(message);
     }
 
     public StoreWriteException(Throwable cause) {
         super(cause);
     }
+
 }

Modified: incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/work/WorkSchedulerException.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/work/WorkSchedulerException.java?view=diff&rev=535837&r1=535836&r2=535837
==============================================================================
--- incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/work/WorkSchedulerException.java (original)
+++ incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/work/WorkSchedulerException.java Mon May  7 03:29:15 2007
@@ -18,7 +18,6 @@
  */
 package org.apache.tuscany.work;
 
-import org.apache.tuscany.spi.TuscanyRuntimeException;
 
 /**
  * Exception thrown by the work scheduler in case of unexpected exceptions.
@@ -27,13 +26,20 @@
  *
  */
 @SuppressWarnings("serial")
-public class WorkSchedulerException extends TuscanyRuntimeException {
+public class WorkSchedulerException extends RuntimeException {
+
+    public WorkSchedulerException() {
+        super();
+    }
+
+    public WorkSchedulerException(String message, Throwable cause) {
+        super(message, cause);
+    }
+
+    public WorkSchedulerException(String message) {
+        super(message);
+    }
 
-    /**
-     * Wraps the root cause.
-     * 
-     * @param cause Root cause for the exception.
-     */
     public WorkSchedulerException(Throwable cause) {
         super(cause);
     }

Modified: incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/core/store/MemoryStore.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/core/store/MemoryStore.java?view=diff&rev=535837&r1=535836&r2=535837
==============================================================================
--- incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/core/store/MemoryStore.java (original)
+++ incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/core/store/MemoryStore.java Mon May  7 03:29:15 2007
@@ -107,7 +107,7 @@
             store.put(owner, map);
         }
         if (map.containsKey(id)) {
-            throw new DuplicateRecordException(owner.getURI(), id);
+            throw new DuplicateRecordException("Duplicate record: " + owner.getURI() +" : " + id);
         }
         map.put(id, new Record(object, expiration));
     }
@@ -115,11 +115,11 @@
     public void updateRecord(RuntimeComponent owner, String id, Object object, long expiration) throws StoreWriteException {
         Map<String, Record> map = store.get(owner);
         if (map == null) {
-            throw new StoreWriteException("Record not found", owner.getURI(), id);
+            throw new StoreWriteException("Record not found: " + owner.getURI() +" : " + id);
         }
         Record record = map.get(id);
         if (record == null) {
-            throw new StoreWriteException("Record not found", owner.getURI(), id);
+            throw new StoreWriteException("Record not found: " + owner.getURI() +" : " + id);
         }
         record.data = object;
     }
@@ -143,10 +143,10 @@
     public void removeRecord(RuntimeComponent owner, String id) throws StoreWriteException {
         Map<String, Record> map = store.get(owner);
         if (map == null) {
-            throw new StoreWriteException("Owner not found", owner.getURI(), id);
+            throw new StoreWriteException("Owner not found: " + owner.getURI() +" : " + id);
         }
         if (map.remove(id) == null) {
-            throw new StoreWriteException("Owner not found", owner.getURI(), id);
+            throw new StoreWriteException("Owner not found: " + owner.getURI() +" : " + id);
         }
     }
 

Modified: incubator/tuscany/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/implementation/java/context/ReflectiveInstanceFactory.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/implementation/java/context/ReflectiveInstanceFactory.java?view=diff&rev=535837&r1=535836&r2=535837
==============================================================================
--- incubator/tuscany/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/implementation/java/context/ReflectiveInstanceFactory.java (original)
+++ incubator/tuscany/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/implementation/java/context/ReflectiveInstanceFactory.java Mon May  7 03:29:15 2007
@@ -70,7 +70,7 @@
         } catch (
             InvocationTargetException e) {
             String name = ctr.getName();
-            throw new ObjectCreationException("Exception thrown by constructor", name, e);
+            throw new ObjectCreationException("Exception thrown by constructor: " + name, e);
         }
 
         if (injectors != null) {

Modified: incubator/tuscany/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/implementation/java/injection/InjectionRuntimeException.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/implementation/java/injection/InjectionRuntimeException.java?view=diff&rev=535837&r1=535836&r2=535837
==============================================================================
--- incubator/tuscany/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/implementation/java/injection/InjectionRuntimeException.java (original)
+++ incubator/tuscany/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/implementation/java/injection/InjectionRuntimeException.java Mon May  7 03:29:15 2007
@@ -18,34 +18,24 @@
  */
 package org.apache.tuscany.implementation.java.injection;
 
-import org.apache.tuscany.spi.TuscanyRuntimeException;
 
 /**
  * Root unchecked exception for the injection package
  *
  * @version $Rev$ $Date$
  */
-public abstract class InjectionRuntimeException extends TuscanyRuntimeException {
+public abstract class InjectionRuntimeException extends RuntimeException {
 
     public InjectionRuntimeException() {
         super();
     }
 
-    public InjectionRuntimeException(String message) {
-        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(String message) {
+        super(message);
     }
 
     public InjectionRuntimeException(Throwable cause) {

Modified: incubator/tuscany/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/implementation/java/injection/InvalidAccessorException.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/implementation/java/injection/InvalidAccessorException.java?view=diff&rev=535837&r1=535836&r2=535837
==============================================================================
--- incubator/tuscany/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/implementation/java/injection/InvalidAccessorException.java (original)
+++ incubator/tuscany/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/implementation/java/injection/InvalidAccessorException.java Mon May  7 03:29:15 2007
@@ -23,12 +23,20 @@
  */
 public class InvalidAccessorException extends InjectionRuntimeException {
 
+    public InvalidAccessorException() {
+        super();
+    }
+
+    public InvalidAccessorException(String message, Throwable cause) {
+        super(message, cause);
+    }
+
     public InvalidAccessorException(String message) {
         super(message);
     }
 
-    public InvalidAccessorException(String message, String identifier) {
-        super(message, identifier);
+    public InvalidAccessorException(Throwable cause) {
+        super(cause);
     }
 
 }

Modified: incubator/tuscany/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/implementation/java/injection/InvalidResourceTypeException.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/implementation/java/injection/InvalidResourceTypeException.java?view=diff&rev=535837&r1=535836&r2=535837
==============================================================================
--- incubator/tuscany/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/implementation/java/injection/InvalidResourceTypeException.java (original)
+++ incubator/tuscany/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/implementation/java/injection/InvalidResourceTypeException.java Mon May  7 03:29:15 2007
@@ -27,7 +27,20 @@
  */
 public class InvalidResourceTypeException extends ObjectCreationException {
 
-    public InvalidResourceTypeException(String message, String identifier) {
-        super(message, identifier);
+    public InvalidResourceTypeException() {
+        super();
     }
+
+    public InvalidResourceTypeException(String message, Throwable cause) {
+        super(message, cause);
+    }
+
+    public InvalidResourceTypeException(String message) {
+        super(message);
+    }
+
+    public InvalidResourceTypeException(Throwable cause) {
+        super(cause);
+    }
+
 }

Modified: incubator/tuscany/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/implementation/java/injection/MethodInjector.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/implementation/java/injection/MethodInjector.java?view=diff&rev=535837&r1=535836&r2=535837
==============================================================================
--- incubator/tuscany/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/implementation/java/injection/MethodInjector.java (original)
+++ incubator/tuscany/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/implementation/java/injection/MethodInjector.java Mon May  7 03:29:15 2007
@@ -47,9 +47,9 @@
         } catch (IllegalAccessException e) {
             throw new AssertionError("Method is not accessible [" + method + "]");
         } catch (IllegalArgumentException e) {
-            throw new ObjectCreationException("Exception thrown by setter", method.getName(), e);
+            throw new ObjectCreationException("Exception thrown by setter: " + method.getName(), e);
         } catch (InvocationTargetException e) {
-            throw new ObjectCreationException("Exception thrown by setter", method.getName(), e);
+            throw new ObjectCreationException("Exception thrown by setter: " + method.getName(), e);
         }
     }
 }

Modified: incubator/tuscany/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/implementation/java/injection/NoMultiplicityTypeException.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/implementation/java/injection/NoMultiplicityTypeException.java?view=diff&rev=535837&r1=535836&r2=535837
==============================================================================
--- incubator/tuscany/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/implementation/java/injection/NoMultiplicityTypeException.java (original)
+++ incubator/tuscany/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/implementation/java/injection/NoMultiplicityTypeException.java Mon May  7 03:29:15 2007
@@ -23,7 +23,20 @@
  */
 public class NoMultiplicityTypeException extends InjectionRuntimeException {
 
-    public NoMultiplicityTypeException(String message, String identifier) {
-        super(message, identifier);
+    public NoMultiplicityTypeException() {
+        super();
     }
+
+    public NoMultiplicityTypeException(String message, Throwable cause) {
+        super(message, cause);
+    }
+
+    public NoMultiplicityTypeException(String message) {
+        super(message);
+    }
+
+    public NoMultiplicityTypeException(Throwable cause) {
+        super(cause);
+    }
+
 }

Modified: incubator/tuscany/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/implementation/java/injection/ObjectCallbackException.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/implementation/java/injection/ObjectCallbackException.java?view=diff&rev=535837&r1=535836&r2=535837
==============================================================================
--- incubator/tuscany/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/implementation/java/injection/ObjectCallbackException.java (original)
+++ incubator/tuscany/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/implementation/java/injection/ObjectCallbackException.java Mon May  7 03:29:15 2007
@@ -29,16 +29,12 @@
         super();
     }
 
-    public ObjectCallbackException(String message) {
-        super(message);
-    }
-
-    public ObjectCallbackException(String message, String identifier) {
-        super(message, identifier);
-    }
-
     public ObjectCallbackException(String message, Throwable cause) {
         super(message, cause);
+    }
+
+    public ObjectCallbackException(String message) {
+        super(message);
     }
 
     public ObjectCallbackException(Throwable cause) {

Modified: incubator/tuscany/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/implementation/java/injection/PojoObjectFactory.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/implementation/java/injection/PojoObjectFactory.java?view=diff&rev=535837&r1=535836&r2=535837
==============================================================================
--- incubator/tuscany/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/implementation/java/injection/PojoObjectFactory.java (original)
+++ incubator/tuscany/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/implementation/java/injection/PojoObjectFactory.java Mon May  7 03:29:15 2007
@@ -105,7 +105,7 @@
             return ctr.newInstance(initargs);
         } catch (IllegalArgumentException e) {
             String name = ctr.getName();
-            throw new ObjectCreationException("Exception thrown by constructor", name, e);
+            throw new ObjectCreationException("Exception thrown by constructor: " + name, e);
         } catch (InstantiationException e) {
             String name = ctr.getDeclaringClass().getName();
             throw new AssertionError("Class is not instantiable [" + name + "]");
@@ -114,7 +114,7 @@
             throw new AssertionError("Constructor is not accessible [" + name + "]");
         } catch (InvocationTargetException e) {
             String name = ctr.getName();
-            throw new ObjectCreationException("Exception thrown by constructor", name, e);
+            throw new ObjectCreationException("Exception thrown by constructor: " + name, e);
         }
     }
 }

Modified: incubator/tuscany/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/implementation/java/injection/ResourceNotFoundException.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/implementation/java/injection/ResourceNotFoundException.java?view=diff&rev=535837&r1=535836&r2=535837
==============================================================================
--- incubator/tuscany/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/implementation/java/injection/ResourceNotFoundException.java (original)
+++ incubator/tuscany/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/implementation/java/injection/ResourceNotFoundException.java Mon May  7 03:29:15 2007
@@ -27,8 +27,20 @@
  */
 public class ResourceNotFoundException extends ObjectCreationException {
 
-    public ResourceNotFoundException(String message, String identifier) {
-        super(message, identifier);
+    public ResourceNotFoundException() {
+        super();
+    }
+
+    public ResourceNotFoundException(String message, Throwable cause) {
+        super(message, cause);
+    }
+
+    public ResourceNotFoundException(String message) {
+        super(message);
+    }
+
+    public ResourceNotFoundException(Throwable cause) {
+        super(cause);
     }
 
 }

Modified: incubator/tuscany/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/implementation/java/injection/ResourceObjectFactory.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/implementation/java/injection/ResourceObjectFactory.java?view=diff&rev=535837&r1=535836&r2=535837
==============================================================================
--- incubator/tuscany/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/implementation/java/injection/ResourceObjectFactory.java (original)
+++ incubator/tuscany/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/implementation/java/injection/ResourceObjectFactory.java Mon May  7 03:29:15 2007
@@ -70,12 +70,12 @@
             if (mappedName == null) {
                 resource = host.resolveResource(type);
                 if (!optional && resource == null) {
-                    throw new ResourceNotFoundException("Resource not found", type.getName());
+                    throw new ResourceNotFoundException("Resource not found: " + type.getName());
                 }
             } else {
                 resource = host.resolveResource(type, mappedName);
                 if (!optional && resource == null) {
-                    throw new ResourceNotFoundException("Resource not found", mappedName);
+                    throw new ResourceNotFoundException("Resource not found: " + mappedName);
                 }
             }
             return resource;

Modified: incubator/tuscany/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/implementation/java/injection/ResourceResolutionException.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/implementation/java/injection/ResourceResolutionException.java?view=diff&rev=535837&r1=535836&r2=535837
==============================================================================
--- incubator/tuscany/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/implementation/java/injection/ResourceResolutionException.java (original)
+++ incubator/tuscany/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/implementation/java/injection/ResourceResolutionException.java Mon May  7 03:29:15 2007
@@ -18,16 +18,26 @@
  */
 package org.apache.tuscany.implementation.java.injection;
 
-import org.apache.tuscany.spi.TuscanyException;
 
 /**
  * @version $Rev$ $Date$
  */
-public class ResourceResolutionException extends TuscanyException {
+public class ResourceResolutionException extends Exception {
     private static final long serialVersionUID = 13421352711315479L;
 
-    public ResourceResolutionException(String message, String identifier) {
-        super(message, identifier);
+    public ResourceResolutionException() {
+        super();
     }
 
+    public ResourceResolutionException(String message, Throwable cause) {
+        super(message, cause);
+    }
+
+    public ResourceResolutionException(String message) {
+        super(message);
+    }
+
+    public ResourceResolutionException(Throwable cause) {
+        super(cause);
+    }
 }

Modified: incubator/tuscany/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/implementation/java/invocation/JavaComponentInfo.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/implementation/java/invocation/JavaComponentInfo.java?view=diff&rev=535837&r1=535836&r2=535837
==============================================================================
--- incubator/tuscany/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/implementation/java/invocation/JavaComponentInfo.java (original)
+++ incubator/tuscany/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/implementation/java/invocation/JavaComponentInfo.java Mon May  7 03:29:15 2007
@@ -114,7 +114,7 @@
             try {
                 configuration.getDestroyInvoker().invokeEvent(instance);
             } catch (ObjectCallbackException e) {
-                throw new TargetDestructionException("Error destroying component instance", getUri().toString(), e);
+                throw new TargetDestructionException("Error destroying component instance : " + getUri().toString(), e);
             }
         }
     }
@@ -257,7 +257,7 @@
             element.setClassifer(ConversationID.class);
             configuration.setObjectFactory(element, factory);
         } else {
-            throw new InvalidAccessorException("Member must be a field or method", member.getName());
+            throw new InvalidAccessorException("Member must be a field or method: " + member.getName());
         }
     }
 
@@ -284,7 +284,7 @@
         } else if (member instanceof Constructor) {
             return null;
         } else {
-            throw new InvalidAccessorException("Member must be a field or method", member.getName());
+            throw new InvalidAccessorException("Member must be a field or method: " + member.getName());
         }
     }
 
@@ -310,7 +310,7 @@
                 return new MethodInjector<Object>(method, new ListMultiplicityObjectFactory(factories));
             }
         } else {
-            throw new InvalidAccessorException("Member must be a field or method", member.getName());
+            throw new InvalidAccessorException("Member must be a field or method: " + member.getName());
         }
     }
 

Modified: incubator/tuscany/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/implementation/java/invocation/JavaTargetInvoker.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/implementation/java/invocation/JavaTargetInvoker.java?view=diff&rev=535837&r1=535836&r2=535837
==============================================================================
--- incubator/tuscany/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/implementation/java/invocation/JavaTargetInvoker.java (original)
+++ incubator/tuscany/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/implementation/java/invocation/JavaTargetInvoker.java Mon May  7 03:29:15 2007
@@ -84,7 +84,7 @@
                 assert !cacheable;
                 return scopeContainer.getAssociatedWrapper(component, contextId);
             default:
-                throw new InvalidConversationSequenceException("Unknown sequence type", String.valueOf(sequence));
+                throw new InvalidConversationSequenceException("Unknown sequence type: " + String.valueOf(sequence));
         }
     }
 

Modified: incubator/tuscany/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/implementation/java/invocation/PojoConfiguration.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/implementation/java/invocation/PojoConfiguration.java?view=diff&rev=535837&r1=535836&r2=535837
==============================================================================
--- incubator/tuscany/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/implementation/java/invocation/PojoConfiguration.java (original)
+++ incubator/tuscany/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/implementation/java/invocation/PojoConfiguration.java Mon May  7 03:29:15 2007
@@ -194,7 +194,7 @@
                 return new MethodInjector<T>(method, new ListMultiplicityObjectFactory(factories));
             }
         } else {
-            throw new InvalidAccessorException("Member must be a field or method", element.getName());
+            throw new InvalidAccessorException("Member must be a field or method: " + element.getName());
         }
     }
 

Modified: incubator/tuscany/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/implementation/java/monitor/DefaultExceptionFormatter.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/implementation/java/monitor/DefaultExceptionFormatter.java?view=diff&rev=535837&r1=535836&r2=535837
==============================================================================
--- incubator/tuscany/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/implementation/java/monitor/DefaultExceptionFormatter.java (original)
+++ incubator/tuscany/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/implementation/java/monitor/DefaultExceptionFormatter.java Mon May  7 03:29:15 2007
@@ -20,9 +20,6 @@
 
 import java.io.PrintWriter;
 
-import org.apache.tuscany.spi.TuscanyException;
-import org.apache.tuscany.spi.TuscanyRuntimeException;
-
 /**
  * Performs basics formatting of exceptions for JDK logging
  *
@@ -38,16 +35,9 @@
     }
 
     public PrintWriter write(PrintWriter writer, Throwable exception) {
-        if (exception instanceof TuscanyException) {
-            TuscanyException e = (TuscanyException) exception;
-            e.appendBaseMessage(writer);
-        } else if (exception instanceof TuscanyRuntimeException) {
-            TuscanyRuntimeException e = (TuscanyRuntimeException) exception;
-            e.appendBaseMessage(writer);
-        }
+        writer.append(exception.getMessage());
         writer.append("\n");
         return writer;
     }
-
 
 }

Modified: incubator/tuscany/java/sca/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/implementation/java/monitor/DefaultExceptionFormatterTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/implementation/java/monitor/DefaultExceptionFormatterTestCase.java?view=diff&rev=535837&r1=535836&r2=535837
==============================================================================
--- incubator/tuscany/java/sca/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/implementation/java/monitor/DefaultExceptionFormatterTestCase.java (original)
+++ incubator/tuscany/java/sca/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/implementation/java/monitor/DefaultExceptionFormatterTestCase.java Mon May  7 03:29:15 2007
@@ -23,10 +23,6 @@
 
 import junit.framework.TestCase;
 
-import org.apache.tuscany.implementation.java.monitor.DefaultExceptionFormatter;
-import org.apache.tuscany.spi.TuscanyException;
-import org.apache.tuscany.spi.TuscanyRuntimeException;
-
 /**
  * @version $Rev$ $Date$
  */
@@ -36,7 +32,7 @@
     public void testTuscanyExceptionFormat() throws Exception {
         StringWriter writer = new StringWriter();
         PrintWriter pw = new PrintWriter(writer);
-        TuscanyException e = new TuscanyException("somemessage") {
+        Exception e = new Exception("somemessage") {
         };
         formatter.write(pw, e);
         assertTrue(writer.toString().indexOf("somemessage") >= 0);
@@ -45,7 +41,7 @@
     public void testTuscanyRuntimeExceptionFormat() throws Exception {
         StringWriter writer = new StringWriter();
         PrintWriter pw = new PrintWriter(writer);
-        TuscanyRuntimeException e = new TuscanyRuntimeException("somemessage") {
+        RuntimeException e = new RuntimeException("somemessage") {
         };
         formatter.write(pw, e);
         assertTrue(writer.toString().indexOf("somemessage") >= 0);



---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org