[jboss-cvs] JBossAS SVN: r92427 - in projects/jboss-osgi: trunk/distribution/installer/runtime/conf and 6 other directories.

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

Author: thomas.diesler at jboss.com
Date: 2009-08-17 10:31:14 -0400 (Mon, 17 Aug 2009)
New Revision: 92427

Modified:
   projects/jboss-osgi/projects/runtime/jbossas/trunk/src/main/resources/jboss-beans-felix.xml
   projects/jboss-osgi/trunk/distribution/installer/runtime/conf/jboss-osgi-felix.properties
   projects/jboss-osgi/trunk/distribution/installer/runtime/server/conf/jboss-osgi-felix-all.properties
   projects/jboss-osgi/trunk/distribution/installer/src/main/resources/installer/install-definition.xml
   projects/jboss-osgi/trunk/reactor/blueprint/testsuite/src/test/resources/jboss-osgi-felix.properties
   projects/jboss-osgi/trunk/testsuite/example/src/test/resources/jboss-osgi-felix.properties
   projects/jboss-osgi/trunk/testsuite/functional/src/test/resources/jboss-osgi-felix.properties
   projects/jboss-osgi/trunk/testsuite/trailblazer/src/test/resources/jboss-osgi-felix.properties
Log:
Remove felix compendium from distribution

Modified: projects/jboss-osgi/projects/runtime/jbossas/trunk/src/main/resources/jboss-beans-felix.xml
===================================================================
--- projects/jboss-osgi/projects/runtime/jbossas/trunk/src/main/resources/jboss-beans-felix.xml	2009-08-17 13:58:01 UTC (rev 92426)
+++ projects/jboss-osgi/projects/runtime/jbossas/trunk/src/main/resources/jboss-beans-felix.xml	2009-08-17 14:31:14 UTC (rev 92427)
@@ -82,7 +82,6 @@
     </property>
     <property name="autoInstall">
      <list elementClass="java.net.URL">
-      <value>${jboss.server.home.url}/deploy/osgi/org.osgi.compendium.jar</value>
      </list>
     </property>
     <property name="autoStart">

Modified: projects/jboss-osgi/trunk/distribution/installer/runtime/conf/jboss-osgi-felix.properties
===================================================================
--- projects/jboss-osgi/trunk/distribution/installer/runtime/conf/jboss-osgi-felix.properties	2009-08-17 13:58:01 UTC (rev 92426)
+++ projects/jboss-osgi/trunk/distribution/installer/runtime/conf/jboss-osgi-felix.properties	2009-08-17 14:31:14 UTC (rev 92427)
@@ -15,8 +15,7 @@
 org.jboss.osgi.hotdeploy.scandir=${osgi.server.home}/deploy
 
 # Bundles that need to be installed with the Framework automatically 
-org.jboss.osgi.spi.framework.autoInstall=\
-	file://${osgi.home}/server/minimal/deploy/org.osgi.compendium.jar
+org.jboss.osgi.spi.framework.autoInstall=
 
 # Bundles that need to be started automatically 
 org.jboss.osgi.spi.framework.autoStart=\

Modified: projects/jboss-osgi/trunk/distribution/installer/runtime/server/conf/jboss-osgi-felix-all.properties
===================================================================
--- projects/jboss-osgi/trunk/distribution/installer/runtime/server/conf/jboss-osgi-felix-all.properties	2009-08-17 13:58:01 UTC (rev 92426)
+++ projects/jboss-osgi/trunk/distribution/installer/runtime/server/conf/jboss-osgi-felix-all.properties	2009-08-17 14:31:14 UTC (rev 92427)
@@ -45,4 +45,5 @@
    org.jboss.virtual.plugins.registry, \
    org.jboss.virtual.plugins.context.jar, \
    org.jboss.virtual.plugins.vfs.helpers, \
-   org.jboss.virtual.protocol
+   org.jboss.virtual.protocol, \
+   org.osgi.util.xml;version=1.0
\ No newline at end of file

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-08-17 13:58:01 UTC (rev 92426)
+++ projects/jboss-osgi/trunk/distribution/installer/src/main/resources/installer/install-definition.xml	2009-08-17 14:31:14 UTC (rev 92427)
@@ -236,9 +236,6 @@
         <include name="jboss-osgi-runtime-felix.jar" />
         <include name="org.apache.felix.framework.jar" />
       </fileset>
-      <fileset condition="isFelix" dir="@{deploy.artifacts.dir}/lib" targetdir="$INSTALL_PATH/runtime/server/minimal/deploy" override="true">
-        <include name="org.osgi.compendium.jar" />
-      </fileset>
       
       <!-- Equinox Integration -->
       
@@ -309,9 +306,6 @@
       </fileset>
       <singlefile condition="isFelix" src="@{deploy.artifacts.dir}/resources/jbossas-config/jboss-beans-felix.xml" 
         target="${jbossInstallPath}/server/${jbossTargetServer}/deployers/osgi.deployer/META-INF/jboss-osgi-jboss-beans.xml" override="true"/>
-      <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 -->
       

Modified: projects/jboss-osgi/trunk/reactor/blueprint/testsuite/src/test/resources/jboss-osgi-felix.properties
===================================================================
--- projects/jboss-osgi/trunk/reactor/blueprint/testsuite/src/test/resources/jboss-osgi-felix.properties	2009-08-17 13:58:01 UTC (rev 92426)
+++ projects/jboss-osgi/trunk/reactor/blueprint/testsuite/src/test/resources/jboss-osgi-felix.properties	2009-08-17 14:31:14 UTC (rev 92427)
@@ -29,11 +29,11 @@
   	org.jboss.virtual.plugins.context.jar, \
   	org.jboss.virtual.plugins.vfs.helpers, \
   	org.jboss.virtual.protocol, \
-  	org.osgi.framework;version=1.4
+  	org.osgi.framework;version=1.4, \
+  	org.osgi.util.xml;version=1.0
 
 # Bundles that need to be installed with the Framework automatically 
-org.jboss.osgi.spi.framework.autoInstall=\
-	file://${test.archive.directory}/bundles/org.osgi.compendium.jar
+org.jboss.osgi.spi.framework.autoInstall=
 
 # Bundles that need to be started automatically 
 org.jboss.osgi.spi.framework.autoStart=\

Modified: projects/jboss-osgi/trunk/testsuite/example/src/test/resources/jboss-osgi-felix.properties
===================================================================
--- projects/jboss-osgi/trunk/testsuite/example/src/test/resources/jboss-osgi-felix.properties	2009-08-17 13:58:01 UTC (rev 92426)
+++ projects/jboss-osgi/trunk/testsuite/example/src/test/resources/jboss-osgi-felix.properties	2009-08-17 14:31:14 UTC (rev 92427)
@@ -31,12 +31,11 @@
   	org.jboss.virtual.plugins.context.jar, \
   	org.jboss.virtual.plugins.vfs.helpers, \
   	org.jboss.virtual.protocol, \
-  	org.osgi.framework;version=1.5
+  	org.osgi.framework;version=1.4, \
+  	org.osgi.util.xml;version=1.0
 
 # Bundles that need to be installed with the Framework automatically 
-org.jboss.osgi.spi.framework.autoInstall=\
-	file://${test.archive.directory}/bundles/org.osgi.compendium.jar
-		
+org.jboss.osgi.spi.framework.autoInstall=		
 
 # Bundles that need to be started automatically 
 org.jboss.osgi.spi.framework.autoStart=\

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-08-17 13:58:01 UTC (rev 92426)
+++ projects/jboss-osgi/trunk/testsuite/functional/src/test/resources/jboss-osgi-felix.properties	2009-08-17 14:31:14 UTC (rev 92427)
@@ -13,6 +13,7 @@
 
 # Extra System Packages
 org.osgi.framework.system.packages.extra=\
+    org.apache.log4j, \
 	org.jboss.logging, \
   	org.jboss.net.protocol, \
   	org.jboss.osgi.spi;version=1.0, \
@@ -21,21 +22,20 @@
   	org.jboss.osgi.spi.management;version=1.0, \
   	org.jboss.osgi.spi.service;version=1.0, \
   	org.jboss.osgi.spi.util;version=1.0, \
-  	org.jboss.virtual, \
+    org.jboss.util, \
+    org.jboss.util.id, \
+    org.jboss.util.threadpool, \
+    org.jboss.util.propertyeditor, \
+    org.jboss.virtual, \
   	org.jboss.virtual.plugins.registry, \
   	org.jboss.virtual.plugins.context.jar, \
   	org.jboss.virtual.plugins.vfs.helpers, \
   	org.jboss.virtual.protocol, \
-  	org.osgi.framework;version\=1.4, \
-    org.apache.log4j, \
-    org.jboss.util, \
-    org.jboss.util.id, \
-    org.jboss.util.threadpool, \
-    org.jboss.util.propertyeditor 
+  	org.osgi.framework;version=1.4, \
+  	org.osgi.util.xml;version=1.0
 
 # Bundles that need to be installed with the Framework automatically 
-org.jboss.osgi.spi.framework.autoInstall=\
-	file://${test.archive.directory}/bundles/org.osgi.compendium.jar
+org.jboss.osgi.spi.framework.autoInstall=
 
 # Bundles that need to be started automatically 
 org.jboss.osgi.spi.framework.autoStart=\

Modified: projects/jboss-osgi/trunk/testsuite/trailblazer/src/test/resources/jboss-osgi-felix.properties
===================================================================
--- projects/jboss-osgi/trunk/testsuite/trailblazer/src/test/resources/jboss-osgi-felix.properties	2009-08-17 13:58:01 UTC (rev 92426)
+++ projects/jboss-osgi/trunk/testsuite/trailblazer/src/test/resources/jboss-osgi-felix.properties	2009-08-17 14:31:14 UTC (rev 92427)
@@ -18,26 +18,24 @@
 org.osgi.framework.system.packages.extra=\
 	org.jboss.logging, \
   	org.jboss.net.protocol, \
+    org.jboss.osgi.common.log;version=1.0, \
   	org.jboss.osgi.spi;version=1.0, \
+  	org.jboss.osgi.spi.capability;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.util;version=1.0, \
   	org.jboss.virtual, \
   	org.jboss.virtual.plugins.registry, \
   	org.jboss.virtual.plugins.context.jar, \
   	org.jboss.virtual.plugins.vfs.helpers, \
   	org.jboss.virtual.protocol, \
-  	org.osgi.framework;version\=1.4, \
-    org.apache.log4j, \
-    org.jboss.util, \
-    org.jboss.util.id, \
-    org.jboss.util.threadpool, \
-    org.jboss.util.propertyeditor 
+  	org.osgi.framework;version=1.4, \
+  	org.osgi.util.xml;version=1.0
 
 # Bundles that need to be installed with the Framework automatically 
-org.jboss.osgi.spi.framework.autoInstall=\
-	file://${test.archive.directory}/bundles/org.osgi.compendium.jar
+org.jboss.osgi.spi.framework.autoInstall=
 
 # Bundles that need to be started automatically 
 org.jboss.osgi.spi.framework.autoStart=\