Relax the Monitor/Problem interfaces to take Throwable and Obbject...

git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@820459 13f79535-47bb-0310-9956-ffa450edef68

2 files changed, 4 insertions, 9 deletions

diff --git a/java/sca/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/NodeFactoryImpl.java b/java/sca/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/NodeFactoryImpl.java
index e5be18e5b9..052f15b2dc 100644
--- a/java/sca/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/NodeFactoryImpl.java
+++ b/java/sca/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/NodeFactoryImpl.java
@@ -24,13 +24,10 @@ import static org.apache.tuscany.sca.common.java.io.IOHelper.createURI;
 import static org.apache.tuscany.sca.common.java.io.IOHelper.openStream;
 
 import java.io.File;
-import java.io.IOException;
 import java.io.InputStream;
 import java.io.InputStreamReader;
 import java.io.Reader;
 import java.io.StringReader;
-import java.io.UnsupportedEncodingException;
-import java.net.MalformedURLException;
 import java.net.URI;
 import java.net.URL;
 import java.security.AccessController;
@@ -279,7 +276,7 @@ public class NodeFactoryImpl extends NodeFactory {
      *
      * @throws Exception
      */
-    private void analyzeProblems() throws Exception {
+    private void analyzeProblems() throws Throwable {
         for (Problem problem : monitor.getProblems()) {
             if ((problem.getSeverity() == Severity.ERROR)) {
                 if (problem.getCause() != null) {
@@ -478,7 +475,7 @@ public class NodeFactoryImpl extends NodeFactory {
     }
 
     protected Composite configureNode(NodeConfiguration configuration, List<Contribution> contributions)
-        throws Exception {
+        throws Throwable {
         if (contributions == null) {
             // Load contributions
             contributions = loadContributions(configuration);
@@ -569,8 +566,7 @@ public class NodeFactoryImpl extends NodeFactory {
         return domainComposite;
     }
 
-    private List<Contribution> loadContributions(NodeConfiguration configuration) throws MalformedURLException,
-        ContributionReadException, XMLStreamException, IOException, UnsupportedEncodingException, Exception {
+    private List<Contribution> loadContributions(NodeConfiguration configuration) throws Throwable {
         List<Contribution> contributions = new ArrayList<Contribution>();
 
         // Load the specified contributions
diff --git a/java/sca/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/NodeImpl.java b/java/sca/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/NodeImpl.java
index cd279f9fcd..82a5b01726 100644
--- a/java/sca/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/NodeImpl.java
+++ b/java/sca/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/NodeImpl.java
@@ -34,7 +34,6 @@ import org.apache.tuscany.sca.assembly.ComponentService;
 import org.apache.tuscany.sca.assembly.Composite;
 import org.apache.tuscany.sca.assembly.CompositeService;
 import org.apache.tuscany.sca.assembly.Endpoint;
-import org.apache.tuscany.sca.assembly.Implementation;
 import org.apache.tuscany.sca.assembly.Service;
 import org.apache.tuscany.sca.common.java.io.IOHelper;
 import org.apache.tuscany.sca.context.ThreadMessageContext;
@@ -145,7 +144,7 @@ public class NodeImpl implements Node, Client {
 
             return this;
 
-        } catch (Exception e) {
+        } catch (Throwable e) {
             throw new IllegalStateException(e);
         }