svn commit: r652063 - in /incubator/tuscany/java/sca/modules/workspace-impl/src/main/java/org/apache/tuscany/sca/workspace/processor/impl: ContributionContentProcessor.java ContributionInfoProcessor.java

[jsdelfino]

Author: jsdelfino
Date: Sun Apr 27 22:22:21 2008
New Revision: 652063

URL: http://svn.apache.org/viewvc?rev=652063&view=rev
Log:
Check if test resolver is alredy installed before installing it again.

Modified:
    
incubator/tuscany/java/sca/modules/workspace-impl/src/main/java/org/apache/tuscany/sca/workspace/processor/impl/ContributionContentProcessor.java
    
incubator/tuscany/java/sca/modules/workspace-impl/src/main/java/org/apache/tuscany/sca/workspace/processor/impl/ContributionInfoProcessor.java

Modified: 
incubator/tuscany/java/sca/modules/workspace-impl/src/main/java/org/apache/tuscany/sca/workspace/processor/impl/ContributionContentProcessor.java
URL: 
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/workspace-impl/src/main/java/org/apache/tuscany/sca/workspace/processor/impl/ContributionContentProcessor.java?rev=652063&r1=652062&r2=652063&view=diff
==============================================================================
--- 
incubator/tuscany/java/sca/modules/workspace-impl/src/main/java/org/apache/tuscany/sca/workspace/processor/impl/ContributionContentProcessor.java
 (original)
+++ 
incubator/tuscany/java/sca/modules/workspace-impl/src/main/java/org/apache/tuscany/sca/workspace/processor/impl/ContributionContentProcessor.java
 Sun Apr 27 22:22:21 2008
@@ -157,11 +157,13 @@
      * @param modelResolvers
      */
     private static void hackResolvers(ModelResolverExtensionPoint 
modelResolvers) {
-        modelResolvers.getResolver(ClassReference.class);
-        try {
-            Class<?> loaderResolverClass = 
Class.forName("org.apache.tuscany.sca.contribution.java.impl.ClassLoaderModelResolver",
 true, ContributionContentProcessor.class.getClassLoader());
-            modelResolvers.addResolver(ClassReference.class, (Class<? extends 
ModelResolver>)loaderResolverClass);
-        } catch (ClassNotFoundException e) {
+        Class<?> resolverClass = 
modelResolvers.getResolver(ClassReference.class);
+        if (resolverClass==null || 
!resolverClass.getName().equals("org.apache.tuscany.sca.contribution.java.impl.ClassLoaderModelResolver"))
 {
+            try {
+                Class<?> loaderResolverClass = 
Class.forName("org.apache.tuscany.sca.contribution.java.impl.ClassLoaderModelResolver",
 true, ContributionContentProcessor.class.getClassLoader());
+                modelResolvers.addResolver(ClassReference.class, (Class<? 
extends ModelResolver>)loaderResolverClass);
+            } catch (ClassNotFoundException e) {
+            }
         }
     }
 }

Modified: 
incubator/tuscany/java/sca/modules/workspace-impl/src/main/java/org/apache/tuscany/sca/workspace/processor/impl/ContributionInfoProcessor.java
URL: 
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/workspace-impl/src/main/java/org/apache/tuscany/sca/workspace/processor/impl/ContributionInfoProcessor.java?rev=652063&r1=652062&r2=652063&view=diff
==============================================================================
--- 
incubator/tuscany/java/sca/modules/workspace-impl/src/main/java/org/apache/tuscany/sca/workspace/processor/impl/ContributionInfoProcessor.java
 (original)
+++ 
incubator/tuscany/java/sca/modules/workspace-impl/src/main/java/org/apache/tuscany/sca/workspace/processor/impl/ContributionInfoProcessor.java
 Sun Apr 27 22:22:21 2008
@@ -163,11 +163,13 @@
      * @param modelResolvers
      */
     private static void hackResolvers(ModelResolverExtensionPoint 
modelResolvers) {
-        modelResolvers.getResolver(ClassReference.class);
-        try {
-            Class<?> loaderResolverClass = 
Class.forName("org.apache.tuscany.sca.contribution.java.impl.ClassLoaderModelResolver",
 true, ContributionContentProcessor.class.getClassLoader());
-            modelResolvers.addResolver(ClassReference.class, (Class<? extends 
ModelResolver>)loaderResolverClass);
-        } catch (ClassNotFoundException e) {
+        Class<?> resolverClass = 
modelResolvers.getResolver(ClassReference.class);
+        if (resolverClass==null || 
!resolverClass.getName().equals("org.apache.tuscany.sca.contribution.java.impl.ClassLoaderModelResolver"))
 {
+            try {
+                Class<?> loaderResolverClass = 
Class.forName("org.apache.tuscany.sca.contribution.java.impl.ClassLoaderModelResolver",
 true, ContributionContentProcessor.class.getClassLoader());
+                modelResolvers.addResolver(ClassReference.class, (Class<? 
extends ModelResolver>)loaderResolverClass);
+            } catch (ClassNotFoundException e) {
+            }
         }
     }
 }