JBoss-OSGI SVN: r102977 - in projects/jboss-osgi/projects/spi/trunk/src/main/java/org/jboss/osgi/testing: internal and 1 other directory.
by jboss-osgi-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2010-03-25 17:01:42 -0400 (Thu, 25 Mar 2010)
New Revision: 102977
Modified:
projects/jboss-osgi/projects/spi/trunk/src/main/java/org/jboss/osgi/testing/OSGiFrameworkTest.java
projects/jboss-osgi/projects/spi/trunk/src/main/java/org/jboss/osgi/testing/OSGiTestHelper.java
projects/jboss-osgi/projects/spi/trunk/src/main/java/org/jboss/osgi/testing/internal/OSGiRuntimeImpl.java
Log:
Add better support for installBundle
Modified: projects/jboss-osgi/projects/spi/trunk/src/main/java/org/jboss/osgi/testing/OSGiFrameworkTest.java
===================================================================
--- projects/jboss-osgi/projects/spi/trunk/src/main/java/org/jboss/osgi/testing/OSGiFrameworkTest.java 2010-03-25 20:07:30 UTC (rev 102976)
+++ projects/jboss-osgi/projects/spi/trunk/src/main/java/org/jboss/osgi/testing/OSGiFrameworkTest.java 2010-03-25 21:01:42 UTC (rev 102977)
@@ -29,7 +29,8 @@
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
-import java.io.File;
+import java.io.IOException;
+import java.net.URL;
import java.util.Arrays;
import java.util.HashSet;
import java.util.List;
@@ -43,12 +44,12 @@
import org.jboss.osgi.vfs.AbstractVFS;
import org.jboss.osgi.vfs.VirtualFile;
import org.jboss.shrinkwrap.api.Archive;
-import org.jboss.shrinkwrap.api.exporter.ZipExporter;
import org.junit.AfterClass;
import org.junit.BeforeClass;
import org.osgi.framework.Bundle;
import org.osgi.framework.BundleContext;
import org.osgi.framework.BundleEvent;
+import org.osgi.framework.BundleException;
import org.osgi.framework.FrameworkEvent;
import org.osgi.framework.FrameworkListener;
import org.osgi.framework.ServiceEvent;
@@ -104,21 +105,22 @@
return (PackageAdmin)systemContext.getService(sref);
}
- protected Bundle installBundle(Archive<?> archive) throws Exception
+ protected Bundle installBundle(String location) throws BundleException, IOException
{
- ZipExporter exporter = archive.as(ZipExporter.class);
- File target = File.createTempFile("archive_", ".jar");
- exporter.exportZip(target, true);
- target.deleteOnExit();
-
- VirtualFile virtualFile = AbstractVFS.getRoot(target.toURI().toURL());
+ URL bundleURL = getTestHelper().getTestArchiveURL(location);
+ return installBundle(AbstractVFS.getRoot(bundleURL));
+ }
+
+ protected Bundle installBundle(Archive<?> archive) throws BundleException, IOException
+ {
+ VirtualFile virtualFile = OSGiTestHelper.toVirtualFile(archive);
return installBundle(virtualFile);
}
- protected Bundle installBundle(VirtualFile archive) throws Exception
+ protected Bundle installBundle(VirtualFile virtualFile) throws BundleException, IOException
{
- String location = archive.getPathName();
- return systemContext.installBundle(location, archive.openStream());
+ String location = virtualFile.getPathName();
+ return systemContext.installBundle(location, virtualFile.openStream());
}
protected void assertLoadClass(Bundle bundle, String className, Bundle exporter)
Modified: projects/jboss-osgi/projects/spi/trunk/src/main/java/org/jboss/osgi/testing/OSGiTestHelper.java
===================================================================
--- projects/jboss-osgi/projects/spi/trunk/src/main/java/org/jboss/osgi/testing/OSGiTestHelper.java 2010-03-25 20:07:30 UTC (rev 102976)
+++ projects/jboss-osgi/projects/spi/trunk/src/main/java/org/jboss/osgi/testing/OSGiTestHelper.java 2010-03-25 21:01:42 UTC (rev 102977)
@@ -37,6 +37,7 @@
import org.jboss.osgi.spi.util.ConstantsHelper;
import org.jboss.osgi.vfs.AbstractVFS;
import org.jboss.osgi.vfs.VirtualFile;
+import org.jboss.shrinkwrap.api.Archive;
import org.jboss.shrinkwrap.api.Archives;
import org.jboss.shrinkwrap.api.Asset;
import org.jboss.shrinkwrap.api.exporter.ZipExporter;
@@ -98,10 +99,20 @@
{
try
{
- return getTestArchiveFile(archive).toURI().toURL();
+ URL archiveURL = new URL(archive);
+ return archiveURL;
}
catch (MalformedURLException ex)
{
+ // ignore
+ }
+ try
+ {
+ File file = getTestArchiveFile(archive);
+ return file.toURI().toURL();
+ }
+ catch (MalformedURLException ex)
+ {
throw new IllegalStateException(ex);
}
}
@@ -109,7 +120,8 @@
/** Try to discover the absolute path for the deployment archive */
public String getTestArchivePath(String archive)
{
- return getTestArchiveFile(archive).getAbsolutePath();
+ File archiveFile = getTestArchiveFile(archive);
+ return archiveFile.getAbsolutePath();
}
/** Try to discover the File for the deployment archive */
@@ -203,11 +215,17 @@
}
// Convert archive to file URL
+ VirtualFile virtualFile = toVirtualFile(archive);
+ return virtualFile;
+ }
+
+ @SuppressWarnings("rawtypes")
+ public static VirtualFile toVirtualFile(Archive archive) throws IOException, MalformedURLException
+ {
ZipExporter exporter = archive.as(ZipExporter.class);
File target = File.createTempFile("archive_", ".jar");
exporter.exportZip(target, true);
target.deleteOnExit();
-
return AbstractVFS.getRoot(target.toURI().toURL());
}
Modified: projects/jboss-osgi/projects/spi/trunk/src/main/java/org/jboss/osgi/testing/internal/OSGiRuntimeImpl.java
===================================================================
--- projects/jboss-osgi/projects/spi/trunk/src/main/java/org/jboss/osgi/testing/internal/OSGiRuntimeImpl.java 2010-03-25 20:07:30 UTC (rev 102976)
+++ projects/jboss-osgi/projects/spi/trunk/src/main/java/org/jboss/osgi/testing/internal/OSGiRuntimeImpl.java 2010-03-25 21:01:42 UTC (rev 102977)
@@ -21,9 +21,7 @@
*/
package org.jboss.osgi.testing.internal;
-import java.io.File;
import java.io.IOException;
-import java.net.MalformedURLException;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collections;
@@ -49,10 +47,9 @@
import org.jboss.osgi.testing.OSGiRuntime;
import org.jboss.osgi.testing.OSGiRuntimeHelper;
import org.jboss.osgi.testing.OSGiServiceReference;
-import org.jboss.osgi.vfs.AbstractVFS;
+import org.jboss.osgi.testing.OSGiTestHelper;
import org.jboss.osgi.vfs.VirtualFile;
import org.jboss.shrinkwrap.api.Archive;
-import org.jboss.shrinkwrap.api.exporter.ZipExporter;
import org.osgi.framework.BundleException;
import org.osgi.framework.Version;
import org.osgi.jmx.framework.BundleStateMBean;
@@ -151,7 +148,7 @@
public OSGiBundle installBundle(Archive<?> archive) throws BundleException, IOException
{
- VirtualFile virtualFile = toVirtualFile(archive);
+ VirtualFile virtualFile = OSGiTestHelper.toVirtualFile(archive);
BundleInfo info = BundleInfo.createBundleInfo(virtualFile);
return installBundle(info);
}
@@ -343,16 +340,6 @@
tuple.uninstall();
}
- private VirtualFile toVirtualFile(Archive<?> archive) throws IOException, MalformedURLException
- {
- ZipExporter exporter = archive.as(ZipExporter.class);
- File target = File.createTempFile("archive_", ".jar");
- exporter.exportZip(target, true);
- target.deleteOnExit();
-
- return AbstractVFS.getRoot(target.toURI().toURL());
- }
-
class BundleTuple
{
BundleInfo info;
14 years, 3 months
- 1
- 0
JBoss-OSGI SVN: r102909 - in projects/jboss-osgi/projects/runtime/framework/trunk: vfs21/.settings and 2 other directories.
by jboss-osgi-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2010-03-24 12:46:18 -0400 (Wed, 24 Mar 2010)
New Revision: 102909
Modified:
projects/jboss-osgi/projects/runtime/framework/trunk/bundle/src/test/java/org/jboss/test/osgi/service/ServiceMixTestCase.java
projects/jboss-osgi/projects/runtime/framework/trunk/vfs21/.settings/org.eclipse.jdt.core.prefs
projects/jboss-osgi/projects/runtime/framework/trunk/vfs21/src/main/java/org/jboss/osgi/framework/classloading/OSGiBundleClassLoader.java
projects/jboss-osgi/projects/runtime/framework/trunk/vfs21/src/main/java/org/jboss/osgi/framework/classloading/OSGiClassLoaderPolicy.java
projects/jboss-osgi/projects/runtime/framework/trunk/vfs30/src/main/java/org/jboss/osgi/framework/classloading/OSGiBundleClassLoader.java
projects/jboss-osgi/projects/runtime/framework/trunk/vfs30/src/main/java/org/jboss/osgi/framework/classloading/OSGiClassLoaderDomain.java
projects/jboss-osgi/projects/runtime/framework/trunk/vfs30/src/main/java/org/jboss/osgi/framework/classloading/OSGiClassLoaderPolicy.java
Log:
[JBOSGI-246] TCK - Framework util
Modified: projects/jboss-osgi/projects/runtime/framework/trunk/bundle/src/test/java/org/jboss/test/osgi/service/ServiceMixTestCase.java
===================================================================
--- projects/jboss-osgi/projects/runtime/framework/trunk/bundle/src/test/java/org/jboss/test/osgi/service/ServiceMixTestCase.java 2010-03-24 16:32:05 UTC (rev 102908)
+++ projects/jboss-osgi/projects/runtime/framework/trunk/bundle/src/test/java/org/jboss/test/osgi/service/ServiceMixTestCase.java 2010-03-24 16:46:18 UTC (rev 102909)
@@ -60,9 +60,10 @@
* @author <a href="mailto:ales.justin@jboss.org">Ales Justin</a>
* @author thomas.diesler(a)jboss.com
*/
+@Ignore
public class ServiceMixTestCase extends AbstractServiceMixTest
{
- @Ignore
+ @Test
public void testGetServiceReferenceFromMC() throws Throwable
{
Deployment bean = deployBeans("beanA", A.class);
@@ -353,7 +354,7 @@
}
}
- @Ignore
+ @Test
@SuppressWarnings("rawtypes")
public void testServiceFactoryMix() throws Throwable
{
@@ -431,7 +432,7 @@
}
}
- @Ignore
+ @Test
public void testFiltering() throws Throwable
{
Deployment bean = deployBeans("beanA", A.class);
@@ -495,7 +496,7 @@
}
}
- @Ignore
+ @Test
public void testBeansMix() throws Throwable
{
VirtualFile assembly = assembleArchive("beans1", "/bundles/service/service-beans1", A.class);
Modified: projects/jboss-osgi/projects/runtime/framework/trunk/vfs21/.settings/org.eclipse.jdt.core.prefs
===================================================================
--- projects/jboss-osgi/projects/runtime/framework/trunk/vfs21/.settings/org.eclipse.jdt.core.prefs 2010-03-24 16:32:05 UTC (rev 102908)
+++ projects/jboss-osgi/projects/runtime/framework/trunk/vfs21/.settings/org.eclipse.jdt.core.prefs 2010-03-24 16:46:18 UTC (rev 102909)
@@ -1,4 +1,4 @@
-#Thu Mar 04 08:40:26 CET 2010
+#Wed Mar 24 17:43:19 CET 2010
eclipse.preferences.version=1
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
Modified: projects/jboss-osgi/projects/runtime/framework/trunk/vfs21/src/main/java/org/jboss/osgi/framework/classloading/OSGiBundleClassLoader.java
===================================================================
--- projects/jboss-osgi/projects/runtime/framework/trunk/vfs21/src/main/java/org/jboss/osgi/framework/classloading/OSGiBundleClassLoader.java 2010-03-24 16:32:05 UTC (rev 102908)
+++ projects/jboss-osgi/projects/runtime/framework/trunk/vfs21/src/main/java/org/jboss/osgi/framework/classloading/OSGiBundleClassLoader.java 2010-03-24 16:46:18 UTC (rev 102909)
@@ -25,6 +25,8 @@
import org.jboss.classloader.spi.ClassLoaderPolicy;
import org.jboss.classloader.spi.base.BaseClassLoader;
+import org.osgi.framework.Bundle;
+import org.osgi.framework.BundleReference;
/**
* An OSGi bundle class loader.
@@ -32,16 +34,23 @@
* @author thomas.diesler(a)jboss.com
* @since 19-Dec-2009
*/
-public class OSGiBundleClassLoader extends BaseClassLoader
+public class OSGiBundleClassLoader extends BaseClassLoader implements BundleReference
{
- @SuppressWarnings("unused")
private OSGiClassLoaderPolicy osgiPolicy;
public OSGiBundleClassLoader(ClassLoaderPolicy policy)
{
super(policy);
- if (policy instanceof OSGiClassLoaderPolicy)
- osgiPolicy = (OSGiClassLoaderPolicy)policy;
+ if (policy instanceof OSGiClassLoaderPolicy == false)
+ throw new IllegalArgumentException("Invalid policy: " + policy);
+
+ osgiPolicy = (OSGiClassLoaderPolicy)policy;
}
+
+ @Override
+ public Bundle getBundle()
+ {
+ return osgiPolicy.getBundle();
+ }
}
Modified: projects/jboss-osgi/projects/runtime/framework/trunk/vfs21/src/main/java/org/jboss/osgi/framework/classloading/OSGiClassLoaderPolicy.java
===================================================================
--- projects/jboss-osgi/projects/runtime/framework/trunk/vfs21/src/main/java/org/jboss/osgi/framework/classloading/OSGiClassLoaderPolicy.java 2010-03-24 16:32:05 UTC (rev 102908)
+++ projects/jboss-osgi/projects/runtime/framework/trunk/vfs21/src/main/java/org/jboss/osgi/framework/classloading/OSGiClassLoaderPolicy.java 2010-03-24 16:46:18 UTC (rev 102909)
@@ -48,6 +48,8 @@
import org.jboss.osgi.vfs.AbstractVFS;
import org.jboss.virtual.VFSUtils;
import org.jboss.virtual.VirtualFile;
+import org.osgi.framework.Bundle;
+import org.osgi.framework.BundleReference;
/**
* The ClassLoaderPolicy for OSGi bundles.
@@ -55,7 +57,7 @@
* @author thomas.diesler(a)jboss.com
* @since 11-Sep-2009
*/
-public class OSGiClassLoaderPolicy extends VFSClassLoaderPolicy
+public class OSGiClassLoaderPolicy extends VFSClassLoaderPolicy implements BundleReference
{
/** The associated bundle state */
private AbstractBundleState bundleState;
@@ -95,6 +97,11 @@
}
}
+ @Override
+ public Bundle getBundle()
+ {
+ return bundleState.getBundle();
+ }
@Override
public String getName()
Modified: projects/jboss-osgi/projects/runtime/framework/trunk/vfs30/src/main/java/org/jboss/osgi/framework/classloading/OSGiBundleClassLoader.java
===================================================================
--- projects/jboss-osgi/projects/runtime/framework/trunk/vfs30/src/main/java/org/jboss/osgi/framework/classloading/OSGiBundleClassLoader.java 2010-03-24 16:32:05 UTC (rev 102908)
+++ projects/jboss-osgi/projects/runtime/framework/trunk/vfs30/src/main/java/org/jboss/osgi/framework/classloading/OSGiBundleClassLoader.java 2010-03-24 16:46:18 UTC (rev 102909)
@@ -25,6 +25,8 @@
import org.jboss.classloader.spi.ClassLoaderPolicy;
import org.jboss.classloader.spi.base.BaseClassLoader;
+import org.osgi.framework.Bundle;
+import org.osgi.framework.BundleReference;
/**
* An OSGi bundle class loader.
@@ -32,16 +34,23 @@
* @author thomas.diesler(a)jboss.com
* @since 19-Dec-2009
*/
-public class OSGiBundleClassLoader extends BaseClassLoader
+public class OSGiBundleClassLoader extends BaseClassLoader implements BundleReference
{
- @SuppressWarnings("unused")
private OSGiClassLoaderPolicy osgiPolicy;
public OSGiBundleClassLoader(ClassLoaderPolicy policy)
{
super(policy);
- if (policy instanceof OSGiClassLoaderPolicy)
- osgiPolicy = (OSGiClassLoaderPolicy)policy;
+ if (policy instanceof OSGiClassLoaderPolicy == false)
+ throw new IllegalArgumentException("Invalid policy: " + policy);
+
+ osgiPolicy = (OSGiClassLoaderPolicy)policy;
}
+
+ @Override
+ public Bundle getBundle()
+ {
+ return osgiPolicy.getBundle();
+ }
}
Modified: projects/jboss-osgi/projects/runtime/framework/trunk/vfs30/src/main/java/org/jboss/osgi/framework/classloading/OSGiClassLoaderDomain.java
===================================================================
--- projects/jboss-osgi/projects/runtime/framework/trunk/vfs30/src/main/java/org/jboss/osgi/framework/classloading/OSGiClassLoaderDomain.java 2010-03-24 16:32:05 UTC (rev 102908)
+++ projects/jboss-osgi/projects/runtime/framework/trunk/vfs30/src/main/java/org/jboss/osgi/framework/classloading/OSGiClassLoaderDomain.java 2010-03-24 16:46:18 UTC (rev 102909)
@@ -39,8 +39,8 @@
import org.jboss.classloader.spi.filter.ClassFilterUtils;
import org.jboss.classloader.spi.filter.PackageClassFilter;
import org.jboss.classloader.spi.filter.RecursivePackageClassFilter;
-import org.jboss.classloading.spi.vfs.policy.VFSClassLoaderPolicy;
import org.jboss.osgi.framework.bundle.OSGiBundleManager;
+import org.jboss.osgi.framework.bundle.OSGiSystemState;
import org.jboss.osgi.framework.plugins.SystemPackagesPlugin;
import org.jboss.vfs.VFS;
import org.jboss.vfs.VirtualFile;
@@ -124,7 +124,8 @@
}
// Create and register the ClassLoaderPolicy
- ClassLoaderPolicy systemPolicy = new VFSClassLoaderPolicy("OSGiSystemPolicy", roots);
+ OSGiSystemState systemBundle = bundleManager.getSystemBundle();
+ ClassLoaderPolicy systemPolicy = new OSGiClassLoaderPolicy(systemBundle, roots);
classLoaderSystem.registerClassLoaderPolicy(getName(), systemPolicy);
}
Modified: projects/jboss-osgi/projects/runtime/framework/trunk/vfs30/src/main/java/org/jboss/osgi/framework/classloading/OSGiClassLoaderPolicy.java
===================================================================
--- projects/jboss-osgi/projects/runtime/framework/trunk/vfs30/src/main/java/org/jboss/osgi/framework/classloading/OSGiClassLoaderPolicy.java 2010-03-24 16:32:05 UTC (rev 102908)
+++ projects/jboss-osgi/projects/runtime/framework/trunk/vfs30/src/main/java/org/jboss/osgi/framework/classloading/OSGiClassLoaderPolicy.java 2010-03-24 16:46:18 UTC (rev 102909)
@@ -48,6 +48,8 @@
import org.jboss.osgi.vfs.AbstractVFS;
import org.jboss.vfs.VFSUtils;
import org.jboss.vfs.VirtualFile;
+import org.osgi.framework.Bundle;
+import org.osgi.framework.BundleReference;
/**
* The ClassLoaderPolicy for OSGi bundles.
@@ -55,7 +57,7 @@
* @author thomas.diesler(a)jboss.com
* @since 11-Sep-2009
*/
-public class OSGiClassLoaderPolicy extends VFSClassLoaderPolicy
+public class OSGiClassLoaderPolicy extends VFSClassLoaderPolicy implements BundleReference
{
/** The associated bundle state */
private AbstractBundleState bundleState;
@@ -95,6 +97,11 @@
}
}
+ @Override
+ public Bundle getBundle()
+ {
+ return bundleState.getBundle();
+ }
@Override
public String getName()
14 years, 3 months
- 1
- 0
JBoss-OSGI SVN: r102896 - in projects/jboss-osgi/projects/runtime/framework/trunk: core/src/main/java/org/jboss/osgi/framework/bundle and 1 other directory.
by jboss-osgi-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2010-03-24 12:13:47 -0400 (Wed, 24 Mar 2010)
New Revision: 102896
Modified:
projects/jboss-osgi/projects/runtime/framework/trunk/bundle/src/test/java/org/jboss/test/osgi/bundle/BundleContextTestCase.java
projects/jboss-osgi/projects/runtime/framework/trunk/core/src/main/java/org/jboss/osgi/framework/bundle/OSGiBundleManager.java
Log:
[JBOSGI-238] [TCK] Framework classpath
Modified: projects/jboss-osgi/projects/runtime/framework/trunk/bundle/src/test/java/org/jboss/test/osgi/bundle/BundleContextTestCase.java
===================================================================
--- projects/jboss-osgi/projects/runtime/framework/trunk/bundle/src/test/java/org/jboss/test/osgi/bundle/BundleContextTestCase.java 2010-03-24 16:13:46 UTC (rev 102895)
+++ projects/jboss-osgi/projects/runtime/framework/trunk/bundle/src/test/java/org/jboss/test/osgi/bundle/BundleContextTestCase.java 2010-03-24 16:13:47 UTC (rev 102896)
@@ -26,6 +26,7 @@
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertSame;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
@@ -216,6 +217,9 @@
{
assertBundleState(Bundle.INSTALLED, bundle.getState());
assertEquals(url.toExternalForm(), bundle.getLocation());
+
+ Bundle duplicate = systemContext.installBundle(url.toExternalForm());
+ assertSame("Duplicate bundle", bundle, duplicate);
}
finally
{
Modified: projects/jboss-osgi/projects/runtime/framework/trunk/core/src/main/java/org/jboss/osgi/framework/bundle/OSGiBundleManager.java
===================================================================
--- projects/jboss-osgi/projects/runtime/framework/trunk/core/src/main/java/org/jboss/osgi/framework/bundle/OSGiBundleManager.java 2010-03-24 16:13:46 UTC (rev 102895)
+++ projects/jboss-osgi/projects/runtime/framework/trunk/core/src/main/java/org/jboss/osgi/framework/bundle/OSGiBundleManager.java 2010-03-24 16:13:47 UTC (rev 102896)
@@ -528,6 +528,15 @@
*/
public AbstractBundleState installBundle(Deployment dep) throws BundleException
{
+ if (dep == null)
+ throw new IllegalArgumentException("Null deployment");
+
+ // If a bundle containing the same location identifier is already installed,
+ // the Bundle object for that bundle is returned.
+ AbstractBundleState bundleState = getBundleByLocation(dep.getLocation());
+ if (bundleState != null)
+ return bundleState;
+
// Create the deployment and deploy it
try
{
@@ -536,7 +545,7 @@
att.addAttachment(Deployment.class, dep);
// In case of update the OSGiBundleState is attached
- AbstractBundleState bundleState = dep.getAttachment(AbstractBundleState.class);
+ bundleState = dep.getAttachment(AbstractBundleState.class);
if (bundleState != null)
att.addAttachment(AbstractBundleState.class, bundleState);
14 years, 3 months
- 1
- 0
JBoss-OSGI SVN: r102874 - in projects/jboss-osgi: projects/runtime/framework/trunk/bundle/src/test/java/org/jboss/test/osgi/service and 6 other directories.
by jboss-osgi-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2010-03-24 08:45:38 -0400 (Wed, 24 Mar 2010)
New Revision: 102874
Added:
projects/jboss-osgi/trunk/testsuite/example/src/test/java/org/jboss/test/osgi/example/simple/SimpleShrinkwrapTestCase.java
projects/jboss-osgi/trunk/testsuite/example/src/test/java/org/jboss/test/osgi/example/simple/husky/
projects/jboss-osgi/trunk/testsuite/example/src/test/java/org/jboss/test/osgi/example/simple/husky/SimpleHuskyTestCase.java
Removed:
projects/jboss-osgi/projects/runtime/framework/trunk/bundle/felix-cache/
projects/jboss-osgi/trunk/testsuite/example/src/test/java/org/jboss/test/osgi/example/simple/SimpleHuskyTestCase.java
Modified:
projects/jboss-osgi/projects/runtime/framework/trunk/bundle/pom.xml
projects/jboss-osgi/projects/runtime/framework/trunk/bundle/src/test/java/org/jboss/test/osgi/service/GetServiceReferencesTestCase.java
projects/jboss-osgi/projects/runtime/framework/trunk/bundle/src/test/java/org/jboss/test/osgi/service/ServiceMixTestCase.java
projects/jboss-osgi/projects/runtime/framework/trunk/bundle/src/test/resources/META-INF/services/org.jboss.osgi.spi.framework.OSGiBootstrapProvider
projects/jboss-osgi/projects/runtime/framework/trunk/bundle/src/test/resources/jboss-osgi-equinox.properties
projects/jboss-osgi/projects/runtime/framework/trunk/bundle/src/test/resources/log4j.xml
projects/jboss-osgi/projects/runtime/framework/trunk/core/src/main/java/org/jboss/osgi/framework/bundle/MDRUtils.java
projects/jboss-osgi/projects/runtime/framework/trunk/core/src/main/java/org/jboss/osgi/framework/bundle/ServiceManagerPluginImpl.java
projects/jboss-osgi/trunk/testsuite/example/src/test/resources/simple/example-simple-husky.bnd
Log:
Fix getService() semantics for unwired packages
Modified: projects/jboss-osgi/projects/runtime/framework/trunk/bundle/pom.xml
===================================================================
--- projects/jboss-osgi/projects/runtime/framework/trunk/bundle/pom.xml 2010-03-24 12:44:26 UTC (rev 102873)
+++ projects/jboss-osgi/projects/runtime/framework/trunk/bundle/pom.xml 2010-03-24 12:45:38 UTC (rev 102874)
@@ -245,18 +245,14 @@
<value>bootstrap/jboss-osgi-bootstrap.xml</value>
</property>
<property>
- <name>org.jboss.osgi.husky.Invoker</name>
- <value>org.jboss.osgi.husky.internal.AbstractInvoker</value>
+ <name>jboss.osgi.framework.properties</name>
+ <value>${jboss.osgi.framework.properties}</value>
</property>
<property>
<name>test.archive.directory</name>
<value>${project.build.directory}/test-libs</value>
</property>
</systemProperties>
- <excludes>
- <!-- excludes listed here need to have a jira issue associated -->
- <exclude>org/jboss/test/osgi/service/ServiceMixUnitTestCase.class</exclude>
- </excludes>
</configuration>
</plugin>
</plugins>
Modified: projects/jboss-osgi/projects/runtime/framework/trunk/bundle/src/test/java/org/jboss/test/osgi/service/GetServiceReferencesTestCase.java
===================================================================
--- projects/jboss-osgi/projects/runtime/framework/trunk/bundle/src/test/java/org/jboss/test/osgi/service/GetServiceReferencesTestCase.java 2010-03-24 12:44:26 UTC (rev 102873)
+++ projects/jboss-osgi/projects/runtime/framework/trunk/bundle/src/test/java/org/jboss/test/osgi/service/GetServiceReferencesTestCase.java 2010-03-24 12:45:38 UTC (rev 102874)
@@ -27,11 +27,16 @@
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.fail;
+import java.io.InputStream;
import java.util.Dictionary;
import java.util.Hashtable;
import org.jboss.osgi.testing.OSGiFrameworkTest;
+import org.jboss.osgi.testing.OSGiManifestBuilder;
import org.jboss.osgi.vfs.VirtualFile;
+import org.jboss.shrinkwrap.api.Archives;
+import org.jboss.shrinkwrap.api.Asset;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
import org.jboss.test.osgi.service.support.a.A;
import org.jboss.test.osgi.service.support.b.B;
import org.junit.Test;
@@ -55,6 +60,7 @@
@Test
public void testGetServiceReferences() throws Exception
{
+
VirtualFile assembly = assembleArchive("simple1", "/bundles/simple/simple-bundle1", A.class);
Bundle bundle = installBundle(assembly);
try
@@ -162,10 +168,23 @@
}
@Test
- public void testGetServiceReferencesMultiple() throws Exception
+ public void testGetServiceReferencesNoWire() throws Exception
{
- VirtualFile assemblyA = assembleArchive("simple1", "/bundles/simple/simple-bundle1", A.class);
- Bundle bundleA = installBundle(assemblyA);
+ JavaArchive archiveA = Archives.create("bundleA", JavaArchive.class);
+ archiveA.setManifest(new Asset()
+ {
+ public InputStream openStream()
+ {
+ OSGiManifestBuilder builder = OSGiManifestBuilder.newInstance();
+ builder.addBundleManifestVersion(2);
+ builder.addBundleSymbolicName("bundleA");
+ builder.addExportPackages("org.jboss.test.osgi.service.support.a");
+ return builder.openStream();
+ }
+ });
+ archiveA.addClass(A.class);
+
+ Bundle bundleA = installBundle(archiveA);
try
{
bundleA.start();
@@ -173,50 +192,67 @@
assertNotNull(contextA);
Class<?> clazz = bundleA.loadClass(A.class.getName());
- Object service1 = clazz.newInstance();
- ServiceRegistration sreg1 = contextA.registerService(A.class.getName(), service1, null);
+ Object service = clazz.newInstance();
+ ServiceRegistration sreg1 = contextA.registerService(A.class.getName(), service, null);
assertNotNull(sreg1);
ServiceReference sref1 = sreg1.getReference();
assertNotNull(sref1);
+
+ ServiceReference sref = systemContext.getServiceReference(A.class.getName());
+ assertNotNull("Reference not null", sref);
+ assertEquals(sref1, sref);
+ ServiceReference[] srefs = systemContext.getServiceReferences(A.class.getName(), null);
+ assertEquals(1, srefs.length);
+ assertEquals(sref1, srefs[0]);
+ srefs = systemContext.getAllServiceReferences(A.class.getName(), null);
+ assertEquals(1, srefs.length);
+ assertEquals(sref1, srefs[0]);
- VirtualFile assemblyB = assembleArchive("simple2", "/bundles/simple/simple-bundle2", A.class);
- Bundle bundleB = installBundle(assemblyB);
+ sref = contextA.getServiceReference(A.class.getName());
+ assertNotNull("Reference not null", sref);
+ assertEquals(sref1, sref);
+ srefs = contextA.getServiceReferences(A.class.getName(), null);
+ assertNotNull("References not null", srefs);
+ assertEquals(1, srefs.length);
+ assertEquals(sref1, srefs[0]);
+ srefs = contextA.getAllServiceReferences(A.class.getName(), null);
+ assertNotNull("References not null", srefs);
+ assertEquals(1, srefs.length);
+ assertEquals(sref1, srefs[0]);
+
+ JavaArchive archiveB = Archives.create("bundleB", JavaArchive.class);
+ archiveB.setManifest(new Asset()
+ {
+ public InputStream openStream()
+ {
+ OSGiManifestBuilder builder = OSGiManifestBuilder.newInstance();
+ builder.addBundleManifestVersion(2);
+ builder.addBundleSymbolicName("bundleB");
+ return builder.openStream();
+ }
+ });
+ Bundle bundleB = installBundle(archiveB);
try
{
bundleB.start();
BundleContext contextB = bundleB.getBundleContext();
assertNotNull(contextB);
- clazz = bundleB.loadClass(A.class.getName());
- Object service2 = clazz.newInstance();
- ServiceRegistration sreg2 = contextB.registerService(A.class.getName(), service2, null);
- assertNotNull(sreg2);
- ServiceReference sref2 = sreg2.getReference();
- assertNotNull(sref2);
+ assertLoadClassFail(bundleB, A.class.getName());
- ServiceReference[] srefs = systemContext.getServiceReferences(A.class.getName(), null);
- assertEquals(2, srefs.length);
- //assertEquals(sref2, srefs[0]);
- //assertEquals(sref1, srefs[1]);
-
- srefs = systemContext.getAllServiceReferences(A.class.getName(), null);
- assertEquals(2, srefs.length);
- //assertEquals(sref2, srefs[0]);
- //assertEquals(sref1, srefs[1]);
-
- srefs = contextA.getServiceReferences(A.class.getName(), null);
+ // Verify that bundle B can see the service registered by bundle A
+ // This is so because B does not have a wire to the service package
+ // and can therefore not be constraint on this package.
+ sref = contextB.getServiceReference(A.class.getName());
+ assertNotNull("Reference not null", sref);
+ srefs = contextB.getServiceReferences(A.class.getName(), null);
+ assertNotNull("References not null", srefs);
assertEquals(1, srefs.length);
assertEquals(sref1, srefs[0]);
-
- srefs = contextA.getAllServiceReferences(A.class.getName(), null);
- //assertEquals(2, srefs.length);
-
- srefs = contextB.getServiceReferences(A.class.getName(), null);
+ srefs = contextB.getAllServiceReferences(A.class.getName(), null);
+ assertNotNull("References not null", srefs);
assertEquals(1, srefs.length);
- assertEquals(sref2, srefs[0]);
-
- srefs = contextB.getAllServiceReferences(A.class.getName(), null);
- //assertEquals(2, srefs.length);
+ assertEquals(sref1, srefs[0]);
}
finally
{
Modified: projects/jboss-osgi/projects/runtime/framework/trunk/bundle/src/test/java/org/jboss/test/osgi/service/ServiceMixTestCase.java
===================================================================
--- projects/jboss-osgi/projects/runtime/framework/trunk/bundle/src/test/java/org/jboss/test/osgi/service/ServiceMixTestCase.java 2010-03-24 12:44:26 UTC (rev 102873)
+++ projects/jboss-osgi/projects/runtime/framework/trunk/bundle/src/test/java/org/jboss/test/osgi/service/ServiceMixTestCase.java 2010-03-24 12:45:38 UTC (rev 102874)
@@ -47,6 +47,7 @@
import org.jboss.test.osgi.service.support.c.C;
import org.jboss.test.osgi.service.support.d.ServiceMixFactory;
import org.jboss.test.osgi.service.support.e.E;
+import org.junit.Ignore;
import org.junit.Test;
import org.osgi.framework.Bundle;
import org.osgi.framework.BundleContext;
@@ -61,7 +62,7 @@
*/
public class ServiceMixTestCase extends AbstractServiceMixTest
{
- @Test
+ @Ignore
public void testGetServiceReferenceFromMC() throws Throwable
{
Deployment bean = deployBeans("beanA", A.class);
@@ -352,7 +353,7 @@
}
}
- @Test
+ @Ignore
@SuppressWarnings("rawtypes")
public void testServiceFactoryMix() throws Throwable
{
@@ -430,7 +431,7 @@
}
}
- @Test
+ @Ignore
public void testFiltering() throws Throwable
{
Deployment bean = deployBeans("beanA", A.class);
@@ -494,7 +495,7 @@
}
}
- @Test
+ @Ignore
public void testBeansMix() throws Throwable
{
VirtualFile assembly = assembleArchive("beans1", "/bundles/service/service-beans1", A.class);
Modified: projects/jboss-osgi/projects/runtime/framework/trunk/bundle/src/test/resources/META-INF/services/org.jboss.osgi.spi.framework.OSGiBootstrapProvider
===================================================================
--- projects/jboss-osgi/projects/runtime/framework/trunk/bundle/src/test/resources/META-INF/services/org.jboss.osgi.spi.framework.OSGiBootstrapProvider 2010-03-24 12:44:26 UTC (rev 102873)
+++ projects/jboss-osgi/projects/runtime/framework/trunk/bundle/src/test/resources/META-INF/services/org.jboss.osgi.spi.framework.OSGiBootstrapProvider 2010-03-24 12:45:38 UTC (rev 102874)
@@ -1 +1,3 @@
-org.jboss.osgi.framework.launch.OSGiFrameworkBootstrapProvider
\ No newline at end of file
+org.jboss.osgi.framework.launch.OSGiFrameworkBootstrapProvider # The MC Framework bootstrap provider
+org.jboss.osgi.equinox.EquinoxBootstrapProvider # The Equinox bootstrap provider
+org.jboss.osgi.felix.FelixBootstrapProvider # The Felix bootstrap provider
\ No newline at end of file
Modified: projects/jboss-osgi/projects/runtime/framework/trunk/bundle/src/test/resources/jboss-osgi-equinox.properties
===================================================================
--- projects/jboss-osgi/projects/runtime/framework/trunk/bundle/src/test/resources/jboss-osgi-equinox.properties 2010-03-24 12:44:26 UTC (rev 102873)
+++ projects/jboss-osgi/projects/runtime/framework/trunk/bundle/src/test/resources/jboss-osgi-equinox.properties 2010-03-24 12:45:38 UTC (rev 102874)
@@ -5,7 +5,7 @@
#
# Equinox properties
-osgi.debug=target/test-classes/equinox-debug.properties
+# osgi.debug=target/test-classes/equinox-debug.properties
# Properties to configure the Framework
org.osgi.framework.storage=${basedir}/target/osgi-store
Modified: projects/jboss-osgi/projects/runtime/framework/trunk/bundle/src/test/resources/log4j.xml
===================================================================
--- projects/jboss-osgi/projects/runtime/framework/trunk/bundle/src/test/resources/log4j.xml 2010-03-24 12:44:26 UTC (rev 102873)
+++ projects/jboss-osgi/projects/runtime/framework/trunk/bundle/src/test/resources/log4j.xml 2010-03-24 12:45:38 UTC (rev 102874)
@@ -32,7 +32,7 @@
<!-- Limit categories -->
<!-- ================ -->
- <!-- Show jboss deployer traces
+ <!-- Show jboss deployer traces - ->
<category name="org.jboss.deployer">
<priority value="TRACE" />
</category>
Modified: projects/jboss-osgi/projects/runtime/framework/trunk/core/src/main/java/org/jboss/osgi/framework/bundle/MDRUtils.java
===================================================================
--- projects/jboss-osgi/projects/runtime/framework/trunk/core/src/main/java/org/jboss/osgi/framework/bundle/MDRUtils.java 2010-03-24 12:44:26 UTC (rev 102873)
+++ projects/jboss-osgi/projects/runtime/framework/trunk/core/src/main/java/org/jboss/osgi/framework/bundle/MDRUtils.java 2010-03-24 12:45:38 UTC (rev 102874)
@@ -244,6 +244,42 @@
}
/**
+ * Tests if the bundle that registered the ControllerContext (source bundle) and the specified user of the ControllerContext (target bundle)
+ * use the same source for the packages of all the specified class names.
+ *
+ * @param context the context
+ * @param sourceBundle the source bundle state
+ * @param targetBundle the target bundle state
+ * @param classNames the array of class names
+ * @return true if the source bundle and the target bundle use the same source for the package of the specified class names; otherwise false.
+ */
+ public static boolean isAssignableTo(ControllerContext context, AbstractBundleState sourceBundle, AbstractBundleState targetBundle, String[] classNames)
+ {
+ if (context == null)
+ throw new IllegalArgumentException("Null context");
+ if (sourceBundle == null)
+ throw new IllegalArgumentException("Null source bundle");
+ if (targetBundle == null)
+ throw new IllegalArgumentException("Null target bundle");
+ if (classNames == null)
+ throw new IllegalArgumentException("Null class names");
+
+ if (sourceBundle == targetBundle)
+ return true;
+
+ if (KernelUtils.isUnregistered(context))
+ return false;
+
+ for (String className : classNames)
+ {
+ if (isAssignableTo(sourceBundle, targetBundle, className) == false)
+ return false;
+ }
+
+ return true;
+ }
+
+ /**
* Is assignable.
*
* @param sourceBundle the source bundle
@@ -267,7 +303,7 @@
if (target == null)
{
log.debug("Cannot load '" + className + "' from: " + targetBundle);
- return false;
+ return true;
}
boolean equals = source.equals(target);
Modified: projects/jboss-osgi/projects/runtime/framework/trunk/core/src/main/java/org/jboss/osgi/framework/bundle/ServiceManagerPluginImpl.java
===================================================================
--- projects/jboss-osgi/projects/runtime/framework/trunk/core/src/main/java/org/jboss/osgi/framework/bundle/ServiceManagerPluginImpl.java 2010-03-24 12:44:26 UTC (rev 102873)
+++ projects/jboss-osgi/projects/runtime/framework/trunk/core/src/main/java/org/jboss/osgi/framework/bundle/ServiceManagerPluginImpl.java 2010-03-24 12:45:38 UTC (rev 102874)
@@ -24,10 +24,12 @@
//$Id$
import java.util.ArrayList;
+import java.util.Arrays;
import java.util.Collection;
import java.util.Collections;
import java.util.Dictionary;
import java.util.HashSet;
+import java.util.Iterator;
import java.util.List;
import java.util.Set;
@@ -58,6 +60,7 @@
import org.jboss.osgi.framework.util.RemoveOnlyCollection;
import org.osgi.framework.Bundle;
import org.osgi.framework.BundleContext;
+import org.osgi.framework.Constants;
import org.osgi.framework.Filter;
import org.osgi.framework.FrameworkUtil;
import org.osgi.framework.InvalidSyntaxException;
@@ -132,7 +135,7 @@
Set<ServiceReference> result = new HashSet<ServiceReference>();
for (ControllerContext context : contexts)
{
- ServiceReference ref = getServiceReferenceForContext(context);
+ ServiceReference ref = getServiceReferenceForContext(context, true);
if (ref != null)
result.add(ref);
}
@@ -152,7 +155,7 @@
List<ServiceReference> references = new ArrayList<ServiceReference>();
for (ControllerContext context : contexts)
{
- ServiceReference ref = getServiceReferenceForContext(context);
+ ServiceReference ref = getServiceReferenceForContext(context, true);
if (ref != null)
references.add(ref);
}
@@ -460,77 +463,91 @@
return mdrFactory;
}
- private List<ServiceReference> getServiceReferencesInternal(AbstractBundleState bundle, String clazz, Filter filter, boolean checkAssignable)
+ private List<ServiceReference> getServiceReferencesInternal(AbstractBundleState targetBundle, String className, Filter filter, boolean checkAssignable)
{
- Set<ControllerContext> contexts = null;
+ ControllerContextPlugin plugin = getBundleManager().getPlugin(ControllerContextPlugin.class);
+
+ // Get all installed contexts
KernelController controller = kernel.getController();
+ List<ControllerContext> contexts = new ArrayList<ControllerContext>(controller.getContextsByState(ControllerState.INSTALLED));
+ // No services found
+ if (contexts == null || contexts.isEmpty())
+ return Collections.emptyList();
+
+ if (filter == null)
+ filter = NoFilter.INSTANCE;
+
// Don't check assignabilty for the system bundle
- boolean isSystemBundle = (bundle.getBundleId() == 0);
- if (isSystemBundle)
+ if (targetBundle.getBundleId() == 0)
checkAssignable = false;
-
- // Load the service class from the given bundle
- if (clazz != null && isSystemBundle == false)
+
+ Iterator<ControllerContext> iterator = contexts.iterator();
+ while (iterator.hasNext())
{
- // Use all contexts the are of the given service type
- Class<?> type = getBundleManager().loadClassFailsafe(bundle, clazz);
- if (type != null)
- contexts = controller.getContexts(type, ControllerState.INSTALLED);
+ ControllerContext context = iterator.next();
- // No services found
- if (contexts == null || contexts.isEmpty())
- return Collections.emptyList();
- }
+ // Match the contxt against the Filter
+ // [TODO] filter directly as part of the controller query
+ ServiceReference sref = getServiceReferenceForContext(context, true);
+ if (sref == null || hasPermission(context) == false || filter.match(sref) == false)
+ {
+ iterator.remove();
+ continue;
+ }
- // Use all installed contexts
- if (contexts == null)
- contexts = controller.getContextsByState(ControllerState.INSTALLED);
+ // Remove the contexts that do not implemented the given class name
+ String[] classNames = (String[])sref.getProperty(Constants.OBJECTCLASS);
+ if (className != null && Arrays.asList(classNames).contains(className) == false)
+ {
+ iterator.remove();
+ continue;
+ }
- // No services found
- if (contexts == null || contexts.isEmpty())
- return Collections.emptyList();
+ // Check assignability
+ AbstractBundleState sourceBundle = plugin.getBundleForContext(context);
+ if (checkAssignable == true && MDRUtils.isAssignableTo(context, sourceBundle, targetBundle, classNames) == false)
+ {
+ iterator.remove();
+ continue;
+ }
+ }
- if (filter == null)
- filter = NoFilter.INSTANCE;
-
// Sort by the spec, should bubble up
List<ControllerContext> sorted = new ArrayList<ControllerContext>(contexts);
Collections.sort(sorted, ContextComparator.getInstance());
-
+
+ // Get the resulting references for the remaining contexts
List<ServiceReference> result = new ArrayList<ServiceReference>();
for (ControllerContext context : sorted)
{
- ServiceReference sref = getServiceReferenceForContext(context);
- if (filter.match(sref) && hasPermission(context))
- {
- // True if the context contains the given class name
- if (clazz == null || MDRUtils.matchClass(context, clazz))
- {
- // Check the assignability
- if (checkAssignable == false || MDRUtils.isAssignableTo(context, bundle))
- result.add(sref);
- }
- }
+ ServiceReference sref = getServiceReferenceForContext(context, true);
+ result.add(sref);
}
- //Collections.sort(result, ServiceReferenceComparator.getInstance());
return result;
}
/**
- * Get service reference for context.
+ * Get ServiceReference for a given context.
+ *
+ *
*
* @param context the context
+ * @param strict true for strict OSGi behaviour
* @return service reference
*/
- private ServiceReference getServiceReferenceForContext(ControllerContext context)
+ private ServiceReference getServiceReferenceForContext(ControllerContext context, boolean strict)
{
if (context instanceof OSGiServiceState)
{
OSGiServiceState service = (OSGiServiceState)context;
return service.hasPermission() ? service.getReferenceInternal() : null;
}
+
+ if (strict == true)
+ return null;
+ // For non strict behaviour we can generically wrap the context
OSGiBundleManager manager = getBundleManager();
ControllerContextPlugin plugin = manager.getPlugin(ControllerContextPlugin.class);
AbstractBundleState bundleState = plugin.getBundleForContext(context);
Deleted: projects/jboss-osgi/trunk/testsuite/example/src/test/java/org/jboss/test/osgi/example/simple/SimpleHuskyTestCase.java
===================================================================
--- projects/jboss-osgi/trunk/testsuite/example/src/test/java/org/jboss/test/osgi/example/simple/SimpleHuskyTestCase.java 2010-03-24 12:44:26 UTC (rev 102873)
+++ projects/jboss-osgi/trunk/testsuite/example/src/test/java/org/jboss/test/osgi/example/simple/SimpleHuskyTestCase.java 2010-03-24 12:45:38 UTC (rev 102874)
@@ -1,108 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2005, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.test.osgi.example.simple;
-
-//$Id$
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assume.assumeNotNull;
-
-import org.jboss.osgi.husky.BridgeFactory;
-import org.jboss.osgi.husky.HuskyCapability;
-import org.jboss.osgi.husky.RuntimeContext;
-import org.jboss.osgi.testing.OSGiBundle;
-import org.jboss.osgi.testing.OSGiRuntime;
-import org.jboss.osgi.testing.OSGiRuntimeTest;
-import org.jboss.test.osgi.example.simple.bundle.SimpleService;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-import org.osgi.framework.Bundle;
-import org.osgi.framework.BundleContext;
-import org.osgi.framework.BundleException;
-import org.osgi.framework.ServiceReference;
-
-/**
- * A test that deployes a bundle and accesses
- * a service from within the test case
- *
- * @author thomas.diesler(a)jboss.com
- * @since 12-Feb-2009
- */
-public class SimpleHuskyTestCase extends OSGiRuntimeTest
-{
- @RuntimeContext
- public BundleContext context;
-
- private OSGiRuntime runtime;
- private OSGiBundle bundle;
-
- @Before
- public void setUp() throws Exception
- {
- // Only do this if we are not within the OSGi Runtime
- if (context == null)
- {
- // Get the default runtime
- runtime = getDefaultRuntime();
- runtime.addCapability(new HuskyCapability());
-
- // Install the bundle
- bundle = runtime.installBundle("example-simple-husky.jar");
-
- // Start the bundle
- bundle.start();
- assertBundleState(Bundle.ACTIVE, bundle.getState());
- }
- }
-
- @After
- public void tearDown() throws BundleException
- {
- // Only do this if we are not within the OSGi Runtime
- if (context == null)
- {
- // Shutdown the runtime
- runtime.shutdown();
- }
- }
-
- @Test
- public void testSimpleBundle() throws Exception
- {
- // Tell Husky to run this test method within the OSGi Runtime
- if (context == null)
- BridgeFactory.getBridge().run();
-
- // Stop here if the context is not injected
- assumeNotNull(context);
-
- // Get the SimpleService reference
- ServiceReference sref = context.getServiceReference(SimpleService.class.getName());
- assertNotNull("SimpleService Not Null", sref);
-
- // Access the SimpleService
- SimpleService service = (SimpleService)context.getService(sref);
- assertEquals("hello", service.echo("hello"));
- }
-}
\ No newline at end of file
Added: projects/jboss-osgi/trunk/testsuite/example/src/test/java/org/jboss/test/osgi/example/simple/SimpleShrinkwrapTestCase.java
===================================================================
--- projects/jboss-osgi/trunk/testsuite/example/src/test/java/org/jboss/test/osgi/example/simple/SimpleShrinkwrapTestCase.java (rev 0)
+++ projects/jboss-osgi/trunk/testsuite/example/src/test/java/org/jboss/test/osgi/example/simple/SimpleShrinkwrapTestCase.java 2010-03-24 12:45:38 UTC (rev 102874)
@@ -0,0 +1,83 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.test.osgi.example.simple;
+
+//$Id$
+
+import static org.junit.Assert.assertNull;
+
+import java.io.InputStream;
+
+import org.jboss.osgi.testing.OSGiFrameworkTest;
+import org.jboss.osgi.testing.OSGiManifestBuilder;
+import org.jboss.shrinkwrap.api.Archives;
+import org.jboss.shrinkwrap.api.Asset;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.junit.Test;
+import org.osgi.framework.Bundle;
+import org.osgi.framework.BundleContext;
+
+/**
+ * A test that deployes a bundle and verifies its state
+ *
+ * @author thomas.diesler(a)jboss.com
+ * @since 12-Feb-2009
+ */
+public class SimpleShrinkwrapTestCase extends OSGiFrameworkTest
+{
+ @Test
+ public void testSimpleBundle() throws Exception
+ {
+ // Build the bundle with shrinkwrap
+ JavaArchive archive = Archives.create("example-simple", JavaArchive.class);
+ archive.setManifest(new Asset()
+ {
+ public InputStream openStream()
+ {
+ OSGiManifestBuilder builder = OSGiManifestBuilder.newInstance();
+ builder.addBundleSymbolicName("example-simple");
+ builder.addBundleManifestVersion(2);
+ return builder.openStream();
+ }
+ });
+
+ // Install the Bundle
+ Bundle bundle = installBundle(archive);
+ assertBundleState(Bundle.INSTALLED, bundle.getState());
+
+ // Check that the BundleContext is still null
+ BundleContext context = bundle.getBundleContext();
+ assertNull("BundleContext null", context);
+
+ // Start the bundle
+ bundle.start();
+ assertBundleState(Bundle.ACTIVE, bundle.getState());
+
+ // Stop the bundle
+ bundle.stop();
+ assertBundleState(Bundle.RESOLVED, bundle.getState());
+
+ // Uninstall the bundle
+ bundle.uninstall();
+ assertBundleState(Bundle.UNINSTALLED, bundle.getState());
+ }
+}
\ No newline at end of file
Property changes on: projects/jboss-osgi/trunk/testsuite/example/src/test/java/org/jboss/test/osgi/example/simple/SimpleShrinkwrapTestCase.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Copied: projects/jboss-osgi/trunk/testsuite/example/src/test/java/org/jboss/test/osgi/example/simple/husky/SimpleHuskyTestCase.java (from rev 102857, projects/jboss-osgi/trunk/testsuite/example/src/test/java/org/jboss/test/osgi/example/simple/SimpleHuskyTestCase.java)
===================================================================
--- projects/jboss-osgi/trunk/testsuite/example/src/test/java/org/jboss/test/osgi/example/simple/husky/SimpleHuskyTestCase.java (rev 0)
+++ projects/jboss-osgi/trunk/testsuite/example/src/test/java/org/jboss/test/osgi/example/simple/husky/SimpleHuskyTestCase.java 2010-03-24 12:45:38 UTC (rev 102874)
@@ -0,0 +1,108 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.test.osgi.example.simple.husky;
+
+//$Id$
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assume.assumeNotNull;
+
+import org.jboss.osgi.husky.BridgeFactory;
+import org.jboss.osgi.husky.HuskyCapability;
+import org.jboss.osgi.husky.RuntimeContext;
+import org.jboss.osgi.testing.OSGiBundle;
+import org.jboss.osgi.testing.OSGiRuntime;
+import org.jboss.osgi.testing.OSGiRuntimeTest;
+import org.jboss.test.osgi.example.simple.bundle.SimpleService;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+import org.osgi.framework.Bundle;
+import org.osgi.framework.BundleContext;
+import org.osgi.framework.BundleException;
+import org.osgi.framework.ServiceReference;
+
+/**
+ * A test that deployes a bundle and accesses
+ * a service from within the test case
+ *
+ * @author thomas.diesler(a)jboss.com
+ * @since 12-Feb-2009
+ */
+public class SimpleHuskyTestCase extends OSGiRuntimeTest
+{
+ @RuntimeContext
+ public BundleContext context;
+
+ private OSGiRuntime runtime;
+ private OSGiBundle bundle;
+
+ @Before
+ public void setUp() throws Exception
+ {
+ // Only do this if we are not within the OSGi Runtime
+ if (context == null)
+ {
+ // Get the default runtime
+ runtime = getDefaultRuntime();
+ runtime.addCapability(new HuskyCapability());
+
+ // Install the bundle
+ bundle = runtime.installBundle("example-simple-husky.jar");
+
+ // Start the bundle
+ bundle.start();
+ assertBundleState(Bundle.ACTIVE, bundle.getState());
+ }
+ }
+
+ @After
+ public void tearDown() throws BundleException
+ {
+ // Only do this if we are not within the OSGi Runtime
+ if (context == null)
+ {
+ // Shutdown the runtime
+ runtime.shutdown();
+ }
+ }
+
+ @Test
+ public void testSimpleBundle() throws Exception
+ {
+ // Tell Husky to run this test method within the OSGi Runtime
+ if (context == null)
+ BridgeFactory.getBridge().run();
+
+ // Stop here if the context is not injected
+ assumeNotNull(context);
+
+ // Get the SimpleService reference
+ ServiceReference sref = context.getServiceReference(SimpleService.class.getName());
+ assertNotNull("SimpleService Not Null", sref);
+
+ // Access the SimpleService
+ SimpleService service = (SimpleService)context.getService(sref);
+ assertEquals("hello", service.echo("hello"));
+ }
+}
\ No newline at end of file
Modified: projects/jboss-osgi/trunk/testsuite/example/src/test/resources/simple/example-simple-husky.bnd
===================================================================
--- projects/jboss-osgi/trunk/testsuite/example/src/test/resources/simple/example-simple-husky.bnd 2010-03-24 12:44:26 UTC (rev 102873)
+++ projects/jboss-osgi/trunk/testsuite/example/src/test/resources/simple/example-simple-husky.bnd 2010-03-24 12:45:38 UTC (rev 102874)
@@ -1,13 +1,9 @@
# bnd build -classpath target/test-classes -output target/test-libs/example-simple-husky.jar src/test/resources/example/simple/example-simple-husky.bnd
Bundle-SymbolicName: example-simple-husky
-
Bundle-Activator: org.jboss.test.osgi.example.simple.bundle.SimpleActivator
-
Private-Package: org.jboss.test.osgi.example.simple.bundle
+Export-Package: org.jboss.test.osgi.example.simple.husky
-# Export the package that contains the test case
-Export-Package: org.jboss.test.osgi.example.simple
-
# Tell Husky that there are test cases in this package
-Test-Package: org.jboss.test.osgi.example.simple
+Test-Package: org.jboss.test.osgi.example.simple.husky
14 years, 3 months
- 1
- 0
JBoss-OSGI SVN: r102872 - projects/jboss-osgi/projects/spi/trunk/src/main/java/org/jboss/osgi/testing.
by jboss-osgi-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2010-03-24 08:16:54 -0400 (Wed, 24 Mar 2010)
New Revision: 102872
Added:
projects/jboss-osgi/projects/spi/trunk/src/main/java/org/jboss/osgi/testing/OSGiManifestBuilder.java
Removed:
projects/jboss-osgi/projects/spi/trunk/src/main/java/org/jboss/osgi/testing/ManifestBuilder.java
Modified:
projects/jboss-osgi/projects/spi/trunk/src/main/java/org/jboss/osgi/testing/OSGiFrameworkTest.java
Log:
Add shrinkwrap support to OSGiFrameworkTest
Deleted: projects/jboss-osgi/projects/spi/trunk/src/main/java/org/jboss/osgi/testing/ManifestBuilder.java
===================================================================
--- projects/jboss-osgi/projects/spi/trunk/src/main/java/org/jboss/osgi/testing/ManifestBuilder.java 2010-03-24 12:10:40 UTC (rev 102871)
+++ projects/jboss-osgi/projects/spi/trunk/src/main/java/org/jboss/osgi/testing/ManifestBuilder.java 2010-03-24 12:16:54 UTC (rev 102872)
@@ -1,157 +0,0 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2006, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
-package org.jboss.osgi.testing;
-
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.PrintWriter;
-import java.io.StringWriter;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.jar.Attributes;
-import java.util.jar.Manifest;
-
-import org.jboss.shrinkwrap.api.Asset;
-import org.osgi.framework.Constants;
-
-/**
- * A simple OSGi manifest builder.
- *
- * @author thomas.diesler(a)jboss.com
- * @since 08-Mar-2010
- */
-public final class ManifestBuilder implements Asset
-{
- private StringWriter sw;
- private PrintWriter pw;
- private List<String> importPackages = new ArrayList<String>();
- private List<String> exportPackages = new ArrayList<String>();
-
- public static ManifestBuilder newInstance()
- {
- return new ManifestBuilder();
- }
-
- private ManifestBuilder()
- {
- sw = new StringWriter();
- pw = new PrintWriter(sw);
- pw.println(Attributes.Name.MANIFEST_VERSION + ": 1.0");
- }
-
- public ManifestBuilder addBundleManifestVersion(int version)
- {
- pw.println(Constants.BUNDLE_MANIFESTVERSION + ": " + version);
- return this;
- }
-
- public ManifestBuilder addBundleSymbolicName(String symbolicName)
- {
- pw.println(Constants.BUNDLE_SYMBOLICNAME + ": " + symbolicName);
- return this;
- }
-
- public ManifestBuilder addBundleActivator(String bundleActivator)
- {
- pw.println(Constants.BUNDLE_ACTIVATOR + ": " + bundleActivator);
- return this;
- }
-
- public ManifestBuilder addImportPackages(String... packages)
- {
- for (String aux : packages)
- importPackages.add(aux);
-
- return this;
- }
-
- public ManifestBuilder addExportPackages(String... packages)
- {
- for (String aux : packages)
- exportPackages.add(aux);
-
- return this;
- }
-
- public ManifestBuilder addManifestHeader(String key, String value)
- {
- pw.println(key + ": " + value);
- return this;
- }
-
- public Manifest getManifest()
- {
- if (exportPackages.size() > 0)
- {
- pw.print(Constants.EXPORT_PACKAGE + ": ");
- for (int i = 0; i < exportPackages.size(); i++)
- {
- if (i > 0)
- pw.print(",");
-
- pw.print(exportPackages.get(i));
- }
- pw.println();
- }
-
- if (importPackages.size() > 0)
- {
- pw.print(Constants.IMPORT_PACKAGE + ": ");
- for (int i = 0; i < importPackages.size(); i++)
- {
- if (i > 0)
- pw.print(",");
-
- pw.print(importPackages.get(i));
- }
- pw.println();
- }
-
- try
- {
- Manifest manifest = new Manifest(new ByteArrayInputStream(sw.toString().getBytes()));
- return manifest;
- }
- catch (IOException ex)
- {
- throw new IllegalStateException("Cannot create manifest", ex);
- }
- }
-
- @Override
- public InputStream openStream()
- {
- Manifest manifest = getManifest();
- ByteArrayOutputStream baos = new ByteArrayOutputStream();
- try
- {
- manifest.write(baos);
- return new ByteArrayInputStream(baos.toByteArray());
- }
- catch (IOException ex)
- {
- throw new IllegalStateException("Cannot provide manifest InputStream", ex);
- }
- }
-}
Modified: projects/jboss-osgi/projects/spi/trunk/src/main/java/org/jboss/osgi/testing/OSGiFrameworkTest.java
===================================================================
--- projects/jboss-osgi/projects/spi/trunk/src/main/java/org/jboss/osgi/testing/OSGiFrameworkTest.java 2010-03-24 12:10:40 UTC (rev 102871)
+++ projects/jboss-osgi/projects/spi/trunk/src/main/java/org/jboss/osgi/testing/OSGiFrameworkTest.java 2010-03-24 12:16:54 UTC (rev 102872)
@@ -29,6 +29,7 @@
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
+import java.io.File;
import java.util.Arrays;
import java.util.HashSet;
import java.util.List;
@@ -39,7 +40,10 @@
import org.jboss.osgi.spi.framework.OSGiBootstrap;
import org.jboss.osgi.spi.framework.OSGiBootstrapProvider;
import org.jboss.osgi.spi.util.ConstantsHelper;
+import org.jboss.osgi.vfs.AbstractVFS;
import org.jboss.osgi.vfs.VirtualFile;
+import org.jboss.shrinkwrap.api.Archive;
+import org.jboss.shrinkwrap.api.exporter.ZipExporter;
import org.junit.AfterClass;
import org.junit.BeforeClass;
import org.osgi.framework.Bundle;
@@ -100,6 +104,17 @@
return (PackageAdmin)systemContext.getService(sref);
}
+ protected Bundle installBundle(Archive<?> archive) throws Exception
+ {
+ ZipExporter exporter = archive.as(ZipExporter.class);
+ File target = File.createTempFile("archive_", ".jar");
+ exporter.exportZip(target, true);
+ target.deleteOnExit();
+
+ VirtualFile virtualFile = AbstractVFS.getRoot(target.toURI().toURL());
+ return installBundle(virtualFile);
+ }
+
protected Bundle installBundle(VirtualFile archive) throws Exception
{
String location = archive.getPathName();
Copied: projects/jboss-osgi/projects/spi/trunk/src/main/java/org/jboss/osgi/testing/OSGiManifestBuilder.java (from rev 102863, projects/jboss-osgi/projects/spi/trunk/src/main/java/org/jboss/osgi/testing/ManifestBuilder.java)
===================================================================
--- projects/jboss-osgi/projects/spi/trunk/src/main/java/org/jboss/osgi/testing/OSGiManifestBuilder.java (rev 0)
+++ projects/jboss-osgi/projects/spi/trunk/src/main/java/org/jboss/osgi/testing/OSGiManifestBuilder.java 2010-03-24 12:16:54 UTC (rev 102872)
@@ -0,0 +1,157 @@
+/*
+* JBoss, Home of Professional Open Source
+* Copyright 2006, JBoss Inc., and individual contributors as indicated
+* by the @authors tag. See the copyright.txt in the distribution for a
+* full listing of individual contributors.
+*
+* This is free software; you can redistribute it and/or modify it
+* under the terms of the GNU Lesser General Public License as
+* published by the Free Software Foundation; either version 2.1 of
+* the License, or (at your option) any later version.
+*
+* This software is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+* Lesser General Public License for more details.
+*
+* You should have received a copy of the GNU Lesser General Public
+* License along with this software; if not, write to the Free
+* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+*/
+package org.jboss.osgi.testing;
+
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.PrintWriter;
+import java.io.StringWriter;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.jar.Attributes;
+import java.util.jar.Manifest;
+
+import org.jboss.shrinkwrap.api.Asset;
+import org.osgi.framework.Constants;
+
+/**
+ * A simple OSGi manifest builder.
+ *
+ * @author thomas.diesler(a)jboss.com
+ * @since 08-Mar-2010
+ */
+public final class OSGiManifestBuilder implements Asset
+{
+ private StringWriter sw;
+ private PrintWriter pw;
+ private List<String> importPackages = new ArrayList<String>();
+ private List<String> exportPackages = new ArrayList<String>();
+
+ public static OSGiManifestBuilder newInstance()
+ {
+ return new OSGiManifestBuilder();
+ }
+
+ private OSGiManifestBuilder()
+ {
+ sw = new StringWriter();
+ pw = new PrintWriter(sw);
+ pw.println(Attributes.Name.MANIFEST_VERSION + ": 1.0");
+ }
+
+ public OSGiManifestBuilder addBundleManifestVersion(int version)
+ {
+ pw.println(Constants.BUNDLE_MANIFESTVERSION + ": " + version);
+ return this;
+ }
+
+ public OSGiManifestBuilder addBundleSymbolicName(String symbolicName)
+ {
+ pw.println(Constants.BUNDLE_SYMBOLICNAME + ": " + symbolicName);
+ return this;
+ }
+
+ public OSGiManifestBuilder addBundleActivator(String bundleActivator)
+ {
+ pw.println(Constants.BUNDLE_ACTIVATOR + ": " + bundleActivator);
+ return this;
+ }
+
+ public OSGiManifestBuilder addImportPackages(String... packages)
+ {
+ for (String aux : packages)
+ importPackages.add(aux);
+
+ return this;
+ }
+
+ public OSGiManifestBuilder addExportPackages(String... packages)
+ {
+ for (String aux : packages)
+ exportPackages.add(aux);
+
+ return this;
+ }
+
+ public OSGiManifestBuilder addManifestHeader(String key, String value)
+ {
+ pw.println(key + ": " + value);
+ return this;
+ }
+
+ public Manifest getManifest()
+ {
+ if (exportPackages.size() > 0)
+ {
+ pw.print(Constants.EXPORT_PACKAGE + ": ");
+ for (int i = 0; i < exportPackages.size(); i++)
+ {
+ if (i > 0)
+ pw.print(",");
+
+ pw.print(exportPackages.get(i));
+ }
+ pw.println();
+ }
+
+ if (importPackages.size() > 0)
+ {
+ pw.print(Constants.IMPORT_PACKAGE + ": ");
+ for (int i = 0; i < importPackages.size(); i++)
+ {
+ if (i > 0)
+ pw.print(",");
+
+ pw.print(importPackages.get(i));
+ }
+ pw.println();
+ }
+
+ try
+ {
+ Manifest manifest = new Manifest(new ByteArrayInputStream(sw.toString().getBytes()));
+ return manifest;
+ }
+ catch (IOException ex)
+ {
+ throw new IllegalStateException("Cannot create manifest", ex);
+ }
+ }
+
+ @Override
+ public InputStream openStream()
+ {
+ Manifest manifest = getManifest();
+ ByteArrayOutputStream baos = new ByteArrayOutputStream();
+ try
+ {
+ manifest.write(baos);
+ return new ByteArrayInputStream(baos.toByteArray());
+ }
+ catch (IOException ex)
+ {
+ throw new IllegalStateException("Cannot provide manifest InputStream", ex);
+ }
+ }
+}
14 years, 3 months
- 1
- 0
JBoss-OSGI SVN: r102860 - projects/jboss-osgi/trunk/testsuite.
by jboss-osgi-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2010-03-24 02:10:03 -0400 (Wed, 24 Mar 2010)
New Revision: 102860
Removed:
projects/jboss-osgi/trunk/testsuite/trailblazer/
Log:
Remove trailblazer
14 years, 3 months
- 1
- 0
JBoss-OSGI SVN: r102859 - projects/jboss-osgi/projects.
by jboss-osgi-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2010-03-24 02:06:48 -0400 (Wed, 24 Mar 2010)
New Revision: 102859
Removed:
projects/jboss-osgi/projects/osgitck/
Log:
Move osgitck to reactor
14 years, 3 months
- 1
- 0
JBoss-OSGI SVN: r102858 - in projects/jboss-osgi: trunk/reactor and 1 other directory.
by jboss-osgi-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2010-03-24 02:06:20 -0400 (Wed, 24 Mar 2010)
New Revision: 102858
Added:
projects/jboss-osgi/trunk/reactor/osgitck/
Removed:
projects/jboss-osgi/projects/osgitck/trunk/
Log:
Move osgitck to reactor
Copied: projects/jboss-osgi/trunk/reactor/osgitck (from rev 102857, projects/jboss-osgi/projects/osgitck/trunk)
14 years, 3 months
- 1
- 0
JBoss-OSGI SVN: r102853 - in projects/jboss-osgi/projects/runtime/framework/trunk: core/src/main/java/org/jboss/osgi/framework/bundle and 1 other directory.
by jboss-osgi-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2010-03-24 01:00:49 -0400 (Wed, 24 Mar 2010)
New Revision: 102853
Modified:
projects/jboss-osgi/projects/runtime/framework/trunk/bundle/src/test/java/org/jboss/test/osgi/service/GetServiceReferencesTestCase.java
projects/jboss-osgi/projects/runtime/framework/trunk/core/src/main/java/org/jboss/osgi/framework/bundle/GenericServiceReferenceWrapper.java
projects/jboss-osgi/projects/runtime/framework/trunk/core/src/main/java/org/jboss/osgi/framework/bundle/MDRUtils.java
projects/jboss-osgi/projects/runtime/framework/trunk/core/src/main/java/org/jboss/osgi/framework/bundle/OSGiServiceState.java
Log:
More work on getServiceReferences - wip
Modified: projects/jboss-osgi/projects/runtime/framework/trunk/bundle/src/test/java/org/jboss/test/osgi/service/GetServiceReferencesTestCase.java
===================================================================
--- projects/jboss-osgi/projects/runtime/framework/trunk/bundle/src/test/java/org/jboss/test/osgi/service/GetServiceReferencesTestCase.java 2010-03-24 04:45:32 UTC (rev 102852)
+++ projects/jboss-osgi/projects/runtime/framework/trunk/bundle/src/test/java/org/jboss/test/osgi/service/GetServiceReferencesTestCase.java 2010-03-24 05:00:49 UTC (rev 102853)
@@ -196,32 +196,27 @@
ServiceReference[] srefs = systemContext.getServiceReferences(A.class.getName(), null);
assertEquals(2, srefs.length);
- assertEquals(sref2, srefs[0]);
- assertEquals(sref1, srefs[1]);
+ //assertEquals(sref2, srefs[0]);
+ //assertEquals(sref1, srefs[1]);
srefs = systemContext.getAllServiceReferences(A.class.getName(), null);
assertEquals(2, srefs.length);
- assertEquals(sref2, srefs[0]);
- assertEquals(sref1, srefs[1]);
+ //assertEquals(sref2, srefs[0]);
+ //assertEquals(sref1, srefs[1]);
srefs = contextA.getServiceReferences(A.class.getName(), null);
assertEquals(1, srefs.length);
assertEquals(sref1, srefs[0]);
- System.out.println("FIXME: verify getAllServiceReferences()");
- //srefs = contextA.getAllServiceReferences(A.class.getName(), null);
+ srefs = contextA.getAllServiceReferences(A.class.getName(), null);
//assertEquals(2, srefs.length);
- //assertEquals(sref2, srefs[0]);
- //assertEquals(sref1, srefs[1]);
srefs = contextB.getServiceReferences(A.class.getName(), null);
assertEquals(1, srefs.length);
assertEquals(sref2, srefs[0]);
- //srefs = contextB.getAllServiceReferences(A.class.getName(), null);
+ srefs = contextB.getAllServiceReferences(A.class.getName(), null);
//assertEquals(2, srefs.length);
- //assertEquals(sref2, srefs[0]);
- //assertEquals(sref1, srefs[1]);
}
finally
{
Modified: projects/jboss-osgi/projects/runtime/framework/trunk/core/src/main/java/org/jboss/osgi/framework/bundle/GenericServiceReferenceWrapper.java
===================================================================
--- projects/jboss-osgi/projects/runtime/framework/trunk/core/src/main/java/org/jboss/osgi/framework/bundle/GenericServiceReferenceWrapper.java 2010-03-24 04:45:32 UTC (rev 102852)
+++ projects/jboss-osgi/projects/runtime/framework/trunk/core/src/main/java/org/jboss/osgi/framework/bundle/GenericServiceReferenceWrapper.java 2010-03-24 05:00:49 UTC (rev 102853)
@@ -110,7 +110,8 @@
public boolean isAssignableTo(Bundle bundle, String className)
{
- return MDRUtils.isAssignableTo(context, bundleState, bundle, className);
+ AbstractBundleState targetBundle = AbstractBundleState.assertBundleState(bundle);
+ return MDRUtils.isAssignableTo(context, bundleState, targetBundle, className);
}
public int compareTo(Object obj)
Modified: projects/jboss-osgi/projects/runtime/framework/trunk/core/src/main/java/org/jboss/osgi/framework/bundle/MDRUtils.java
===================================================================
--- projects/jboss-osgi/projects/runtime/framework/trunk/core/src/main/java/org/jboss/osgi/framework/bundle/MDRUtils.java 2010-03-24 04:45:32 UTC (rev 102852)
+++ projects/jboss-osgi/projects/runtime/framework/trunk/core/src/main/java/org/jboss/osgi/framework/bundle/MDRUtils.java 2010-03-24 05:00:49 UTC (rev 102853)
@@ -133,60 +133,6 @@
}
/**
- * Is assignable to bundle.
- *
- * @param context the context
- * @param bundleState the bundle state
- * @param otherBundle the other bundle
- * @param className the class name
- * @return true if assignable, false otherwise
- */
- private static boolean isAssignableTo(ControllerContext context, AbstractBundleState bundleState, AbstractBundleState otherBundle, String className)
- {
- if (bundleState == otherBundle)
- return true;
-
- if (KernelUtils.isUnregistered(context))
- return false;
-
- return isAssignableTo(bundleState, otherBundle, className);
- }
-
- /**
- * Is assignable.
- *
- * @param bundleState the bundle state
- * @param other the other bundle
- * @param className the class name
- * @return true if assignable, false otherwise
- */
- private static boolean isAssignableTo(AbstractBundleState bundleState, AbstractBundleState other, String className)
- {
- Object source = getSource(bundleState, className);
- if (source == null)
- throw new IllegalStateException("Cannot load '" + className + "' from: " + bundleState);
-
- Object otherSource = getSource(other, className);
- if (otherSource == null)
- {
- log.debug("Cannot load '" + className + "' from: " + other);
- return false;
- }
-
- boolean equals = source.equals(otherSource);
- if (equals == false)
- {
- ClassLoader otherLoader = getClassLoader(otherSource);
- ClassLoader sourceLoader = getClassLoader(source);
- StringBuffer buffer = new StringBuffer("Cannot assign '" + className + "' comming from different exporters");
- buffer.append("\n service: ").append(sourceLoader);
- buffer.append("\n request: ").append(otherLoader);
- log.warn(buffer.toString());
- }
- return equals;
- }
-
- /**
* Get the source of a class for ServiceReference.isAssignable()
*
* @param className the class name
@@ -260,93 +206,136 @@
}
/**
- * Is context assignable to bundle.
+ * Tests if the bundle that registered the ControllerContext (source bundle) and the specified user of the ControllerContext (target bundle)
+ * use the same source for the package of the specified class name.
+ *
+ * This method performs the following checks:
+ *
+ * 1. Get the package name from the specified class name.
+ * 2. For the bundle that registered the ControllerContext (source bundle); find the source for the package.
+ * If no source is found then return true if the source bundle is equal to the target bundle; otherwise return false.
+ * 3. If the package source of the source bundle is equal to the package source of the target bundle then return true;
+ * otherwise return false.
*
* @param context the context
- * @param bundleState the bundle state
- * @return true if assignable, false otherwise
+ * @param sourceBundle the source bundle state
+ * @param targetBundle the target bundle state
+ * @param className the class name
+ * @return true if the source bundle and the target bundle use the same source for the package of the specified class name; otherwise false.
*/
- public static boolean isAssignableTo(ControllerContext context, AbstractBundleState bundleState)
+ public static boolean isAssignableTo(ControllerContext context, AbstractBundleState sourceBundle, AbstractBundleState targetBundle, String className)
{
if (context == null)
throw new IllegalArgumentException("Null context");
- if (bundleState == null)
- throw new IllegalArgumentException("Null bundle state");
-
- OSGiBundleManager manager = bundleState.getBundleManager();
- ControllerContextPlugin plugin = manager.getPlugin(ControllerContextPlugin.class);
+ if (sourceBundle == null)
+ throw new IllegalArgumentException("Null source bundle");
+ if (targetBundle == null)
+ throw new IllegalArgumentException("Null target bundle");
+ if (className == null)
+ throw new IllegalArgumentException("Null class name");
- // context's bundle
- AbstractBundleState other = plugin.getBundleForContext(context);
- if (bundleState == other)
+ if (sourceBundle == targetBundle)
return true;
+
if (KernelUtils.isUnregistered(context))
return false;
- String[] classes = getProperty(context, Constants.OBJECTCLASS, String[].class);
- if (classes == null)
+ return isAssignableTo(sourceBundle, targetBundle, className);
+ }
+
+ /**
+ * Is assignable.
+ *
+ * @param sourceBundle the source bundle
+ * @param targetBundle the target bundle
+ * @param className the class name
+ * @return true if assignable, false otherwise
+ */
+ private static boolean isAssignableTo(AbstractBundleState sourceBundle, AbstractBundleState targetBundle, String className)
+ {
+ if (sourceBundle == null)
+ throw new IllegalArgumentException("Null source bundle");
+ if (className == null)
+ throw new IllegalArgumentException("Null class name");
+
+ // If no source is found return true if the source bundle is equal to the target bundle; otherwise return false
+ Object source = getSource(sourceBundle, className);
+ if (source == null)
+ return sourceBundle.equals(targetBundle);
+
+ Object target = getSource(targetBundle, className);
+ if (target == null)
+ {
+ log.debug("Cannot load '" + className + "' from: " + targetBundle);
return false;
+ }
- for (String className : classes)
+ boolean equals = source.equals(target);
+ if (equals == false)
{
- if (isAssignableTo(bundleState, other, className) == false)
- return false;
+ ClassLoader targetLoader = getClassLoader(target);
+ ClassLoader sourceLoader = getClassLoader(source);
+ StringBuffer buffer = new StringBuffer("Cannot assign '" + className + "' comming from different exporters");
+ buffer.append("\n source: ").append(sourceLoader);
+ buffer.append("\n target: ").append(targetLoader);
+ log.warn(buffer.toString());
}
- return true;
+ return equals;
}
/**
* Is assignable to bundle.
*
* @param context the context
- * @param bundleState the bundle state
+ * @param sourceBundle the bundle state
* @param className the class name
* @return true if assignable, false otherwise
*/
- public static boolean isAssignableTo(ControllerContext context, AbstractBundleState bundleState, String className)
+ public static boolean isAssignableTo(ControllerContext context, AbstractBundleState sourceBundle, String className)
{
- if (context == null)
- throw new IllegalArgumentException("Null context");
- if (bundleState == null)
+ if (sourceBundle == null)
throw new IllegalArgumentException("Null bundle state");
- if (className == null)
- throw new IllegalArgumentException("Null class name");
-
- OSGiBundleManager manager = bundleState.getBundleManager();
+
+ OSGiBundleManager manager = sourceBundle.getBundleManager();
ControllerContextPlugin plugin = manager.getPlugin(ControllerContextPlugin.class);
- AbstractBundleState other = plugin.getBundleForContext(context);
- return isAssignableTo(context, bundleState, other, className);
+ AbstractBundleState targetBundle = plugin.getBundleForContext(context);
+ return isAssignableTo(context, sourceBundle, targetBundle, className);
}
/**
- * Is assignable to bundle.
+ * Is context assignable to bundle.
*
* @param context the context
- * @param bundleState the bundle state
- * @param bundle the other bundle
- * @param className the class name
+ * @param sourceBundle the bundle state
* @return true if assignable, false otherwise
*/
- public static boolean isAssignableTo(ControllerContext context, AbstractBundleState bundleState, Bundle bundle, String className)
+ public static boolean isAssignableTo(ControllerContext context, AbstractBundleState sourceBundle)
{
if (context == null)
throw new IllegalArgumentException("Null context");
- if (bundleState == null)
+ if (sourceBundle == null)
throw new IllegalArgumentException("Null bundle state");
- if (bundle == null)
- throw new IllegalArgumentException("Null bundle");
- if (className == null)
- throw new IllegalArgumentException("Null class name");
- AbstractBundleState otherBundle;
- if (bundle instanceof AbstractBundleState)
- otherBundle = (AbstractBundleState)bundle;
- else if (bundle instanceof OSGiBundleWrapper)
- otherBundle = ((OSGiBundleWrapper)bundle).getBundleState();
- else
- throw new IllegalArgumentException("Illegal bundle type: " + bundle);
+ OSGiBundleManager manager = sourceBundle.getBundleManager();
+ ControllerContextPlugin plugin = manager.getPlugin(ControllerContextPlugin.class);
+
+ // context's bundle
+ AbstractBundleState targetBundle = plugin.getBundleForContext(context);
+ if (sourceBundle == targetBundle)
+ return true;
+ if (KernelUtils.isUnregistered(context))
+ return false;
- return isAssignableTo(context, bundleState, otherBundle, className);
+ String[] classes = getProperty(context, Constants.OBJECTCLASS, String[].class);
+ if (classes == null)
+ return false;
+
+ for (String className : classes)
+ {
+ if (isAssignableTo(sourceBundle, targetBundle, className) == false)
+ return false;
+ }
+ return true;
}
/**
Modified: projects/jboss-osgi/projects/runtime/framework/trunk/core/src/main/java/org/jboss/osgi/framework/bundle/OSGiServiceState.java
===================================================================
--- projects/jboss-osgi/projects/runtime/framework/trunk/core/src/main/java/org/jboss/osgi/framework/bundle/OSGiServiceState.java 2010-03-24 04:45:32 UTC (rev 102852)
+++ projects/jboss-osgi/projects/runtime/framework/trunk/core/src/main/java/org/jboss/osgi/framework/bundle/OSGiServiceState.java 2010-03-24 05:00:49 UTC (rev 102853)
@@ -555,7 +555,8 @@
@Override
public boolean isAssignableTo(Bundle bundle, String className)
{
- return MDRUtils.isAssignableTo(this, bundleState, bundle, className);
+ AbstractBundleState targetBundle = AbstractBundleState.assertBundleState(bundle);
+ return MDRUtils.isAssignableTo(this, bundleState, targetBundle, className);
}
@Override
14 years, 3 months
- 1
- 0
JBoss-OSGI SVN: r102778 - in projects/jboss-osgi/projects: runtime/framework/trunk/bundle/felix-cache and 7 other directories.
by jboss-osgi-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2010-03-23 08:53:25 -0400 (Tue, 23 Mar 2010)
New Revision: 102778
Added:
projects/jboss-osgi/projects/runtime/framework/trunk/bundle/felix-cache/
projects/jboss-osgi/projects/runtime/framework/trunk/bundle/felix-cache/bundle0/
projects/jboss-osgi/projects/runtime/framework/trunk/bundle/felix-cache/bundle0/bundle.id
projects/jboss-osgi/projects/runtime/framework/trunk/bundle/src/test/java/org/jboss/test/osgi/simple/SimpleFrameworkTestCase.java
projects/jboss-osgi/projects/runtime/framework/trunk/bundle/src/test/java/org/jboss/test/osgi/simple/SimpleRuntimeTestCase.java
Removed:
projects/jboss-osgi/projects/runtime/framework/trunk/bundle/src/test/java/org/jboss/test/osgi/simple/SimpleBundleTestCase.java
Modified:
projects/jboss-osgi/projects/runtime/framework/trunk/bundle/pom.xml
projects/jboss-osgi/projects/runtime/framework/trunk/bundle/src/test/java/org/jboss/test/osgi/bundle/BundleContextTestCase.java
projects/jboss-osgi/projects/runtime/framework/trunk/bundle/src/test/java/org/jboss/test/osgi/bundle/BundleLifecycleTestCase.java
projects/jboss-osgi/projects/runtime/framework/trunk/bundle/src/test/java/org/jboss/test/osgi/bundle/BundleTestCase.java
projects/jboss-osgi/projects/runtime/framework/trunk/bundle/src/test/java/org/jboss/test/osgi/classloader/BundleClassPathTestCase.java
projects/jboss-osgi/projects/runtime/framework/trunk/bundle/src/test/java/org/jboss/test/osgi/resolver/ResolverSmokeTestCase.java
projects/jboss-osgi/projects/runtime/framework/trunk/bundle/src/test/java/org/jboss/test/osgi/service/GetServiceReferencesTestCase.java
projects/jboss-osgi/projects/runtime/framework/trunk/bundle/src/test/java/org/jboss/test/osgi/simple/SimpleLogServiceTestCase.java
projects/jboss-osgi/projects/spi/trunk/src/main/java/org/jboss/osgi/testing/OSGiFrameworkTest.java
Log:
Add more test coverage for getServiceReferences
Added: projects/jboss-osgi/projects/runtime/framework/trunk/bundle/felix-cache/bundle0/bundle.id
===================================================================
--- projects/jboss-osgi/projects/runtime/framework/trunk/bundle/felix-cache/bundle0/bundle.id (rev 0)
+++ projects/jboss-osgi/projects/runtime/framework/trunk/bundle/felix-cache/bundle0/bundle.id 2010-03-23 12:53:25 UTC (rev 102778)
@@ -0,0 +1 @@
+43
\ No newline at end of file
Modified: projects/jboss-osgi/projects/runtime/framework/trunk/bundle/pom.xml
===================================================================
--- projects/jboss-osgi/projects/runtime/framework/trunk/bundle/pom.xml 2010-03-23 12:43:47 UTC (rev 102777)
+++ projects/jboss-osgi/projects/runtime/framework/trunk/bundle/pom.xml 2010-03-23 12:53:25 UTC (rev 102778)
@@ -305,7 +305,7 @@
<id>framework-equinox</id>
<activation>
<property>
- <name>fmwk</name>
+ <name>frwk</name>
<value>equinox</value>
</property>
</activation>
@@ -358,7 +358,7 @@
<id>framework-felix</id>
<activation>
<property>
- <name>fmwk</name>
+ <name>frwk</name>
<value>felix</value>
</property>
</activation>
@@ -411,7 +411,7 @@
<id>framework-jbossmc-default</id>
<activation>
<property>
- <name>!fmwk</name>
+ <name>!frwk</name>
</property>
</activation>
<dependencies>
Modified: projects/jboss-osgi/projects/runtime/framework/trunk/bundle/src/test/java/org/jboss/test/osgi/bundle/BundleContextTestCase.java
===================================================================
--- projects/jboss-osgi/projects/runtime/framework/trunk/bundle/src/test/java/org/jboss/test/osgi/bundle/BundleContextTestCase.java 2010-03-23 12:43:47 UTC (rev 102777)
+++ projects/jboss-osgi/projects/runtime/framework/trunk/bundle/src/test/java/org/jboss/test/osgi/bundle/BundleContextTestCase.java 2010-03-23 12:53:25 UTC (rev 102778)
@@ -211,7 +211,7 @@
public void testInstallBundle() throws Exception
{
URL url = getTestArchiveURL("bundles/jboss-osgi-common.jar");
- Bundle bundle = context.installBundle(url.toExternalForm());
+ Bundle bundle = systemContext.installBundle(url.toExternalForm());
try
{
assertBundleState(Bundle.INSTALLED, bundle.getState());
@@ -225,7 +225,7 @@
// Test file location
String location = getTestArchivePath("bundles/jboss-osgi-common.jar");
- bundle = context.installBundle(location);
+ bundle = systemContext.installBundle(location);
try
{
assertBundleState(Bundle.INSTALLED, bundle.getState());
@@ -238,7 +238,7 @@
}
// Test symbolic location
- bundle = context.installBundle("/symbolic/location", url.openStream());
+ bundle = systemContext.installBundle("/symbolic/location", url.openStream());
try
{
assertBundleState(Bundle.INSTALLED, bundle.getState());
Modified: projects/jboss-osgi/projects/runtime/framework/trunk/bundle/src/test/java/org/jboss/test/osgi/bundle/BundleLifecycleTestCase.java
===================================================================
--- projects/jboss-osgi/projects/runtime/framework/trunk/bundle/src/test/java/org/jboss/test/osgi/bundle/BundleLifecycleTestCase.java 2010-03-23 12:43:47 UTC (rev 102777)
+++ projects/jboss-osgi/projects/runtime/framework/trunk/bundle/src/test/java/org/jboss/test/osgi/bundle/BundleLifecycleTestCase.java 2010-03-23 12:53:25 UTC (rev 102778)
@@ -83,7 +83,7 @@
assertBundleState(Bundle.INSTALLED, bundleA.getState());
// BundleA not started - service not available
- ServiceReference sref = context.getServiceReference(LifecycleService.class.getName());
+ ServiceReference sref = systemContext.getServiceReference(LifecycleService.class.getName());
assertNull("Service not available", sref);
VirtualFile assemblyB = assembleArchive("lifecycle-failstart", "/bundles/lifecycle/fail-on-start", FailOnStartActivator.class);
@@ -207,8 +207,8 @@
assertBundleState(Bundle.INSTALLED, bundleB.getState());
// Get the PackageAdmin service
- ServiceReference sref = context.getServiceReference(PackageAdmin.class.getName());
- PackageAdmin packageAdmin = (PackageAdmin)context.getService(sref);
+ ServiceReference sref = systemContext.getServiceReference(PackageAdmin.class.getName());
+ PackageAdmin packageAdmin = (PackageAdmin)systemContext.getService(sref);
// Attempt to explicitly resolve a bundle with missing dependency
boolean allResolved = packageAdmin.resolveBundles(new Bundle[] { bundleB });
Modified: projects/jboss-osgi/projects/runtime/framework/trunk/bundle/src/test/java/org/jboss/test/osgi/bundle/BundleTestCase.java
===================================================================
--- projects/jboss-osgi/projects/runtime/framework/trunk/bundle/src/test/java/org/jboss/test/osgi/bundle/BundleTestCase.java 2010-03-23 12:43:47 UTC (rev 102777)
+++ projects/jboss-osgi/projects/runtime/framework/trunk/bundle/src/test/java/org/jboss/test/osgi/bundle/BundleTestCase.java 2010-03-23 12:53:25 UTC (rev 102778)
@@ -172,7 +172,7 @@
Bundle bundle = installBundle(assemble1);
try
{
- int beforeCount = context.getBundles().length;
+ int beforeCount = systemContext.getBundles().length;
bundle.start();
assertBundleState(Bundle.ACTIVE, bundle.getState());
@@ -182,7 +182,7 @@
assertBundleState(Bundle.ACTIVE, bundle.getState());
assertEquals("Bundle-Version", "1.0.1", bundle.getHeaders().get(Constants.BUNDLE_VERSION));
- int afterCount = context.getBundles().length;
+ int afterCount = systemContext.getBundles().length;
assertEquals("Bundle count", beforeCount, afterCount);
}
finally
Modified: projects/jboss-osgi/projects/runtime/framework/trunk/bundle/src/test/java/org/jboss/test/osgi/classloader/BundleClassPathTestCase.java
===================================================================
--- projects/jboss-osgi/projects/runtime/framework/trunk/bundle/src/test/java/org/jboss/test/osgi/classloader/BundleClassPathTestCase.java 2010-03-23 12:43:47 UTC (rev 102777)
+++ projects/jboss-osgi/projects/runtime/framework/trunk/bundle/src/test/java/org/jboss/test/osgi/classloader/BundleClassPathTestCase.java 2010-03-23 12:53:25 UTC (rev 102778)
@@ -44,7 +44,7 @@
public void testBundleClassPath() throws Exception
{
URL bundleURL = getTestArchiveURL("bundle-classpath.war");
- Bundle bundle = context.installBundle(bundleURL.toExternalForm());
+ Bundle bundle = systemContext.installBundle(bundleURL.toExternalForm());
bundle.start();
assertEquals("Bundle state", Bundle.ACTIVE, bundle.getState());
Modified: projects/jboss-osgi/projects/runtime/framework/trunk/bundle/src/test/java/org/jboss/test/osgi/resolver/ResolverSmokeTestCase.java
===================================================================
--- projects/jboss-osgi/projects/runtime/framework/trunk/bundle/src/test/java/org/jboss/test/osgi/resolver/ResolverSmokeTestCase.java 2010-03-23 12:43:47 UTC (rev 102777)
+++ projects/jboss-osgi/projects/runtime/framework/trunk/bundle/src/test/java/org/jboss/test/osgi/resolver/ResolverSmokeTestCase.java 2010-03-23 12:53:25 UTC (rev 102778)
@@ -70,7 +70,7 @@
List<Bundle> unresolved = new ArrayList<Bundle>();
for (String path : bundlePaths)
{
- Bundle bundle = context.installBundle(getTestArchivePath(path));
+ Bundle bundle = systemContext.installBundle(getTestArchivePath(path));
unresolved.add(bundle);
}
Modified: projects/jboss-osgi/projects/runtime/framework/trunk/bundle/src/test/java/org/jboss/test/osgi/service/GetServiceReferencesTestCase.java
===================================================================
--- projects/jboss-osgi/projects/runtime/framework/trunk/bundle/src/test/java/org/jboss/test/osgi/service/GetServiceReferencesTestCase.java 2010-03-23 12:43:47 UTC (rev 102777)
+++ projects/jboss-osgi/projects/runtime/framework/trunk/bundle/src/test/java/org/jboss/test/osgi/service/GetServiceReferencesTestCase.java 2010-03-23 12:53:25 UTC (rev 102778)
@@ -23,13 +23,15 @@
// $Id: $
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.fail;
import java.util.Dictionary;
import java.util.Hashtable;
+import org.jboss.osgi.testing.OSGiFrameworkTest;
import org.jboss.osgi.vfs.VirtualFile;
-import org.jboss.test.osgi.AbstractFrameworkTest;
import org.jboss.test.osgi.service.support.a.A;
import org.jboss.test.osgi.service.support.b.B;
import org.junit.Test;
@@ -48,9 +50,8 @@
* @author Thomas.Diesler(a)jboss.com
* @version $Revision: 1.1 $
*/
-public class GetServiceReferencesTestCase extends AbstractFrameworkTest
+public class GetServiceReferencesTestCase extends OSGiFrameworkTest
{
-
@Test
public void testGetServiceReferences() throws Exception
{
@@ -161,6 +162,79 @@
}
@Test
+ public void testGetServiceReferencesMultiple() throws Exception
+ {
+ VirtualFile assemblyA = assembleArchive("simple1", "/bundles/simple/simple-bundle1", A.class);
+ Bundle bundleA = installBundle(assemblyA);
+ try
+ {
+ bundleA.start();
+ BundleContext contextA = bundleA.getBundleContext();
+ assertNotNull(contextA);
+
+ Class<?> clazz = bundleA.loadClass(A.class.getName());
+ Object service1 = clazz.newInstance();
+ ServiceRegistration sreg1 = contextA.registerService(A.class.getName(), service1, null);
+ assertNotNull(sreg1);
+ ServiceReference sref1 = sreg1.getReference();
+ assertNotNull(sref1);
+
+ VirtualFile assemblyB = assembleArchive("simple2", "/bundles/simple/simple-bundle2", A.class);
+ Bundle bundleB = installBundle(assemblyB);
+ try
+ {
+ bundleB.start();
+ BundleContext contextB = bundleB.getBundleContext();
+ assertNotNull(contextB);
+
+ clazz = bundleB.loadClass(A.class.getName());
+ Object service2 = clazz.newInstance();
+ ServiceRegistration sreg2 = contextB.registerService(A.class.getName(), service2, null);
+ assertNotNull(sreg2);
+ ServiceReference sref2 = sreg2.getReference();
+ assertNotNull(sref2);
+
+ ServiceReference[] srefs = systemContext.getServiceReferences(A.class.getName(), null);
+ assertEquals(2, srefs.length);
+ assertEquals(sref2, srefs[0]);
+ assertEquals(sref1, srefs[1]);
+
+ srefs = systemContext.getAllServiceReferences(A.class.getName(), null);
+ assertEquals(2, srefs.length);
+ assertEquals(sref2, srefs[0]);
+ assertEquals(sref1, srefs[1]);
+
+ srefs = contextA.getServiceReferences(A.class.getName(), null);
+ assertEquals(1, srefs.length);
+ assertEquals(sref1, srefs[0]);
+
+ System.out.println("FIXME: verify getAllServiceReferences()");
+ //srefs = contextA.getAllServiceReferences(A.class.getName(), null);
+ //assertEquals(2, srefs.length);
+ //assertEquals(sref2, srefs[0]);
+ //assertEquals(sref1, srefs[1]);
+
+ srefs = contextB.getServiceReferences(A.class.getName(), null);
+ assertEquals(1, srefs.length);
+ assertEquals(sref2, srefs[0]);
+
+ //srefs = contextB.getAllServiceReferences(A.class.getName(), null);
+ //assertEquals(2, srefs.length);
+ //assertEquals(sref2, srefs[0]);
+ //assertEquals(sref1, srefs[1]);
+ }
+ finally
+ {
+ bundleB.uninstall();
+ }
+ }
+ finally
+ {
+ bundleA.uninstall();
+ }
+ }
+
+ @Test
public void testGetServiceReferencesNoClassNotAssignable() throws Exception
{
assertGetServiceReferencesNotAssignable(null);
@@ -179,15 +253,15 @@
try
{
bundleA.start();
- BundleContext context1 = bundleA.getBundleContext();
- assertNotNull(context1);
+ BundleContext contextA = bundleA.getBundleContext();
+ assertNotNull(contextA);
if (className != null)
- assertNoGetReference(context1, className);
+ assertNoGetReference(contextA, className);
Class<?> clazz = bundleA.loadClass(A.class.getName());
Object service1 = clazz.newInstance();
- ServiceRegistration sreg1 = context1.registerService(A.class.getName(), service1, null);
+ ServiceRegistration sreg1 = contextA.registerService(A.class.getName(), service1, null);
assertNotNull(sreg1);
ServiceReference sref1 = sreg1.getReference();
assertNotNull(sref1);
@@ -197,59 +271,59 @@
try
{
bundleB.start();
- BundleContext context2 = bundleB.getBundleContext();
- assertNotNull(context2);
+ BundleContext contextB = bundleB.getBundleContext();
+ assertNotNull(contextB);
if (className != null)
- assertNoGetReference(context2, className);
+ assertNoGetReference(contextB, className);
clazz = bundleB.loadClass(A.class.getName());
Object service2 = clazz.newInstance();
- ServiceRegistration sreg2 = context2.registerService(A.class.getName(), service2, null);
+ ServiceRegistration sreg2 = contextB.registerService(A.class.getName(), service2, null);
assertNotNull(sreg2);
ServiceReference sref2 = sreg2.getReference();
assertNotNull(sref2);
if (className != null)
- assertGetReference(context1, className, sref1);
+ assertGetReference(contextA, className, sref1);
if (className != null)
- assertGetReference(context2, className, sref2);
+ assertGetReference(contextB, className, sref2);
sreg1.unregister();
if (className != null)
- assertNoGetReference(context1, className);
+ assertNoGetReference(contextA, className);
if (className != null)
- assertGetReference(context2, className, sref2);
+ assertGetReference(contextB, className, sref2);
- sreg1 = context1.registerService(A.class.getName(), service1, null);
+ sreg1 = contextA.registerService(A.class.getName(), service1, null);
assertNotNull(sreg1);
sref1 = sreg1.getReference();
assertNotNull(sref1);
if (className != null)
- assertGetReference(context1, className, sref1);
+ assertGetReference(contextA, className, sref1);
if (className != null)
- assertGetReference(context2, className, sref2);
+ assertGetReference(contextB, className, sref2);
sreg2.unregister();
if (className != null)
- assertGetReference(context1, className, sref1);
+ assertGetReference(contextA, className, sref1);
if (className != null)
- assertNoGetReference(context2, className);
+ assertNoGetReference(contextB, className);
sreg1.unregister();
if (className != null)
- assertNoGetReference(context1, className);
+ assertNoGetReference(contextA, className);
if (className != null)
- assertNoGetReference(context2, className);
+ assertNoGetReference(contextB, className);
}
finally
{
Deleted: projects/jboss-osgi/projects/runtime/framework/trunk/bundle/src/test/java/org/jboss/test/osgi/simple/SimpleBundleTestCase.java
===================================================================
--- projects/jboss-osgi/projects/runtime/framework/trunk/bundle/src/test/java/org/jboss/test/osgi/simple/SimpleBundleTestCase.java 2010-03-23 12:43:47 UTC (rev 102777)
+++ projects/jboss-osgi/projects/runtime/framework/trunk/bundle/src/test/java/org/jboss/test/osgi/simple/SimpleBundleTestCase.java 2010-03-23 12:53:25 UTC (rev 102778)
@@ -1,101 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2005, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.test.osgi.simple;
-
-//$Id$
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-
-import org.jboss.osgi.spi.util.ServiceLoader;
-import org.jboss.osgi.testing.OSGiBundle;
-import org.jboss.osgi.testing.OSGiRuntime;
-import org.jboss.osgi.testing.OSGiRuntimeHelper;
-import org.jboss.test.osgi.simple.bundleA.SimpleService;
-import org.junit.Test;
-import org.osgi.framework.Bundle;
-import org.osgi.framework.BundleContext;
-import org.osgi.framework.ServiceReference;
-import org.osgi.framework.launch.Framework;
-import org.osgi.framework.launch.FrameworkFactory;
-
-/**
- * A test that deployes a bundle and verifies its state
- *
- * @author thomas.diesler(a)jboss.com
- * @since 18-Aug-2009
- */
-public class SimpleBundleTestCase
-{
- @Test
- public void testBundleInstallLauchAPI() throws Exception
- {
- // Uses the OSGi Framework launch API
- FrameworkFactory factory = ServiceLoader.loadService(FrameworkFactory.class);
- Framework framework = factory.newFramework(null);
- framework.start();
-
- OSGiRuntimeHelper helper = new OSGiRuntimeHelper();
-
- BundleContext sysContext = framework.getBundleContext();
- Bundle bundle = sysContext.installBundle(helper.getTestArchivePath("simple-bundle.jar"));
-
- assertEquals("simple-bundle", bundle.getSymbolicName());
-
- bundle.start();
- assertEquals("Bundle state", Bundle.ACTIVE, bundle.getState());
-
- BundleContext bndContext = bundle.getBundleContext();
- assertNotNull("BundleContext not null", bndContext);
-
- // getServiceReference from bundle context
- ServiceReference sref = bndContext.getServiceReference(SimpleService.class.getName());
- assertNotNull("ServiceReference not null", sref);
-
- // getServiceReference from system context
- sref = sysContext.getServiceReference(SimpleService.class.getName());
- assertNotNull("ServiceReference not null", sref);
-
- bundle.uninstall();
- assertEquals("Bundle state", Bundle.UNINSTALLED, bundle.getState());
-
- framework.stop();
- }
-
- @Test
- public void testBundleInstallRuntimeAPI() throws Exception
- {
- // Uses the JBossOSGi SPI provided runtime abstraction
- OSGiRuntime runtime = new OSGiRuntimeHelper().getEmbeddedRuntime();
- OSGiBundle bundle = runtime.installBundle("simple-bundle.jar");
-
- assertEquals("simple-bundle", bundle.getSymbolicName());
-
- bundle.start();
- assertEquals("Bundle state", Bundle.ACTIVE, bundle.getState());
-
- bundle.uninstall();
- assertEquals("Bundle state", Bundle.UNINSTALLED, bundle.getState());
-
- runtime.shutdown();
- }
-}
\ No newline at end of file
Copied: projects/jboss-osgi/projects/runtime/framework/trunk/bundle/src/test/java/org/jboss/test/osgi/simple/SimpleFrameworkTestCase.java (from rev 102773, projects/jboss-osgi/projects/runtime/framework/trunk/bundle/src/test/java/org/jboss/test/osgi/simple/SimpleBundleTestCase.java)
===================================================================
--- projects/jboss-osgi/projects/runtime/framework/trunk/bundle/src/test/java/org/jboss/test/osgi/simple/SimpleFrameworkTestCase.java (rev 0)
+++ projects/jboss-osgi/projects/runtime/framework/trunk/bundle/src/test/java/org/jboss/test/osgi/simple/SimpleFrameworkTestCase.java 2010-03-23 12:53:25 UTC (rev 102778)
@@ -0,0 +1,71 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.test.osgi.simple;
+
+//$Id$
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+
+import java.net.URL;
+
+import org.jboss.osgi.testing.OSGiFrameworkTest;
+import org.jboss.test.osgi.simple.bundleA.SimpleService;
+import org.junit.Test;
+import org.osgi.framework.Bundle;
+import org.osgi.framework.BundleContext;
+import org.osgi.framework.ServiceReference;
+
+/**
+ * A test that deployes a bundle and verifies its state
+ *
+ * @author thomas.diesler(a)jboss.com
+ * @since 18-Aug-2009
+ */
+public class SimpleFrameworkTestCase extends OSGiFrameworkTest
+{
+ @Test
+ public void testBundleInstall() throws Exception
+ {
+ URL bundleURL = getTestArchiveURL("simple-bundle.jar");
+ Bundle bundle = systemContext.installBundle(bundleURL.toExternalForm());
+
+ assertEquals("simple-bundle", bundle.getSymbolicName());
+
+ bundle.start();
+ assertEquals("Bundle state", Bundle.ACTIVE, bundle.getState());
+
+ BundleContext bndContext = bundle.getBundleContext();
+ assertNotNull("BundleContext not null", bndContext);
+
+ // getServiceReference from bundle context
+ ServiceReference sref = bndContext.getServiceReference(SimpleService.class.getName());
+ assertNotNull("ServiceReference not null", sref);
+
+ // getServiceReference from system context
+ sref = systemContext.getServiceReference(SimpleService.class.getName());
+ assertNotNull("ServiceReference not null", sref);
+
+ bundle.uninstall();
+ assertEquals("Bundle state", Bundle.UNINSTALLED, bundle.getState());
+ }
+}
\ No newline at end of file
Modified: projects/jboss-osgi/projects/runtime/framework/trunk/bundle/src/test/java/org/jboss/test/osgi/simple/SimpleLogServiceTestCase.java
===================================================================
--- projects/jboss-osgi/projects/runtime/framework/trunk/bundle/src/test/java/org/jboss/test/osgi/simple/SimpleLogServiceTestCase.java 2010-03-23 12:43:47 UTC (rev 102777)
+++ projects/jboss-osgi/projects/runtime/framework/trunk/bundle/src/test/java/org/jboss/test/osgi/simple/SimpleLogServiceTestCase.java 2010-03-23 12:53:25 UTC (rev 102778)
@@ -51,7 +51,7 @@
@Test
public void testNoLogService() throws Exception
{
- Bundle bundle = context.installBundle(getTestArchivePath("simple-logservice-bundle.jar"));
+ Bundle bundle = systemContext.installBundle(getTestArchivePath("simple-logservice-bundle.jar"));
try
{
bundle.start();
@@ -70,12 +70,12 @@
@Test
public void testLogServiceFromThirdParty() throws Exception
{
- Bundle logBundle = context.installBundle(getTestArchivePath("bundles/org.apache.felix.log.jar"));
+ Bundle logBundle = systemContext.installBundle(getTestArchivePath("bundles/org.apache.felix.log.jar"));
try
{
logBundle.start();
- Bundle bundle = context.installBundle(getTestArchivePath("simple-logservice-bundle.jar"));
+ Bundle bundle = systemContext.installBundle(getTestArchivePath("simple-logservice-bundle.jar"));
try
{
try
@@ -102,10 +102,10 @@
@Test
public void testLogServiceFromCompendium() throws Exception
{
- Bundle cmpnBundle = context.installBundle(getTestArchivePath("bundles/org.osgi.compendium.jar"));
+ Bundle cmpnBundle = systemContext.installBundle(getTestArchivePath("bundles/org.osgi.compendium.jar"));
try
{
- Bundle bundle = context.installBundle(getTestArchivePath("simple-logservice-bundle.jar"));
+ Bundle bundle = systemContext.installBundle(getTestArchivePath("simple-logservice-bundle.jar"));
try
{
bundle.start();
@@ -132,15 +132,15 @@
@Test
public void testLogServiceFromTwoExporters() throws Exception
{
- Bundle cmpnBundle = context.installBundle(getTestArchivePath("bundles/org.osgi.compendium.jar"));
+ Bundle cmpnBundle = systemContext.installBundle(getTestArchivePath("bundles/org.osgi.compendium.jar"));
try
{
- Bundle logBundle = context.installBundle(getTestArchivePath("bundles/org.apache.felix.log.jar"));
+ Bundle logBundle = systemContext.installBundle(getTestArchivePath("bundles/org.apache.felix.log.jar"));
try
{
logBundle.start();
- Bundle bundle = context.installBundle(getTestArchivePath("simple-logservice-bundle.jar"));
+ Bundle bundle = systemContext.installBundle(getTestArchivePath("simple-logservice-bundle.jar"));
try
{
bundle.start();
Added: projects/jboss-osgi/projects/runtime/framework/trunk/bundle/src/test/java/org/jboss/test/osgi/simple/SimpleRuntimeTestCase.java
===================================================================
--- projects/jboss-osgi/projects/runtime/framework/trunk/bundle/src/test/java/org/jboss/test/osgi/simple/SimpleRuntimeTestCase.java (rev 0)
+++ projects/jboss-osgi/projects/runtime/framework/trunk/bundle/src/test/java/org/jboss/test/osgi/simple/SimpleRuntimeTestCase.java 2010-03-23 12:53:25 UTC (rev 102778)
@@ -0,0 +1,59 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.test.osgi.simple;
+
+//$Id: SimpleBundleTestCase.java 102773 2010-03-23 11:38:05Z thomas.diesler(a)jboss.com $
+
+import static org.junit.Assert.assertEquals;
+
+import org.jboss.osgi.testing.OSGiBundle;
+import org.jboss.osgi.testing.OSGiRuntime;
+import org.jboss.osgi.testing.OSGiRuntimeTest;
+import org.junit.Test;
+import org.osgi.framework.Bundle;
+
+/**
+ * A test that deployes a bundle and verifies its state
+ *
+ * @author thomas.diesler(a)jboss.com
+ * @since 18-Aug-2009
+ */
+public class SimpleRuntimeTestCase extends OSGiRuntimeTest
+{
+ @Test
+ public void testBundleInstall() throws Exception
+ {
+ // Uses the JBossOSGi SPI provided runtime abstraction
+ OSGiRuntime runtime = getDefaultRuntime();
+ OSGiBundle bundle = runtime.installBundle("simple-bundle.jar");
+
+ assertEquals("simple-bundle", bundle.getSymbolicName());
+
+ bundle.start();
+ assertEquals("Bundle state", Bundle.ACTIVE, bundle.getState());
+
+ bundle.uninstall();
+ assertEquals("Bundle state", Bundle.UNINSTALLED, bundle.getState());
+
+ runtime.shutdown();
+ }
+}
\ No newline at end of file
Modified: projects/jboss-osgi/projects/spi/trunk/src/main/java/org/jboss/osgi/testing/OSGiFrameworkTest.java
===================================================================
--- projects/jboss-osgi/projects/spi/trunk/src/main/java/org/jboss/osgi/testing/OSGiFrameworkTest.java 2010-03-23 12:43:47 UTC (rev 102777)
+++ projects/jboss-osgi/projects/spi/trunk/src/main/java/org/jboss/osgi/testing/OSGiFrameworkTest.java 2010-03-23 12:53:25 UTC (rev 102778)
@@ -66,7 +66,7 @@
private static final Logger log = Logger.getLogger(OSGiFrameworkTest.class);
protected static Framework framework;
- protected static BundleContext context;
+ protected static BundleContext systemContext;
private final List<FrameworkEvent> frameworkEvents = new CopyOnWriteArrayList<FrameworkEvent>();
private final List<BundleEvent> bundleEvents = new CopyOnWriteArrayList<BundleEvent>();
@@ -80,7 +80,7 @@
framework.start();
// Get the system context
- context = framework.getBundleContext();
+ systemContext = framework.getBundleContext();
}
@AfterClass
@@ -96,21 +96,21 @@
protected PackageAdmin getPackageAdmin()
{
- ServiceReference sref = context.getServiceReference(PackageAdmin.class.getName());
- return (PackageAdmin)context.getService(sref);
+ ServiceReference sref = systemContext.getServiceReference(PackageAdmin.class.getName());
+ return (PackageAdmin)systemContext.getService(sref);
}
protected Bundle installBundle(VirtualFile archive) throws Exception
{
- String location = archive.toURL().toExternalForm();
- return context.installBundle(location, archive.openStream());
+ String location = archive.getPathName();
+ return systemContext.installBundle(location, archive.openStream());
}
protected void assertLoadClass(Bundle bundle, String className, Bundle exporter)
{
Class<?> clazz = assertLoadClass(bundle, className);
Bundle actual = getPackageAdmin().getBundle(clazz);
- assertEquals(exporter, actual);
+ assertEquals("Loaded from ClassLoader", exporter, actual);
}
@Override
14 years, 3 months
- 1
- 0