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/02/23 04:19:15 UTC
svn commit: r380032 - in /incubator/tuscany/java/sca:
common/src/main/java/org/apache/tuscany/common/
container.java/src/main/java/org/apache/tuscany/container/java/config/
core/src/main/java/org/apache/tuscany/core/
core/src/main/java/org/apache/tusca...
Author: jmarino
Date: Wed Feb 22 19:19:11 2006
New Revision: 380032
URL: http://svn.apache.org/viewcvs?rev=380032&view=rev
Log:
move of top-level Tuscany checked and unchecked exceptions to common from core
Added:
incubator/tuscany/java/sca/common/src/main/java/org/apache/tuscany/common/TuscanyException.java
incubator/tuscany/java/sca/common/src/main/java/org/apache/tuscany/common/TuscanyRuntimeException.java
Removed:
incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/TuscanyException.java
incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/TuscanyRuntimeException.java
Modified:
incubator/tuscany/java/sca/container.java/src/main/java/org/apache/tuscany/container/java/config/IntrospectionException.java
incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/config/ConfigurationException.java
incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/context/CoreRuntimeException.java
incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/injection/InjectionRuntimeException.java
incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/invocation/InvocationException.java
incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/runtime/RuntimeMonitor.java
incubator/tuscany/java/sca/model/src/main/java/org/apache/tuscany/model/ModelRuntimeException.java
incubator/tuscany/java/sca/tomcat/src/main/java/org/apache/tuscany/tomcat/lifecycle/listener/BootstrapConfigurationException.java
incubator/tuscany/java/sca/tomcat/src/main/java/org/apache/tuscany/tomcat/lifecycle/listener/WebAppLifecycleListener.java
Added: incubator/tuscany/java/sca/common/src/main/java/org/apache/tuscany/common/TuscanyException.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/common/src/main/java/org/apache/tuscany/common/TuscanyException.java?rev=380032&view=auto
==============================================================================
--- incubator/tuscany/java/sca/common/src/main/java/org/apache/tuscany/common/TuscanyException.java (added)
+++ incubator/tuscany/java/sca/common/src/main/java/org/apache/tuscany/common/TuscanyException.java Wed Feb 22 19:19:11 2006
@@ -0,0 +1,85 @@
+package org.apache.tuscany.common;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * The root checked exception for the Tuscany rubntime
+ *
+ * @version $Rev: 368822 $ $Date: 2006-01-13 10:54:38 -0800 (Fri, 13 Jan 2006) $
+ */
+public abstract class TuscanyException extends Exception {
+
+ protected List<String> contextStack;
+
+ public TuscanyException() {
+ super();
+ }
+
+ public TuscanyException(String message) {
+ super(message);
+ }
+
+ public TuscanyException(String message, Throwable cause) {
+ super(message, cause);
+ }
+
+ public TuscanyException(Throwable cause) {
+ super(cause);
+ }
+
+ /**
+ * Returns a collection of names representing the context call stack where the error occured. The top of the stack
+ * is the first element in the collection.
+ */
+ public List<String> returnContextNames(String name) {
+ if (contextStack == null) {
+ contextStack = new ArrayList();
+ }
+ return contextStack;
+ }
+
+ /**
+ * Pushes a context name where an error occured onto the call stack
+ */
+ public void addContextName(String name) {
+ if (contextStack == null) {
+ contextStack = new ArrayList();
+ }
+ contextStack.add(name);
+ }
+
+ private String identifier;
+
+ /**
+ * Returns a string representing additional error information referred to in the error message
+ */
+ public String getIdentifier() {
+ return identifier;
+ }
+
+ /**
+ * Sets an additional error information referred to in the error message
+ */
+ public void setIdentifier(String identifier) {
+ this.identifier = identifier;
+ }
+
+ public String getMessage() {
+ if (identifier == null && contextStack == null) {
+ return super.getMessage();
+ }
+ StringBuffer b = new StringBuffer();
+ if (identifier != null) {
+ b.append(" [" + identifier + "]");
+ }
+ if (contextStack != null) {
+ b.append("\nContext stack trace: ");
+ for (int i = contextStack.size() - 1; i >= 0; i--) {
+ b.append("[" + contextStack.get(i) + "]");
+ }
+ }
+ return super.getMessage() + b.toString();
+
+ }
+}
Added: incubator/tuscany/java/sca/common/src/main/java/org/apache/tuscany/common/TuscanyRuntimeException.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/common/src/main/java/org/apache/tuscany/common/TuscanyRuntimeException.java?rev=380032&view=auto
==============================================================================
--- incubator/tuscany/java/sca/common/src/main/java/org/apache/tuscany/common/TuscanyRuntimeException.java (added)
+++ incubator/tuscany/java/sca/common/src/main/java/org/apache/tuscany/common/TuscanyRuntimeException.java Wed Feb 22 19:19:11 2006
@@ -0,0 +1,91 @@
+package org.apache.tuscany.common;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * The root unchecked exception for the Tuscany runtime
+ *
+ * @version $Rev: 368822 $ $Date: 2006-01-13 10:54:38 -0800 (Fri, 13 Jan 2006) $
+ */
+
+public abstract class TuscanyRuntimeException extends RuntimeException {
+
+ protected List<String> contextStack;
+
+ protected String moduleComponentName;
+
+ protected String componentName;
+
+ public TuscanyRuntimeException() {
+ super();
+ }
+
+ public TuscanyRuntimeException(String message) {
+ super(message);
+ }
+
+ public TuscanyRuntimeException(String message, Throwable cause) {
+ super(message, cause);
+ }
+
+ public TuscanyRuntimeException(Throwable cause) {
+ super(cause);
+ }
+
+ /**
+ * Returns a collection of names representing the context call stack where the error occured. The top of the stack
+ * is the first element in the collection.
+ */
+ public List<String> returnContextNames(String name) {
+ if (contextStack == null) {
+ contextStack = new ArrayList();
+ }
+ return contextStack;
+ }
+
+ /**
+ * Pushes a context name where an error occured onto the call stack
+ */
+ public void addContextName(String name) {
+ if (contextStack == null) {
+ contextStack = new ArrayList();
+ }
+ contextStack.add(name);
+ }
+
+ private String identifier;
+
+ /**
+ * Returns a string representing additional error information referred to in the error message
+ */
+ public String getIdentifier() {
+ return identifier;
+ }
+
+ /**
+ * Sets an additional error information referred to in the error message
+ */
+ public void setIdentifier(String identifier) {
+ this.identifier = identifier;
+ }
+
+ public String getMessage() {
+ if (identifier == null && contextStack == null) {
+ return super.getMessage();
+ }
+ StringBuffer b = new StringBuffer();
+ if (identifier != null) {
+ b.append(" [" + identifier + "]");
+ }
+ if (contextStack != null) {
+ b.append("\nContext stack trace: ");
+ for (int i = contextStack.size() - 1; i >= 0; i--) {
+ b.append("[" + contextStack.get(i) + "]");
+ }
+ }
+ return super.getMessage() + b.toString();
+
+ }
+
+}
Modified: incubator/tuscany/java/sca/container.java/src/main/java/org/apache/tuscany/container/java/config/IntrospectionException.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/container.java/src/main/java/org/apache/tuscany/container/java/config/IntrospectionException.java?rev=380032&r1=380031&r2=380032&view=diff
==============================================================================
--- incubator/tuscany/java/sca/container.java/src/main/java/org/apache/tuscany/container/java/config/IntrospectionException.java (original)
+++ incubator/tuscany/java/sca/container.java/src/main/java/org/apache/tuscany/container/java/config/IntrospectionException.java Wed Feb 22 19:19:11 2006
@@ -1,6 +1,6 @@
package org.apache.tuscany.container.java.config;
-import org.apache.tuscany.core.TuscanyRuntimeException;
+import org.apache.tuscany.common.TuscanyRuntimeException;
public class IntrospectionException extends TuscanyRuntimeException {
Modified: incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/config/ConfigurationException.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/config/ConfigurationException.java?rev=380032&r1=380031&r2=380032&view=diff
==============================================================================
--- incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/config/ConfigurationException.java (original)
+++ incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/config/ConfigurationException.java Wed Feb 22 19:19:11 2006
@@ -16,7 +16,8 @@
*/
package org.apache.tuscany.core.config;
-import org.apache.tuscany.core.TuscanyException;
+import org.apache.tuscany.common.TuscanyException;
+
/**
* Base class for exceptions that pertain to configuration.
Modified: incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/context/CoreRuntimeException.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/context/CoreRuntimeException.java?rev=380032&r1=380031&r2=380032&view=diff
==============================================================================
--- incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/context/CoreRuntimeException.java (original)
+++ incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/context/CoreRuntimeException.java Wed Feb 22 19:19:11 2006
@@ -1,6 +1,6 @@
package org.apache.tuscany.core.context;
-import org.apache.tuscany.core.TuscanyRuntimeException;
+import org.apache.tuscany.common.TuscanyRuntimeException;
/**
* The root exception for the runtime package. Exceptions occurring in the runtime are generally non-recoverable
Modified: incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/injection/InjectionRuntimeException.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/injection/InjectionRuntimeException.java?rev=380032&r1=380031&r2=380032&view=diff
==============================================================================
--- incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/injection/InjectionRuntimeException.java (original)
+++ incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/injection/InjectionRuntimeException.java Wed Feb 22 19:19:11 2006
@@ -1,6 +1,6 @@
package org.apache.tuscany.core.injection;
-import org.apache.tuscany.core.TuscanyRuntimeException;
+import org.apache.tuscany.common.TuscanyRuntimeException;
/**
* Root unchecked exception for the injection package
Modified: incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/invocation/InvocationException.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/invocation/InvocationException.java?rev=380032&r1=380031&r2=380032&view=diff
==============================================================================
--- incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/invocation/InvocationException.java (original)
+++ incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/invocation/InvocationException.java Wed Feb 22 19:19:11 2006
@@ -1,6 +1,6 @@
package org.apache.tuscany.core.invocation;
-import org.apache.tuscany.core.TuscanyException;
+import org.apache.tuscany.common.TuscanyException;
/**
* The root checked exception for the invocation framework
Modified: incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/runtime/RuntimeMonitor.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/runtime/RuntimeMonitor.java?rev=380032&r1=380031&r2=380032&view=diff
==============================================================================
--- incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/runtime/RuntimeMonitor.java (original)
+++ incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/runtime/RuntimeMonitor.java Wed Feb 22 19:19:11 2006
@@ -13,8 +13,9 @@
*/
package org.apache.tuscany.core.runtime;
-import org.apache.tuscany.core.TuscanyException;
-import org.apache.tuscany.core.TuscanyRuntimeException;
+import org.apache.tuscany.common.TuscanyException;
+import org.apache.tuscany.common.TuscanyRuntimeException;
+
/**
* Serves as a top-level error logging monitor
Modified: incubator/tuscany/java/sca/model/src/main/java/org/apache/tuscany/model/ModelRuntimeException.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/model/src/main/java/org/apache/tuscany/model/ModelRuntimeException.java?rev=380032&r1=380031&r2=380032&view=diff
==============================================================================
--- incubator/tuscany/java/sca/model/src/main/java/org/apache/tuscany/model/ModelRuntimeException.java (original)
+++ incubator/tuscany/java/sca/model/src/main/java/org/apache/tuscany/model/ModelRuntimeException.java Wed Feb 22 19:19:11 2006
@@ -13,17 +13,14 @@
*/
package org.apache.tuscany.model;
-import java.util.ArrayList;
-import java.util.List;
+import org.apache.tuscany.common.TuscanyRuntimeException;
/**
* The root runtime exception for the model.
*
- * FIXME this will extend from TuscanyRuntimeException when we move the latter to common
- *
* @version $Rev$ $Date$
*/
-public abstract class ModelRuntimeException extends RuntimeException {
+public abstract class ModelRuntimeException extends TuscanyRuntimeException {
public ModelRuntimeException() {
super();
@@ -41,68 +38,4 @@
super(cause);
}
-
- protected List<String> contextStack;
-
- protected String moduleComponentName;
-
- protected String componentName;
-
- //FIXME duplicate methods below to be eliminated when extends TuscanyRuntimeException
-
- /**
- * Returns a collection of names representing the context call stack where the error occured. The top of the stack
- * is the first element in the collection.
- */
- public List<String> returnContextNames(String name) {
- if (contextStack == null) {
- contextStack = new ArrayList();
- }
- return contextStack;
- }
-
- /**
- * Pushes a context name where an error occured onto the call stack
- */
- public void addContextName(String name) {
- if (contextStack == null) {
- contextStack = new ArrayList();
- }
- contextStack.add(name);
- }
-
- private String identifier;
-
- /**
- * Returns a string representing additional error information referred to in the error message
- */
- public String getIdentifier() {
- return identifier;
- }
-
- /**
- * Sets an additional error information referred to in the error message
- */
- public void setIdentifier(String identifier) {
- this.identifier = identifier;
- }
-
- public String getMessage() {
- if (identifier == null && contextStack == null) {
- return super.getMessage();
- }
- StringBuffer b = new StringBuffer();
- if (identifier != null) {
- b.append(" [" + identifier + "]");
- }
- if (contextStack != null) {
- b.append("\nContext stack trace: ");
- for (int i = contextStack.size() - 1; i >= 0; i--) {
- b.append("[" + contextStack.get(i) + "]");
- }
- }
- return super.getMessage() + b.toString();
-
- }
}
-
Modified: incubator/tuscany/java/sca/tomcat/src/main/java/org/apache/tuscany/tomcat/lifecycle/listener/BootstrapConfigurationException.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/tomcat/src/main/java/org/apache/tuscany/tomcat/lifecycle/listener/BootstrapConfigurationException.java?rev=380032&r1=380031&r2=380032&view=diff
==============================================================================
--- incubator/tuscany/java/sca/tomcat/src/main/java/org/apache/tuscany/tomcat/lifecycle/listener/BootstrapConfigurationException.java (original)
+++ incubator/tuscany/java/sca/tomcat/src/main/java/org/apache/tuscany/tomcat/lifecycle/listener/BootstrapConfigurationException.java Wed Feb 22 19:19:11 2006
@@ -13,7 +13,7 @@
*/
package org.apache.tuscany.tomcat.lifecycle.listener;
-import org.apache.tuscany.core.TuscanyException;
+import org.apache.tuscany.common.TuscanyException;
/**
* Signals an exception booting the Tuscany runtime hosted in a Tomcat instance
Modified: incubator/tuscany/java/sca/tomcat/src/main/java/org/apache/tuscany/tomcat/lifecycle/listener/WebAppLifecycleListener.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/tomcat/src/main/java/org/apache/tuscany/tomcat/lifecycle/listener/WebAppLifecycleListener.java?rev=380032&r1=380031&r2=380032&view=diff
==============================================================================
--- incubator/tuscany/java/sca/tomcat/src/main/java/org/apache/tuscany/tomcat/lifecycle/listener/WebAppLifecycleListener.java (original)
+++ incubator/tuscany/java/sca/tomcat/src/main/java/org/apache/tuscany/tomcat/lifecycle/listener/WebAppLifecycleListener.java Wed Feb 22 19:19:11 2006
@@ -25,7 +25,7 @@
import org.apache.catalina.LifecycleListener;
import org.apache.catalina.deploy.FilterDef;
import org.apache.catalina.deploy.FilterMap;
-import org.apache.tuscany.core.TuscanyRuntimeException;
+import org.apache.tuscany.common.TuscanyRuntimeException;
import org.apache.tuscany.core.config.ConfigurationException;
import org.apache.tuscany.core.context.AggregateContext;
import org.apache.tuscany.core.context.EventContext;