From 01dc06b3389f75f04a0294d6d25e0e62060570e7 Mon Sep 17 00:00:00 2001 From: rfeng Date: Thu, 19 Mar 2009 16:34:10 +0000 Subject: Clean up contribution-osgi git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@756082 13f79535-47bb-0310-9956-ffa450edef68 --- .../osgi/impl/OSGiBundleProcessor.java | 10 -- .../impl/OSGiBundleReferenceModelResolver.java | 37 ++----- .../osgi/impl/OSGiModelResolverImpl.java | 116 --------------------- 3 files changed, 6 insertions(+), 157 deletions(-) delete mode 100644 java/sca/modules/contribution-osgi/src/main/java/org/apache/tuscany/sca/contribution/osgi/impl/OSGiModelResolverImpl.java (limited to 'java') diff --git a/java/sca/modules/contribution-osgi/src/main/java/org/apache/tuscany/sca/contribution/osgi/impl/OSGiBundleProcessor.java b/java/sca/modules/contribution-osgi/src/main/java/org/apache/tuscany/sca/contribution/osgi/impl/OSGiBundleProcessor.java index 0445159d3a..0b0d49de3e 100644 --- a/java/sca/modules/contribution-osgi/src/main/java/org/apache/tuscany/sca/contribution/osgi/impl/OSGiBundleProcessor.java +++ b/java/sca/modules/contribution-osgi/src/main/java/org/apache/tuscany/sca/contribution/osgi/impl/OSGiBundleProcessor.java @@ -72,14 +72,4 @@ public class OSGiBundleProcessor { } return bundleReference; } - - // private void initialize() { - // try { - // if (!initializedOSGi) { - // initializedOSGi = true; - // osgiRuntime = OSGiRuntime.getRuntime(); - // } - // } catch (Exception e) { - // } - // } } diff --git a/java/sca/modules/contribution-osgi/src/main/java/org/apache/tuscany/sca/contribution/osgi/impl/OSGiBundleReferenceModelResolver.java b/java/sca/modules/contribution-osgi/src/main/java/org/apache/tuscany/sca/contribution/osgi/impl/OSGiBundleReferenceModelResolver.java index 05510bbd3d..e63bbc495f 100644 --- a/java/sca/modules/contribution-osgi/src/main/java/org/apache/tuscany/sca/contribution/osgi/impl/OSGiBundleReferenceModelResolver.java +++ b/java/sca/modules/contribution-osgi/src/main/java/org/apache/tuscany/sca/contribution/osgi/impl/OSGiBundleReferenceModelResolver.java @@ -36,7 +36,7 @@ import org.osgi.framework.Bundle; */ public class OSGiBundleReferenceModelResolver implements ModelResolver { private Contribution contribution; - private Map map = new HashMap(); + private Map refs = new HashMap(); private OSGiBundleProcessor bundleProcessor; @@ -47,11 +47,11 @@ public class OSGiBundleReferenceModelResolver implements ModelResolver { 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 class OSGiBundleReferenceModelResolver implements ModelResolver { } public T resolveModel(Class modelClass, T unresolved) { - Object resolved = map.get(unresolved); + Object resolved = refs.get(unresolved); if (resolved != null) { return modelClass.cast(resolved); @@ -95,14 +95,13 @@ public class OSGiBundleReferenceModelResolver implements ModelResolver { 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 @@ public class OSGiBundleReferenceModelResolver implements ModelResolver { } } - - 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; - - } - } diff --git a/java/sca/modules/contribution-osgi/src/main/java/org/apache/tuscany/sca/contribution/osgi/impl/OSGiModelResolverImpl.java b/java/sca/modules/contribution-osgi/src/main/java/org/apache/tuscany/sca/contribution/osgi/impl/OSGiModelResolverImpl.java deleted file mode 100644 index 244fb4048b..0000000000 --- a/java/sca/modules/contribution-osgi/src/main/java/org/apache/tuscany/sca/contribution/osgi/impl/OSGiModelResolverImpl.java +++ /dev/null @@ -1,116 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ - -package org.apache.tuscany.sca.contribution.osgi.impl; - -import java.util.Collection; -import java.util.HashMap; -import java.util.Hashtable; -import java.util.Map; - -import org.apache.tuscany.sca.contribution.osgi.BundleReference; -import org.apache.tuscany.sca.contribution.resolver.ClassReference; -import org.apache.tuscany.sca.contribution.resolver.ModelResolver; -import org.osgi.framework.Bundle; - -/** - * An implementation of an artifact resolver for OSGi bundles. - * - * @version $Rev$ $Date$ - */ -public class OSGiModelResolverImpl implements ModelResolver { - private static final long serialVersionUID = -7826976465762296634L; - - private Map map = new HashMap(); - - private Hashtable bundles; - public OSGiModelResolverImpl(Hashtable bundles) { - this.bundles = bundles; - } - - - public T resolveModel(Class modelClass, T unresolved) { - Object resolved = map.get(unresolved); - if (resolved != null) { - - // Return the resolved object - return modelClass.cast(resolved); - - } else if (unresolved instanceof ClassReference) { - - // Load a class on demand - ClassReference classReference = (ClassReference)unresolved; - Class clazz = null; - for (Bundle bundle : bundles.values()) { - try { - clazz = bundle.loadClass(classReference.getClassName()); - } catch (ClassNotFoundException e) { - continue; - } - break; - } - if (clazz == null) { - - // Return the unresolved object - return unresolved; - } - - // Store a new ClassReference wrapping the loaded class - resolved = new ClassReference(clazz); - map.put(resolved, resolved); - - // Return the resolved ClassReference - return modelClass.cast(resolved); - - } else if (unresolved instanceof BundleReference) { - for (String bundlePath: bundles.keySet()) { - Bundle bundle = bundles.get(bundlePath); - BundleReference bundleRef = (BundleReference)unresolved; - String bundleVersion = (String)bundle.getHeaders().get("Bundle-Version"); - if (bundle.getSymbolicName().equals(bundleRef.getSymbolicName())&& - (bundleVersion == null || bundleRef.getVersion() == null || - bundleVersion.equals(bundleRef.getVersion()))) { - - resolved = new BundleReference(bundle); - map.put(resolved, resolved); - - // Return the resolved BundleReference - return modelClass.cast(resolved); - - } - } - } - - // Return the unresolved object - return unresolved; - } - - public void addModel(Object resolved) { - map.put(resolved, resolved); - } - - public Object removeModel(Object resolved) { - return map.remove(resolved); - } - - public Collection getModels() { - return map.values(); - } - -} -- cgit v1.2.3