You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by rf...@apache.org on 2009/03/19 17:34:10 UTC
svn commit: r756082 - in
/tuscany/java/sca/modules/contribution-osgi/src/main/java/org/apache/tuscany/sca/contribution/osgi/impl:
OSGiBundleProcessor.java OSGiBundleReferenceModelResolver.java
OSGiModelResolverImpl.java
Author: rfeng
Date: Thu Mar 19 16:34:10 2009
New Revision: 756082
URL: http://svn.apache.org/viewvc?rev=756082&view=rev
Log:
Clean up contribution-osgi
Removed:
tuscany/java/sca/modules/contribution-osgi/src/main/java/org/apache/tuscany/sca/contribution/osgi/impl/OSGiModelResolverImpl.java
Modified:
tuscany/java/sca/modules/contribution-osgi/src/main/java/org/apache/tuscany/sca/contribution/osgi/impl/OSGiBundleProcessor.java
tuscany/java/sca/modules/contribution-osgi/src/main/java/org/apache/tuscany/sca/contribution/osgi/impl/OSGiBundleReferenceModelResolver.java
Modified: tuscany/java/sca/modules/contribution-osgi/src/main/java/org/apache/tuscany/sca/contribution/osgi/impl/OSGiBundleProcessor.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/contribution-osgi/src/main/java/org/apache/tuscany/sca/contribution/osgi/impl/OSGiBundleProcessor.java?rev=756082&r1=756081&r2=756082&view=diff
==============================================================================
--- tuscany/java/sca/modules/contribution-osgi/src/main/java/org/apache/tuscany/sca/contribution/osgi/impl/OSGiBundleProcessor.java (original)
+++ tuscany/java/sca/modules/contribution-osgi/src/main/java/org/apache/tuscany/sca/contribution/osgi/impl/OSGiBundleProcessor.java Thu Mar 19 16:34:10 2009
@@ -72,14 +72,4 @@
}
return bundleReference;
}
-
- // private void initialize() {
- // try {
- // if (!initializedOSGi) {
- // initializedOSGi = true;
- // osgiRuntime = OSGiRuntime.getRuntime();
- // }
- // } catch (Exception e) {
- // }
- // }
}
Modified: tuscany/java/sca/modules/contribution-osgi/src/main/java/org/apache/tuscany/sca/contribution/osgi/impl/OSGiBundleReferenceModelResolver.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/contribution-osgi/src/main/java/org/apache/tuscany/sca/contribution/osgi/impl/OSGiBundleReferenceModelResolver.java?rev=756082&r1=756081&r2=756082&view=diff
==============================================================================
--- tuscany/java/sca/modules/contribution-osgi/src/main/java/org/apache/tuscany/sca/contribution/osgi/impl/OSGiBundleReferenceModelResolver.java (original)
+++ tuscany/java/sca/modules/contribution-osgi/src/main/java/org/apache/tuscany/sca/contribution/osgi/impl/OSGiBundleReferenceModelResolver.java Thu Mar 19 16:34:10 2009
@@ -36,7 +36,7 @@
*/
public class OSGiBundleReferenceModelResolver implements ModelResolver {
private Contribution contribution;
- private Map<String, BundleReference> map = new HashMap<String, BundleReference>();
+ private Map<BundleReference, BundleReference> refs = new HashMap<BundleReference, BundleReference>();
private OSGiBundleProcessor bundleProcessor;
@@ -47,11 +47,11 @@
public void addModel(Object resolved) {
BundleReference bundleRef = (BundleReference)resolved;
- map.put(bundleRef.getSymbolicName(), bundleRef);
+ refs.put(bundleRef, bundleRef);
}
public Object removeModel(Object resolved) {
- return map.remove(((BundleReference)resolved).getSymbolicName());
+ return refs.remove(resolved);
}
/**
@@ -75,7 +75,7 @@
}
public <T> T resolveModel(Class<T> modelClass, T unresolved) {
- Object resolved = map.get(unresolved);
+ Object resolved = refs.get(unresolved);
if (resolved != null) {
return modelClass.cast(resolved);
@@ -95,14 +95,13 @@
if (bundle == null) {
bundleReference = bundleProcessor.installNestedBundle(contribution, bundleName, bundleVersion);
} else {
- bundleReference =
- new BundleReference(bundle);
+ bundleReference = new BundleReference(bundle);
}
if (bundleReference != null) {
//if we load the class
- map.put(((BundleReference)unresolved).getSymbolicName(), bundleReference);
+ refs.put(((BundleReference)unresolved), bundleReference);
// Return the resolved BundleReference
return modelClass.cast(bundleReference);
@@ -113,28 +112,4 @@
}
}
-
- private String getBundleFileName(Object bundle) {
- if (bundle instanceof Bundle) {
- String path = ((Bundle)bundle).getLocation();
- if (path.endsWith("/"))
- path = path.substring(0, path.length() - 1);
- if (path.startsWith(contribution.getLocation())) {
- if (path.equals(contribution.getLocation())) {
- int index = path.lastIndexOf('/');
- if (index > 0 && index < path.length() - 1)
- path = path.substring(index + 1);
- } else {
- path = path.substring(contribution.getLocation().length());
- if (path.startsWith("/"))
- path = path.substring(1);
- }
- } else if (path.lastIndexOf('/') >= 0)
- path = path.substring(path.lastIndexOf('/') + 1);
- return path;
- }
- return null;
-
- }
-
}