Author: ningjiang
Date: Fri Jul 2 08:40:57 2010
New Revision: 959919
URL: http://svn.apache.org/viewvc?rev=959919&view=rev
Log:
Fixed the test error of OsgiPackageScanClassResolverTest
Modified:
camel/trunk/components/camel-core-osgi/src/main/java/org/apache/camel/core/osgi/OsgiPackageScanClassResolver.java
camel/trunk/components/camel-core-osgi/src/test/java/org/apache/camel/core/osgi/CamelMockBundle.java
Modified:
camel/trunk/components/camel-core-osgi/src/main/java/org/apache/camel/core/osgi/OsgiPackageScanClassResolver.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-core-osgi/src/main/java/org/apache/camel/core/osgi/OsgiPackageScanClassResolver.java?rev=959919&r1=959918&r2=959919&view=diff
==============================================================================
---
camel/trunk/components/camel-core-osgi/src/main/java/org/apache/camel/core/osgi/OsgiPackageScanClassResolver.java
(original)
+++
camel/trunk/components/camel-core-osgi/src/main/java/org/apache/camel/core/osgi/OsgiPackageScanClassResolver.java
Fri Jul 2 08:40:57 2010
@@ -16,18 +16,15 @@
*/
package org.apache.camel.core.osgi;
-import java.lang.reflect.Method;
import java.net.URL;
import java.util.Collections;
import java.util.Enumeration;
import java.util.HashSet;
import java.util.Set;
-import org.apache.camel.impl.DefaultPackageScanClassResolver;
import org.apache.camel.core.osgi.utils.BundleDelegatingClassLoader;
+import org.apache.camel.impl.DefaultPackageScanClassResolver;
import org.apache.camel.spi.PackageScanFilter;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.osgi.framework.Bundle;
import org.osgi.framework.BundleContext;
Modified:
camel/trunk/components/camel-core-osgi/src/test/java/org/apache/camel/core/osgi/CamelMockBundle.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-core-osgi/src/test/java/org/apache/camel/core/osgi/CamelMockBundle.java?rev=959919&r1=959918&r2=959919&view=diff
==============================================================================
---
camel/trunk/components/camel-core-osgi/src/test/java/org/apache/camel/core/osgi/CamelMockBundle.java
(original)
+++
camel/trunk/components/camel-core-osgi/src/test/java/org/apache/camel/core/osgi/CamelMockBundle.java
Fri Jul 2 08:40:57 2010
@@ -87,11 +87,11 @@ public class CamelMockBundle extends Moc
}
public Enumeration findEntries(String path, String filePattern, boolean
recurse) {
- if (path.equals("/org/apache/camel/osgi/test") &&
filePattern.equals("*.class")) {
+ if (path.equals("/org/apache/camel/core/osgi/test") &&
filePattern.equals("*.class")) {
List<URL> urls = new ArrayList<URL>();
- URL url =
getClass().getClassLoader().getResource("org/apache/camel/osgi/test/MyTypeConverter.class");
+ URL url =
getClass().getClassLoader().getResource("org/apache/camel/core/osgi/test/MyTypeConverter.class");
urls.add(url);
- url =
getClass().getClassLoader().getResource("org/apache/camel/osgi/test/MyRouteBuilder.class");
+ url =
getClass().getClassLoader().getResource("org/apache/camel/core/osgi/test/MyRouteBuilder.class");
urls.add(url);
return new ListEnumeration(urls);
} else {