svn commit: r675471 - in /activemq/camel/trunk/camel-core/src/main/java/org/apache/camel: impl/converter/AnnotationTypeConverterLoader.java util/WebSphereResolverUtil.java

[davsclaus]

Author: davsclaus
Date: Thu Jul 10 00:59:32 2008
New Revision: 675471

URL: http://svn.apache.org/viewvc?rev=675471&view=rev
Log:
CAMEL-636: Removed bad tangle

Modified:
    
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/converter/AnnotationTypeConverterLoader.java
    
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/util/WebSphereResolverUtil.java

Modified: 
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/converter/AnnotationTypeConverterLoader.java
URL: 
http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/converter/AnnotationTypeConverterLoader.java?rev=675471&r1=675470&r2=675471&view=diff
==============================================================================
--- 
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/converter/AnnotationTypeConverterLoader.java
 (original)
+++ 
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/converter/AnnotationTypeConverterLoader.java
 Thu Jul 10 00:59:32 2008
@@ -57,7 +57,7 @@
         // use WebSphere specific resolver if running on WebSphere
         if 
(WebSphereResolverUtil.isWebSphereClassLoader(this.getClass().getClassLoader()))
 {
             LOG.info("Using WebSphere specific ResolverUtil");
-            resolver = new WebSphereResolverUtil();
+            resolver = new WebSphereResolverUtil(META_INF_SERVICES);
         }
     }
 

Modified: 
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/util/WebSphereResolverUtil.java
URL: 
http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/util/WebSphereResolverUtil.java?rev=675471&r1=675470&r2=675471&view=diff
==============================================================================
--- 
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/util/WebSphereResolverUtil.java
 (original)
+++ 
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/util/WebSphereResolverUtil.java
 Thu Jul 10 00:59:32 2008
@@ -20,13 +20,22 @@
 import java.net.URL;
 import java.util.Enumeration;
 
-import org.apache.camel.impl.converter.AnnotationTypeConverterLoader;
-
 /**
  * WebSphere specific resolver util to handle loading annotated resources in 
JAR files.
  */
 public class WebSphereResolverUtil extends ResolverUtil {
 
+    private String resourcePath;
+
+    /**
+     * Constructor.
+     *
+     * @param resourcePath  the fixed resource path to use for fetching camel 
jars in WebSphere.
+     */
+    public WebSphereResolverUtil(String resourcePath) {
+        this.resourcePath = resourcePath;
+    }
+
     /**
      * Is the classloader from IBM and thus the WebSphere platform?
      *
@@ -59,7 +68,7 @@
             // converters that is annotated. So by searching for this resource 
WebSphere is able to find
             // it and return the URL to the .jar file with the resource. Then 
the default ResolverUtil
             // can take it from there and find the classes that are annotated.
-            enumeration = 
loader.getResources(AnnotationTypeConverterLoader.META_INF_SERVICES);
+            enumeration = loader.getResources(resourcePath);
         }
 
         return enumeration;