[jboss-cvs] JBossAS SVN: r100225 - in projects/jboss-osgi: projects/runtime/framework/trunk/src/main/java/org/jboss/osgi/framework/plugins/internal and 13 other directories.

jboss-cvs-commits at lists.jboss.org jboss-cvs-commits at lists.jboss.org
Mon Feb 1 18:08:25 EST 2010


Author: thomas.diesler at jboss.com
Date: 2010-02-01 18:08:24 -0500 (Mon, 01 Feb 2010)
New Revision: 100225

Added:
   projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbosgi286/
   projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbosgi286/OSGi286TestCase.java
   projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbosgi286/bundle/
   projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbosgi286/bundle/OSGi286Activator.java
   projects/jboss-osgi/trunk/testsuite/functional/src/test/resources/jbosgi286/
   projects/jboss-osgi/trunk/testsuite/functional/src/test/resources/jbosgi286/jbosgi286-bundle.bnd
Modified:
   projects/jboss-osgi/projects/runtime/framework/trunk/src/main/java/org/jboss/osgi/framework/classloading/OSGiClassLoaderDomain.java
   projects/jboss-osgi/projects/runtime/framework/trunk/src/main/java/org/jboss/osgi/framework/classloading/OSGiClassLoaderSystem.java
   projects/jboss-osgi/projects/runtime/framework/trunk/src/main/java/org/jboss/osgi/framework/plugins/internal/SystemPackagesPluginImpl.java
   projects/jboss-osgi/trunk/testsuite/example/pom.xml
   projects/jboss-osgi/trunk/testsuite/example/src/test/java/org/jboss/test/osgi/example/xml/jaxb/JAXBTestCase.java
   projects/jboss-osgi/trunk/testsuite/example/src/test/resources/META-INF/jboss-osgi-bootstrap.xml
   projects/jboss-osgi/trunk/testsuite/example/src/test/resources/xml/jaxb/example-xml-jaxb.bnd
   projects/jboss-osgi/trunk/testsuite/functional/pom.xml
   projects/jboss-osgi/trunk/testsuite/functional/scripts/antrun-test-jars.xml
   projects/jboss-osgi/trunk/testsuite/functional/src/test/resources/META-INF/jboss-osgi-bootstrap.xml
   projects/jboss-osgi/trunk/testsuite/pom.xml
Log:
[JBOSGI-286] Investigate classloading of javax.* classes

Modified: projects/jboss-osgi/projects/runtime/framework/trunk/src/main/java/org/jboss/osgi/framework/classloading/OSGiClassLoaderDomain.java
===================================================================
--- projects/jboss-osgi/projects/runtime/framework/trunk/src/main/java/org/jboss/osgi/framework/classloading/OSGiClassLoaderDomain.java	2010-02-01 21:30:10 UTC (rev 100224)
+++ projects/jboss-osgi/projects/runtime/framework/trunk/src/main/java/org/jboss/osgi/framework/classloading/OSGiClassLoaderDomain.java	2010-02-01 23:08:24 UTC (rev 100225)
@@ -28,6 +28,8 @@
 import java.util.ArrayList;
 import java.util.List;
 
+import org.jboss.classloader.plugins.filter.CombiningClassFilter;
+import org.jboss.classloader.plugins.filter.PatternClassFilter;
 import org.jboss.classloader.spi.ClassLoaderDomain;
 import org.jboss.classloader.spi.ClassLoaderPolicy;
 import org.jboss.classloader.spi.ClassLoaderSystem;
@@ -35,6 +37,7 @@
 import org.jboss.classloader.spi.base.BaseClassLoader;
 import org.jboss.classloader.spi.filter.ClassFilterUtils;
 import org.jboss.classloader.spi.filter.PackageClassFilter;
+import org.jboss.classloader.spi.filter.RecursivePackageClassFilter;
 import org.jboss.classloading.spi.vfs.policy.VFSClassLoaderPolicy;
 import org.jboss.osgi.framework.bundle.OSGiBundleManager;
 import org.jboss.osgi.framework.plugins.SystemPackagesPlugin;
@@ -98,11 +101,12 @@
 
       // Initialize the configured system packages
       String filteredPackages = getSystemPackagesAsString();
-      PackageClassFilter classFilter = PackageClassFilter.createPackageClassFilterFromString(filteredPackages);
-      classFilter.setIncludeJava(true);
+      PackageClassFilter systemFilter = PackageClassFilter.createPackageClassFilterFromString(filteredPackages);
+      PatternClassFilter javaFilter = RecursivePackageClassFilter.createRecursivePackageClassFilter("java");
+      CombiningClassFilter filter = CombiningClassFilter.create(javaFilter, systemFilter);
 
       // Setup the domain's parent policy
-      setParentPolicy(new ParentPolicy(classFilter, ClassFilterUtils.NOTHING));
+      setParentPolicy(new ParentPolicy(filter, ClassFilterUtils.NOTHING));
 
       // Initialize the configured policy roots
       VirtualFile[] roots = new VirtualFile[classPath.size()];

Modified: projects/jboss-osgi/projects/runtime/framework/trunk/src/main/java/org/jboss/osgi/framework/classloading/OSGiClassLoaderSystem.java
===================================================================
--- projects/jboss-osgi/projects/runtime/framework/trunk/src/main/java/org/jboss/osgi/framework/classloading/OSGiClassLoaderSystem.java	2010-02-01 21:30:10 UTC (rev 100224)
+++ projects/jboss-osgi/projects/runtime/framework/trunk/src/main/java/org/jboss/osgi/framework/classloading/OSGiClassLoaderSystem.java	2010-02-01 23:08:24 UTC (rev 100225)
@@ -49,9 +49,8 @@
    {
       ClassLoaderDomain domain = getDefaultDomain();
 
-      PatternClassFilter filter = RecursivePackageClassFilter.createRecursivePackageClassFilterFromString("org.osgi");
-      filter.setIncludeJava(true);
-      domain.setParentPolicy(new ParentPolicy(filter, ClassFilterUtils.NOTHING));
+      PatternClassFilter javaFilter = RecursivePackageClassFilter.createRecursivePackageClassFilter("java");
+      domain.setParentPolicy(new ParentPolicy(javaFilter, ClassFilterUtils.NOTHING));
 
       AbstractJDKChecker.getExcluded().add(AbstractBundleState.class);
       AbstractJDKChecker.getExcluded().add(OSGiBundleState.class);
@@ -60,7 +59,7 @@
    @Override
    protected ClassLoaderDomain createDomain(String name)
    {
-      return new ClassLoaderDomain(name);
+      return new OSGiClassLoaderDomain(name);
    }
 
    @Override

Modified: projects/jboss-osgi/projects/runtime/framework/trunk/src/main/java/org/jboss/osgi/framework/plugins/internal/SystemPackagesPluginImpl.java
===================================================================
--- projects/jboss-osgi/projects/runtime/framework/trunk/src/main/java/org/jboss/osgi/framework/plugins/internal/SystemPackagesPluginImpl.java	2010-02-01 21:30:10 UTC (rev 100224)
+++ projects/jboss-osgi/projects/runtime/framework/trunk/src/main/java/org/jboss/osgi/framework/plugins/internal/SystemPackagesPluginImpl.java	2010-02-01 23:08:24 UTC (rev 100225)
@@ -92,6 +92,16 @@
 
          allPackages.add("org.jboss.virtual");
          
+         allPackages.add("org.osgi.framework");
+         allPackages.add("org.osgi.framework.hooks");
+         allPackages.add("org.osgi.framework.hooks.service");
+         allPackages.add("org.osgi.framework.launch");
+         allPackages.add("org.osgi.service.condpermadmin");
+         allPackages.add("org.osgi.service.packageadmin");
+         allPackages.add("org.osgi.service.permissionadmin");
+         allPackages.add("org.osgi.service.startlevel");
+         allPackages.add("org.osgi.service.url");
+         
          allPackages.add("org.w3c.dom");
          allPackages.add("org.w3c.dom.bootstrap");
          allPackages.add("org.w3c.dom.ls");
@@ -103,11 +113,6 @@
          allPackages.add("org.xml.sax");
          allPackages.add("org.xml.sax.ext");
          allPackages.add("org.xml.sax.helpers");
-
-         allPackages.add("org.osgi.framework");
-         allPackages.add("org.osgi.framework.launch");
-         allPackages.add("org.osgi.service.startlevel");
-         allPackages.add("org.osgi.service.packageadmin");
          
          String asString = packagesAsString(allPackages);
          getBundleManager().setProperty(Constants.FRAMEWORK_SYSTEMPACKAGES, asString);

Modified: projects/jboss-osgi/trunk/testsuite/example/pom.xml
===================================================================
--- projects/jboss-osgi/trunk/testsuite/example/pom.xml	2010-02-01 21:30:10 UTC (rev 100224)
+++ projects/jboss-osgi/trunk/testsuite/example/pom.xml	2010-02-01 23:08:24 UTC (rev 100225)
@@ -236,13 +236,12 @@
             <configuration>
               <excludes>
                 <exclude>${target.container.excludes}</exclude>
-                <!-- https://issues.apache.org/jira/browse/FELIX-1804 -->
-                <exclude>org/jboss/test/osgi/example/webapp/WebAppNegativeTestCase.class</exclude>
-                <exclude>org/jboss/test/osgi/example/webapp/WebAppInterceptorTestCase.class</exclude>
                 <!-- Functionality not supported in Felix -->                
                 <exclude>org/jboss/test/osgi/example/interceptor/**</exclude>
                 <exclude>org/jboss/test/osgi/example/microcontainer/**</exclude>
                 <exclude>org/jboss/test/osgi/example/serviceloader/**</exclude>
+                <exclude>org/jboss/test/osgi/example/webapp/WebAppNegativeTestCase.class</exclude>
+                <exclude>org/jboss/test/osgi/example/webapp/WebAppInterceptorTestCase.class</exclude>
               </excludes>
             </configuration>
           </plugin>
@@ -289,9 +288,10 @@
             <configuration>
               <excludes>
                 <exclude>${target.container.excludes}</exclude>
-                <exclude>org/jboss/test/osgi/example/webapp/WebAppExtenderTestCase.class</exclude>
                 <!-- [JBOSGI-204] Failure in Bundle.start() uninstalls the bundle -->
                 <exclude>org/jboss/test/osgi/example/webapp/WebAppNegativeTestCase.class</exclude>
+                <!-- Functionality not supported in JBossMC -->                
+                <exclude>org/jboss/test/osgi/example/webapp/WebAppExtenderTestCase.class</exclude>
               </excludes>
             </configuration>
           </plugin>
@@ -332,9 +332,10 @@
             <configuration>
               <excludes>
                 <exclude>${target.container.excludes}</exclude>
-                <exclude>org/jboss/test/osgi/example/webapp/WebAppExtenderTestCase.class</exclude>
                 <!-- [JBOSGI-204] Failure in Bundle.start() uninstalls the bundle -->
                 <exclude>org/jboss/test/osgi/example/webapp/WebAppNegativeTestCase.class</exclude>
+                <!-- Functionality not supported in JBossMC -->                
+                <exclude>org/jboss/test/osgi/example/webapp/WebAppExtenderTestCase.class</exclude>
               </excludes>
             </configuration>
           </plugin>

Modified: projects/jboss-osgi/trunk/testsuite/example/src/test/java/org/jboss/test/osgi/example/xml/jaxb/JAXBTestCase.java
===================================================================
--- projects/jboss-osgi/trunk/testsuite/example/src/test/java/org/jboss/test/osgi/example/xml/jaxb/JAXBTestCase.java	2010-02-01 21:30:10 UTC (rev 100224)
+++ projects/jboss-osgi/trunk/testsuite/example/src/test/java/org/jboss/test/osgi/example/xml/jaxb/JAXBTestCase.java	2010-02-01 23:08:24 UTC (rev 100225)
@@ -45,8 +45,10 @@
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
+import org.osgi.framework.Bundle;
 import org.osgi.framework.BundleContext;
 import org.osgi.framework.ServiceReference;
+import org.osgi.service.packageadmin.PackageAdmin;
 
 /**
  * A test that uses JAXB to read an XML document.
@@ -88,6 +90,26 @@
    }
 
    @Test
+   public void testWiring() throws Exception
+   {
+      // Tell Husky to run this test method within the OSGi Runtime
+      if (context == null)
+         BridgeFactory.getBridge().run();
+      
+      // Stop here if the context is not injected
+      assumeNotNull(context);
+
+      ServiceReference sref = context.getServiceReference(PackageAdmin.class.getName());
+      PackageAdmin packageAdmin = (PackageAdmin)context.getService(sref);
+      
+      Bundle serviceBundle = packageAdmin.getBundle(JAXBService.class);
+      Bundle contextBundle = packageAdmin.getBundle(JAXBContext.class);
+      
+      assertEquals("jboss-osgi-jaxb", serviceBundle.getSymbolicName());
+      assertEquals("jboss-osgi-jaxb", serviceBundle, contextBundle);
+   }
+   
+   @Test
    @SuppressWarnings("unchecked")
    public void testUnmarshaller() throws Exception
    {

Modified: projects/jboss-osgi/trunk/testsuite/example/src/test/resources/META-INF/jboss-osgi-bootstrap.xml
===================================================================
--- projects/jboss-osgi/trunk/testsuite/example/src/test/resources/META-INF/jboss-osgi-bootstrap.xml	2010-02-01 21:30:10 UTC (rev 100224)
+++ projects/jboss-osgi/trunk/testsuite/example/src/test/resources/META-INF/jboss-osgi-bootstrap.xml	2010-02-01 23:08:24 UTC (rev 100225)
@@ -19,9 +19,6 @@
         <entry><key>org.osgi.framework.storage.clean</key><value>onFirstInit</value></entry>
         <entry><key>org.osgi.framework.system.packages.extra</key><value>
           
-          <!-- [JBOSGI-145]  JAXB classes are loaded from the system classpath -->
-          com.sun.xml.internal.bind.v2,
-          
           <!-- loging -->
           org.apache.log4j;version=1.2,
           org.slf4j;version=1.5,

Modified: projects/jboss-osgi/trunk/testsuite/example/src/test/resources/xml/jaxb/example-xml-jaxb.bnd
===================================================================
--- projects/jboss-osgi/trunk/testsuite/example/src/test/resources/xml/jaxb/example-xml-jaxb.bnd	2010-02-01 21:30:10 UTC (rev 100224)
+++ projects/jboss-osgi/trunk/testsuite/example/src/test/resources/xml/jaxb/example-xml-jaxb.bnd	2010-02-01 23:08:24 UTC (rev 100225)
@@ -6,7 +6,7 @@
 Export-Package: org.jboss.test.osgi.example.xml.jaxb
 
 Import-Package: com.sun.xml.bind.v2, javax.xml.bind*, javax.xml.datatype, javax.xml.namespace, \
-   org.jboss.osgi.jaxb, org.jboss.osgi.spi*, org.jboss.osgi.husky, org.jboss.osgi.testing, org.junit, org.osgi.framework
+   org.jboss.osgi.jaxb, org.jboss.osgi.spi*, org.jboss.osgi.husky, org.jboss.osgi.testing, org.junit, org.osgi.framework, org.osgi.service.packageadmin
 
 Include-Resource: booking.xml, booking.xsd
 

Modified: projects/jboss-osgi/trunk/testsuite/functional/pom.xml
===================================================================
--- projects/jboss-osgi/trunk/testsuite/functional/pom.xml	2010-02-01 21:30:10 UTC (rev 100224)
+++ projects/jboss-osgi/trunk/testsuite/functional/pom.xml	2010-02-01 23:08:24 UTC (rev 100225)
@@ -171,6 +171,8 @@
                 <exclude>org/jboss/test/osgi/jbosgi108/**</exclude>
                 <!-- [JBOSGI-214] Cannot repeatedly register service bound to an interface from the system classpath -->
                 <exclude>org/jboss/test/osgi/jbosgi214/**</exclude>
+                <!-- [JBOSGI-268] Investigate classloading of javax.* classes -->
+                <exclude>org/jboss/test/osgi/jbosgi268/**</exclude>
               </excludes>
             </configuration>
           </plugin>

Modified: projects/jboss-osgi/trunk/testsuite/functional/scripts/antrun-test-jars.xml
===================================================================
--- projects/jboss-osgi/trunk/testsuite/functional/scripts/antrun-test-jars.xml	2010-02-01 21:30:10 UTC (rev 100224)
+++ projects/jboss-osgi/trunk/testsuite/functional/scripts/antrun-test-jars.xml	2010-02-01 23:08:24 UTC (rev 100225)
@@ -26,6 +26,7 @@
  [JBOSGI-210] Bundle is only installed but not started in runtime
  [JBOSGI-214] Cannot repeatedly register service bound to an interface from the system classpath
  [JBOSGI-284] Investigate version numbering scheme
+ [JBOSGI-286] Investigate classloading of javax.* classes
 
 -->
 
@@ -163,6 +164,9 @@
       </fileset>
     </jar>
 
+    <!-- jbosgi286 -->
+    <bnd classpath="${tests.classes.dir}" output="${tests.output.dir}/test-libs/jbosgi286-bundle.jar" files="${tests.resources.dir}/jbosgi286/jbosgi286-bundle.bnd" />
+    
     <!-- localization -->
     <bnd classpath="${tests.classes.dir}" output="${tests.output.dir}/test-libs/localization-simple-host.jar" files="${tests.resources.dir}/localization/localization-simple-host.bnd" />
     <bnd classpath="${tests.classes.dir}" output="${tests.output.dir}/test-libs/localization-simple-frag.jar" files="${tests.resources.dir}/localization/localization-simple-frag.bnd" />

Added: projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbosgi286/OSGi286TestCase.java
===================================================================
--- projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbosgi286/OSGi286TestCase.java	                        (rev 0)
+++ projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbosgi286/OSGi286TestCase.java	2010-02-01 23:08:24 UTC (rev 100225)
@@ -0,0 +1,65 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.test.osgi.jbosgi286;
+
+//$Id: OSGi284TestCase.java 100204 2010-02-01 10:14:11Z thomas.diesler at jboss.com $
+
+import org.jboss.osgi.jaxb.JAXBCapability;
+import org.jboss.osgi.testing.OSGiBundle;
+import org.jboss.osgi.testing.OSGiRuntime;
+import org.jboss.osgi.testing.OSGiTest;
+import org.junit.Test;
+import org.osgi.framework.Bundle;
+
+/**
+ * [JBOSGI-286] Investigate classloading of javax.* classes
+ * 
+ * https://jira.jboss.org/jira/browse/JBOSGI-286
+ * 
+ * @author thomas.diesler at jboss.com
+ * @since 01-Feb-2010
+ */
+public class OSGi286TestCase extends OSGiTest
+{
+   @Test
+   public void testInstallInvalidBundleVersion() throws Exception
+   {
+      OSGiRuntime runtime = getDefaultRuntime();
+      try
+      {
+         runtime.addCapability(new JAXBCapability());
+
+         OSGiBundle bundleX = runtime.installBundle("jbosgi286-bundle.jar");
+         assertBundleState(Bundle.INSTALLED, bundleX.getState());
+
+         bundleX.start();
+         assertBundleState(Bundle.ACTIVE, bundleX.getState());
+
+         bundleX.uninstall();
+         assertBundleState(Bundle.UNINSTALLED, bundleX.getState());
+      }
+      finally
+      {
+         runtime.shutdown();
+      }
+   }
+}
\ No newline at end of file

Added: projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbosgi286/bundle/OSGi286Activator.java
===================================================================
--- projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbosgi286/bundle/OSGi286Activator.java	                        (rev 0)
+++ projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbosgi286/bundle/OSGi286Activator.java	2010-02-01 23:08:24 UTC (rev 100225)
@@ -0,0 +1,50 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.test.osgi.jbosgi286.bundle;
+
+//$Id: OSGi284ActivatorA.java 100204 2010-02-01 10:14:11Z thomas.diesler at jboss.com $
+
+import javax.xml.bind.JAXBContext;
+
+import org.osgi.framework.Bundle;
+import org.osgi.framework.BundleActivator;
+import org.osgi.framework.BundleContext;
+import org.osgi.framework.ServiceReference;
+import org.osgi.service.packageadmin.PackageAdmin;
+
+public class OSGi286Activator implements BundleActivator
+{
+   public void start(BundleContext context)
+   {
+      ServiceReference sref = context.getServiceReference(PackageAdmin.class.getName());
+      PackageAdmin packageAdmin = (PackageAdmin)context.getService(sref);
+      
+      // Verify that the javax.xml.bind.JAXBContext is wired to the jax bundle
+      Bundle exporter = packageAdmin.getBundle(JAXBContext.class);
+      if (exporter == null || "jboss-osgi-jaxb".equals(exporter.getSymbolicName()) == false)
+         throw new IllegalStateException("Invalid exporter: " + exporter);
+   }
+
+   public void stop(BundleContext context)
+   {
+   }
+}
\ No newline at end of file

Modified: projects/jboss-osgi/trunk/testsuite/functional/src/test/resources/META-INF/jboss-osgi-bootstrap.xml
===================================================================
--- projects/jboss-osgi/trunk/testsuite/functional/src/test/resources/META-INF/jboss-osgi-bootstrap.xml	2010-02-01 21:30:10 UTC (rev 100224)
+++ projects/jboss-osgi/trunk/testsuite/functional/src/test/resources/META-INF/jboss-osgi-bootstrap.xml	2010-02-01 23:08:24 UTC (rev 100225)
@@ -19,9 +19,6 @@
         <entry><key>org.osgi.framework.storage.clean</key><value>onFirstInit</value></entry>
         <entry><key>org.osgi.framework.system.packages.extra</key><value>
         
-          <!-- [JBOSGI-145]  JAXB classes are loaded from the system classpath -->
-          com.sun.xml.internal.bind.v2,
-          
           <!-- loging -->
           org.apache.log4j;version=1.2,
           org.slf4j;version=1.5,

Added: projects/jboss-osgi/trunk/testsuite/functional/src/test/resources/jbosgi286/jbosgi286-bundle.bnd
===================================================================
--- projects/jboss-osgi/trunk/testsuite/functional/src/test/resources/jbosgi286/jbosgi286-bundle.bnd	                        (rev 0)
+++ projects/jboss-osgi/trunk/testsuite/functional/src/test/resources/jbosgi286/jbosgi286-bundle.bnd	2010-02-01 23:08:24 UTC (rev 100225)
@@ -0,0 +1,7 @@
+# bnd build -classpath target/test-classes -output target/test-libs/jbosgi286-bundleA.jar src/test/resources/jbosgi286/bundle.bnd
+
+Bundle-SymbolicName: jbosgi286-bundle
+Bundle-Activator: org.jboss.test.osgi.jbosgi286.bundle.OSGi286Activator
+Import-Package: javax.xml.bind, org.osgi.framework, org.osgi.service.packageadmin
+Private-Package: org.jboss.test.osgi.jbosgi286.bundle
+

Modified: projects/jboss-osgi/trunk/testsuite/pom.xml
===================================================================
--- projects/jboss-osgi/trunk/testsuite/pom.xml	2010-02-01 21:30:10 UTC (rev 100224)
+++ projects/jboss-osgi/trunk/testsuite/pom.xml	2010-02-01 23:08:24 UTC (rev 100225)
@@ -31,7 +31,6 @@
 
   <modules>
     <module>example</module>
-    <module>trailblazer</module>
     <module>functional</module>
   </modules>
 




More information about the jboss-cvs-commits mailing list