[jboss-osgi-commits] JBoss-OSGI SVN: r91715 - in projects/jboss-osgi: projects/runtime/felix/trunk/src/test/java/org/jboss/test/osgi/felix and 2 other directories.

Tue Jul 28 11:27:48 EDT 2009

Author: thomas.diesler at jboss.com
Date: 2009-07-28 11:27:45 -0400 (Tue, 28 Jul 2009)
New Revision: 91715

Removed:
   projects/jboss-osgi/projects/runtime/felix/trunk/src/main/java/org/jboss/osgi/felix/FelixFrameworkFactory.java
Modified:
   projects/jboss-osgi/projects/runtime/felix/trunk/src/test/java/org/jboss/test/osgi/felix/SystemBundleTestCase.java
   projects/jboss-osgi/projects/spi/trunk/src/main/java/org/jboss/osgi/spi/framework/FrameworkLoader.java
   projects/jboss-osgi/trunk/reactor/pom.xml
Log:
Add SPI and Felix to reactor

Deleted: projects/jboss-osgi/projects/runtime/felix/trunk/src/main/java/org/jboss/osgi/felix/FelixFrameworkFactory.java
===================================================================

--- projects/jboss-osgi/projects/runtime/felix/trunk/src/main/java/org/jboss/osgi/felix/FelixFrameworkFactory.java	2009-07-28 15:17:52 UTC (rev 91714)
+++ projects/jboss-osgi/projects/runtime/felix/trunk/src/main/java/org/jboss/osgi/felix/FelixFrameworkFactory.java	2009-07-28 15:27:45 UTC (rev 91715)
@@ -1,45 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2005, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.osgi.felix;
-
-//$Id$
-
-import java.util.Map;
-
-import org.jboss.osgi.spi.framework.OSGiBootstrapProvider;
-import org.osgi.framework.launch.Framework;
-import org.osgi.framework.launch.FrameworkFactory;
-
-/**
- * The Felix {@link FrameworkFactory}
- * 
- * @author thomas.diesler at jboss.com
- * @since 27-Jul-2009
- */
-public class FelixFrameworkFactory implements FrameworkFactory
-{
-   @Override
-   public Framework newFramework(Map configuration)
-   {
-      return null;
-   }
-}
\ No newline at end of file

Modified: projects/jboss-osgi/projects/runtime/felix/trunk/src/test/java/org/jboss/test/osgi/felix/SystemBundleTestCase.java
===================================================================
--- projects/jboss-osgi/projects/runtime/felix/trunk/src/test/java/org/jboss/test/osgi/felix/SystemBundleTestCase.java	2009-07-28 15:17:52 UTC (rev 91714)
+++ projects/jboss-osgi/projects/runtime/felix/trunk/src/test/java/org/jboss/test/osgi/felix/SystemBundleTestCase.java	2009-07-28 15:27:45 UTC (rev 91715)
@@ -26,9 +26,6 @@
 import static org.junit.Assert.assertEquals;
 
 import org.jboss.osgi.felix.FelixIntegration;
-import org.jboss.osgi.spi.framework.OSGiBootstrap;
-import org.jboss.osgi.spi.framework.OSGiBootstrapProvider;
-import org.jboss.osgi.spi.framework.OSGiFramework;
 import org.jboss.osgi.spi.testing.OSGiTest;
 import org.junit.Test;
 import org.osgi.framework.Bundle;
@@ -53,15 +50,4 @@
       assertEquals("BundleId == 0", 0, bundle.getBundleId());
       assertEquals("SymbolicName", "org.apache.felix.framework", bundle.getSymbolicName());
    }
-
-   @Test
-   public void testSystemBundle()
-   {
-      OSGiBootstrapProvider configProvider = OSGiBootstrap.getBootstrapProvider();
-      OSGiFramework framework = configProvider.getFramework();
-      Bundle bundle = framework.getBundle();
-
-      assertEquals("BundleId == 0", 0, bundle.getBundleId());
-      assertEquals("SymbolicName", "org.apache.felix.framework", bundle.getSymbolicName());
-   }
 }
\ No newline at end of file

Modified: projects/jboss-osgi/projects/spi/trunk/src/main/java/org/jboss/osgi/spi/framework/FrameworkLoader.java
===================================================================
--- projects/jboss-osgi/projects/spi/trunk/src/main/java/org/jboss/osgi/spi/framework/FrameworkLoader.java	2009-07-28 15:17:52 UTC (rev 91714)
+++ projects/jboss-osgi/projects/spi/trunk/src/main/java/org/jboss/osgi/spi/framework/FrameworkLoader.java	2009-07-28 15:27:45 UTC (rev 91715)
@@ -67,5 +67,4 @@
       
       return factory.newFramework(configuration);
    }
-   
 }
\ No newline at end of file

Modified: projects/jboss-osgi/trunk/reactor/pom.xml
===================================================================
--- projects/jboss-osgi/trunk/reactor/pom.xml	2009-07-28 15:17:52 UTC (rev 91714)
+++ projects/jboss-osgi/trunk/reactor/pom.xml	2009-07-28 15:27:45 UTC (rev 91715)
@@ -12,57 +12,34 @@
   <!-- $Id: pom.xml 91403 2009-07-18 14:01:46Z thomas.diesler at jboss.com $ -->
 
   <!--
-  
-  The reactor is used to pull in external subprojects and build them
-  as part of this maven reactor build. It is a one-stop entry point 
-  to build, test and deploy dependent SNAPSHOTs.
-  
-  To pull in a particular subproject, set one or more of these svn:external definitions
-  
-      spi                        https://svn.jboss.org/repos/jbossas/projects/jboss-osgi/projects/spi/trunk
-      bundles/apache-xerces      https://svn.jboss.org/repos/jbossas/projects/jboss-osgi/projects/bundles/apache-xerces/trunk
-      bundles/common             https://svn.jboss.org/repos/jbossas/projects/jboss-osgi/projects/bundles/common/trunk
-      bundles/hotdeploy          https://svn.jboss.org/repos/jbossas/projects/jboss-osgi/projects/bundles/hotdeploy/trunk
-      bundles/husky              https://svn.jboss.org/repos/jbossas/projects/jboss-osgi/projects/bundles/husky/trunk
-      bundles/jaxb               https://svn.jboss.org/repos/jbossas/projects/jboss-osgi/projects/bundles/jaxb/trunk
-      bundles/jmx                https://svn.jboss.org/repos/jbossas/projects/jboss-osgi/projects/bundles/jmx/trunk
-      bundles/jndi               https://svn.jboss.org/repos/jbossas/projects/jboss-osgi/projects/bundles/jndi/trunk
-      bundles/jboss-common-core  https://svn.jboss.org/repos/jbossas/projects/jboss-osgi/projects/bundles/jboss-common-core/trunk
-      bundles/jboss-xml-binding  https://svn.jboss.org/repos/jbossas/projects/jboss-osgi/projects/bundles/jboss-xml-binding/trunk
-      bundles/microcontainer     https://svn.jboss.org/repos/jbossas/projects/jboss-osgi/projects/bundles/microcontainer/trunk
-      bundles/remotelog          https://svn.jboss.org/repos/jbossas/projects/jboss-osgi/projects/bundles/remotelog/trunk
-      bundles/webconsole         https://svn.jboss.org/repos/jbossas/projects/jboss-osgi/projects/bundles/webconsole/trunk
-      runtime/deployers          https://svn.jboss.org/repos/jbossas/projects/jboss-osgi/projects/runtime/deployers/trunk
-      runtime/equinox            https://svn.jboss.org/repos/jbossas/projects/jboss-osgi/projects/runtime/equinox/trunk
-      runtime/felix              https://svn.jboss.org/repos/jbossas/projects/jboss-osgi/projects/runtime/felix/trunk
-      runtime/jbossas            https://svn.jboss.org/repos/jbossas/projects/jboss-osgi/projects/runtime/jbossas/trunk
-      runtime/knopflerfish       https://svn.jboss.org/repos/jbossas/projects/jboss-osgi/projects/runtime/knopflerfish/trunk
-  
-  and enable the associated maven module
-  
-      <module>spi</module>
-      <module>runtime/equinox</module>
-      <module>runtime/felix</module>
-      <module>runtime/knopflerfish</module>
-      <module>runtime/deployers</module>
-      <module>bundles/common</module>
-      <module>bundles/jboss-common-core</module>
-      <module>bundles/apache-xerces</module>
-      <module>bundles/jaxb</module>
-      <module>bundles/jboss-xml-binding</module>
-      <module>bundles/jndi</module>
-      <module>bundles/jmx</module>
-      <module>bundles/remotelog</module>
-      <module>bundles/webconsole</module>
-      <module>bundles/hotdeploy</module>
-      <module>bundles/microcontainer</module>
-      <module>bundles/husky</module>
-      <module>runtime/jbossas</module>
-      
-  A release MUST NOT contain any svn:external definitions.
-  
+
+    The reactor is used to pull in external subprojects and build them as part of this maven reactor build. It is a one-stop entry point to build, test and deploy
+    dependent SNAPSHOTs. To pull in a particular subproject, set one or more of these svn:external definitions spi
+    https://svn.jboss.org/repos/jbossas/projects/jboss-osgi/projects/spi/trunk bundles/apache-xerces
+    https://svn.jboss.org/repos/jbossas/projects/jboss-osgi/projects/bundles/apache-xerces/trunk bundles/common
+    https://svn.jboss.org/repos/jbossas/projects/jboss-osgi/projects/bundles/common/trunk bundles/hotdeploy
+    https://svn.jboss.org/repos/jbossas/projects/jboss-osgi/projects/bundles/hotdeploy/trunk bundles/husky
+    https://svn.jboss.org/repos/jbossas/projects/jboss-osgi/projects/bundles/husky/trunk bundles/jaxb
+    https://svn.jboss.org/repos/jbossas/projects/jboss-osgi/projects/bundles/jaxb/trunk bundles/jmx
+    https://svn.jboss.org/repos/jbossas/projects/jboss-osgi/projects/bundles/jmx/trunk bundles/jndi
+    https://svn.jboss.org/repos/jbossas/projects/jboss-osgi/projects/bundles/jndi/trunk bundles/jboss-common-core
+    https://svn.jboss.org/repos/jbossas/projects/jboss-osgi/projects/bundles/jboss-common-core/trunk bundles/jboss-xml-binding
+    https://svn.jboss.org/repos/jbossas/projects/jboss-osgi/projects/bundles/jboss-xml-binding/trunk bundles/microcontainer
+    https://svn.jboss.org/repos/jbossas/projects/jboss-osgi/projects/bundles/microcontainer/trunk bundles/remotelog
+    https://svn.jboss.org/repos/jbossas/projects/jboss-osgi/projects/bundles/remotelog/trunk bundles/webconsole
+    https://svn.jboss.org/repos/jbossas/projects/jboss-osgi/projects/bundles/webconsole/trunk runtime/deployers
+    https://svn.jboss.org/repos/jbossas/projects/jboss-osgi/projects/runtime/deployers/trunk runtime/equinox
+    https://svn.jboss.org/repos/jbossas/projects/jboss-osgi/projects/runtime/equinox/trunk runtime/felix
+    https://svn.jboss.org/repos/jbossas/projects/jboss-osgi/projects/runtime/felix/trunk runtime/jbossas
+    https://svn.jboss.org/repos/jbossas/projects/jboss-osgi/projects/runtime/jbossas/trunk runtime/knopflerfish
+    https://svn.jboss.org/repos/jbossas/projects/jboss-osgi/projects/runtime/knopflerfish/trunk and enable the associated maven module <module>spi</module>
+    <module>runtime/equinox</module> <module>runtime/felix</module> <module>runtime/knopflerfish</module> <module>runtime/deployers</module>
+    <module>bundles/common</module> <module>bundles/jboss-common-core</module> <module>bundles/apache-xerces</module> <module>bundles/jaxb</module>
+    <module>bundles/jboss-xml-binding</module> <module>bundles/jndi</module> <module>bundles/jmx</module> <module>bundles/remotelog</module>
+    <module>bundles/webconsole</module> <module>bundles/hotdeploy</module> <module>bundles/microcontainer</module> <module>bundles/husky</module>
+    <module>runtime/jbossas</module> A release MUST NOT contain any svn:external definitions.
   -->
-  
+
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <modelVersion>4.0.0</modelVersion>
 
@@ -77,8 +54,10 @@
     <artifactId>jboss-osgi</artifactId>
     <version>1.0.0</version>
   </parent>
-  
+
   <modules>
+    <module>spi</module>
+    <module>runtime/felix</module>
     <module>blueprint</module>
   </modules>
 

