[jboss-osgi-commits] JBoss-OSGI SVN: r93119 - in projects/jboss-osgi/trunk: testsuite/example/src/test/java/org/jboss/test/osgi/example/http and 1 other directory.

[jboss-osgi-commits at lists.jboss.org]

Author: thomas.diesler at jboss.com
Date: 2009-09-02 04:25:41 -0400 (Wed, 02 Sep 2009)
New Revision: 93119

Modified:
   projects/jboss-osgi/trunk/distribution/installer/src/main/resources/installer/install-definition.xml
   projects/jboss-osgi/trunk/testsuite/example/src/test/java/org/jboss/test/osgi/example/http/HttpServiceTestCase.java
Log:
Disable configadmin service for MC Framework

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	2009-09-02 08:24:44 UTC (rev 93118)
+++ projects/jboss-osgi/trunk/distribution/installer/src/main/resources/installer/install-definition.xml	2009-09-02 08:25:41 UTC (rev 93119)
@@ -200,9 +200,7 @@
         <include name="jboss-osgi-jndi.jar" />
         <!-- web -->        
         <include name="jboss-osgi-webconsole.jar" />
-        <include name="org.apache.felix.configadmin.jar" />
         <include name="org.apache.felix.http.jetty.jar" />
-        <include name="org.apache.felix.metatype.jar" />
       </fileset>
 
       <!-- Server All -->
@@ -214,9 +212,7 @@
         <include name="jboss-osgi-jndi.jar" />
         <!-- web -->        
         <include name="jboss-osgi-webconsole.jar" />
-        <include name="org.apache.felix.configadmin.jar" />
         <include name="org.apache.felix.http.jetty.jar" />
-        <include name="org.apache.felix.metatype.jar" />
         <!-- all -->        
         <include name="jboss-osgi-apache-xerces.jar" />
         <include name="jboss-osgi-blueprint.jar" />
@@ -239,6 +235,8 @@
         <include name="org.osgi.compendium.jar" />
       </fileset>
       <fileset condition="isFelix" dir="@{deploy.artifacts.dir}/lib" targetdir="$INSTALL_PATH/runtime/server/all/deploy" override="true">
+        <include name="org.apache.felix.configadmin.jar" />
+        <include name="org.apache.felix.metatype.jar" />
         <include name="jboss-osgi-microcontainer.jar" />
       </fileset>
       
@@ -253,6 +251,8 @@
         <include name="org.eclipse.osgi.services.jar" />
       </fileset>
       <fileset condition="isEquinox" dir="@{deploy.artifacts.dir}/lib" targetdir="$INSTALL_PATH/runtime/server/all/deploy" override="true">
+        <include name="org.apache.felix.configadmin.jar" />
+        <include name="org.apache.felix.metatype.jar" />
         <include name="jboss-osgi-microcontainer.jar" />
       </fileset>
       

Modified: projects/jboss-osgi/trunk/testsuite/example/src/test/java/org/jboss/test/osgi/example/http/HttpServiceTestCase.java
===================================================================
--- projects/jboss-osgi/trunk/testsuite/example/src/test/java/org/jboss/test/osgi/example/http/HttpServiceTestCase.java	2009-09-02 08:24:44 UTC (rev 93118)
+++ projects/jboss-osgi/trunk/testsuite/example/src/test/java/org/jboss/test/osgi/example/http/HttpServiceTestCase.java	2009-09-02 08:25:41 UTC (rev 93119)
@@ -29,7 +29,6 @@
 import java.io.InputStreamReader;
 import java.net.URL;
 
-import org.jboss.osgi.spi.capability.ConfigAdminCapability;
 import org.jboss.osgi.spi.capability.HttpCapability;
 import org.jboss.osgi.spi.testing.OSGiBundle;
 import org.jboss.osgi.spi.testing.OSGiRuntime;
@@ -53,7 +52,6 @@
    public static void setUpClass() throws Exception
    {
       runtime = new OSGiTestHelper().getDefaultRuntime();
-      runtime.addCapability(new ConfigAdminCapability());
       runtime.addCapability(new HttpCapability());
 
       Thread.sleep(5000);