svn commit: r1403860 - in /servicemix/utils/trunk: pom.xml src/main/java/org/apache/servicemix/executors/impl/FactoryFinder.java

[gertv]

Author: gertv
Date: Tue Oct 30 20:18:50 2012
New Revision: 1403860

URL: http://svn.apache.org/viewvc?rev=1403860&view=rev
Log:
Prepare for release: align dependencies with upcoming 4.5.0 release

Modified:
    servicemix/utils/trunk/pom.xml
    
servicemix/utils/trunk/src/main/java/org/apache/servicemix/executors/impl/FactoryFinder.java

Modified: servicemix/utils/trunk/pom.xml
URL: 
http://svn.apache.org/viewvc/servicemix/utils/trunk/pom.xml?rev=1403860&r1=1403859&r2=1403860&view=diff
==============================================================================
--- servicemix/utils/trunk/pom.xml (original)
+++ servicemix/utils/trunk/pom.xml Tue Oct 30 20:18:50 2012
@@ -34,10 +34,10 @@
     <description>Various utility/helper classes and services for the 
ServiceMix containers and components</description>
 
     <properties>
-        <slf4j.version>1.6.1</slf4j.version>
+        <slf4j.version>1.6.6</slf4j.version>
 
         <servicemix.legal.version>1.0</servicemix.legal.version>
-        <servicemix.specs.version>1.8.0</servicemix.specs.version>
+        <servicemix.specs.version>2.1.0</servicemix.specs.version>
     </properties>
 
     <scm>
@@ -257,7 +257,7 @@
             <plugin>
                 <groupId>org.apache.felix</groupId>
                 <artifactId>maven-bundle-plugin</artifactId>
-                <version>2.3.6</version>
+                <version>2.3.7</version>
                 <extensions>true</extensions>
                 <configuration>
                     <instructions>

Modified: 
servicemix/utils/trunk/src/main/java/org/apache/servicemix/executors/impl/FactoryFinder.java
URL: 
http://svn.apache.org/viewvc/servicemix/utils/trunk/src/main/java/org/apache/servicemix/executors/impl/FactoryFinder.java?rev=1403860&r1=1403859&r2=1403860&view=diff
==============================================================================
--- 
servicemix/utils/trunk/src/main/java/org/apache/servicemix/executors/impl/FactoryFinder.java
 (original)
+++ 
servicemix/utils/trunk/src/main/java/org/apache/servicemix/executors/impl/FactoryFinder.java
 Tue Oct 30 20:18:50 2012
@@ -167,7 +167,12 @@ class FactoryFinder {
 
                     try {
                         // If we are deployed into an OSGi environment, 
leverage it
-                        Class spiClass = 
org.apache.servicemix.specs.locator.OsgiLocator.locate(iFactoryId);
+                        ClassLoader cl = FactoryFinder.class.getClassLoader();
+                        if (cl == null) {
+                            cl = ClassLoader.getSystemClassLoader();
+                        }
+                        Class factoryClass = cl.loadClass(iFactoryId);
+                        Class spiClass = 
org.apache.servicemix.specs.locator.OsgiLocator.locate(factoryClass, 
iFactoryId);
                         if (spiClass != null) {
                             return spiClass.newInstance();
                         }