[jboss-cvs] JBossAS SVN: r97968 - in projects/jboss-osgi/projects/runtime/framework/branches/tdiesler/src: main/java/org/jboss/osgi/framework/classloading and 7 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Thu Dec 17 15:24:16 EST 2009
Author: thomas.diesler at jboss.com
Date: 2009-12-17 15:24:15 -0500 (Thu, 17 Dec 2009)
New Revision: 97968
Modified:
projects/jboss-osgi/projects/runtime/framework/branches/tdiesler/src/main/java/org/jboss/osgi/framework/bundle/InstanceMetaDataRetrievalFactory.java
projects/jboss-osgi/projects/runtime/framework/branches/tdiesler/src/main/java/org/jboss/osgi/framework/bundle/MDRUtils.java
projects/jboss-osgi/projects/runtime/framework/branches/tdiesler/src/main/java/org/jboss/osgi/framework/bundle/OSGiBundleManager.java
projects/jboss-osgi/projects/runtime/framework/branches/tdiesler/src/main/java/org/jboss/osgi/framework/bundle/OSGiBundleState.java
projects/jboss-osgi/projects/runtime/framework/branches/tdiesler/src/main/java/org/jboss/osgi/framework/bundle/OSGiScopeInfo.java
projects/jboss-osgi/projects/runtime/framework/branches/tdiesler/src/main/java/org/jboss/osgi/framework/bundle/OSGiServiceRegistrationWrapper.java
projects/jboss-osgi/projects/runtime/framework/branches/tdiesler/src/main/java/org/jboss/osgi/framework/bundle/OSGiSystemState.java
projects/jboss-osgi/projects/runtime/framework/branches/tdiesler/src/main/java/org/jboss/osgi/framework/classloading/OSGiClassLoaderDomain.java
projects/jboss-osgi/projects/runtime/framework/branches/tdiesler/src/main/java/org/jboss/osgi/framework/metadata/ManifestParser.java
projects/jboss-osgi/projects/runtime/framework/branches/tdiesler/src/main/java/org/jboss/osgi/framework/metadata/internal/AbstractOSGiMetaData.java
projects/jboss-osgi/projects/runtime/framework/branches/tdiesler/src/main/java/org/jboss/osgi/framework/metadata/internal/OSGiParameters.java
projects/jboss-osgi/projects/runtime/framework/branches/tdiesler/src/main/java/org/jboss/osgi/framework/util/CaseInsensitiveDictionary.java
projects/jboss-osgi/projects/runtime/framework/branches/tdiesler/src/main/java/org/jboss/osgi/framework/util/NoFilter.java
projects/jboss-osgi/projects/runtime/framework/branches/tdiesler/src/test/java/org/jboss/test/osgi/FrameworkTest.java
projects/jboss-osgi/projects/runtime/framework/branches/tdiesler/src/test/java/org/jboss/test/osgi/bundle/BundleUnitTestCase.java
projects/jboss-osgi/projects/runtime/framework/branches/tdiesler/src/test/java/org/jboss/test/osgi/bundle/SystemBundleUnitTestCase.java
projects/jboss-osgi/projects/runtime/framework/branches/tdiesler/src/test/java/org/jboss/test/osgi/classloader/ClassLoaderDomainUnitTestCase.java
projects/jboss-osgi/projects/runtime/framework/branches/tdiesler/src/test/java/org/jboss/test/osgi/resolver/ResolverSmokeTest.java
Log:
Add initial support for Bundle.update()
Modified: projects/jboss-osgi/projects/runtime/framework/branches/tdiesler/src/main/java/org/jboss/osgi/framework/bundle/InstanceMetaDataRetrievalFactory.java
===================================================================
--- projects/jboss-osgi/projects/runtime/framework/branches/tdiesler/src/main/java/org/jboss/osgi/framework/bundle/InstanceMetaDataRetrievalFactory.java 2009-12-17 20:22:42 UTC (rev 97967)
+++ projects/jboss-osgi/projects/runtime/framework/branches/tdiesler/src/main/java/org/jboss/osgi/framework/bundle/InstanceMetaDataRetrievalFactory.java 2009-12-17 20:24:15 UTC (rev 97968)
@@ -42,6 +42,8 @@
public class InstanceMetaDataRetrievalFactory implements MetaDataRetrievalFactory
{
private Controller controller;
+
+ @SuppressWarnings("rawtypes")
private Set<DictionaryFactory> factories = new CopyOnWriteArraySet<DictionaryFactory>();
public InstanceMetaDataRetrievalFactory(Controller controller)
@@ -51,7 +53,7 @@
this.controller = controller;
}
- @SuppressWarnings({"unchecked"})
+ @SuppressWarnings({"unchecked", "rawtypes"})
public MetaDataRetrieval getMetaDataRetrieval(Scope scope)
{
if (scope == null)
@@ -89,6 +91,7 @@
* @param factory the factory
* @return Set#add
*/
+ @SuppressWarnings("rawtypes")
public boolean addFactory(DictionaryFactory factory)
{
if (factory == null)
@@ -105,6 +108,7 @@
* @param factory the factory
* @return Set#add
*/
+ @SuppressWarnings("rawtypes")
public boolean removeFactory(DictionaryFactory factory)
{
if (factory == null)
Modified: projects/jboss-osgi/projects/runtime/framework/branches/tdiesler/src/main/java/org/jboss/osgi/framework/bundle/MDRUtils.java
===================================================================
--- projects/jboss-osgi/projects/runtime/framework/branches/tdiesler/src/main/java/org/jboss/osgi/framework/bundle/MDRUtils.java 2009-12-17 20:22:42 UTC (rev 97967)
+++ projects/jboss-osgi/projects/runtime/framework/branches/tdiesler/src/main/java/org/jboss/osgi/framework/bundle/MDRUtils.java 2009-12-17 20:24:15 UTC (rev 97968)
@@ -192,7 +192,7 @@
*/
private static ClassLoader getClassLoader(Object instance)
{
- return (instance instanceof Class) ? Class.class.cast(instance).getClassLoader() : instance.getClass().getClassLoader();
+ return (instance instanceof Class<?>) ? Class.class.cast(instance).getClassLoader() : instance.getClass().getClassLoader();
}
/**
Modified: projects/jboss-osgi/projects/runtime/framework/branches/tdiesler/src/main/java/org/jboss/osgi/framework/bundle/OSGiBundleManager.java
===================================================================
--- projects/jboss-osgi/projects/runtime/framework/branches/tdiesler/src/main/java/org/jboss/osgi/framework/bundle/OSGiBundleManager.java 2009-12-17 20:22:42 UTC (rev 97967)
+++ projects/jboss-osgi/projects/runtime/framework/branches/tdiesler/src/main/java/org/jboss/osgi/framework/bundle/OSGiBundleManager.java 2009-12-17 20:24:15 UTC (rev 97968)
@@ -218,13 +218,8 @@
public void start()
{
- // createSystemBundle
- Manifest manifest = new Manifest();
- Attributes attributes = manifest.getMainAttributes();
- attributes.put(new Name(Constants.BUNDLE_NAME), Constants.SYSTEM_BUNDLE_SYMBOLICNAME);
- attributes.put(new Name(Constants.BUNDLE_SYMBOLICNAME), Constants.SYSTEM_BUNDLE_SYMBOLICNAME);
- OSGiMetaData systemMetaData = new AbstractOSGiMetaData(manifest);
- systemBundle = new OSGiSystemState(systemMetaData);
+ // Create the system Bundle
+ systemBundle = new OSGiSystemState();
addBundle(systemBundle);
applyMDRUsage(true);
@@ -789,7 +784,7 @@
{
URL storageLocation = getBundleStorageLocation(in);
VirtualFile root = VFS.getRoot(storageLocation);
-
+
BundleInfo info = BundleInfo.createBundleInfo(root, location);
Deployment dep = DeploymentFactory.createDeployment(info);
dep.addAttachment(OSGiBundleState.class, bundleState);
@@ -804,7 +799,7 @@
throwAfterUpdate = (BundleException)ex;
else
throwAfterUpdate = new BundleException("Cannot install updated bundle from: " + location, ex);
-
+
if (activeBeforeUpdate)
{
startBundle(bundleState);
@@ -847,16 +842,18 @@
if (getBundleById(id) == null)
throw new BundleException(bundleState + " not installed");
- DeploymentUnit unit = bundleState.getDeploymentUnit();
- try
+ for (DeploymentUnit unit : bundleState.getDeploymentUnits())
{
- deployerClient.undeploy(unit.getName());
- bundleState.modified();
+ try
+ {
+ deployerClient.undeploy(unit.getName());
+ bundleState.modified();
+ }
+ catch (DeploymentException e)
+ {
+ throw new BundleException("Unable to uninstall " + bundleState, e);
+ }
}
- catch (DeploymentException e)
- {
- throw new BundleException("Unable to uninstall " + bundleState, e);
- }
}
/**
@@ -871,8 +868,8 @@
if (unit == null)
throw new IllegalArgumentException("Null unit");
- OSGiMetaData osgiMetaData = unit.getAttachment(OSGiMetaData.class);
- if (osgiMetaData == null)
+ OSGiMetaData metaData = unit.getAttachment(OSGiMetaData.class);
+ if (metaData == null)
{
Manifest manifest = unit.getAttachment(Manifest.class);
// [TODO] we need a mechanism to construct an OSGiMetaData from an easier factory
@@ -882,7 +879,8 @@
Attributes attributes = manifest.getMainAttributes();
attributes.put(new Name(Constants.BUNDLE_NAME), unit.getName());
attributes.put(new Name(Constants.BUNDLE_SYMBOLICNAME), unit.getName());
- osgiMetaData = new AbstractOSGiMetaData(manifest);
+ metaData = new AbstractOSGiMetaData(manifest);
+ unit.addAttachment(OSGiMetaData.class, metaData);
}
// The bundle location is not necessarily the bundle root url
@@ -952,7 +950,7 @@
Deployment dep = unit.getAttachment(Deployment.class);
fireEvent = (dep == null || dep.isBundleUpdate() == false);
}
-
+
bundleState.changeState(Bundle.INSTALLED, fireEvent);
// Add the bundle to the resolver
Modified: projects/jboss-osgi/projects/runtime/framework/branches/tdiesler/src/main/java/org/jboss/osgi/framework/bundle/OSGiBundleState.java
===================================================================
--- projects/jboss-osgi/projects/runtime/framework/branches/tdiesler/src/main/java/org/jboss/osgi/framework/bundle/OSGiBundleState.java 2009-12-17 20:22:42 UTC (rev 97967)
+++ projects/jboss-osgi/projects/runtime/framework/branches/tdiesler/src/main/java/org/jboss/osgi/framework/bundle/OSGiBundleState.java 2009-12-17 20:24:15 UTC (rev 97968)
@@ -24,9 +24,11 @@
import java.io.IOException;
import java.io.InputStream;
import java.net.URL;
+import java.util.ArrayList;
+import java.util.Collections;
import java.util.Enumeration;
+import java.util.List;
import java.util.Set;
-import java.util.Stack;
import java.util.concurrent.atomic.AtomicLong;
import org.jboss.dependency.spi.ControllerContext;
@@ -60,8 +62,8 @@
/** The bundle location */
private String location;
- /** The stack of deployment units */
- private Stack<DeploymentUnit> units = new Stack<DeploymentUnit>();
+ /** The list of deployment units */
+ private List<DeploymentUnit> units = new ArrayList<DeploymentUnit>();
/**
* Create a new BundleState.
@@ -113,20 +115,31 @@
*/
public DeploymentUnit getDeploymentUnit()
{
- return units.peek();
+ int index = (units.size() - 1);
+ return units.get(index);
}
/**
- * Add a DeploymentUnit to the stack.
+ * Add a DeploymentUnit to the list.
*
* @see {@link OSGiBundleManager#updateBundle(OSGiBundleState, InputStream)}
*/
void addDeploymentUnit(DeploymentUnit unit)
{
unit.getMutableMetaData().addMetaData(unit, DeploymentUnit.class);
- units.push(unit);
+ units.add(unit);
}
+ /**
+ * Get the list of DeploymentUnits.
+ *
+ * @see {@link OSGiBundleManager#uninstallBundle(OSGiBundleState)}
+ */
+ List<DeploymentUnit> getDeploymentUnits()
+ {
+ return Collections.unmodifiableList(units);
+ }
+
public String getLocation()
{
return location;
Modified: projects/jboss-osgi/projects/runtime/framework/branches/tdiesler/src/main/java/org/jboss/osgi/framework/bundle/OSGiScopeInfo.java
===================================================================
--- projects/jboss-osgi/projects/runtime/framework/branches/tdiesler/src/main/java/org/jboss/osgi/framework/bundle/OSGiScopeInfo.java 2009-12-17 20:22:42 UTC (rev 97967)
+++ projects/jboss-osgi/projects/runtime/framework/branches/tdiesler/src/main/java/org/jboss/osgi/framework/bundle/OSGiScopeInfo.java 2009-12-17 20:24:15 UTC (rev 97968)
@@ -74,7 +74,7 @@
if (scope == null)
return key;
Object qualifier = scope.getQualifier();
- if (qualifier instanceof Class)
+ if (qualifier instanceof Class<?>)
return key;
Object service = serviceState.getTarget();
Modified: projects/jboss-osgi/projects/runtime/framework/branches/tdiesler/src/main/java/org/jboss/osgi/framework/bundle/OSGiServiceRegistrationWrapper.java
===================================================================
--- projects/jboss-osgi/projects/runtime/framework/branches/tdiesler/src/main/java/org/jboss/osgi/framework/bundle/OSGiServiceRegistrationWrapper.java 2009-12-17 20:22:42 UTC (rev 97967)
+++ projects/jboss-osgi/projects/runtime/framework/branches/tdiesler/src/main/java/org/jboss/osgi/framework/bundle/OSGiServiceRegistrationWrapper.java 2009-12-17 20:24:15 UTC (rev 97968)
@@ -55,7 +55,7 @@
return serviceState.getReference();
}
- @SuppressWarnings("unchecked")
+ @SuppressWarnings("rawtypes")
public void setProperties(Dictionary properties)
{
serviceState.setProperties(properties);
Modified: projects/jboss-osgi/projects/runtime/framework/branches/tdiesler/src/main/java/org/jboss/osgi/framework/bundle/OSGiSystemState.java
===================================================================
--- projects/jboss-osgi/projects/runtime/framework/branches/tdiesler/src/main/java/org/jboss/osgi/framework/bundle/OSGiSystemState.java 2009-12-17 20:22:42 UTC (rev 97967)
+++ projects/jboss-osgi/projects/runtime/framework/branches/tdiesler/src/main/java/org/jboss/osgi/framework/bundle/OSGiSystemState.java 2009-12-17 20:24:15 UTC (rev 97968)
@@ -26,9 +26,13 @@
import java.net.URL;
import java.util.Enumeration;
import java.util.Set;
+import java.util.jar.Attributes;
+import java.util.jar.Manifest;
+import java.util.jar.Attributes.Name;
import org.jboss.dependency.spi.ControllerContext;
import org.jboss.osgi.framework.metadata.OSGiMetaData;
+import org.jboss.osgi.framework.metadata.internal.AbstractOSGiMetaData;
import org.jboss.osgi.spi.NotImplementedException;
import org.jboss.util.collection.ConcurrentSet;
import org.osgi.framework.BundleException;
@@ -51,14 +55,14 @@
/**
* Create a new OSGiSystemBundle.
- * @param osgiMetaData the metadata for the system bundle
*/
- public OSGiSystemState(OSGiMetaData osgiMetaData)
+ public OSGiSystemState()
{
- if (osgiMetaData == null)
- throw new IllegalArgumentException("Null osgi metadata");
-
- this.osgiMetaData = osgiMetaData;
+ Manifest manifest = new Manifest();
+ Attributes attributes = manifest.getMainAttributes();
+ attributes.put(new Name(Constants.BUNDLE_NAME), Constants.SYSTEM_BUNDLE_SYMBOLICNAME);
+ attributes.put(new Name(Constants.BUNDLE_SYMBOLICNAME), Constants.SYSTEM_BUNDLE_SYMBOLICNAME);
+ osgiMetaData = new AbstractOSGiMetaData(manifest);
}
@Override
Modified: projects/jboss-osgi/projects/runtime/framework/branches/tdiesler/src/main/java/org/jboss/osgi/framework/classloading/OSGiClassLoaderDomain.java
===================================================================
--- projects/jboss-osgi/projects/runtime/framework/branches/tdiesler/src/main/java/org/jboss/osgi/framework/classloading/OSGiClassLoaderDomain.java 2009-12-17 20:22:42 UTC (rev 97967)
+++ projects/jboss-osgi/projects/runtime/framework/branches/tdiesler/src/main/java/org/jboss/osgi/framework/classloading/OSGiClassLoaderDomain.java 2009-12-17 20:24:15 UTC (rev 97968)
@@ -33,7 +33,7 @@
import org.jboss.classloader.spi.ClassLoaderSystem;
import org.jboss.classloader.spi.ParentPolicy;
import org.jboss.classloader.spi.base.BaseClassLoader;
-import org.jboss.classloader.spi.filter.ClassFilter;
+import org.jboss.classloader.spi.filter.ClassFilterUtils;
import org.jboss.classloader.spi.filter.PackageClassFilter;
import org.jboss.classloading.spi.vfs.policy.VFSClassLoaderPolicy;
import org.jboss.osgi.framework.bundle.OSGiBundleManager;
@@ -102,7 +102,7 @@
classFilter.setIncludeJava(true);
// Setup the domain's parent policy
- setParentPolicy(new ParentPolicy(classFilter, ClassFilter.NOTHING));
+ setParentPolicy(new ParentPolicy(classFilter, ClassFilterUtils.NOTHING));
// Initialize the configured policy roots
VirtualFile[] roots = new VirtualFile[classPath.size()];
Modified: projects/jboss-osgi/projects/runtime/framework/branches/tdiesler/src/main/java/org/jboss/osgi/framework/metadata/ManifestParser.java
===================================================================
--- projects/jboss-osgi/projects/runtime/framework/branches/tdiesler/src/main/java/org/jboss/osgi/framework/metadata/ManifestParser.java 2009-12-17 20:22:42 UTC (rev 97967)
+++ projects/jboss-osgi/projects/runtime/framework/branches/tdiesler/src/main/java/org/jboss/osgi/framework/metadata/ManifestParser.java 2009-12-17 20:24:15 UTC (rev 97968)
@@ -100,7 +100,7 @@
* @param list the list to create
* @param packages whether to create packages
*/
- @SuppressWarnings("unchecked")
+ @SuppressWarnings({ "rawtypes", "unchecked" })
public static void parse(String header, List list, boolean packages)
{
if (header == null)
Modified: projects/jboss-osgi/projects/runtime/framework/branches/tdiesler/src/main/java/org/jboss/osgi/framework/metadata/internal/AbstractOSGiMetaData.java
===================================================================
--- projects/jboss-osgi/projects/runtime/framework/branches/tdiesler/src/main/java/org/jboss/osgi/framework/metadata/internal/AbstractOSGiMetaData.java 2009-12-17 20:22:42 UTC (rev 97967)
+++ projects/jboss-osgi/projects/runtime/framework/branches/tdiesler/src/main/java/org/jboss/osgi/framework/metadata/internal/AbstractOSGiMetaData.java 2009-12-17 20:24:15 UTC (rev 97968)
@@ -103,7 +103,7 @@
super(manifest);
}
- @SuppressWarnings("unchecked")
+ @SuppressWarnings({ "unchecked", "rawtypes" })
public Dictionary<String, String> getHeaders(String locale)
{
// TODO localisation
Modified: projects/jboss-osgi/projects/runtime/framework/branches/tdiesler/src/main/java/org/jboss/osgi/framework/metadata/internal/OSGiParameters.java
===================================================================
--- projects/jboss-osgi/projects/runtime/framework/branches/tdiesler/src/main/java/org/jboss/osgi/framework/metadata/internal/OSGiParameters.java 2009-12-17 20:22:42 UTC (rev 97967)
+++ projects/jboss-osgi/projects/runtime/framework/branches/tdiesler/src/main/java/org/jboss/osgi/framework/metadata/internal/OSGiParameters.java 2009-12-17 20:24:15 UTC (rev 97968)
@@ -92,7 +92,7 @@
return get(key, creator, null);
}
- @SuppressWarnings("unchecked")
+ @SuppressWarnings({ "unchecked", "rawtypes" })
protected <T> T get(String key, ValueCreator<T> creator, T defaultValue)
{
T value = (T)cachedAttributes.get(key);
Modified: projects/jboss-osgi/projects/runtime/framework/branches/tdiesler/src/main/java/org/jboss/osgi/framework/util/CaseInsensitiveDictionary.java
===================================================================
--- projects/jboss-osgi/projects/runtime/framework/branches/tdiesler/src/main/java/org/jboss/osgi/framework/util/CaseInsensitiveDictionary.java 2009-12-17 20:22:42 UTC (rev 97967)
+++ projects/jboss-osgi/projects/runtime/framework/branches/tdiesler/src/main/java/org/jboss/osgi/framework/util/CaseInsensitiveDictionary.java 2009-12-17 20:24:15 UTC (rev 97968)
@@ -73,7 +73,7 @@
return delegate.elements();
}
- @SuppressWarnings("unchecked")
+ @SuppressWarnings({ "unchecked", "rawtypes" })
public synchronized boolean equals(Object obj)
{
if (obj == this)
Modified: projects/jboss-osgi/projects/runtime/framework/branches/tdiesler/src/main/java/org/jboss/osgi/framework/util/NoFilter.java
===================================================================
--- projects/jboss-osgi/projects/runtime/framework/branches/tdiesler/src/main/java/org/jboss/osgi/framework/util/NoFilter.java 2009-12-17 20:22:42 UTC (rev 97967)
+++ projects/jboss-osgi/projects/runtime/framework/branches/tdiesler/src/main/java/org/jboss/osgi/framework/util/NoFilter.java 2009-12-17 20:24:15 UTC (rev 97968)
@@ -44,7 +44,7 @@
{
}
- @SuppressWarnings("unchecked")
+ @SuppressWarnings("rawtypes")
public boolean match(Dictionary dictionary)
{
return true;
@@ -55,7 +55,7 @@
return true;
}
- @SuppressWarnings("unchecked")
+ @SuppressWarnings("rawtypes")
public boolean matchCase(Dictionary dictionary)
{
return true;
Modified: projects/jboss-osgi/projects/runtime/framework/branches/tdiesler/src/test/java/org/jboss/test/osgi/FrameworkTest.java
===================================================================
--- projects/jboss-osgi/projects/runtime/framework/branches/tdiesler/src/test/java/org/jboss/test/osgi/FrameworkTest.java 2009-12-17 20:22:42 UTC (rev 97967)
+++ projects/jboss-osgi/projects/runtime/framework/branches/tdiesler/src/test/java/org/jboss/test/osgi/FrameworkTest.java 2009-12-17 20:24:15 UTC (rev 97968)
@@ -169,17 +169,17 @@
protected Bundle installBundle(String location) throws BundleException
{
- return getBundleManager().installBundle(location, null);
+ return getBundleManager().installBundle(location, null).getBundleInternal();
}
protected Bundle installBundle(String location, InputStream instream) throws BundleException
{
- return getBundleManager().installBundle(location, instream);
+ return getBundleManager().installBundle(location, instream).getBundleInternal();
}
protected Bundle installBundle(VirtualFile bundleFile) throws BundleException
{
- return getBundleManager().installBundle(bundleFile);
+ return getBundleManager().installBundle(bundleFile).getBundleInternal();
}
/**
Modified: projects/jboss-osgi/projects/runtime/framework/branches/tdiesler/src/test/java/org/jboss/test/osgi/bundle/BundleUnitTestCase.java
===================================================================
--- projects/jboss-osgi/projects/runtime/framework/branches/tdiesler/src/test/java/org/jboss/test/osgi/bundle/BundleUnitTestCase.java 2009-12-17 20:22:42 UTC (rev 97967)
+++ projects/jboss-osgi/projects/runtime/framework/branches/tdiesler/src/test/java/org/jboss/test/osgi/bundle/BundleUnitTestCase.java 2009-12-17 20:24:15 UTC (rev 97968)
@@ -183,7 +183,7 @@
}
finally
{
- uninstall(bundle);
+ bundle.uninstall();
}
}
@@ -194,10 +194,10 @@
public void testSingleton() throws Exception
{
- Bundle bundle1 = installBundle(assembleBundle("bundle1", "/bundles/singleton/singleton1"));
+ Bundle bundle1 = installBundle(assembleBundle("bundle10", "/bundles/singleton/singleton1"));
try
{
- Bundle bundle2 = installBundle(assembleBundle("bundle2", "/bundles/singleton/singleton2"));
+ Bundle bundle2 = installBundle(assembleBundle("bundle20", "/bundles/singleton/singleton2"));
uninstall(bundle2);
fail("Should not be here!");
}
Modified: projects/jboss-osgi/projects/runtime/framework/branches/tdiesler/src/test/java/org/jboss/test/osgi/bundle/SystemBundleUnitTestCase.java
===================================================================
--- projects/jboss-osgi/projects/runtime/framework/branches/tdiesler/src/test/java/org/jboss/test/osgi/bundle/SystemBundleUnitTestCase.java 2009-12-17 20:22:42 UTC (rev 97967)
+++ projects/jboss-osgi/projects/runtime/framework/branches/tdiesler/src/test/java/org/jboss/test/osgi/bundle/SystemBundleUnitTestCase.java 2009-12-17 20:24:15 UTC (rev 97968)
@@ -88,7 +88,7 @@
}
}
- @SuppressWarnings("unchecked")
+ @SuppressWarnings({ "unchecked", "rawtypes" })
public void testGetHeaders() throws Exception
{
Dictionary expected = new Hashtable();
Modified: projects/jboss-osgi/projects/runtime/framework/branches/tdiesler/src/test/java/org/jboss/test/osgi/classloader/ClassLoaderDomainUnitTestCase.java
===================================================================
--- projects/jboss-osgi/projects/runtime/framework/branches/tdiesler/src/test/java/org/jboss/test/osgi/classloader/ClassLoaderDomainUnitTestCase.java 2009-12-17 20:22:42 UTC (rev 97967)
+++ projects/jboss-osgi/projects/runtime/framework/branches/tdiesler/src/test/java/org/jboss/test/osgi/classloader/ClassLoaderDomainUnitTestCase.java 2009-12-17 20:24:15 UTC (rev 97968)
@@ -33,7 +33,7 @@
import org.jboss.classloader.spi.ClassLoaderPolicy;
import org.jboss.classloader.spi.ClassLoaderSystem;
import org.jboss.classloader.spi.ParentPolicy;
-import org.jboss.classloader.spi.filter.ClassFilter;
+import org.jboss.classloader.spi.filter.ClassFilterUtils;
import org.jboss.classloader.spi.filter.PackageClassFilter;
import org.jboss.classloading.spi.vfs.policy.VFSClassLoaderPolicy;
import org.jboss.logging.Logger;
@@ -74,7 +74,7 @@
PackageClassFilter classFilter = PackageClassFilter.createPackageClassFilterFromString(filteredPackages);
classFilter.setIncludeJava(true);
- domain.setParentPolicy(new ParentPolicy(classFilter, ClassFilter.NOTHING));
+ domain.setParentPolicy(new ParentPolicy(classFilter, ClassFilterUtils.NOTHING));
URL coreURL = new OSGiTestHelper().getTestArchiveURL("bundles/org.osgi.core.jar");
VirtualFile coreVF = VFS.createNewRoot(coreURL);
Modified: projects/jboss-osgi/projects/runtime/framework/branches/tdiesler/src/test/java/org/jboss/test/osgi/resolver/ResolverSmokeTest.java
===================================================================
--- projects/jboss-osgi/projects/runtime/framework/branches/tdiesler/src/test/java/org/jboss/test/osgi/resolver/ResolverSmokeTest.java 2009-12-17 20:22:42 UTC (rev 97967)
+++ projects/jboss-osgi/projects/runtime/framework/branches/tdiesler/src/test/java/org/jboss/test/osgi/resolver/ResolverSmokeTest.java 2009-12-17 20:24:15 UTC (rev 97968)
@@ -97,9 +97,10 @@
}
PackageAdminPlugin packageAdmin = bundleManager.getPlugin(PackageAdminPlugin.class);
- boolean allResoved = packageAdmin.resolveBundles(null);
+ packageAdmin.resolveBundles(null);
+
+ System.out.println("[JBOSGI-151] Cannot resolve circular dependencies");
//assertTrue("All bundles resolved", allResoved);
- System.out.println("[JBOSGI-151] Cannot resolve circular dependencies");
}
finally
{
More information about the jboss-cvs-commits
mailing list