JBoss-OSGI SVN: r103033 - in projects/jboss-osgi: projects/runtime/framework/trunk/core/src/main/java/org/jboss/osgi/framework/classloading and 2 other directories.
by jboss-osgi-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2010-03-26 07:28:12 -0400 (Fri, 26 Mar 2010)
New Revision: 103033
Modified:
projects/jboss-osgi/projects/bundles/husky/trunk/pom.xml
projects/jboss-osgi/projects/runtime/framework/trunk/core/src/main/java/org/jboss/osgi/framework/classloading/OSGiCoreClassFilter.java
projects/jboss-osgi/projects/spi/trunk/src/main/java/org/jboss/osgi/testing/OSGiTest.java
projects/jboss-osgi/trunk/distribution/installer/src/main/resources/installer/install-definition.xml
Log:
Add shrinkwrap-api to runtime/lib
Modified: projects/jboss-osgi/projects/bundles/husky/trunk/pom.xml
===================================================================
--- projects/jboss-osgi/projects/bundles/husky/trunk/pom.xml 2010-03-26 11:22:14 UTC (rev 103032)
+++ projects/jboss-osgi/projects/bundles/husky/trunk/pom.xml 2010-03-26 11:28:12 UTC (rev 103033)
@@ -185,8 +185,7 @@
</Private-Package>
<Embed-Transitive>true</Embed-Transitive>
<Embed-Dependency>
- junit;inline=false,
- shrinkwrap-api;inline=false,
+ junit;inline=false
</Embed-Dependency>
<_exportcontents>
org.junit;version=${version.junit}
Modified: projects/jboss-osgi/projects/runtime/framework/trunk/core/src/main/java/org/jboss/osgi/framework/classloading/OSGiCoreClassFilter.java
===================================================================
--- projects/jboss-osgi/projects/runtime/framework/trunk/core/src/main/java/org/jboss/osgi/framework/classloading/OSGiCoreClassFilter.java 2010-03-26 11:22:14 UTC (rev 103032)
+++ projects/jboss-osgi/projects/runtime/framework/trunk/core/src/main/java/org/jboss/osgi/framework/classloading/OSGiCoreClassFilter.java 2010-03-26 11:28:12 UTC (rev 103033)
@@ -55,6 +55,7 @@
"org.osgi.service.packageadmin",
"org.osgi.service.permissionadmin",
"org.osgi.service.startlevel",
+ "org.osgi.service.tracker",
"org.osgi.service.url"
};
}
Modified: projects/jboss-osgi/projects/spi/trunk/src/main/java/org/jboss/osgi/testing/OSGiTest.java
===================================================================
--- projects/jboss-osgi/projects/spi/trunk/src/main/java/org/jboss/osgi/testing/OSGiTest.java 2010-03-26 11:22:14 UTC (rev 103032)
+++ projects/jboss-osgi/projects/spi/trunk/src/main/java/org/jboss/osgi/testing/OSGiTest.java 2010-03-26 11:28:12 UTC (rev 103033)
@@ -144,7 +144,7 @@
/**
* Delegates to {@link OSGiTestHelper#getInitialContext()}
*/
- public InitialContext getInitialContext() throws NamingException
+ protected InitialContext getInitialContext() throws NamingException
{
return getTestHelper().getInitialContext();
}
@@ -152,7 +152,7 @@
/**
* Delegates to {@link OSGiTestHelper#getServerHost()}
*/
- public String getServerHost()
+ protected String getServerHost()
{
return getTestHelper().getServerHost();
}
@@ -160,7 +160,7 @@
/**
* Delegates to {@link OSGiTestHelper#getTargetContainer()}
*/
- public String getTargetContainer()
+ protected String getTargetContainer()
{
return getTestHelper().getTargetContainer();
}
@@ -168,7 +168,7 @@
/**
* Delegates to {@link OSGiTestHelper#getFrameworkName()}
*/
- public String getFrameworkName()
+ protected String getFrameworkName()
{
return getTestHelper().getFrameworkName();
}
@@ -176,28 +176,31 @@
/**
* Delegates to {@link OSGiTestHelper#assembleArchive(String, String, Class...)}
*/
- public Archive<?> assembleArchive(String name, String resource, Class<?>... packages) throws Exception
+ protected Archive<?> assembleArchive(String name, String resource, Class<?>... packages) throws Exception
{
return getTestHelper().assembleArchive(name, resource, packages);
}
- public VirtualFile toVirtualFile(Archive<?> archive) throws IOException, MalformedURLException
- {
- return OSGiTestHelper.toVirtualFile(archive);
- }
-
/**
* Delegates to {@link OSGiTestHelper#assembleArchive(String, String[], Class...)}
*/
- public Archive<?> assembleArchive(String name, String[] resources, Class<?>... packages) throws Exception
+ protected Archive<?> assembleArchive(String name, String[] resources, Class<?>... packages) throws Exception
{
return getTestHelper().assembleArchive(name, resources, packages);
}
/**
+ * Delegates to {@link OSGiTestHelper#toVirtualFile(Archive)}
+ */
+ protected VirtualFile toVirtualFile(Archive<?> archive) throws IOException, MalformedURLException
+ {
+ return OSGiTestHelper.toVirtualFile(archive);
+ }
+
+ /**
* Delegates to {@link OSGiTestHelper#assertBundleState(int, int)}
*/
- public void assertBundleState(int expState, int wasState)
+ protected void assertBundleState(int expState, int wasState)
{
getTestHelper().assertBundleState(expState, wasState);
}
@@ -205,7 +208,7 @@
/**
* Delegates to {@link OSGiTestHelper#assertLoadClass(Bundle, String)}
*/
- public Class<?> assertLoadClass(Bundle bundle, String className)
+ protected Class<?> assertLoadClass(Bundle bundle, String className)
{
return getTestHelper().assertLoadClass(bundle, className);
}
@@ -213,7 +216,7 @@
/**
* Delegates to {@link OSGiTestHelper#assertLoadClassFail(Bundle, String)}
*/
- public void assertLoadClassFail(Bundle bundle, String className)
+ protected void assertLoadClassFail(Bundle bundle, String className)
{
getTestHelper().assertLoadClassFail(bundle, className);
}
Modified: projects/jboss-osgi/trunk/distribution/installer/src/main/resources/installer/install-definition.xml
===================================================================
--- projects/jboss-osgi/trunk/distribution/installer/src/main/resources/installer/install-definition.xml 2010-03-26 11:22:14 UTC (rev 103032)
+++ projects/jboss-osgi/trunk/distribution/installer/src/main/resources/installer/install-definition.xml 2010-03-26 11:28:12 UTC (rev 103033)
@@ -192,6 +192,7 @@
<include name="jboss-osgi-vfs30.jar" />
<include name="jboss-vfs.jar" />
<include name="log4j.jar" />
+ <include name="shrinkwrap-api.jar" />
<include name="slf4j-api.jar" />
<include name="slf4j-log4j12.jar" />
</fileset>
@@ -311,7 +312,7 @@
<include name="pax-web-extender-war.jar" />
</fileset>
- <!-- JBossMC Integration -->
+ <!-- Native Integration -->
<singlefile condition="isJBossMC" src="@{runtime.dir}/server/conf/jboss-osgi-bootstrap.xml" target="$INSTALL_PATH/runtime/server/minimal/conf/jboss-osgi-bootstrap.xml"
override="true" />
@@ -354,6 +355,7 @@
</fileset>
<fileset condition="isJBossMC" dir="@{deploy.artifacts.dir}/lib/org.osgi" targetdir="$INSTALL_PATH/runtime/lib" override="true">
<include name="org.osgi.core.jar" />
+ <include name="org.osgi.compendium.jar" /> <!-- Used for org.osgi.service.tracker delegation -->
</fileset>
<fileset condition="isJBossMC" dir="@{deploy.artifacts.dir}/lib/org.osgi" targetdir="$INSTALL_PATH/runtime/server/minimal/deploy" override="true">
<include name="org.osgi.compendium.jar" />
@@ -406,6 +408,7 @@
<include name="jboss-osgi-jbossas.jar" />
<include name="jboss-osgi-spi.jar" />
<include name="jboss-osgi-vfs.jar" />
+ <include name="shrinkwrap-api.jar" />
</fileset>
<fileset condition="!isJBoss601" dir="@{deploy.artifacts.dir}/lib" targetdir="${jbossInstallPath}/server/${jbossTargetServer}/deployers/osgi.deployer" override="true">
<include name="jboss-osgi-deployers-vfs21.jar" />
@@ -475,7 +478,7 @@
<include name="pax-web-extender-war.jar" />
</fileset>
- <!-- JBossMC Integration -->
+ <!-- Native Integration -->
<fileset condition="isJBossMC" dir="@{deploy.artifacts.dir}/lib" targetdir="${jbossInstallPath}/server/${jbossTargetServer}/deployers/osgi.deployer"
override="true">
@@ -496,6 +499,7 @@
<fileset condition="isJBossMC" dir="@{deploy.artifacts.dir}/lib/org.osgi" targetdir="${jbossInstallPath}/server/${jbossTargetServer}/deployers/osgi.deployer"
override="true">
<include name="org.osgi.core.jar" />
+ <include name="org.osgi.compendium.jar" /> <!-- Used for org.osgi.service.tracker delegation -->
</fileset>
<fileset condition="isJBossMC" dir="@{deploy.artifacts.dir}/lib/org.osgi" targetdir="${jbossInstallPath}/server/${jbossTargetServer}/deploy/osgi"
override="true">
14 years, 3 months
- 1
- 0
JBoss-OSGI SVN: r103027 - in projects/jboss-osgi/projects: runtime/framework/trunk/bundle/src/test/resources and 2 other directories.
by jboss-osgi-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2010-03-26 06:50:26 -0400 (Fri, 26 Mar 2010)
New Revision: 103027
Modified:
projects/jboss-osgi/projects/runtime/framework/trunk/bundle/src/test/java/org/jboss/test/osgi/classloader/DynamicImportPackageTestCase.java
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/classloading/OSGiPackageRequirement.java
projects/jboss-osgi/projects/spi/trunk/src/main/java/org/jboss/osgi/testing/OSGiManifestBuilder.java
Log:
Add DynamicImport-Package support to OSGiManifestBuilder
Modified: projects/jboss-osgi/projects/runtime/framework/trunk/bundle/src/test/java/org/jboss/test/osgi/classloader/DynamicImportPackageTestCase.java
===================================================================
--- projects/jboss-osgi/projects/runtime/framework/trunk/bundle/src/test/java/org/jboss/test/osgi/classloader/DynamicImportPackageTestCase.java 2010-03-26 10:24:57 UTC (rev 103026)
+++ projects/jboss-osgi/projects/runtime/framework/trunk/bundle/src/test/java/org/jboss/test/osgi/classloader/DynamicImportPackageTestCase.java 2010-03-26 10:50:26 UTC (rev 103027)
@@ -52,7 +52,6 @@
{
bundle.start();
assertBundleState(Bundle.ACTIVE, bundle.getState());
-
assertLoadClass(bundle, LogService.class.getName());
}
finally
@@ -75,7 +74,6 @@
{
bundle.start();
assertBundleState(Bundle.ACTIVE, bundle.getState());
-
assertLoadClassFail(bundle, LogService.class.getName());
Bundle cmpd = installBundle("bundles/org.osgi.compendium.jar");
@@ -97,14 +95,14 @@
private JavaArchive getBundleArchive()
{
- JavaArchive archive = Archives.create("dynamic-log-service", JavaArchive.class);
+ final JavaArchive archive = Archives.create("dynamic-log-service", JavaArchive.class);
archive.setManifest(new Asset()
{
public InputStream openStream()
{
OSGiManifestBuilder builder = OSGiManifestBuilder.newInstance();
builder.addBundleManifestVersion(2);
- builder.addBundleSymbolicName("dynamic-log-service");
+ builder.addBundleSymbolicName(archive.getName());
builder.addDynamicImportPackages("org.osgi.service.log");
return builder.openStream();
}
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-26 10:24:57 UTC (rev 103026)
+++ projects/jboss-osgi/projects/runtime/framework/trunk/bundle/src/test/resources/log4j.xml 2010-03-26 10:50:26 UTC (rev 103027)
@@ -33,9 +33,12 @@
<!-- ================ -->
<!-- Show jboss deployer traces - ->
- <category name="org.jboss.deployer">
+ <category name="org.jboss.classloading">
<priority value="TRACE" />
</category>
+ <category name="org.jboss.classloader">
+ <priority value="TRACE" />
+ </category>
-->
<!-- ======================= -->
Modified: projects/jboss-osgi/projects/runtime/framework/trunk/core/src/main/java/org/jboss/osgi/framework/classloading/OSGiPackageRequirement.java
===================================================================
--- projects/jboss-osgi/projects/runtime/framework/trunk/core/src/main/java/org/jboss/osgi/framework/classloading/OSGiPackageRequirement.java 2010-03-26 10:24:57 UTC (rev 103026)
+++ projects/jboss-osgi/projects/runtime/framework/trunk/core/src/main/java/org/jboss/osgi/framework/classloading/OSGiPackageRequirement.java 2010-03-26 10:50:26 UTC (rev 103027)
@@ -105,20 +105,26 @@
super(name, versionRange);
if (bundleState == null)
throw new IllegalArgumentException("Null bundleState");
- if (packageAttribute == null)
- throw new IllegalArgumentException("Null packageAttribute");
+
+ // TODO enable this check when BasicResolver does not abuse
+ // PackageRequirement for RequireBundle any more
+ //if (packageAttribute == null)
+ // throw new IllegalArgumentException("Null packageAttribute");
this.bundleState = bundleState;
this.packageAttribute = packageAttribute;
- // resolution:=optional
- String resolution = packageAttribute.getDirectiveValue(Constants.RESOLUTION_DIRECTIVE, String.class);
- if (Constants.RESOLUTION_OPTIONAL.equals(resolution))
- setOptional(true);
+ if (packageAttribute != null)
+ {
+ // resolution:=optional
+ String resolution = packageAttribute.getDirectiveValue(Constants.RESOLUTION_DIRECTIVE, String.class);
+ if (Constants.RESOLUTION_OPTIONAL.equals(resolution))
+ setOptional(true);
- // DynamicImport-Package
- if (isDynamic == true)
- setDynamic(true);
+ // DynamicImport-Package
+ if (isDynamic == true)
+ setDynamic(true);
+ }
}
/**
Modified: projects/jboss-osgi/projects/spi/trunk/src/main/java/org/jboss/osgi/testing/OSGiManifestBuilder.java
===================================================================
--- projects/jboss-osgi/projects/spi/trunk/src/main/java/org/jboss/osgi/testing/OSGiManifestBuilder.java 2010-03-26 10:24:57 UTC (rev 103026)
+++ projects/jboss-osgi/projects/spi/trunk/src/main/java/org/jboss/osgi/testing/OSGiManifestBuilder.java 2010-03-26 10:50:26 UTC (rev 103027)
@@ -47,6 +47,7 @@
private PrintWriter pw;
private List<String> importPackages = new ArrayList<String>();
private List<String> exportPackages = new ArrayList<String>();
+ private List<String> dynamicImportPackages = new ArrayList<String>();
public static OSGiManifestBuilder newInstance()
{
@@ -86,6 +87,14 @@
return this;
}
+ public OSGiManifestBuilder addDynamicImportPackages(String... packages)
+ {
+ for (String aux : packages)
+ dynamicImportPackages.add(aux);
+
+ return this;
+ }
+
public OSGiManifestBuilder addExportPackages(String... packages)
{
for (String aux : packages)
@@ -102,6 +111,7 @@
public Manifest getManifest()
{
+ // Export-Package
if (exportPackages.size() > 0)
{
pw.print(Constants.EXPORT_PACKAGE + ": ");
@@ -115,6 +125,7 @@
pw.println();
}
+ // Import-Package
if (importPackages.size() > 0)
{
pw.print(Constants.IMPORT_PACKAGE + ": ");
@@ -128,6 +139,20 @@
pw.println();
}
+ // DynamicImport-Package
+ if (dynamicImportPackages.size() > 0)
+ {
+ pw.print(Constants.DYNAMICIMPORT_PACKAGE + ": ");
+ for (int i = 0; i < dynamicImportPackages.size(); i++)
+ {
+ if (i > 0)
+ pw.print(",");
+
+ pw.print(dynamicImportPackages.get(i));
+ }
+ pw.println();
+ }
+
try
{
Manifest manifest = new Manifest(new ByteArrayInputStream(sw.toString().getBytes()));
14 years, 3 months
- 1
- 0
JBoss-OSGI SVN: r103025 - in projects/jboss-osgi/projects/runtime/framework/trunk: bundle/src/test/java/org/jboss/test/osgi/bundle and 6 other directories.
by jboss-osgi-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2010-03-26 06:07:20 -0400 (Fri, 26 Mar 2010)
New Revision: 103025
Added:
projects/jboss-osgi/projects/runtime/framework/trunk/bundle/src/test/java/org/jboss/test/osgi/classloader/DynamicImportPackageTestCase.java
projects/jboss-osgi/projects/runtime/framework/trunk/core/src/main/java/org/jboss/osgi/framework/deployers/AbstractClassLoadingDeployer.java
Removed:
projects/jboss-osgi/projects/runtime/framework/trunk/core/src/main/java/org/jboss/osgi/framework/deployers/AbstractOSGiClassLoadingDeployer.java
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/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/simple/SimpleFrameworkTestCase.java
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/core/src/main/java/org/jboss/osgi/framework/classloading/OSGiPackageRequirement.java
projects/jboss-osgi/projects/runtime/framework/trunk/core/src/main/java/org/jboss/osgi/framework/deployers/OSGiBundleClassLoadingDeployer.java
projects/jboss-osgi/projects/runtime/framework/trunk/core/src/main/java/org/jboss/osgi/framework/deployers/OSGiFragmentClassLoadingDeployer.java
projects/jboss-osgi/projects/runtime/framework/trunk/core/src/main/java/org/jboss/osgi/framework/resolver/internal/basic/BasicResolverImpl.java
projects/jboss-osgi/projects/runtime/framework/trunk/pom.xml
Log:
[JBCL-131] Add a notion of on demand resolution
Add initial test coverage for DynamicImport-Package
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-26 10:01:44 UTC (rev 103024)
+++ projects/jboss-osgi/projects/runtime/framework/trunk/bundle/src/test/java/org/jboss/test/osgi/bundle/BundleContextTestCase.java 2010-03-26 10:07:20 UTC (rev 103025)
@@ -212,13 +212,13 @@
public void testInstallBundle() throws Exception
{
URL url = getTestArchiveURL("bundles/jboss-osgi-common.jar");
- Bundle bundle = systemContext.installBundle(url.toExternalForm());
+ Bundle bundle = installBundle(url.toExternalForm());
try
{
assertBundleState(Bundle.INSTALLED, bundle.getState());
assertEquals(url.toExternalForm(), bundle.getLocation());
- Bundle duplicate = systemContext.installBundle(url.toExternalForm());
+ Bundle duplicate = installBundle(url.toExternalForm());
assertSame("Duplicate bundle", bundle, duplicate);
}
finally
@@ -229,7 +229,7 @@
// Test file location
String location = getTestArchivePath("bundles/jboss-osgi-common.jar");
- bundle = systemContext.installBundle(location);
+ bundle = installBundle(location);
try
{
assertBundleState(Bundle.INSTALLED, bundle.getState());
@@ -242,7 +242,7 @@
}
// Test symbolic location
- bundle = systemContext.installBundle("/symbolic/location", url.openStream());
+ bundle = 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/classloader/BundleClassPathTestCase.java
===================================================================
--- projects/jboss-osgi/projects/runtime/framework/trunk/bundle/src/test/java/org/jboss/test/osgi/classloader/BundleClassPathTestCase.java 2010-03-26 10:01:44 UTC (rev 103024)
+++ projects/jboss-osgi/projects/runtime/framework/trunk/bundle/src/test/java/org/jboss/test/osgi/classloader/BundleClassPathTestCase.java 2010-03-26 10:07:20 UTC (rev 103025)
@@ -44,7 +44,7 @@
public void testBundleClassPath() throws Exception
{
URL bundleURL = getTestArchiveURL("bundle-classpath.war");
- Bundle bundle = systemContext.installBundle(bundleURL.toExternalForm());
+ Bundle bundle = installBundle(bundleURL.toExternalForm());
bundle.start();
assertEquals("Bundle state", Bundle.ACTIVE, bundle.getState());
Added: projects/jboss-osgi/projects/runtime/framework/trunk/bundle/src/test/java/org/jboss/test/osgi/classloader/DynamicImportPackageTestCase.java
===================================================================
--- projects/jboss-osgi/projects/runtime/framework/trunk/bundle/src/test/java/org/jboss/test/osgi/classloader/DynamicImportPackageTestCase.java (rev 0)
+++ projects/jboss-osgi/projects/runtime/framework/trunk/bundle/src/test/java/org/jboss/test/osgi/classloader/DynamicImportPackageTestCase.java 2010-03-26 10:07:20 UTC (rev 103025)
@@ -0,0 +1,114 @@
+/*
+* JBoss, Home of Professional Open Source
+* Copyright 2009, Red Hat Middleware LLC, and individual contributors
+* as indicated by the @author tags. See the copyright.txt file 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.classloader;
+
+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.service.log.LogService;
+
+/**
+ * Test the DynamicImport-Package manifest header.
+ *
+ * @author thomas.diesler(a)jboss.com
+ * @since 26-Mar-2010
+ */
+public class DynamicImportPackageTestCase extends OSGiFrameworkTest
+{
+ @Test
+ public void testLogServiceAvailableOnInstall() throws Exception
+ {
+ Bundle cmpd = installBundle("bundles/org.osgi.compendium.jar");
+ try
+ {
+ Bundle bundle = installBundle(getBundleArchive());
+ assertBundleState(Bundle.INSTALLED, bundle.getState());
+ try
+ {
+ bundle.start();
+ assertBundleState(Bundle.ACTIVE, bundle.getState());
+
+ assertLoadClass(bundle, LogService.class.getName());
+ }
+ finally
+ {
+ bundle.uninstall();
+ }
+ }
+ finally
+ {
+ cmpd.uninstall();
+ }
+ }
+
+ @Test
+ public void testLogServiceNotAvailableOnInstall() throws Exception
+ {
+ Bundle bundle = installBundle(getBundleArchive());
+ assertBundleState(Bundle.INSTALLED, bundle.getState());
+ try
+ {
+ bundle.start();
+ assertBundleState(Bundle.ACTIVE, bundle.getState());
+
+ assertLoadClassFail(bundle, LogService.class.getName());
+
+ Bundle cmpd = installBundle("bundles/org.osgi.compendium.jar");
+ try
+ {
+ System.out.println("FIXME [JBCL-131] Add a notion of on demand resolution");
+ //assertLoadClass(bundle, LogService.class.getName());
+ }
+ finally
+ {
+ cmpd.uninstall();
+ }
+ }
+ finally
+ {
+ bundle.uninstall();
+ }
+ }
+
+ private JavaArchive getBundleArchive()
+ {
+ JavaArchive archive = Archives.create("dynamic-log-service", JavaArchive.class);
+ archive.setManifest(new Asset()
+ {
+ public InputStream openStream()
+ {
+ OSGiManifestBuilder builder = OSGiManifestBuilder.newInstance();
+ builder.addBundleManifestVersion(2);
+ builder.addBundleSymbolicName("dynamic-log-service");
+ builder.addDynamicImportPackages("org.osgi.service.log");
+ return builder.openStream();
+ }
+ });
+ return archive;
+ }
+}
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-26 10:01:44 UTC (rev 103024)
+++ projects/jboss-osgi/projects/runtime/framework/trunk/bundle/src/test/java/org/jboss/test/osgi/resolver/ResolverSmokeTestCase.java 2010-03-26 10:07:20 UTC (rev 103025)
@@ -36,7 +36,6 @@
import org.jboss.test.osgi.AbstractFrameworkTest;
import org.junit.Test;
import org.osgi.framework.Bundle;
-import org.osgi.framework.BundleException;
/**
* Smoketest for the {@link Resolver}
@@ -47,7 +46,7 @@
public class ResolverSmokeTestCase extends AbstractFrameworkTest
{
@Test
- public void testRandomBundleResolution() throws BundleException
+ public void testRandomBundleResolution() throws Exception
{
List<String> bundlePaths = new ArrayList<String>();
bundlePaths.add("bundles/jboss-osgi-apache-xerces.jar");
@@ -70,7 +69,7 @@
List<Bundle> unresolved = new ArrayList<Bundle>();
for (String path : bundlePaths)
{
- Bundle bundle = systemContext.installBundle(getTestArchivePath(path));
+ Bundle bundle = installBundle(getTestArchivePath(path));
unresolved.add(bundle);
}
Modified: 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/SimpleFrameworkTestCase.java 2010-03-26 10:01:44 UTC (rev 103024)
+++ projects/jboss-osgi/projects/runtime/framework/trunk/bundle/src/test/java/org/jboss/test/osgi/simple/SimpleFrameworkTestCase.java 2010-03-26 10:07:20 UTC (rev 103025)
@@ -47,7 +47,7 @@
public void testBundleInstall() throws Exception
{
URL bundleURL = getTestArchiveURL("simple-bundle.jar");
- Bundle bundle = systemContext.installBundle(bundleURL.toExternalForm());
+ Bundle bundle = installBundle(bundleURL.toExternalForm());
assertEquals("simple-bundle", bundle.getSymbolicName());
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-26 10:01:44 UTC (rev 103024)
+++ projects/jboss-osgi/projects/runtime/framework/trunk/bundle/src/test/java/org/jboss/test/osgi/simple/SimpleLogServiceTestCase.java 2010-03-26 10:07:20 UTC (rev 103025)
@@ -51,7 +51,7 @@
@Test
public void testNoLogService() throws Exception
{
- Bundle bundle = systemContext.installBundle(getTestArchivePath("simple-logservice-bundle.jar"));
+ Bundle bundle = installBundle(getTestArchivePath("simple-logservice-bundle.jar"));
try
{
bundle.start();
@@ -70,12 +70,12 @@
@Test
public void testLogServiceFromThirdParty() throws Exception
{
- Bundle logBundle = systemContext.installBundle(getTestArchivePath("bundles/org.apache.felix.log.jar"));
+ Bundle logBundle = installBundle(getTestArchivePath("bundles/org.apache.felix.log.jar"));
try
{
logBundle.start();
- Bundle bundle = systemContext.installBundle(getTestArchivePath("simple-logservice-bundle.jar"));
+ Bundle bundle = installBundle(getTestArchivePath("simple-logservice-bundle.jar"));
try
{
try
@@ -102,10 +102,10 @@
@Test
public void testLogServiceFromCompendium() throws Exception
{
- Bundle cmpnBundle = systemContext.installBundle(getTestArchivePath("bundles/org.osgi.compendium.jar"));
+ Bundle cmpnBundle = installBundle(getTestArchivePath("bundles/org.osgi.compendium.jar"));
try
{
- Bundle bundle = systemContext.installBundle(getTestArchivePath("simple-logservice-bundle.jar"));
+ Bundle bundle = installBundle(getTestArchivePath("simple-logservice-bundle.jar"));
try
{
bundle.start();
@@ -132,15 +132,15 @@
@Test
public void testLogServiceFromTwoExporters() throws Exception
{
- Bundle cmpnBundle = systemContext.installBundle(getTestArchivePath("bundles/org.osgi.compendium.jar"));
+ Bundle cmpnBundle = installBundle(getTestArchivePath("bundles/org.osgi.compendium.jar"));
try
{
- Bundle logBundle = systemContext.installBundle(getTestArchivePath("bundles/org.apache.felix.log.jar"));
+ Bundle logBundle = installBundle(getTestArchivePath("bundles/org.apache.felix.log.jar"));
try
{
logBundle.start();
- Bundle bundle = systemContext.installBundle(getTestArchivePath("simple-logservice-bundle.jar"));
+ Bundle bundle = installBundle(getTestArchivePath("simple-logservice-bundle.jar"));
try
{
bundle.start();
Modified: projects/jboss-osgi/projects/runtime/framework/trunk/core/src/main/java/org/jboss/osgi/framework/classloading/OSGiPackageRequirement.java
===================================================================
--- projects/jboss-osgi/projects/runtime/framework/trunk/core/src/main/java/org/jboss/osgi/framework/classloading/OSGiPackageRequirement.java 2010-03-26 10:01:44 UTC (rev 103024)
+++ projects/jboss-osgi/projects/runtime/framework/trunk/core/src/main/java/org/jboss/osgi/framework/classloading/OSGiPackageRequirement.java 2010-03-26 10:07:20 UTC (rev 103025)
@@ -35,7 +35,7 @@
import org.osgi.framework.Constants;
/**
- * OSGiPackageRequirement.
+ * A classloading requirement that extends a {@link PackageRequirement} by OSGi metadata.
*
* todo PackagePermission/IMPORT
* @author <a href="adrian(a)jboss.com">Adrian Brock</a>
@@ -51,44 +51,44 @@
private AbstractBundleState bundleState;
/** The attributes */
- private PackageAttribute requirePackage;
-
+ private PackageAttribute packageAttribute;
+
/**
* Create a new OSGiPackageRequirement.
*
* @param bundleState the bundle state
- * @param requirePackage the require package metadata
+ * @param packageAttribute the require package metadata
* @return the requirement
* @throws IllegalArgumentException for a null requirePackage
*/
@SuppressWarnings("deprecation")
- public static OSGiPackageRequirement create(AbstractBundleState bundleState, PackageAttribute requirePackage)
+ public static OSGiPackageRequirement create(AbstractBundleState bundleState, PackageAttribute packageAttribute, boolean isDynamic)
{
if (bundleState == null)
throw new IllegalArgumentException("Null bundle");
- if (requirePackage == null)
+ if (packageAttribute == null)
throw new IllegalArgumentException("Null require package");
- String name = requirePackage.getAttribute();
+ String name = packageAttribute.getAttribute();
AbstractVersionRange range = null;
- String versionString = requirePackage.getAttributeValue(Constants.VERSION_ATTRIBUTE, String.class);
+ String versionString = packageAttribute.getAttributeValue(Constants.VERSION_ATTRIBUTE, String.class);
if (versionString != null)
{
range = (AbstractVersionRange)AbstractVersionRange.valueOf(versionString);
- String oldVersionString = requirePackage.getAttributeValue(Constants.PACKAGE_SPECIFICATION_VERSION, String.class);
+ String oldVersionString = packageAttribute.getAttributeValue(Constants.PACKAGE_SPECIFICATION_VERSION, String.class);
if (oldVersionString != null && oldVersionString.equals(versionString) == false)
throw new IllegalStateException(Constants.VERSION_ATTRIBUTE + " of " + versionString + " does not match " + Constants.PACKAGE_SPECIFICATION_VERSION
+ " of " + oldVersionString);
}
else
{
- versionString = requirePackage.getAttributeValue(Constants.PACKAGE_SPECIFICATION_VERSION, String.class);
+ versionString = packageAttribute.getAttributeValue(Constants.PACKAGE_SPECIFICATION_VERSION, String.class);
if (versionString != null)
range = (AbstractVersionRange)AbstractVersionRange.valueOf(versionString);
}
- return new OSGiPackageRequirement(bundleState, name, range, requirePackage);
+ return new OSGiPackageRequirement(bundleState, name, range, packageAttribute, isDynamic);
}
/**
@@ -97,21 +97,28 @@
* @param bundleState the bundleState
* @param name the name
* @param versionRange the version range - pass null for all versions
- * @param requirePackage the require package metadata
+ * @param packageAttribute the require package metadata
* @throws IllegalArgumentException for a null name or requirePackage
*/
- public OSGiPackageRequirement(AbstractBundleState bundleState, String name, VersionRange versionRange, PackageAttribute requirePackage)
+ public OSGiPackageRequirement(AbstractBundleState bundleState, String name, VersionRange versionRange, PackageAttribute packageAttribute, boolean isDynamic)
{
super(name, versionRange);
+ if (bundleState == null)
+ throw new IllegalArgumentException("Null bundleState");
+ if (packageAttribute == null)
+ throw new IllegalArgumentException("Null packageAttribute");
+
this.bundleState = bundleState;
+ this.packageAttribute = packageAttribute;
- if (requirePackage != null)
- {
- this.requirePackage = requirePackage;
- String resolution = requirePackage.getDirectiveValue(Constants.RESOLUTION_DIRECTIVE, String.class);
- if (Constants.RESOLUTION_OPTIONAL.equals(resolution))
- setOptional(true);
- }
+ // resolution:=optional
+ String resolution = packageAttribute.getDirectiveValue(Constants.RESOLUTION_DIRECTIVE, String.class);
+ if (Constants.RESOLUTION_OPTIONAL.equals(resolution))
+ setOptional(true);
+
+ // DynamicImport-Package
+ if (isDynamic == true)
+ setDynamic(true);
}
/**
@@ -121,7 +128,7 @@
*/
public PackageAttribute getPackageMetaData()
{
- return requirePackage;
+ return packageAttribute;
}
/**
@@ -134,7 +141,7 @@
Module module = null;
if (bundleState instanceof AbstractDeployedBundleState)
{
- AbstractDeployedBundleState depBundle = (AbstractDeployedBundleState)bundleState;
+ AbstractDeployedBundleState depBundle = (AbstractDeployedBundleState)bundleState;
DeploymentUnit unit = depBundle.getDeploymentUnit();
module = unit.getAttachment(Module.class);
if (module == null)
@@ -142,7 +149,7 @@
}
return module;
}
-
+
@Override
public boolean equals(Object obj)
{
@@ -152,18 +159,19 @@
return false;
if (super.equals(obj) == false)
return false;
-
+
return true;
}
private String shortString;
+
public String toShortString()
{
if (shortString == null)
{
StringBuffer buffer = new StringBuffer(bundleState.getCanonicalName() + "[" + getName());
- Map<String, Parameter> attributes = requirePackage.getAttributes();
- Map<String, Parameter> directives = requirePackage.getDirectives();
+ Map<String, Parameter> attributes = packageAttribute.getAttributes();
+ Map<String, Parameter> directives = packageAttribute.getDirectives();
for (Map.Entry<String, Parameter> entry : directives.entrySet())
buffer.append(";" + entry.getKey() + ":=" + entry.getValue().getValue());
for (Map.Entry<String, Parameter> entry : attributes.entrySet())
@@ -173,7 +181,7 @@
}
return shortString;
}
-
+
@Override
protected void toString(StringBuffer buffer)
{
Copied: projects/jboss-osgi/projects/runtime/framework/trunk/core/src/main/java/org/jboss/osgi/framework/deployers/AbstractClassLoadingDeployer.java (from rev 103005, projects/jboss-osgi/projects/runtime/framework/trunk/core/src/main/java/org/jboss/osgi/framework/deployers/AbstractOSGiClassLoadingDeployer.java)
===================================================================
--- projects/jboss-osgi/projects/runtime/framework/trunk/core/src/main/java/org/jboss/osgi/framework/deployers/AbstractClassLoadingDeployer.java (rev 0)
+++ projects/jboss-osgi/projects/runtime/framework/trunk/core/src/main/java/org/jboss/osgi/framework/deployers/AbstractClassLoadingDeployer.java 2010-03-26 10:07:20 UTC (rev 103025)
@@ -0,0 +1,169 @@
+/*
+* JBoss, Home of Professional Open Source
+* Copyright 2009, Red Hat Middleware LLC, and individual contributors
+* as indicated by the @author tags. See the copyright.txt file 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.framework.deployers;
+
+// $Id$
+
+import java.util.List;
+
+import org.jboss.classloader.spi.ClassLoaderDomain;
+import org.jboss.classloading.spi.metadata.CapabilitiesMetaData;
+import org.jboss.classloading.spi.metadata.ClassLoadingMetaData;
+import org.jboss.classloading.spi.metadata.RequirementsMetaData;
+import org.jboss.deployers.spi.DeploymentException;
+import org.jboss.deployers.spi.deployer.DeploymentStages;
+import org.jboss.deployers.spi.deployer.helpers.AbstractSimpleRealDeployer;
+import org.jboss.deployers.structure.spi.ClassLoaderFactory;
+import org.jboss.deployers.structure.spi.DeploymentUnit;
+import org.jboss.osgi.framework.bundle.AbstractBundleState;
+import org.jboss.osgi.framework.bundle.OSGiBundleManager;
+import org.jboss.osgi.framework.classloading.OSGiBundleCapability;
+import org.jboss.osgi.framework.classloading.OSGiBundleRequirement;
+import org.jboss.osgi.framework.classloading.OSGiClassLoadingMetaData;
+import org.jboss.osgi.framework.classloading.OSGiPackageCapability;
+import org.jboss.osgi.framework.classloading.OSGiPackageRequirement;
+import org.jboss.osgi.framework.metadata.OSGiMetaData;
+import org.jboss.osgi.framework.metadata.PackageAttribute;
+import org.jboss.osgi.framework.metadata.ParameterizedAttribute;
+import org.jboss.osgi.framework.plugins.SystemPackagesPlugin;
+
+/**
+ * An abstract OSGi classloading deployer, that maps {@link OSGiMetaData} into {@link ClassLoadingMetaData}.
+ *
+ * @author thomas.diesler(a)jboss.com
+ * @since 07-Jan-2010
+ */
+public class AbstractClassLoadingDeployer extends AbstractSimpleRealDeployer<OSGiMetaData>
+{
+ private ClassLoaderDomain domain;
+ private ClassLoaderFactory factory;
+
+ public AbstractClassLoadingDeployer()
+ {
+ super(OSGiMetaData.class);
+ addInput(AbstractBundleState.class);
+ setOutput(ClassLoadingMetaData.class);
+ setStage(DeploymentStages.POST_PARSE);
+ setTopLevelOnly(true);
+ }
+
+ public void setDomain(ClassLoaderDomain domain)
+ {
+ this.domain = domain;
+ }
+
+ public void setFactory(ClassLoaderFactory factory)
+ {
+ this.factory = factory;
+ }
+
+ @Override
+ public void deploy(DeploymentUnit unit, OSGiMetaData osgiMetaData) throws DeploymentException
+ {
+ if (unit.isAttachmentPresent(ClassLoadingMetaData.class))
+ return;
+
+ AbstractBundleState bundleState = unit.getAttachment(AbstractBundleState.class);
+ if (bundleState == null)
+ throw new IllegalStateException("No bundle state");
+
+ OSGiBundleManager bundleManager = bundleState.getBundleManager();
+
+ OSGiClassLoadingMetaData classLoadingMetaData = new OSGiClassLoadingMetaData();
+ classLoadingMetaData.setName(bundleState.getSymbolicName());
+ classLoadingMetaData.setVersion(bundleState.getVersion());
+ classLoadingMetaData.setDomain(domain != null ? domain.getName() : null);
+
+ CapabilitiesMetaData capabilities = classLoadingMetaData.getCapabilities();
+ RequirementsMetaData requirements = classLoadingMetaData.getRequirements();
+
+ OSGiBundleCapability bundleCapability = OSGiBundleCapability.create(bundleState);
+ capabilities.addCapability(bundleCapability);
+
+ // Required Bundles
+ List<ParameterizedAttribute> requireBundles = osgiMetaData.getRequireBundles();
+ if (requireBundles != null && requireBundles.isEmpty() == false)
+ {
+ for (ParameterizedAttribute requireBundle : requireBundles)
+ {
+ OSGiBundleRequirement requirement = OSGiBundleRequirement.create(requireBundle);
+ requirements.addRequirement(requirement);
+ }
+ }
+
+ // Export-Package
+ List<PackageAttribute> exports = osgiMetaData.getExportPackages();
+ if (exports != null && exports.isEmpty() == false)
+ {
+ for (PackageAttribute packageAttribute : exports)
+ {
+ OSGiPackageCapability packageCapability = OSGiPackageCapability.create(bundleState, packageAttribute);
+ capabilities.addCapability(packageCapability);
+ }
+ }
+
+ // Import-Package
+ List<PackageAttribute> imports = osgiMetaData.getImportPackages();
+ if (imports != null && imports.isEmpty() == false)
+ {
+ SystemPackagesPlugin syspackPlugin = bundleManager.getPlugin(SystemPackagesPlugin.class);
+ for (PackageAttribute packageAttribute : imports)
+ {
+ String packageName = packageAttribute.getAttribute();
+
+ // [TODO] Should system packages be added as capabilities?
+ if (syspackPlugin.isSystemPackage(packageName) == true)
+ continue;
+
+ OSGiPackageRequirement requirement = OSGiPackageRequirement.create(bundleState, packageAttribute, false);
+ requirements.addRequirement(requirement);
+ }
+ }
+
+ // DynamicImport-Package
+ List<PackageAttribute> dynamicImports = osgiMetaData.getDynamicImports();
+ if (dynamicImports != null && dynamicImports.isEmpty() == false)
+ {
+ SystemPackagesPlugin syspackPlugin = bundleManager.getPlugin(SystemPackagesPlugin.class);
+ for (PackageAttribute packageAttribute : dynamicImports)
+ {
+ String packageName = packageAttribute.getAttribute();
+
+ // [TODO] Should system packages be added as capabilities?
+ if (syspackPlugin.isSystemPackage(packageName) == true)
+ continue;
+
+ OSGiPackageRequirement requirement = OSGiPackageRequirement.create(bundleState, packageAttribute, true);
+ requirements.addRequirement(requirement);
+ }
+ }
+
+ unit.addAttachment(ClassLoadingMetaData.class, classLoadingMetaData);
+
+ // AnnotationMetaDataDeployer.ANNOTATION_META_DATA_COMPLETE
+ unit.addAttachment("org.jboss.deployment.annotation.metadata.complete", Boolean.TRUE);
+
+ // Add the OSGi ClassLoaderFactory if configured
+ if (factory != null)
+ unit.addAttachment(ClassLoaderFactory.class, factory);
+ }
+}
Deleted: projects/jboss-osgi/projects/runtime/framework/trunk/core/src/main/java/org/jboss/osgi/framework/deployers/AbstractOSGiClassLoadingDeployer.java
===================================================================
--- projects/jboss-osgi/projects/runtime/framework/trunk/core/src/main/java/org/jboss/osgi/framework/deployers/AbstractOSGiClassLoadingDeployer.java 2010-03-26 10:01:44 UTC (rev 103024)
+++ projects/jboss-osgi/projects/runtime/framework/trunk/core/src/main/java/org/jboss/osgi/framework/deployers/AbstractOSGiClassLoadingDeployer.java 2010-03-26 10:07:20 UTC (rev 103025)
@@ -1,152 +0,0 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2009, Red Hat Middleware LLC, and individual contributors
-* as indicated by the @author tags. See the copyright.txt file 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.framework.deployers;
-
-// $Id$
-
-import java.util.List;
-
-import org.jboss.classloader.spi.ClassLoaderDomain;
-import org.jboss.classloading.spi.metadata.CapabilitiesMetaData;
-import org.jboss.classloading.spi.metadata.ClassLoadingMetaData;
-import org.jboss.classloading.spi.metadata.RequirementsMetaData;
-import org.jboss.deployers.spi.DeploymentException;
-import org.jboss.deployers.spi.deployer.DeploymentStages;
-import org.jboss.deployers.spi.deployer.helpers.AbstractSimpleRealDeployer;
-import org.jboss.deployers.structure.spi.ClassLoaderFactory;
-import org.jboss.deployers.structure.spi.DeploymentUnit;
-import org.jboss.osgi.framework.bundle.AbstractBundleState;
-import org.jboss.osgi.framework.bundle.OSGiBundleManager;
-import org.jboss.osgi.framework.classloading.OSGiBundleCapability;
-import org.jboss.osgi.framework.classloading.OSGiBundleRequirement;
-import org.jboss.osgi.framework.classloading.OSGiClassLoadingMetaData;
-import org.jboss.osgi.framework.classloading.OSGiPackageCapability;
-import org.jboss.osgi.framework.classloading.OSGiPackageRequirement;
-import org.jboss.osgi.framework.metadata.OSGiMetaData;
-import org.jboss.osgi.framework.metadata.PackageAttribute;
-import org.jboss.osgi.framework.metadata.ParameterizedAttribute;
-import org.jboss.osgi.framework.plugins.SystemPackagesPlugin;
-
-/**
- * An abstract OSGi classloading deployer, that maps {@link OSGiMetaData} into {@link ClassLoadingMetaData}.
- *
- * @author thomas.diesler(a)jboss.com
- * @since 07-Jan-2010
- */
-public class AbstractOSGiClassLoadingDeployer extends AbstractSimpleRealDeployer<OSGiMetaData>
-{
- private ClassLoaderDomain domain;
- private ClassLoaderFactory factory;
-
- public AbstractOSGiClassLoadingDeployer()
- {
- super(OSGiMetaData.class);
- addInput(AbstractBundleState.class);
- setOutput(ClassLoadingMetaData.class);
- setStage(DeploymentStages.POST_PARSE);
- setTopLevelOnly(true);
- }
-
- public void setDomain(ClassLoaderDomain domain)
- {
- this.domain = domain;
- }
-
- public void setFactory(ClassLoaderFactory factory)
- {
- this.factory = factory;
- }
-
- @Override
- public void deploy(DeploymentUnit unit, OSGiMetaData osgiMetaData) throws DeploymentException
- {
- if (unit.isAttachmentPresent(ClassLoadingMetaData.class))
- return;
-
- AbstractBundleState bundleState = unit.getAttachment(AbstractBundleState.class);
- if (bundleState == null)
- throw new IllegalStateException("No bundle state");
-
- OSGiBundleManager bundleManager = bundleState.getBundleManager();
-
- OSGiClassLoadingMetaData classLoadingMetaData = new OSGiClassLoadingMetaData();
- classLoadingMetaData.setName(bundleState.getSymbolicName());
- classLoadingMetaData.setVersion(bundleState.getVersion());
- classLoadingMetaData.setDomain(domain != null ? domain.getName() : null);
-
- CapabilitiesMetaData capabilities = classLoadingMetaData.getCapabilities();
- RequirementsMetaData requirements = classLoadingMetaData.getRequirements();
-
- OSGiBundleCapability bundleCapability = OSGiBundleCapability.create(bundleState);
- capabilities.addCapability(bundleCapability);
-
- // Required Bundles
- List<ParameterizedAttribute> requireBundles = osgiMetaData.getRequireBundles();
- if (requireBundles != null && requireBundles.isEmpty() == false)
- {
- for (ParameterizedAttribute requireBundle : requireBundles)
- {
- OSGiBundleRequirement requirement = OSGiBundleRequirement.create(requireBundle);
- requirements.addRequirement(requirement);
- }
- }
-
- // Export Packages
- List<PackageAttribute> exported = osgiMetaData.getExportPackages();
- if (exported != null && exported.isEmpty() == false)
- {
- for (PackageAttribute packageAttribute : exported)
- {
- OSGiPackageCapability packageCapability = OSGiPackageCapability.create(bundleState, packageAttribute);
- capabilities.addCapability(packageCapability);
- }
- }
-
- // Import Packages
- List<PackageAttribute> imported = osgiMetaData.getImportPackages();
- if (imported != null && imported.isEmpty() == false)
- {
- SystemPackagesPlugin syspackPlugin = bundleManager.getPlugin(SystemPackagesPlugin.class);
- for (PackageAttribute packageAttribute : imported)
- {
- String packageName = packageAttribute.getAttribute();
-
- // [TODO] Should system packages be added as capabilities?
- boolean isSystemPackage = syspackPlugin.isSystemPackage(packageName);
- if (isSystemPackage == false)
- {
- OSGiPackageRequirement requirement = OSGiPackageRequirement.create(bundleState, packageAttribute);
- requirements.addRequirement(requirement);
- }
- }
- }
-
- unit.addAttachment(ClassLoadingMetaData.class, classLoadingMetaData);
-
- // AnnotationMetaDataDeployer.ANNOTATION_META_DATA_COMPLETE
- unit.addAttachment("org.jboss.deployment.annotation.metadata.complete", Boolean.TRUE);
-
- // Add the OSGi ClassLoaderFactory if configured
- if (factory != null)
- unit.addAttachment(ClassLoaderFactory.class, factory);
- }
-}
Modified: projects/jboss-osgi/projects/runtime/framework/trunk/core/src/main/java/org/jboss/osgi/framework/deployers/OSGiBundleClassLoadingDeployer.java
===================================================================
--- projects/jboss-osgi/projects/runtime/framework/trunk/core/src/main/java/org/jboss/osgi/framework/deployers/OSGiBundleClassLoadingDeployer.java 2010-03-26 10:01:44 UTC (rev 103024)
+++ projects/jboss-osgi/projects/runtime/framework/trunk/core/src/main/java/org/jboss/osgi/framework/deployers/OSGiBundleClassLoadingDeployer.java 2010-03-26 10:07:20 UTC (rev 103025)
@@ -36,7 +36,7 @@
* @author thomas.diesler(a)jboss.com
* @version $Revision: 1.1 $
*/
-public class OSGiBundleClassLoadingDeployer extends AbstractOSGiClassLoadingDeployer
+public class OSGiBundleClassLoadingDeployer extends AbstractClassLoadingDeployer
{
@Override
public void deploy(DeploymentUnit unit, OSGiMetaData osgiMetaData) throws DeploymentException
Modified: projects/jboss-osgi/projects/runtime/framework/trunk/core/src/main/java/org/jboss/osgi/framework/deployers/OSGiFragmentClassLoadingDeployer.java
===================================================================
--- projects/jboss-osgi/projects/runtime/framework/trunk/core/src/main/java/org/jboss/osgi/framework/deployers/OSGiFragmentClassLoadingDeployer.java 2010-03-26 10:01:44 UTC (rev 103024)
+++ projects/jboss-osgi/projects/runtime/framework/trunk/core/src/main/java/org/jboss/osgi/framework/deployers/OSGiFragmentClassLoadingDeployer.java 2010-03-26 10:07:20 UTC (rev 103025)
@@ -42,7 +42,7 @@
* @author thomas.diesler(a)jboss.com
* @since 07-Jan-2010
*/
-public class OSGiFragmentClassLoadingDeployer extends AbstractOSGiClassLoadingDeployer
+public class OSGiFragmentClassLoadingDeployer extends AbstractClassLoadingDeployer
{
@Override
public void deploy(DeploymentUnit unit, OSGiMetaData osgiMetaData) throws DeploymentException
Modified: projects/jboss-osgi/projects/runtime/framework/trunk/core/src/main/java/org/jboss/osgi/framework/resolver/internal/basic/BasicResolverImpl.java
===================================================================
--- projects/jboss-osgi/projects/runtime/framework/trunk/core/src/main/java/org/jboss/osgi/framework/resolver/internal/basic/BasicResolverImpl.java 2010-03-26 10:01:44 UTC (rev 103024)
+++ projects/jboss-osgi/projects/runtime/framework/trunk/core/src/main/java/org/jboss/osgi/framework/resolver/internal/basic/BasicResolverImpl.java 2010-03-26 10:07:20 UTC (rev 103025)
@@ -452,7 +452,7 @@
Object version = otherPackage.getVersion();
VersionRange versionRange = new VersionRange(version, true, version, true);
- OSGiPackageRequirement newPackageRequirement = new OSGiPackageRequirement(bundle, packageName, versionRange, null);
+ OSGiPackageRequirement newPackageRequirement = new OSGiPackageRequirement(bundle, packageName, versionRange, null, false);
BundleRequirement newBundleRequirement = new BundleRequirement(bundle, newPackageRequirement);
newBundleRequirement.wireCapability(otherCapability);
bundleRequirements.add(newBundleRequirement);
Modified: projects/jboss-osgi/projects/runtime/framework/trunk/pom.xml
===================================================================
--- projects/jboss-osgi/projects/runtime/framework/trunk/pom.xml 2010-03-26 10:01:44 UTC (rev 103024)
+++ projects/jboss-osgi/projects/runtime/framework/trunk/pom.xml 2010-03-26 10:07:20 UTC (rev 103025)
@@ -55,7 +55,7 @@
<version.apache.felix.configadmin>1.0.10</version.apache.felix.configadmin>
<version.apache.felix.log>1.0.0</version.apache.felix.log>
<version.apache.felix.metatype>1.0.2</version.apache.felix.metatype>
- <version.jboss.classloading>2.2.0.Alpha4</version.jboss.classloading>
+ <version.jboss.classloading>2.2.0-SNAPSHOT</version.jboss.classloading>
<version.jboss.deployers>2.2.0.Alpha4</version.jboss.deployers>
<version.jboss.kernel>2.2.0.Alpha9</version.jboss.kernel>
<version.jboss.logging>2.2.0.CR1</version.jboss.logging>
14 years, 3 months
- 1
- 0
JBoss-OSGI SVN: r103017 - in projects/jboss-osgi/projects/runtime/framework/trunk: vfs30/src/main/java/org/jboss/osgi/framework/classloading and 1 other directory.
by jboss-osgi-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2010-03-26 04:48:19 -0400 (Fri, 26 Mar 2010)
New Revision: 103017
Modified:
projects/jboss-osgi/projects/runtime/framework/trunk/core/src/main/java/org/jboss/osgi/framework/classloading/OSGiModule.java
projects/jboss-osgi/projects/runtime/framework/trunk/vfs30/src/main/java/org/jboss/osgi/framework/classloading/OSGiBundleClassLoader.java
Log:
[JBOSGI-306] Invalid classloader policy created
Throw ISE in OSGiModule when it is called to create the policy
Modified: projects/jboss-osgi/projects/runtime/framework/trunk/core/src/main/java/org/jboss/osgi/framework/classloading/OSGiModule.java
===================================================================
--- projects/jboss-osgi/projects/runtime/framework/trunk/core/src/main/java/org/jboss/osgi/framework/classloading/OSGiModule.java 2010-03-26 07:42:50 UTC (rev 103016)
+++ projects/jboss-osgi/projects/runtime/framework/trunk/core/src/main/java/org/jboss/osgi/framework/classloading/OSGiModule.java 2010-03-26 08:48:19 UTC (rev 103017)
@@ -21,6 +21,7 @@
*/
package org.jboss.osgi.framework.classloading;
+import org.jboss.classloader.spi.ClassLoaderPolicy;
import org.jboss.classloading.spi.dependency.Module;
import org.jboss.classloading.spi.metadata.ClassLoadingMetaData;
import org.jboss.deployers.structure.spi.DeploymentUnit;
@@ -41,4 +42,10 @@
{
super(unit);
}
+
+ @Override
+ public ClassLoaderPolicy createClassLoaderPolicy()
+ {
+ throw new IllegalStateException("OSGiClassLoaderFactory is expected to create the policy");
+ }
}
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-26 07:42:50 UTC (rev 103016)
+++ projects/jboss-osgi/projects/runtime/framework/trunk/vfs30/src/main/java/org/jboss/osgi/framework/classloading/OSGiBundleClassLoader.java 2010-03-26 08:48:19 UTC (rev 103017)
@@ -25,7 +25,6 @@
import org.jboss.classloader.spi.ClassLoaderPolicy;
import org.jboss.classloader.spi.base.BaseClassLoader;
-import org.jboss.logging.Logger;
import org.osgi.framework.Bundle;
import org.osgi.framework.BundleReference;
@@ -37,23 +36,16 @@
*/
public class OSGiBundleClassLoader extends BaseClassLoader implements BundleReference
{
- // Provide logging
- private static final Logger log = Logger.getLogger(OSGiBundleClassLoader.class);
-
private OSGiClassLoaderPolicy osgiPolicy;
public OSGiBundleClassLoader(ClassLoaderPolicy policy)
{
super(policy);
- if (policy instanceof OSGiClassLoaderPolicy)
- osgiPolicy = (OSGiClassLoaderPolicy)policy;
-
- if (osgiPolicy == null)
- {
- log.warn("Invalid policy: " + policy, new IllegalStateException());
- System.out.println("FIXME [JBOSGI-306] Invalid policy: " + policy);
- }
+ if (policy instanceof OSGiClassLoaderPolicy == false)
+ throw new IllegalArgumentException("Invalid policy: " + policy);
+
+ osgiPolicy = (OSGiClassLoaderPolicy)policy;
}
@Override
14 years, 3 months
- 1
- 0
JBoss-OSGI SVN: r103016 - projects/jboss-osgi/projects/bundles/husky/trunk.
by jboss-osgi-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2010-03-26 03:42:50 -0400 (Fri, 26 Mar 2010)
New Revision: 103016
Modified:
projects/jboss-osgi/projects/bundles/husky/trunk/pom.xml
Log:
Embedded shrinkwrap
Modified: projects/jboss-osgi/projects/bundles/husky/trunk/pom.xml
===================================================================
--- projects/jboss-osgi/projects/bundles/husky/trunk/pom.xml 2010-03-26 07:34:00 UTC (rev 103015)
+++ projects/jboss-osgi/projects/bundles/husky/trunk/pom.xml 2010-03-26 07:42:50 UTC (rev 103016)
@@ -47,6 +47,7 @@
<version.jboss.osgi.felix>2.0.4-SNAPSHOT</version.jboss.osgi.felix>
<version.jboss.osgi.jmx>1.0.4-SNAPSHOT</version.jboss.osgi.jmx>
<version.jboss.osgi.vfs>1.0.0-SNAPSHOT</version.jboss.osgi.vfs>
+ <version.jboss.shrinkwrap>1.0.0-SNAPSHOT</version.jboss.shrinkwrap>
<version.osgi>4.2.0</version.osgi>
</properties>
@@ -72,6 +73,11 @@
<version>${version.jboss.osgi.deployment}</version>
</dependency>
<dependency>
+ <groupId>org.jboss.shrinkwrap</groupId>
+ <artifactId>shrinkwrap-api</artifactId>
+ <version>${version.jboss.shrinkwrap}</version>
+ </dependency>
+ <dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
</dependency>
@@ -135,7 +141,7 @@
</dependency>
<dependency>
<groupId>org.jboss.osgi.vfs</groupId>
- <artifactId>jboss-osgi-vfs21</artifactId>
+ <artifactId>jboss-osgi-vfs30</artifactId>
<version>${version.jboss.osgi.vfs}</version>
<scope>test</scope>
</dependency>
@@ -180,8 +186,11 @@
<Embed-Transitive>true</Embed-Transitive>
<Embed-Dependency>
junit;inline=false,
+ shrinkwrap-api;inline=false,
</Embed-Dependency>
- <_exportcontents>org.junit;version=${version.junit}</_exportcontents>
+ <_exportcontents>
+ org.junit;version=${version.junit}
+ </_exportcontents>
</instructions>
</configuration>
</plugin>
14 years, 3 months
- 1
- 0
JBoss-OSGI SVN: r103014 - projects/jboss-osgi/projects/bundles/husky/trunk.
by jboss-osgi-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2010-03-26 03:32:20 -0400 (Fri, 26 Mar 2010)
New Revision: 103014
Modified:
projects/jboss-osgi/projects/bundles/husky/trunk/pom.xml
Log:
Update to felix-2.0.4
Modified: projects/jboss-osgi/projects/bundles/husky/trunk/pom.xml
===================================================================
--- projects/jboss-osgi/projects/bundles/husky/trunk/pom.xml 2010-03-26 07:29:33 UTC (rev 103013)
+++ projects/jboss-osgi/projects/bundles/husky/trunk/pom.xml 2010-03-26 07:32:20 UTC (rev 103014)
@@ -44,7 +44,7 @@
<version.apache.felix.log>1.0.0</version.apache.felix.log>
<version.jboss.osgi.common>1.0.4-SNAPSHOT</version.jboss.osgi.common>
<version.jboss.osgi.deployment>1.0.2-SNAPSHOT</version.jboss.osgi.deployment>
- <version.jboss.osgi.felix>2.0.2.SP1-SNAPSHOT</version.jboss.osgi.felix>
+ <version.jboss.osgi.felix>2.0.4-SNAPSHOT</version.jboss.osgi.felix>
<version.jboss.osgi.jmx>1.0.4-SNAPSHOT</version.jboss.osgi.jmx>
<version.jboss.osgi.vfs>1.0.0-SNAPSHOT</version.jboss.osgi.vfs>
<version.osgi>4.2.0</version.osgi>
14 years, 3 months
- 1
- 0
JBoss-OSGI SVN: r103013 - in projects/jboss-osgi/projects/runtime: felix/trunk and 1 other directory.
by jboss-osgi-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2010-03-26 03:29:33 -0400 (Fri, 26 Mar 2010)
New Revision: 103013
Modified:
projects/jboss-osgi/projects/runtime/equinox/trunk/pom.xml
projects/jboss-osgi/projects/runtime/felix/trunk/pom.xml
Log:
Remove dependency on husky
Modified: projects/jboss-osgi/projects/runtime/equinox/trunk/pom.xml
===================================================================
--- projects/jboss-osgi/projects/runtime/equinox/trunk/pom.xml 2010-03-26 07:12:45 UTC (rev 103012)
+++ projects/jboss-osgi/projects/runtime/equinox/trunk/pom.xml 2010-03-26 07:29:33 UTC (rev 103013)
@@ -40,7 +40,6 @@
<properties>
<version.eclipse.equinox>3.5.2</version.eclipse.equinox>
<version.jboss.osgi.deployment>1.0.2-SNAPSHOT</version.jboss.osgi.deployment>
- <version.jboss.osgi.husky>1.0.4-SNAPSHOT</version.jboss.osgi.husky>
<version.jboss.osgi.spi>1.0.5-SNAPSHOT</version.jboss.osgi.spi>
</properties>
@@ -96,9 +95,8 @@
</dependency>
<dependency>
- <groupId>org.jboss.osgi.bundles</groupId>
- <artifactId>jboss-osgi-husky</artifactId>
- <version>${version.jboss.osgi.husky}</version>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-log4j12</artifactId>
<scope>test</scope>
</dependency>
</dependencies>
Modified: projects/jboss-osgi/projects/runtime/felix/trunk/pom.xml
===================================================================
--- projects/jboss-osgi/projects/runtime/felix/trunk/pom.xml 2010-03-26 07:12:45 UTC (rev 103012)
+++ projects/jboss-osgi/projects/runtime/felix/trunk/pom.xml 2010-03-26 07:29:33 UTC (rev 103013)
@@ -39,7 +39,6 @@
<properties>
<version.felix.framework>2.0.4</version.felix.framework>
<version.jboss.osgi.deployment>1.0.2-SNAPSHOT</version.jboss.osgi.deployment>
- <version.jboss.osgi.husky>1.0.4-SNAPSHOT</version.jboss.osgi.husky>
<version.jboss.osgi.spi>1.0.5-SNAPSHOT</version.jboss.osgi.spi>
<version.osgi>4.2.0</version.osgi>
</properties>
@@ -84,12 +83,6 @@
</dependency>
<dependency>
- <groupId>org.jboss.osgi.bundles</groupId>
- <artifactId>jboss-osgi-husky</artifactId>
- <version>${version.jboss.osgi.husky}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
<scope>test</scope>
14 years, 3 months
- 1
- 0
JBoss-OSGI SVN: r103006 - in projects/jboss-osgi/projects/runtime/framework/trunk: bundle/src/test/java/org/jboss/test/osgi/bundle and 7 other directories.
by jboss-osgi-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2010-03-26 01:39:01 -0400 (Fri, 26 Mar 2010)
New Revision: 103006
Modified:
projects/jboss-osgi/projects/runtime/framework/trunk/bundle/src/test/java/org/jboss/test/osgi/AbstractDeploymentTest.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/bundle/SystemBundleTestCase.java
projects/jboss-osgi/projects/runtime/framework/trunk/bundle/src/test/java/org/jboss/test/osgi/classloader/RequireBundleTestCase.java
projects/jboss-osgi/projects/runtime/framework/trunk/bundle/src/test/java/org/jboss/test/osgi/compendium/PackageAdminTestCase.java
projects/jboss-osgi/projects/runtime/framework/trunk/bundle/src/test/java/org/jboss/test/osgi/resolver/AbstractImportExportTest.java
projects/jboss-osgi/projects/runtime/framework/trunk/bundle/src/test/java/org/jboss/test/osgi/resolver/ResolverMetadataTestCase.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/service/GetUnGetServiceTestCase.java
projects/jboss-osgi/projects/runtime/framework/trunk/bundle/src/test/java/org/jboss/test/osgi/service/RegisterServiceTestCase.java
projects/jboss-osgi/projects/runtime/framework/trunk/bundle/src/test/java/org/jboss/test/osgi/service/ServiceFactoryTestCase.java
projects/jboss-osgi/projects/runtime/framework/trunk/bundle/src/test/java/org/jboss/test/osgi/service/ServiceListenerTestCase.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/java/org/jboss/test/osgi/service/ServiceReferenceTestCase.java
projects/jboss-osgi/projects/runtime/framework/trunk/bundle/src/test/java/org/jboss/test/osgi/service/ServiceRegistrationTestCase.java
projects/jboss-osgi/projects/runtime/framework/trunk/bundle/src/test/java/org/jboss/test/osgi/service/support/JMXKernel.java
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/vfs30/src/main/java/org/jboss/osgi/framework/classloading/OSGiBundleClassLoader.java
Log:
[JBOSGI-306] Invalid classloader policy created
Log warn instead of ISE
Modified: projects/jboss-osgi/projects/runtime/framework/trunk/bundle/src/test/java/org/jboss/test/osgi/AbstractDeploymentTest.java
===================================================================
--- projects/jboss-osgi/projects/runtime/framework/trunk/bundle/src/test/java/org/jboss/test/osgi/AbstractDeploymentTest.java 2010-03-26 05:29:54 UTC (rev 103005)
+++ projects/jboss-osgi/projects/runtime/framework/trunk/bundle/src/test/java/org/jboss/test/osgi/AbstractDeploymentTest.java 2010-03-26 05:39:01 UTC (rev 103006)
@@ -41,7 +41,7 @@
import org.jboss.kernel.spi.dependency.KernelControllerContext;
import org.jboss.kernel.spi.deployment.KernelDeployment;
import org.jboss.osgi.framework.deployers.AbstractDeployment;
-import org.jboss.osgi.vfs.VirtualFile;
+import org.jboss.shrinkwrap.api.Archive;
/**
* Parent for deployment tests.
@@ -146,7 +146,7 @@
protected Deployment addBeans(String name, BeanMetaData bmd, Class<?>... packages) throws Exception
{
- VirtualFile assembly = assembleArchive(name, new String[0], packages);
+ Archive<?> assembly = assembleArchive(name, new String[0], packages);
if (bmd == null)
{
@@ -155,7 +155,7 @@
bmd = builder.getBeanMetaData();
}
- Deployment deployment = AbstractDeployment.createDeployment(assembly);
+ Deployment deployment = AbstractDeployment.createDeployment(toVirtualFile(assembly));
MutableAttachments att = (MutableAttachments)deployment.getPredeterminedManagedObjects();
att.addAttachment(BeanMetaData.class, bmd);
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-26 05:29:54 UTC (rev 103005)
+++ projects/jboss-osgi/projects/runtime/framework/trunk/bundle/src/test/java/org/jboss/test/osgi/bundle/BundleLifecycleTestCase.java 2010-03-26 05:39:01 UTC (rev 103006)
@@ -26,7 +26,7 @@
import static org.junit.Assert.assertNull;
import static org.junit.Assert.fail;
-import org.jboss.osgi.vfs.VirtualFile;
+import org.jboss.shrinkwrap.api.Archive;
import org.jboss.test.osgi.AbstractFrameworkTest;
import org.jboss.test.osgi.bundle.support.a.FailOnStartActivator;
import org.jboss.test.osgi.bundle.support.b.LifecycleService;
@@ -51,7 +51,7 @@
@Test
public void testSimpleStart() throws Exception
{
- VirtualFile assemblyA = assembleArchive("lifecycle-service", "/bundles/lifecycle/simple-service", LifecycleService.class);
+ Archive<?> assemblyA = assembleArchive("lifecycle-service", "/bundles/lifecycle/simple-service", LifecycleService.class);
Bundle bundleA = installBundle(assemblyA);
try
{
@@ -76,7 +76,7 @@
@Test
public void testDependencyNotAvailable() throws Exception
{
- VirtualFile assemblyA = assembleArchive("lifecycle-service", "/bundles/lifecycle/simple-service", LifecycleService.class);
+ Archive<?> assemblyA = assembleArchive("lifecycle-service", "/bundles/lifecycle/simple-service", LifecycleService.class);
Bundle bundleA = installBundle(assemblyA);
try
{
@@ -86,7 +86,7 @@
ServiceReference sref = systemContext.getServiceReference(LifecycleService.class.getName());
assertNull("Service not available", sref);
- VirtualFile assemblyB = assembleArchive("lifecycle-failstart", "/bundles/lifecycle/fail-on-start", FailOnStartActivator.class);
+ Archive<?> assemblyB = assembleArchive("lifecycle-failstart", "/bundles/lifecycle/fail-on-start", FailOnStartActivator.class);
Bundle bundleB = installBundle(assemblyB);
try
{
@@ -118,14 +118,14 @@
@Test
public void testDependencyAvailable() throws Exception
{
- VirtualFile assemblyA = assembleArchive("lifecycle-service", "/bundles/lifecycle/simple-service", LifecycleService.class);
+ Archive<?> assemblyA = assembleArchive("lifecycle-service", "/bundles/lifecycle/simple-service", LifecycleService.class);
Bundle bundleA = installBundle(assemblyA);
try
{
bundleA.start();
assertBundleState(Bundle.ACTIVE, bundleA.getState());
- VirtualFile assemblyB = assembleArchive("lifecycle-failstart", "/bundles/lifecycle/fail-on-start", FailOnStartActivator.class);
+ Archive<?> assemblyB = assembleArchive("lifecycle-failstart", "/bundles/lifecycle/fail-on-start", FailOnStartActivator.class);
Bundle bundleB = installBundle(assemblyB);
try
{
@@ -151,13 +151,13 @@
@Test
public void testStartRetry() throws Exception
{
- VirtualFile assemblyA = assembleArchive("lifecycle-service", "/bundles/lifecycle/simple-service", LifecycleService.class);
+ Archive<?> assemblyA = assembleArchive("lifecycle-service", "/bundles/lifecycle/simple-service", LifecycleService.class);
Bundle bundleA = installBundle(assemblyA);
try
{
assertBundleState(Bundle.INSTALLED, bundleA.getState());
- VirtualFile assemblyB = assembleArchive("lifecycle-failstart", "/bundles/lifecycle/fail-on-start", FailOnStartActivator.class);
+ Archive<?> assemblyB = assembleArchive("lifecycle-failstart", "/bundles/lifecycle/fail-on-start", FailOnStartActivator.class);
Bundle bundleB = installBundle(assemblyB);
try
{
@@ -200,7 +200,7 @@
@Test
public void testFailToResolve() throws Exception
{
- VirtualFile assemblyA = assembleArchive("lifecycle-failstart", "/bundles/lifecycle/fail-on-start", FailOnStartActivator.class);
+ Archive<?> assemblyA = assembleArchive("lifecycle-failstart", "/bundles/lifecycle/fail-on-start", FailOnStartActivator.class);
Bundle bundleB = installBundle(assemblyA);
try
{
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-26 05:29:54 UTC (rev 103005)
+++ projects/jboss-osgi/projects/runtime/framework/trunk/bundle/src/test/java/org/jboss/test/osgi/bundle/BundleTestCase.java 2010-03-26 05:39:01 UTC (rev 103006)
@@ -36,7 +36,7 @@
import java.util.jar.Manifest;
import org.jboss.osgi.vfs.VFSUtils;
-import org.jboss.osgi.vfs.VirtualFile;
+import org.jboss.shrinkwrap.api.Archive;
import org.jboss.test.osgi.AbstractFrameworkTest;
import org.junit.Test;
import org.osgi.framework.Bundle;
@@ -58,7 +58,7 @@
public void testBundleId() throws Exception
{
long id1 = -1;
- VirtualFile assembly = assembleArchive("simple-bundle1", "/bundles/simple/simple-bundle1");
+ Archive<?> assembly = assembleArchive("simple-bundle1", "/bundles/simple/simple-bundle1");
Bundle bundle = installBundle(assembly);
try
{
@@ -87,7 +87,7 @@
@Test
public void testSymbolicName() throws Exception
{
- VirtualFile assembly = assembleArchive("simple-bundle1", "/bundles/simple/simple-bundle1");
+ Archive<?> assembly = assembleArchive("simple-bundle1", "/bundles/simple/simple-bundle1");
Bundle bundle = installBundle(assembly);
try
{
@@ -103,7 +103,7 @@
@Test
public void testState() throws Exception
{
- VirtualFile assembly = assembleArchive("simple-bundle1", "/bundles/simple/simple-bundle1");
+ Archive<?> assembly = assembleArchive("simple-bundle1", "/bundles/simple/simple-bundle1");
Bundle bundle = installBundle(assembly);
try
{
@@ -125,7 +125,7 @@
@Test
public void testGetBundleContext() throws Exception
{
- VirtualFile assembly = assembleArchive("simple-bundle1", "/bundles/simple/simple-bundle1");
+ Archive<?> assembly = assembleArchive("simple-bundle1", "/bundles/simple/simple-bundle1");
Bundle bundle = installBundle(assembly);
try
{
@@ -161,15 +161,15 @@
@Test
public void testUpdate() throws Exception
{
- VirtualFile assemble1 = assembleArchive("bundle1", "/bundles/update/update-bundle1");
- VirtualFile assemble2 = assembleArchive("bundle2", "/bundles/update/update-bundle2");
+ Archive<?> assembly1 = assembleArchive("bundle1", "/bundles/update/update-bundle1");
+ Archive<?> assembly2 = assembleArchive("bundle2", "/bundles/update/update-bundle2");
- Manifest manifest = VFSUtils.getManifest(assemble2);
+ Manifest manifest = VFSUtils.getManifest(toVirtualFile(assembly2));
ByteArrayOutputStream baos = new ByteArrayOutputStream();
new JarOutputStream(baos, manifest).close();
ByteArrayInputStream updateStream = new ByteArrayInputStream(baos.toByteArray());
- Bundle bundle = installBundle(assemble1);
+ Bundle bundle = installBundle(assembly1);
try
{
int beforeCount = systemContext.getBundles().length;
@@ -200,11 +200,11 @@
@Test
public void testSingleton() throws Exception
{
- VirtualFile assemblyA = assembleArchive("bundle10", "/bundles/singleton/singleton1");
+ Archive<?> assemblyA = assembleArchive("bundle10", "/bundles/singleton/singleton1");
Bundle bundleA = installBundle(assemblyA);
try
{
- VirtualFile assemblyB = assembleArchive("bundle20", "/bundles/singleton/singleton2");
+ Archive<?> assemblyB = assembleArchive("bundle20", "/bundles/singleton/singleton2");
Bundle bundleB = installBundle(assemblyB);
bundleB.uninstall();
fail("Should not be here!");
@@ -222,11 +222,11 @@
@Test
public void testNotSingleton() throws Exception
{
- VirtualFile assemblyA = assembleArchive("bundle1", "/bundles/singleton/singleton1");
+ Archive<?> assemblyA = assembleArchive("bundle1", "/bundles/singleton/singleton1");
Bundle bundleA = installBundle(assemblyA);
try
{
- VirtualFile assemblyB = assembleArchive("not-singleton", "/bundles/singleton/not-singleton");
+ Archive<?> assemblyB = assembleArchive("not-singleton", "/bundles/singleton/not-singleton");
Bundle bundleB = installBundle(assemblyB);
try
{
@@ -247,7 +247,7 @@
@SuppressWarnings({ "rawtypes", "unchecked" })
public void testGetHeaders() throws Exception
{
- VirtualFile assembly = assembleArchive("simple-bundle1", "/bundles/simple/simple-bundle1");
+ Archive<?> assembly = assembleArchive("simple-bundle1", "/bundles/simple/simple-bundle1");
Bundle bundle = installBundle(assembly);
try
{
Modified: projects/jboss-osgi/projects/runtime/framework/trunk/bundle/src/test/java/org/jboss/test/osgi/bundle/SystemBundleTestCase.java
===================================================================
--- projects/jboss-osgi/projects/runtime/framework/trunk/bundle/src/test/java/org/jboss/test/osgi/bundle/SystemBundleTestCase.java 2010-03-26 05:29:54 UTC (rev 103005)
+++ projects/jboss-osgi/projects/runtime/framework/trunk/bundle/src/test/java/org/jboss/test/osgi/bundle/SystemBundleTestCase.java 2010-03-26 05:39:01 UTC (rev 103006)
@@ -23,7 +23,8 @@
// $Id: $
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.fail;
import java.util.Dictionary;
import java.util.Hashtable;
Modified: projects/jboss-osgi/projects/runtime/framework/trunk/bundle/src/test/java/org/jboss/test/osgi/classloader/RequireBundleTestCase.java
===================================================================
--- projects/jboss-osgi/projects/runtime/framework/trunk/bundle/src/test/java/org/jboss/test/osgi/classloader/RequireBundleTestCase.java 2010-03-26 05:29:54 UTC (rev 103005)
+++ projects/jboss-osgi/projects/runtime/framework/trunk/bundle/src/test/java/org/jboss/test/osgi/classloader/RequireBundleTestCase.java 2010-03-26 05:39:01 UTC (rev 103006)
@@ -25,7 +25,7 @@
import static org.junit.Assert.fail;
-import org.jboss.osgi.vfs.VirtualFile;
+import org.jboss.shrinkwrap.api.Archive;
import org.jboss.test.osgi.AbstractFrameworkTest;
import org.jboss.test.osgi.classloader.support.a.A;
import org.jboss.test.osgi.classloader.support.b.B;
@@ -46,13 +46,13 @@
@Test
public void testSimpleRequireBundle() throws Exception
{
- VirtualFile assemblyA = assembleArchive("bundleA", "/bundles/classloader/bundleA", A.class);
+ Archive<?> assemblyA = assembleArchive("bundleA", "/bundles/classloader/bundleA", A.class);
Bundle bundleA = installBundle(assemblyA);
try
{
bundleA.start();
assertLoadClass(bundleA, A.class.getName());
- VirtualFile assemblyB = assembleArchive("simplerequirebundleA", "/bundles/classloader/simplerequirebundleA", B.class);
+ Archive<?> assemblyB = assembleArchive("simplerequirebundleA", "/bundles/classloader/simplerequirebundleA", B.class);
Bundle bundleB = installBundle(assemblyB);
try
{
@@ -74,13 +74,13 @@
@Test
public void testSimpleRequireBundleFails() throws Exception
{
- VirtualFile assemblyA = assembleArchive("bundleA", "/bundles/classloader/bundleA", A.class);
+ Archive<?> assemblyA = assembleArchive("bundleA", "/bundles/classloader/bundleA", A.class);
Bundle bundleA = installBundle(assemblyA);
try
{
bundleA.start();
assertLoadClass(bundleA, A.class.getName());
- VirtualFile assemblyB = assembleArchive("simplerequirebundlefails", "/bundles/classloader/simplerequirebundlefails", B.class);
+ Archive<?> assemblyB = assembleArchive("simplerequirebundlefails", "/bundles/classloader/simplerequirebundlefails", B.class);
Bundle bundleB = installBundle(assemblyB);
try
{
@@ -105,13 +105,13 @@
@Test
public void testVersionRequireBundle() throws Exception
{
- VirtualFile assemblyA = assembleArchive("bundleA", "/bundles/classloader/bundleA", A.class);
+ Archive<?> assemblyA = assembleArchive("bundleA", "/bundles/classloader/bundleA", A.class);
Bundle bundleA = installBundle(assemblyA);
try
{
bundleA.start();
assertLoadClass(bundleA, A.class.getName());
- VirtualFile assemblyB = assembleArchive("versionrequirebundleA", "/bundles/classloader/versionrequirebundleA", B.class);
+ Archive<?> assemblyB = assembleArchive("versionrequirebundleA", "/bundles/classloader/versionrequirebundleA", B.class);
Bundle bundleB = installBundle(assemblyB);
try
{
@@ -133,13 +133,13 @@
@Test
public void testVersionRequireBundleFails() throws Exception
{
- VirtualFile assemblyA = assembleArchive("bundleA", "/bundles/classloader/bundleA", A.class);
+ Archive<?> assemblyA = assembleArchive("bundleA", "/bundles/classloader/bundleA", A.class);
Bundle bundleA = installBundle(assemblyA);
try
{
bundleA.start();
assertLoadClass(bundleA, A.class.getName());
- VirtualFile assemblyB = assembleArchive("versionrequirebundlefails", "/bundles/classloader/versionrequirebundlefails", B.class);
+ Archive<?> assemblyB = assembleArchive("versionrequirebundlefails", "/bundles/classloader/versionrequirebundlefails", B.class);
Bundle bundleB = installBundle(assemblyB);
try
{
@@ -164,13 +164,13 @@
@Test
public void testOptionalRequireBundle() throws Exception
{
- VirtualFile assemblyA = assembleArchive("bundleA", "/bundles/classloader/bundleA", A.class);
+ Archive<?> assemblyA = assembleArchive("bundleA", "/bundles/classloader/bundleA", A.class);
Bundle bundleA = installBundle(assemblyA);
try
{
bundleA.start();
assertLoadClass(bundleA, A.class.getName());
- VirtualFile assemblyB = assembleArchive("optionalrequirebundleA", "/bundles/classloader/optionalrequirebundleA", B.class);
+ Archive<?> assemblyB = assembleArchive("optionalrequirebundleA", "/bundles/classloader/optionalrequirebundleA", B.class);
Bundle bundleB = installBundle(assemblyB);
try
{
@@ -192,13 +192,13 @@
@Test
public void testOptionalRequireBundleFails() throws Exception
{
- VirtualFile assemblyA = assembleArchive("bundleA", "/bundles/classloader/bundleA", A.class);
+ Archive<?> assemblyA = assembleArchive("bundleA", "/bundles/classloader/bundleA", A.class);
Bundle bundleA = installBundle(assemblyA);
try
{
bundleA.start();
assertLoadClass(bundleA, A.class.getName());
- VirtualFile assemblyB = assembleArchive("optionalrequirebundlefails", "/bundles/classloader/optionalrequirebundlefails", B.class);
+ Archive<?> assemblyB = assembleArchive("optionalrequirebundlefails", "/bundles/classloader/optionalrequirebundlefails", B.class);
Bundle bundleB = installBundle(assemblyB);
try
{
@@ -224,7 +224,7 @@
//Bundle-Version: 1.0.0
//Bundle-SymbolicName: org.jboss.test.osgi.classloader.bundleA;test=x
//Export-Package: org.jboss.test.osgi.classloader.support.a;version=1.0.0;test=x
- VirtualFile assemblyA = assembleArchive("bundleA", "/bundles/classloader/bundleA", A.class);
+ Archive<?> assemblyA = assembleArchive("bundleA", "/bundles/classloader/bundleA", A.class);
Bundle bundleA = installBundle(assemblyA);
try
@@ -236,7 +236,7 @@
//Bundle-SymbolicName: org.jboss.test.osgi.classloader.bundleB
//Require-Bundle: org.jboss.test.osgi.classloader.bundleA;visibility:=reexport
//Export-Package: org.jboss.test.osgi.classloader.support.b
- VirtualFile assemblyB = assembleArchive("reexportrequirebundleA", "/bundles/classloader/reexportrequirebundleA", B.class);
+ Archive<?> assemblyB = assembleArchive("reexportrequirebundleA", "/bundles/classloader/reexportrequirebundleA", B.class);
Bundle bundleB = installBundle(assemblyB);
try
@@ -248,7 +248,7 @@
//Bundle-Name: BundleC
//Bundle-SymbolicName: org.jboss.test.osgi.classloader.bundleC
//Require-Bundle: org.jboss.test.osgi.classloader.bundleB
- VirtualFile assemblyC = assembleArchive("reexportrequirebundleB", "/bundles/classloader/reexportrequirebundleB");
+ Archive<?> assemblyC = assembleArchive("reexportrequirebundleB", "/bundles/classloader/reexportrequirebundleB");
Bundle bundleC = installBundle(assemblyC);
try
@@ -275,20 +275,20 @@
@Test
public void testNoReExportRequireBundle() throws Exception
{
- VirtualFile assemblyA = assembleArchive("bundleA", "/bundles/classloader/bundleA", A.class);
+ Archive<?> assemblyA = assembleArchive("bundleA", "/bundles/classloader/bundleA", A.class);
Bundle bundleA = installBundle(assemblyA);
try
{
bundleA.start();
assertLoadClass(bundleA, A.class.getName());
- VirtualFile assemblyB = assembleArchive("noreexportrequirebundleA", "/bundles/classloader/noreexportrequirebundleA", B.class);
+ Archive<?> assemblyB = assembleArchive("noreexportrequirebundleA", "/bundles/classloader/noreexportrequirebundleA", B.class);
Bundle bundleB = installBundle(assemblyB);
try
{
bundleB.start();
assertLoadClass(bundleB, A.class.getName(), bundleA);
assertLoadClass(bundleB, B.class.getName(), bundleB);
- VirtualFile assemblyC = assembleArchive("reexportrequirebundleB", "/bundles/classloader/reexportrequirebundleB");
+ Archive<?> assemblyC = assembleArchive("reexportrequirebundleB", "/bundles/classloader/reexportrequirebundleB");
Bundle bundleC = installBundle(assemblyC);
try
{
@@ -314,13 +314,13 @@
@Test
public void testAttributeRequireBundle() throws Exception
{
- VirtualFile assemblyA = assembleArchive("bundleA", "/bundles/classloader/bundleA", A.class);
+ Archive<?> assemblyA = assembleArchive("bundleA", "/bundles/classloader/bundleA", A.class);
Bundle bundleA = installBundle(assemblyA);
try
{
bundleA.start();
assertLoadClass(bundleA, A.class.getName());
- VirtualFile assemblyB = assembleArchive("attributerequirebundleA", "/bundles/classloader/attributerequirebundleA", B.class);
+ Archive<?> assemblyB = assembleArchive("attributerequirebundleA", "/bundles/classloader/attributerequirebundleA", B.class);
Bundle bundleB = installBundle(assemblyB);
try
{
@@ -345,7 +345,7 @@
// Bundle-SymbolicName: org.jboss.test.osgi.classloader.bundleA;test=x
// Export-Package: org.jboss.test.osgi.classloader.support.a;version=1.0.0;test=x
// Bundle-Version: 1.0.0
- VirtualFile assemblyA = assembleArchive("bundleA", "/bundles/classloader/bundleA", A.class);
+ Archive<?> assemblyA = assembleArchive("bundleA", "/bundles/classloader/bundleA", A.class);
Bundle bundleA = installBundle(assemblyA);
try
{
@@ -354,7 +354,7 @@
// Bundle-SymbolicName: org.jboss.test.osgi.classloader.bundleB
// Require-Bundle: org.jboss.test.osgi.classloader.bundleA;doesnotexist=true;test=y
- VirtualFile assemblyB = assembleArchive("attributerequirebundlefails", "/bundles/classloader/attributerequirebundlefails", B.class);
+ Archive<?> assemblyB = assembleArchive("attributerequirebundlefails", "/bundles/classloader/attributerequirebundlefails", B.class);
Bundle bundleB = installBundle(assemblyB);
try
{
Modified: projects/jboss-osgi/projects/runtime/framework/trunk/bundle/src/test/java/org/jboss/test/osgi/compendium/PackageAdminTestCase.java
===================================================================
--- projects/jboss-osgi/projects/runtime/framework/trunk/bundle/src/test/java/org/jboss/test/osgi/compendium/PackageAdminTestCase.java 2010-03-26 05:29:54 UTC (rev 103005)
+++ projects/jboss-osgi/projects/runtime/framework/trunk/bundle/src/test/java/org/jboss/test/osgi/compendium/PackageAdminTestCase.java 2010-03-26 05:39:01 UTC (rev 103006)
@@ -26,7 +26,7 @@
import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertSame;
-import org.jboss.osgi.vfs.VirtualFile;
+import org.jboss.shrinkwrap.api.Archive;
import org.jboss.test.osgi.AbstractFrameworkTest;
import org.jboss.test.osgi.compendium.support.a.PA;
import org.jboss.test.osgi.compendium.support.b.Other;
@@ -45,7 +45,7 @@
@Test
public void testGetBudleFromClass() throws Exception
{
- VirtualFile assemblyA = assembleArchive("smoke-assembled", "/bundles/smoke/smoke-assembled", PA.class);
+ Archive<?> assemblyA = assembleArchive("smoke-assembled", "/bundles/smoke/smoke-assembled", PA.class);
Bundle bundleA = installBundle(assemblyA);
try
{
@@ -60,7 +60,7 @@
Bundle notFound = pa.getBundle(getClass());
assertNull(notFound);
- VirtualFile assemblyB = assembleArchive("simple", "/bundles/simple/simple-bundle1", Other.class);
+ Archive<?> assemblyB = assembleArchive("simple", "/bundles/simple/simple-bundle1", Other.class);
Bundle bundleB = installBundle(assemblyB);
try
{
Modified: projects/jboss-osgi/projects/runtime/framework/trunk/bundle/src/test/java/org/jboss/test/osgi/resolver/AbstractImportExportTest.java
===================================================================
--- projects/jboss-osgi/projects/runtime/framework/trunk/bundle/src/test/java/org/jboss/test/osgi/resolver/AbstractImportExportTest.java 2010-03-26 05:29:54 UTC (rev 103005)
+++ projects/jboss-osgi/projects/runtime/framework/trunk/bundle/src/test/java/org/jboss/test/osgi/resolver/AbstractImportExportTest.java 2010-03-26 05:39:01 UTC (rev 103006)
@@ -27,7 +27,7 @@
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
-import org.jboss.osgi.vfs.VirtualFile;
+import org.jboss.shrinkwrap.api.Archive;
import org.jboss.test.osgi.classloader.support.a.A;
import org.junit.Test;
import org.osgi.framework.Bundle;
@@ -46,14 +46,14 @@
{
// Bundle-SymbolicName: simpleimport
// Import-Package: org.jboss.test.osgi.classloader.support.a
- VirtualFile fileA = assembleArchive("bundleA", "/bundles/resolver/simpleimport");
- Bundle bundleA = installBundle(fileA);
+ Archive<?> assemblyA = assembleArchive("bundleA", "/bundles/resolver/simpleimport");
+ Bundle bundleA = installBundle(assemblyA);
try
{
// Bundle-SymbolicName: simpleexport
// Export-Package: org.jboss.test.osgi.classloader.support.a
- VirtualFile fileB = assembleArchive("bundleB", "/bundles/resolver/simpleexport", A.class);
- Bundle bundleB = installBundle(fileB);
+ Archive<?> assemblyB = assembleArchive("bundleB", "/bundles/resolver/simpleexport", A.class);
+ Bundle bundleB = installBundle(assemblyB);
try
{
// Resolve the installed bundles
@@ -85,8 +85,8 @@
{
// Bundle-SymbolicName: simpleimport
// Import-Package: org.jboss.test.osgi.classloader.support.a
- VirtualFile fileA = assembleArchive("bundleA", "/bundles/resolver/simpleimport");
- Bundle bundleA = installBundle(fileA);
+ Archive<?> assemblyA = assembleArchive("bundleA", "/bundles/resolver/simpleimport");
+ Bundle bundleA = installBundle(assemblyA);
try
{
// Resolve the installed bundles
@@ -111,14 +111,14 @@
{
// Bundle-SymbolicName: simpleimport
// Import-Package: org.jboss.test.osgi.classloader.support.a
- VirtualFile fileA = assembleArchive("bundleA", "/bundles/resolver/simpleimport");
- Bundle bundleA = installBundle(fileA);
+ Archive<?> assemblyA = assembleArchive("bundleA", "/bundles/resolver/simpleimport");
+ Bundle bundleA = installBundle(assemblyA);
try
{
// Bundle-SymbolicName: simpleexport
// Export-Package: org.jboss.test.osgi.classloader.support.a
- VirtualFile fileB = assembleArchive("bundleB", "/bundles/resolver/simpleexport", A.class);
- Bundle bundleB = installBundle(fileB);
+ Archive<?> assemblyB = assembleArchive("bundleB", "/bundles/resolver/simpleexport", A.class);
+ Bundle bundleB = installBundle(assemblyB);
try
{
// Only resolve BundleB
@@ -154,8 +154,8 @@
// Bundle-SymbolicName: selfimport
// Export-Package: org.jboss.test.osgi.classloader.support.a
// Import-Package: org.jboss.test.osgi.classloader.support.a
- VirtualFile fileA = assembleArchive("bundleA", "/bundles/resolver/selfimport", A.class);
- Bundle bundleA = installBundle(fileA);
+ Archive<?> assemblyA = assembleArchive("bundleA", "/bundles/resolver/selfimport", A.class);
+ Bundle bundleA = installBundle(assemblyA);
try
{
// Resolve the installed bundles
@@ -180,14 +180,14 @@
{
//Bundle-SymbolicName: packageimportversion
//Import-Package: org.jboss.test.osgi.classloader.support.a;version="[0.0.0,1.0.0]"
- VirtualFile fileA = assembleArchive("bundleA", "/bundles/resolver/packageimportversion");
- Bundle bundleA = installBundle(fileA);
+ Archive<?> assemblyA = assembleArchive("bundleA", "/bundles/resolver/packageimportversion");
+ Bundle bundleA = installBundle(assemblyA);
try
{
//Bundle-SymbolicName: packageexportversion100
//Export-Package: org.jboss.test.osgi.classloader.support.a;version=1.0.0
- VirtualFile fileB = assembleArchive("bundleB", "/bundles/resolver/packageexportversion100", A.class);
- Bundle bundleB = installBundle(fileB);
+ Archive<?> assemblyB = assembleArchive("bundleB", "/bundles/resolver/packageexportversion100", A.class);
+ Bundle bundleB = installBundle(assemblyB);
try
{
// Resolve the installed bundles
@@ -219,14 +219,14 @@
{
//Bundle-SymbolicName: packageimportversionfails
//Import-Package: org.jboss.test.osgi.classloader.support.a;version="[3.0,4.0)"
- VirtualFile fileA = assembleArchive("bundleA", "/bundles/resolver/packageimportversionfails");
- Bundle bundleA = installBundle(fileA);
+ Archive<?> assemblyA = assembleArchive("bundleA", "/bundles/resolver/packageimportversionfails");
+ Bundle bundleA = installBundle(assemblyA);
try
{
//Bundle-SymbolicName: packageexportversion100
//Export-Package: org.jboss.test.osgi.classloader.support.a;version=1.0.0
- VirtualFile fileB = assembleArchive("bundleB", "/bundles/resolver/packageexportversion100", A.class);
- Bundle bundleB = installBundle(fileB);
+ Archive<?> assemblyB = assembleArchive("bundleB", "/bundles/resolver/packageexportversion100", A.class);
+ Bundle bundleB = installBundle(assemblyB);
try
{
// Resolve the installed bundles
@@ -258,8 +258,8 @@
{
//Bundle-SymbolicName: packageimportoptional
//Import-Package: org.jboss.test.osgi.classloader.support.a;resolution:=optional
- VirtualFile fileA = assembleArchive("bundleA", "/bundles/resolver/packageimportoptional");
- Bundle bundleA = installBundle(fileA);
+ Archive<?> assemblyA = assembleArchive("bundleA", "/bundles/resolver/packageimportoptional");
+ Bundle bundleA = installBundle(assemblyA);
try
{
// Resolve the installed bundles
@@ -284,14 +284,14 @@
{
//Bundle-SymbolicName: packageimportoptional
//Import-Package: org.jboss.test.osgi.classloader.support.a;resolution:=optional
- VirtualFile fileA = assembleArchive("bundleA", "/bundles/resolver/packageimportoptional");
- Bundle bundleA = installBundle(fileA);
+ Archive<?> assemblyA = assembleArchive("bundleA", "/bundles/resolver/packageimportoptional");
+ Bundle bundleA = installBundle(assemblyA);
try
{
// Bundle-SymbolicName: simpleexport
// Export-Package: org.jboss.test.osgi.classloader.support.a
- VirtualFile fileB = assembleArchive("bundleB", "/bundles/resolver/simpleexport", A.class);
- Bundle bundleB = installBundle(fileB);
+ Archive<?> assemblyB = assembleArchive("bundleB", "/bundles/resolver/simpleexport", A.class);
+ Bundle bundleB = installBundle(assemblyB);
try
{
// Resolve the installed bundles
@@ -323,8 +323,8 @@
{
//Bundle-SymbolicName: packageimportoptional
//Import-Package: org.jboss.test.osgi.classloader.support.a;resolution:=optional
- VirtualFile fileA = assembleArchive("bundleA", "/bundles/resolver/packageimportoptional");
- Bundle bundleA = installBundle(fileA);
+ Archive<?> assemblyA = assembleArchive("bundleA", "/bundles/resolver/packageimportoptional");
+ Bundle bundleA = installBundle(assemblyA);
try
{
// Resolve the installed bundles
@@ -334,8 +334,8 @@
// Bundle-SymbolicName: simpleexport
// Export-Package: org.jboss.test.osgi.classloader.support.a
- VirtualFile fileB = assembleArchive("bundleB", "/bundles/resolver/simpleexport", A.class);
- Bundle bundleB = installBundle(fileB);
+ Archive<?> assemblyB = assembleArchive("bundleB", "/bundles/resolver/simpleexport", A.class);
+ Bundle bundleB = installBundle(assemblyB);
try
{
// Resolve the installed bundles
@@ -367,14 +367,14 @@
{
//Bundle-SymbolicName: bundlenameimport
//Import-Package: org.jboss.test.osgi.classloader.support.a;bundle-symbolic-name=simpleexport
- VirtualFile fileA = assembleArchive("bundleA", "/bundles/resolver/bundlenameimport");
- Bundle bundleA = installBundle(fileA);
+ Archive<?> assemblyA = assembleArchive("bundleA", "/bundles/resolver/bundlenameimport");
+ Bundle bundleA = installBundle(assemblyA);
try
{
//Bundle-SymbolicName: simpleexport
//Export-Package: org.jboss.test.osgi.classloader.support.a
- VirtualFile fileB = assembleArchive("bundleB", "/bundles/resolver/simpleexport", A.class);
- Bundle bundleB = installBundle(fileB);
+ Archive<?> assemblyB = assembleArchive("bundleB", "/bundles/resolver/simpleexport", A.class);
+ Bundle bundleB = installBundle(assemblyB);
try
{
// Resolve the installed bundles
@@ -406,14 +406,14 @@
{
//Bundle-SymbolicName: bundlenameimport
//Import-Package: org.jboss.test.osgi.classloader.support.a;bundle-symbolic-name=simpleexport
- VirtualFile fileA = assembleArchive("bundleA", "/bundles/resolver/bundlenameimport");
- Bundle bundleA = installBundle(fileA);
+ Archive<?> assemblyA = assembleArchive("bundleA", "/bundles/resolver/bundlenameimport");
+ Bundle bundleA = installBundle(assemblyA);
try
{
//Bundle-SymbolicName: sigleton;singleton:=true
//Export-Package: org.jboss.test.osgi.classloader.support.a
- VirtualFile fileB = assembleArchive("bundleB", "/bundles/resolver/singleton", A.class);
- Bundle bundleB = installBundle(fileB);
+ Archive<?> assemblyB = assembleArchive("bundleB", "/bundles/resolver/singleton", A.class);
+ Bundle bundleB = installBundle(assemblyB);
try
{
// Resolve the installed bundles
@@ -445,14 +445,14 @@
{
//Bundle-SymbolicName: bundleversionimport
//Import-Package: org.jboss.test.osgi.classloader.support.a;bundle-version="[0.0.0,1.0.0)"
- VirtualFile fileA = assembleArchive("bundleA", "/bundles/resolver/bundleversionimport");
- Bundle bundleA = installBundle(fileA);
+ Archive<?> assemblyA = assembleArchive("bundleA", "/bundles/resolver/bundleversionimport");
+ Bundle bundleA = installBundle(assemblyA);
try
{
// Bundle-SymbolicName: simpleexport
// Export-Package: org.jboss.test.osgi.classloader.support.a
- VirtualFile fileB = assembleArchive("bundleB", "/bundles/resolver/simpleexport", A.class);
- Bundle bundleB = installBundle(fileB);
+ Archive<?> assemblyB = assembleArchive("bundleB", "/bundles/resolver/simpleexport", A.class);
+ Bundle bundleB = installBundle(assemblyB);
try
{
// Resolve the installed bundles
@@ -484,14 +484,14 @@
{
//Bundle-SymbolicName: bundleversionimportfails
//Import-Package: org.jboss.test.osgi.classloader.support.a;bundle-version="[1.0.0,2.0.0)"
- VirtualFile fileA = assembleArchive("bundleA", "/bundles/resolver/bundleversionimportfails");
- Bundle bundleA = installBundle(fileA);
+ Archive<?> assemblyA = assembleArchive("bundleA", "/bundles/resolver/bundleversionimportfails");
+ Bundle bundleA = installBundle(assemblyA);
try
{
// Bundle-SymbolicName: simpleexport
// Export-Package: org.jboss.test.osgi.classloader.support.a
- VirtualFile fileB = assembleArchive("bundleB", "/bundles/resolver/simpleexport", A.class);
- Bundle bundleB = installBundle(fileB);
+ Archive<?> assemblyB = assembleArchive("bundleB", "/bundles/resolver/simpleexport", A.class);
+ Bundle bundleB = installBundle(assemblyB);
try
{
// Resolve the installed bundles
@@ -525,14 +525,14 @@
//Bundle-SymbolicName: requirebundle
//Require-Bundle: simpleexport
- VirtualFile fileA = assembleArchive("bundleA", "/bundles/resolver/requirebundle");
- Bundle bundleA = installBundle(fileA);
+ Archive<?> assemblyA = assembleArchive("bundleA", "/bundles/resolver/requirebundle");
+ Bundle bundleA = installBundle(assemblyA);
try
{
// Bundle-SymbolicName: simpleexport
// Export-Package: org.jboss.test.osgi.classloader.support.a
- VirtualFile fileB = assembleArchive("bundleB", "/bundles/resolver/simpleexport", A.class);
- Bundle bundleB = installBundle(fileB);
+ Archive<?> assemblyB = assembleArchive("bundleB", "/bundles/resolver/simpleexport", A.class);
+ Bundle bundleB = installBundle(assemblyB);
try
{
// Resolve the installed bundles
@@ -564,8 +564,8 @@
{
//Bundle-SymbolicName: requirebundle
//Require-Bundle: simpleexport
- VirtualFile fileA = assembleArchive("bundleA", "/bundles/resolver/requirebundle");
- Bundle bundleA = installBundle(fileA);
+ Archive<?> assemblyA = assembleArchive("bundleA", "/bundles/resolver/requirebundle");
+ Bundle bundleA = installBundle(assemblyA);
try
{
// Resolve the installed bundles
@@ -590,8 +590,8 @@
{
//Bundle-SymbolicName: requirebundleoptional
//Require-Bundle: simpleexport;resolution:=optional
- VirtualFile fileA = assembleArchive("bundleA", "/bundles/resolver/requirebundleoptional");
- Bundle bundleA = installBundle(fileA);
+ Archive<?> assemblyA = assembleArchive("bundleA", "/bundles/resolver/requirebundleoptional");
+ Bundle bundleA = installBundle(assemblyA);
try
{
// Resolve the installed bundles
@@ -613,14 +613,14 @@
{
//Bundle-SymbolicName: requirebundleversion
//Require-Bundle: simpleexport;bundle-version="[0.0.0,1.0.0]"
- VirtualFile fileA = assembleArchive("bundleA", "/bundles/resolver/requirebundleversion");
- Bundle bundleA = installBundle(fileA);
+ Archive<?> assemblyA = assembleArchive("bundleA", "/bundles/resolver/requirebundleversion");
+ Bundle bundleA = installBundle(assemblyA);
try
{
// Bundle-SymbolicName: simpleexport
// Export-Package: org.jboss.test.osgi.classloader.support.a
- VirtualFile fileB = assembleArchive("bundleB", "/bundles/resolver/simpleexport", A.class);
- Bundle bundleB = installBundle(fileB);
+ Archive<?> assemblyB = assembleArchive("bundleB", "/bundles/resolver/simpleexport", A.class);
+ Bundle bundleB = installBundle(assemblyB);
try
{
// Resolve the installed bundles
@@ -652,14 +652,14 @@
{
//Bundle-SymbolicName: versionrequirebundlefails
//Require-Bundle: simpleexport;bundle-version="[1.0.0,2.0.0)"
- VirtualFile fileA = assembleArchive("bundleA", "/bundles/resolver/requirebundleversionfails");
- Bundle bundleA = installBundle(fileA);
+ Archive<?> assemblyA = assembleArchive("bundleA", "/bundles/resolver/requirebundleversionfails");
+ Bundle bundleA = installBundle(assemblyA);
try
{
// Bundle-SymbolicName: simpleexport
// Export-Package: org.jboss.test.osgi.classloader.support.a
- VirtualFile fileB = assembleArchive("bundleB", "/bundles/resolver/simpleexport", A.class);
- Bundle bundleB = installBundle(fileB);
+ Archive<?> assemblyB = assembleArchive("bundleB", "/bundles/resolver/simpleexport", A.class);
+ Bundle bundleB = installBundle(assemblyB);
try
{
// Resolve the installed bundles
@@ -691,17 +691,17 @@
{
// Bundle-SymbolicName: simpleexport
// Export-Package: org.jboss.test.osgi.classloader.support.a
- VirtualFile fileA = assembleArchive("bundleA", "/bundles/resolver/simpleexport", A.class);
+ Archive<?> assemblyA = assembleArchive("bundleA", "/bundles/resolver/simpleexport", A.class);
// Bundle-SymbolicName: simpleexportother
// Export-Package: org.jboss.test.osgi.classloader.support.a
- VirtualFile fileB = assembleArchive("bundleB", "/bundles/resolver/simpleexportother", A.class);
+ Archive<?> assemblyB = assembleArchive("bundleB", "/bundles/resolver/simpleexportother", A.class);
// Bundle-SymbolicName: simpleimport
// Import-Package: org.jboss.test.osgi.classloader.support.a
- VirtualFile fileC = assembleArchive("bundleC", "/bundles/resolver/simpleimport");
+ Archive<?> assemblyC = assembleArchive("bundleC", "/bundles/resolver/simpleimport");
- Bundle bundleA = installBundle(fileA);
+ Bundle bundleA = installBundle(assemblyA);
try
{
// Resolve the installed bundles
@@ -712,10 +712,10 @@
// Verify bundle states
assertEquals("BundleA RESOLVED", Bundle.RESOLVED, bundleA.getState());
- Bundle bundleB = installBundle(fileB);
+ Bundle bundleB = installBundle(assemblyB);
try
{
- Bundle bundleC = installBundle(fileC);
+ Bundle bundleC = installBundle(assemblyC);
try
{
allResolved = packageAdmin.resolveBundles(null);
@@ -751,17 +751,17 @@
{
// Bundle-SymbolicName: simpleexport
// Export-Package: org.jboss.test.osgi.classloader.support.a
- VirtualFile fileA = assembleArchive("bundleA", "/bundles/resolver/simpleexport", A.class);
+ Archive<?> assemblyA = assembleArchive("bundleA", "/bundles/resolver/simpleexport", A.class);
// Bundle-SymbolicName: simpleexportother
// Export-Package: org.jboss.test.osgi.classloader.support.a
- VirtualFile fileB = assembleArchive("bundleB", "/bundles/resolver/simpleexportother", A.class);
+ Archive<?> assemblyB = assembleArchive("bundleB", "/bundles/resolver/simpleexportother", A.class);
// Bundle-SymbolicName: simpleimport
// Import-Package: org.jboss.test.osgi.classloader.support.a
- VirtualFile fileC = assembleArchive("bundleC", "/bundles/resolver/simpleimport");
+ Archive<?> assemblyC = assembleArchive("bundleC", "/bundles/resolver/simpleimport");
- Bundle bundleB = installBundle(fileB);
+ Bundle bundleB = installBundle(assemblyB);
try
{
// Resolve the installed bundles
@@ -772,10 +772,10 @@
// Verify bundle states
assertEquals("BundleB RESOLVED", Bundle.RESOLVED, bundleB.getState());
- Bundle bundleA = installBundle(fileA);
+ Bundle bundleA = installBundle(assemblyA);
try
{
- Bundle bundleC = installBundle(fileC);
+ Bundle bundleC = installBundle(assemblyC);
try
{
allResolved = packageAdmin.resolveBundles(null);
@@ -811,23 +811,23 @@
{
//Bundle-SymbolicName: packageexportversion100
//Export-Package: org.jboss.test.osgi.classloader.support.a;version=1.0.0
- VirtualFile fileA = assembleArchive("bundleA", "/bundles/resolver/packageexportversion100", A.class);
+ Archive<?> assemblyA = assembleArchive("bundleA", "/bundles/resolver/packageexportversion100", A.class);
//Bundle-SymbolicName: packageexportversion200
//Export-Package: org.jboss.test.osgi.classloader.support.a;version=2.0.0
- VirtualFile fileB = assembleArchive("bundleB", "/bundles/resolver/packageexportversion200", A.class);
+ Archive<?> assemblyB = assembleArchive("bundleB", "/bundles/resolver/packageexportversion200", A.class);
// Bundle-SymbolicName: simpleimport
// Import-Package: org.jboss.test.osgi.classloader.support.a
- VirtualFile fileC = assembleArchive("bundleC", "/bundles/resolver/simpleimport");
+ Archive<?> assemblyC = assembleArchive("bundleC", "/bundles/resolver/simpleimport");
- Bundle bundleA = installBundle(fileA);
+ Bundle bundleA = installBundle(assemblyA);
try
{
- Bundle bundleB = installBundle(fileB);
+ Bundle bundleB = installBundle(assemblyB);
try
{
- Bundle bundleC = installBundle(fileC);
+ Bundle bundleC = installBundle(assemblyC);
try
{
// Resolve the installed bundles
@@ -866,23 +866,23 @@
{
//Bundle-SymbolicName: packageexportversion200
//Export-Package: org.jboss.test.osgi.classloader.support.a;version=2.0.0
- VirtualFile fileA = assembleArchive("bundleA", "/bundles/resolver/packageexportversion200", A.class);
+ Archive<?> assemblyA = assembleArchive("bundleA", "/bundles/resolver/packageexportversion200", A.class);
//Bundle-SymbolicName: packageexportversion100
//Export-Package: org.jboss.test.osgi.classloader.support.a;version=1.0.0
- VirtualFile fileB = assembleArchive("bundleB", "/bundles/resolver/packageexportversion100", A.class);
+ Archive<?> assemblyB = assembleArchive("bundleB", "/bundles/resolver/packageexportversion100", A.class);
// Bundle-SymbolicName: simpleimport
// Import-Package: org.jboss.test.osgi.classloader.support.a
- VirtualFile fileC = assembleArchive("bundleC", "/bundles/resolver/simpleimport");
+ Archive<?> assemblyC = assembleArchive("bundleC", "/bundles/resolver/simpleimport");
- Bundle bundleA = installBundle(fileA);
+ Bundle bundleA = installBundle(assemblyA);
try
{
- Bundle bundleB = installBundle(fileB);
+ Bundle bundleB = installBundle(assemblyB);
try
{
- Bundle bundleC = installBundle(fileC);
+ Bundle bundleC = installBundle(assemblyC);
try
{
// Resolve the installed bundles
@@ -921,20 +921,20 @@
{
// Bundle-SymbolicName: simpleexport
// Export-Package: org.jboss.test.osgi.classloader.support.a
- VirtualFile fileA = assembleArchive("bundleA", "/bundles/resolver/simpleexport", A.class);
+ Archive<?> assemblyA = assembleArchive("bundleA", "/bundles/resolver/simpleexport", A.class);
// Bundle-SymbolicName: simpleexportother
// Export-Package: org.jboss.test.osgi.classloader.support.a
- VirtualFile fileB = assembleArchive("bundleB", "/bundles/resolver/simpleexportother", A.class);
+ Archive<?> assemblyB = assembleArchive("bundleB", "/bundles/resolver/simpleexportother", A.class);
// Bundle-SymbolicName: simpleimport
// Import-Package: org.jboss.test.osgi.classloader.support.a
- VirtualFile fileC = assembleArchive("bundleC", "/bundles/resolver/simpleimport");
+ Archive<?> assemblyC = assembleArchive("bundleC", "/bundles/resolver/simpleimport");
- Bundle bundleA = installBundle(fileA);
+ Bundle bundleA = installBundle(assemblyA);
try
{
- Bundle bundleB = installBundle(fileB);
+ Bundle bundleB = installBundle(assemblyB);
try
{
// Resolve the installed bundles
@@ -946,7 +946,7 @@
assertEquals("BundleA RESOLVED", Bundle.RESOLVED, bundleA.getState());
assertEquals("BundleB RESOLVED", Bundle.RESOLVED, bundleB.getState());
- Bundle bundleC = installBundle(fileC);
+ Bundle bundleC = installBundle(assemblyC);
try
{
allResolved = packageAdmin.resolveBundles(null);
@@ -981,20 +981,20 @@
{
// Bundle-SymbolicName: simpleexportother
// Export-Package: org.jboss.test.osgi.classloader.support.a
- VirtualFile fileA = assembleArchive("bundleA", "/bundles/resolver/simpleexportother", A.class);
+ Archive<?> assemblyA = assembleArchive("bundleA", "/bundles/resolver/simpleexportother", A.class);
// Bundle-SymbolicName: simpleexport
// Export-Package: org.jboss.test.osgi.classloader.support.a
- VirtualFile fileB = assembleArchive("bundleB", "/bundles/resolver/simpleexport", A.class);
+ Archive<?> assemblyB = assembleArchive("bundleB", "/bundles/resolver/simpleexport", A.class);
// Bundle-SymbolicName: simpleimport
// Import-Package: org.jboss.test.osgi.classloader.support.a
- VirtualFile fileC = assembleArchive("bundleC", "/bundles/resolver/simpleimport");
+ Archive<?> assemblyC = assembleArchive("bundleC", "/bundles/resolver/simpleimport");
- Bundle bundleA = installBundle(fileA);
+ Bundle bundleA = installBundle(assemblyA);
try
{
- Bundle bundleB = installBundle(fileB);
+ Bundle bundleB = installBundle(assemblyB);
try
{
// Resolve the installed bundles
@@ -1006,7 +1006,7 @@
assertEquals("BundleA RESOLVED", Bundle.RESOLVED, bundleA.getState());
assertEquals("BundleB RESOLVED", Bundle.RESOLVED, bundleB.getState());
- Bundle bundleC = installBundle(fileC);
+ Bundle bundleC = installBundle(assemblyC);
try
{
allResolved = packageAdmin.resolveBundles(null);
@@ -1041,14 +1041,14 @@
{
//Bundle-SymbolicName: packageexportattribute
//Export-Package: org.jboss.test.osgi.classloader.support.a;test=x
- VirtualFile fileA = assembleArchive("bundleA", "/bundles/resolver/packageexportattribute", A.class);
- Bundle bundleA = installBundle(fileA);
+ Archive<?> assemblyA = assembleArchive("bundleA", "/bundles/resolver/packageexportattribute", A.class);
+ Bundle bundleA = installBundle(assemblyA);
try
{
//Bundle-SymbolicName: simpleimport
//Import-Package: org.jboss.test.osgi.classloader.support.a
- VirtualFile fileB = assembleArchive("bundleB", "/bundles/resolver/simpleimport");
- Bundle bundleB = installBundle(fileB);
+ Archive<?> assemblyB = assembleArchive("bundleB", "/bundles/resolver/simpleimport");
+ Bundle bundleB = installBundle(assemblyB);
try
{
// Resolve the installed bundles
@@ -1071,8 +1071,8 @@
//Bundle-SymbolicName: packageimportattribute
//Import-Package: org.jboss.test.osgi.classloader.support.a;test=x
- fileB = assembleArchive("bundleB", "/bundles/resolver/packageimportattribute");
- bundleB = installBundle(fileB);
+ assemblyB = assembleArchive("bundleB", "/bundles/resolver/packageimportattribute");
+ bundleB = installBundle(assemblyB);
try
{
// Resolve the installed bundles
@@ -1104,14 +1104,14 @@
{
//Bundle-SymbolicName: packageexportattribute
//Export-Package: org.jboss.test.osgi.classloader.support.a;test=x
- VirtualFile fileA = assembleArchive("bundleA", "/bundles/resolver/packageexportattribute", A.class);
- Bundle bundleA = installBundle(fileA);
+ Archive<?> assemblyA = assembleArchive("bundleA", "/bundles/resolver/packageexportattribute", A.class);
+ Bundle bundleA = installBundle(assemblyA);
try
{
//Bundle-SymbolicName: packageimportattributefails
//Import-Package: org.jboss.test.osgi.classloader.support.a;test=y
- VirtualFile fileB = assembleArchive("bundleB", "/bundles/resolver/packageimportattributefails");
- Bundle bundleB = installBundle(fileB);
+ Archive<?> assemblyB = assembleArchive("bundleB", "/bundles/resolver/packageimportattributefails");
+ Bundle bundleB = installBundle(assemblyB);
try
{
// Resolve the installed bundles
@@ -1143,14 +1143,14 @@
{
//Bundle-SymbolicName: packageexportattributemandatory
//Export-Package: org.jboss.test.osgi.classloader.support.a;test=x;mandatory:=test
- VirtualFile fileA = assembleArchive("bundleA", "/bundles/resolver/packageexportattributemandatory", A.class);
- Bundle bundleA = installBundle(fileA);
+ Archive<?> assemblyA = assembleArchive("bundleA", "/bundles/resolver/packageexportattributemandatory", A.class);
+ Bundle bundleA = installBundle(assemblyA);
try
{
//Bundle-SymbolicName: packageimportattribute
//Import-Package: org.jboss.test.osgi.classloader.support.a;test=x
- VirtualFile fileB = assembleArchive("bundleB", "/bundles/resolver/packageimportattribute");
- Bundle bundleB = installBundle(fileB);
+ Archive<?> assemblyB = assembleArchive("bundleB", "/bundles/resolver/packageimportattribute");
+ Bundle bundleB = installBundle(assemblyB);
try
{
// Resolve the installed bundles
@@ -1182,14 +1182,14 @@
{
//Bundle-SymbolicName: packageexportattributemandatory
//Export-Package: org.jboss.test.osgi.classloader.support.a;test=x;mandatory:=test
- VirtualFile fileA = assembleArchive("bundleA", "/bundles/resolver/packageexportattributemandatory", A.class);
- Bundle bundleA = installBundle(fileA);
+ Archive<?> assemblyA = assembleArchive("bundleA", "/bundles/resolver/packageexportattributemandatory", A.class);
+ Bundle bundleA = installBundle(assemblyA);
try
{
//Bundle-SymbolicName: simpleimport
//Import-Package: org.jboss.test.osgi.classloader.support.a
- VirtualFile fileB = assembleArchive("bundleB", "/bundles/resolver/simpleimport");
- Bundle bundleB = installBundle(fileB);
+ Archive<?> assemblyB = assembleArchive("bundleB", "/bundles/resolver/simpleimport");
+ Bundle bundleB = installBundle(assemblyB);
try
{
// Resolve the installed bundles
@@ -1221,8 +1221,8 @@
{
//Bundle-SymbolicName: systempackageimport
//Import-Package: org.osgi.framework;version=1.4
- VirtualFile fileA = assembleArchive("bundleA", "/bundles/resolver/systempackageimport");
- Bundle bundleA = installBundle(fileA);
+ Archive<?> assemblyA = assembleArchive("bundleA", "/bundles/resolver/systempackageimport");
+ Bundle bundleA = installBundle(assemblyA);
try
{
// Resolve the installed bundles
Modified: projects/jboss-osgi/projects/runtime/framework/trunk/bundle/src/test/java/org/jboss/test/osgi/resolver/ResolverMetadataTestCase.java
===================================================================
--- projects/jboss-osgi/projects/runtime/framework/trunk/bundle/src/test/java/org/jboss/test/osgi/resolver/ResolverMetadataTestCase.java 2010-03-26 05:29:54 UTC (rev 103005)
+++ projects/jboss-osgi/projects/runtime/framework/trunk/bundle/src/test/java/org/jboss/test/osgi/resolver/ResolverMetadataTestCase.java 2010-03-26 05:39:01 UTC (rev 103006)
@@ -37,7 +37,7 @@
import org.jboss.osgi.framework.resolver.RequiredBundle;
import org.jboss.osgi.framework.resolver.Resolver;
import org.jboss.osgi.framework.resolver.ResolverBundle;
-import org.jboss.osgi.vfs.VirtualFile;
+import org.jboss.shrinkwrap.api.Archive;
import org.jboss.test.osgi.classloader.support.a.A;
import org.junit.Test;
import org.osgi.framework.Bundle;
@@ -60,8 +60,8 @@
// Bundle-SymbolicName: simpleexport
// Export-Package: org.jboss.test.osgi.classloader.support.a
- VirtualFile fileA = assembleArchive("bundleA", "/bundles/resolver/simpleexport", A.class);
- Bundle bundleA = installBundle(fileA);
+ Archive<?> assemblyA = assembleArchive("bundleA", "/bundles/resolver/simpleexport", A.class);
+ Bundle bundleA = installBundle(assemblyA);
try
{
assertEquals(1, resolver.getBundles().size());
@@ -115,8 +115,8 @@
// Bundle-SymbolicName: simpleimport
// Import-Package: org.jboss.test.osgi.classloader.support.a
- VirtualFile fileA = assembleArchive("bundleA", "/bundles/resolver/simpleimport");
- Bundle bundleA = installBundle(fileA);
+ Archive<?> assemblyA = assembleArchive("bundleA", "/bundles/resolver/simpleimport");
+ Bundle bundleA = installBundle(assemblyA);
try
{
ResolverBundle resBundleA = resolver.getBundle(bundleA);
@@ -148,8 +148,8 @@
// Bundle-SymbolicName: singleton;singleton:=true
// Export-Package: org.jboss.test.osgi.classloader.support.a
- VirtualFile fileA = assembleArchive("bundleA", "/bundles/resolver/singleton", A.class);
- Bundle bundleA = installBundle(fileA);
+ Archive<?> assemblyA = assembleArchive("bundleA", "/bundles/resolver/singleton", A.class);
+ Bundle bundleA = installBundle(assemblyA);
try
{
ResolverBundle resBundleA = resolver.getBundle(bundleA);
@@ -170,8 +170,8 @@
//Bundle-SymbolicName: requirebundle
//Require-Bundle: simpleexport
- VirtualFile fileA = assembleArchive("bundleA", "/bundles/resolver/requirebundle");
- Bundle bundleA = installBundle(fileA);
+ Archive<?> assemblyA = assembleArchive("bundleA", "/bundles/resolver/requirebundle");
+ Bundle bundleA = installBundle(assemblyA);
try
{
ResolverBundle resBundleA = resolver.getBundle(bundleA);
@@ -197,8 +197,8 @@
//Bundle-SymbolicName: requirebundle
//Require-Bundle: simpleexport;resolution:=optional
- VirtualFile fileA = assembleArchive("bundleA", "/bundles/resolver/requirebundleoptional");
- Bundle bundleA = installBundle(fileA);
+ Archive<?> assemblyA = assembleArchive("bundleA", "/bundles/resolver/requirebundleoptional");
+ Bundle bundleA = installBundle(assemblyA);
try
{
ResolverBundle resBundleA = resolver.getBundle(bundleA);
@@ -224,8 +224,8 @@
//Bundle-SymbolicName: requirebundle
//Require-Bundle: simpleexport;bundle-version="[0.0.0,1.0.0]"
- VirtualFile fileA = assembleArchive("bundleA", "/bundles/resolver/requirebundleversion");
- Bundle bundleA = installBundle(fileA);
+ Archive<?> assemblyA = assembleArchive("bundleA", "/bundles/resolver/requirebundleversion");
+ Bundle bundleA = installBundle(assemblyA);
try
{
ResolverBundle resBundleA = resolver.getBundle(bundleA);
@@ -251,8 +251,8 @@
//Bundle-SymbolicName: packageexportattribute
//Export-Package: org.jboss.test.osgi.classloader.support.a;test=x
- VirtualFile fileA = assembleArchive("bundleA", "/bundles/resolver/packageexportattribute");
- Bundle bundleA = installBundle(fileA);
+ Archive<?> assemblyA = assembleArchive("bundleA", "/bundles/resolver/packageexportattribute");
+ Bundle bundleA = installBundle(assemblyA);
try
{
ResolverBundle resBundleA = resolver.getBundle(bundleA);
@@ -263,8 +263,8 @@
//Bundle-SymbolicName: simpleimport
//Import-Package: org.jboss.test.osgi.classloader.support.a
- VirtualFile fileB = assembleArchive("bundleB", "/bundles/resolver/simpleimport");
- Bundle bundleB = installBundle(fileB);
+ Archive<?> assemblyB = assembleArchive("bundleB", "/bundles/resolver/simpleimport");
+ Bundle bundleB = installBundle(assemblyB);
try
{
ResolverBundle resBundleB = resolver.getBundle(bundleB);
@@ -278,8 +278,8 @@
//Bundle-SymbolicName: packageimportattribute
//Import-Package: org.jboss.test.osgi.classloader.support.a;test=x
- fileB = assembleArchive("bundleB", "/bundles/resolver/packageimportattribute");
- bundleB = installBundle(fileB);
+ assemblyB = assembleArchive("bundleB", "/bundles/resolver/packageimportattribute");
+ bundleB = installBundle(assemblyB);
try
{
ResolverBundle resBundleB = resolver.getBundle(bundleB);
@@ -309,8 +309,8 @@
//Bundle-SymbolicName: packageexportattribute
//Export-Package: org.jboss.test.osgi.classloader.support.a;test=x
- VirtualFile fileA = assembleArchive("bundleA", "/bundles/resolver/packageexportattribute");
- Bundle bundleA = installBundle(fileA);
+ Archive<?> assemblyA = assembleArchive("bundleA", "/bundles/resolver/packageexportattribute");
+ Bundle bundleA = installBundle(assemblyA);
try
{
ResolverBundle resBundleA = resolver.getBundle(bundleA);
@@ -321,8 +321,8 @@
//Bundle-SymbolicName: packageimportattributefails
//Import-Package: org.jboss.test.osgi.classloader.support.a;test=y
- VirtualFile fileB = assembleArchive("bundleB", "/bundles/resolver/packageimportattributefails");
- Bundle bundleB = installBundle(fileB);
+ Archive<?> assemblyB = assembleArchive("bundleB", "/bundles/resolver/packageimportattributefails");
+ Bundle bundleB = installBundle(assemblyB);
try
{
ResolverBundle resBundleB = resolver.getBundle(bundleB);
@@ -352,8 +352,8 @@
//Bundle-SymbolicName: packageexportattributemandatory
//Export-Package: org.jboss.test.osgi.classloader.support.a;test=x;mandatory:=test
- VirtualFile fileA = assembleArchive("bundleA", "/bundles/resolver/packageexportattributemandatory");
- Bundle bundleA = installBundle(fileA);
+ Archive<?> assemblyA = assembleArchive("bundleA", "/bundles/resolver/packageexportattributemandatory");
+ Bundle bundleA = installBundle(assemblyA);
try
{
ResolverBundle resBundleA = resolver.getBundle(bundleA);
@@ -366,8 +366,8 @@
//Bundle-SymbolicName: packageimportattribute
//Import-Package: org.jboss.test.osgi.classloader.support.a;test=x
- VirtualFile fileB = assembleArchive("bundleB", "/bundles/resolver/packageimportattribute");
- Bundle bundleB = installBundle(fileB);
+ Archive<?> assemblyB = assembleArchive("bundleB", "/bundles/resolver/packageimportattribute");
+ Bundle bundleB = installBundle(assemblyB);
try
{
ResolverBundle resBundleB = resolver.getBundle(bundleB);
@@ -397,8 +397,8 @@
//Bundle-SymbolicName: packageexportattributemandatory
//Export-Package: org.jboss.test.osgi.classloader.support.a;test=x;mandatory:=test
- VirtualFile fileA = assembleArchive("bundleA", "/bundles/resolver/packageexportattributemandatory");
- Bundle bundleA = installBundle(fileA);
+ Archive<?> assemblyA = assembleArchive("bundleA", "/bundles/resolver/packageexportattributemandatory");
+ Bundle bundleA = installBundle(assemblyA);
try
{
ResolverBundle resBundleA = resolver.getBundle(bundleA);
@@ -411,8 +411,8 @@
//Bundle-SymbolicName: simpleimport
//Import-Package: org.jboss.test.osgi.classloader.support.a
- VirtualFile fileB = assembleArchive("bundleB", "/bundles/resolver/simpleimport");
- Bundle bundleB = installBundle(fileB);
+ Archive<?> assemblyB = assembleArchive("bundleB", "/bundles/resolver/simpleimport");
+ Bundle bundleB = installBundle(assemblyB);
try
{
ResolverBundle resBundleB = resolver.getBundle(bundleB);
@@ -426,8 +426,8 @@
//Bundle-SymbolicName: packageimportattributefails
//Import-Package: org.jboss.test.osgi.classloader.support.a;test=y
- fileB = assembleArchive("bundleB", "/bundles/resolver/packageimportattributefails");
- bundleB = installBundle(fileB);
+ assemblyB = assembleArchive("bundleB", "/bundles/resolver/packageimportattributefails");
+ bundleB = installBundle(assemblyB);
try
{
ResolverBundle resBundleB = resolver.getBundle(bundleB);
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-26 05:29:54 UTC (rev 103005)
+++ projects/jboss-osgi/projects/runtime/framework/trunk/bundle/src/test/java/org/jboss/test/osgi/service/GetServiceReferencesTestCase.java 2010-03-26 05:39:01 UTC (rev 103006)
@@ -33,7 +33,7 @@
import org.jboss.osgi.testing.OSGiFrameworkTest;
import org.jboss.osgi.testing.OSGiManifestBuilder;
-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.spec.JavaArchive;
@@ -61,7 +61,7 @@
public void testGetServiceReferences() throws Exception
{
- VirtualFile assembly = assembleArchive("simple1", "/bundles/simple/simple-bundle1", A.class);
+ Archive<?> assembly = assembleArchive("simple1", "/bundles/simple/simple-bundle1", A.class);
Bundle bundle = installBundle(assembly);
try
{
@@ -279,7 +279,7 @@
private void assertGetServiceReferencesNotAssignable(String className) throws Exception
{
- VirtualFile assemblyA = assembleArchive("simple1", "/bundles/simple/simple-bundle1", A.class);
+ Archive<?> assemblyA = assembleArchive("simple1", "/bundles/simple/simple-bundle1", A.class);
Bundle bundleA = installBundle(assemblyA);
try
{
@@ -297,7 +297,7 @@
ServiceReference sref1 = sreg1.getReference();
assertNotNull(sref1);
- VirtualFile assemblyB = assembleArchive("simple2", "/bundles/simple/simple-bundle2", A.class);
+ Archive<?> assemblyB = assembleArchive("simple2", "/bundles/simple/simple-bundle2", A.class);
Bundle bundleB = installBundle(assemblyB);
try
{
@@ -384,7 +384,7 @@
// Bundle-ManifestVersion: 2
// Bundle-SymbolicName: org.jboss.test.osgi.service2
// Export-Package: org.jboss.test.osgi.service.support.a
- VirtualFile assemblyA = assembleArchive("service2", "/bundles/service/service-bundle2", A.class);
+ Archive<?> assemblyA = assembleArchive("service2", "/bundles/service/service-bundle2", A.class);
Bundle bundleA = installBundle(assemblyA);
try
{
@@ -405,7 +405,7 @@
// Bundle-ManifestVersion: 2
// Bundle-SymbolicName: org.jboss.test.osgi.service1
// Import-Package: org.jboss.test.osgi.service.support.a
- VirtualFile assemblyB = assembleArchive("service1", "/bundles/service/service-bundle1");
+ Archive<?> assemblyB = assembleArchive("service1", "/bundles/service/service-bundle1");
Bundle bundleB = installBundle(assemblyB);
try
{
@@ -483,7 +483,7 @@
// Bundle-ManifestVersion: 2
// Bundle-SymbolicName: org.jboss.test.osgi.service2
// Export-Package: org.jboss.test.osgi.service.support.a
- VirtualFile assemblyA = assembleArchive("service2", "/bundles/service/service-bundle2", A.class);
+ Archive<?> assemblyA = assembleArchive("service2", "/bundles/service/service-bundle2", A.class);
Bundle bundleA = installBundle(assemblyA);
try
{
@@ -507,7 +507,7 @@
// Bundle-ManifestVersion: 2
// Bundle-SymbolicName: org.jboss.test.osgi.service1
// Import-Package: org.jboss.test.osgi.service.support.a
- VirtualFile assemblyB = assembleArchive("service1", "/bundles/service/service-bundle1");
+ Archive<?> assemblyB = assembleArchive("service1", "/bundles/service/service-bundle1");
Bundle bundleB = installBundle(assemblyB);
try
{
@@ -597,7 +597,7 @@
String className = A.class.getName();
String wrongClassName = B.class.getName();
- VirtualFile assembly = assembleArchive("simple1", "/bundles/simple/simple-bundle1", A.class);
+ Archive<?> assembly = assembleArchive("simple1", "/bundles/simple/simple-bundle1", A.class);
Bundle bundle = installBundle(assembly);
try
{
Modified: projects/jboss-osgi/projects/runtime/framework/trunk/bundle/src/test/java/org/jboss/test/osgi/service/GetUnGetServiceTestCase.java
===================================================================
--- projects/jboss-osgi/projects/runtime/framework/trunk/bundle/src/test/java/org/jboss/test/osgi/service/GetUnGetServiceTestCase.java 2010-03-26 05:29:54 UTC (rev 103005)
+++ projects/jboss-osgi/projects/runtime/framework/trunk/bundle/src/test/java/org/jboss/test/osgi/service/GetUnGetServiceTestCase.java 2010-03-26 05:39:01 UTC (rev 103006)
@@ -28,7 +28,7 @@
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
-import org.jboss.osgi.vfs.VirtualFile;
+import org.jboss.shrinkwrap.api.Archive;
import org.jboss.test.osgi.AbstractFrameworkTest;
import org.jboss.test.osgi.service.support.BrokenServiceFactory;
import org.junit.Test;
@@ -55,7 +55,7 @@
@Test
public void testGetUnServiceErrors() throws Exception
{
- VirtualFile assembly = assembleArchive("simple-bundle1", "/bundles/simple/simple-bundle1");
+ Archive<?> assembly = assembleArchive("simple-bundle1", "/bundles/simple/simple-bundle1");
Bundle bundle = installBundle(assembly);
try
{
@@ -94,7 +94,7 @@
@Test
public void testGetService() throws Exception
{
- VirtualFile assembly = assembleArchive("simple-bundle1", "/bundles/simple/simple-bundle1");
+ Archive<?> assembly = assembleArchive("simple-bundle1", "/bundles/simple/simple-bundle1");
Bundle bundle = installBundle(assembly);
try
{
@@ -121,7 +121,7 @@
@Test
public void testGetServiceAfterStop() throws Exception
{
- VirtualFile assembly = assembleArchive("simple-bundle1", "/bundles/simple/simple-bundle1");
+ Archive<?> assembly = assembleArchive("simple-bundle1", "/bundles/simple/simple-bundle1");
Bundle bundle = installBundle(assembly);
try
{
@@ -155,7 +155,7 @@
@Test
public void testErrorInGetService() throws Exception
{
- VirtualFile assembly = assembleArchive("simple-bundle1", "/bundles/simple/simple-bundle1");
+ Archive<?> assembly = assembleArchive("simple-bundle1", "/bundles/simple/simple-bundle1");
Bundle bundle = installBundle(assembly);
try
{
@@ -181,7 +181,7 @@
@Test
public void testErrorInUnGetService() throws Exception
{
- VirtualFile assembly = assembleArchive("simple-bundle1", "/bundles/simple/simple-bundle1");
+ Archive<?> assembly = assembleArchive("simple-bundle1", "/bundles/simple/simple-bundle1");
Bundle bundle = installBundle(assembly);
try
{
@@ -210,7 +210,7 @@
@Test
public void testUnGetServiceResult() throws Exception
{
- VirtualFile assembly1 = assembleArchive("simple-bundle1", "/bundles/simple/simple-bundle1");
+ Archive<?> assembly1 = assembleArchive("simple-bundle1", "/bundles/simple/simple-bundle1");
Bundle bundle1 = installBundle(assembly1);
try
{
@@ -231,7 +231,7 @@
assertTrue(context1.ungetService(sref));
assertFalse(context1.ungetService(sref));
- VirtualFile assembly2 = assembleArchive("simple-bundle2", "/bundles/simple/simple-bundle2");
+ Archive<?> assembly2 = assembleArchive("simple-bundle2", "/bundles/simple/simple-bundle2");
Bundle bundle2 = installBundle(assembly2);
try
{
Modified: projects/jboss-osgi/projects/runtime/framework/trunk/bundle/src/test/java/org/jboss/test/osgi/service/RegisterServiceTestCase.java
===================================================================
--- projects/jboss-osgi/projects/runtime/framework/trunk/bundle/src/test/java/org/jboss/test/osgi/service/RegisterServiceTestCase.java 2010-03-26 05:29:54 UTC (rev 103005)
+++ projects/jboss-osgi/projects/runtime/framework/trunk/bundle/src/test/java/org/jboss/test/osgi/service/RegisterServiceTestCase.java 2010-03-26 05:39:01 UTC (rev 103006)
@@ -21,12 +21,16 @@
*/
package org.jboss.test.osgi.service;
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertArrayEquals;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.fail;
import java.util.Dictionary;
import java.util.Hashtable;
-import org.jboss.osgi.vfs.VirtualFile;
+import org.jboss.shrinkwrap.api.Archive;
import org.jboss.test.osgi.AbstractFrameworkTest;
import org.junit.Test;
import org.osgi.framework.Bundle;
@@ -55,7 +59,7 @@
String OBJCLASS = BundleContext.class.getName();
String[] OBJCLASSES = new String[] { OBJCLASS };
- VirtualFile assembly = assembleArchive("simple-bundle1", "/bundles/simple/simple-bundle1");
+ Archive<?> assembly = assembleArchive("simple-bundle1", "/bundles/simple/simple-bundle1");
Bundle bundle = installBundle(assembly);
try
{
@@ -190,7 +194,7 @@
Dictionary<String, Object> properties = new Hashtable<String, Object>();
properties.put(Constants.OBJECTCLASS, new String[] { "rubbish" });
- VirtualFile assembly = assembleArchive("simple-bundle1", "/bundles/simple/simple-bundle1");
+ Archive<?> assembly = assembleArchive("simple-bundle1", "/bundles/simple/simple-bundle1");
Bundle bundle = installBundle(assembly);
try
{
@@ -221,7 +225,7 @@
@Test
public void testRegisterService() throws Exception
{
- VirtualFile assembly = assembleArchive("simple-bundle1", "/bundles/simple/simple-bundle1");
+ Archive<?> assembly = assembleArchive("simple-bundle1", "/bundles/simple/simple-bundle1");
Bundle bundle = installBundle(assembly);
try
{
@@ -248,7 +252,7 @@
@Test
public void testBundleUninstall() throws Exception
{
- VirtualFile assembly1 = assembleArchive("simple-bundle1", "/bundles/simple/simple-bundle1");
+ Archive<?> assembly1 = assembleArchive("simple-bundle1", "/bundles/simple/simple-bundle1");
Bundle bundle1 = installBundle(assembly1);
try
{
@@ -261,7 +265,7 @@
Object actual = bundleContext.getService(reference);
assertEquals(bundleContext, actual);
- VirtualFile assembly2 = assembleArchive("simple-bundle2", "/bundles/simple/simple-bundle2");
+ Archive<?> assembly2 = assembleArchive("simple-bundle2", "/bundles/simple/simple-bundle2");
Bundle bundle2 = installBundle(assembly2);
try
{
@@ -289,7 +293,7 @@
@Test
public void testRegisteredServices() throws Exception
{
- VirtualFile assembly1 = assembleArchive("simple-bundle1", "/bundles/simple/simple-bundle1");
+ Archive<?> assembly1 = assembleArchive("simple-bundle1", "/bundles/simple/simple-bundle1");
Bundle bundle1 = installBundle(assembly1);
try
{
@@ -302,7 +306,7 @@
Object actual = bundleContext.getService(reference);
assertEquals(bundleContext, actual);
- VirtualFile assembly2 = assembleArchive("simple-bundle2", "/bundles/simple/simple-bundle2");
+ Archive<?> assembly2 = assembleArchive("simple-bundle2", "/bundles/simple/simple-bundle2");
Bundle bundle2 = installBundle(assembly2);
try
{
Modified: projects/jboss-osgi/projects/runtime/framework/trunk/bundle/src/test/java/org/jboss/test/osgi/service/ServiceFactoryTestCase.java
===================================================================
--- projects/jboss-osgi/projects/runtime/framework/trunk/bundle/src/test/java/org/jboss/test/osgi/service/ServiceFactoryTestCase.java 2010-03-26 05:29:54 UTC (rev 103005)
+++ projects/jboss-osgi/projects/runtime/framework/trunk/bundle/src/test/java/org/jboss/test/osgi/service/ServiceFactoryTestCase.java 2010-03-26 05:39:01 UTC (rev 103006)
@@ -29,7 +29,7 @@
import static org.junit.Assert.fail;
import org.jboss.osgi.framework.bundle.OSGiBundleWrapper;
-import org.jboss.osgi.vfs.VirtualFile;
+import org.jboss.shrinkwrap.api.Archive;
import org.jboss.test.osgi.AbstractFrameworkTest;
import org.jboss.test.osgi.service.support.SimpleServiceFactory;
import org.jboss.test.osgi.service.support.a.A;
@@ -57,7 +57,7 @@
@Test
public void testRegisterServiceFactory() throws Exception
{
- VirtualFile assemblyA = assembleArchive("simple1", "/bundles/simple/simple-bundle1", A.class);
+ Archive<?> assemblyA = assembleArchive("simple1", "/bundles/simple/simple-bundle1", A.class);
Bundle bundleA = installBundle(assemblyA);
try
{
@@ -82,7 +82,7 @@
assertEquals(bundleA.getSymbolicName(), serviceFactory.getBundle.getSymbolicName());
assertEquals(1, serviceFactory.getCount);
- VirtualFile assemblyB = assembleArchive("simple2", "/bundles/simple/simple-bundle2");
+ Archive<?> assemblyB = assembleArchive("simple2", "/bundles/simple/simple-bundle2");
Bundle bundleB = installBundle(assemblyB);
try
{
@@ -112,7 +112,7 @@
@Test
public void testGetServiceFactory() throws Exception
{
- VirtualFile assembly = assembleArchive("simple1", "/bundles/simple/simple-bundle1");
+ Archive<?> assembly = assembleArchive("simple1", "/bundles/simple/simple-bundle1");
Bundle bundle = installBundle(assembly);
try
{
@@ -148,7 +148,7 @@
{
String OBJCLASS = BundleContext.class.getName();
- VirtualFile assembly = assembleArchive("simple1", "/bundles/simple/simple-bundle1");
+ Archive<?> assembly = assembleArchive("simple1", "/bundles/simple/simple-bundle1");
Bundle bundle = installBundle(assembly);
try
{
@@ -185,7 +185,7 @@
String[] OBJCLASS = { String.class.getName() };
String[] OBJCLASSES = { String.class.getName(), BundleContext.class.getName() };
- VirtualFile assembly = assembleArchive("simple1", "/bundles/simple/simple-bundle1");
+ Archive<?> assembly = assembleArchive("simple1", "/bundles/simple/simple-bundle1");
Bundle bundle = installBundle(assembly);
try
{
Modified: projects/jboss-osgi/projects/runtime/framework/trunk/bundle/src/test/java/org/jboss/test/osgi/service/ServiceListenerTestCase.java
===================================================================
--- projects/jboss-osgi/projects/runtime/framework/trunk/bundle/src/test/java/org/jboss/test/osgi/service/ServiceListenerTestCase.java 2010-03-26 05:29:54 UTC (rev 103005)
+++ projects/jboss-osgi/projects/runtime/framework/trunk/bundle/src/test/java/org/jboss/test/osgi/service/ServiceListenerTestCase.java 2010-03-26 05:39:01 UTC (rev 103006)
@@ -27,7 +27,7 @@
import java.util.Hashtable;
-import org.jboss.osgi.vfs.VirtualFile;
+import org.jboss.shrinkwrap.api.Archive;
import org.jboss.test.osgi.AbstractFrameworkTest;
import org.junit.Test;
import org.osgi.framework.Bundle;
@@ -49,7 +49,7 @@
@Test
public void testServiceListener() throws Exception
{
- VirtualFile assembly = assembleArchive("simple1", "/bundles/simple/simple-bundle1");
+ Archive<?> assembly = assembleArchive("simple1", "/bundles/simple/simple-bundle1");
Bundle bundle = installBundle(assembly);
try
{
@@ -77,7 +77,7 @@
@Test
public void testObjectClassFilter() throws Exception
{
- VirtualFile assembly = assembleArchive("simple1", "/bundles/simple/simple-bundle1");
+ Archive<?> assembly = assembleArchive("simple1", "/bundles/simple/simple-bundle1");
Bundle bundle = installBundle(assembly);
try
{
@@ -115,7 +115,7 @@
@Test
public void testModifyServiceProperties() throws Exception
{
- VirtualFile assembly = assembleArchive("simple1", "/bundles/simple/simple-bundle1");
+ Archive<?> assembly = assembleArchive("simple1", "/bundles/simple/simple-bundle1");
Bundle bundle = installBundle(assembly);
try
{
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-26 05:29:54 UTC (rev 103005)
+++ projects/jboss-osgi/projects/runtime/framework/trunk/bundle/src/test/java/org/jboss/test/osgi/service/ServiceMixTestCase.java 2010-03-26 05:39:01 UTC (rev 103006)
@@ -41,7 +41,7 @@
import org.jboss.deployers.client.spi.Deployment;
import org.jboss.kernel.spi.dependency.KernelControllerContext;
import org.jboss.osgi.framework.deployers.AbstractDeployment;
-import org.jboss.osgi.vfs.VirtualFile;
+import org.jboss.shrinkwrap.api.Archive;
import org.jboss.test.osgi.service.support.LazyBundle;
import org.jboss.test.osgi.service.support.a.A;
import org.jboss.test.osgi.service.support.c.C;
@@ -69,7 +69,7 @@
Deployment bean = deployBeans("beanA", A.class);
try
{
- VirtualFile assembly1 = assembleArchive("simple1", "/bundles/service/service-bundle1");
+ Archive<?> assembly1 = assembleArchive("simple1", "/bundles/service/service-bundle1");
Bundle bundle1 = installBundle(assembly1);
try
{
@@ -122,7 +122,7 @@
{
KernelControllerContext kcc = getControllerContext("C", null);
- VirtualFile assembly1 = assembleArchive("simple2", "/bundles/service/service-bundle3");
+ Archive<?> assembly1 = assembleArchive("simple2", "/bundles/service/service-bundle3");
Bundle bundle1 = installBundle(assembly1);
try
{
@@ -181,7 +181,7 @@
{
KernelControllerContext kcc = getControllerContext("C", null);
- VirtualFile assembly1 = assembleArchive("simple2", "/bundles/service/service-bundle3");
+ Archive<?> assembly1 = assembleArchive("simple2", "/bundles/service/service-bundle3");
Bundle bundle1 = installBundle(assembly1);
try
{
@@ -241,7 +241,7 @@
Deployment bean = addBeans("beanA", bmd, C.class, A.class);
try
{
- VirtualFile assembly1 = assembleArchive("simple2", "/bundles/service/service-bundle3");
+ Archive<?> assembly1 = assembleArchive("simple2", "/bundles/service/service-bundle3");
Bundle bundle1 = installBundle(assembly1);
try
{
@@ -296,7 +296,7 @@
Deployment bean2 = addBeans("beanA2", bmd, E.class);
try
{
- VirtualFile assembly1 = assembleArchive("simple2", "/bundles/service/service-bundle4");
+ Archive<?> assembly1 = assembleArchive("simple2", "/bundles/service/service-bundle4");
Bundle bundle1 = installBundle(assembly1);
try
{
@@ -364,7 +364,7 @@
Deployment bean1 = addBeans("beanA1", bmd, C.class, A.class, ServiceMixFactory.class);
try
{
- VirtualFile assembly = assembleArchive("service-bundle4", "/bundles/service/service-bundle4");
+ Archive<?> assembly = assembleArchive("service-bundle4", "/bundles/service/service-bundle4");
Bundle bundle = installBundle(assembly);
try
{
@@ -438,7 +438,7 @@
Deployment bean = deployBeans("beanA", A.class);
try
{
- VirtualFile assembly1 = assembleArchive("simple2", "/bundles/service/service-bundle1");
+ Archive<?> assembly1 = assembleArchive("simple2", "/bundles/service/service-bundle1");
Bundle bundle1 = installBundle(assembly1);
try
{
@@ -499,8 +499,8 @@
@Test
public void testBeansMix() throws Throwable
{
- VirtualFile assembly = assembleArchive("beans1", "/bundles/service/service-beans1", A.class);
- Deployment deployment = addDeployment(AbstractDeployment.createDeployment(assembly));
+ Archive<?> assembly = assembleArchive("beans1", "/bundles/service/service-beans1", A.class);
+ Deployment deployment = addDeployment(AbstractDeployment.createDeployment(toVirtualFile(assembly)));
try
{
checkComplete();
@@ -531,7 +531,7 @@
@Test
public void testServiceInjection() throws Throwable
{
- VirtualFile assembly1 = assembleArchive("simple2", "/bundles/service/service-bundle2", A.class);
+ Archive<?> assembly1 = assembleArchive("simple2", "/bundles/service/service-bundle2", A.class);
Bundle bundle = installBundle(assembly1);
try
{
@@ -546,8 +546,8 @@
ServiceRegistration reg1 = bundleContext1.registerService(A.class.getName(), a, table);
assertNotNull(reg1);
- VirtualFile assembly = assembleArchive("beans1", "/bundles/service/service-beans2", C.class);
- Deployment deployment = addDeployment(AbstractDeployment.createDeployment(assembly));
+ Archive<?> assembly = assembleArchive("beans1", "/bundles/service/service-beans2", C.class);
+ Deployment deployment = addDeployment(AbstractDeployment.createDeployment(toVirtualFile(assembly)));
try
{
checkComplete();
Modified: projects/jboss-osgi/projects/runtime/framework/trunk/bundle/src/test/java/org/jboss/test/osgi/service/ServiceReferenceTestCase.java
===================================================================
--- projects/jboss-osgi/projects/runtime/framework/trunk/bundle/src/test/java/org/jboss/test/osgi/service/ServiceReferenceTestCase.java 2010-03-26 05:29:54 UTC (rev 103005)
+++ projects/jboss-osgi/projects/runtime/framework/trunk/bundle/src/test/java/org/jboss/test/osgi/service/ServiceReferenceTestCase.java 2010-03-26 05:39:01 UTC (rev 103006)
@@ -36,7 +36,7 @@
import java.util.Set;
import java.util.TreeSet;
-import org.jboss.osgi.vfs.VirtualFile;
+import org.jboss.shrinkwrap.api.Archive;
import org.jboss.test.osgi.AbstractFrameworkTest;
import org.jboss.test.osgi.service.support.a.A;
import org.junit.Test;
@@ -63,7 +63,7 @@
String[] clazzes = new String[] { BundleContext.class.getName() };
Object serviceID = null;
- VirtualFile assembly = assembleArchive("simple1", "/bundles/simple/simple-bundle1");
+ Archive<?> assembly = assembleArchive("simple1", "/bundles/simple/simple-bundle1");
Bundle bundle = installBundle(assembly);
try
{
@@ -162,7 +162,7 @@
{
ServiceReference sref = null;
- VirtualFile assembly = assembleArchive("simple1", "/bundles/simple/simple-bundle1");
+ Archive<?> assembly = assembleArchive("simple1", "/bundles/simple/simple-bundle1");
Bundle bundle = installBundle(assembly);
try
{
@@ -222,7 +222,7 @@
@Test
public void testGetBundle() throws Exception
{
- VirtualFile assembly = assembleArchive("simple1", "/bundles/simple/simple-bundle1");
+ Archive<?> assembly = assembleArchive("simple1", "/bundles/simple/simple-bundle1");
Bundle bundle = installBundle(assembly);
try
{
@@ -253,7 +253,7 @@
@Test
public void testGetBundleAfterStop() throws Exception
{
- VirtualFile assembly = assembleArchive("simple1", "/bundles/simple/simple-bundle1");
+ Archive<?> assembly = assembleArchive("simple1", "/bundles/simple/simple-bundle1");
Bundle bundle = installBundle(assembly);
try
{
@@ -284,7 +284,7 @@
@Test
public void testUsingBundles() throws Exception
{
- VirtualFile assembly1 = assembleArchive("simple1", "/bundles/simple/simple-bundle1");
+ Archive<?> assembly1 = assembleArchive("simple1", "/bundles/simple/simple-bundle1");
Bundle bundle1 = installBundle(assembly1);
try
{
@@ -300,7 +300,7 @@
assertUsingBundles(sref);
- VirtualFile assembly2 = assembleArchive("simple2", "/bundles/simple/simple-bundle2");
+ Archive<?> assembly2 = assembleArchive("simple2", "/bundles/simple/simple-bundle2");
Bundle bundle2 = installBundle(assembly2);
try
{
@@ -343,7 +343,7 @@
@Test
public void testUsingBundlesAfterStop() throws Exception
{
- VirtualFile assembly1 = assembleArchive("simple1", "/bundles/simple/simple-bundle1");
+ Archive<?> assembly1 = assembleArchive("simple1", "/bundles/simple/simple-bundle1");
Bundle bundle1 = installBundle(assembly1);
try
{
@@ -359,7 +359,7 @@
assertUsingBundles(sref);
- VirtualFile assembly2 = assembleArchive("simple2", "/bundles/simple/simple-bundle2");
+ Archive<?> assembly2 = assembleArchive("simple2", "/bundles/simple/simple-bundle2");
Bundle bundle2 = installBundle(assembly2);
try
{
@@ -388,7 +388,7 @@
@Test
public void testIsAssignableToErrors() throws Exception
{
- VirtualFile assembly = assembleArchive("simple1", "/bundles/simple/simple-bundle1", A.class);
+ Archive<?> assembly = assembleArchive("simple1", "/bundles/simple/simple-bundle1", A.class);
Bundle bundle = installBundle(assembly);
try
{
@@ -431,7 +431,7 @@
@Test
public void testNotAssignableTo() throws Exception
{
- VirtualFile assembly1 = assembleArchive("simple1", "/bundles/simple/simple-bundle1", A.class);
+ Archive<?> assembly1 = assembleArchive("simple1", "/bundles/simple/simple-bundle1", A.class);
Bundle bundle1 = installBundle(assembly1);
try
{
@@ -445,7 +445,7 @@
ServiceReference sref = sreg.getReference();
assertNotNull(sref);
- VirtualFile assembly2 = assembleArchive("simple2", "/bundles/simple/simple-bundle2", A.class);
+ Archive<?> assembly2 = assembleArchive("simple2", "/bundles/simple/simple-bundle2", A.class);
Bundle bundle2 = installBundle(assembly2);
try
{
@@ -473,7 +473,7 @@
//Bundle-Name: Service2
//Bundle-SymbolicName: org.jboss.test.osgi.service2
//Export-Package: org.jboss.test.osgi.service.support.a
- VirtualFile assembly2 = assembleArchive("service2", "/bundles/service/service-bundle2", A.class);
+ Archive<?> assembly2 = assembleArchive("service2", "/bundles/service/service-bundle2", A.class);
Bundle bundle2 = installBundle(assembly2);
try
@@ -485,7 +485,7 @@
//Bundle-Name: Service1
//Bundle-SymbolicName: org.jboss.test.osgi.service1
//Import-Package: org.jboss.test.osgi.service.support.a
- VirtualFile assembly1 = assembleArchive("service1", "/bundles/service/service-bundle1");
+ Archive<?> assembly1 = assembleArchive("service1", "/bundles/service/service-bundle1");
Bundle bundle1 = installBundle(assembly1);
try
Modified: projects/jboss-osgi/projects/runtime/framework/trunk/bundle/src/test/java/org/jboss/test/osgi/service/ServiceRegistrationTestCase.java
===================================================================
--- projects/jboss-osgi/projects/runtime/framework/trunk/bundle/src/test/java/org/jboss/test/osgi/service/ServiceRegistrationTestCase.java 2010-03-26 05:29:54 UTC (rev 103005)
+++ projects/jboss-osgi/projects/runtime/framework/trunk/bundle/src/test/java/org/jboss/test/osgi/service/ServiceRegistrationTestCase.java 2010-03-26 05:39:01 UTC (rev 103006)
@@ -30,7 +30,7 @@
import java.util.Hashtable;
-import org.jboss.osgi.vfs.VirtualFile;
+import org.jboss.shrinkwrap.api.Archive;
import org.jboss.test.osgi.AbstractFrameworkTest;
import org.jboss.test.osgi.service.support.SimpleServiceFactory;
import org.junit.Test;
@@ -53,7 +53,7 @@
@Test
public void testGetReference() throws Exception
{
- VirtualFile assembly = assembleArchive("simple1", "/bundles/simple/simple-bundle1");
+ Archive<?> assembly = assembleArchive("simple1", "/bundles/simple/simple-bundle1");
Bundle bundle = installBundle(assembly);
try
{
@@ -115,7 +115,7 @@
@Test
public void testSetProperties() throws Exception
{
- VirtualFile assembly = assembleArchive("simple1", "/bundles/simple/simple-bundle1");
+ Archive<?> assembly = assembleArchive("simple1", "/bundles/simple/simple-bundle1");
Bundle bundle = installBundle(assembly);
try
{
@@ -224,7 +224,7 @@
@Test
public void testSetPropertiesAfterStop() throws Exception
{
- VirtualFile assembly = assembleArchive("simple1", "/bundles/simple/simple-bundle1");
+ Archive<?> assembly = assembleArchive("simple1", "/bundles/simple/simple-bundle1");
Bundle bundle = installBundle(assembly);
try
{
@@ -257,7 +257,7 @@
@Test
public void testUnregister() throws Exception
{
- VirtualFile assembly1 = assembleArchive("simple1", "/bundles/simple/simple-bundle1");
+ Archive<?> assembly1 = assembleArchive("simple1", "/bundles/simple/simple-bundle1");
Bundle bundle1 = installBundle(assembly1);
try
{
@@ -282,7 +282,7 @@
inUse = bundle1.getServicesInUse();
assertArrayEquals(new ServiceReference[] { reference }, inUse);
- VirtualFile assembly2 = assembleArchive("simple2", "/bundles/simple/simple-bundle2");
+ Archive<?> assembly2 = assembleArchive("simple2", "/bundles/simple/simple-bundle2");
Bundle bundle2 = installBundle(assembly2);
try
{
@@ -340,7 +340,7 @@
@Test
public void testUnregisterAfterStop() throws Exception
{
- VirtualFile assembly = assembleArchive("simple1", "/bundles/simple/simple-bundle1");
+ Archive<?> assembly = assembleArchive("simple1", "/bundles/simple/simple-bundle1");
Bundle bundle = installBundle(assembly);
try
{
Modified: projects/jboss-osgi/projects/runtime/framework/trunk/bundle/src/test/java/org/jboss/test/osgi/service/support/JMXKernel.java
===================================================================
--- projects/jboss-osgi/projects/runtime/framework/trunk/bundle/src/test/java/org/jboss/test/osgi/service/support/JMXKernel.java 2010-03-26 05:29:54 UTC (rev 103005)
+++ projects/jboss-osgi/projects/runtime/framework/trunk/bundle/src/test/java/org/jboss/test/osgi/service/support/JMXKernel.java 2010-03-26 05:39:01 UTC (rev 103006)
@@ -1,6 +1,7 @@
package org.jboss.test.osgi.service.support;
import java.util.Properties;
+
import javax.management.MBeanServer;
import javax.management.MBeanServerFactory;
import javax.management.MalformedObjectNameException;
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-26 05:29:54 UTC (rev 103005)
+++ projects/jboss-osgi/projects/runtime/framework/trunk/core/src/main/java/org/jboss/osgi/framework/bundle/OSGiBundleManager.java 2010-03-26 05:39:01 UTC (rev 103006)
@@ -95,7 +95,7 @@
*/
public class OSGiBundleManager
{
- /** The log */
+ // Provide logging
private static final Logger log = Logger.getLogger(OSGiBundleManager.class);
/** The bundle manager's bean name: OSGiBundleManager */
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-26 05:29:54 UTC (rev 103005)
+++ projects/jboss-osgi/projects/runtime/framework/trunk/vfs30/src/main/java/org/jboss/osgi/framework/classloading/OSGiBundleClassLoader.java 2010-03-26 05:39:01 UTC (rev 103006)
@@ -25,6 +25,7 @@
import org.jboss.classloader.spi.ClassLoaderPolicy;
import org.jboss.classloader.spi.base.BaseClassLoader;
+import org.jboss.logging.Logger;
import org.osgi.framework.Bundle;
import org.osgi.framework.BundleReference;
@@ -36,16 +37,23 @@
*/
public class OSGiBundleClassLoader extends BaseClassLoader implements BundleReference
{
+ // Provide logging
+ private static final Logger log = Logger.getLogger(OSGiBundleClassLoader.class);
+
private OSGiClassLoaderPolicy osgiPolicy;
public OSGiBundleClassLoader(ClassLoaderPolicy policy)
{
super(policy);
- if (policy instanceof OSGiClassLoaderPolicy == false)
- throw new IllegalArgumentException("Invalid policy: " + policy);
+ if (policy instanceof OSGiClassLoaderPolicy)
+ osgiPolicy = (OSGiClassLoaderPolicy)policy;
- osgiPolicy = (OSGiClassLoaderPolicy)policy;
+ if (osgiPolicy == null)
+ {
+ log.warn("Invalid policy: " + policy, new IllegalStateException());
+ System.out.println("FIXME [JBOSGI-306] Invalid policy: " + policy);
+ }
}
@Override
14 years, 3 months
- 1
- 0
JBoss-OSGI SVN: r103003 - 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-26 00:33:32 -0400 (Fri, 26 Mar 2010)
New Revision: 103003
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/OSGiTest.java
projects/jboss-osgi/projects/spi/trunk/src/main/java/org/jboss/osgi/testing/OSGiTestHelper.java
Log:
Expose shrinkwrap archives to test cases
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-26 04:11:33 UTC (rev 103002)
+++ projects/jboss-osgi/projects/spi/trunk/src/main/java/org/jboss/osgi/testing/OSGiFrameworkTest.java 2010-03-26 04:33:32 UTC (rev 103003)
@@ -30,6 +30,7 @@
import static org.junit.Assert.fail;
import java.io.IOException;
+import java.io.InputStream;
import java.net.URL;
import java.util.Arrays;
import java.util.HashSet;
@@ -105,24 +106,30 @@
return (PackageAdmin)systemContext.getService(sref);
}
- protected Bundle installBundle(String location) throws BundleException, IOException
- {
- 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);
+ return installBundle(archive.getName(), virtualFile.openStream());
}
protected Bundle installBundle(VirtualFile virtualFile) throws BundleException, IOException
{
String location = virtualFile.getPathName();
- return systemContext.installBundle(location, virtualFile.openStream());
+ return installBundle(location, virtualFile.openStream());
}
+ protected Bundle installBundle(String location) throws BundleException, IOException
+ {
+ URL bundleURL = getTestHelper().getTestArchiveURL(location);
+ VirtualFile virtualFile = AbstractVFS.getRoot(bundleURL);
+ return installBundle(location, virtualFile.openStream());
+ }
+
+ protected Bundle installBundle(String location, InputStream inputStream) throws BundleException
+ {
+ return systemContext.installBundle(location, inputStream);
+ }
+
protected void assertLoadClass(Bundle bundle, String className, Bundle exporter)
{
Class<?> clazz = assertLoadClass(bundle, className);
Modified: projects/jboss-osgi/projects/spi/trunk/src/main/java/org/jboss/osgi/testing/OSGiTest.java
===================================================================
--- projects/jboss-osgi/projects/spi/trunk/src/main/java/org/jboss/osgi/testing/OSGiTest.java 2010-03-26 04:11:33 UTC (rev 103002)
+++ projects/jboss-osgi/projects/spi/trunk/src/main/java/org/jboss/osgi/testing/OSGiTest.java 2010-03-26 04:33:32 UTC (rev 103003)
@@ -22,6 +22,8 @@
package org.jboss.osgi.testing;
import java.io.File;
+import java.io.IOException;
+import java.net.MalformedURLException;
import java.net.URL;
import javax.naming.InitialContext;
@@ -29,6 +31,7 @@
import org.jboss.logging.Logger;
import org.jboss.osgi.vfs.VirtualFile;
+import org.jboss.shrinkwrap.api.Archive;
import org.junit.After;
import org.junit.Before;
import org.osgi.framework.Bundle;
@@ -173,15 +176,20 @@
/**
* Delegates to {@link OSGiTestHelper#assembleArchive(String, String, Class...)}
*/
- public VirtualFile assembleArchive(String name, String resource, Class<?>... packages) throws Exception
+ public Archive<?> assembleArchive(String name, String resource, Class<?>... packages) throws Exception
{
return getTestHelper().assembleArchive(name, resource, packages);
}
+ public VirtualFile toVirtualFile(Archive<?> archive) throws IOException, MalformedURLException
+ {
+ return OSGiTestHelper.toVirtualFile(archive);
+ }
+
/**
* Delegates to {@link OSGiTestHelper#assembleArchive(String, String[], Class...)}
*/
- public VirtualFile assembleArchive(String name, String[] resources, Class<?>... packages) throws Exception
+ public Archive<?> assembleArchive(String name, String[] resources, Class<?>... packages) throws Exception
{
return getTestHelper().assembleArchive(name, resources, packages);
}
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-26 04:11:33 UTC (rev 103002)
+++ projects/jboss-osgi/projects/spi/trunk/src/main/java/org/jboss/osgi/testing/OSGiTestHelper.java 2010-03-26 04:33:32 UTC (rev 103003)
@@ -172,12 +172,12 @@
return framework;
}
- public VirtualFile assembleArchive(String name, String resource, Class<?>... packages) throws Exception
+ public Archive<?> assembleArchive(String name, String resource, Class<?>... packages) throws Exception
{
return assembleArchive(name, new String[] { resource }, packages);
}
- public VirtualFile assembleArchive(String name, String[] resources, Class<?>... packages) throws IOException
+ public Archive<?> assembleArchive(String name, String[] resources, Class<?>... packages) throws IOException
{
JavaArchive archive = Archives.create(name + ".jar", JavaArchive.class);
if (resources != null)
@@ -213,17 +213,14 @@
addResources(archive, base, classes);
}
}
-
- // Convert archive to file URL
- VirtualFile virtualFile = toVirtualFile(archive);
- return virtualFile;
+ return archive;
}
@SuppressWarnings("rawtypes")
public static VirtualFile toVirtualFile(Archive archive) throws IOException, MalformedURLException
{
ZipExporter exporter = archive.as(ZipExporter.class);
- File target = File.createTempFile("archive_", ".jar");
+ File target = File.createTempFile("osgi-bundle_", ".jar");
exporter.exportZip(target, true);
target.deleteOnExit();
return AbstractVFS.getRoot(target.toURI().toURL());
14 years, 3 months
- 1
- 0
JBoss-OSGI SVN: r102978 - projects/jboss-osgi/trunk/testsuite/example/src/test/java/org/jboss/test/osgi/example/event.
by jboss-osgi-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2010-03-25 17:05:11 -0400 (Thu, 25 Mar 2010)
New Revision: 102978
Modified:
projects/jboss-osgi/trunk/testsuite/example/src/test/java/org/jboss/test/osgi/example/event/EventAdminTestCase.java
Log:
fix javadoc
Modified: projects/jboss-osgi/trunk/testsuite/example/src/test/java/org/jboss/test/osgi/example/event/EventAdminTestCase.java
===================================================================
--- projects/jboss-osgi/trunk/testsuite/example/src/test/java/org/jboss/test/osgi/example/event/EventAdminTestCase.java 2010-03-25 21:01:42 UTC (rev 102977)
+++ projects/jboss-osgi/trunk/testsuite/example/src/test/java/org/jboss/test/osgi/example/event/EventAdminTestCase.java 2010-03-25 21:05:11 UTC (rev 102978)
@@ -50,7 +50,7 @@
import org.osgi.service.event.EventHandler;
/**
- * A test that deployes a bundle that containes a HttpServlet which is registered through the OSGi HttpService
+ * A test that deployes the EventAdmin and sends/receives messages on a topic.
*
* @author thomas.diesler(a)jboss.com
* @since 08-Dec-2009
14 years, 3 months
- 1
- 0