Author: edwardsmj
Date: Sun May  3 07:12:03 2009
New Revision: 771033

URL: http://svn.apache.org/viewvc?rev=771033&view=rev
Log:
Improve error reporting when exceptions occur during Java implementation 
processing - tag all exceptions with the name of the Java class.

Modified:
    
tuscany/java/sca/modules/implementation-java-xml/src/main/java/org/apache/tuscany/sca/implementation/java/xml/JavaImplementationProcessor.java

Modified: 
tuscany/java/sca/modules/implementation-java-xml/src/main/java/org/apache/tuscany/sca/implementation/java/xml/JavaImplementationProcessor.java
URL: 
http://svn.apache.org/viewvc/tuscany/java/sca/modules/implementation-java-xml/src/main/java/org/apache/tuscany/sca/implementation/java/xml/JavaImplementationProcessor.java?rev=771033&r1=771032&r2=771033&view=diff
==============================================================================
--- 
tuscany/java/sca/modules/implementation-java-xml/src/main/java/org/apache/tuscany/sca/implementation/java/xml/JavaImplementationProcessor.java
 (original)
+++ 
tuscany/java/sca/modules/implementation-java-xml/src/main/java/org/apache/tuscany/sca/implementation/java/xml/JavaImplementationProcessor.java
 Sun May  3 07:12:03 2009
@@ -167,34 +167,38 @@
     public void resolve(JavaImplementation javaImplementation, ModelResolver 
resolver)
         throws ContributionResolveException {
 
-        ClassReference classReference = new 
ClassReference(javaImplementation.getName());
-        classReference = resolver.resolveModel(ClassReference.class, 
classReference);
-        Class<?> javaClass = classReference.getJavaClass();
-        if (javaClass == null) {
-            error("ClassNotFoundException", resolver, 
javaImplementation.getName());
-            //throw new ContributionResolveException(new 
ClassNotFoundException(javaImplementation.getName()));
-            return;
-        }
-
-        javaImplementation.setJavaClass(javaClass);
-
-        try {
-            javaFactory.createJavaImplementation(javaImplementation, 
javaImplementation.getJavaClass());
-        } catch (IntrospectionException e) {
-            ContributionResolveException ce = new 
ContributionResolveException(e);
-            error("ContributionResolveException", javaFactory, ce);
-            //throw ce;
-            return;
-        }
-
-        javaImplementation.setUnresolved(false);
-        mergeComponentType(resolver, javaImplementation);
-
-        // FIXME the introspector should always create at least one service
-        if (javaImplementation.getServices().isEmpty()) {
-            
javaImplementation.getServices().add(assemblyFactory.createService());
-        }
-    }
+       try {
+               ClassReference classReference = new 
ClassReference(javaImplementation.getName());
+               classReference = resolver.resolveModel(ClassReference.class, 
classReference);
+               Class<?> javaClass = classReference.getJavaClass();
+               if (javaClass == null) {
+                   error("ClassNotFoundException", resolver, 
javaImplementation.getName());
+                   //throw new ContributionResolveException(new 
ClassNotFoundException(javaImplementation.getName()));
+                   return;
+               }
+       
+               javaImplementation.setJavaClass(javaClass);
+       
+               try {
+                   javaFactory.createJavaImplementation(javaImplementation, 
javaImplementation.getJavaClass());
+               } catch (IntrospectionException e) {
+                   ContributionResolveException ce = new 
ContributionResolveException(e);
+                   error("ContributionResolveException", javaFactory, ce);
+                   //throw ce;
+                   return;
+               }
+       
+               javaImplementation.setUnresolved(false);
+               mergeComponentType(resolver, javaImplementation);
+       
+               // FIXME the introspector should always create at least one 
service
+               if (javaImplementation.getServices().isEmpty()) {
+                   
javaImplementation.getServices().add(assemblyFactory.createService());
+               }
+       } catch (Throwable e ) {
+               throw new ContributionResolveException( "Resolving Java 
implementation: " + javaImplementation.getName(), e);
+       } // end try
+    } // end method
 
     private JavaElementImpl getMemeber(JavaImplementation impl, String name, 
Class<?> type) {
         String setter = JavaIntrospectionHelper.toSetter(name);


Reply via email to