svn commit: r126424 - /incubator/beehive/trunk/controls/src/api/org/apache/beehive/controls/api/bean/Controls.java

[kentam]

Author: kentam
Date: Tue Jan 25 13:26:01 2005
New Revision: 126424

URL: http://svn.apache.org/viewcvs?view=rev&rev=126424
Log:
Temporarily disable dependency on Apache commons-discovery until classloader 
issues are better understood.


Modified:
   
incubator/beehive/trunk/controls/src/api/org/apache/beehive/controls/api/bean/Controls.java

Modified: 
incubator/beehive/trunk/controls/src/api/org/apache/beehive/controls/api/bean/Controls.java
Url: 
http://svn.apache.org/viewcvs/incubator/beehive/trunk/controls/src/api/org/apache/beehive/controls/api/bean/Controls.java?view=diff&rev=126424&p1=incubator/beehive/trunk/controls/src/api/org/apache/beehive/controls/api/bean/Controls.java&r1=126423&p2=incubator/beehive/trunk/controls/src/api/org/apache/beehive/controls/api/bean/Controls.java&r2=126424
==============================================================================
--- 
incubator/beehive/trunk/controls/src/api/org/apache/beehive/controls/api/bean/Controls.java
 (original)
+++ 
incubator/beehive/trunk/controls/src/api/org/apache/beehive/controls/api/bean/Controls.java
 Tue Jan 25 13:26:01 2005
@@ -25,7 +25,7 @@
 import org.apache.beehive.controls.spi.bean.ControlFactory;
 import org.apache.beehive.controls.spi.bean.JavaControlFactory;
 
-import org.apache.commons.discovery.tools.DiscoverClass;
+// import org.apache.commons.discovery.tools.DiscoverClass;
 
 import java.lang.reflect.Constructor;
 import java.lang.reflect.Method;
@@ -36,7 +36,7 @@
  */
 public class Controls
 {
-    final private static String DEFAULT_FACTORY_CLASS = 
JavaControlFactory.class.getName();
+    final private static Class DEFAULT_FACTORY_CLASS = 
JavaControlFactory.class;
 
     /**
      * Factory method for instantiating controls.  Controls instantiated using 
this method will be associated with the
@@ -97,8 +97,8 @@
     {
         try
         {
-            DiscoverClass discoverer = new DiscoverClass();
-            Class factoryClass = discoverer.find( ControlFactory.class, 
DEFAULT_FACTORY_CLASS );
+            // DiscoverClass discoverer = new DiscoverClass();
+            Class factoryClass = DEFAULT_FACTORY_CLASS;
             ControlFactory factory = 
(ControlFactory)factoryClass.newInstance();
             return factory.instantiate( beanClass, props, context, id );
         }