[jboss-cvs] JBossAS SVN: r89550 - in projects/jboss-osgi/trunk: runtime/felix/src/main/resources and 1 other directories.

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

Author: thomas.diesler at jboss.com
Date: 2009-05-30 09:49:39 -0400 (Sat, 30 May 2009)
New Revision: 89550

Modified:
   projects/jboss-osgi/trunk/distribution/src/main/resources/installer/install-definition.xml
   projects/jboss-osgi/trunk/runtime/felix/src/main/resources/osgi-deployers-jboss-beans.xml
   projects/jboss-osgi/trunk/testsuite/example/src/test/java/org/jboss/test/osgi/example/log/LogServiceTestCase.java
Log:
More on AS integration - WIP

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-05-30 13:22:11 UTC (rev 89549)
+++ projects/jboss-osgi/trunk/distribution/src/main/resources/installer/install-definition.xml	2009-05-30 13:49:39 UTC (rev 89550)
@@ -293,12 +293,12 @@
       <fileset condition="isFelix" dir="@{deploy.artifacts.dir}/lib" targetdir="${jbossInstallPath}/server/${jbossTargetServer}/deployers/osgi.deployer" override="true">
         <include name="jboss-osgi-runtime-felix.jar" />
         <include name="org.apache.felix.framework.jar" />
+        <include name="org.osgi.compendium.jar" />
       </fileset>
       <fileset condition="isFelix" dir="@{deploy.artifacts.dir}/resources/jboss-osgi-runtime-felix" targetdir="${jbossInstallPath}/server/${jbossTargetServer}/deployers/osgi.deployer/META-INF" override="true">
         <include name="osgi-deployers-jboss-beans.xml" />
       </fileset>
       <fileset condition="isFelix" dir="@{deploy.artifacts.dir}/lib" targetdir="${jbossInstallPath}/server/${jbossTargetServer}/deploy/osgi" override="true">
-        <include name="org.osgi.compendium.jar" />
       </fileset>
       
       <!-- Equinox Integration -->
@@ -307,12 +307,12 @@
         <include name="jboss-osgi-runtime-equinox.jar" />
         <include name="org.apache.equinox.framework.jar" />
         <include name="org.eclipse.osgi.jar"/>
+        <include name="org.eclipse.osgi.services.jar" />
       </fileset>
       <fileset condition="isEquinox" dir="@{deploy.artifacts.dir}/resources/jboss-osgi-runtime-equinox" targetdir="${jbossInstallPath}/server/${jbossTargetServer}/deployers/osgi.deployer/META-INF" override="true">
         <include name="osgi-deployers-jboss-beans.xml" />
       </fileset>
       <fileset condition="isEquinox" dir="@{deploy.artifacts.dir}/lib" targetdir="${jbossInstallPath}/server/${jbossTargetServer}/deploy/osgi" override="true">
-        <include name="org.eclipse.osgi.services.jar" />
       </fileset>
       
       <!-- Knopflerfish Integration -->
@@ -320,12 +320,12 @@
       <fileset condition="isKnopflerfish" dir="@{deploy.artifacts.dir}/lib" targetdir="${jbossInstallPath}/server/${jbossTargetServer}/deployers/osgi.deployer" override="true">
         <include name="jboss-osgi-runtime-knopflerfish.jar" />
         <include name="org.knopflerfish.framework.jar" />
+        <include name="org.osgi.compendium.jar" />
       </fileset>
       <fileset condition="isKnopflerfish" dir="@{deploy.artifacts.dir}/resources/jboss-osgi-runtime-knopflerfish" targetdir="${jbossInstallPath}/server/${jbossTargetServer}/deployers/osgi.deployer/META-INF" override="true">
         <include name="osgi-deployers-jboss-beans.xml" />
       </fileset>
       <fileset condition="isKnopflerfish" dir="@{deploy.artifacts.dir}/lib" targetdir="${jbossInstallPath}/server/${jbossTargetServer}/deploy/osgi" override="true">
-        <include name="org.osgi.compendium.jar" />
       </fileset>
       
     </pack>

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-05-30 13:22:11 UTC (rev 89549)
+++ projects/jboss-osgi/trunk/runtime/felix/src/main/resources/osgi-deployers-jboss-beans.xml	2009-05-30 13:49:39 UTC (rev 89550)
@@ -27,7 +27,7 @@
           <value>
             org.apache.xerces.dom,
             org.jboss.logging,
-            org.jboss.osgi.common.service,
+            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,
@@ -36,6 +36,9 @@
             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,
+            org.osgi.service.event;version=1.1,
+            org.osgi.service.http;version=1.2,
+            org.osgi.service.log;version=1.3,
             
             <!-- needed by jboss-remoting -->
             org.apache.log4j, 
@@ -63,12 +66,16 @@
         <entry><key>org.jboss.osgi.husky.runtime.connector.port</key><value>5401</value></entry>
       </map>
     </property>
-    <property name="autoStart">
+    <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/jboss-osgi-common.jar</value>
      </list>
     </property>
+    <property name="autoStart">
+     <list elementClass="java.net.URL">
+      <value>${jboss.server.home.url}/deploy/osgi/org.apache.felix.log.jar</value>
+     </list>
+    </property>
   </bean>
 
   <!-- The Framework Management -->

Modified: projects/jboss-osgi/trunk/testsuite/example/src/test/java/org/jboss/test/osgi/example/log/LogServiceTestCase.java
===================================================================
--- projects/jboss-osgi/trunk/testsuite/example/src/test/java/org/jboss/test/osgi/example/log/LogServiceTestCase.java	2009-05-30 13:22:11 UTC (rev 89549)
+++ projects/jboss-osgi/trunk/testsuite/example/src/test/java/org/jboss/test/osgi/example/log/LogServiceTestCase.java	2009-05-30 13:49:39 UTC (rev 89550)
@@ -59,7 +59,6 @@
       runtime.startLogEntryTracking(logEntryCache);
    }
 
-
    @AfterClass
    public static void tearDownClass() throws Exception
    {