svn commit: r635126 - in /openejb/trunk/openejb3: pom.xml server/openejb-server/src/main/java/org/apache/openejb/server/ServiceManager.java

[db...@apache.org]

Author: dblevins
Date: Sat Mar  8 16:35:26 2008
New Revision: 635126

URL: http://svn.apache.org/viewvc?rev=635126&view=rev
Log:
Updated to xbean-reflect 3.4-SNAPSHOT

Modified:
    openejb/trunk/openejb3/pom.xml
    openejb/trunk/openejb3/server/openejb-server/src/main/java/org/apache/openejb/server/ServiceManager.java

Modified: openejb/trunk/openejb3/pom.xml
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/pom.xml?rev=635126&r1=635125&r2=635126&view=diff
==============================================================================
--- openejb/trunk/openejb3/pom.xml (original)
+++ openejb/trunk/openejb3/pom.xml Sat Mar  8 16:35:26 2008
@@ -794,7 +794,7 @@
       <dependency>
         <groupId>org.apache.xbean</groupId>
         <artifactId>xbean-reflect</artifactId>
-        <version>${xbeanVersion}</version>
+        <version>3.4-SNAPSHOT</version>
         <exclusions>
           <exclusion>
             <groupId>mx4j</groupId>

Modified: openejb/trunk/openejb3/server/openejb-server/src/main/java/org/apache/openejb/server/ServiceManager.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/server/openejb-server/src/main/java/org/apache/openejb/server/ServiceManager.java?rev=635126&r1=635125&r2=635126&view=diff
==============================================================================
--- openejb/trunk/openejb3/server/openejb-server/src/main/java/org/apache/openejb/server/ServiceManager.java (original)
+++ openejb/trunk/openejb3/server/openejb-server/src/main/java/org/apache/openejb/server/ServiceManager.java Sat Mar  8 16:35:26 2008
@@ -181,10 +181,11 @@
 
                     ObjectRecipe recipe = new ObjectRecipe(serviceClass);
                     try {
-                        if (recipe.findFactoryMethod(serviceClass, "createServerService") != null){
+                        // Do not import.  This class is not available in xbean-reflect-3.3
+                        if (org.apache.xbean.recipe.ReflectionUtil.findStaticFactory(serviceClass, "createServerService", null, null) != null){
                             recipe = new ObjectRecipe(serviceClass, "createServerService");
                         }
-                    } catch (MissingFactoryMethodException e) {
+                    } catch (Throwable e) {
                     }
 
                     recipe.allow(Option.CASE_INSENSITIVE_PROPERTIES);