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=2571efe9d0f70a64393441265069f2644dcf6ce9;hb=098e868d40b2130c6735b1547247c61a5d88da95;hp=2f846ccb7a102663e5b10ba9986eaac2d0e7d130;hpb=3779f02dcb5f24beee8fc08b5f5876af446dab41;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 2f846ccb7..2571efe9d 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,19 @@
+/*
+ * Copyright (C) 2010 Mathieu Baudier <mbaudier@argeo.org>
+ *
+ * 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;
@@ -33,8 +49,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();
@@ -91,9 +107,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
@@ -265,11 +281,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);
@@ -283,15 +304,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) {
@@ -300,8 +326,10 @@ 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 if (osgiBundle.getVersion() == null) {
 			bundle = OsgiBundleUtils.findBundleBySymbolicName(bundleContext,
@@ -319,8 +347,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;
@@ -364,8 +392,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;
 	}