You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by rf...@apache.org on 2007/05/12 19:58:30 UTC
svn commit: r537498 - in /incubator/tuscany/java/sca/modules:
core-spi/src/main/java/org/apache/tuscany/sca/scope/
core/src/main/java/org/apache/tuscany/sca/core/invocation/
implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementatio...
Author: rfeng
Date: Sat May 12 10:58:28 2007
New Revision: 537498
URL: http://svn.apache.org/viewvc?view=rev&rev=537498
Log:
Clean up exceptions in the spi
Added:
incubator/tuscany/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/InvalidConversationSequenceException.java
- copied, changed from r537494, incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/sca/scope/InvalidConversationSequenceException.java
Removed:
incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/sca/scope/ComponentException.java
incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/sca/scope/InvalidConversationSequenceException.java
incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/sca/scope/TargetException.java
Modified:
incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/sca/scope/PersistenceException.java
incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/sca/scope/TargetDestructionException.java
incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/sca/scope/TargetInitializationException.java
incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/sca/scope/TargetInvocationException.java
incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/sca/scope/TargetInvokerCreationException.java
incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/sca/scope/TargetNotFoundException.java
incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/sca/scope/TargetResolutionException.java
incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/ProxyCreationException.java
incubator/tuscany/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaComponentInfo.java
incubator/tuscany/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaTargetInvoker.java
Modified: incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/sca/scope/PersistenceException.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/sca/scope/PersistenceException.java?view=diff&rev=537498&r1=537497&r2=537498
==============================================================================
--- incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/sca/scope/PersistenceException.java (original)
+++ incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/sca/scope/PersistenceException.java Sat May 12 10:58:28 2007
@@ -23,7 +23,7 @@
*
* @version $Rev$ $Date$
*/
-public class PersistenceException extends ComponentException {
+public class PersistenceException extends Exception {
public PersistenceException() {
}
Modified: incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/sca/scope/TargetDestructionException.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/sca/scope/TargetDestructionException.java?view=diff&rev=537498&r1=537497&r2=537498
==============================================================================
--- incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/sca/scope/TargetDestructionException.java (original)
+++ incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/sca/scope/TargetDestructionException.java Sat May 12 10:58:28 2007
@@ -24,6 +24,7 @@
* @version $Rev$ $Date$
*/
public class TargetDestructionException extends TargetResolutionException {
+ private static final long serialVersionUID = -6126684147851674709L;
public TargetDestructionException() {
super();
Modified: incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/sca/scope/TargetInitializationException.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/sca/scope/TargetInitializationException.java?view=diff&rev=537498&r1=537497&r2=537498
==============================================================================
--- incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/sca/scope/TargetInitializationException.java (original)
+++ incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/sca/scope/TargetInitializationException.java Sat May 12 10:58:28 2007
@@ -24,6 +24,7 @@
* @version $Rev$ $Date$
*/
public class TargetInitializationException extends TargetResolutionException {
+ private static final long serialVersionUID = -6228778208649752698L;
public TargetInitializationException() {
super();
Modified: incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/sca/scope/TargetInvocationException.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/sca/scope/TargetInvocationException.java?view=diff&rev=537498&r1=537497&r2=537498
==============================================================================
--- incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/sca/scope/TargetInvocationException.java (original)
+++ incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/sca/scope/TargetInvocationException.java Sat May 12 10:58:28 2007
@@ -23,7 +23,9 @@
*
* @version $Rev$ $Date$
*/
-public class TargetInvocationException extends TargetException {
+public class TargetInvocationException extends Exception {
+
+ private static final long serialVersionUID = -6553427708442761743L;
public TargetInvocationException() {
super();
Modified: incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/sca/scope/TargetInvokerCreationException.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/sca/scope/TargetInvokerCreationException.java?view=diff&rev=537498&r1=537497&r2=537498
==============================================================================
--- incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/sca/scope/TargetInvokerCreationException.java (original)
+++ incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/sca/scope/TargetInvokerCreationException.java Sat May 12 10:58:28 2007
@@ -24,7 +24,7 @@
* @version $Rev$ $Date$
* @Deprecated
*/
-public abstract class TargetInvokerCreationException extends ComponentException {
+public abstract class TargetInvokerCreationException extends Exception {
public TargetInvokerCreationException() {
super();
Modified: incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/sca/scope/TargetNotFoundException.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/sca/scope/TargetNotFoundException.java?view=diff&rev=537498&r1=537497&r2=537498
==============================================================================
--- incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/sca/scope/TargetNotFoundException.java (original)
+++ incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/sca/scope/TargetNotFoundException.java Sat May 12 10:58:28 2007
@@ -24,6 +24,7 @@
* @version $$Rev$$ $$Date$$
*/
public class TargetNotFoundException extends TargetResolutionException {
+ private static final long serialVersionUID = 5541830480658471186L;
public TargetNotFoundException() {
super();
Modified: incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/sca/scope/TargetResolutionException.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/sca/scope/TargetResolutionException.java?view=diff&rev=537498&r1=537497&r2=537498
==============================================================================
--- incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/sca/scope/TargetResolutionException.java (original)
+++ incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/sca/scope/TargetResolutionException.java Sat May 12 10:58:28 2007
@@ -23,7 +23,8 @@
*
* @version $Rev$ $Date$
*/
-public class TargetResolutionException extends TargetException {
+public class TargetResolutionException extends Exception {
+ private static final long serialVersionUID = 2912513650522019405L;
public TargetResolutionException() {
super();
Modified: incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/ProxyCreationException.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/ProxyCreationException.java?view=diff&rev=537498&r1=537497&r2=537498
==============================================================================
--- incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/ProxyCreationException.java (original)
+++ incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/ProxyCreationException.java Sat May 12 10:58:28 2007
@@ -18,14 +18,15 @@
*/
package org.apache.tuscany.sca.core.invocation;
-import org.apache.tuscany.sca.scope.CoreRuntimeException;
+import org.apache.tuscany.sca.factory.ObjectCreationException;
+
/**
* Denotes an error creating a proxy
*
* @version $$Rev$$ $$Date$$
*/
-public class ProxyCreationException extends CoreRuntimeException {
+public class ProxyCreationException extends ObjectCreationException {
private static final long serialVersionUID = 8002454344828513781L;
public ProxyCreationException() {
Copied: incubator/tuscany/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/InvalidConversationSequenceException.java (from r537494, incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/sca/scope/InvalidConversationSequenceException.java)
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/InvalidConversationSequenceException.java?view=diff&rev=537498&p1=incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/sca/scope/InvalidConversationSequenceException.java&r1=537494&p2=incubator/tuscany/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/InvalidConversationSequenceException.java&r2=537498
==============================================================================
--- incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/sca/scope/InvalidConversationSequenceException.java (original)
+++ incubator/tuscany/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/InvalidConversationSequenceException.java Sat May 12 10:58:28 2007
@@ -16,7 +16,9 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.tuscany.sca.scope;
+package org.apache.tuscany.sca.implementation.java.invocation;
+
+import org.apache.tuscany.sca.scope.TargetInvocationException;
/**
* Denotes an unknown operation sequence in a conversation
Modified: incubator/tuscany/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/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/sca/implementation/java/invocation/JavaComponentInfo.java?view=diff&rev=537498&r1=537497&r2=537498
==============================================================================
--- incubator/tuscany/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaComponentInfo.java (original)
+++ incubator/tuscany/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaComponentInfo.java Sat May 12 10:58:28 2007
@@ -62,9 +62,8 @@
import org.apache.tuscany.sca.implementation.java.introspect.impl.JavaIntrospectionHelper;
import org.apache.tuscany.sca.interfacedef.Operation;
import org.apache.tuscany.sca.interfacedef.java.impl.JavaInterfaceUtil;
-import org.apache.tuscany.sca.scope.ComponentException;
-import org.apache.tuscany.sca.scope.CoreRuntimeException;
import org.apache.tuscany.sca.scope.InstanceWrapper;
+import org.apache.tuscany.sca.scope.PersistenceException;
import org.apache.tuscany.sca.scope.Scope;
import org.apache.tuscany.sca.scope.TargetDestructionException;
import org.apache.tuscany.sca.scope.TargetInvokerCreationException;
@@ -145,7 +144,7 @@
}
}
- public void start() throws CoreRuntimeException {
+ public void start() {
if (!configuration.getDefinition().getCallbackMembers().isEmpty()) {
Map<String, List<RuntimeWire>> callbackWires = new HashMap<String, List<RuntimeWire>>();
for (ComponentService service : component.getServices()) {
@@ -382,7 +381,7 @@
public void stop() {
}
- public void removeInstance() throws ComponentException {
+ public void removeInstance() throws PersistenceException {
component.getScopeContainer().remove();
}
Modified: incubator/tuscany/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/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/sca/implementation/java/invocation/JavaTargetInvoker.java?view=diff&rev=537498&r1=537497&r2=537498
==============================================================================
--- incubator/tuscany/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaTargetInvoker.java (original)
+++ incubator/tuscany/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaTargetInvoker.java Sat May 12 10:58:28 2007
@@ -28,12 +28,11 @@
import org.apache.tuscany.sca.invocation.ConversationSequence;
import org.apache.tuscany.sca.invocation.InvocationChain;
import org.apache.tuscany.sca.invocation.Message;
-import org.apache.tuscany.sca.scope.ComponentException;
+import org.apache.tuscany.sca.scope.CoreRuntimeException;
import org.apache.tuscany.sca.scope.InstanceWrapper;
-import org.apache.tuscany.sca.scope.InvalidConversationSequenceException;
import org.apache.tuscany.sca.scope.Scope;
import org.apache.tuscany.sca.scope.ScopeContainer;
-import org.apache.tuscany.sca.scope.TargetException;
+import org.apache.tuscany.sca.scope.TargetResolutionException;
/**
* Responsible for synchronously dispatching an invocation to a Java component
@@ -72,7 +71,8 @@
/**
* Resolves the target service instance or returns a cached one
*/
- protected InstanceWrapper getInstance(ConversationSequence sequence, Object contextId) throws TargetException {
+ protected InstanceWrapper getInstance(ConversationSequence sequence, Object contextId)
+ throws TargetResolutionException, InvalidConversationSequenceException {
if (sequence == null) {
if (cacheable) {
if (target == null) {
@@ -82,8 +82,7 @@
} else {
return scopeContainer.getWrapper(contextId);
}
- }
- else {
+ } else {
switch (sequence) {
case CONVERSATION_START:
assert !cacheable;
@@ -100,7 +99,7 @@
public Object invokeTarget(final Object payload, final ConversationSequence sequence)
throws InvocationTargetException {
-
+
// FIXME: How to deal with other scopes
Object contextId = ThreadMessageContext.getMessageContext().getConversationID();
try {
@@ -118,9 +117,7 @@
scopeContainer.remove();
}
return ret;
- } catch (IllegalAccessException e) {
- throw new InvocationTargetException(e);
- } catch (ComponentException e) {
+ } catch (Exception e) {
throw new InvocationTargetException(e);
}
}
@@ -156,5 +153,5 @@
}
return null;
}
-
+
}
---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org