[jboss-osgi-commits] JBoss-OSGI SVN: r91724 - in projects/jboss-osgi: projects/runtime/equinox/trunk/src/test/resources and 5 other directories.

Author: thomas.diesler(a)jboss.com Date: 2009-07-28 12:40:30 -0400 (Tue, 28 Jul 2009) New Revision: 91724 Removed: projects/jboss-osgi/projects/runtime/equinox/trunk/src/main/java/org/jboss/osgi/equinox/framework/ projects/jboss-osgi/projects/runtime/equinox/trunk/src/test/resources/jboss-osgi-beans.xml projects/jboss-osgi/projects/runtime/equinox/trunk/src/test/resources/jndi.properties projects/jboss-osgi/projects/runtime/equinox/trunk/src/test/resources/org.jboss.osgi.spi.framework.OSGiBootstrapProvider projects/jboss-osgi/projects/runtime/equinox/trunk/src/test/resources/tst.policy projects/jboss-osgi/projects/runtime/felix/trunk/src/test/resources/jboss-osgi-beans.xml projects/jboss-osgi/projects/runtime/felix/trunk/src/test/resources/jndi.properties projects/jboss-osgi/projects/runtime/felix/trunk/src/test/resources/org.jboss.osgi.spi.framework.OSGiBootstrapProvider projects/jboss-osgi/projects/runtime/felix/trunk/src/test/resources/tst.policy Modified: projects/jboss-osgi/projects/runtime/felix/trunk/pom.xml projects/jboss-osgi/projects/spi/trunk/pom.xml projects/jboss-osgi/trunk/reactor/pom.xml projects/jboss-osgi/trunk/testsuite/pom.xml Log: More on framework launch API Deleted: projects/jboss-osgi/projects/runtime/equinox/trunk/src/test/resources/jboss-osgi-beans.xml =================================================================== --- projects/jboss-osgi/projects/runtime/equinox/trunk/src/test/resources/jboss-osgi-beans.xml 2009-07-28 16:13:48 UTC (rev 91723) +++ projects/jboss-osgi/projects/runtime/equinox/trunk/src/test/resources/jboss-osgi-beans.xml 2009-07-28 16:40:30 UTC (rev 91724) @@ -1,15 +0,0 @@ -<!-- - $Id$ ---> -<deployment xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="urn:jboss:bean-deployer:2.0 bean-deployer_2_0.xsd" xmlns="urn:jboss:bean-deployer:2.0"> - - <!-- The OSGiFramework --> - <bean name="jboss.osgi:service=Framework" class="org.jboss.osgi.equinox.framework.EquinoxIntegration"> - <property name="properties"> - <map keyClass="java.lang.String" valueClass="java.lang.String"> - <entry><key>org.osgi.framework.storage.clean</key><value>onFirstInit</value></entry> - </map> - </property> - </bean> - -</deployment> Deleted: projects/jboss-osgi/projects/runtime/equinox/trunk/src/test/resources/jndi.properties =================================================================== --- projects/jboss-osgi/projects/runtime/equinox/trunk/src/test/resources/jndi.properties 2009-07-28 16:13:48 UTC (rev 91723) +++ projects/jboss-osgi/projects/runtime/equinox/trunk/src/test/resources/jndi.properties 2009-07-28 16:40:30 UTC (rev 91724) @@ -1,3 +0,0 @@ -java.naming.factory.initial=org.jnp.interfaces.NamingContextFactory -java.naming.factory.url.pkgs=org.jboss.naming:org.jnp.interfaces -java.naming.provider.url=jnp://@jboss.bind.address@:1099 Deleted: projects/jboss-osgi/projects/runtime/equinox/trunk/src/test/resources/org.jboss.osgi.spi.framework.OSGiBootstrapProvider =================================================================== --- projects/jboss-osgi/projects/runtime/equinox/trunk/src/test/resources/org.jboss.osgi.spi.framework.OSGiBootstrapProvider 2009-07-28 16:13:48 UTC (rev 91723) +++ projects/jboss-osgi/projects/runtime/equinox/trunk/src/test/resources/org.jboss.osgi.spi.framework.OSGiBootstrapProvider 2009-07-28 16:40:30 UTC (rev 91724) @@ -1 +0,0 @@ -org.jboss.osgi.spi.framework.MicrocontainerBootstrapProvider \ No newline at end of file Deleted: projects/jboss-osgi/projects/runtime/equinox/trunk/src/test/resources/tst.policy =================================================================== --- projects/jboss-osgi/projects/runtime/equinox/trunk/src/test/resources/tst.policy 2009-07-28 16:13:48 UTC (rev 91723) +++ projects/jboss-osgi/projects/runtime/equinox/trunk/src/test/resources/tst.policy 2009-07-28 16:40:30 UTC (rev 91724) @@ -1,4 +0,0 @@ -grant { - permission java.security.AllPermission; -}; - Modified: projects/jboss-osgi/projects/runtime/felix/trunk/pom.xml =================================================================== --- projects/jboss-osgi/projects/runtime/felix/trunk/pom.xml 2009-07-28 16:13:48 UTC (rev 91723) +++ projects/jboss-osgi/projects/runtime/felix/trunk/pom.xml 2009-07-28 16:40:30 UTC (rev 91724) @@ -20,7 +20,7 @@ <artifactId>jboss-osgi-runtime-felix</artifactId> <packaging>jar</packaging> - <version>1.0.1-SNAPSHOT</version> + <version>1.9.0-SNAPSHOT</version> <!-- Parent --> <parent> @@ -31,7 +31,6 @@ <properties> <version.felix.framework>1.9.0-SNAPSHOT</version.felix.framework> - <version.jboss.microcontainer>2.0.5.GA</version.jboss.microcontainer> <version.jboss.osgi.spi>1.0.1-SNAPSHOT</version.jboss.osgi.spi> </properties> @@ -47,26 +46,10 @@ <artifactId>org.apache.felix.framework</artifactId> <version>${version.felix.framework}</version> </dependency> - - <!-- Test Dependencies --> - <dependency> - <groupId>org.jboss.microcontainer</groupId> - <artifactId>jboss-kernel</artifactId> - <version>${version.jboss.microcontainer}</version> - <scope>test</scope> - </dependency> </dependencies> <!-- Build --> <build> - <testResources> - <testResource> - <directory>src/test/resources</directory> - <filtering>true</filtering> - </testResource> - </testResources> - <plugins> - </plugins> </build> <!-- Profiles --> Deleted: projects/jboss-osgi/projects/runtime/felix/trunk/src/test/resources/jboss-osgi-beans.xml =================================================================== --- projects/jboss-osgi/projects/runtime/felix/trunk/src/test/resources/jboss-osgi-beans.xml 2009-07-28 16:13:48 UTC (rev 91723) +++ projects/jboss-osgi/projects/runtime/felix/trunk/src/test/resources/jboss-osgi-beans.xml 2009-07-28 16:40:30 UTC (rev 91724) @@ -1,15 +0,0 @@ -<!-- - $Id$ ---> -<deployment xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="urn:jboss:bean-deployer:2.0 bean-deployer_2_0.xsd" xmlns="urn:jboss:bean-deployer:2.0"> - - <!-- The OSGiFramework --> - <bean name="jboss.osgi:service=Framework" class="org.jboss.osgi.felix.framework.FelixIntegration"> - <property name="properties"> - <map keyClass="java.lang.String" valueClass="java.lang.String"> - <entry><key>org.osgi.framework.storage.clean</key><value>onFirstInit</value></entry> - </map> - </property> - </bean> - -</deployment> Deleted: projects/jboss-osgi/projects/runtime/felix/trunk/src/test/resources/jndi.properties =================================================================== --- projects/jboss-osgi/projects/runtime/felix/trunk/src/test/resources/jndi.properties 2009-07-28 16:13:48 UTC (rev 91723) +++ projects/jboss-osgi/projects/runtime/felix/trunk/src/test/resources/jndi.properties 2009-07-28 16:40:30 UTC (rev 91724) @@ -1,3 +0,0 @@ -java.naming.factory.initial=org.jnp.interfaces.NamingContextFactory -java.naming.factory.url.pkgs=org.jboss.naming:org.jnp.interfaces -java.naming.provider.url=jnp://@jboss.bind.address@:1099 Deleted: projects/jboss-osgi/projects/runtime/felix/trunk/src/test/resources/org.jboss.osgi.spi.framework.OSGiBootstrapProvider =================================================================== --- projects/jboss-osgi/projects/runtime/felix/trunk/src/test/resources/org.jboss.osgi.spi.framework.OSGiBootstrapProvider 2009-07-28 16:13:48 UTC (rev 91723) +++ projects/jboss-osgi/projects/runtime/felix/trunk/src/test/resources/org.jboss.osgi.spi.framework.OSGiBootstrapProvider 2009-07-28 16:40:30 UTC (rev 91724) @@ -1 +0,0 @@ -org.jboss.osgi.spi.framework.MicrocontainerBootstrapProvider \ No newline at end of file Deleted: projects/jboss-osgi/projects/runtime/felix/trunk/src/test/resources/tst.policy =================================================================== --- projects/jboss-osgi/projects/runtime/felix/trunk/src/test/resources/tst.policy 2009-07-28 16:13:48 UTC (rev 91723) +++ projects/jboss-osgi/projects/runtime/felix/trunk/src/test/resources/tst.policy 2009-07-28 16:40:30 UTC (rev 91724) @@ -1,4 +0,0 @@ -grant { - permission java.security.AllPermission; -}; - Modified: projects/jboss-osgi/projects/spi/trunk/pom.xml =================================================================== --- projects/jboss-osgi/projects/spi/trunk/pom.xml 2009-07-28 16:13:48 UTC (rev 91723) +++ projects/jboss-osgi/projects/spi/trunk/pom.xml 2009-07-28 16:40:30 UTC (rev 91724) @@ -34,7 +34,7 @@ <version.args4j>2.0.12</version.args4j> <version.jboss.logging>2.0.5.GA</version.jboss.logging> <version.jboss.vfs>2.1.0.GA</version.jboss.vfs> - <version.osgi>r4v42</version.osgi> + <version.osgi>r4v42-20090728</version.osgi> </properties> <!-- Dependencies --> Modified: projects/jboss-osgi/trunk/reactor/pom.xml =================================================================== --- projects/jboss-osgi/trunk/reactor/pom.xml 2009-07-28 16:13:48 UTC (rev 91723) +++ projects/jboss-osgi/trunk/reactor/pom.xml 2009-07-28 16:40:30 UTC (rev 91724) @@ -57,6 +57,7 @@ <modules> <module>spi</module> + <module>runtime/equinox</module> <module>runtime/felix</module> <module>blueprint</module> </modules> Modified: projects/jboss-osgi/trunk/testsuite/pom.xml =================================================================== --- projects/jboss-osgi/trunk/testsuite/pom.xml 2009-07-28 16:13:48 UTC (rev 91723) +++ projects/jboss-osgi/trunk/testsuite/pom.xml 2009-07-28 16:40:30 UTC (rev 91724) @@ -100,8 +100,16 @@ <version>${version.jboss.osgi.remotelog}</version> <scope>provided</scope> </dependency> + + <!-- OSGi Dependencies --> <dependency> <groupId>org.osgi</groupId> + <artifactId>org.osgi.core</artifactId> + <version>${version.osgi}</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.osgi</groupId> <artifactId>org.osgi.compendium</artifactId> <version>${version.osgi}</version> <scope>provided</scope>