[jboss-cvs] JBossAS SVN: r89521 - in projects/jboss-osgi/trunk: 3rdparty/jaxb/src/main/java and 15 other directories.

jboss-cvs-commits at lists.jboss.org jboss-cvs-commits at lists.jboss.org
Fri May 29 03:28:27 EDT 2009


Author: thomas.diesler at jboss.com
Date: 2009-05-29 03:28:27 -0400 (Fri, 29 May 2009)
New Revision: 89521

Added:
   projects/jboss-osgi/trunk/3rdparty/jaxb/src/main/java/org/
   projects/jboss-osgi/trunk/3rdparty/jaxb/src/main/java/org/jboss/
   projects/jboss-osgi/trunk/3rdparty/jaxb/src/main/java/org/jboss/osgi/
   projects/jboss-osgi/trunk/3rdparty/jaxb/src/main/java/org/jboss/osgi/jaxb/
   projects/jboss-osgi/trunk/3rdparty/jaxb/src/main/java/org/jboss/osgi/jaxb/internal/
   projects/jboss-osgi/trunk/3rdparty/jaxb/src/main/java/org/jboss/osgi/jaxb/internal/JAXBServiceActivator.java
   projects/jboss-osgi/trunk/bundles/common/src/main/java/org/jboss/osgi/common/service/JAXBService.java
   projects/jboss-osgi/trunk/bundles/common/src/main/java/org/jboss/osgi/common/service/XMLBindingService.java
   projects/jboss-osgi/trunk/hudson/hudson-home/jobs/jbossosgi-matrix/
Removed:
   projects/jboss-osgi/trunk/hudson/hudson-home/jobs/jbossosgi-container-matrix/
   projects/jboss-osgi/trunk/hudson/hudson-home/jobs/jbossosgi-framework-matrix/
Modified:
   projects/jboss-osgi/trunk/3rdparty/jaxb/pom.xml
   projects/jboss-osgi/trunk/3rdparty/jboss-xml-binding/pom.xml
   projects/jboss-osgi/trunk/3rdparty/jboss-xml-binding/src/main/java/org/jboss/osgi/jbossxb/internal/XMLBindingActivator.java
   projects/jboss-osgi/trunk/bundles/jmx/src/main/java/org/jboss/osgi/jmx/internal/MBeanServerServiceActivator.java
   projects/jboss-osgi/trunk/hudson/build.xml
   projects/jboss-osgi/trunk/hudson/hudson-home/jobs/jbossosgi-matrix/config.xml
   projects/jboss-osgi/trunk/spi/src/main/java/org/jboss/osgi/spi/testing/internal/EmbeddedRuntime.java
   projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/bootstrap/CapabilityTestCase.java
   projects/jboss-osgi/trunk/testsuite/functional/src/test/resources/jboss-osgi-felix.properties
Log:
Register marker services for JAXB and JBossXB

Modified: projects/jboss-osgi/trunk/3rdparty/jaxb/pom.xml
===================================================================
--- projects/jboss-osgi/trunk/3rdparty/jaxb/pom.xml	2009-05-29 06:15:21 UTC (rev 89520)
+++ projects/jboss-osgi/trunk/3rdparty/jaxb/pom.xml	2009-05-29 07:28:27 UTC (rev 89521)
@@ -25,6 +25,25 @@
       <artifactId>jaxb-impl</artifactId>
       <version>${version.xml.bind}</version>
     </dependency> 
+
+    <!-- OSGi Dependencies -->
+    <dependency>
+      <groupId>org.osgi</groupId>
+      <artifactId>org.osgi.core</artifactId>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.osgi</groupId>
+      <artifactId>org.osgi.compendium</artifactId>
+      <scope>provided</scope>
+    </dependency>
+    
+    <!-- Bundles -->
+    <dependency>
+      <groupId>org.jboss.osgi.bundles</groupId>
+      <artifactId>jboss-osgi-common</artifactId>
+      <scope>provided</scope>
+    </dependency>
   </dependencies>
 
   <build>
@@ -35,7 +54,9 @@
         <configuration>
           <instructions>
             <Bundle-SymbolicName>${artifactId}</Bundle-SymbolicName>
+            <Bundle-Activator>org.jboss.osgi.jaxb.internal.JAXBServiceActivator</Bundle-Activator>
             <Private-Package>
+              org.jboss.osgi.jaxb.internal
             </Private-Package>
             <Import-Package>
               <!-- system -->
@@ -49,6 +70,10 @@
               org.xml.sax*,
 
               <!-- import -->
+              org.jboss.osgi.common.log;version=1.0, 
+              org.jboss.osgi.common.service;version=1.0, 
+              org.osgi.framework, 
+              org.osgi.service.log,
               
               <!-- ignore -->
               !com.sun.xml.fastinfoset.*, 

Added: projects/jboss-osgi/trunk/3rdparty/jaxb/src/main/java/org/jboss/osgi/jaxb/internal/JAXBServiceActivator.java
===================================================================
--- projects/jboss-osgi/trunk/3rdparty/jaxb/src/main/java/org/jboss/osgi/jaxb/internal/JAXBServiceActivator.java	                        (rev 0)
+++ projects/jboss-osgi/trunk/3rdparty/jaxb/src/main/java/org/jboss/osgi/jaxb/internal/JAXBServiceActivator.java	2009-05-29 07:28:27 UTC (rev 89521)
@@ -0,0 +1,54 @@
+/*
+ * 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.osgi.jaxb.internal;
+
+//$Id$
+
+import org.jboss.osgi.common.log.LogServiceTracker;
+import org.jboss.osgi.common.service.JAXBService;
+import org.osgi.framework.BundleActivator;
+import org.osgi.framework.BundleContext;
+import org.osgi.service.log.LogService;
+
+/**
+ * A BundleActivator for JAXB related services
+ * 
+ * @author thomas.diesler at jboss.com
+ * @since 29-May-2009
+ */
+public class JAXBServiceActivator implements BundleActivator
+{
+   private LogService log;
+
+   public void start(BundleContext context)
+   {
+      log = new LogServiceTracker(context);
+      
+      JAXBService service = new JAXBService(){};
+      context.registerService(JAXBService.class.getName(), service, null);
+      log.log(LogService.LOG_INFO, "JAXBService registered");
+   }
+
+   public void stop(BundleContext context)
+   {
+   }
+}
\ No newline at end of file


Property changes on: projects/jboss-osgi/trunk/3rdparty/jaxb/src/main/java/org/jboss/osgi/jaxb/internal/JAXBServiceActivator.java
___________________________________________________________________
Name: svn:keywords
   + Id Revision
Name: svn:eol-style
   + LF

Modified: projects/jboss-osgi/trunk/3rdparty/jboss-xml-binding/pom.xml
===================================================================
--- projects/jboss-osgi/trunk/3rdparty/jboss-xml-binding/pom.xml	2009-05-29 06:15:21 UTC (rev 89520)
+++ projects/jboss-osgi/trunk/3rdparty/jboss-xml-binding/pom.xml	2009-05-29 07:28:27 UTC (rev 89521)
@@ -79,6 +79,7 @@
               org.apache.xerces.*, 
               org.jboss.logging,
               org.jboss.osgi.common.log;version=1.0,
+              org.jboss.osgi.common.service;version=1.0,
               org.jboss.util*, 
               org.osgi.framework, 
               org.osgi.service.log,

Modified: projects/jboss-osgi/trunk/3rdparty/jboss-xml-binding/src/main/java/org/jboss/osgi/jbossxb/internal/XMLBindingActivator.java
===================================================================
--- projects/jboss-osgi/trunk/3rdparty/jboss-xml-binding/src/main/java/org/jboss/osgi/jbossxb/internal/XMLBindingActivator.java	2009-05-29 06:15:21 UTC (rev 89520)
+++ projects/jboss-osgi/trunk/3rdparty/jboss-xml-binding/src/main/java/org/jboss/osgi/jbossxb/internal/XMLBindingActivator.java	2009-05-29 07:28:27 UTC (rev 89521)
@@ -27,6 +27,7 @@
 import javax.xml.parsers.SAXParserFactory;
 
 import org.jboss.osgi.common.log.LogServiceTracker;
+import org.jboss.osgi.common.service.XMLBindingService;
 import org.jboss.xb.binding.parser.sax.SaxJBossXBParser;
 import org.osgi.framework.BundleActivator;
 import org.osgi.framework.BundleContext;
@@ -60,6 +61,10 @@
          // SaxJBossXBParser initializes the SAXParserFactory in a static block
          // using SAXParserFactory.newInstance(), which internally uses the TCCL
          new SaxJBossXBParser();
+
+         XMLBindingService service = new XMLBindingService(){};
+         context.registerService(XMLBindingService.class.getName(), service, null);
+         log.log(LogService.LOG_INFO, "XMLBindingService registered");
       }
       finally
       {

Added: projects/jboss-osgi/trunk/bundles/common/src/main/java/org/jboss/osgi/common/service/JAXBService.java
===================================================================
--- projects/jboss-osgi/trunk/bundles/common/src/main/java/org/jboss/osgi/common/service/JAXBService.java	                        (rev 0)
+++ projects/jboss-osgi/trunk/bundles/common/src/main/java/org/jboss/osgi/common/service/JAXBService.java	2009-05-29 07:28:27 UTC (rev 89521)
@@ -0,0 +1,34 @@
+/*
+ * 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.osgi.common.service;
+
+//$Id$
+
+/**
+ * A marker service that is registered by jboss-osgi-jaxb
+ * 
+ * @author thomas.diesler at jboss.com
+ * @since 29-May-2009
+ */
+public interface JAXBService
+{
+}
\ No newline at end of file


Property changes on: projects/jboss-osgi/trunk/bundles/common/src/main/java/org/jboss/osgi/common/service/JAXBService.java
___________________________________________________________________
Name: svn:keywords
   + Id Revision
Name: svn:eol-style
   + LF

Added: projects/jboss-osgi/trunk/bundles/common/src/main/java/org/jboss/osgi/common/service/XMLBindingService.java
===================================================================
--- projects/jboss-osgi/trunk/bundles/common/src/main/java/org/jboss/osgi/common/service/XMLBindingService.java	                        (rev 0)
+++ projects/jboss-osgi/trunk/bundles/common/src/main/java/org/jboss/osgi/common/service/XMLBindingService.java	2009-05-29 07:28:27 UTC (rev 89521)
@@ -0,0 +1,34 @@
+/*
+ * 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.osgi.common.service;
+
+//$Id$
+
+/**
+ * A marker service that is registered by jboss-osgi-xml-binding
+ * 
+ * @author thomas.diesler at jboss.com
+ * @since 29-May-2009
+ */
+public interface XMLBindingService
+{
+}
\ No newline at end of file


Property changes on: projects/jboss-osgi/trunk/bundles/common/src/main/java/org/jboss/osgi/common/service/XMLBindingService.java
___________________________________________________________________
Name: svn:keywords
   + Id Revision
Name: svn:eol-style
   + LF

Modified: projects/jboss-osgi/trunk/bundles/jmx/src/main/java/org/jboss/osgi/jmx/internal/MBeanServerServiceActivator.java
===================================================================
--- projects/jboss-osgi/trunk/bundles/jmx/src/main/java/org/jboss/osgi/jmx/internal/MBeanServerServiceActivator.java	2009-05-29 06:15:21 UTC (rev 89520)
+++ projects/jboss-osgi/trunk/bundles/jmx/src/main/java/org/jboss/osgi/jmx/internal/MBeanServerServiceActivator.java	2009-05-29 07:28:27 UTC (rev 89521)
@@ -130,7 +130,7 @@
          }
          catch (NamingException ex)
          {
-            log.log(LogService.LOG_ERROR, "Cannot bind RMIAdoaptor", ex);
+            log.log(LogService.LOG_ERROR, "Cannot bind RMIAdaptor", ex);
          }
          
          return iniCtx;
@@ -153,7 +153,7 @@
          }
          catch (NamingException ex)
          {
-            log.log(LogService.LOG_ERROR, "Cannot unbind RMIAdoaptor", ex);
+            log.log(LogService.LOG_ERROR, "Cannot unbind RMIAdaptor", ex);
          }
          
          super.removedService(reference, service);

Modified: projects/jboss-osgi/trunk/hudson/build.xml
===================================================================
--- projects/jboss-osgi/trunk/hudson/build.xml	2009-05-29 06:15:21 UTC (rev 89520)
+++ projects/jboss-osgi/trunk/hudson/build.xml	2009-05-29 07:28:27 UTC (rev 89521)
@@ -27,8 +27,7 @@
        <copyjob index="2" prefix="${hudson.job.prefix}" job="jbossosgi-embedded"/>
        <copyjob index="3" prefix="${hudson.job.prefix}" job="jbossosgi-jdk15"/>
        <copyjob index="4" prefix="${hudson.job.prefix}" job="jbossosgi-jdk16"/>
-       <copyjob index="5" prefix="${hudson.job.prefix}" job="jbossosgi-container-matrix"/>
-       <copyjob index="6" prefix="${hudson.job.prefix}" job="jbossosgi-framework-matrix"/>
+       <copyjob index="5" prefix="${hudson.job.prefix}" job="jbossosgi-matrix"/>
      </sequential>
   </macrodef>
   

Copied: projects/jboss-osgi/trunk/hudson/hudson-home/jobs/jbossosgi-matrix (from rev 89519, projects/jboss-osgi/trunk/hudson/hudson-home/jobs/jbossosgi-container-matrix)

Modified: projects/jboss-osgi/trunk/hudson/hudson-home/jobs/jbossosgi-matrix/config.xml
===================================================================
--- projects/jboss-osgi/trunk/hudson/hudson-home/jobs/jbossosgi-container-matrix/config.xml	2009-05-29 06:14:09 UTC (rev 89519)
+++ projects/jboss-osgi/trunk/hudson/hudson-home/jobs/jbossosgi-matrix/config.xml	2009-05-29 07:28:27 UTC (rev 89521)
@@ -35,6 +35,8 @@
       <name>framework</name>
       <values>
         <string>felix</string>
+        <string>equinox</string>
+        <string>knopflerfish</string>
       </values>
     </axis>
     <axis>

Modified: projects/jboss-osgi/trunk/spi/src/main/java/org/jboss/osgi/spi/testing/internal/EmbeddedRuntime.java
===================================================================
--- projects/jboss-osgi/trunk/spi/src/main/java/org/jboss/osgi/spi/testing/internal/EmbeddedRuntime.java	2009-05-29 06:15:21 UTC (rev 89520)
+++ projects/jboss-osgi/trunk/spi/src/main/java/org/jboss/osgi/spi/testing/internal/EmbeddedRuntime.java	2009-05-29 07:28:27 UTC (rev 89521)
@@ -44,6 +44,7 @@
 import org.osgi.framework.Bundle;
 import org.osgi.framework.BundleContext;
 import org.osgi.framework.BundleException;
+import org.osgi.framework.InvalidSyntaxException;
 import org.osgi.framework.ServiceReference;
 import org.osgi.service.log.LogReaderService;
 import org.osgi.service.packageadmin.PackageAdmin;
@@ -83,14 +84,21 @@
    
    public OSGiServiceReference getServiceReference(String clazz)
    {
-      // TODO Auto-generated method stub
-      return null;
+      ServiceReference sref = getBundleContext().getServiceReference(clazz);
+      return (sref != null ? new EmbeddedServiceReference(sref) : null);
    }
 
-   public OSGiServiceReference[] getServiceReferences(String clazz, String filter)
+   public OSGiServiceReference[] getServiceReferences(String clazz, String filter) throws InvalidSyntaxException
    {
-      // TODO Auto-generated method stub
-      return null;
+      OSGiServiceReference[] retRefs = null;
+      ServiceReference[] srefs = getBundleContext().getServiceReferences(clazz, filter);
+      if (srefs != null)
+      {
+         retRefs = new OSGiServiceReference[srefs.length];
+         for(int i=0; i < srefs.length; i++)
+            retRefs[i] = new EmbeddedServiceReference(srefs[i]);
+      }
+      return retRefs;
    }
 
    @Override

Modified: projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/bootstrap/CapabilityTestCase.java
===================================================================
--- projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/bootstrap/CapabilityTestCase.java	2009-05-29 06:15:21 UTC (rev 89520)
+++ projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/bootstrap/CapabilityTestCase.java	2009-05-29 07:28:27 UTC (rev 89521)
@@ -25,18 +25,28 @@
 package org.jboss.test.osgi.bootstrap;
 
 import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertNull;
 
+import javax.management.MBeanServer;
+import javax.naming.InitialContext;
+import javax.xml.parsers.DocumentBuilderFactory;
+import javax.xml.parsers.SAXParserFactory;
+
+import org.jboss.osgi.common.service.JAXBService;
+import org.jboss.osgi.common.service.MicrocontainerService;
+import org.jboss.osgi.common.service.XMLBindingService;
 import org.jboss.osgi.spi.testing.OSGiBundle;
 import org.jboss.osgi.spi.testing.OSGiRuntime;
+import org.jboss.osgi.spi.testing.OSGiServiceReference;
 import org.jboss.osgi.spi.testing.OSGiTest;
 import org.jboss.osgi.spi.testing.capability.JAXBCapability;
 import org.jboss.osgi.spi.testing.capability.JMXCapability;
 import org.jboss.osgi.spi.testing.capability.JNDICapability;
+import org.jboss.osgi.spi.testing.capability.MicrocontainerCapability;
 import org.jboss.osgi.spi.testing.capability.XMLBindingCapability;
 import org.jboss.osgi.spi.testing.capability.XMLParserCapability;
 import org.junit.Test;
-import org.osgi.framework.Bundle;
 import org.osgi.framework.BundleException;
 
 /**
@@ -58,8 +68,17 @@
          
          runtime.addCapability(new XMLParserCapability());
          
-         bundle = runtime.getBundle("jboss-osgi-apache-xerces", null);
-         assertEquals("Test bundle ACTIVE", Bundle.ACTIVE, bundle.getState());
+         OSGiServiceReference saxRef = runtime.getServiceReference(SAXParserFactory.class.getName());
+         assertNotNull("SAXParserFactory registered", saxRef);
+         assertEquals("namespaceAware", Boolean.TRUE, saxRef.getProperty("parser.namespaceAware"));
+         assertEquals("validating", Boolean.TRUE, saxRef.getProperty("parser.validating"));
+         assertEquals("xincludeAware", Boolean.TRUE, saxRef.getProperty("parser.xincludeAware"));
+         
+         OSGiServiceReference domRef = runtime.getServiceReference(DocumentBuilderFactory.class.getName());
+         assertNotNull("DocumentBuilderFactory registered", domRef);
+         assertEquals("namespaceAware", Boolean.TRUE, domRef.getProperty("parser.namespaceAware"));
+         assertEquals("validating", Boolean.TRUE, domRef.getProperty("parser.validating"));
+         assertEquals("xincludeAware", Boolean.TRUE, domRef.getProperty("parser.xincludeAware"));
       }
       finally
       {
@@ -78,8 +97,8 @@
          
          runtime.addCapability(new JAXBCapability());
          
-         bundle = runtime.getBundle("jboss-osgi-jaxb", null);
-         assertEquals("Test bundle ACTIVE", Bundle.ACTIVE, bundle.getState());
+         OSGiServiceReference saxRef = runtime.getServiceReference(JAXBService.class.getName());
+         assertNotNull("JAXBService registered", saxRef);
       }
       finally
       {
@@ -98,8 +117,8 @@
          
          runtime.addCapability(new XMLBindingCapability());
          
-         bundle = runtime.getBundle("jboss-osgi-xml-binding", null);
-         assertEquals("Test bundle ACTIVE", Bundle.ACTIVE, bundle.getState());
+         OSGiServiceReference saxRef = runtime.getServiceReference(XMLBindingService.class.getName());
+         assertNotNull("XMLBindingService registered", saxRef);
       }
       finally
       {
@@ -118,8 +137,8 @@
          
          runtime.addCapability(new JNDICapability());
          
-         bundle = runtime.getBundle("jboss-osgi-jndi", null);
-         assertEquals("Test bundle ACTIVE", Bundle.ACTIVE, bundle.getState());
+         OSGiServiceReference saxRef = runtime.getServiceReference(InitialContext.class.getName());
+         assertNotNull("InitialContext registered", saxRef);
       }
       finally
       {
@@ -138,12 +157,32 @@
          
          runtime.addCapability(new JMXCapability());
          
-         bundle = runtime.getBundle("jboss-osgi-jmx", null);
-         assertEquals("Test bundle ACTIVE", Bundle.ACTIVE, bundle.getState());
+         OSGiServiceReference saxRef = runtime.getServiceReference(MBeanServer.class.getName());
+         assertNotNull("MBeanServer registered", saxRef);
       }
       finally
       {
          runtime.shutdown();
       }
    }
+   
+   @Test
+   public void testMicrocontainerCapability() throws Exception
+   {
+      OSGiRuntime runtime = getEmbeddedRuntime();
+      try
+      {
+         OSGiBundle bundle = runtime.getBundle("jboss-osgi-microcontainer", null);
+         assertNull("Test bundle null", bundle);
+         
+         runtime.addCapability(new MicrocontainerCapability());
+         
+         OSGiServiceReference saxRef = runtime.getServiceReference(MicrocontainerService.class.getName());
+         assertNotNull("MicrocontainerService registered", saxRef);
+      }
+      finally
+      {
+         runtime.shutdown();
+      }
+   }
 }
\ No newline at end of file

Modified: projects/jboss-osgi/trunk/testsuite/functional/src/test/resources/jboss-osgi-felix.properties
===================================================================
--- projects/jboss-osgi/trunk/testsuite/functional/src/test/resources/jboss-osgi-felix.properties	2009-05-29 06:15:21 UTC (rev 89520)
+++ projects/jboss-osgi/trunk/testsuite/functional/src/test/resources/jboss-osgi-felix.properties	2009-05-29 07:28:27 UTC (rev 89521)
@@ -18,9 +18,9 @@
 org.osgi.framework.system.packages.extra=\
 	org.jboss.logging, \
   	org.jboss.net.protocol, \
-  	org.jboss.osgi.spi, \
-  	org.jboss.osgi.spi.logging, \
-  	org.jboss.osgi.spi.management, \
+  	org.jboss.osgi.spi;version=1.0, \
+  	org.jboss.osgi.spi.logging;version=1.0, \
+  	org.jboss.osgi.spi.management;version=1.0, \
   	org.jboss.virtual, \
   	org.jboss.virtual.plugins.registry, \
   	org.jboss.virtual.plugins.context.jar, \




More information about the jboss-cvs-commits mailing list