X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=runtime%2Forg.argeo.slc.support.osgi%2Fsrc%2Fmain%2Fjava%2Forg%2Fargeo%2Fslc%2Fosgi%2FBundlesManager.java;h=788f2da57b79bcb1c35c1db34ac7d2f5d75d5663;hb=7b8669f41556f46a0f229192d05e2f2592c57d5f;hp=f282f948301b8b9f4b1577fbd48f07a9c561b827;hpb=2bdb0d14599c1f6d75af6e6b4c481009832d5dfb;p=gpl%2Fargeo-slc.git

diff --git a/runtime/org.argeo.slc.support.osgi/src/main/java/org/argeo/slc/osgi/BundlesManager.java b/runtime/org.argeo.slc.support.osgi/src/main/java/org/argeo/slc/osgi/BundlesManager.java
index f282f9483..788f2da57 100644
--- a/runtime/org.argeo.slc.support.osgi/src/main/java/org/argeo/slc/osgi/BundlesManager.java
+++ b/runtime/org.argeo.slc.support.osgi/src/main/java/org/argeo/slc/osgi/BundlesManager.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright (C) 2007-2012 Mathieu Baudier
+ *
+ * Licensed 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.argeo.slc.osgi;
 
 import org.apache.commons.logging.Log;
@@ -22,6 +37,7 @@ import org.springframework.osgi.context.event.OsgiBundleApplicationContextListen
 import org.springframework.osgi.context.event.OsgiBundleContextClosedEvent;
 import org.springframework.osgi.context.event.OsgiBundleContextFailedEvent;
 import org.springframework.osgi.context.event.OsgiBundleContextRefreshedEvent;
+import org.springframework.osgi.util.OsgiBundleUtils;
 import org.springframework.osgi.util.OsgiFilterUtils;
 import org.springframework.util.Assert;
 
@@ -32,8 +48,8 @@ public class BundlesManager implements BundleContextAware, FrameworkListener,
 
 	private BundleContext bundleContext;
 
-	private Long defaultTimeout = 10000l;
-	private Long pollingPeriod = 100l;
+	private Long defaultTimeout = 30 * 1000l;
+	private Long pollingPeriod = 200l;
 
 	// Refresh sync objects
 	private final Object refreshedPackageSem = new Object();
@@ -90,9 +106,9 @@ public class BundlesManager implements BundleContextAware, FrameworkListener,
 			}
 
 			if (log.isDebugEnabled())
-				log.debug("Bundle " + bundle.getSymbolicName()
-						+ " ready to be used at latest version."
-						+ " (upgrade performed in " + (end - begin) + "ms).");
+				log.debug("Bundle '" + bundle.getSymbolicName()
+						+ "' upgraded and ready " + " (upgrade performed in "
+						+ (end - begin) + "ms).");
 
 			if (log.isTraceEnabled()) {
 				ApplicationContext applicationContext = (ApplicationContext) bundleContext
@@ -251,7 +267,7 @@ public class BundlesManager implements BundleContextAware, FrameworkListener,
 		try {
 			Thread.sleep(pollingPeriod);
 		} catch (InterruptedException e) {
-			// silent
+			throw new SlcException("Polling interrupted");
 		}
 	}
 
@@ -264,11 +280,16 @@ public class BundlesManager implements BundleContextAware, FrameworkListener,
 	}
 
 	@SuppressWarnings(value = { "unchecked" })
-	public <T> T getSingleService(Class<T> clss, String filter) {
+	public <T> T getSingleService(Class<T> clss, String filter,
+			Boolean synchronous) {
 		Assert.isTrue(OsgiFilterUtils.isValidFilter(filter), "valid filter");
 		ServiceReference[] sfs;
 		try {
-			sfs = bundleContext.getServiceReferences(clss.getName(), filter);
+			if (synchronous)
+				sfs = getServiceRefSynchronous(clss.getName(), filter);
+			else
+				sfs = bundleContext
+						.getServiceReferences(clss.getName(), filter);
 		} catch (InvalidSyntaxException e) {
 			throw new SlcException("Cannot retrieve service reference for "
 					+ filter, e);
@@ -282,15 +303,20 @@ public class BundlesManager implements BundleContextAware, FrameworkListener,
 		return (T) bundleContext.getService(sfs[0]);
 	}
 
-	public <T> T getSingleServiceStrict(Class<T> clss, String filter) {
-		T service = getSingleService(clss, filter);
+	public <T> T getSingleServiceStrict(Class<T> clss, String filter,
+			Boolean synchronous) {
+		T service = getSingleService(clss, filter, synchronous);
 		if (service == null)
 			throw new SlcException("No execution flow found for " + filter);
 		else
 			return service;
 	}
 
-	/** @return the related bundle or null if not found */
+	/**
+	 * @param osgiBundle
+	 *            cannot be null
+	 * @return the related bundle or null if not found
+	 */
 	public Bundle findRelatedBundle(OsgiBundle osgiBundle) {
 		Bundle bundle = null;
 		if (osgiBundle.getInternalBundleId() != null) {
@@ -299,10 +325,15 @@ public class BundlesManager implements BundleContextAware, FrameworkListener,
 					osgiBundle.getName().equals(bundle.getSymbolicName()),
 					"symbolic name consistent");
 			if (osgiBundle.getVersion() != null)
-				Assert.isTrue(osgiBundle.getVersion().equals(
-						bundle.getHeaders().get(Constants.BUNDLE_VERSION)),
+				Assert.isTrue(
+						osgiBundle.getVersion().equals(
+								bundle.getHeaders().get(
+										Constants.BUNDLE_VERSION)),
 						"version consistent");
-		} else {
+		} else if (osgiBundle.getVersion() == null) {
+			bundle = OsgiBundleUtils.findBundleBySymbolicName(bundleContext,
+					osgiBundle.getName());
+		} else {// scan all bundles
 			bundles: for (Bundle b : bundleContext.getBundles()) {
 				if (b.getSymbolicName() == null) {
 					log.warn("Bundle " + b + " has no symbolic name defined.");
@@ -315,8 +346,8 @@ public class BundlesManager implements BundleContextAware, FrameworkListener,
 						break bundles;
 					}
 
-					if (b.getHeaders().get(Constants.BUNDLE_VERSION).equals(
-							osgiBundle.getVersion())) {
+					if (b.getHeaders().get(Constants.BUNDLE_VERSION)
+							.equals(osgiBundle.getVersion())) {
 						bundle = b;
 						osgiBundle.setInternalBundleId(b.getBundleId());
 						break bundles;
@@ -360,8 +391,11 @@ public class BundlesManager implements BundleContextAware, FrameworkListener,
 		this.defaultTimeout = defaultTimeout;
 	}
 
-	/** Temporary internal access for {@link OsgiExecutionModulesManager} */
-	BundleContext getBundleContext() {
+	/**
+	 * Use with caution since it may interfer with some cached information
+	 * within this object
+	 */
+	public BundleContext getBundleContext() {
 		return bundleContext;
 	}