[jboss-cvs] JBossAS SVN: r89590 - in projects/jboss-osgi/trunk: runtime/equinox/src/main/resources and 2 other directories.

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

Author: thomas.diesler at jboss.com
Date: 2009-06-01 04:35:49 -0400 (Mon, 01 Jun 2009)
New Revision: 89590

Modified:
   projects/jboss-osgi/trunk/distribution/src/main/resources/installer/install-definition.xml
   projects/jboss-osgi/trunk/runtime/equinox/src/main/resources/osgi-deployers-jboss-beans.xml
   projects/jboss-osgi/trunk/runtime/felix/src/main/resources/osgi-deployers-jboss-beans.xml
   projects/jboss-osgi/trunk/runtime/knopflerfish/src/main/resources/osgi-deployers-jboss-beans.xml
Log:
check new AS integration

Modified: projects/jboss-osgi/trunk/distribution/src/main/resources/installer/install-definition.xml
===================================================================
--- projects/jboss-osgi/trunk/distribution/src/main/resources/installer/install-definition.xml	2009-06-01 08:00:17 UTC (rev 89589)
+++ projects/jboss-osgi/trunk/distribution/src/main/resources/installer/install-definition.xml	2009-06-01 08:35:49 UTC (rev 89590)
@@ -274,7 +274,6 @@
       <fileset dir="@{deploy.artifacts.dir}/lib" targetdir="${jbossInstallPath}/server/${jbossTargetServer}/deployers/osgi.deployer" override="true">
         <include name="jboss-osgi-deployers.jar" />
         <include name="jboss-osgi-integration-jbossas.jar" />
-        <include name="jboss-osgi-microcontainer.jar" />
         <include name="jboss-osgi-spi.jar" />
       </fileset>
       
@@ -313,7 +312,6 @@
       </fileset>
       <fileset condition="isEquinox" dir="@{deploy.artifacts.dir}/lib" targetdir="${jbossInstallPath}/server/${jbossTargetServer}/deploy/osgi" override="true">
         <include name="org.eclipse.osgi.services.jar" />
-        <include name="jboss-osgi-webconsole.jar" />
       </fileset>
       
       <!-- Knopflerfish Integration -->
@@ -327,7 +325,6 @@
       </fileset>
       <fileset condition="isKnopflerfish" dir="@{deploy.artifacts.dir}/lib" targetdir="${jbossInstallPath}/server/${jbossTargetServer}/deploy/osgi" override="true">
         <include name="org.osgi.compendium.jar" />
-        <include name="jboss-osgi-webconsole.jar" />
       </fileset>
       
     </pack>

Modified: projects/jboss-osgi/trunk/runtime/equinox/src/main/resources/osgi-deployers-jboss-beans.xml
===================================================================
--- projects/jboss-osgi/trunk/runtime/equinox/src/main/resources/osgi-deployers-jboss-beans.xml	2009-06-01 08:00:17 UTC (rev 89589)
+++ projects/jboss-osgi/trunk/runtime/equinox/src/main/resources/osgi-deployers-jboss-beans.xml	2009-06-01 08:35:49 UTC (rev 89590)
@@ -38,7 +38,7 @@
     </property>
     <property name="autoInstall">
      <list elementClass="java.net.URL">
-      <value>${jboss.server.home.url}/deploy/osgi/org.osgi.compendium.jar</value>
+      <value>${jboss.server.home.url}/deploy/osgi/org.eclipse.osgi.services.jar</value>
      </list>
     </property>
     <property name="autoStart">

Modified: projects/jboss-osgi/trunk/runtime/felix/src/main/resources/osgi-deployers-jboss-beans.xml
===================================================================
--- projects/jboss-osgi/trunk/runtime/felix/src/main/resources/osgi-deployers-jboss-beans.xml	2009-06-01 08:00:17 UTC (rev 89589)
+++ projects/jboss-osgi/trunk/runtime/felix/src/main/resources/osgi-deployers-jboss-beans.xml	2009-06-01 08:35:49 UTC (rev 89590)
@@ -30,22 +30,14 @@
             org.jboss.logging,
             
             <!-- jboss -->
-            org.jboss.osgi.common.log;version=1.0,
-            org.jboss.osgi.common.service;version=1.0,
-            org.jboss.osgi.jbossas.integration,
             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.osgi.spi.service;version=1.0,
             org.jboss.osgi.spi.testing;version=1.0,
             org.jboss.osgi.spi.testing.capability;version=1.0,
             org.jboss.xb.binding;version=2.0,
             org.jboss.xb.binding.sunday.unmarshalling;version=2.0,
-            
-            <!-- compendium -->
-            org.osgi.service.event;version=1.1,
-            org.osgi.service.http;version=1.2,
-            org.osgi.service.log;version=1.3,
-            org.osgi.util.xml;version=1.0,
           </value>
         </entry>
         <!-- 

Modified: projects/jboss-osgi/trunk/runtime/knopflerfish/src/main/resources/osgi-deployers-jboss-beans.xml
===================================================================
--- projects/jboss-osgi/trunk/runtime/knopflerfish/src/main/resources/osgi-deployers-jboss-beans.xml	2009-06-01 08:00:17 UTC (rev 89589)
+++ projects/jboss-osgi/trunk/runtime/knopflerfish/src/main/resources/osgi-deployers-jboss-beans.xml	2009-06-01 08:35:49 UTC (rev 89590)
@@ -30,24 +30,13 @@
             javax.xml.parsers,
             org.xml.sax,
             
-            <!-- jboss -->
-            org.jboss.osgi.common.log;version=1.0,
-            org.jboss.osgi.common.service;version=1.0,
-            org.jboss.osgi.jbossas.integration,
+            <!-- jboss-osgi -->
             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.osgi.spi.testing;version=1.0,
             org.jboss.osgi.spi.testing.capability;version=1.0,
-            org.jboss.xb.binding;version=2.0,
-            org.jboss.xb.binding.sunday.unmarshalling;version=2.0,
             
-            <!-- compendium -->
-            org.osgi.service.event;version=1.1,
-            org.osgi.service.http;version=1.2,
-            org.osgi.service.log;version=1.3,
-            org.osgi.util.xml;version=1.0,
-            
             <!-- core -->            
             org.osgi.framework;version=1.4,
             org.osgi.service.packageadmin;version=1.2,