You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ni...@apache.org on 2009/09/17 12:01:51 UTC
svn commit: r816119 - in
/camel/trunk/components/camel-osgi/src/main/java/org/apache/camel/osgi:
OsgiFactoryFinder.java OsgiPackageScanClassResolver.java
Author: ningjiang
Date: Thu Sep 17 10:01:50 2009
New Revision: 816119
URL: http://svn.apache.org/viewvc?rev=816119&view=rev
Log:
Cleaned up the code, removed the unnecessary full package name
Modified:
camel/trunk/components/camel-osgi/src/main/java/org/apache/camel/osgi/OsgiFactoryFinder.java
camel/trunk/components/camel-osgi/src/main/java/org/apache/camel/osgi/OsgiPackageScanClassResolver.java
Modified: camel/trunk/components/camel-osgi/src/main/java/org/apache/camel/osgi/OsgiFactoryFinder.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-osgi/src/main/java/org/apache/camel/osgi/OsgiFactoryFinder.java?rev=816119&r1=816118&r2=816119&view=diff
==============================================================================
--- camel/trunk/components/camel-osgi/src/main/java/org/apache/camel/osgi/OsgiFactoryFinder.java (original)
+++ camel/trunk/components/camel-osgi/src/main/java/org/apache/camel/osgi/OsgiFactoryFinder.java Thu Sep 17 10:01:50 2009
@@ -79,12 +79,12 @@
public BundleEntry getResource(String name) {
BundleEntry entry = null;
- org.osgi.framework.Bundle[] bundles = null;
+ Bundle[] bundles = null;
BundleContext bundleContext = Activator.getBundle().getBundleContext();
if (bundleContext == null) {
// Bundle is not in STARTING|ACTIVE|STOPPING state
// (See OSGi 4.1 spec, section 4.3.17)
- bundles = new org.osgi.framework.Bundle[] {Activator.getBundle()};
+ bundles = new Bundle[] {Activator.getBundle()};
} else {
bundles = bundleContext.getBundles();
}
Modified: camel/trunk/components/camel-osgi/src/main/java/org/apache/camel/osgi/OsgiPackageScanClassResolver.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-osgi/src/main/java/org/apache/camel/osgi/OsgiPackageScanClassResolver.java?rev=816119&r1=816118&r2=816119&view=diff
==============================================================================
--- camel/trunk/components/camel-osgi/src/main/java/org/apache/camel/osgi/OsgiPackageScanClassResolver.java (original)
+++ camel/trunk/components/camel-osgi/src/main/java/org/apache/camel/osgi/OsgiPackageScanClassResolver.java Thu Sep 17 10:01:50 2009
@@ -133,21 +133,21 @@
@SuppressWarnings("unchecked")
static Set<String> getImplementationsInBundle(PackageScanFilter test, String packageName, ClassLoader loader, Method mth) {
try {
- org.osgi.framework.Bundle bundle = (org.osgi.framework.Bundle) mth.invoke(loader);
- org.osgi.framework.Bundle[] bundles = null;
+ Bundle bundle = (Bundle) mth.invoke(loader);
+ Bundle[] bundles = null;
BundleContext bundleContext = bundle.getBundleContext();
if (bundleContext == null) {
// Bundle is not in STARTING|ACTIVE|STOPPING state
// (See OSGi 4.1 spec, section 4.3.17)
- bundles = new org.osgi.framework.Bundle[] {bundle};
+ bundles = new Bundle[] {bundle};
} else {
bundles = bundleContext.getBundles();
}
Set<String> urls = new HashSet<String>();
- for (org.osgi.framework.Bundle bd : bundles) {
+ for (Bundle bd : bundles) {
if (LOG.isTraceEnabled()) {
LOG.trace("Searching in bundle:" + bd);
}